[yocto] [meta]/recipes-extended - Sumo Branch
Hi Everyone, In the Sumo branch, the iptables are not compiling correctly, I see that the xtables.c isn't getting compiled at all. Here is the recipe for iptables http://git.yoctoproject.org/cgit.cgi/poky/tree/meta/recipes-extended/iptables/iptables_1.6.2.bb?h=sumo Has anyone faced this issue? Thanks -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-selinux][PATCH 2/2] libselinux: fix build with glibc-2.30 from poky
Fixes build error: procattr.c:27:14: error: static declaration of 'gettid' follows non-static declaration 27 | static pid_t gettid(void) | ^~ In file included from /home/builder/src/base/build_mgu22/tmp/work/aarch64-poky-linux/libselinux/2.8-r0/recipe-sysroot/usr/include/unistd.h:1170, from procattr.c:2: /home/builder/src/base/build_mgu22/tmp/work/aarch64-poky-linux/libselinux/2.8-r0/recipe-sysroot/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of 'gettid' was here 34 | extern __pid_t gettid (void) __THROW; |^~ Signed-off-by: Mikko Rapeli --- ...Do-not-define-gettid-if-glibc-2.30-is-use.patch | 58 ++ recipes-security/selinux/libselinux_2.8.bb | 1 + 2 files changed, 59 insertions(+) create mode 100644 recipes-security/selinux/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch diff --git a/recipes-security/selinux/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch b/recipes-security/selinux/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch new file mode 100644 index 000..3105eab --- /dev/null +++ b/recipes-security/selinux/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch @@ -0,0 +1,58 @@ +From 707e4b8610733b5c9eaac0f00239778f3edb23c2 Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach +Date: Mon, 11 Mar 2019 16:00:41 +0100 +Subject: [PATCH] libselinux: Do not define gettid() if glibc >= 2.30 is used +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since version 2.30 glibc implements gettid() system call wrapper, see +https://sourceware.org/bugzilla/show_bug.cgi?id=6399 + +Fixes: +cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I../include -D_GNU_SOURCE -DNO_ANDROID_BACKEND -c -o procattr.o procattr.c +procattr.c:28:14: error: static declaration of ???gettid??? follows non-static declaration + 28 | static pid_t gettid(void) + | ^~ +In file included from /usr/include/unistd.h:1170, + from procattr.c:2: +/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ???gettid??? was here + 34 | extern __pid_t gettid (void) __THROW; + |^~ + +Signed-off-by: Petr Lautrbach +--- + libselinux/src/procattr.c | 15 +-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +Upstream-Status: Backport + +diff --git a/libselinux/src/procattr.c b/libselinux/src/procattr.c +index 48dd8af..c6799ef 100644 +--- a/libselinux/src/procattr.c b/libselinux/src/procattr.c +@@ -22,8 +22,19 @@ static pthread_key_t destructor_key; + static int destructor_key_initialized = 0; + static __thread char destructor_initialized; + +-#ifndef __BIONIC__ +-/* Bionic declares this in unistd.h and has a definition for it */ ++/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and ++ * has a definition for it */ ++#ifdef __BIONIC__ ++ #define OVERRIDE_GETTID 0 ++#elif !defined(__GLIBC_PREREQ) ++ #define OVERRIDE_GETTID 1 ++#elif !__GLIBC_PREREQ(2,30) ++ #define OVERRIDE_GETTID 1 ++#else ++ #define OVERRIDE_GETTID 0 ++#endif ++ ++#if OVERRIDE_GETTID + static pid_t gettid(void) + { + return syscall(__NR_gettid); +-- +1.9.1 + diff --git a/recipes-security/selinux/libselinux_2.8.bb b/recipes-security/selinux/libselinux_2.8.bb index 5de4607..cfa7a82 100644 --- a/recipes-security/selinux/libselinux_2.8.bb +++ b/recipes-security/selinux/libselinux_2.8.bb @@ -12,4 +12,5 @@ SRC_URI += "\ file://libselinux-make-SOCK_CLOEXEC-optional.patch \ file://libselinux-define-FD_CLOEXEC-as-necessary.patch \ file://0001-src-Makefile-fix-includedir-in-libselinux.pc.patch \ + file://0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch;striplevel=2 \ " -- 1.9.1 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-selinux][PATCH 1/2] meson-selinux.bbclass: fix meson flags for glib-2.0-native
With latest poky master, glib-2.0-native fails to compile: | meson.build:1:0: ERROR: Value "false" for combo option is not one of the choices. Possible choices are: "enabled", "disabled", "auto". Thus use enabled and disabled when enabling and disabling flags with meson. Now glib-2.0-native compiles again. Signed-off-by: Mikko Rapeli --- classes/meson-selinux.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/meson-selinux.bbclass b/classes/meson-selinux.bbclass index 77a763a..91c2a2b 100644 --- a/classes/meson-selinux.bbclass +++ b/classes/meson-selinux.bbclass @@ -1,4 +1,4 @@ inherit selinux PACKAGECONFIG_append = " ${@target_selinux(d)}" -PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux," +PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux," -- 1.9.1 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta-selinux][PATCH 1/2] meson-selinux.bbclass: fix meson flags for glib-2.0-native
Hi Mikko, Is this specifically for warrior (or thud), maybe? The following commit explains the current logic: commit bb0c9c3abcb935e4b362eb57985e1ee7fec0bfe0 Author: Yi Zhao Date: Wed Jun 12 15:53:20 2019 +0800 glib-2.0: fix configure error for meson build In glib 2.60.x, it turns selinux into a meson feature. We should use '-Dselinux=enabled/disabled' rather than '-Dselinux=true/false' to enable/disable the feature. Add meso-enable-selinux.bbclass for this change and inherit it in glib-2.0 bbappend to fix the configure error. Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald and the second patch is already present in tree: commit 087fe5c8144c246c6361bd8bcbd1ffd9e9b675bb Author: Yi Zhao Date: Fri Aug 9 17:48:00 2019 +0800 libselinux: fix build with glibc 2.30 Fix build error: procattr.c:27:14: error: static declaration of 'gettid' follows non-static declaration 27 | static pid_t gettid(void) | ^~ In file included from /buildarea/build/tmp/work/core2-64-poky-linux/libselinux/2.8-r0/recipe-sysroot/usr/include/unistd.h:1170, from procattr.c:2: /buildarea/build/tmp/work/core2-64-poky-linux/libselinux/2.8-r0/recipe-sysroot/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of 'gettid' was here 34 | extern __pid_t gettid (void) __THROW; |^~ Signed-off-by: Yi Zhao Signed-off-by: Joe MacDonald This is what my current work tree looks like, for reference: $ repo forall -p -c git log -1 --pretty=oneline project meta-openembedded/ 2ebaa8df1257389161d0bee9e553c28f63e52005 python3-pyatspi: Add Dbus ATSPI recipe project meta-selinux/ 154654a6fe12206a6b9ad6d8c36a4dbe672bcc46 selinux-python: Fix dependency for ntpath project yocto-mainline/ ca2207f418b7847ffce4b8c53a5a442e5cf461d9 commands.py: fix typo -J. [[yocto] [meta-selinux][PATCH 1/2] meson-selinux.bbclass: fix meson flags for glib-2.0-native] On 19.08.28 (Wed 18:30) Mikko Rapeli wrote: > With latest poky master, glib-2.0-native fails to compile: > > | meson.build:1:0: ERROR: Value "false" for combo option is not one of the > choices. Possible choices are: "enabled", > "disabled", "auto". > > Thus use enabled and disabled when enabling and disabling flags > with meson. Now glib-2.0-native compiles again. > > Signed-off-by: Mikko Rapeli > --- > classes/meson-selinux.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/classes/meson-selinux.bbclass b/classes/meson-selinux.bbclass > index 77a763a..91c2a2b 100644 > --- a/classes/meson-selinux.bbclass > +++ b/classes/meson-selinux.bbclass > @@ -1,4 +1,4 @@ > inherit selinux > > PACKAGECONFIG_append = " ${@target_selinux(d)}" > -PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux," > +PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux," > -- > 1.9.1 > > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto -- -Joe MacDonald. :wq signature.asc Description: PGP signature -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] Error trying to generate Raspberry Pi initramfs
I'm trying to generate an initramfs for a raspberry pi 3 for a sumo build. We are based off of the Qt boot2qt system. I have followed the instructions in the meta-raspberrypi.pdf documentation, section 3.14 Image with Initramfs. I edited the meta-raspberrypi/recipes-kernel/linux/linux-raspberry.inc file and added the variables into my local.conf file. I created a rpi-minimal-initramfs.bb recipe and it is created when I build the system. But the command line that is put into the boot partition is: dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait fbcon=map:10 fbcon=font:VGA8x8 No initramfs. In the linux-raspberry.inc file, after the insertion point for the new kernel variables, there is a test for KERNEL_INITRAMFS. I tried setting this in my local.conf file, but when I do I get an error for a missing file: | /home//tmp/deploy/images/raspberrypi3/uImage1-raspberrypi3.bin: No such file or directory So, apparently that can't be set directly. There seems to be something missing in the instructions in the meta-raspberrypi.pdf documentation. Anyone that has any experience with setting this up and can help me figure out what I'm missing, I would greatly appreciate the help. Regards, Greg Wilson-Lindberg -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] Error trying to generate Raspberry Pi initramfs
Three things: [1] The initramfs is NOT the initrd (te second one is the temp stage in booting the linux to mmcblk...); [2] There are some config parameters you need to set up in your kernel .config file: https://github.com/ZoranStojsavljevic/bbb-yocto/blob/master/custom/config-initramfs [3] The command line is formed in u-boot or in grub2, or in your Linux boot loader (you need to add some lines in ash u-boot config script, as the following example): https://github.com/ZoranStojsavljevic/bbb-yocto/blob/master/custom/u-boot.ash Good Luck, Zoran ___ On Wed, Aug 28, 2019 at 7:26 PM Greg Wilson-Lindberg wrote: > > I'm trying to generate an initramfs for a raspberry pi 3 for a sumo build. We > are based off of the Qt boot2qt system. > > I have followed the instructions in the meta-raspberrypi.pdf documentation, > section 3.14 Image with Initramfs. > > I edited the meta-raspberrypi/recipes-kernel/linux/linux-raspberry.inc file > and added the variables into my local.conf file. I created a > rpi-minimal-initramfs.bb recipe and it is created when I build the system. > But the command line that is put into the boot partition is: > > dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait > fbcon=map:10 fbcon=font:VGA8x8 > > No initramfs. > > In the linux-raspberry.inc file, after the insertion point for the new kernel > variables, there is a test for KERNEL_INITRAMFS. I tried setting this in my > local.conf file, but when I do I get an error for a missing file: > > | /home//tmp/deploy/images/raspberrypi3/uImage1-raspberrypi3.bin: No such > file or directory > > So, apparently that can't be set directly. > > There seems to be something missing in the instructions in the > meta-raspberrypi.pdf documentation. Anyone that has any experience with > setting this up and can help me figure out what I'm missing, I would greatly > appreciate the help. > > Regards, > Greg Wilson-Lindberg > > > > > > > > > > > > -- > ___ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-selinux] [PATCH] python-scapy: upgrade 2.4.2 -> 2.4.3
License file changed from bin/scapy to LICENSE Signed-off-by: Yuan Chao --- recipes-security/scapy/python-scapy.inc | 4 ++-- .../scapy/{python-scapy_2.4.2.bb => python-scapy_2.4.3.bb}| 0 .../scapy/{python3-scapy_2.4.2.bb => python3-scapy_2.4.3.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename recipes-security/scapy/{python-scapy_2.4.2.bb => python-scapy_2.4.3.bb} (100%) rename recipes-security/scapy/{python3-scapy_2.4.2.bb => python3-scapy_2.4.3.bb} (100%) diff --git a/recipes-security/scapy/python-scapy.inc b/recipes-security/scapy/python-scapy.inc index baa69b2..28e13f2 100644 --- a/recipes-security/scapy/python-scapy.inc +++ b/recipes-security/scapy/python-scapy.inc @@ -3,11 +3,11 @@ DESCRIPTION = "Scapy is a powerful interactive packet manipulation program. It i SECTION = "security" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://bin/scapy;beginline=9;endline=13;md5=1d5249872cc54cd4ca3d3879262d0c69" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" S = "${WORKDIR}/git" -SRCREV = "bad14cb1a5aee29f8107fbe8ad008d4645f14da7" +SRCREV = "3047580162a9407ef05fe981983cacfa698f1159" SRC_URI = "git://github.com/secdev/scapy.git" inherit ptest diff --git a/recipes-security/scapy/python-scapy_2.4.2.bb b/recipes-security/scapy/python-scapy_2.4.3.bb similarity index 100% rename from recipes-security/scapy/python-scapy_2.4.2.bb rename to recipes-security/scapy/python-scapy_2.4.3.bb diff --git a/recipes-security/scapy/python3-scapy_2.4.2.bb b/recipes-security/scapy/python3-scapy_2.4.3.bb similarity index 100% rename from recipes-security/scapy/python3-scapy_2.4.2.bb rename to recipes-security/scapy/python3-scapy_2.4.3.bb -- 2.17.1 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] Query on error log "no providers found in RDEPENDS"
Hi, I am new to this mail group. I have the below error while creating a package, Can someone help to fix this issue. @ubuntu:~/EVO_BUILD/741058_MGMT_Core_OPS/build_mpxls1046$ bitbake datatransfer-mgr Loading cache: 100% || Time: 0:00:01 Loaded 3343 entries from dependency cache. Parsing recipes: 100% |##| Time: 0:00:04 Parsing of 2450 .bb files complete (2446 cached, 4 parsed). 3345 targets, 177 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION = "1.36.0" BUILD_SYS= "i686-linux" NATIVELSBSTRING = "universal" TARGET_SYS = "aarch64-fsl-linux" MACHINE = "mpxls1046" DISTRO = "fsl-qoriq" DISTRO_VERSION = "2.4.4" TUNE_FEATURES= "aarch64" TARGET_FPU = "" meta meta-poky meta-yocto-bsp meta-oe meta-multimedia meta-python meta-networking meta-gnome meta-filesystems meta-webserver meta-perl meta-virtualization meta-security meta-freescale meta-freescale-distro meta-qoriq-demos meta-bsp-teledyne meta-laird-cp meta-microsys-layerscape = "develop:25b4f49569fcf4417572f2a4081f21221a8d802b" Initialising tasks: 100% |###| Time: 0:00:01 NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks ERROR: datatransfer-mgr-1.0-r1 do_package_qa: QA Issue: /usr/bin/DataTransferMgr contained in package datatransfer-mgr requires libzipcpp.so()(64bit), but no providers found in RDEPENDS_datatransfer-mgr? [file-rdeps] ERROR: datatransfer-mgr-1.0-r1 do_package_qa: QA run found fatal errors. Please consider fixing them. ERROR: datatransfer-mgr-1.0-r1 do_package_qa: Function failed: do_package_qa ERROR: Logfile of failure stored in: /home/tdy/EVO_BUILD/741058_MGMT_Core_OPS/build_mpxls1046/tmp/work/aarch64-fsl-linux/datatransfer-mgr/1.0-r1/temp/log.do_package_qa.6 ERROR: Task (/home/tdy/EVO_BUILD/741058_MGMT_Core_OPS/sources/meta-bsp-teledyne/recipes-wireless/datatransfer-mgr/datatransfer-mgr_1.0.bb:do_package_qa) failed with exit code '1' NOTE: Tasks Summary: Attempted 591 tasks of which 577 didn't need to be rerun and 1 failed. Summary: 1 task failed: /home/tdy/EVO_BUILD/741058_MGMT_Core_OPS/sources/meta-bsp-teledyne/recipes-wireless/datatransfer-mgr/datatransfer-mgr_1.0.bb: do_package_qa Summary: There were 3 ERROR messages shown, returning a non-zero exit code. *my .bb file for zipcpp is below:* # # This file is the zipcpp recipe. # DEPENDS = "zeromq cppzmq" SUMMARY = "ZeroMQ based IPC C++ library" SECTION = "base" LICENSE = "CLOSED" SRC_URI = "git://git@elsvsapp02/TDY/ZIPCpp.git;protocol=ssh;branch=develop" SRCREV = "${AUTOREV}" S = "${WORKDIR}/git" LIB_ARTIFACT = "libzipcpp.so" LIB_VERSION = "1" do_install() { install -d ${D}${libdir} install -m 0755 ${S}/bin/${LIB_ARTIFACT}.${LIB_VERSION} ${D}${libdir}/${LIB_ARTIFACT}.${LIB_VERSION} ln -rs ${D}${libdir}/${LIB_ARTIFACT}.${LIB_VERSION} ${D}${libdir}/${LIB_ARTIFACT} install -d ${D}${includedir} install -m 0644 ${S}/include/zipc.h ${D}${includedir} install -m 0644 ${S}/include/logger.h ${D}${includedir} install -d ${D}${includedir}/fmt install -m 0644 ${S}/include/fmt/* ${D}${includedir}/fmt } #do_install_append() { #rm -r ${D}/usr/share #} #PACKAGES = "${PN}-dev" FILES_${PN} += "${libdir}/${LIB_ARTIFACT}.${LIB_VERSION}" FILES_${PN} += "${libdir}/${LIB_ARTIFACT}" #RDEPENDS_${PN} = "${LIB_ARTIFACT}.${LIB_VERSION}" #RDEPENDS_${PN} = "${LIB_ARTIFACT}" *and the .bb file for datatransfer-mgr is below.* # Copyright (C) 2018 Teledyne Controls DEPENDS = "zeromq cppzmq zipcpp protobuf json-c jsoncpp rapidjson" DESCRIPTION = "Wireless Data Transfer Manager for Evo" SECTION = "base" PRIORITY = "optional" LICENSE = "CLOSED" PR = "r1" SRC_URI = "git://git@elsvsapp02/GroundLink-Evo/DataTransferManager.git;protocol=ssh " SRC_URI = "file:///home/tdy/DataTransferManager/DataTransferManager.tgz" SRCREV = "${AUTOREV}" CDT_CONFIGURATION ?= "Release" BUILD_ARTIFACT = "DataTransferMgr" S = "${WORKDIR}/git/DataTransferManager-1.0" S = "${WORKDIR}/DataTransferManager-1.0" export STAGING_INCDIR export STAGING_LIBDIR export PV export PR #EXTRA_OEMAKE = "'CXX=${CXX}' 'RANLIB=${RANLIB}' 'AR=${AR}' \ # 'CXXFLAGS=${CXXFLAGS}' 'BUILDDIR=${S}' \ # 'STAGING_LIBDIR=${STAGING_LIBDIR}'" EXTRA_OEMAKE += "'INCLUDE_DIR=${D}${includedir}' 'LIB_DIR=${D}${libdir}'" do_compile() { cd Release oe_runmake } do_install() { mkdir -p ${D}${bindir} install -m 755 ${S}/Release
Re: [yocto] [meta-selinux][PATCH 1/2] meson-selinux.bbclass: fix meson flags for glib-2.0-native
Hi, On Wed, Aug 28, 2019 at 01:19:17PM -0400, Joe MacDonald wrote: > Hi Mikko, > > Is this specifically for warrior (or thud), maybe? The following commit > explains the current logic: > > commit bb0c9c3abcb935e4b362eb57985e1ee7fec0bfe0 > Author: Yi Zhao > Date: Wed Jun 12 15:53:20 2019 +0800 > > glib-2.0: fix configure error for meson build > > In glib 2.60.x, it turns selinux into a meson feature. We should use > '-Dselinux=enabled/disabled' rather than '-Dselinux=true/false' to > enable/disable the feature. > > Add meso-enable-selinux.bbclass for this change and inherit it in > glib-2.0 bbappend to fix the configure error. > > Signed-off-by: Yi Zhao > Signed-off-by: Joe MacDonald > > and the second patch is already present in tree: > > commit 087fe5c8144c246c6361bd8bcbd1ffd9e9b675bb > Author: Yi Zhao > Date: Fri Aug 9 17:48:00 2019 +0800 > > libselinux: fix build with glibc 2.30 > > Fix build error: > procattr.c:27:14: error: static declaration of 'gettid' follows > non-static declaration >27 | static pid_t gettid(void) > | ^~ > In file included from > /buildarea/build/tmp/work/core2-64-poky-linux/libselinux/2.8-r0/recipe-sysroot/usr/include/unistd.h:1170, > from procattr.c:2: > > /buildarea/build/tmp/work/core2-64-poky-linux/libselinux/2.8-r0/recipe-sysroot/usr/include/bits/unistd_ext.h:34:16: > note: previous declaration of 'gettid' was here >34 | extern __pid_t gettid (void) __THROW; > |^~ > > Signed-off-by: Yi Zhao > Signed-off-by: Joe MacDonald > > This is what my current work tree looks like, for reference: > > $ repo forall -p -c git log -1 --pretty=oneline > project meta-openembedded/ > 2ebaa8df1257389161d0bee9e553c28f63e52005 python3-pyatspi: Add Dbus ATSPI > recipe > > project meta-selinux/ > 154654a6fe12206a6b9ad6d8c36a4dbe672bcc46 selinux-python: Fix dependency for > ntpath > > project yocto-mainline/ > ca2207f418b7847ffce4b8c53a5a442e5cf461d9 commands.py: fix typo Hmm, good that same patches are already in master branch but I somehow got a much older master branch state from remote git://git.yoctoproject.org/meta-selinux commit a917c322c120c05fc6746fc9aca38c27398ffb4a Author: Yi Zhao AuthorDate: Fri Apr 19 10:46:32 2019 +0800 Commit: Joe MacDonald CommitDate: Tue Apr 23 11:12:57 2019 -0400 Was also checking master-next there. Based on time stamps in .git/modules/meta-selinux/refs/remotes/upstream/ my last fetch was Aug 28 11:02 CET. Seems like the "libselinux: fix build with glibc 2.30" was pushed to the server just after I had been checking for it: commit 087fe5c8144c246c6361bd8bcbd1ffd9e9b675bb Author: Yi Zhao AuthorDate: Fri Aug 9 17:48:00 2019 +0800 Commit: Joe MacDonald CommitDate: Wed Aug 28 10:26:52 2019 -0400 libselinux: fix build with glibc 2.30 Anyway, fixes are in and life continues :) Thanks, -Mikko > -J. > > [[yocto] [meta-selinux][PATCH 1/2] meson-selinux.bbclass: fix meson flags for > glib-2.0-native] On 19.08.28 (Wed 18:30) Mikko Rapeli wrote: > > > With latest poky master, glib-2.0-native fails to compile: > > > > | meson.build:1:0: ERROR: Value "false" for combo option is not one of the > > choices. Possible choices are: "enabled", > > "disabled", "auto". > > > > Thus use enabled and disabled when enabling and disabling flags > > with meson. Now glib-2.0-native compiles again. > > > > Signed-off-by: Mikko Rapeli > > --- > > classes/meson-selinux.bbclass | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/classes/meson-selinux.bbclass b/classes/meson-selinux.bbclass > > index 77a763a..91c2a2b 100644 > > --- a/classes/meson-selinux.bbclass > > +++ b/classes/meson-selinux.bbclass > > @@ -1,4 +1,4 @@ > > inherit selinux > > > > PACKAGECONFIG_append = " ${@target_selinux(d)}" > > -PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux," > > +PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux," > > -- > > 1.9.1 > > > > -- > > ___ > > yocto mailing list > > yocto@yoctoproject.org > > https://lists.yoctoproject.org/listinfo/yocto > > -- > -Joe MacDonald. > :wq -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto