Topics

[meta-selinux][PATCH 11/17] mcstrans: upgrade to 3.1 (20200710)


Yi Zhao
 

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
recipes-security/selinux/mcstrans.inc | 6 ++++--
recipes-security/selinux/mcstrans_3.0.bb | 7 -------
recipes-security/selinux/mcstrans_3.1.bb | 7 +++++++
3 files changed, 11 insertions(+), 9 deletions(-)
delete mode 100644 recipes-security/selinux/mcstrans_3.0.bb
create mode 100644 recipes-security/selinux/mcstrans_3.1.bb

diff --git a/recipes-security/selinux/mcstrans.inc b/recipes-security/selinux/mcstrans.inc
index b9c670b..52b95c6 100644
--- a/recipes-security/selinux/mcstrans.inc
+++ b/recipes-security/selinux/mcstrans.inc
@@ -14,8 +14,10 @@ inherit systemd update-rc.d

DEPENDS += "libsepol libselinux libcap"

-# We do not need "${D}/" as a prefix anymore.
-EXTRA_OEMAKE += "SBINDIR=${base_sbindir} INITDIR=${sysconfdir}/init.d"
+EXTRA_OEMAKE += "SBINDIR=${base_sbindir} \
+ INITDIR=${sysconfdir}/init.d \
+ SYSTEMDDIR=${systemd_unitdir} \
+ "

do_install_append() {
install -d ${D}${sbindir}
diff --git a/recipes-security/selinux/mcstrans_3.0.bb b/recipes-security/selinux/mcstrans_3.0.bb
deleted file mode 100644
index 27ddfce..0000000
--- a/recipes-security/selinux/mcstrans_3.0.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20191204.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-SRC_URI[md5sum] = "0edc58a4d65425ffa5d58d32bf412352"
-SRC_URI[sha256sum] = "0992b8e7c4de1ba5f98a82547b02418370be5a5f588fc6d5f1cd2c7824bda87e"
diff --git a/recipes-security/selinux/mcstrans_3.1.bb b/recipes-security/selinux/mcstrans_3.1.bb
new file mode 100644
index 0000000..26bb299
--- /dev/null
+++ b/recipes-security/selinux/mcstrans_3.1.bb
@@ -0,0 +1,7 @@
+require selinux_20200710.inc
+require ${BPN}.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+SRC_URI[md5sum] = "18b7bf8193dd2360bc60f0e2639009ab"
+SRC_URI[sha256sum] = "cc918576c17340fc944849d785e2a7400b269ef079a36b871c140504164d6a45"
--
2.25.1