libcgroup: drop bbappend
PATCH 1/12 libcgroup: drop bbappend
The content of the bbappend is already contained in libcgroup recipe.
--- recipes-core/libcgroup/libcgroup_%.bbappend | 1 - recipes-core/libcgroup/libcgroup_selinux.inc | 10 ---------- 2 files changed, 11 deletions(-) delete mode 100644 recipes-core/libcgroup/libcgroup_%.bbappend delete mode 100644 recipes-core/libcgroup/libcgroup_selinux.inc
recipes-core/libcgroup/libcgroup_%.bbappend deleted +0 -1
@@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)}
recipes-core/libcgroup/libcgroup_selinux.inc deleted +0 -10
@@ -1,10 +0,0 @@ -EXTRA_OECONF:append:class-native = " --enable-pam=no" - -do_install:append() { - test ! -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 || { - mv -f ${D}${base_libdir}/security/pam_cgroup.so.0.0.0 ${D}${base_libdir}/security/pam_cgroup.so - rm -f ${D}${base_libdir}/security/pam_cgroup.so.* - } -} - -BBCLASSEXTEND = "native"
Signature · 1 line
2.25.1
PATCH 2/12 libpcre: drop bbappend
This bbappend was added long time ago and it is useless now.
--- recipes-support/libpcre/libpcre_%.bbappend | 1 - recipes-support/libpcre/libpcre_selinux.inc | 18 ------------------ 2 files changed, 19 deletions(-) delete mode 100644 recipes-support/libpcre/libpcre_%.bbappend delete mode 100644 recipes-support/libpcre/libpcre_selinux.inc
recipes-support/libpcre/libpcre_%.bbappend deleted +0 -1
@@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)}
recipes-support/libpcre/libpcre_selinux.inc deleted +0 -18
@@ -1,18 +0,0 @@ -do_install:append () { - # This code creates libpcre for both the dev machine (SDK native) - # and for cross-compiling (machine arch). For Linux (SDK Linux native - # + all machine arch), symlinks to the .so files have to be created, - # but not for the Windows SDK native. - if [ ${TARGET_OS} != "mingw32" ]; then - if [ ! ${D}${libdir} -ef ${D}${base_libdir} -a -e ${D}${libdir}/libpcre.so ]; then - realsofile=`readlink ${D}${libdir}/libpcre.so` - mkdir -p ${D}/${base_libdir}/ - mv -f ${D}${libdir}/libpcre.so.* ${D}${base_libdir}/ - relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} - ln -sf ${relpath}/${realsofile} ${D}${libdir}/libpcre.so - ln -sf ${relpath}/${realsofile} ${D}${libdir}/libpcre.so.1 - fi - fi -} - -FILES:${PN} += "${base_libdir}/libpcre.so.*"
Signature · 1 line
2.25.1
PATCH 3/12 logrotate: drop bbappend
In reply to Yi ZhaoThe content of the bbappend is already contained in logrotate recipe.
--- recipes-extended/logrotate/logrotate_%.bbappend | 1 - recipes-extended/logrotate/logrotate_selinux.inc | 5 ----- 2 files changed, 6 deletions(-) delete mode 100644 recipes-extended/logrotate/logrotate_%.bbappend delete mode 100644 recipes-extended/logrotate/logrotate_selinux.inc
recipes-extended/logrotate/logrotate_%.bbappend deleted +0 -1
@@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)}
recipes-extended/logrotate/logrotate_selinux.inc deleted +0 -5
@@ -1,5 +0,0 @@ -inherit selinux - -DEPENDS += "${LIBSELINUX}" - -EXTRA_OEMAKE += "${@target_selinux(d, 'WITH_SELINUX=\"yes\"')}"
Signature · 1 line
2.25.1
PATCH 4/12 augeas: drop bbappend
In reply to Yi ZhaoThe PACKAGECONFIG[selinux] is enabled in augeas recipe.
--- conf/layer.conf | 4 +--- .../recipes-support/augeas/augeas_%.bbappend | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend
conf/layer.conf +1 -3
@@ -5,9 +5,7 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILES_DYNAMIC += "openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \ - openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bbappend \ - networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ +BBFILES_DYNAMIC += "networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \ virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bb \ virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bbappend \
dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend deleted +0 -1
@@ -1 +0,0 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)}
Signature · 1 line
2.25.1
PATCH 5/12 lxc: drop bbappend
In reply to Yi ZhaoThe PACKAGECONFIG[selinux] is enabled in lxc recipe.
--- conf/layer.conf | 2 -- .../virtualization-layer/recipes-containers/lxc/lxc_%.bbappend | 1 - 2 files changed, 3 deletions(-) delete mode 100644 dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend
conf/layer.conf +0 -2
@@ -7,8 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILES_DYNAMIC += "networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \ - virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bb \ - virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes*/*/*.bbappend \ meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bb \ meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bbappend \ "
dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend deleted +0 -1
@@ -1 +0,0 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}
Signature · 1 line
2.25.1
PATCH 6/12 python2: drop bbappend
In reply to Yi ZhaoThis bbappend was added long time ago and it is useless now.
--- conf/layer.conf | 2 -- .../python/files/sitecustomize.py | 26 ------------------- .../recipes-devtools/python/python_%.bbappend | 1 - .../python/python_selinux.inc | 5 ---- 4 files changed, 34 deletions(-) delete mode 100644 dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py delete mode 100644 dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend delete mode 100644 dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc
conf/layer.conf +0 -2
@@ -7,8 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILES_DYNAMIC += "networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bb \ networking-layer:${LAYERDIR}/dynamic-layers/networking-layer/*/*/*.bbappend \ - meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bb \ - meta-python2:${LAYERDIR}/dynamic-layers/python2-layer/recipes*/*/*.bbappend \ " BBFILE_COLLECTIONS += "selinux"
dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py deleted +0 -26
@@ -1,26 +0,0 @@ -# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <[email protected]> -# GPLv2 or later -# Version: 20081123 -# Features: -# * set proper default encoding -# Features removed for SELinux: -# * enable readline completion in the interactive interpreter -# * load command line history on startup -# * save command line history on exit - -import os - -def __enableDefaultEncoding(): - import sys - try: - sys.setdefaultencoding( "utf8" ) - except LookupError: - pass - -import sys -try: - import rlcompleter, readline -except ImportError: - pass -else: - __enableDefaultEncoding()
dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend deleted +0 -1
@@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)}
dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc deleted +0 -5
@@ -1,5 +0,0 @@ -# If selinux enabled, disable handlers to rw command history file -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -inherit selinux -
Signature · 1 line
2.25.1
PATCH 7/12 classes: drop redundant classes
In reply to Yi ZhaoThere are some redundant classes: enable-selinux.bbclass, with-selinux.bbclass, meson-enable-selinux.bbclass, meson-selinux.bbclass, enable-audit.bbclass, with-audit.bbclass. These classes only add PACKAGEOCNFIG[selinux]/[audit] to recipes. But currently most recipes have added PACKAGECONFIG[selinux]/[audit] in their bb files. We don't need these anymore. Only keep enable-selinux.class and enable-audit.class to append PACKAGECONFIG[selinux]/[audit] for recipes.
---
classes/enable-selinux.bbclass | 3 +--
classes/meson-enable-selinux.bbclass | 4 ----
classes/meson-selinux.bbclass | 4 ----
classes/with-audit.bbclass | 5 -----
classes/with-selinux.bbclass | 4 ----
recipes-connectivity/iproute2/iproute2_%.bbappend | 3 ++-
recipes-connectivity/openssh/openssh_selinux.inc | 9 +++------
recipes-core/coreutils/coreutils_%.bbappend | 4 ++--
recipes-core/dbus/dbus_%.bbappend | 2 +-
recipes-core/eudev/eudev_selinux.inc | 1 +
recipes-core/glib-2.0/glib-2.0_%.bbappend | 2 +-
recipes-core/systemd/systemd_selinux.inc | 2 +-
recipes-core/util-linux/util-linux_%.bbappend | 3 ++-
recipes-devtools/rpm/rpm_selinux.inc | 4 ++--
recipes-extended/at/at_%.bbappend | 2 +-
recipes-extended/cronie/cronie_%.bbappend | 4 ++--
recipes-extended/findutils/findutils_%.bbappend | 3 ++-
recipes-extended/pam/libpam_selinux.inc | 1 +
recipes-extended/psmisc/psmisc_%.bbappend | 1 +
recipes-extended/sed/sed_4.%.bbappend | 2 +-
recipes-extended/shadow/shadow_selinux.inc | 5 +----
recipes-extended/sudo/sudo_%.bbappend | 5 ++++-
recipes-extended/tar/tar_selinux.inc | 4 ++--
recipes-graphics/mesa/mesa_%.bbappend | 4 ++--
recipes-graphics/xcb/libxcb_selinux.inc | 6 ------
recipes-graphics/{xcb => xorg-lib}/libxcb_%.bbappend | 0
recipes-graphics/xorg-lib/libxcb_selinux.inc | 5 +++++
recipes-kernel/perf/perf_selinux.inc | 2 +-
recipes-support/attr/attr_selinux.inc | 2 --
recipes-support/gnupg/gnupg_selinux.inc | 3 +--
30 files changed, 40 insertions(+), 59 deletions(-)
delete mode 100644 classes/meson-enable-selinux.bbclass
delete mode 100644 classes/meson-selinux.bbclass
delete mode 100644 classes/with-audit.bbclass
delete mode 100644 classes/with-selinux.bbclass
delete mode 100644 recipes-graphics/xcb/libxcb_selinux.inc
rename recipes-graphics/{xcb => xorg-lib}/libxcb_%.bbappend (100%)
create mode 100644 recipes-graphics/xorg-lib/libxcb_selinux.incclasses/enable-selinux.bbclass +1 -2
@@ -1,4 +1,3 @@ inherit selinux -PACKAGECONFIG:append = " ${@target_selinux(d)}" -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux," +PACKAGECONFIG:append = " ${@target_selinux(d, 'selinux')}"
classes/meson-enable-selinux.bbclass deleted +0 -4
@@ -1,4 +0,0 @@ -inherit selinux - -PACKAGECONFIG:append = " ${@target_selinux(d)}" -PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux,"
classes/meson-selinux.bbclass deleted +0 -4
@@ -1,4 +0,0 @@ -inherit selinux - -PACKAGECONFIG:append = " ${@target_selinux(d)}" -PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,"
classes/with-audit.bbclass deleted +0 -5
@@ -1,5 +0,0 @@ -# There is still no audit DISTRO_FEATURE, so enable audit when selinux feature enabled. -inherit selinux - -PACKAGECONFIG:append = " ${@target_selinux(d, 'audit')}" -PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit,"
classes/with-selinux.bbclass deleted +0 -4
@@ -1,4 +0,0 @@ -inherit selinux - -PACKAGECONFIG:append = " ${@target_selinux(d)}" -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux,"
recipes-connectivity/iproute2/iproute2_%.bbappend +2 -1
@@ -1 +1,2 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} +PACKAGECONFIG[selinux] = ",,libselinux"
recipes-connectivity/openssh/openssh_selinux.inc +3 -6
@@ -1,9 +1,6 @@ -inherit with-selinux +inherit enable-selinux enable-audit FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -# There is no distro feature just for audit. -PACKAGECONFIG:append = " audit" - -PACKAGECONFIG[audit] = "--with-audit=linux,--without-audit,audit," - +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" +PACKAGECONFIG[audit] = "--with-audit=linux,--without-audit,audit"
recipes-core/coreutils/coreutils_%.bbappend +2 -2
@@ -1,2 +1,2 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} - +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
recipes-core/dbus/dbus_%.bbappend +1 -1
@@ -1,2 +1,2 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux enable-audit', '', d)}
recipes-core/eudev/eudev_selinux.inc +1 -0
@@ -1,3 +1,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" inherit enable-selinux +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
recipes-core/glib-2.0/glib-2.0_%.bbappend +1 -1
@@ -1 +1 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-enable-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}
recipes-core/systemd/systemd_selinux.inc +1 -1
@@ -1,4 +1,4 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-audit', '', d)} +inherit enable-selinux enable-audit do_install:append() { if ${@bb.utils.contains('PACKAGECONFIG', 'backlight', 'true', 'false', d)}; then
recipes-core/util-linux/util-linux_%.bbappend +2 -1
@@ -1 +1,2 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
recipes-devtools/rpm/rpm_selinux.inc +2 -2
@@ -1,2 +1,2 @@ -inherit with-selinux -PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libsemanage," +inherit enable-selinux +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
recipes-extended/at/at_%.bbappend +1 -1
@@ -1 +1 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}
recipes-extended/cronie/cronie_%.bbappend +2 -2
@@ -1,2 +1,2 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-audit', '', d)} -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux enable-audit', '', d)} +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
recipes-extended/findutils/findutils_%.bbappend +2 -1
@@ -1 +1,2 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
recipes-extended/pam/libpam_selinux.inc +1 -0
@@ -1,3 +1,4 @@ inherit enable-selinux +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" RDEPENDS:${PN}-runtime += "${@target_selinux(d, 'pam-plugin-selinux')}"
recipes-extended/psmisc/psmisc_%.bbappend +1 -0
@@ -1 +1,2 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
recipes-extended/sed/sed_4.%.bbappend +1 -1
@@ -1 +1 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)}
recipes-extended/shadow/shadow_selinux.inc +1 -4
@@ -1,6 +1,3 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -inherit with-selinux with-audit - -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux libsemanage," - +inherit enable-selinux enable-audit
recipes-extended/sudo/sudo_%.bbappend +4 -1
@@ -1 +1,4 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux enable-audit', '', d)} + +PACKAGECONFIG[audit] = "--with-linux-audit,--without-linux-audit,audit" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
recipes-extended/tar/tar_selinux.inc +2 -2
@@ -1,3 +1,3 @@ -inherit with-selinux +inherit enable-selinux -PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'acl', ' acl', '', d)}" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
recipes-graphics/mesa/mesa_%.bbappend +2 -2
@@ -1,2 +1,2 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-selinux', '', d)} - +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} +PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux"
recipes-graphics/xcb/libxcb_selinux.inc deleted +0 -6
@@ -1,6 +0,0 @@ -inherit enable-selinux -# libxcb-xselinux will not build with libselinux, so remove the depend -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,," - -PACKAGES += "${PN}-xselinux" -FILES:${PN}-xselinux += "${libdir}/libxcb-xselinux.so.*"
recipes-graphics/xorg-lib/libxcb_%.bbappend renamed from recipes-graphics/xcb/libxcb_%.bbappend +0 -0
recipes-graphics/xorg-lib/libxcb_selinux.inc new file +5 -0
@@ -0,0 +1,5 @@ +inherit enable-selinux +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" + +PACKAGES += "${PN}-xselinux" +FILES:${PN}-xselinux += "${libdir}/libxcb-xselinux.so.*"
recipes-kernel/perf/perf_selinux.inc +1 -1
@@ -1 +1 @@ -DEPENDS .= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', ' audit', '', d)}" +inherit enable-audit
recipes-support/attr/attr_selinux.inc +0 -2
@@ -1,5 +1,3 @@ -inherit selinux - FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://fix-ptest-failures-when-selinux-enabled.patch"
recipes-support/gnupg/gnupg_selinux.inc +1 -2
@@ -1,3 +1,2 @@ inherit enable-selinux -# gnupg will not build with libselinux, so remove the depend -PACKAGECONFIG[selinux] = "--enable-selinux-support,--disable-selinux-support,," +PACKAGECONFIG[selinux] = "--enable-selinux-support,--disable-selinux-support,libselinux"
Signature · 1 line
2.25.1
PATCH 8/12 sysklogd: sync the initscript to latest oe-core version
In reply to Yi ZhaoThe sysklogd has been updated to 2.2.3 in oe-core. Update the initscript to adapt it.
--- recipes-extended/sysklogd/files/sysklogd | 3 +++ 1 file changed, 3 insertions(+)
recipes-extended/sysklogd/files/sysklogd +3 -0
@@ -22,6 +22,9 @@ binpath_syslogd=/usr/sbin/syslogd test -x $binpath || exit 0 +# run secure by default +SYSLOGD="-ss" + test ! -r /etc/default/syslogd || . /etc/default/syslogd create_xconsole()
Signature · 1 line
2.25.1
PATCH 9/12 net-tools: fix selinux build
In reply to Yi ZhaoSimply adding EXTRA_OEMAKE doesn't work for selinux build. We need to modify config files in do_configure.
--- recipes-extended/net-tools/net-tools_selinux.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
recipes-extended/net-tools/net-tools_selinux.inc +8 -3
@@ -1,5 +1,10 @@ -inherit selinux +inherit enable-selinux -DEPENDS += "${LIBSELINUX}" +PACKAGECONFIG[selinux] = ",,libselinux" -EXTRA_OEMAKE += "${@target_selinux(d, 'HAVE_SELINUX=1', 'HAVE_SELINUX=0')}" +do_configure:append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'selinux', 'true', 'false', d)} ; then + echo "#define HAVE_SELINUX 1" >> ${S}/config.h + echo "HAVE_SELINUX=1" >> ${S}/config.make + fi +}
Signature · 1 line
2.25.1
PATCH 10/12 setools: disable native/nativesdk build
In reply to Yi ZhaoDisable native/nativesdk build as they don't work for a long time.
--- recipes-security/setools/setools_4.4.0.bb | 6 ------ 1 file changed, 6 deletions(-)
recipes-security/setools/setools_4.4.0.bb +0 -6
@@ -8,8 +8,6 @@ SETools." SECTION = "base" LICENSE = "GPLv2 & LGPLv2.1" -BBCLASSEXTEND = "native nativesdk " - S = "${WORKDIR}/git" SRC_URI = "git://github.com/SELinuxProject/${BPN}.git;branch=4.4 \ file://setools4-fixes-for-cross-compiling.patch \
@@ -23,13 +21,9 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=83a5eb6974c11f30785e90d0eeccf40c \ DEPENDS += "bison-native flex-native swig-native python3 python3-cython-native libsepol libselinux" -DEPENDS:class-native += "libselinux python3-setuptools python3-cython python3-networkx" - RDEPENDS:${PN} += "python3-networkx python3-decorator python3-setuptools \ python3-logging python3-json libselinux-python" -RDEPENDS:${PN}:class-native = "" - RPROVIDES:${PN} += "${PN}-console" inherit setuptools3
Signature · 1 line
2.25.1
PATCH 11/12 python3-decorator: drop bbappend
In reply to Yi ZhaoIt is useless as setools-native build is disabled.
--- recipes-devtools/python/python3-decorator_%.bbappend | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 recipes-devtools/python/python3-decorator_%.bbappend
recipes-devtools/python/python3-decorator_%.bbappend deleted +0 -2
@@ -1,2 +0,0 @@ -BBCLASSEXTEND = "native nativesdk" -
Signature · 1 line
2.25.1
PATCH 12/12 python3-networkx: drop bbappend
In reply to Yi ZhaoIt is useless as setools-native build is disabled.
--- recipes-devtools/python/python3-networkx_%.bbappend | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 recipes-devtools/python/python3-networkx_%.bbappend
recipes-devtools/python/python3-networkx_%.bbappend deleted +0 -2
@@ -1,2 +0,0 @@ -BBCLASSEXTEND = "native nativesdk" -
Signature · 1 line
2.25.1