From d81473e1f4103eb1a94b8d1f39708d063613bc0f Mon Sep 17 00:00:00 2001 From: BianTanggui Date: Fri, 8 Jul 2022 11:17:11 +0800 Subject: [PATCH 1/3] Match-id-4c83e8548653a6a7a9824ffba9749a43f1d367b5 --- build/conf/hook.yaml | 1 + build/conf/installhelper.yaml | 1 + build/conf/runtime.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/build/conf/hook.yaml b/build/conf/hook.yaml index 62ac88a..279e9c6 100644 --- a/build/conf/hook.yaml +++ b/build/conf/hook.yaml @@ -22,6 +22,7 @@ compile: [ "buildmode","pie" ], [ "ldflags",'-linkmode=external -buildid=IdNetCheck -extldflags "-Wl,-z,now" -w -s '], [ "trimpath","{{ systemEnv.workspace }}/ascend-docker-plugin/hook/main.go"], + [ "o", "{{ systemEnv.workspace }}/ascend-docker-plugin/hook/build/ascend-docker-hook"] ] output: files: diff --git a/build/conf/installhelper.yaml b/build/conf/installhelper.yaml index 4d140bf..d02d7a0 100644 --- a/build/conf/installhelper.yaml +++ b/build/conf/installhelper.yaml @@ -22,6 +22,7 @@ compile: [ "buildmode", "pie" ], [ "ldflags", '-linkmode=external -buildid=IdNetCheck -extldflags "-Wl,-z,now" -w -s'], [ "trimpath", "{{ systemEnv.workspace }}/ascend-docker-plugin/install/deb/src/main.go"], + [ "o", "{{ systemEnv.workspace }}/ascend-docker-plugin/build/helper/build/ascend-docker-plugin-install-helper"], ] output: files: diff --git a/build/conf/runtime.yaml b/build/conf/runtime.yaml index 6a2753f..4daf089 100644 --- a/build/conf/runtime.yaml +++ b/build/conf/runtime.yaml @@ -22,6 +22,7 @@ compile: [ "buildmode", "pie" ], [ "ldflags", '-linkmode=external -buildid=IdNetCheck -extldflags "-Wl,-z,now" -w -s'], [ "trimpath", "{{ systemEnv.workspace }}/ascend-docker-plugin/runtime/main.go" ], + [ "o", "{{ systemEnv.workspace }}/ascend-docker-plugin/runtime/build/ascend-docker-runtime"] ] output: files: From ba074ae6edb5d403b1f0e2d9b2ab5f15d79ddbe0 Mon Sep 17 00:00:00 2001 From: BianTanggui Date: Fri, 8 Jul 2022 16:14:15 +0800 Subject: [PATCH 2/3] Match-id-31e9f3c1234a3780f7f94c19ce085552f56f0058 --- build/conf/hook.yaml | 2 +- build/conf/installhelper.yaml | 2 +- build/conf/runtime.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/conf/hook.yaml b/build/conf/hook.yaml index 279e9c6..b8f1c73 100644 --- a/build/conf/hook.yaml +++ b/build/conf/hook.yaml @@ -21,8 +21,8 @@ compile: parameters: [ [ "buildmode","pie" ], [ "ldflags",'-linkmode=external -buildid=IdNetCheck -extldflags "-Wl,-z,now" -w -s '], + [ "o", "{{ systemEnv.workspace }}/ascend-docker-plugin/hook/build/ascend-docker-hook"], [ "trimpath","{{ systemEnv.workspace }}/ascend-docker-plugin/hook/main.go"], - [ "o", "{{ systemEnv.workspace }}/ascend-docker-plugin/hook/build/ascend-docker-hook"] ] output: files: diff --git a/build/conf/installhelper.yaml b/build/conf/installhelper.yaml index d02d7a0..d83314b 100644 --- a/build/conf/installhelper.yaml +++ b/build/conf/installhelper.yaml @@ -21,8 +21,8 @@ compile: parameters: [ [ "buildmode", "pie" ], [ "ldflags", '-linkmode=external -buildid=IdNetCheck -extldflags "-Wl,-z,now" -w -s'], - [ "trimpath", "{{ systemEnv.workspace }}/ascend-docker-plugin/install/deb/src/main.go"], [ "o", "{{ systemEnv.workspace }}/ascend-docker-plugin/build/helper/build/ascend-docker-plugin-install-helper"], + [ "trimpath", "{{ systemEnv.workspace }}/ascend-docker-plugin/install/deb/src/main.go"], ] output: files: diff --git a/build/conf/runtime.yaml b/build/conf/runtime.yaml index 4daf089..50f89aa 100644 --- a/build/conf/runtime.yaml +++ b/build/conf/runtime.yaml @@ -21,8 +21,8 @@ compile: parameters: [ [ "buildmode", "pie" ], [ "ldflags", '-linkmode=external -buildid=IdNetCheck -extldflags "-Wl,-z,now" -w -s'], + [ "o", "{{ systemEnv.workspace }}/ascend-docker-plugin/runtime/build/ascend-docker-runtime"], [ "trimpath", "{{ systemEnv.workspace }}/ascend-docker-plugin/runtime/main.go" ], - [ "o", "{{ systemEnv.workspace }}/ascend-docker-plugin/runtime/build/ascend-docker-runtime"] ] output: files: From 1e147377d5da5baafd768b6bcff1b45e77bb01bc Mon Sep 17 00:00:00 2001 From: BianTanggui Date: Sat, 9 Jul 2022 09:10:42 +0800 Subject: [PATCH 3/3] Match-id-d07fc3f7b7b47a682e16096b5427f9620f92ead7 --- build/conf/hook.yaml | 6 ------ build/conf/installhelper.yaml | 6 ------ build/conf/runtime.yaml | 6 ------ 3 files changed, 18 deletions(-) diff --git a/build/conf/hook.yaml b/build/conf/hook.yaml index b8f1c73..209f49a 100644 --- a/build/conf/hook.yaml +++ b/build/conf/hook.yaml @@ -25,9 +25,3 @@ compile: [ "trimpath","{{ systemEnv.workspace }}/ascend-docker-plugin/hook/main.go"], ] output: - files: - include: - - copy: - src: [ "{{ systemEnv.workspace }}/ascend-docker-plugin/hook/main" ] - des: "{{ systemEnv.workspace }}/ascend-docker-plugin/hook/build/ascend-docker-hook" - rename: true \ No newline at end of file diff --git a/build/conf/installhelper.yaml b/build/conf/installhelper.yaml index d83314b..205e041 100644 --- a/build/conf/installhelper.yaml +++ b/build/conf/installhelper.yaml @@ -25,9 +25,3 @@ compile: [ "trimpath", "{{ systemEnv.workspace }}/ascend-docker-plugin/install/deb/src/main.go"], ] output: - files: - include: - - copy: - src: [ "{{ systemEnv.workspace }}/ascend-docker-plugin/install/deb/src/main" ] - des: "{{ systemEnv.workspace }}/ascend-docker-plugin/build/helper/build/ascend-docker-plugin-install-helper" - rename: true \ No newline at end of file diff --git a/build/conf/runtime.yaml b/build/conf/runtime.yaml index 50f89aa..d255704 100644 --- a/build/conf/runtime.yaml +++ b/build/conf/runtime.yaml @@ -25,9 +25,3 @@ compile: [ "trimpath", "{{ systemEnv.workspace }}/ascend-docker-plugin/runtime/main.go" ], ] output: - files: - include: - - copy: - src: [ "{{ systemEnv.workspace }}/ascend-docker-plugin/runtime/main" ] - des: "{{ systemEnv.workspace }}/ascend-docker-plugin/runtime/build/ascend-docker-runtime" - rename: true \ No newline at end of file