Skip to contentSkip to conversation

systemd: Upgrade 218 -> 219

PATCH Superseded Khem Raj 2 participants 5 messages Feb 25, 2015 – Feb 27, 2015 exec and binfmt

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 systemd: Upgrade 218 -> 219

219 has been in the docks for sometime, the older patch got merged this patch is now upgrading 218 to 219

Make all patches using git

Change-Id Ib0350144592aba26cad56c13c9a5522515915c58
---
 ...r-getty-to-agetty-in-console-setup-system.patch |  44 +++++++++
 ...ed-missing.h-fall-back-to-insecure-getenv.patch |  25 +++++
 ...t-install-dependency-links-at-install-tim.patch |  74 ++++++++++++++
 ...eck-for-additional-features-that-uclibc-.patch} |  26 ++++-
 ...n-Use-execvpe-only-when-libc-supports-it.patch} |  32 ++++--
 ...al-Use-posix-fallocate-only-if-available.patch} |  48 +++++----
 ...til-Use-mkostemp-only-if-libc-supports-it.patch |  42 ++++++++
 ...unimplemented-_SC_PHYS_PAGES-system-conf.patch} |  29 ++++--
 ...or-add-support-for-executing-scripts-und.patch} |  43 ++++----
 ...-Make-root-s-home-directory-configurable.patch} | 108 +++++++++++----------
 ...011-systemd-user-avoid-using-system-auth.patch} |  12 ++-
 .../systemd/systemd/binfmt-install.patch           |  57 -----------
 .../systemd/systemd/optional_secure_getenv.patch   |  19 ----
 .../systemd/systemd-pam-fix-getty-unit.patch       |  35 -------
 .../systemd/systemd/systemd-pam-fix-mkostemp.patch |  30 ------
 .../systemd/{systemd_218.bb => systemd_219.bb}     |  37 ++++---
 16 files changed, 384 insertions(+), 277 deletions(-)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0002-shared-missing.h-fall-back-to-insecure-getenv.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
 rename meta/recipes-core/systemd/systemd/{systemd-pam-configure-check-uclibc.patch => 0004-configure-Check-for-additional-features-that-uclibc-.patch} (57%)
 rename meta/recipes-core/systemd/systemd/{systemd-pam-fix-execvpe.patch => 0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch} (54%)
 rename meta/recipes-core/systemd/systemd/{systemd-pam-fix-fallocate.patch => 0006-journal-Use-posix-fallocate-only-if-available.patch} (65%)
 create mode 100644 meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
 rename meta/recipes-core/systemd/systemd/{uclibc-get-physmem.patch => 0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch} (58%)
 rename meta/recipes-core/systemd/systemd/{0001-add-support-for-executing-scripts-under-etc-rcS.d.patch => 0009-sysv-generator-add-support-for-executing-scripts-und.patch} (84%)
 rename meta/recipes-core/systemd/systemd/{0001-Make-root-s-home-directory-configurable.patch => 0010-Make-root-s-home-directory-configurable.patch} (67%)
 rename meta/recipes-core/systemd/systemd/{0001-systemd-user-avoid-using-system-auth.patch => 0011-systemd-user-avoid-using-system-auth.patch} (71%)
 delete mode 100644 meta/recipes-core/systemd/systemd/binfmt-install.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/optional_secure_getenv.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch
 rename meta/recipes-core/systemd/{systemd_218.bb => systemd_219.bb} (92%)
meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch new file +44 -0
new file mode 100644
index 0000000..b6ab5ef
@@ -0,0 +1,44 @@
+From 100e50604efc4032001a2de6a6b47853c0003817 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 20 Feb 2015 05:29:15 +0000
+Subject: [PATCH 01/11] units: Prefer getty to agetty in console setup systemd
+ units
+
+Upstream-Status: Inappropriate [configuration specific]
+
+Signed-off-by: Maxime Ripard <[email protected]>
+Signed-off-by: Khem Raj <[email protected]>
+---
+ units/[email protected]        | 2 +-
+ units/[email protected] | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/units/[email protected] b/units/[email protected]
+index 46164ab..bdf6ec8 100644
+--- a/units/[email protected]
++++ b/units/[email protected]
+@@ -27,7 +27,7 @@ ConditionPathExists=/dev/tty0
+ 
+ [Service]
+ # the VT is cleared by TTYVTDisallocate
+-ExecStart=-/sbin/agetty --noclear %I $TERM
++ExecStart=-/sbin/getty -L %I $TERM
+ Type=idle
+ Restart=always
+ RestartSec=0
+diff --git a/units/[email protected] b/units/[email protected]
+index 4522d0d..e6d499d 100644
+--- a/units/[email protected]
++++ b/units/[email protected]
+@@ -22,7 +22,7 @@ Before=getty.target
+ IgnoreOnIsolate=yes
+ 
+ [Service]
+-ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM
++ExecStart=-/sbin/getty -L 115200 %I $TERM
+ Type=idle
+ Restart=always
+ UtmpIdentifier=%I
+-- 
+2.1.4
+
meta/recipes-core/systemd/systemd/0002-shared-missing.h-fall-back-to-insecure-getenv.patch new file +25 -0
new file mode 100644
index 0000000..1cf7840
@@ -0,0 +1,25 @@
+From 03baade6db2cf83b44a157818ba827d725449bb0 Mon Sep 17 00:00:00 2001
+From: Emil Renner Berthing <[email protected]>
+Date: Thu, 18 Sep 2014 15:24:47 +0200
+Subject: [PATCH 02/11] shared/missing.h: fall back to insecure getenv
+
+---
+ src/shared/missing.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index b33a70c..11cca04 100644
+--- a/src/shared/missing.h
++++ b/src/shared/missing.h
+@@ -366,7 +366,7 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
+ #  ifdef HAVE___SECURE_GETENV
+ #    define secure_getenv __secure_getenv
+ #  else
+-#    error "neither secure_getenv nor __secure_getenv are available"
++#    define secure_getenv getenv
+ #  endif
+ #endif
+ 
+-- 
+2.1.4
+
meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch new file +74 -0

74 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch renamed from meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch +21 -5
similarity index 57%
rename from meta/recipes-core/systemd/systemd/systemd-pam-configure-check-uclibc.patch
rename to meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch
index 4639532..dddb7da 100644
@@ -1,11 +1,24 @@
+From 4e2e8dbf3f23ab7dca32286cc0f37bff6ac49e22 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 20 Feb 2015 05:05:45 +0000
+Subject: [PATCH 04/11] configure: Check for additional features that uclibc
+ doesnt support
+
+This helps in supporting uclibc which does not have all features that
+glibc might have
+
 Upstream-Status: Denied [no desire for uclibc support]
+
 Signed-off-by: Khem Raj <[email protected]>
+---
+ configure.ac | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
 
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac	2014-03-15 17:53:51.756340454 -0700
-+++ git/configure.ac	2014-03-15 18:07:34.888355897 -0700
-@@ -78,6 +78,24 @@
+diff --git a/configure.ac b/configure.ac
+index 9a2235b..a5b2e6e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -103,6 +103,24 @@ AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't s
  
  M4_DEFINES=
  
@@ -30,3 +43,6 @@ Index: git/configure.ac
  # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
  m4_ifdef([GTK_DOC_CHECK], [
  GTK_DOC_CHECK([1.18],[--flavour no-tmpl])],
+-- 
+2.1.4
+
meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch renamed from meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch +22 -10
similarity index 54%
rename from meta/recipes-core/systemd/systemd/systemd-pam-fix-execvpe.patch
rename to meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch
index 7170a38..85279d6 100644
@@ -1,20 +1,29 @@
+From a7417c2e6950d55c22c1b0d15783898b8ff229ef Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 20 Feb 2015 05:10:37 +0000
+Subject: [PATCH 05/11] nspawn: Use execvpe only when libc supports it
+
 Upstream-Status: Denied [no desire for uclibc support]
+
 Signed-off-by: Khem Raj <[email protected]>
+---
+ src/nspawn/nspawn.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
 
-Index: systemd-209/src/nspawn/nspawn.c
-===================================================================
---- systemd-209.orig/src/nspawn/nspawn.c	2014-02-19 15:03:09.000000000 -0800
-+++ systemd-209/src/nspawn/nspawn.c	2014-02-19 23:20:38.720628627 -0800
-@@ -91,6 +91,8 @@
-         LINK_GUEST
- } LinkJournal;
+diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
+index 0d8d199..b597edb 100644
+--- a/src/nspawn/nspawn.c
++++ b/src/nspawn/nspawn.c
+@@ -129,6 +129,8 @@ typedef enum Volatile {
+         VOLATILE_STATE,
+ } Volatile;
  
 +#include "config.h"
 +
  static char *arg_directory = NULL;
+ static char *arg_template = NULL;
  static char *arg_user = NULL;
- static sd_id128_t arg_uuid = {};
-@@ -2045,7 +2047,12 @@
+@@ -4257,7 +4259,12 @@ int main(int argc, char *argv[]) {
                                  a[0] = (char*) "/sbin/init";
                                  execve(a[0], a, env_use);
                          } else if (argc > optind)
@@ -23,7 +32,10 @@ Index: systemd-209/src/nspawn/nspawn.c
 +#else
 +                                environ = env_use;
 +                                execvp(argv[optind], argv + optind);
-+#endif /* HAVE_EXECVPE */                      
++#endif /* HAVE_EXECVPE */
                          else {
                                  chdir(home ? home : "/root");
                                  execle("/bin/bash", "-bash", NULL, env_use);
+-- 
+2.1.4
+
meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch renamed from meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch +28 -20

84 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch new file +42 -0

42 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch renamed from meta/recipes-core/systemd/systemd/uclibc-get-physmem.patch +19 -10
similarity index 58%
rename from meta/recipes-core/systemd/systemd/uclibc-get-physmem.patch
rename to meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
index 39dfc9e..5297625 100644
@@ -1,18 +1,24 @@
-bypass unimplemented _SC_PHYS_PAGES system configuration API in uclibc
+From b45ea3bfd6635744c8a6b74d0ac701b44bb1d294 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 20 Feb 2015 05:19:37 +0000
+Subject: [PATCH 08/11] util: bypass unimplemented _SC_PHYS_PAGES system
+ configuration API on uclibc
 
 Upstream-Status: Inappropriate [uclibc-specific]
 
 Signed-off-by: Khem Raj <[email protected]>
+---
+ src/shared/util.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
 
-Index: git/src/shared/util.c
-===================================================================
---- git.orig/src/shared/util.c	2014-03-15 18:09:34.796358146 -0700
-+++ git/src/shared/util.c	2014-03-15 20:16:33.836501084 -0700
-@@ -6332,11 +6332,24 @@
- 
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 72f4665..cbbe3b1 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -6793,10 +6793,25 @@ uint64_t physical_memory(void) {
          /* We return this as uint64_t in case we are running as 32bit
           * process on a 64bit kernel with huge amounts of memory */
--
+ 
 +#ifdef __UCLIBC__
 +        char line[128];
 +        FILE *f = fopen("/proc/meminfo", "r");
@@ -29,9 +35,12 @@ Index: git/src/shared/util.c
 +#else
          mem = sysconf(_SC_PHYS_PAGES);
          assert(mem > 0);
--
+ 
          return (uint64_t) mem * (uint64_t) page_size();
 +#endif
  }
  
- char* mount_test_option(const char *haystack, const char *needle) {
+ void hexdump(FILE *f, const void *p, size_t s) {
+-- 
+2.1.4
+
meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch renamed from meta/recipes-core/systemd/systemd/0001-add-support-for-executing-scripts-under-etc-rcS.d.patch +24 -19

111 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch renamed from meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch +56 -52

203 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch renamed from meta/recipes-core/systemd/systemd/0001-systemd-user-avoid-using-system-auth.patch +8 -4
similarity index 71%
rename from meta/recipes-core/systemd/systemd/0001-systemd-user-avoid-using-system-auth.patch
rename to meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch
index 97701f7..e562bca 100644
@@ -1,11 +1,15 @@
-Upstream-Status: Inappropriate [oe specific]
-
-Subject: systemd-user: avoid using system-auth
+From 7e202f71785bf5a67c8a4f6b58d3585608fbfdc4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Fri, 20 Feb 2015 05:26:25 +0000
+Subject: [PATCH 11/11] systemd-user: avoid using system-auth
 
 In OE, we don't provide system-auth, instead, we use common-* files.
 So modify systemd-user file to use common-* files.
 
+Upstream-Status: Inappropriate [oe specific]
+
 Signed-off-by: Chen Qi <[email protected]>
+Signed-off-by: Khem Raj <[email protected]>
 ---
  src/login/systemd-user | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -23,5 +27,5 @@ index 8112d74..99635af 100644
 +account  include common-account
 +session  include common-session
 -- 
-1.9.1
+2.1.4
 
meta/recipes-core/systemd/systemd/binfmt-install.patch deleted +0 -57

57 lines not on this page · raw message

meta/recipes-core/systemd/systemd/optional_secure_getenv.patch deleted +0 -19
deleted file mode 100644
index 2063268..0000000
@@ -1,19 +0,0 @@
-on uclibc secure_getenv is not available
-therefore default to using getenv instead
-
-Upstream-Status: Denied [no desire for uclibc support]
-Signed-off-by: Khem Raj <[email protected]>
-
-Index: git/src/shared/missing.h
-===================================================================
---- git.orig/src/shared/missing.h	2012-09-22 18:46:44.141282145 -0700
-+++ git/src/shared/missing.h	2012-09-22 18:48:44.081276570 -0700
-@@ -233,6 +233,8 @@
- #ifndef HAVE_SECURE_GETENV
- #  ifdef HAVE___SECURE_GETENV
- #    define secure_getenv __secure_getenv
-+#  elif defined __UCLIBC__
-+#    define secure_getenv getenv
- #  else
- #    error neither secure_getenv nor __secure_getenv are available
- #  endif
meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch deleted +0 -35
deleted file mode 100644
index 9b4c940..0000000
@@ -1,35 +0,0 @@
-Prefer getty to agetty in console setup systemd units
-
-Upstream-Status: Inappropriate [configuration specific]
-Signed-off-by: Maxime Ripard <[email protected]>
----
- units/[email protected]        |    2 +-
- units/[email protected] |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: git/units/[email protected]
-===================================================================
---- git.orig/units/[email protected]	2014-03-15 08:16:17.000000000 -0700
-+++ git/units/[email protected]	2014-03-15 08:21:11.007695825 -0700
-@@ -27,7 +27,7 @@
- 
- [Service]
- # the VT is cleared by TTYVTDisallocate
--ExecStart=-/sbin/agetty --noclear %I $TERM
-+ExecStart=-/sbin/getty -L %I $TERM
- Type=idle
- Restart=always
- RestartSec=0
-Index: git/units/[email protected]
-===================================================================
---- git.orig/units/[email protected]	2014-03-15 08:16:17.000000000 -0700
-+++ git/units/[email protected]	2014-03-15 08:22:31.291697331 -0700
-@@ -22,7 +22,7 @@
- IgnoreOnIsolate=yes
- 
- [Service]
--ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM
-+ExecStart=-/sbin/getty -L 115200 %I $TERM
- Type=idle
- Restart=always
- RestartSec=0
meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch deleted +0 -30
deleted file mode 100644
index 8c7aa07..0000000
@@ -1,30 +0,0 @@
-Upstream-Status: Denied [no desire for uclibc support]
-Signed-off-by: Khem Raj <[email protected]>
-
-Index: git/src/shared/util.c
-===================================================================
---- git.orig/src/shared/util.c	2014-03-15 15:14:21.368160908 -0700
-+++ git/src/shared/util.c	2014-03-15 15:44:21.988194688 -0700
-@@ -85,6 +85,8 @@
- #include "def.h"
- #include "missing.h"
- 
-+#include "config.h"
-+
- int saved_argc = 0;
- char **saved_argv = NULL;
- 
-@@ -6222,7 +6224,13 @@
- 
-         u = umask(077);
- 
-+#ifdef HAVE_MKOSTEMP
-         fd = mkostemp(pattern, flags);
-+#else
-+        fd = mkstemp(pattern);
-+        if (fd >= 0) fcntl(fd, F_SETFD, flags);
-+#endif /* HAVE_MKOSTEMP */
-+
-         if (fd < 0)
-                 return -errno;
- 
meta/recipes-core/systemd/systemd_219.bb renamed from meta/recipes-core/systemd/systemd_218.bb +21 -16
similarity index 92%
rename from meta/recipes-core/systemd/systemd_218.bb
rename to meta/recipes-core/systemd/systemd_219.bb
index 221c2cc..4859304 100644
@@ -19,28 +19,28 @@ 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 util-linux"
+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"
 
 inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext
 
-SRCREV = "820aced6f6067a6b7c57b7d36e44f64378870cbf"
+SRCREV = "a88abde72169ddc2df77df3fa5bed30725022253"
 
-PV = "218+git${SRCPV}"
+PV = "219+git${SRCPV}"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \
-           file://binfmt-install.patch \
-           file://systemd-pam-configure-check-uclibc.patch \
-           file://systemd-pam-fix-execvpe.patch \
-           file://systemd-pam-fix-fallocate.patch \
-           file://systemd-pam-fix-mkostemp.patch \
-           file://optional_secure_getenv.patch \
-           file://uclibc-get-physmem.patch \
-           file://0001-add-support-for-executing-scripts-under-etc-rcS.d.patch \
-           file://0001-Make-root-s-home-directory-configurable.patch \
-           file://0001-systemd-user-avoid-using-system-auth.patch \
+           file://0002-shared-missing.h-fall-back-to-insecure-getenv.patch \
+           file://0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
+           file://0004-configure-Check-for-additional-features-that-uclibc-.patch \
+           file://0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch \
+           file://0006-journal-Use-posix-fallocate-only-if-available.patch \
+           file://0007-util-Use-mkostemp-only-if-libc-supports-it.patch \
+           file://0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \
+           file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \
+           file://0010-Make-root-s-home-directory-configurable.patch \
+           file://0011-systemd-user-avoid-using-system-auth.patch \
            file://touchscreen.rules \
            file://00-create-volatile.conf \
            file://init \
@@ -50,8 +50,8 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
 S = "${WORKDIR}/git"
 
 SRC_URI_append_libc-uclibc = "\
-                             file://systemd-pam-fix-getty-unit.patch \
-                            "
+            file://0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch \
+           "
 LDFLAGS_append_libc-uclibc = " -lrt"
 
 GTKDOC_DOCDIR = "${S}/docs/"
@@ -127,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/
@@ -159,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 () {
Signature · 1 line
2.1.4
#1 lore raw
Quoted 3 lines · Khem Raj

219 has been in the docks for sometime, the older patch got merged this patch is now upgrading 218 to 219

With this merged I'm now getting these warnings from QA:

WARNING: QA Issue: systemd rdepends on iptables, but it isn't a build dependency? [build-deps]
WARNING: QA Issue: systemd rdepends on libxkbcommon, but it isn't a build dependency? [build-deps]

Ross

author
#2 lore raw
Quoted 7 lines · Ross
Quoted 3 lines · Khem Raj

219 has been in the docks for sometime, the older patch got merged this patch is now upgrading 218 to 219

Quoted 7 lines

With this merged I'm now getting these warnings from QA:

WARNING: QA Issue: systemd rdepends on iptables, but it isn't a build dependency? [build-deps]
WARNING: QA Issue: systemd rdepends on libxkbcommon, but it isn't a build dependency? [build-deps]

I did not see it yet, since they were not part of my distro

Pushed a fix here please try it out

http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/gcc-5.0&id=70d1beede31ee50ded93ea55cff27b8886161af9

#3 lore raw
Quoted 4 lines · Khem Raj

I did not see it yet, since they were not part of my distro

Pushed a fix here please try it out

I just sent a patch that does roughly the same thing apart from disabling iptables (well, libiptc) by default. Does anyone have a strong preference either way?

Ross

author
#4 lore raw
Quoted 11 lines · Ross
Quoted 4 lines · Khem Raj

I did not see it yet, since they were not part of my distro

Pushed a fix here please try it out

I just sent a patch that does roughly the same thing apart from disabling iptables (well, libiptc) by default. Does anyone have a strong preference either way?

I would be fine if it was a packageconfig and off by default.

Quoted 2 lines

Ross