License-Update: Rename COPYING to LICENSE. No content changes. * Refresh patch.
Signed-off-by: Yi Zhao <[email protected]> --- .../policycoreutils-fixfiles-de-bashify.patch | 8 ++++---- .../{policycoreutils_3.4.bb => policycoreutils_3.5.bb} | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename recipes-security/selinux/{policycoreutils_3.4.bb => policycoreutils_3.5.bb} (97%) 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 @@ -From cdc8f6e887d9ab8944e3ae89dd18bf55edf080c4 Mon Sep 17 00:00:00 2001 +From 624d6231ca9daf494e33352d562ff97cb0219f2d Mon Sep 17 00:00:00 2001 From: Joe MacDonald <[email protected]> Date: Fri, 20 Feb 2015 17:00:19 -0500 Subject: [PATCH] fixfiles: de-bashify @@ -19,7 +19,7 @@ Signed-off-by: Wenzong Fan <[email protected]> 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/scripts/fixfiles b/scripts/fixfiles -index c72ca0e..143cc2e 100755 +index 166af6f..a23cdc6 100755 --- a/scripts/fixfiles +++ b/scripts/fixfiles @@ -1,4 +1,4 @@ @@ -74,8 +74,8 @@ index c72ca0e..143cc2e 100755 + fi } - # -@@ -295,7 +300,7 @@ relabel() { + # unmount tmp bind mount before exit +@@ -315,7 +320,7 @@ relabel() { exit 1 fi diff --git a/recipes-security/selinux/policycoreutils_3.4.bb b/recipes-security/selinux/policycoreutils_3.5.bb similarity index 97% rename from recipes-security/selinux/policycoreutils_3.4.bb rename to 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 \ context." SECTION = "base" LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=393a5ca445f6965873eca0259a17f833" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=393a5ca445f6965873eca0259a17f833" require selinux_common.inc @@ -136,7 +136,7 @@ do_compile:prepend() { export PYLIBVER='python${PYTHON_BASEVERSION}' export PYTHON_CPPFLAGS="-I${STAGING_INCDIR}/${PYLIBVER}" export PYTHON_LDFLAGS="${STAGING_LIBDIR}/lib${PYLIBVER}.so" - export PYTHON_SITE_PKG="${libdir}/${PYLIBVER}/site-packages" + export PYTHON_SITE_PKG="${PYTHON_SITEPACKAGES_DIR}" } do_compile:class-native() { -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#59393): https://lists.yoctoproject.org/g/yocto/message/59393 Mute This Topic: https://lists.yoctoproject.org/mt/97540062/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
