From d09ae7be344b0273bb7e6d2df5d35feacd0f3954 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Wed, 5 Sep 2018 08:18:20 +0800 Subject: restorecond: uprev to 2.8 (20180524) Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald --- recipes-security/selinux/restorecond.inc | 4 ---- recipes-security/selinux/restorecond_2.7.bb | 7 ------- recipes-security/selinux/restorecond_2.8.bb | 7 +++++++ 3 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 recipes-security/selinux/restorecond_2.7.bb create mode 100644 recipes-security/selinux/restorecond_2.8.bb 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" FILES_${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \ " -do_install_prepend() { - export SYSTEMDDIR=${D}/${systemd_unitdir} -} - SYSTEMD_SERVICE_restorecond = "restorecond.service" INITSCRIPT_PACKAGES = "restorecond" INITSCRIPT_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 @@ -include selinux_20170804.inc -include ${BPN}.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" - -SRC_URI[md5sum] = "46f8ad0a37f955ef148d4e19b8cc8b1f" -SRC_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 @@ +include selinux_20180524.inc +include ${BPN}.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" + +SRC_URI[md5sum] = "cfe4e4d6184623fdcb9bc2681e693abb" +SRC_URI[sha256sum] = "323cab1128e5308cd85fea0e5c98e3c8973e1ada0b659f2fce76187e192271bf" -- cgit v1.2.3-54-g00ecf