* [PATCH 0/5] systemd 219 upgrade and musl fixes
@ 2015-02-20 4:24 Khem Raj
2015-02-20 4:24 ` [PATCH 1/5] systemd: Upgrade 216 -> 219 Khem Raj
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Khem Raj @ 2015-02-20 4:24 UTC (permalink / raw)
To: openembedded-core
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.bb
--
2.1.4
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/5] systemd: Upgrade 216 -> 219
2015-02-20 4:24 [PATCH 0/5] systemd 219 upgrade and musl fixes Khem Raj
@ 2015-02-20 4:24 ` Khem Raj
2015-02-20 4:24 ` [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately Khem Raj
` (3 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Khem Raj @ 2015-02-20 4:24 UTC (permalink / raw)
To: openembedded-core
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
Change-Id: Ic53aaad198998de146c3a7702ef17de871de9de6
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...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%)
diff --git a/meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch
index c5ad291..c0ce4a9 100644
--- a/meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch
+++ b/meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch
@@ -21,11 +21,11 @@ Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
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"
diff --git a/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch b/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch
deleted file mode 100644
index e004359..0000000
--- a/meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 5a16bc264c32237e38a844d55e7a1820a31b8440 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com>
-Date: Fri, 28 Nov 2014 15:59:59 +0100
-Subject: [PATCH] build-sys: configure the list of system users, files and
- directories
-
-Choose which system users defined in sysusers.d/systemd.conf and files
-or directories in tmpfiles.d/systemd.conf, should be provided depending
-on comile-time configuration.
-
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Makefile.am | 4 ++++
- configure.ac | 2 ++
- sysusers.d/.gitignore | 1 +
- sysusers.d/{systemd.conf => systemd.conf.m4} | 8 ++++++++
- tmpfiles.d/.gitignore | 3 ++-
- tmpfiles.d/{systemd.conf => systemd.conf.m4} | 2 ++
- 6 files changed, 19 insertions(+), 1 deletion(-)
- rename sysusers.d/{systemd.conf => systemd.conf.m4} (77%)
- rename tmpfiles.d/{systemd.conf => systemd.conf.m4} (96%)
-
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am 2015-01-23 21:23:04.000000000 +0000
-+++ git/Makefile.am 2015-01-23 21:23:04.000000000 +0000
-@@ -5698,6 +5698,10 @@
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
-
-+sysusers.d/%: sysusers.d/%.m4
-+ $(AM_V_at)$(MKDIR_P) $(dir $@)
-+ $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
-+
- tmpfiles.d/%: tmpfiles.d/%.m4
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac 2015-01-23 21:23:04.000000000 +0000
-+++ git/configure.ac 2015-01-23 21:23:04.000000000 +0000
-@@ -971,6 +971,7 @@
- AC_ARG_ENABLE(timesyncd, AS_HELP_STRING([--disable-timesyncd], [disable timesync daemon]))
- if test "x$enable_timesyncd" != "xno"; then
- have_timesyncd=yes
-+ M4_DEFINES="$M4_DEFINES -DENABLE_TIMESYNCD"
- fi
- AM_CONDITIONAL(ENABLE_TIMESYNCD, [test "$have_timesyncd" = "yes"])
-
-@@ -1060,6 +1061,7 @@
- AS_IF([test "x$enable_networkd" != "xno"], [
- AC_DEFINE(ENABLE_NETWORKD, 1, [Define if networkd support is to be enabled])
- have_networkd=yes
-+ M4_DEFINES="$M4_DEFINES -DENABLE_NETWORKD"
- ])
- AM_CONDITIONAL(ENABLE_NETWORKD, [test "x$have_networkd" = "xyes"])
-
-Index: git/sysusers.d/systemd.conf
-===================================================================
---- git.orig/sysusers.d/systemd.conf 2015-01-23 21:23:02.000000000 +0000
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,12 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--g systemd-journal - -
--u systemd-bus-proxy - "systemd Bus Proxy"
--u systemd-network - "systemd Network Management"
--u systemd-resolve - "systemd Resolver"
--u systemd-timesync - "systemd Time Synchronization"
-Index: git/sysusers.d/systemd.conf.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ git/sysusers.d/systemd.conf.m4 2015-01-23 21:26:30.000000000 +0000
-@@ -0,0 +1,20 @@
-+# This file is part of systemd.
-+#
-+# systemd is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU Lesser General Public License as published by
-+# the Free Software Foundation; either version 2.1 of the License, or
-+# (at your option) any later version.
-+
-+g systemd-journal - -
-+m4_ifdef(`ENABLE_KDBUS',
-+u systemd-bus-proxy - "systemd Bus Proxy"
-+)m4_dnl
-+m4_ifdef(`ENABLE_NETWORKD',
-+u systemd-network - "systemd Network Management"
-+)m4_dnl
-+m4_ifdef(`ENABLE_RESOLVED',
-+u systemd-resolve - "systemd Resolver"
-+)m4_dnl
-+m4_ifdef(`ENABLE_TIMESYNCD',
-+u systemd-timesync - "systemd Time Synchronization"
-+)m4_dnl
-Index: git/tmpfiles.d/systemd.conf
-===================================================================
---- git.orig/tmpfiles.d/systemd.conf 2015-01-23 21:23:02.000000000 +0000
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,32 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--# See tmpfiles.d(5) for details
--
--d /run/user 0755 root root -
--F! /run/utmp 0664 root utmp -
--
--d /run/systemd/ask-password 0755 root root -
--d /run/systemd/seats 0755 root root -
--d /run/systemd/sessions 0755 root root -
--d /run/systemd/users 0755 root root -
--d /run/systemd/machines 0755 root root -
--d /run/systemd/shutdown 0755 root root -
--d /run/systemd/netif 0755 systemd-network systemd-network -
--d /run/systemd/netif/links 0755 systemd-network systemd-network -
--d /run/systemd/netif/leases 0755 systemd-network systemd-network -
--
--d /run/log 0755 root root -
--
--z /run/log/journal 2755 root systemd-journal - -
--Z /run/log/journal/%m ~2750 root systemd-journal - -
--
--z /var/log/journal 2755 root systemd-journal - -
--z /var/log/journal/%m 2755 root systemd-journal - -
--
--d /var/lib/systemd 0755 root root -
--d /var/lib/systemd/coredump 0755 root root 3d
-Index: git/tmpfiles.d/systemd.conf.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ git/tmpfiles.d/systemd.conf.m4 2015-01-23 21:26:46.000000000 +0000
-@@ -0,0 +1,34 @@
-+# This file is part of systemd.
-+#
-+# systemd is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU Lesser General Public License as published by
-+# the Free Software Foundation; either version 2.1 of the License, or
-+# (at your option) any later version.
-+
-+# See tmpfiles.d(5) for details
-+
-+d /run/user 0755 root root -
-+F! /run/utmp 0664 root utmp -
-+
-+d /run/systemd/ask-password 0755 root root -
-+d /run/systemd/seats 0755 root root -
-+d /run/systemd/sessions 0755 root root -
-+d /run/systemd/users 0755 root root -
-+d /run/systemd/machines 0755 root root -
-+d /run/systemd/shutdown 0755 root root -
-+m4_ifdef(`ENABLE_NETWORKD',
-+d /run/systemd/netif 0755 systemd-network systemd-network -
-+d /run/systemd/netif/links 0755 systemd-network systemd-network -
-+d /run/systemd/netif/leases 0755 systemd-network systemd-network -
-+)m4_dnl
-+
-+d /run/log 0755 root root -
-+
-+z /run/log/journal 2755 root systemd-journal - -
-+Z /run/log/journal/%m ~2750 root systemd-journal - -
-+
-+z /var/log/journal 2755 root systemd-journal - -
-+z /var/log/journal/%m 2755 root systemd-journal - -
-+
-+d /var/lib/systemd 0755 root root -
-+d /var/lib/systemd/coredump 0755 root root 3d
diff --git a/meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch b/meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch
deleted file mode 100644
index 4795f86..0000000
--- a/meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From bedd083aaedb3bbb14ef579a047bf4b4fed56d9b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com>
-Date: Wed, 26 Nov 2014 09:17:50 +0100
-Subject: [PATCH] build-sys: do not install tmpfiles and sysusers files by
- default
-
-Upstream-Status: Backport
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- Makefile.am | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index ddd0df1..65bb176 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2039,7 +2039,6 @@ nodist_tmpfiles_DATA = \
- dist_tmpfiles_DATA = \
- tmpfiles.d/systemd.conf \
- tmpfiles.d/systemd-nologin.conf \
-- tmpfiles.d/systemd-remote.conf \
- tmpfiles.d/tmp.conf \
- tmpfiles.d/x11.conf \
- tmpfiles.d/var.conf
-@@ -2094,8 +2093,7 @@ SYSINIT_TARGET_WANTS += \
- systemd-sysusers.service
-
- dist_sysusers_DATA = \
-- sysusers.d/systemd.conf \
-- sysusers.d/systemd-remote.conf
-+ sysusers.d/systemd.conf
-
- nodist_sysusers_DATA = \
- sysusers.d/basic.conf
-@@ -3839,6 +3837,16 @@ systemd_journal_remote_CFLAGS = \
- systemd_journal_remote_LDADD += \
- $(MICROHTTPD_LIBS)
-
-+if ENABLE_SYSUSERS
-+dist_sysusers_DATA += \
-+ sysusers.d/systemd-remote.conf
-+endif
-+
-+if ENABLE_TMPFILES
-+dist_tmpfiles_DATA += \
-+ tmpfiles.d/systemd-remote.conf
-+endif
-+
- if HAVE_GNUTLS
- systemd_journal_remote_LDADD += \
- $(GNUTLS_LIBS)
---
-1.9.1
-
diff --git a/meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch b/meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch
deleted file mode 100644
index 621a0da..0000000
--- a/meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2173cbf847fc53ca24950e77958c902edecfc207 Mon Sep 17 00:00:00 2001
-From: Olivier Brunel <jjk@jjacky.com>
-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 <net147@gmail.com>
----
- 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
-
diff --git a/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch b/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch
deleted file mode 100644
index 448ef1a..0000000
--- a/meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch
+++ /dev/null
@@ -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 <Qi.Chen@windriver.com>
----
- 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
-
diff --git a/meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch b/meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch
deleted file mode 100644
index b5b0168..0000000
--- a/meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From aeb50ff0bd4bbbca74c4695072232348351d512d Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Wed, 27 Aug 2014 17:45:41 +0200
-Subject: [PATCH] tmpfiles: make resolv.conf entry conditional on resolved
- support
-
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- Makefile.am | 15 +++++++++++++--
- TODO | 2 --
- configure.ac | 1 +
- tmpfiles.d/.gitignore | 1 +
- tmpfiles.d/{etc.conf => etc.conf.m4} | 2 ++
- 5 files changed, 17 insertions(+), 4 deletions(-)
- create mode 100644 tmpfiles.d/.gitignore
- rename tmpfiles.d/{etc.conf => etc.conf.m4} (95%)
-
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am 2015-01-24 00:41:20.134716451 -0800
-+++ git/Makefile.am 2015-01-24 00:41:20.126716451 -0800
-@@ -1935,14 +1935,16 @@
- units/systemd-tmpfiles-setup.service \
- units/systemd-tmpfiles-clean.service
-
-+nodist_tmpfiles_DATA = \
-+ tmpfiles.d/etc.conf
-+
- dist_tmpfiles_DATA = \
- tmpfiles.d/systemd.conf \
- tmpfiles.d/systemd-nologin.conf \
- tmpfiles.d/systemd-remote.conf \
- tmpfiles.d/tmp.conf \
- tmpfiles.d/x11.conf \
-- tmpfiles.d/var.conf \
-- tmpfiles.d/etc.conf
-+ tmpfiles.d/var.conf
-
- if HAVE_SYSV_COMPAT
- dist_tmpfiles_DATA += \
-@@ -1965,10 +1967,14 @@
- endif
-
- EXTRA_DIST += \
-+ tmpfiles.d/etc.conf.m4 \
- units/systemd-tmpfiles-setup-dev.service.in \
- units/systemd-tmpfiles-setup.service.in \
- units/systemd-tmpfiles-clean.service.in
-
-+CLEANFILES += \
-+ tmpfiles.d/etc.conf
-+
- # ------------------------------------------------------------------------------
- if ENABLE_SYSUSERS
- systemd_sysusers_SOURCES = \
-@@ -5684,6 +5690,11 @@
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
-
-+tmpfiles.d/%: tmpfiles.d/%.m4
-+ $(AM_V_at)$(MKDIR_P) $(dir $@)
-+ $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
-+
-+
- units/%: units/%.m4
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
-Index: git/TODO
-===================================================================
---- git.orig/TODO 2015-01-24 00:41:20.134716451 -0800
-+++ git/TODO 2015-01-24 00:41:20.126716451 -0800
-@@ -111,8 +111,6 @@
-
- * Allow multiple ExecStart= for all Type= settings, so that we can cover rescue.service nicely
-
--* the resolv.conf tmpfiles line should be covered by ENABLE_NETWORKD...
--
- * Add a new verb "systemctl top"
-
- * logind: allow users to kill or lock their own sessions
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac 2015-01-24 00:41:20.134716451 -0800
-+++ git/configure.ac 2015-01-24 00:41:20.126716451 -0800
-@@ -1041,6 +1041,7 @@
- AC_ARG_ENABLE(resolved, AS_HELP_STRING([--disable-resolved], [disable resolve daemon]))
- if test "x$enable_resolved" != "xno"; then
- have_resolved=yes
-+ M4_DEFINES="$M4_DEFINES -DENABLE_RESOLVED"
- fi
- AM_CONDITIONAL(ENABLE_RESOLVED, [test "$have_resolved" = "yes"])
-
-Index: git/tmpfiles.d/.gitignore
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ git/tmpfiles.d/.gitignore 2015-01-24 00:41:20.126716451 -0800
-@@ -0,0 +1 @@
-+etc.conf
-Index: git/tmpfiles.d/etc.conf
-===================================================================
---- git.orig/tmpfiles.d/etc.conf 2015-01-24 00:41:20.134716451 -0800
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,15 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--# See tmpfiles.d(5) for details
--
--L /etc/os-release - - - - ../usr/lib/os-release
--L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
--L+ /etc/mtab - - - - ../proc/self/mounts
--L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
--C /etc/nsswitch.conf - - - -
--C /etc/pam.d - - - -
-Index: git/tmpfiles.d/etc.conf.m4
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ git/tmpfiles.d/etc.conf.m4 2015-01-24 00:41:20.126716451 -0800
-@@ -0,0 +1,17 @@
-+# This file is part of systemd.
-+#
-+# systemd is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU Lesser General Public License as published by
-+# the Free Software Foundation; either version 2.1 of the License, or
-+# (at your option) any later version.
-+
-+# See tmpfiles.d(5) for details
-+
-+L /etc/os-release - - - - ../usr/lib/os-release
-+L /etc/localtime - - - - ../usr/share/zoneinfo/UTC
-+L+ /etc/mtab - - - - ../proc/self/mounts
-+m4_ifdef(`ENABLE_RESOLVED',
-+L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf
-+)
-+C /etc/nsswitch.conf - - - -
-+C /etc/pam.d - - - -
diff --git a/meta/recipes-core/systemd/systemd/binfmt-install.patch b/meta/recipes-core/systemd/systemd/binfmt-install.patch
index c2d5099..93b8e3c 100644
--- a/meta/recipes-core/systemd/systemd/binfmt-install.patch
+++ b/meta/recipes-core/systemd/systemd/binfmt-install.patch
@@ -9,11 +9,11 @@ however can do that in a postinst.
Upstream-Status: Denied
Signed-off-by: Ross Burton <ross.burton@intel.com>
-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
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
index f8e19ce..28a9a34 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
@@ -9,11 +9,11 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
src/journal/journald-kmsg.c | 16 ++++++++++++++--
2 files changed, 29 insertions(+), 3 deletions(-)
-diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index f2f1f35..092f87b 100644
---- a/src/journal/journal-file.c
-+++ b/src/journal/journal-file.c
-@@ -38,6 +38,8 @@
+Index: git/src/journal/journal-file.c
+===================================================================
+--- git.orig/src/journal/journal-file.c
++++ git/src/journal/journal-file.c
+@@ -35,6 +35,8 @@
#include "compress.h"
#include "fsprg.h"
@@ -22,7 +22,7 @@ index f2f1f35..092f87b 100644
#define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
#define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
-@@ -314,7 +316,7 @@ static int journal_file_verify_header(JournalFile *f) {
+@@ -314,7 +316,7 @@ static int journal_file_verify_header(Jo
static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
uint64_t old_size, new_size;
@@ -31,7 +31,7 @@ index f2f1f35..092f87b 100644
assert(f);
-@@ -362,9 +364,21 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
+@@ -362,9 +364,21 @@ static int journal_file_allocate(Journal
/* Note that the glibc fallocate() fallback is very
inefficient, hence we try to minimize the allocation area
as we can. */
@@ -53,10 +53,10 @@ index f2f1f35..092f87b 100644
if (fstat(f->fd, &f->last_stat) < 0)
return -errno;
-diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
-index 12992e7..dc4fa93 100644
---- a/src/journal/journald-kmsg.c
-+++ b/src/journal/journald-kmsg.c
+Index: git/src/journal/journald-kmsg.c
+===================================================================
+--- git.orig/src/journal/journald-kmsg.c
++++ git/src/journal/journald-kmsg.c
@@ -437,6 +437,7 @@ fail:
int server_open_kernel_seqnum(Server *s) {
_cleanup_close_ int fd;
@@ -65,28 +65,24 @@ index 12992e7..dc4fa93 100644
assert(s);
-@@ -449,8 +450,19 @@ int server_open_kernel_seqnum(Server *s) {
- log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m");
+@@ -450,7 +451,19 @@ int server_open_kernel_seqnum(Server *s)
return 0;
}
--
+
- if (posix_fallocate(fd, 0, sizeof(uint64_t)) < 0) {
+#ifdef HAVE_POSIX_FALLOCATE
+ r = posix_fallocate(fd, 0, sizeof(uint64_t));
+#else
-+ /* Use good old method to write zeros into the journal file
-+ perhaps very inefficient yet working. */
-+ char *buf = alloca(sizeof(uint64_t));
-+ off_t oldpos = lseek(fd, 0, SEEK_CUR);
-+ bzero(buf, sizeof(uint64_t));
-+ lseek(fd, 0, SEEK_SET);
-+ r = write(fd, buf, sizeof(uint64_t));
-+ lseek(fd, oldpos, SEEK_SET);
++ /* Use good old method to write zeros into the journal file
++ perhaps very inefficient yet working. */
++ char *buf = alloca(sizeof(uint64_t));
++ off_t oldpos = lseek(fd, 0, SEEK_CUR);
++ bzero(buf, sizeof(uint64_t));
++ lseek(fd, 0, SEEK_SET);
++ r = write(fd, buf, sizeof(uint64_t));
++ lseek(fd, oldpos, SEEK_SET);
+#endif /* HAVE_POSIX_FALLOCATE */
-+ if (r < 0) {
- log_error("Failed to allocate sequential number file, ignoring: %m");
++ if (r < 0) {
+ log_error_errno(errno, "Failed to allocate sequential number file, ignoring: %m");
return 0;
}
---
-1.7.9.5
-
diff --git a/meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch b/meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch
deleted file mode 100644
index 15645de..0000000
--- a/meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Dont include sys/sysinfo.h on uclibc it conflicts with linux/sysinfo.h
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-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>
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_219.bb
similarity index 92%
rename from meta/recipes-core/systemd/systemd_216.bb
rename to meta/recipes-core/systemd/systemd_219.bb
index 569e88c..009b4d6 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -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* \
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately
2015-02-20 4:24 [PATCH 0/5] systemd 219 upgrade and musl fixes Khem Raj
2015-02-20 4:24 ` [PATCH 1/5] systemd: Upgrade 216 -> 219 Khem Raj
@ 2015-02-20 4:24 ` Khem Raj
2015-02-20 12:55 ` Richard Purdie
2015-02-20 4:24 ` [PATCH 3/5] systemd: Add missing dependency on util-linux-libs Khem Raj
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Khem Raj @ 2015-02-20 4:24 UTC (permalink / raw)
To: openembedded-core
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
Change-Id: Ibfdf4c9d106f8d90707418e1975932188a6b3036
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...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.bb
diff --git a/meta/recipes-core/util-linux/files/0001-switch_root_improve_statfs_f_type_portability.patch b/meta/recipes-core/util-linux/files/0001-switch_root_improve_statfs_f_type_portability.patch
new file mode 100644
index 0000000..1a0087b
--- /dev/null
+++ b/meta/recipes-core/util-linux/files/0001-switch_root_improve_statfs_f_type_portability.patch
@@ -0,0 +1,56 @@
+Upstream-Status: Backport
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+From 8f806bb1ea30f15db7ca36d1cfa79349f8115302 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+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 <ncopa@alpinelinux.org>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ 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"));
diff --git a/meta/recipes-core/util-linux/files/0002-include_statfs_magic.patch b/meta/recipes-core/util-linux/files/0002-include_statfs_magic.patch
new file mode 100644
index 0000000..fa0d25c
--- /dev/null
+++ b/meta/recipes-core/util-linux/files/0002-include_statfs_magic.patch
@@ -0,0 +1,45 @@
+Upstream-Status: Backport
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+From 64d0cee6c00abb3efa89d53879c0bba15f7eb805 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 10 Nov 2014 11:29:42 +0100
+Subject: [PATCH] include/statfs_magic: use macro rather than type for f_type
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ include/statfs_magic.h | 4 ++--
+ sys-utils/switch_root.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/statfs_magic.h b/include/statfs_magic.h
+index d27be1c..7397a4e 100644
+--- a/include/statfs_magic.h
++++ b/include/statfs_magic.h
+@@ -7,9 +7,9 @@
+ * 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;
++#define F_TYPE_EQUAL(a, b) (a == (__typeof__(a)) b)
+ #else
+-typedef __SWORD_TYPE ul_statfs_ftype_t;
++#define F_TYPE_EQUAL(a, b) (a == (__SWORD_TYPE) b)
+ #endif
+
+ /*
+diff --git a/sys-utils/switch_root.c b/sys-utils/switch_root.c
+index c6a2eff..534d44a 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 == (ul_statfs_ftype_t) STATFS_RAMFS_MAGIC ||
+- stfs.f_type == (ul_statfs_ftype_t) STATFS_TMPFS_MAGIC))
++ (F_TYPE_EQUAL(stfs.f_type, STATFS_RAMFS_MAGIC) ||
++ F_TYPE_EQUAL(stfs.f_type, STATFS_TMPFS_MAGIC)))
+ recursiveRemove(cfd);
+ else
+ warn(_("old root filesystem is not an initramfs"));
diff --git a/meta/recipes-core/util-linux/util-linux/configure-sbindir.patch b/meta/recipes-core/util-linux/files/configure-sbindir.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux/configure-sbindir.patch
rename to meta/recipes-core/util-linux/files/configure-sbindir.patch
diff --git a/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch b/meta/recipes-core/util-linux/files/fix-parallel-build.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch
rename to meta/recipes-core/util-linux/files/fix-parallel-build.patch
diff --git a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/files/uclibc-__progname-conflict.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
rename to meta/recipes-core/util-linux/files/uclibc-__progname-conflict.patch
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/meta/recipes-core/util-linux/files/util-linux-native-qsort.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch
rename to meta/recipes-core/util-linux/files/util-linux-native-qsort.patch
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native.patch b/meta/recipes-core/util-linux/files/util-linux-native.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux/util-linux-native.patch
rename to meta/recipes-core/util-linux/files/util-linux-native.patch
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch b/meta/recipes-core/util-linux/files/util-linux-ng-2.16-mount_lock_path.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux/util-linux-ng-2.16-mount_lock_path.patch
rename to meta/recipes-core/util-linux/files/util-linux-ng-2.16-mount_lock_path.patch
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/files/util-linux-ng-replace-siginterrupt.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
rename to meta/recipes-core/util-linux/files/util-linux-ng-replace-siginterrupt.patch
diff --git a/meta/recipes-core/util-linux/util-linux-libs.inc b/meta/recipes-core/util-linux/util-linux-libs.inc
new file mode 100644
index 0000000..39c01b0
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux-libs.inc
@@ -0,0 +1,93 @@
+SUMMARY = "A suite of basic system administration utilities"
+DESCRIPTION = "Util-linux includes a suite of basic system administration utilities \
+commonly found on most Linux systems. Some of the more important utilities include \
+disk partitioning, kernel message management, filesystem creation, and system login."
+
+SECTION = "base"
+
+LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
+
+LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c \
+ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://Documentation/licenses/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://Documentation/licenses/COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c \
+ file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \
+ file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
+ file://libuuid/COPYING;md5=b442ffb762cf8d3e9df1b99e0bb4af70 \
+ file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \
+ file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16"
+
+inherit autotools gettext pkgconfig update-alternatives python-dir
+DEPENDS = "zlib ncurses"
+DEPENDS_append_class-native = " lzo-native"
+DEPENDS_append_class-nativesdk = " lzo-native"
+
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.xz \
+ "
+
+PACKAGES =+ "\
+ util-linux-libblkid \
+ util-linux-libmount \
+ util-linux-pylibmount \
+ util-linux-libuuid \
+ "
+
+SHARED_EXTRA_OECONF = "--disable-use-tty-group \
+ --disable-makeinstall-chown \
+ --enable-kill --enable-last --enable-mesg --enable-partx \
+ --enable-raw --enable-reset --disable-login \
+ --disable-vipw --disable-newgrp --disable-chfn-chsh \
+ --enable-write --enable-mount \
+ --enable-libuuid --enable-libblkid --enable-fsck --without-udev \
+ usrsbin_execdir='${sbindir}' \
+"
+
+EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}"
+
+PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+"
+PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam,"
+
+
+# Build setpriv requires libcap-ng
+PACKAGECONFIG[libcap-ng] = "--enable-setpriv,--disable-setpriv,libcap-ng,"
+
+# Build python bindings for libmount
+PACKAGECONFIG[pylibmount] = "--with-python --enable-pylibmount,--without-python --disable-pylibmount,python"
+
+FILES_${PN}-dev += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/pylibmount.la"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/dist-packages/libmount/.debug/"
+
+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.*"
+
+RRECOMMENDS_${PN}_class-native = ""
+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"
+
+do_compile () {
+ set -e
+ oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'
+}
+
+do_install () {
+ # with ccache the timestamps on compiled files may
+ # end up earlier than on their inputs, this allows
+ # for the resultant compilation in the install step.
+ oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= \
+ 'OPT=${CFLAGS}' 'CC=${CC}' 'LD=${LD}' \
+ 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' \
+ install
+ rm -rf ${D}${base_bindir}
+ rm -rf ${D}${sbindir}
+ rm -rf ${D}${bindir}
+ rm -rf ${D}${datadir}
+}
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-core/util-linux/util-linux-libs_2.25.2.bb b/meta/recipes-core/util-linux/util-linux-libs_2.25.2.bb
new file mode 100644
index 0000000..25cfe46
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux-libs_2.25.2.bb
@@ -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}"
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index b4f51e9..3162624 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -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"
diff --git a/meta/recipes-core/util-linux/util-linux_2.25.2.bb b/meta/recipes-core/util-linux/util-linux_2.25.2.bb
index 697b900..018dcc5 100644
--- a/meta/recipes-core/util-linux/util-linux_2.25.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.25.2.bb
@@ -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} \
"
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index bcd9ba7..d352338 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -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"
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/5] systemd: Add missing dependency on util-linux-libs
2015-02-20 4:24 [PATCH 0/5] systemd 219 upgrade and musl fixes Khem Raj
2015-02-20 4:24 ` [PATCH 1/5] systemd: Upgrade 216 -> 219 Khem Raj
2015-02-20 4:24 ` [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately Khem Raj
@ 2015-02-20 4:24 ` Khem Raj
2015-02-20 4:24 ` [PATCH 4/5] tclibc-musl: Use musl for providing virtual/libintl instead of gettext Khem Raj
2015-02-20 4:24 ` [PATCH 5/5] glibc: Dont offer to be parsed for non-glibc TCLIBC selection Khem Raj
4 siblings, 0 replies; 12+ messages in thread
From: Khem Raj @ 2015-02-20 4:24 UTC (permalink / raw)
To: openembedded-core
Change-Id: Id7694deb38368046177a68114feb3e01c41a9f2d
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/systemd/systemd_219.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index 009b4d6..4cb4d10 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -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"
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/5] tclibc-musl: Use musl for providing virtual/libintl instead of gettext
2015-02-20 4:24 [PATCH 0/5] systemd 219 upgrade and musl fixes Khem Raj
` (2 preceding siblings ...)
2015-02-20 4:24 ` [PATCH 3/5] systemd: Add missing dependency on util-linux-libs Khem Raj
@ 2015-02-20 4:24 ` Khem Raj
2015-02-20 4:24 ` [PATCH 5/5] glibc: Dont offer to be parsed for non-glibc TCLIBC selection Khem Raj
4 siblings, 0 replies; 12+ messages in thread
From: Khem Raj @ 2015-02-20 4:24 UTC (permalink / raw)
To: openembedded-core
Lets try to use musl version of libintl and see how far we get
Change-Id: I0259049eb6461ab9b579c7f3ad401fefede24621
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/conf/distro/include/tclibc-musl.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/distro/include/tclibc-musl.inc b/meta/conf/distro/include/tclibc-musl.inc
index d1272a3..7c1c91b 100644
--- a/meta/conf/distro/include/tclibc-musl.inc
+++ b/meta/conf/distro/include/tclibc-musl.inc
@@ -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"
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/5] glibc: Dont offer to be parsed for non-glibc TCLIBC selection
2015-02-20 4:24 [PATCH 0/5] systemd 219 upgrade and musl fixes Khem Raj
` (3 preceding siblings ...)
2015-02-20 4:24 ` [PATCH 4/5] tclibc-musl: Use musl for providing virtual/libintl instead of gettext Khem Raj
@ 2015-02-20 4:24 ` Khem Raj
2015-02-23 15:00 ` Christopher Larson
4 siblings, 1 reply; 12+ messages in thread
From: Khem Raj @ 2015-02-20 4:24 UTC (permalink / raw)
To: openembedded-core
We 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
Change-Id: Id794ce193c6557b5435002a8f9b6eb608738b696
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/glibc/glibc_2.21.bb | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb
index 1ef494b..6e54046 100644
--- a/meta/recipes-core/glibc/glibc_2.21.bb
+++ b/meta/recipes-core/glibc/glibc_2.21.bb
@@ -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))
}
--
2.1.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately
2015-02-20 4:24 ` [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately Khem Raj
@ 2015-02-20 12:55 ` Richard Purdie
2015-02-20 21:07 ` Khem Raj
2015-02-20 21:26 ` Burton, Ross
0 siblings, 2 replies; 12+ messages in thread
From: Richard Purdie @ 2015-02-20 12:55 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
On Fri, 2015-02-20 at 04:24 +0000, Khem Raj wrote:
> 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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately
2015-02-20 12:55 ` Richard Purdie
@ 2015-02-20 21:07 ` Khem Raj
2015-02-20 21:26 ` Burton, Ross
1 sibling, 0 replies; 12+ messages in thread
From: Khem Raj @ 2015-02-20 21:07 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
> On Feb 20, 2015, at 4:55 AM, Richard Purdie <richard.purdie@linuxfoundation.org> wrote:
>
> On Fri, 2015-02-20 at 04:24 +0000, Khem Raj wrote:
>> 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 :(
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 ?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately
2015-02-20 12:55 ` Richard Purdie
2015-02-20 21:07 ` Khem Raj
@ 2015-02-20 21:26 ` Burton, Ross
2015-02-24 20:26 ` Khem Raj
1 sibling, 1 reply; 12+ messages in thread
From: Burton, Ross @ 2015-02-20 21:26 UTC (permalink / raw)
To: Richard Purdie; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
On 20 February 2015 at 12:55, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:
> 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
[-- Attachment #2: Type: text/html, Size: 849 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 5/5] glibc: Dont offer to be parsed for non-glibc TCLIBC selection
2015-02-20 4:24 ` [PATCH 5/5] glibc: Dont offer to be parsed for non-glibc TCLIBC selection Khem Raj
@ 2015-02-23 15:00 ` Christopher Larson
2015-02-23 17:29 ` Khem Raj
0 siblings, 1 reply; 12+ messages in thread
From: Christopher Larson @ 2015-02-23 15:00 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
On Thu, Feb 19, 2015 at 9:24 PM, Khem Raj <raj.khem@gmail.com> wrote:
> + 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?
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1018 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 5/5] glibc: Dont offer to be parsed for non-glibc TCLIBC selection
2015-02-23 15:00 ` Christopher Larson
@ 2015-02-23 17:29 ` Khem Raj
0 siblings, 0 replies; 12+ messages in thread
From: Khem Raj @ 2015-02-23 17:29 UTC (permalink / raw)
To: Christopher Larson; +Cc: Patches and discussions about the oe-core layer
On Mon, Feb 23, 2015 at 7:00 AM, Christopher Larson <clarson@kergoth.com> wrote:
>
> On Thu, Feb 19, 2015 at 9:24 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> + 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.
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 !=
> 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.
> --
> Christopher Larson
> clarson at kergoth dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Maintainer - Tslib
> Senior Software Engineer, Mentor Graphics
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately
2015-02-20 21:26 ` Burton, Ross
@ 2015-02-24 20:26 ` Khem Raj
0 siblings, 0 replies; 12+ messages in thread
From: Khem Raj @ 2015-02-24 20:26 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On Fri, Feb 20, 2015 at 1:26 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 20 February 2015 at 12:55, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>>
>> 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.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2015-02-24 20:26 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-20 4:24 [PATCH 0/5] systemd 219 upgrade and musl fixes Khem Raj
2015-02-20 4:24 ` [PATCH 1/5] systemd: Upgrade 216 -> 219 Khem Raj
2015-02-20 4:24 ` [PATCH 2/5] util-linux, util-linux-libs: Build and package util-linux libs separately Khem Raj
2015-02-20 12:55 ` Richard Purdie
2015-02-20 21:07 ` Khem Raj
2015-02-20 21:26 ` Burton, Ross
2015-02-24 20:26 ` Khem Raj
2015-02-20 4:24 ` [PATCH 3/5] systemd: Add missing dependency on util-linux-libs Khem Raj
2015-02-20 4:24 ` [PATCH 4/5] tclibc-musl: Use musl for providing virtual/libintl instead of gettext Khem Raj
2015-02-20 4:24 ` [PATCH 5/5] glibc: Dont offer to be parsed for non-glibc TCLIBC selection Khem Raj
2015-02-23 15:00 ` Christopher Larson
2015-02-23 17:29 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.