Skip to contentSkip to conversation

meson-selinux.bbclass: fix meson flags for glib-2.0-native

PATCH In review Mikko Rapeli 2 participants 4 messages Aug 28, 2019 – Aug 29, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

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.

---
 classes/meson-selinux.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
classes/meson-selinux.bbclass +1 -1
index 77a763a..91c2a2b 100644
@@ -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,"
Signature · 1 line
1.9.1
#1 lore raw

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;
      |                ^~~~~~
---
 ...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
recipes-security/selinux/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch new file +58 -0
new file mode 100644
index 0000000..3105eab
@@ -0,0 +1,58 @@
+From 707e4b8610733b5c9eaac0f00239778f3edb23c2 Mon Sep 17 00:00:00 2001
+From: Petr Lautrbach <[email protected]>
+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 <[email protected]>
+---
+ 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
+
recipes-security/selinux/libselinux_2.8.bb +1 -0
index 5de4607..cfa7a82 100644
@@ -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 \
         "
Signature · 1 line
1.9.1
#2 lore raw
In reply to Mikko Rapeli

Hi Mikko,

Is this specifically for warrior (or thud), maybe? The following commit explains the current logic:

commit bb0c9c3abcb935e4b362eb57985e1ee7fec0bfe0
Author: Yi Zhao <[email protected]>
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.

and the second patch is already present in tree:

commit 087fe5c8144c246c6361bd8bcbd1ffd9e9b675bb
Author: Yi Zhao <[email protected]>
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;
| ^~~~~~

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.

Quoted 31 lines · [[yocto] [meta-selinux][PATCH 1/2] meson-selinux.bbclass: fix meson flags for…

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.

---
 classes/meson-selinux.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
classes/meson-selinux.bbclass +1 -1
index 77a763a..91c2a2b 100644
@@ -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,"
Signature · 7 lines
1.9.1

-- 
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Signature · 2 lines
-Joe MacDonald.
:wq
#3 lore raw

Hi,

Quoted 50 lines · Joe MacDonald

Hi Mikko,

Is this specifically for warrior (or thud), maybe? The following commit explains the current logic:

commit bb0c9c3abcb935e4b362eb57985e1ee7fec0bfe0
Author: Yi Zhao <[email protected]>
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.

and the second patch is already present in tree:

commit 087fe5c8144c246c6361bd8bcbd1ffd9e9b675bb
Author: Yi Zhao <[email protected]>
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;
| ^~~~~~

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
Quoted 5 lines

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 <[email protected]>
AuthorDate: Fri Apr 19 10:46:32 2019 +0800
Commit:     Joe MacDonald <[email protected]>
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 <[email protected]>
AuthorDate: Fri Aug 9 17:48:00 2019 +0800
Commit:     Joe MacDonald <[email protected]>
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

Quoted 39 lines

-J.

Quoted 31 lines · [[yocto] [meta-selinux][PATCH 1/2] meson-selinux.bbclass: fix meson flags for…

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.

---
 classes/meson-selinux.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
classes/meson-selinux.bbclass +1 -1
index 77a763a..91c2a2b 100644
@@ -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,"
Signature · 7 lines
1.9.1

-- 
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto
Signature · 2 lines
-Joe MacDonald.
:wq