diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2023-03-11 21:13:01 +0800 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2023-03-27 09:34:02 -0400 |
commit | 8bd9e7783551fefef3406c9d9d8399aa3234d897 (patch) | |
tree | 28edf4333ecd88f605dd495c068ca4bd95261cd3 | |
parent | efed45fd9fd3bcf3d00afc918ea0c63261d4fb44 (diff) | |
download | meta-selinux-8bd9e7783551fefef3406c9d9d8399aa3234d897.tar.gz |
policycoreutils: upgrade 3.4 -> 3.5
License-Update: Rename COPYING to LICENSE. No content changes.
* Refresh patch.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r-- | recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch | 8 | ||||
-rw-r--r-- | recipes-security/selinux/policycoreutils_3.5.bb (renamed from recipes-security/selinux/policycoreutils_3.4.bb) | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch b/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch index 0e80959..5dcb5e4 100644 --- a/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch +++ b/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cdc8f6e887d9ab8944e3ae89dd18bf55edf080c4 Mon Sep 17 00:00:00 2001 | 1 | From 624d6231ca9daf494e33352d562ff97cb0219f2d Mon Sep 17 00:00:00 2001 |
2 | From: Joe MacDonald <joe_macdonald@mentor.com> | 2 | From: Joe MacDonald <joe_macdonald@mentor.com> |
3 | Date: Fri, 20 Feb 2015 17:00:19 -0500 | 3 | Date: Fri, 20 Feb 2015 17:00:19 -0500 |
4 | Subject: [PATCH] fixfiles: de-bashify | 4 | Subject: [PATCH] fixfiles: de-bashify |
@@ -19,7 +19,7 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | |||
19 | 1 file changed, 14 insertions(+), 9 deletions(-) | 19 | 1 file changed, 14 insertions(+), 9 deletions(-) |
20 | 20 | ||
21 | diff --git a/scripts/fixfiles b/scripts/fixfiles | 21 | diff --git a/scripts/fixfiles b/scripts/fixfiles |
22 | index c72ca0e..143cc2e 100755 | 22 | index 166af6f..a23cdc6 100755 |
23 | --- a/scripts/fixfiles | 23 | --- a/scripts/fixfiles |
24 | +++ b/scripts/fixfiles | 24 | +++ b/scripts/fixfiles |
25 | @@ -1,4 +1,4 @@ | 25 | @@ -1,4 +1,4 @@ |
@@ -74,8 +74,8 @@ index c72ca0e..143cc2e 100755 | |||
74 | + fi | 74 | + fi |
75 | } | 75 | } |
76 | 76 | ||
77 | # | 77 | # unmount tmp bind mount before exit |
78 | @@ -295,7 +300,7 @@ relabel() { | 78 | @@ -315,7 +320,7 @@ relabel() { |
79 | exit 1 | 79 | exit 1 |
80 | fi | 80 | fi |
81 | 81 | ||
diff --git a/recipes-security/selinux/policycoreutils_3.4.bb b/recipes-security/selinux/policycoreutils_3.5.bb index ab871a3..c106ee7 100644 --- a/recipes-security/selinux/policycoreutils_3.4.bb +++ b/recipes-security/selinux/policycoreutils_3.5.bb | |||
@@ -6,7 +6,7 @@ to switch roles, and run_init to run /etc/init.d scripts in the proper \ | |||
6 | context." | 6 | context." |
7 | SECTION = "base" | 7 | SECTION = "base" |
8 | LICENSE = "GPL-2.0-or-later" | 8 | LICENSE = "GPL-2.0-or-later" |
9 | LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833" | 9 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=393a5ca445f6965873eca0259a17f833" |
10 | 10 | ||
11 | require selinux_common.inc | 11 | require selinux_common.inc |
12 | 12 | ||
@@ -136,7 +136,7 @@ do_compile:prepend() { | |||
136 | export PYLIBVER='python${PYTHON_BASEVERSION}' | 136 | export PYLIBVER='python${PYTHON_BASEVERSION}' |
137 | export PYTHON_CPPFLAGS="-I${STAGING_INCDIR}/${PYLIBVER}" | 137 | export PYTHON_CPPFLAGS="-I${STAGING_INCDIR}/${PYLIBVER}" |
138 | export PYTHON_LDFLAGS="${STAGING_LIBDIR}/lib${PYLIBVER}.so" | 138 | export PYTHON_LDFLAGS="${STAGING_LIBDIR}/lib${PYLIBVER}.so" |
139 | export PYTHON_SITE_PKG="${libdir}/${PYLIBVER}/site-packages" | 139 | export PYTHON_SITE_PKG="${PYTHON_SITEPACKAGES_DIR}" |
140 | } | 140 | } |
141 | 141 | ||
142 | do_compile:class-native() { | 142 | do_compile:class-native() { |