summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-09-05 08:18:20 +0800
committerJoe MacDonald <joe_macdonald@mentor.com>2018-09-07 16:13:57 -0400
commitd09ae7be344b0273bb7e6d2df5d35feacd0f3954 (patch)
treef3302d0a8882123a4e97144047f09baebb2b4a77
parentc55c0aca382b2df31125af67cb2e2eb8e5eebd11 (diff)
downloadmeta-selinux-d09ae7be344b0273bb7e6d2df5d35feacd0f3954.tar.gz
restorecond: uprev to 2.8 (20180524)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-security/selinux/restorecond.inc4
-rw-r--r--recipes-security/selinux/restorecond_2.7.bb7
-rw-r--r--recipes-security/selinux/restorecond_2.8.bb7
3 files changed, 7 insertions, 11 deletions
diff --git a/recipes-security/selinux/restorecond.inc b/recipes-security/selinux/restorecond.inc
index 6f12d23..d168303 100644
--- a/recipes-security/selinux/restorecond.inc
+++ b/recipes-security/selinux/restorecond.inc
@@ -18,10 +18,6 @@ DEPENDS += "libsepol libselinux libpcre dbus-glib glib-2.0 pkgconfig-native"
18FILES_${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \ 18FILES_${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \
19" 19"
20 20
21do_install_prepend() {
22 export SYSTEMDDIR=${D}/${systemd_unitdir}
23}
24
25SYSTEMD_SERVICE_restorecond = "restorecond.service" 21SYSTEMD_SERVICE_restorecond = "restorecond.service"
26INITSCRIPT_PACKAGES = "restorecond" 22INITSCRIPT_PACKAGES = "restorecond"
27INITSCRIPT_NAME_restorecond = "restorecond" 23INITSCRIPT_NAME_restorecond = "restorecond"
diff --git a/recipes-security/selinux/restorecond_2.7.bb b/recipes-security/selinux/restorecond_2.7.bb
deleted file mode 100644
index 1f9a70c..0000000
--- a/recipes-security/selinux/restorecond_2.7.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1include selinux_20170804.inc
2include ${BPN}.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
5
6SRC_URI[md5sum] = "46f8ad0a37f955ef148d4e19b8cc8b1f"
7SRC_URI[sha256sum] = "cb8e0a8d706cb2c1f105125f3514dffffefcbcfb49199183a7f91ab0bdf1f24d"
diff --git a/recipes-security/selinux/restorecond_2.8.bb b/recipes-security/selinux/restorecond_2.8.bb
new file mode 100644
index 0000000..4a83a23
--- /dev/null
+++ b/recipes-security/selinux/restorecond_2.8.bb
@@ -0,0 +1,7 @@
1include selinux_20180524.inc
2include ${BPN}.inc
3
4LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
5
6SRC_URI[md5sum] = "cfe4e4d6184623fdcb9bc2681e693abb"
7SRC_URI[sha256sum] = "323cab1128e5308cd85fea0e5c98e3c8973e1ada0b659f2fce76187e192271bf"