From fe11e3e73f6256031c812b296a86ba7a1374c350 Mon Sep 17 00:00:00 2001 From: xiadanni Date: Fri, 20 Nov 2020 09:58:53 +0800 Subject: [PATCH] isula-build: mask /proc/pin_memory Signed-off-by: xiadanni --- VERSION-openeuler | 2 +- git-commit | 2 +- isula-build.spec | 2 +- ...069-isula-build-mask-proc-pin_memory.patch | 25 +++++++++++++++++++ series.conf | 7 +----- 5 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 patch/0069-isula-build-mask-proc-pin_memory.patch diff --git a/VERSION-openeuler b/VERSION-openeuler index 33768ba..76c83e5 100644 --- a/VERSION-openeuler +++ b/VERSION-openeuler @@ -1 +1 @@ -0.9.4-6 +0.9.4-7 diff --git a/git-commit b/git-commit index 1df6c6c..267a459 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -5d42104ebadef24b190e31f1a6ecf5ac549b42ab +b10f08c8ff5fc0d43ca42ad73de3538f24212a3f diff --git a/isula-build.spec b/isula-build.spec index a859880..d947d72 100644 --- a/isula-build.spec +++ b/isula-build.spec @@ -2,7 +2,7 @@ Name: isula-build Version: 0.9.4 -Release: 6 +Release: 7 Summary: A tool to build container images License: Mulan PSL V2 URL: https://gitee.com/openeuler/isula-build diff --git a/patch/0069-isula-build-mask-proc-pin_memory.patch b/patch/0069-isula-build-mask-proc-pin_memory.patch new file mode 100644 index 0000000..1e60d2d --- /dev/null +++ b/patch/0069-isula-build-mask-proc-pin_memory.patch @@ -0,0 +1,25 @@ +From e85ac3e92535311cbed6a6c6b1e714b31c1fc980 Mon Sep 17 00:00:00 2001 +From: xiadanni +Date: Fri, 20 Nov 2020 09:46:40 +0800 +Subject: [PATCH] isula-build: mask /proc/pin_memory + +Signed-off-by: xiadanni +--- + constant.go | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/constant.go b/constant.go +index 9c3f281..a0abfc9 100644 +--- a/constant.go ++++ b/constant.go +@@ -97,6 +97,7 @@ var ( + "/proc/sig_catch", + "/proc/kbox", + "/proc/oom_extend", ++ "/proc/pin_memory", + "/sys/firmware", + "/proc/cpuirqstat", + "/proc/memstat", +-- +2.17.1 + diff --git a/series.conf b/series.conf index 05a1e17..10e51a0 100644 --- a/series.conf +++ b/series.conf @@ -1,14 +1,9 @@ patch/0013-vendor-change-auth.json-file-mode-from-0700-to-0600.patch -#patch/0014-store-recover-use-graphLock-when-mount-a-layer.patch -#patch/0027-fix-goroutine-leak-with-close-tarLogger-in-a-defer-c.patch patch/0030-xattr-support-ima-and-evm.patch patch/0033-isula-build-remove-docker-releated-path-for-authenti.patch patch/0037-isula-build-fix-goroutine-leak-problem.patch -#patch/0038-parse-all-stages-and-mark-it-wheather-need-to-commit.patch -#patch/0039-bugfix-fix-build-hang-problem-when-error-happened-be.patch -#patch/0040-isula-build-change-default-healthcheck-timeout-to-20.patch -#patch/0041-isula-build-add-t-shortname-for-tag-and-remove-it-fr.patch patch/0065-fix-panic-when-user-knock-ctrl-c-when-pull-push-and-.patch patch/0066-bugfix-chown-config-root-path-before-daemon-started.patch patch/0067-bugfix-fix-unsuitable-filemode-for-isula-build-er.patch patch/0068-isula-build-support-build-Dockerfile-only-have-FROM-.patch +patch/0069-isula-build-mask-proc-pin_memory.patch