diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2021-01-07 11:43:40 +0800 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2021-01-14 07:12:08 -0500 |
commit | 31a0e25809a83e5cbcaaf47569f1f64eaa58df52 (patch) | |
tree | 6e8e9e2bdb156a1d1116aef8625406d1f326e968 | |
parent | c197571d7ce3a659a580911ade33a9695e6d61c1 (diff) | |
download | meta-selinux-31a0e25809a83e5cbcaaf47569f1f64eaa58df52.tar.gz |
restorecond: upgrade to 3.1 (20200710)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r-- | recipes-security/selinux/restorecond.inc | 14 | ||||
-rw-r--r-- | recipes-security/selinux/restorecond_3.0.bb | 7 | ||||
-rw-r--r-- | recipes-security/selinux/restorecond_3.1.bb | 7 |
3 files changed, 20 insertions, 8 deletions
diff --git a/recipes-security/selinux/restorecond.inc b/recipes-security/selinux/restorecond.inc index d168303..a5b1635 100644 --- a/recipes-security/selinux/restorecond.inc +++ b/recipes-security/selinux/restorecond.inc | |||
@@ -15,10 +15,22 @@ inherit systemd update-rc.d | |||
15 | 15 | ||
16 | DEPENDS += "libsepol libselinux libpcre dbus-glib glib-2.0 pkgconfig-native" | 16 | DEPENDS += "libsepol libselinux libpcre dbus-glib glib-2.0 pkgconfig-native" |
17 | 17 | ||
18 | EXTRA_OEMAKE += "SYSTEMDSYSTEMUNITDIR=${systemd_system_unitdir} \ | ||
19 | SYSTEMDUSERUNITDIR=${systemd_user_unitdir} \ | ||
20 | " | ||
21 | |||
18 | FILES_${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \ | 22 | FILES_${PN} += "${datadir}/dbus-1/services/org.selinux.Restorecond.service \ |
19 | " | 23 | ${systemd_user_unitdir}/* \ |
24 | " | ||
20 | 25 | ||
21 | SYSTEMD_SERVICE_restorecond = "restorecond.service" | 26 | SYSTEMD_SERVICE_restorecond = "restorecond.service" |
22 | INITSCRIPT_PACKAGES = "restorecond" | 27 | INITSCRIPT_PACKAGES = "restorecond" |
23 | INITSCRIPT_NAME_restorecond = "restorecond" | 28 | INITSCRIPT_NAME_restorecond = "restorecond" |
24 | INITSCRIPT_PARAMS_restorecond = "defaults" | 29 | INITSCRIPT_PARAMS_restorecond = "defaults" |
30 | |||
31 | do_install_append() { | ||
32 | if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'false', 'true', d)}; then | ||
33 | # remove /usr/lib/systemd/user | ||
34 | rm -rf ${D}${nonarch_libdir} | ||
35 | fi | ||
36 | } | ||
diff --git a/recipes-security/selinux/restorecond_3.0.bb b/recipes-security/selinux/restorecond_3.0.bb deleted file mode 100644 index 8c840c9..0000000 --- a/recipes-security/selinux/restorecond_3.0.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | require selinux_20191204.inc | ||
2 | require ${BPN}.inc | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | ||
5 | |||
6 | SRC_URI[md5sum] = "f32edbd8a1f724ef1e4fa70bf9e22685" | ||
7 | SRC_URI[sha256sum] = "32a92c9f4bf48c613f9f467ced58d8c369eec8892239cd44d5d0e139b41926dc" | ||
diff --git a/recipes-security/selinux/restorecond_3.1.bb b/recipes-security/selinux/restorecond_3.1.bb new file mode 100644 index 0000000..d4e0d06 --- /dev/null +++ b/recipes-security/selinux/restorecond_3.1.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | require selinux_20200710.inc | ||
2 | require ${BPN}.inc | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" | ||
5 | |||
6 | SRC_URI[md5sum] = "8daf761739a150a7a29bb491726a6cd9" | ||
7 | SRC_URI[sha256sum] = "82ca45099685a45d718f11f8859963c1ba83d98e510312cbf0b7dc5664c60ad0" | ||