systemd 219 upgrade and musl fixes
cover systemd 219 upgrade and musl fixes
Upgrade to systemd 219 ( tested on mips/x86)
Divide util-linux into libs and apps part this solves the catch-22 systemd -> libmount(utils-linux) -> systemd Fix for musl to be a provider for libintl
Tighten glibc recipe parsing, helps in accomodating other libs
The following changes since commit 530565c6cb77319f4cc49edeea6fec6be997415d:
glibc: Update to glibc 2.21 release tag (2015-02-19 17:04:19 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib kraj/misc
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/misc
Khem Raj (5):
systemd: Upgrade 216 -> 219
util-linux,util-linux-libs: Build and package util-linux libs
separately
systemd: Add missing dependency on util-linux-libs
tclibc-musl: Use musl for providing virtual/libintl instead of gettext
glibc: Dont offer to be parsed for non-glibc TCLIBC selection
meta/conf/distro/include/tclibc-musl.inc | 2 +-
meta/recipes-core/glibc/glibc_2.21.bb | 12 +-
...1-Make-root-s-home-directory-configurable.patch | 127 ++++++++-------
...onfigure-the-list-of-system-users-files-a.patch | 176 ---------------------
...o-not-install-tmpfiles-and-sysusers-files.patch | 56 -------
...-Fix-navigating-backwards-missing-entries.patch | 34 ----
...ing.h-add-fake-__NR_memfd_create-for-MIPS.patch | 29 ----
...ke-resolv.conf-entry-conditional-on-resol.patch | 142 -----------------
.../systemd/systemd/binfmt-install.patch | 35 ++--
.../systemd/systemd-pam-fix-fallocate.patch | 50 +++---
.../systemd/systemd/uclibc-sysinfo_h.patch | 19 ---
.../systemd/{systemd_216.bb => systemd_219.bb} | 41 +++--
...ch_root_improve_statfs_f_type_portability.patch | 56 +++++++
.../files/0002-include_statfs_magic.patch | 45 ++++++
.../{util-linux => files}/configure-sbindir.patch | 0
.../{util-linux => files}/fix-parallel-build.patch | 0
.../uclibc-__progname-conflict.patch | 0
.../util-linux-native-qsort.patch | 0
.../{util-linux => files}/util-linux-native.patch | 0
.../util-linux-ng-2.16-mount_lock_path.patch | 0
.../util-linux-ng-replace-siginterrupt.patch | 0
meta/recipes-core/util-linux/util-linux-libs.inc | 93 +++++++++++
.../util-linux/util-linux-libs_2.25.2.bb | 25 +++
meta/recipes-core/util-linux/util-linux.inc | 23 +--
meta/recipes-core/util-linux/util-linux_2.25.2.bb | 2 +
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
26 files changed, 357 insertions(+), 612 deletions(-)
delete mode 100644 meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch
delete mode 100644 meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch
rename meta/recipes-core/systemd/{systemd_216.bb => systemd_219.bb} (92%)
create mode 100644 meta/recipes-core/util-linux/files/0001-switch_root_improve_statfs_f_type_portability.patch
create mode 100644 meta/recipes-core/util-linux/files/0002-include_statfs_magic.patch
rename meta/recipes-core/util-linux/{util-linux => files}/configure-sbindir.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/fix-parallel-build.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/uclibc-__progname-conflict.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/util-linux-native-qsort.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/util-linux-native.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/util-linux-ng-2.16-mount_lock_path.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/util-linux-ng-replace-siginterrupt.patch (100%)
create mode 100644 meta/recipes-core/util-linux/util-linux-libs.inc
create mode 100644 meta/recipes-core/util-linux/util-linux-libs_2.25.2.bbSignature · 1 line
2.1.4
PATCH 1/5 systemd: Upgrade 216 -> 219
Remove upstreamed patches as well as patches which arent needed anymore since features are dropped from systemd e.g. userspace firmware download Tested on qemux86
---
...1-Make-root-s-home-directory-configurable.patch | 127 ++++++++-------
...onfigure-the-list-of-system-users-files-a.patch | 176 ---------------------
...o-not-install-tmpfiles-and-sysusers-files.patch | 56 -------
...-Fix-navigating-backwards-missing-entries.patch | 34 ----
...ing.h-add-fake-__NR_memfd_create-for-MIPS.patch | 29 ----
...ke-resolv.conf-entry-conditional-on-resol.patch | 142 -----------------
.../systemd/systemd/binfmt-install.patch | 35 ++--
.../systemd/systemd-pam-fix-fallocate.patch | 50 +++---
.../systemd/systemd/uclibc-sysinfo_h.patch | 19 ---
.../systemd/{systemd_216.bb => systemd_219.bb} | 39 +++--
10 files changed, 122 insertions(+), 585 deletions(-)
delete mode 100644 meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch
delete mode 100644 meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch
rename meta/recipes-core/systemd/{systemd_216.bb => systemd_219.bb} (92%)meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch +62 -65
@@ -21,11 +21,11 @@ Signed-off-by: Dan McGregor <[email protected]> units/rescue.service.m4.in | 4 ++-- 8 files changed, 20 insertions(+), 11 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index 4028112..5d18f5c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -191,6 +191,7 @@ AM_CPPFLAGS = \ +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am ++++ git/Makefile.am +@@ -198,6 +198,7 @@ AM_CPPFLAGS = \ -DKEXEC=\"$(KEXEC)\" \ -DLIBDIR=\"$(libdir)\" \ -DROOTLIBDIR=\"$(rootlibdir)\" \
@@ -33,7 +33,7 @@ index 4028112..5d18f5c 100644 -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/shared \ -@@ -5584,6 +5585,7 @@ EXTRA_DIST += \ +@@ -6202,6 +6203,7 @@ EXTRA_DIST += \ substitutions = \ '|rootlibexecdir=$(rootlibexecdir)|' \ '|rootbindir=$(rootbindir)|' \
@@ -41,14 +41,14 @@ index 4028112..5d18f5c 100644 '|bindir=$(bindir)|' \ '|SYSTEMCTL=$(rootbindir)/systemctl|' \ '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \ -diff --git a/configure.ac b/configure.ac -index 18b7198..365bc73 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1272,6 +1272,11 @@ AC_ARG_WITH([rootlibdir], +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac ++++ git/configure.ac +@@ -1372,6 +1372,11 @@ AC_ARG_WITH([rootlibdir], [], [with_rootlibdir=${libdir}]) - + +AC_ARG_WITH([roothomedir], + AS_HELP_STRING([--with-roothomedir=DIR], [Home directory for the root user]), + [],
@@ -57,15 +57,15 @@ index 18b7198..365bc73 100644 AC_ARG_WITH([pamlibdir], AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]), [], -@@ -1317,6 +1322,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir]) +@@ -1454,6 +1459,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir]) AC_SUBST([pamconfdir], [$with_pamconfdir]) AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootlibdir], [$with_rootlibdir]) +AC_SUBST([roothomedir], [$with_roothomedir]) - + AC_CONFIG_FILES([ Makefile po/Makefile.in -@@ -1400,6 +1406,7 @@ AC_MSG_RESULT([ +@@ -1546,6 +1552,7 @@ AC_MSG_RESULT([ include_prefix: ${INCLUDE_PREFIX} lib dir: ${libdir} rootlib dir: ${with_rootlibdir}
@@ -73,55 +73,55 @@ index 18b7198..365bc73 100644 SysV init scripts: ${SYSTEM_SYSVINIT_PATH} SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} Build Python: ${PYTHON} -diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c -index 62599d0..852d34c 100644 ---- a/src/core/unit-printf.c -+++ b/src/core/unit-printf.c -@@ -259,7 +259,7 @@ static int specifier_user_home(char specifier, void *data, void *userdata, char +Index: git/src/core/unit-printf.c +=================================================================== +--- git.orig/src/core/unit-printf.c ++++ git/src/core/unit-printf.c +@@ -259,7 +259,7 @@ static int specifier_user_home(char spec * best of it if we can, but fail if we can't */ - + if (!c->user || streq(c->user, "root") || streq(c->user, "0")) - n = strdup("/root"); + n = strdup(ROOTHOMEDIR); else return -ENOTSUP; - -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index d01da45..3e876d5 100644 ---- a/src/nspawn/nspawn.c -+++ b/src/nspawn/nspawn.c -@@ -3312,7 +3312,7 @@ int main(int argc, char *argv[]) { + +Index: git/src/nspawn/nspawn.c +=================================================================== +--- git.orig/src/nspawn/nspawn.c ++++ git/src/nspawn/nspawn.c +@@ -4036,7 +4036,7 @@ int main(int argc, char *argv[]) { if (r < 0) _exit(EXIT_FAILURE); - + - if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: "/root") < 0) || + if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: ROOTHOMEDIR) < 0) || (asprintf((char**)(envp + n_env++), "USER=%s", arg_user ? arg_user : "root") < 0) || (asprintf((char**)(envp + n_env++), "LOGNAME=%s", arg_user ? arg_user : "root") < 0)) { log_oom(); -@@ -3402,7 +3402,7 @@ int main(int argc, char *argv[]) { - } else if (argc > optind) - execvpe(argv[optind], argv + optind, env_use); +@@ -4131,7 +4131,7 @@ int main(int argc, char *argv[]) { + execvp(argv[optind], argv + optind); + #endif /* HAVE_EXECVPE */ else { - chdir(home ? home : "/root"); + chdir(home ? home : ROOTHOMEDIR); execle("/bin/bash", "-bash", NULL, env_use); execle("/bin/sh", "-sh", NULL, env_use); } -diff --git a/src/shared/util.c b/src/shared/util.c -index 85a570a..aef6033 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -4377,7 +4377,7 @@ int get_user_creds( +Index: git/src/shared/util.c +=================================================================== +--- git.orig/src/shared/util.c ++++ git/src/shared/util.c +@@ -4606,7 +4606,7 @@ int get_user_creds( *gid = 0; - + if (home) - *home = "/root"; + *home = ROOTHOMEDIR; - + if (shell) *shell = "/bin/sh"; -@@ -5363,7 +5363,7 @@ int get_home_dir(char **_h) { +@@ -5608,7 +5608,7 @@ int get_home_dir(char **_h) { /* Hardcode home directory for root to avoid NSS */ u = getuid(); if (u == 0) {
@@ -129,52 +129,49 @@ index 85a570a..aef6033 100644 + h = strdup(ROOTHOMEDIR); if (!h) return -ENOMEM; - -diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in -index 3f4904a..e2af652 100644 ---- a/units/console-shell.service.m4.in -+++ b/units/console-shell.service.m4.in + +Index: git/units/console-shell.service.m4.in +=================================================================== +--- git.orig/units/console-shell.service.m4.in ++++ git/units/console-shell.service.m4.in @@ -15,8 +15,8 @@ After=rc-local.service Before=getty.target - + [Service] -Environment=HOME=/root -WorkingDirectory=/root +Environment=HOME=@roothomedir@ +WorkingDirectory=@roothomedir@ - ExecStart=-/sbin/sulogin + ExecStart=-@SULOGIN@ ExecStopPost=-@SYSTEMCTL@ poweroff Type=idle -diff --git a/units/emergency.service.in b/units/emergency.service.in -index 91fc1bb..659547e 100644 ---- a/units/emergency.service.in -+++ b/units/emergency.service.in -@@ -13,8 +13,8 @@ Conflicts=shutdown.target +Index: git/units/emergency.service.in +=================================================================== +--- git.orig/units/emergency.service.in ++++ git/units/emergency.service.in +@@ -14,8 +14,8 @@ Conflicts=rescue.service Before=shutdown.target - + [Service] -Environment=HOME=/root -WorkingDirectory=/root +Environment=HOME=@roothomedir@ +WorkingDirectory=@roothomedir@ ExecStartPre=-/bin/plymouth quit - ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.' - ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default" -diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in -index ef54369..7aad86f 100644 ---- a/units/rescue.service.m4.in -+++ b/units/rescue.service.m4.in -@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.service + ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.' + ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --fail --no-block default" +Index: git/units/rescue.service.in +=================================================================== +--- git.orig/units/rescue.service.in ++++ git/units/rescue.service.in +@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.serv Before=shutdown.target - + [Service] -Environment=HOME=/root -WorkingDirectory=/root +Environment=HOME=@roothomedir@ +WorkingDirectory=@roothomedir@ ExecStartPre=-/bin/plymouth quit - ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.' - ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default" --- -1.9.3 - + ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.' + ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --fail --no-block default"
meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch deleted +0 -176
176 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch deleted +0 -56
56 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 2173cbf847fc53ca24950e77958c902edecfc207 Mon Sep 17 00:00:00 2001 -From: Olivier Brunel <[email protected]> -Date: Fri, 5 Dec 2014 16:06:45 +0100 -Subject: [PATCH] journal: Fix navigating backwards missing entries - -With DIRECTION_UP (i.e. navigating backwards) in generic_array_bisect() when the -needle was found as the last item in the array, it wasn't actually processed as -match, resulting in entries being missed. - -https://bugs.freedesktop.org/show_bug.cgi?id=86855 - -Upstream-Status: Backport - -Signed-off-by: Jonathan Liu <[email protected]> ---- - src/journal/journal-file.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index 7858435..c5d2d19 100644 ---- a/src/journal/journal-file.c -+++ b/src/journal/journal-file.c -@@ -1657,7 +1657,7 @@ static int generic_array_bisect( - } - } - -- if (k > n) { -+ if (k >= n) { - if (direction == DIRECTION_UP) { - i = n; - subtract_one = true; --- -2.1.3 -
meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch deleted +0 -29
@@ -1,29 +0,0 @@ -Upstream-Status: Backport - -Subject: missing.h: add fake __NR_memfd_create for MIPS - -We don't have the correct __NR_memfd_create syscall number yet, so set it to -0xffffffff for now to prevent compile time errors. - -Signed-off-by: Chen Qi <[email protected]> ---- - src/shared/missing.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/shared/missing.h b/src/shared/missing.h -index 3ff1a21..3051cb5 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -167,6 +167,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) { - # define __NR_fanotify_mark 5296 - # endif - # endif -+# ifndef __NR_memfd_create -+# define __NR_memfd_create 0xffffffff /* FIXME */ -+# endif - #else - # ifndef __NR_fanotify_init - # define __NR_fanotify_init 338 --- -1.9.1 -
meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch deleted +0 -142
142 lines not on this page · raw message
meta/recipes-core/systemd/systemd/binfmt-install.patch +18 -17
@@ -9,11 +9,11 @@ however can do that in a postinst. Upstream-Status: Denied Signed-off-by: Ross Burton <[email protected]> -diff --git a/Makefile.am b/Makefile.am -index 7933de6..78acb6f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -3133,10 +3133,6 @@ INSTALL_DIRS += \ +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am ++++ git/Makefile.am +@@ -4495,10 +4495,6 @@ $(prefix)/lib/binfmt.d \ $(sysconfdir)/binfmt.d
@@ -24,30 +24,31 @@ index 7933de6..78acb6f 100644 endif EXTRA_DIST += \ -diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount -index 6be3893..709adef 100644 ---- a/units/proc-sys-fs-binfmt_misc.automount -+++ b/units/proc-sys-fs-binfmt_misc.automount -@@ -16,3 +16,6 @@ ConditionPathIsReadWrite=/proc/sys/ +Index: git/units/proc-sys-fs-binfmt_misc.automount +=================================================================== +--- git.orig/units/proc-sys-fs-binfmt_misc.automount ++++ git/units/proc-sys-fs-binfmt_misc.automount +@@ -16,3 +16,6 @@ [Automount] Where=/proc/sys/fs/binfmt_misc + +[Install] +WantedBy=sysinit.target -diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index 02dfe77..86d3481 100644 ---- a/units/systemd-binfmt.service.in -+++ b/units/systemd-binfmt.service.in -@@ -11,6 +11,7 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5) +Index: git/units/systemd-binfmt.service.in +=================================================================== +--- git.orig/units/systemd-binfmt.service.in ++++ git/units/systemd-binfmt.service.in +@@ -11,6 +11,8 @@ Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt DefaultDependencies=no Conflicts=shutdown.target +Wants=proc-sys-fs-binfmt_misc.automount - After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount ++ + After=proc-sys-fs-binfmt_misc.automount Before=sysinit.target shutdown.target ConditionPathIsReadWrite=/proc/sys/ -@@ -24,3 +25,6 @@ ConditionDirectoryNotEmpty=|/run/binfmt.d +@@ -24,3 +26,6 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-binfmt
meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch +23 -27
86 lines not on this page · raw message
meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch deleted +0 -19
@@ -1,19 +0,0 @@ -Dont include sys/sysinfo.h on uclibc it conflicts with linux/sysinfo.h - -Signed-off-by: Khem Raj <[email protected]> -Upstream-Status: Inappropriate [uclibc specific] - -Index: systemd-209/src/readahead/readahead-common.c -=================================================================== ---- systemd-209.orig/src/readahead/readahead-common.c 2014-02-12 18:42:33.810685053 -0800 -+++ systemd-209/src/readahead/readahead-common.c 2014-02-19 23:49:31.856661142 -0800 -@@ -22,7 +22,9 @@ - #include <errno.h> - #include <stdlib.h> - #include <string.h> -+#ifndef __UCLIBC__ - #include <sys/sysinfo.h> -+#endif - #include <sys/inotify.h> - #include <fcntl.h> - #include <sys/mman.h>
meta/recipes-core/systemd/systemd_219.bb renamed from meta/recipes-core/systemd/systemd_216.bb +19 -20
@@ -1,6 +1,15 @@ -SUMMARY = "System and service manager for Linux, replacing SysVinit" +SUMMARY = "A System and service manager" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd" +DESCRIPTION = "systemd is a system and service manager for Linux, compatible with \ +SysV and LSB init scripts. systemd provides aggressive parallelization \ +capabilities, uses socket and D-Bus activation for starting services, \ +offers on-demand starting of daemons, keeps track of processes using \ +Linux cgroups, supports snapshotting and restoring of the system \ +state, maintains mount and automount points and implements an \ +elaborate transactional dependency-based service control logic. It can \ +work as a drop-in replacement for sysvinit." + LICENSE = "GPLv2 & LGPLv2.1 & MIT" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \
@@ -17,9 +26,9 @@ SECTION = "base/shell" inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext -SRCREV = "5d0ae62c665262c4c55536457e84e278c252cc0b" +SRCREV = "a88abde72169ddc2df77df3fa5bed30725022253" -PV = "216+git${SRCPV}" +PV = "219+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \ file://binfmt-install.patch \
@@ -28,16 +37,10 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= file://systemd-pam-fix-fallocate.patch \ file://systemd-pam-fix-mkostemp.patch \ file://optional_secure_getenv.patch \ - file://uclibc-sysinfo_h.patch \ file://uclibc-get-physmem.patch \ file://0001-add-support-for-executing-scripts-under-etc-rcS.d.patch \ - file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \ file://0001-Make-root-s-home-directory-configurable.patch \ file://0001-systemd-user-avoid-using-system-auth.patch \ - file://0001-journal-Fix-navigating-backwards-missing-entries.patch \ - file://0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch \ - file://0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch \ - file://0001-build-sys-configure-the-list-of-system-users-files-a.patch \ file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \
@@ -90,8 +93,6 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ --enable-split-usr \ --without-python \ --with-sysvrcnd-path=${sysconfdir} \ - --with-firmware-path=/lib/firmware \ - ac_cv_path_KILL=${base_bindir}/kill \ " # uclibc does not have NSS EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "
@@ -126,6 +127,9 @@ do_install() { # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable touch ${D}${sysconfdir}/machine-id + + install -d ${D}${sysconfdir}/udev/rules.d/ + install -d ${D}${sysconfdir}/tmpfiles.d install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
@@ -158,7 +162,9 @@ do_install() { sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it # for existence else it fails - ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)} + if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then + ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)} + fi } do_install_ptest () {
@@ -309,14 +315,7 @@ FILES_udev += "${base_sbindir}/udevd \ ${rootlibexecdir}/udev/scsi_id \ ${rootlibexecdir}/udev/v4l_id \ ${rootlibexecdir}/udev/keymaps \ - ${rootlibexecdir}/udev/rules.d/4*.rules \ - ${rootlibexecdir}/udev/rules.d/5*.rules \ - ${rootlibexecdir}/udev/rules.d/6*.rules \ - ${rootlibexecdir}/udev/rules.d/70-power-switch.rules \ - ${rootlibexecdir}/udev/rules.d/75*.rules \ - ${rootlibexecdir}/udev/rules.d/78*.rules \ - ${rootlibexecdir}/udev/rules.d/8*.rules \ - ${rootlibexecdir}/udev/rules.d/95*.rules \ + ${rootlibexecdir}/udev/rules.d/*.rules \ ${sysconfdir}/udev \ ${sysconfdir}/init.d/systemd-udevd \ ${systemd_unitdir}/system/*udev* \
Signature · 1 line
2.1.4
PATCH 2/5 util-linux, util-linux-libs: Build and package util-linux libs separately
We have a catch-22 where systemd->libmount(util-linux) -> libssytemd(systemd)
This patch breaks the dependency loop by building and packaging libraries from util-linux package in a separate package.
Adjust dependencies accordingly
Backport patches to make util-linux compile happy on musl
---
...ch_root_improve_statfs_f_type_portability.patch | 56 +++++++++++++
.../files/0002-include_statfs_magic.patch | 45 +++++++++++
.../{util-linux => files}/configure-sbindir.patch | 0
.../{util-linux => files}/fix-parallel-build.patch | 0
.../uclibc-__progname-conflict.patch | 0
.../util-linux-native-qsort.patch | 0
.../{util-linux => files}/util-linux-native.patch | 0
.../util-linux-ng-2.16-mount_lock_path.patch | 0
.../util-linux-ng-replace-siginterrupt.patch | 0
meta/recipes-core/util-linux/util-linux-libs.inc | 93 ++++++++++++++++++++++
.../util-linux/util-linux-libs_2.25.2.bb | 25 ++++++
meta/recipes-core/util-linux/util-linux.inc | 23 ++----
meta/recipes-core/util-linux/util-linux_2.25.2.bb | 2 +
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
14 files changed, 229 insertions(+), 17 deletions(-)
create mode 100644 meta/recipes-core/util-linux/files/0001-switch_root_improve_statfs_f_type_portability.patch
create mode 100644 meta/recipes-core/util-linux/files/0002-include_statfs_magic.patch
rename meta/recipes-core/util-linux/{util-linux => files}/configure-sbindir.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/fix-parallel-build.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/uclibc-__progname-conflict.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/util-linux-native-qsort.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/util-linux-native.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/util-linux-ng-2.16-mount_lock_path.patch (100%)
rename meta/recipes-core/util-linux/{util-linux => files}/util-linux-ng-replace-siginterrupt.patch (100%)
create mode 100644 meta/recipes-core/util-linux/util-linux-libs.inc
create mode 100644 meta/recipes-core/util-linux/util-linux-libs_2.25.2.bbmeta/recipes-core/util-linux/files/0001-switch_root_improve_statfs_f_type_portability.patch new file +56 -0
@@ -0,0 +1,56 @@ +Upstream-Status: Backport +Signed-off-by: Khem Raj <[email protected]> + +From 8f806bb1ea30f15db7ca36d1cfa79349f8115302 Mon Sep 17 00:00:00 2001 +From: Karel Zak <[email protected]> +Date: Thu, 6 Nov 2014 12:50:27 +0100 +Subject: [PATCH] switch_root: improve statfs->f_type portability + +__SWORD_TYPE is not available everywhere, for example it's not defined +by musl libc. It also seems that __SWORD_TYPE is not used for f_type +on some architectures (s390x). + +Reported-by: Natanael Copa <[email protected]> +Signed-off-by: Karel Zak <[email protected]> +--- + include/statfs_magic.h | 11 +++++++++++ + sys-utils/switch_root.c | 4 ++-- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/include/statfs_magic.h b/include/statfs_magic.h +index b5fde1a..d27be1c 100644 +--- a/include/statfs_magic.h ++++ b/include/statfs_magic.h +@@ -1,6 +1,17 @@ + #ifndef UTIL_LINUX_STATFS_MAGIC_H + #define UTIL_LINUX_STATFS_MAGIC_H + ++#include <sys/statfs.h> ++ ++/* ++ * If possible then don't depend on internal libc __SWORD_TYPE type. ++ */ ++#ifdef __GNUC__ ++typedef __typeof__( ((struct statfs *)0)->f_type ) ul_statfs_ftype_t; ++#else ++typedef __SWORD_TYPE ul_statfs_ftype_t; ++#endif ++ + /* + * Unfortunately, Linux kernel hedeader file <linux/magic.h> is incomplete + * mess and kernel returns by statfs f_type many numbers that are nowhere +diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c +index 6822a5d..c6a2eff 100644 +--- a/sys-utils/switch_root.c ++++ b/sys-utils/switch_root.c +@@ -181,8 +181,8 @@ static int switchroot(const char *newroot) + if (pid <= 0) { + struct statfs stfs; + if (fstatfs(cfd, &stfs) == 0 && +- (stfs.f_type == (__SWORD_TYPE)STATFS_RAMFS_MAGIC || +- stfs.f_type == (__SWORD_TYPE)STATFS_TMPFS_MAGIC)) ++ (stfs.f_type == (ul_statfs_ftype_t) STATFS_RAMFS_MAGIC || ++ stfs.f_type == (ul_statfs_ftype_t) STATFS_TMPFS_MAGIC)) + recursiveRemove(cfd); + else + warn(_("old root filesystem is not an initramfs"));
meta/recipes-core/util-linux/files/0002-include_statfs_magic.patch new file +45 -0
45 lines not on this page · raw message
meta/recipes-core/util-linux/files/configure-sbindir.patch renamed from meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +0 -0
meta/recipes-core/util-linux/files/fix-parallel-build.patch renamed from meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch +0 -0
meta/recipes-core/util-linux/files/uclibc-__progname-conflict.patch renamed from meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch +0 -0
meta/recipes-core/util-linux/files/util-linux-native-qsort.patch renamed from meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch +0 -0
meta/recipes-core/util-linux/files/util-linux-native.patch renamed from meta/recipes-core/util-linux/util-linux/util-linux-native.patch +0 -0
meta/recipes-core/util-linux/files/util-linux-ng-2.16-mount_lock_path.patch renamed from meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch +0 -0
meta/recipes-core/util-linux/files/util-linux-ng-replace-siginterrupt.patch renamed from meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch +0 -0
meta/recipes-core/util-linux/util-linux-libs.inc new file +93 -0
93 lines not on this page · raw message
meta/recipes-core/util-linux/util-linux-libs_2.25.2.bb new file +25 -0
@@ -0,0 +1,25 @@ +MAJOR_VERSION = "2.25" +require util-linux-libs.inc + +SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ + file://util-linux-ng-2.16-mount_lock_path.patch \ + file://uclibc-__progname-conflict.patch \ + file://configure-sbindir.patch \ + file://fix-parallel-build.patch \ + file://0001-switch_root_improve_statfs_f_type_portability.patch \ + file://0002-include_statfs_magic.patch \ +" + +SRC_URI[md5sum] = "cab3d7be354000f629bc601238b629b3" +SRC_URI[sha256sum] = "e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6" + +CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" + +EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ + --disable-fallocate --disable-use-tty-group \ +" +EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \ + --disable-fallocate --disable-use-tty-group \ +" + +S = "${WORKDIR}/util-linux-${PV}"
meta/recipes-core/util-linux/util-linux.inc +7 -16
@@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16" inherit autotools gettext pkgconfig systemd update-alternatives python-dir -DEPENDS = "zlib ncurses" +DEPENDS = "zlib ncurses util-linux-libs" DEPENDS_append_class-native = " lzo-native" DEPENDS_append_class-nativesdk = " lzo-native"
@@ -27,8 +27,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ util-linux-swaponoff util-linux-losetup util-linux-umount \ - util-linux-mount util-linux-readprofile util-linux-libblkid \ - util-linux-libmount util-linux-libuuid util-linux-uuidd \ + util-linux-mount util-linux-readprofile util-linux-uuidd \ util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ util-linux-mkfs util-linux-mcookie util-linux-reset \ util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
@@ -46,7 +45,7 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \ usrsbin_execdir='${sbindir}' \ " -EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" +EXTRA_OECONF = "${SHARED_EXTRA_OECONF}" PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} "
@@ -64,9 +63,6 @@ PACKAGECONFIG[pylibmount] = "--with-python --enable-pylibmount,--without-python FILES_${PN}-bash-completion += "${datadir}/bash-completion" FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" -FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.la" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/.debug/" - FILES_util-linux-agetty = "${base_sbindir}/agetty" FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" FILES_util-linux-fstrim = "${base_sbindir}/fstrim"
@@ -86,11 +82,6 @@ FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" FILES_util-linux-getopt = "${bindir}/getopt.${BPN}" -FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" -FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" -FILES_util-linux-pylibmount = "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.so \ - ${libdir}/${PYTHON_DIR}/dist-packages/libmount/__init__.*" -FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" FILES_util-linux-lscpu = "${bindir}/lscpu" FILES_util-linux-fsck = "${base_sbindir}/fsck*"
@@ -115,8 +106,6 @@ RRECOMMENDS_${PN}_class-nativesdk = "" RDEPENDS_${PN}_class-native = "" RDEPENDS_${PN}_class-nativesdk = "" -RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev" - SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim" SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable"
@@ -125,7 +114,7 @@ SYSTEMD_AUTO_ENABLE_${PN}-fstrim = "disable" do_compile () { set -e - oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' + oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' } do_install () {
@@ -135,7 +124,9 @@ do_install () { oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \ 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install - + rm -rf ${D}${libdir} + rm -rf ${D}${base_libdir}/*.so* + rm -rf ${D}${includedir} mkdir -p ${D}${base_bindir} sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
meta/recipes-core/util-linux/util-linux_2.25.2.bb +2 -0
@@ -14,6 +14,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ file://uclibc-__progname-conflict.patch \ file://configure-sbindir.patch \ file://fix-parallel-build.patch \ + file://0001-switch_root_improve_statfs_f_type_portability.patch \ + file://0002-include_statfs_magic.patch \ ${OLDHOST} \ "
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +1 -1
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b48f21d765b875bd10400975d12c1ca2 \ file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \ file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6" SECTION = "base" -DEPENDS = "util-linux" +DEPENDS = "util-linux-libs" SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ file://mkdir.patch"
Signature · 1 line
2.1.4
Re: [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately
Quoted 5 lines · Khem Raj
We have a catch-22 where
systemd->libmount(util-linux)-> libssytemd(systemd)This patch breaks the dependency loop by building and packaging libraries from util-linux package in a separate package.
Every time we're tried to split a piece of software into two like this it has been a world of pain. Are we sure there is no alternative to this?
I'm *very* nervous about this :(
Cheers,
Richard
Re: [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately
Quoted 7 lines · Richard Purdie
Quoted 3 lines · Khem Raj
We have a catch-22 where
systemd->libmount(util-linux)-> libssytemd(systemd)
Quoted 8 lines
Quoted 2 lines
This patch breaks the dependency loop by building and packaging libraries from util-linux package in a separate package.
Every time we're tried to split a piece of software into two like this it has been a world of pain. Are we sure there is no alternative to this?
I'm *very* nervous about this :(
I don’t think there is another solution. unless we have a different package providing libmount.so and then we could disable it in util-linux, I have taken most care during split, thanks to testlab/buildhistory to make sure that exact content is divided into 2. What sort of issues do you expect ?
Re: [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately
In reply to Richard PurdieQuoted 4 lines · Richard Purdie
Every time we're tried to split a piece of software into two like this it has been a world of pain. Are we sure there is no alternative to this?
One alternative is to just disable systemd in util-linux, surely. Last time I looked it was just uuidd that can optionally use libsystemd to daemonise cleanly.
Ross
Re: [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately
Quoted 4 lines · Ross
Quoted 1 line · Richard Purdie
Quoted 8 lines
Quoted 3 lines
Every time we're tried to split a piece of software into two like this it has been a world of pain. Are we sure there is no alternative to this?
One alternative is to just disable systemd in util-linux, surely. Last time I looked it was just uuidd that can optionally use libsystemd to daemonise cleanly.
Thats is intrusive too. btw I have updated the latest patch here
http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/misc&id=c53322e9e587ef9a88c050f21aa98604deeeeb1f
Double installs were fixed which I found with clean builds from sstate.
PATCH 3/5 systemd: Add missing dependency on util-linux-libs
In reply to Khem Raj--- meta/recipes-core/systemd/systemd_219.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/systemd/systemd_219.bb +1 -1
@@ -19,7 +19,7 @@ PROVIDES = "udev" PE = "1" -DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native" +DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux-libs" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SECTION = "base/shell"
Signature · 1 line
2.1.4
PATCH 4/5 tclibc-musl: Use musl for providing virtual/libintl instead of gettext
In reply to Khem RajLets try to use musl version of libintl and see how far we get
--- meta/conf/distro/include/tclibc-musl.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/tclibc-musl.inc +1 -1
@@ -10,7 +10,7 @@ OVERRIDES .= "${LIBCOVERRIDE}" PREFERRED_PROVIDER_virtual/libc ?= "musl" PREFERRED_PROVIDER_virtual/libiconv ?= "musl" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" +PREFERRED_PROVIDER_virtual/libintl ?= "musl" PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc"
Signature · 1 line
2.1.4
PATCH 5/5 glibc: Dont offer to be parsed for non-glibc TCLIBC selection
In reply to Khem RajWe now can support musl along with uclibc and glibc earlier when only alternative was uclibc this check was fine but now we need to consider non-glibc vs glibc case instead of uclibc vs glibc
--- meta/recipes-core/glibc/glibc_2.21.bb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
meta/recipes-core/glibc/glibc_2.21.bb +4 -8
@@ -62,17 +62,13 @@ TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}" GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1" # -# For now, we will skip building of a gcc package if it is a uclibc one -# and our build is not a uclibc one, and we skip a glibc one if our build -# is a uclibc build. +# We will skip parsing glibc when system C library selection is not glibc +# this helps in easing out parsing for non-glibc system libraries # -# See the note in gcc/gcc_3.4.0.oe -# - python __anonymous () { import re - uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) - if uc_os: + notglibc = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) and (re.match('.*musl$', d.getVar('TARGET_OS', True)) != None) + if notglibc: raise bb.parse.SkipPackage("incompatible with target %s" % d.getVar('TARGET_OS', True)) }
Signature · 1 line
2.1.4
Re: [PATCH 5/5] glibc: Dont offer to be parsed for non-glibc TCLIBC selection
Quoted 4 lines · Khem Raj
+ notglibc = (re.match('.*uclibc
,d.getVar('TARGET_OS', True)) != None) and (re.match('.*musl, d.getVar('TARGET_OS', True))!= None)
+ if notglibc:
Pretty sure this is a condition that will never be satisfied. This will only succeed if TARGET_OS is both musl and uclibc. Could we skip on TCLIBC != glibc, to be both future proof and fix the logic?
Signature · 5 lines
Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics
Re: [PATCH 5/5] glibc: Dont offer to be parsed for non-glibc TCLIBC selection
Quoted 11 lines · Christopher Larson
Quoted 5 lines · Khem Raj
+ notglibc = (re.match('.*uclibc
,d.getVar('TARGET_OS', True)) != None) and (re.match('.*musl, d.getVar('TARGET_OS', True))!= None)
+ if notglibc:Pretty sure this is a condition that will never be satisfied. This will only succeed if
TARGET_OSis both musl and uclibc.
right ! I should have paid more attention. But since bitbake stopped complaining with my test case
i relied on it not warning me. but I realise it should have just reused the parser cache
Could we skip on TCLIBC !=
Quoted 1 line
glibc, to be both future proof and fix the logic?
Actually that was the patch I have done prior to this ( see meta-linaro) but thats too restrictive since
it also meant that it started to ignore it for nativesdk-libc and we use glibc as a provider to nativesdk version
of libc even in cases when target libc is musl or uclibc. So TARGET_OS is really the correct variable here.
Quoted 6 lines
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics