summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-03-13 13:50:37 +0800
committerJoe MacDonald <joe@deserted.net>2021-03-17 09:39:50 -0400
commit45e06de91f71020cebdad19dc0337315127da3e0 (patch)
tree92b9b17dd7049113b7f93a2fca41639f2a8fc842
parent74bbbc3277fa72cc202aa466d0369b892aaddb0d (diff)
downloadmeta-selinux-45e06de91f71020cebdad19dc0337315127da3e0.tar.gz
mcstrans: update to 3.2
Merge inc file into bb file. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r--recipes-security/selinux/mcstrans_3.1.bb7
-rw-r--r--recipes-security/selinux/mcstrans_3.2.bb (renamed from recipes-security/selinux/mcstrans.inc)13
2 files changed, 9 insertions, 11 deletions
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 @@
1require selinux_20200710.inc
2require ${BPN}.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5
6SRC_URI[md5sum] = "18b7bf8193dd2360bc60f0e2639009ab"
7SRC_URI[sha256sum] = "cc918576c17340fc944849d785e2a7400b269ef079a36b871c140504164d6a45"
diff --git a/recipes-security/selinux/mcstrans.inc b/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 @@
1
1SUMMARY = "Daemon to translate SELinux MCS/MLS sensitivity labels" 2SUMMARY = "Daemon to translate SELinux MCS/MLS sensitivity labels"
2DESCRIPTION = "\ 3DESCRIPTION = "\
3mcstrans provides an translation daemon to translate SELinux categories \ 4mcstrans provides an translation daemon to translate SELinux categories \
4from internal representations to user defined representation." 5from internal representations to user defined representation."
5
6SECTION = "base" 6SECTION = "base"
7LICENSE = "GPLv2+" 7LICENSE = "GPLv2+"
8LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
8 9
9SRC_URI += "file://mcstrans-de-bashify.patch \ 10require selinux_common.inc
10 file://mcstrans-fix-the-init-script.patch \
11"
12 11
13inherit systemd update-rc.d 12inherit systemd update-rc.d
14 13
14SRC_URI += "file://mcstrans-de-bashify.patch \
15 file://mcstrans-fix-the-init-script.patch \
16 "
17
15DEPENDS += "libsepol libselinux libcap" 18DEPENDS += "libsepol libselinux libcap"
16 19
17EXTRA_OEMAKE += "SBINDIR=${base_sbindir} \ 20EXTRA_OEMAKE += "SBINDIR=${base_sbindir} \
@@ -19,6 +22,8 @@ EXTRA_OEMAKE += "SBINDIR=${base_sbindir} \
19 SYSTEMDDIR=${systemd_unitdir} \ 22 SYSTEMDDIR=${systemd_unitdir} \
20 " 23 "
21 24
25S = "${WORKDIR}/git/mcstrans"
26
22do_install_append() { 27do_install_append() {
23 install -d ${D}${sbindir} 28 install -d ${D}${sbindir}
24 install -m 755 utils/untranscon ${D}${sbindir}/ 29 install -m 755 utils/untranscon ${D}${sbindir}/