!221 屏蔽go-selinux使用,以保证在selinux开启的openEuler能够正确构建镜像

From: @meilier 
Reviewed-by: @jingxiaolu 
Signed-off-by: @jingxiaolu
This commit is contained in:
openeuler-ci-bot 2022-03-16 06:37:35 +00:00 committed by Gitee
commit 299662db18
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 43 additions and 3 deletions

View File

@ -1 +1 @@
0.9.6-5
0.9.6-6

View File

@ -1 +1 @@
72af9798974345d587fe8f3ea2c121adc1696651
e3a0acf9c3f50e99364a9ad70f9d40c4bf473feb

View File

@ -2,7 +2,7 @@
Name: isula-build
Version: 0.9.6
Release: 5
Release: 6
Summary: A tool to build container images
License: Mulan PSL V2
URL: https://gitee.com/openeuler/isula-build
@ -85,6 +85,12 @@ fi
/usr/share/bash-completion/completions/isula-build
%changelog
* Wed Mar 16 2022 xingweizheng <xingweizheng@huawei.com> - 0.9.6-6
- Type:bugfix
- CVE:NA
- SUG:restart
- DESC:disable go-selinux on openEuler
* Thu Jan 13 2022 DCCooper <1866858@gmail.com> - 0.9.6-5
- Type:enhancement
- CVE:NA

View File

@ -0,0 +1,33 @@
From d536520c7ecc20c67c2e2b10931a2a773425e3f6 Mon Sep 17 00:00:00 2001
From: xingweizheng <xingweizheng@huawei.com>
Date: Wed, 16 Mar 2022 11:17:25 +0800
Subject: [PATCH] tule
---
.../opencontainers/selinux/go-selinux/selinux_linux.go | 2 ++
.../opencontainers/selinux/go-selinux/selinux_stub.go | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
index b045843..0b16f03 100644
--- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
@@ -1,3 +1,5 @@
+// +build !linux
+
package selinux
import (
diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_stub.go b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_stub.go
index 4265775..7ac4017 100644
--- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_stub.go
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_stub.go
@@ -1,4 +1,4 @@
-// +build !linux
+// +build linux
package selinux
--
2.27.0

View File

@ -9,3 +9,4 @@ patch/0097-fix-the-message-is-not-rational-when-not-appoint-Doc.patch
patch/0098-utils-remove-unused-PBKDF2-and-AES-related.patch
patch/0099-Refactor-refactor-image-separator-related.patch
patch/0100-Add-syscall-statx-in-seccomp-to-fix-Operation-not-pe.patch
patch/0101-disable-go-selinux-on-openEuler.patch