Refresh patches. Signed-off-by: Yi Zhao <[email protected]> --- .../selinux/mcstrans/mcstrans-de-bashify.patch | 6 +++--- .../mcstrans/mcstrans-fix-the-init-script.patch | 4 ++-- .../selinux/{mcstrans_3.3.bb => mcstrans_3.4.bb} | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) rename recipes-security/selinux/{mcstrans_3.3.bb => mcstrans_3.4.bb} (87%)
diff --git a/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch b/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch index 27fd677..74ae879 100644 --- a/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch +++ b/recipes-security/selinux/mcstrans/mcstrans-de-bashify.patch @@ -1,4 +1,4 @@ -From 544b3c078374e5001e7fdc1b7d0b2eafda36f8fe Mon Sep 17 00:00:00 2001 +From 580a625e9e1266d92c248a5e3f471d12d42c149b Mon Sep 17 00:00:00 2001 From: Joe MacDonald <[email protected]> Date: Fri, 7 Aug 2015 15:16:45 -0400 Subject: [PATCH] mcstrans: remove dependency on bash in initscript @@ -8,7 +8,7 @@ dependency on bash. Signed-off-by: Joe MacDonald <[email protected]> -Upstream-Status: Pending +Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Wenzong Fan <[email protected]> Signed-off-by: Yi Zhao <[email protected]> @@ -27,5 +27,5 @@ index 2804ec0..8b4737d 100644 # mcstransd This starts and stops mcstransd # -- -2.7.4 +2.25.1 diff --git a/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch b/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch index 79be090..a560722 100644 --- a/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch +++ b/recipes-security/selinux/mcstrans/mcstrans-fix-the-init-script.patch @@ -1,4 +1,4 @@ -From 4d918a9679d2902ca2d41fe769a4d76f07a67b5f Mon Sep 17 00:00:00 2001 +From 123d5b6413905bfad535a072ff0ab5a495cb2a2a Mon Sep 17 00:00:00 2001 From: Roy Li <[email protected]> Date: Wed, 6 Nov 2019 22:13:33 +0800 Subject: [PATCH] mcstrans: fix the init script @@ -28,5 +28,5 @@ index 8b4737d..86c89ea 100644 echo if test $RETVAL = 0 ; then -- -2.7.4 +2.25.1 diff --git a/recipes-security/selinux/mcstrans_3.3.bb b/recipes-security/selinux/mcstrans_3.4.bb similarity index 87% rename from recipes-security/selinux/mcstrans_3.3.bb rename to recipes-security/selinux/mcstrans_3.4.bb index cd8780b..b5d6b54 100644 --- a/recipes-security/selinux/mcstrans_3.3.bb +++ b/recipes-security/selinux/mcstrans_3.4.bb @@ -9,18 +9,18 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" require selinux_common.inc -inherit systemd update-rc.d +inherit pkgconfig systemd update-rc.d SRC_URI += "file://mcstrans-de-bashify.patch \ file://mcstrans-fix-the-init-script.patch \ " -DEPENDS += "libsepol libselinux libcap" +DEPENDS = "libsepol libselinux libcap" -EXTRA_OEMAKE += "SBINDIR=${base_sbindir} \ - INITDIR=${sysconfdir}/init.d \ - SYSTEMDDIR=${systemd_unitdir} \ - " +EXTRA_OEMAKE = "SBINDIR=${base_sbindir} \ + INITDIR=${sysconfdir}/init.d \ + SYSTEMDDIR=${systemd_unitdir} \ + " S = "${WORKDIR}/git/mcstrans" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#57924): https://lists.yoctoproject.org/g/yocto/message/57924 Mute This Topic: https://lists.yoctoproject.org/mt/93301120/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
