Merge inc file into bb file.

Signed-off-by: Yi Zhao <yi.z...@windriver.com>
---
 recipes-security/selinux/mcstrans_3.1.bb            |  7 -------
 .../selinux/{mcstrans.inc => mcstrans_3.2.bb}       | 13 +++++++++----
 2 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 100644 recipes-security/selinux/mcstrans_3.1.bb
 rename recipes-security/selinux/{mcstrans.inc => mcstrans_3.2.bb} (92%)

diff --git a/recipes-security/selinux/mcstrans_3.1.bb 
b/recipes-security/selinux/mcstrans_3.1.bb
deleted file mode 100644
index 26bb299..0000000
--- a/recipes-security/selinux/mcstrans_3.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require selinux_20200710.inc
-require ${BPN}.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-SRC_URI[md5sum] = "18b7bf8193dd2360bc60f0e2639009ab"
-SRC_URI[sha256sum] = 
"cc918576c17340fc944849d785e2a7400b269ef079a36b871c140504164d6a45"
diff --git a/recipes-security/selinux/mcstrans.inc 
b/recipes-security/selinux/mcstrans_3.2.bb
similarity index 92%
rename from recipes-security/selinux/mcstrans.inc
rename to recipes-security/selinux/mcstrans_3.2.bb
index 52b95c6..0cece17 100644
--- a/recipes-security/selinux/mcstrans.inc
+++ b/recipes-security/selinux/mcstrans_3.2.bb
@@ -1,17 +1,20 @@
+
 SUMMARY = "Daemon to translate SELinux MCS/MLS sensitivity labels"
 DESCRIPTION = "\
 mcstrans provides an translation daemon to translate SELinux categories \
 from internal representations to user defined representation."
-
 SECTION = "base"
 LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-SRC_URI += "file://mcstrans-de-bashify.patch \
-            file://mcstrans-fix-the-init-script.patch \
-"
+require selinux_common.inc
 
 inherit systemd update-rc.d
 
+SRC_URI += "file://mcstrans-de-bashify.patch \
+            file://mcstrans-fix-the-init-script.patch \
+           "
+
 DEPENDS += "libsepol libselinux libcap"
 
 EXTRA_OEMAKE += "SBINDIR=${base_sbindir} \
@@ -19,6 +22,8 @@ EXTRA_OEMAKE += "SBINDIR=${base_sbindir} \
                  SYSTEMDDIR=${systemd_unitdir} \
                 "
 
+S = "${WORKDIR}/git/mcstrans"
+
 do_install_append() {
     install -d ${D}${sbindir}
     install -m 755 utils/untranscon ${D}${sbindir}/
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#52698): https://lists.yoctoproject.org/g/yocto/message/52698
Mute This Topic: https://lists.yoctoproject.org/mt/81298598/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to