[meta-gplv2] [PATCH 1/2] layer.conf: Set elfutils version correctly
Richard Purdie
We need to set PREFERRED_VERSION for elfutils or the wrong one will be used.
Signed-off-by: Richard Purdie <richard.purdie@...> --- conf/layer.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/layer.conf b/conf/layer.conf index 3abe6b5..b0915d4 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -18,5 +18,6 @@ LAYERSERIES_COMPAT_gplv2 = "honister" LICENSE_PATH += "${LAYERDIR}/licenses" +PREFERRED_VERSION_elfutils = "${@['', '0.148']['GPLV3' in (d.getVar('INCOMPATIBLE_LICENSE') or '').upper()]}" PREFERRED_VERSION_shared-mime-info = "${@['', '1.10']['GPLV3' in (d.getVar('INCOMPATIBLE_LICENSE') or '').upper()]}" PREFERRED_VERSION_shared-mime-info-native = "${@['', '1.10']['GPLV3' in (d.getVar('INCOMPATIBLE_LICENSE') or '').upper()]}" -- 2.32.0 |
|
[meta-gplv2] [PATCH 2/2] elfutils: Work around reproducibility issue
Richard Purdie
The version in this layer doesn't reproduce, so disable the warnings/errors
and allow it to build. Signed-off-by: Richard Purdie <richard.purdie@...> --- recipes-devtools/elfutils/elfutils_0.148.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-devtools/elfutils/elfutils_0.148.bb b/recipes-devtools/elfutils/elfutils_0.148.bb index 848e2cf..97d88a2 100644 --- a/recipes-devtools/elfutils/elfutils_0.148.bb +++ b/recipes-devtools/elfutils/elfutils_0.148.bb @@ -66,6 +66,9 @@ CFLAGS += "-Wno-error=format-truncation=" # but 0.182 has different license, so to be safe don't backport the fix, just ignore the issue CFLAGS += "-Wno-error=stringop-overflow=" +# There are fixes in later versions for this but the old version won't be reproducible +TARGET_CC_ARCH:remove:class-target = " -Wdate-time" + EXTRA_OECONF = "--program-prefix=eu- --without-lzma" EXTRA_OECONF:append:class-native = " --without-bzlib" -- 2.32.0 |
|
Yocto Autobuilder: Latency Monitor and AB-INT - Meeting notes: Aug 19, 2021
YP AB Intermittent failures meeting
=================================== Aug 19, 2021, 9 AM ET https://windriver.zoom.us/j/3696693975 Attendees: Tony, Richard, Trevor, Randy, Alex, Saul Summary: ======== ptest results continue to improve but there's still room for even more improvement. The make/ninja load average limit is in but it's not clear if it's effective yet and it breaks dunfell. Trevor investigating. There's not much new this week, I've commented on a few existing activities below and added "Aug 19" in most cases. If anyone wants to help, we could use more eyes on the logs, particularly the summary logs and understanding iostat # when the dd test times out. Plans for the week: =================== Richard: lttng-tools and more! Alex: SWAT plans. September email, training. Sakib: hook more responsive load average in to latency test. (v3) Trevor: patch to set PARALLEL_MAKE : -l 50 -> dunfell, gatesgarth, hardknott (Aug 5 - it's a priority) Investigate dunfell which failed with this change. - data on WR AB load average. Tony: go back to school. Thanks for all your work Tony! Saul: Randy: Gather more iostat data, graph it! Meeting Notes: ============== 1. job server - ninja could be patched with make's more responsive algorithm next or is this good enough? - Richard suggested that we extract make's code for measuring the load average to a separate binary and run it in the periodic io latency test. Also can we translate it to python? - Trevor is working on this and had some problems so next week. (Aug 19 - Trevor is back from vaction so maybe next week.) - Trevor to see if the load average change really did reduce load on WR build systems. (Aug 19) 2. AB status Trevor is learning about buildbot and working on a scheduling bug (CentOS worker?) bitbake layer setup tool should allow multiple backends: eg: kas, a y-a-helper. ptest cases are improving, we may be close to done! Let's wait a week to see how things go. (July29, Aug 5, Aug 19, we're not done...) - lttng-tools ptest is failing. RP is working on it with upstream. The timeout (done on Aug 5) increase hasn't helped. 3. Sakib's improvements to the logging are merged. Sakib generated a summary of all high latency 'top' logs from ~July 23->July 29 by just running his summary script on the merged raw top logs. More analysis required.... Still relevant parts of Previous Meeting Notes: ======================= 4. bitbake server timeout ( no change july 29, Aug 19) "Timeout while waiting for a reply from the bitbake server (60s)" 5. io stalls (no update: July 29) Richard said that it would make sense to write an ftrace utility / script to monitor io latency and we could install it with sudo Ch^W mentioned ftrace on IRC. Sakib and Randy will work on that but not for a week or two or longer! (Aug 19). Randy collected iostat data on 3 build server: https://postimg.cc/gallery/8cN6LYB We agreed that having -ty-2 be ~ 100 utilization for many hours in a row is not acceptable and that a threshold of ~ 10 minutes at 100% utilization may be a reasonable limt. I need to figure out if I can get data on the fraction of IO done per IO clas since we do use ionice to do clean-up and other activities. ../Randy |
|
Minutes: Yocto Project Weekly Triage Meeting 8/19/2021
Trevor Gamblin
Wiki: https://wiki.yoctoproject.org/wiki/Bug_Triage Attendees: Alex, Armin, Bruce, Diane, Joshua, Randy,
Richard, Ross, Saul, Stephen, Steve, Tim, Tony, TrevorG ARs: Notes:
- (carried over) Steve
encountered build failures such as the one in https://errors.yoctoproject.org/Errors/Details/593109/
when attempting to run dunfell builds with the PARALLEL_MAKE load
averaging added. WR is testing/investigating on internal
Autobuilder instance - Trevor is still planning on looking into
this!
Medium+ 3.4 Unassigned Enhancements/Bugs: 76 (Last week
80) AB-INT Bugs: 46
(No change)
|
|
Problem with building Go recipe for "Delve" project
Christofer Dutz <christofer.dutz@...>
Hi all,  after having sorted out all of my programatic-configuration issues I’m currently having an issue where I don’t quite know what I’m doing wrong.  We use a too called „Delve“ to debug applications on yocto remotely. This is an application built in Go. https://github.com/go-delve/delve  However as soon as I try to build the layer I built for it, it fails.  The reason is that the repo contains one directory that only has test-classes and not a single „build“-class.  As the Go tooling seems to execute:  This also lists up that package and as soon as the yocto go tooling tries to build it, the build fails with:  | go build github.com/go-delve/delve/service/test: no non-test Go files in /home/cdutz/Projects/yocto/dunfell/build/tmp/work/aarch64-fslc-linux/delve/1.7.1-r0/build/src/github.com/go-delve/delve/service/test  A simple workaround is to simply create an empty go file with only a package in that directory, however this sort of feels like a workaround.  Is this possibly a bug in the Yocto Go tooling or am I doing someting stupid?  Chris  |
|
Re: [meta-rockchip][PATCH 2/2] linux-yocto_5.4: Drop bbappend
Trevor Woerner
On Wed, Aug 18, 2021 at 2:16 PM Khem Raj <raj.khem@...> wrote: 5.4 recipe has been dropped from oe-core added to meta-rockchip master thanks! |
|
Re: [meta-rockchip][PATCH 1/2] machines: Adjust for new location of tune files in core
Trevor Woerner
On Wed, Aug 18, 2021 at 2:16 PM Khem Raj <raj.khem@...> wrote: Signed-off-by: Khem Raj <raj.khem@...> added to meta-rockchip master thanks! |
|
YOCTO Zeus: Qt remote objects compiler repc missing from sdk toolchain
#toolchain
#sdk
#qtremoteobjects
#repc
anthony.marchand@...
Hello,
I permit myself to contact you because I got a weird issue in my sdk toolchain. So, as I need "qtremoteobjects" in my embedded linux image, I add it like this: ---------------------------------------------------- QT = " \
qtbase \ qtbase-dev \ qtbase-plugins \ qtbase-mkspecs \ qtbase-tools \ cinematicexperience \ qtgraphicaleffects \ qtquickcontrols \ qtquickcontrols2 \ qtquickcontrols-qmlplugins \ qtsvg \ qtserialport \ qtserialbus \ qtremoteobjects \ qtremoteobjects-dev \ qtmultimedia \ qtwebsockets \ " PACKAGECONFIG_pn-qtvirtualkeyboard = "lang-fr_FR"
PACKAGECONFIG_DEFAULT_pn-qtbase = "widgets libs freetype tslib gles2 eglfs" Â
TOUCHSCREEN = " \
tslib tslib-conf tslib-tests tslib-calibrate \ " Â
IMAGE_INSTALL += " \
bash \ sudo \ environment \ opkg \ os-release \ ${QT} \ " Â
#IMAGE_INSTALL_append_mx6 = " ${MX6TOOL}"
Â
IMAGE_FEATURES += " \
ssh-server-openssh \ " Â
export IMAGE_BASENAME = "myimage"
---------------------------------------------------- So it's work fine when I flash it in my card, but after building SDK, "repc" is missing in /sysroots/cortexa9t2hf-neon-poky-linux-gnueabi/usr/bin . More precisly, it is present, but located in: /sysroots/cortexa9t2hf-neon-poky-linux-gnueabi/usr/bin/.debug/repc And when I compile my app, I got the following error: Â
Pre build error --> make[2]: /opt/poky/MY_SDK/sysroots/x86_64-pokysdk-linux/usr/bin/repc: Command not found
because "make" seems to try to find repc in "/usr/bin/repc" rather than "/usr/bin/.debug/repc" . But when I link or move repc from "/usr/bin/.debug/repc" to  "/usr/bin/repc", it gives me a "segment fault error" when I try to make my app. I saw a similar issue on the web but it does not resolve my problem: https://e2e.ti.com/support/processors-group/processors/f/processors-forum/902941/processor-sdk-am437x-qt-remote-objects-compiler-repc-missing-from-sdk-toolchain
Does anyone already encontered this problem with qtremote control? Do you have got any idea about what is going wrong?
Â
By advance, thanks for all, best reguards. Â
|
|
Does PACKAGE_EXCLUDE work for Hardknott?
JH
Hi,
I set up PACKAGE_EXCLUDE = "python3 python3-dbus", but it still build pyhon3 and python3-dbus, what could I be wrong here? Thank you. Kind regards, - jh |
|
[meta-security][PATCH 1/2] image-with-hardened-binaries: add class
Maximilian Blenk
Hi Armin,
toggle quoted message
Show quoted text
sorry for the confusion, this is a resend (had some issues submitting the patch via mail and in the end it seems it ended up on the mailing list twice) (and happened again, so i guess you will also get this mail twice :-D Hope this is fixed now...) BR Max On 18.08.21 23:44, akuster808 wrote:
Hello Max, |
|
[meta-selinux][PATCH 12/12] python3-networkx: drop bbappend
Yi Zhao
It is useless as setools-native build is disabled.
Signed-off-by: Yi Zhao <yi.zhao@...> --- recipes-devtools/python/python3-networkx_%.bbappend | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 recipes-devtools/python/python3-networkx_%.bbappend diff --git a/recipes-devtools/python/python3-networkx_%.bbappend b/recipes-devtools/python/python3-networkx_%.bbappend deleted file mode 100644 index 3bc71e0..0000000 --- a/recipes-devtools/python/python3-networkx_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -BBCLASSEXTEND = "native nativesdk" - -- 2.25.1 |
|
[meta-selinux][PATCH 11/12] python3-decorator: drop bbappend
Yi Zhao
It is useless as setools-native build is disabled.
Signed-off-by: Yi Zhao <yi.zhao@...> --- recipes-devtools/python/python3-decorator_%.bbappend | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 recipes-devtools/python/python3-decorator_%.bbappend diff --git a/recipes-devtools/python/python3-decorator_%.bbappend b/recipes-devtools/python/python3-decorator_%.bbappend deleted file mode 100644 index 3bc71e0..0000000 --- a/recipes-devtools/python/python3-decorator_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -BBCLASSEXTEND = "native nativesdk" - -- 2.25.1 |
|
[meta-selinux][PATCH 10/12] setools: disable native/nativesdk build
Yi Zhao
Disable native/nativesdk build as they don't work for a long time.
Signed-off-by: Yi Zhao <yi.zhao@...> --- recipes-security/setools/setools_4.4.0.bb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipes-security/setools/setools_4.4.0.bb b/recipes-security/setools/setools_4.4.0.bb index 528e78f..2b10993 100644 --- a/recipes-security/setools/setools_4.4.0.bb +++ b/recipes-security/setools/setools_4.4.0.bb @@ -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 -- 2.25.1 |
|
[meta-selinux][PATCH 09/12] net-tools: fix selinux build
Yi Zhao
Simply adding EXTRA_OEMAKE doesn't work for selinux build. We need to
modify config files in do_configure. Signed-off-by: Yi Zhao <yi.zhao@...> --- recipes-extended/net-tools/net-tools_selinux.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/recipes-extended/net-tools/net-tools_selinux.inc b/recipes-extended/net-tools/net-tools_selinux.inc index 1bcf7be..6454205 100644 --- a/recipes-extended/net-tools/net-tools_selinux.inc +++ b/recipes-extended/net-tools/net-tools_selinux.inc @@ -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 +} -- 2.25.1 |
|
[meta-selinux][PATCH 08/12] sysklogd: sync the initscript to latest oe-core version
Yi Zhao
The sysklogd has been updated to 2.2.3 in oe-core. Update the initscript
to adapt it. Signed-off-by: Yi Zhao <yi.zhao@...> --- recipes-extended/sysklogd/files/sysklogd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-extended/sysklogd/files/sysklogd b/recipes-extended/sysklogd/files/sysklogd index 7943b1d..2a7eae4 100644 --- a/recipes-extended/sysklogd/files/sysklogd +++ b/recipes-extended/sysklogd/files/sysklogd @@ -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() -- 2.25.1 |
|
[meta-selinux][PATCH 07/12] classes: drop redundant classes
Yi Zhao
There 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. Signed-off-by: Yi Zhao <yi.zhao@...> --- 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.inc diff --git a/classes/enable-selinux.bbclass b/classes/enable-selinux.bbclass index c8af97e..3dc61d6 100644 --- a/classes/enable-selinux.bbclass +++ b/classes/enable-selinux.bbclass @@ -1,4 +1,3 @@ inherit selinux -PACKAGECONFIG:append = " ${@target_selinux(d)}" -PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux," +PACKAGECONFIG:append = " ${@target_selinux(d, 'selinux')}" diff --git a/classes/meson-enable-selinux.bbclass b/classes/meson-enable-selinux.bbclass deleted file mode 100644 index b5b8cb7..0000000 --- a/classes/meson-enable-selinux.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -inherit selinux - -PACKAGECONFIG:append = " ${@target_selinux(d)}" -PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux," diff --git a/classes/meson-selinux.bbclass b/classes/meson-selinux.bbclass deleted file mode 100644 index 337ffca..0000000 --- a/classes/meson-selinux.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -inherit selinux - -PACKAGECONFIG:append = " ${@target_selinux(d)}" -PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux," diff --git a/classes/with-audit.bbclass b/classes/with-audit.bbclass deleted file mode 100644 index a99bf71..0000000 --- a/classes/with-audit.bbclass +++ /dev/null @@ -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," diff --git a/classes/with-selinux.bbclass b/classes/with-selinux.bbclass deleted file mode 100644 index 37b9e13..0000000 --- a/classes/with-selinux.bbclass +++ /dev/null @@ -1,4 +0,0 @@ -inherit selinux - -PACKAGECONFIG:append = " ${@target_selinux(d)}" -PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," diff --git a/recipes-connectivity/iproute2/iproute2_%.bbappend b/recipes-connectivity/iproute2/iproute2_%.bbappend index b01ad25..8cb2a5b 100644 --- a/recipes-connectivity/iproute2/iproute2_%.bbappend +++ b/recipes-connectivity/iproute2/iproute2_%.bbappend @@ -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" diff --git a/recipes-connectivity/openssh/openssh_selinux.inc b/recipes-connectivity/openssh/openssh_selinux.inc index 20937c2..07c25c5 100644 --- a/recipes-connectivity/openssh/openssh_selinux.inc +++ b/recipes-connectivity/openssh/openssh_selinux.inc @@ -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" diff --git a/recipes-core/coreutils/coreutils_%.bbappend b/recipes-core/coreutils/coreutils_%.bbappend index 7b9a2dc..138c23a 100644 --- a/recipes-core/coreutils/coreutils_%.bbappend +++ b/recipes-core/coreutils/coreutils_%.bbappend @@ -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" diff --git a/recipes-core/dbus/dbus_%.bbappend b/recipes-core/dbus/dbus_%.bbappend index ee221e2..fe51e54 100644 --- a/recipes-core/dbus/dbus_%.bbappend +++ b/recipes-core/dbus/dbus_%.bbappend @@ -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)} diff --git a/recipes-core/eudev/eudev_selinux.inc b/recipes-core/eudev/eudev_selinux.inc index 94950f5..976cb23 100644 --- a/recipes-core/eudev/eudev_selinux.inc +++ b/recipes-core/eudev/eudev_selinux.inc @@ -1,3 +1,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" inherit enable-selinux +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" diff --git a/recipes-core/glib-2.0/glib-2.0_%.bbappend b/recipes-core/glib-2.0/glib-2.0_%.bbappend index 39a0a3a..74e22b3 100644 --- a/recipes-core/glib-2.0/glib-2.0_%.bbappend +++ b/recipes-core/glib-2.0/glib-2.0_%.bbappend @@ -1 +1 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'meson-enable-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} diff --git a/recipes-core/systemd/systemd_selinux.inc b/recipes-core/systemd/systemd_selinux.inc index 8136ea8..7d466ee 100644 --- a/recipes-core/systemd/systemd_selinux.inc +++ b/recipes-core/systemd/systemd_selinux.inc @@ -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 diff --git a/recipes-core/util-linux/util-linux_%.bbappend b/recipes-core/util-linux/util-linux_%.bbappend index b01ad25..138c23a 100644 --- a/recipes-core/util-linux/util-linux_%.bbappend +++ b/recipes-core/util-linux/util-linux_%.bbappend @@ -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" diff --git a/recipes-devtools/rpm/rpm_selinux.inc b/recipes-devtools/rpm/rpm_selinux.inc index 983dda7..b6e0e7c 100644 --- a/recipes-devtools/rpm/rpm_selinux.inc +++ b/recipes-devtools/rpm/rpm_selinux.inc @@ -1,2 +1,2 @@ -inherit with-selinux -PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libsemanage," +inherit enable-selinux +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" diff --git a/recipes-extended/at/at_%.bbappend b/recipes-extended/at/at_%.bbappend index b01ad25..74e22b3 100644 --- a/recipes-extended/at/at_%.bbappend +++ b/recipes-extended/at/at_%.bbappend @@ -1 +1 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} diff --git a/recipes-extended/cronie/cronie_%.bbappend b/recipes-extended/cronie/cronie_%.bbappend index cfa56ca..2da759e 100644 --- a/recipes-extended/cronie/cronie_%.bbappend +++ b/recipes-extended/cronie/cronie_%.bbappend @@ -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" diff --git a/recipes-extended/findutils/findutils_%.bbappend b/recipes-extended/findutils/findutils_%.bbappend index b01ad25..138c23a 100644 --- a/recipes-extended/findutils/findutils_%.bbappend +++ b/recipes-extended/findutils/findutils_%.bbappend @@ -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" diff --git a/recipes-extended/pam/libpam_selinux.inc b/recipes-extended/pam/libpam_selinux.inc index bee1f3e..2f8b945 100644 --- a/recipes-extended/pam/libpam_selinux.inc +++ b/recipes-extended/pam/libpam_selinux.inc @@ -1,3 +1,4 @@ inherit enable-selinux +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" RDEPENDS:${PN}-runtime += "${@target_selinux(d, 'pam-plugin-selinux')}" diff --git a/recipes-extended/psmisc/psmisc_%.bbappend b/recipes-extended/psmisc/psmisc_%.bbappend index 74e22b3..d02ee09 100644 --- a/recipes-extended/psmisc/psmisc_%.bbappend +++ b/recipes-extended/psmisc/psmisc_%.bbappend @@ -1 +1,2 @@ inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" diff --git a/recipes-extended/sed/sed_4.%.bbappend b/recipes-extended/sed/sed_4.%.bbappend index b01ad25..74e22b3 100644 --- a/recipes-extended/sed/sed_4.%.bbappend +++ b/recipes-extended/sed/sed_4.%.bbappend @@ -1 +1 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} diff --git a/recipes-extended/shadow/shadow_selinux.inc b/recipes-extended/shadow/shadow_selinux.inc index 3c8daea..e719ebc 100644 --- a/recipes-extended/shadow/shadow_selinux.inc +++ b/recipes-extended/shadow/shadow_selinux.inc @@ -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 diff --git a/recipes-extended/sudo/sudo_%.bbappend b/recipes-extended/sudo/sudo_%.bbappend index b01ad25..2e35ec5 100644 --- a/recipes-extended/sudo/sudo_%.bbappend +++ b/recipes-extended/sudo/sudo_%.bbappend @@ -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" diff --git a/recipes-extended/tar/tar_selinux.inc b/recipes-extended/tar/tar_selinux.inc index b1fa7bf..0f64298 100644 --- a/recipes-extended/tar/tar_selinux.inc +++ b/recipes-extended/tar/tar_selinux.inc @@ -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" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 02c4918..ef81ec4 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -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" diff --git a/recipes-graphics/xcb/libxcb_selinux.inc b/recipes-graphics/xcb/libxcb_selinux.inc deleted file mode 100644 index 6924315..0000000 --- a/recipes-graphics/xcb/libxcb_selinux.inc +++ /dev/null @@ -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.*" diff --git a/recipes-graphics/xcb/libxcb_%.bbappend b/recipes-graphics/xorg-lib/libxcb_%.bbappend similarity index 100% rename from recipes-graphics/xcb/libxcb_%.bbappend rename to recipes-graphics/xorg-lib/libxcb_%.bbappend diff --git a/recipes-graphics/xorg-lib/libxcb_selinux.inc b/recipes-graphics/xorg-lib/libxcb_selinux.inc new file mode 100644 index 0000000..04c66c1 --- /dev/null +++ b/recipes-graphics/xorg-lib/libxcb_selinux.inc @@ -0,0 +1,5 @@ +inherit enable-selinux +PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" + +PACKAGES += "${PN}-xselinux" +FILES:${PN}-xselinux += "${libdir}/libxcb-xselinux.so.*" diff --git a/recipes-kernel/perf/perf_selinux.inc b/recipes-kernel/perf/perf_selinux.inc index bed3cc2..f1bdaf8 100644 --- a/recipes-kernel/perf/perf_selinux.inc +++ b/recipes-kernel/perf/perf_selinux.inc @@ -1 +1 @@ -DEPENDS .= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', ' audit', '', d)}" +inherit enable-audit diff --git a/recipes-support/attr/attr_selinux.inc b/recipes-support/attr/attr_selinux.inc index 7b45842..efc18b2 100644 --- a/recipes-support/attr/attr_selinux.inc +++ b/recipes-support/attr/attr_selinux.inc @@ -1,5 +1,3 @@ -inherit selinux - FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://fix-ptest-failures-when-selinux-enabled.patch" diff --git a/recipes-support/gnupg/gnupg_selinux.inc b/recipes-support/gnupg/gnupg_selinux.inc index 12571b4..eee1731 100644 --- a/recipes-support/gnupg/gnupg_selinux.inc +++ b/recipes-support/gnupg/gnupg_selinux.inc @@ -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" -- 2.25.1 |
|
[meta-selinux][PATCH 06/12] python2: drop bbappend
Yi Zhao
This bbappend was added long time ago and it is useless now.
Signed-off-by: Yi Zhao <yi.zhao@...> --- 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 diff --git a/conf/layer.conf b/conf/layer.conf index fcd61d5..d7c80b8 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -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" diff --git a/dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py b/dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py deleted file mode 100644 index d2b71fa..0000000 --- a/dynamic-layers/python2-layer/recipes-devtools/python/files/sitecustomize.py +++ /dev/null @@ -1,26 +0,0 @@ -# OpenEmbedded sitecustomize.py (C) 2002-2008 Michael 'Mickey' Lauer <mlauer@...> -# 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() diff --git a/dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend b/dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend deleted file mode 100644 index 7719d3b..0000000 --- a/dynamic-layers/python2-layer/recipes-devtools/python/python_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)} diff --git a/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc b/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc deleted file mode 100644 index 4fed832..0000000 --- a/dynamic-layers/python2-layer/recipes-devtools/python/python_selinux.inc +++ /dev/null @@ -1,5 +0,0 @@ -# If selinux enabled, disable handlers to rw command history file -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -inherit selinux - -- 2.25.1 |
|
[meta-selinux][PATCH 05/12] lxc: drop bbappend
Yi Zhao
The PACKAGECONFIG[selinux] is enabled in lxc recipe.
Signed-off-by: Yi Zhao <yi.zhao@...> --- 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 diff --git a/conf/layer.conf b/conf/layer.conf index ebc8e33..fcd61d5 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -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 \ " diff --git a/dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend b/dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend deleted file mode 100644 index 74e22b3..0000000 --- a/dynamic-layers/virtualization-layer/recipes-containers/lxc/lxc_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'enable-selinux', '', d)} -- 2.25.1 |
|
[meta-selinux][PATCH 04/12] augeas: drop bbappend
Yi Zhao
The PACKAGECONFIG[selinux] is enabled in augeas recipe.
Signed-off-by: Yi Zhao <yi.zhao@...> --- 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 diff --git a/conf/layer.conf b/conf/layer.conf index 673cc13..ebc8e33 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -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 \ diff --git a/dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend b/dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend deleted file mode 100644 index b01ad25..0000000 --- a/dynamic-layers/openembedded-layer/recipes-support/augeas/augeas_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'with-selinux', '', d)} -- 2.25.1 |
|
[meta-selinux][PATCH 03/12] logrotate: drop bbappend
Yi Zhao
The content of the bbappend is already contained in logrotate recipe.
Signed-off-by: Yi Zhao <yi.zhao@...> --- 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 diff --git a/recipes-extended/logrotate/logrotate_%.bbappend b/recipes-extended/logrotate/logrotate_%.bbappend deleted file mode 100644 index 7719d3b..0000000 --- a/recipes-extended/logrotate/logrotate_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)} diff --git a/recipes-extended/logrotate/logrotate_selinux.inc b/recipes-extended/logrotate/logrotate_selinux.inc deleted file mode 100644 index 1bdca98..0000000 --- a/recipes-extended/logrotate/logrotate_selinux.inc +++ /dev/null @@ -1,5 +0,0 @@ -inherit selinux - -DEPENDS += "${LIBSELINUX}" - -EXTRA_OEMAKE += "${@target_selinux(d, 'WITH_SELINUX=\"yes\"')}" -- 2.25.1 |
|