diff options
Diffstat (limited to 'meta/recipes-core/systemd')
5 files changed, 11 insertions, 155 deletions
diff --git a/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch deleted file mode 100644 index 43a0d3f616..0000000000 --- a/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 82d837b76618a773485b96e38b7b91083a7437e8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 20 Feb 2015 05:05:45 +0000 -Subject: [PATCH 06/19] 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 <raj.khem@gmail.com> ---- - configure.ac | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 7f6b3b9..7c4b5a2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -110,6 +110,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin] - - AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) - -+# check for few functions not implemented in uClibc -+ -+AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate) -+ -+# check for %ms format support - assume always no if cross compiling -+ -+AC_MSG_CHECKING([whether %ms format is supported by *scanf]) -+ -+AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([ -+ #include <stdio.h> -+ ],[ -+ char *buf1, *buf2, *buf3, str="1 2.3 abcde" ; -+ int rc = sscanf(str, "%ms %ms %ms", &buf1, &buf2, &buf3) ; -+ return (rc==3)?0:1;])], -+ [AC_DEFINE([HAVE_MSFORMAT], [1], [Define if %ms format is supported by *scanf.])], -+ [AC_MSG_RESULT([no])]) -+ - M4_DEFINES= - - AC_CHECK_TOOL(OBJCOPY, objcopy) --- -2.10.2 - diff --git a/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch index fad69a51af..bc92db7468 100644 --- a/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch +++ b/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> configure.ac | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index 29ed1dd..02f4017 100644 ---- a/Makefile.am -+++ b/Makefile.am +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am ++++ git/Makefile.am @@ -320,7 +320,7 @@ define install-relative-aliases while [ -n "$$1" ]; do \ $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \ @@ -25,19 +25,16 @@ index 29ed1dd..02f4017 100644 shift 2 || exit $$?; \ done endef -diff --git a/configure.ac b/configure.ac -index 7c4b5a2..b10c952 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -108,8 +108,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin]) +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac ++++ git/configure.ac +@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin]) AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]) -AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) - - # check for few functions not implemented in uClibc + M4_DEFINES= - AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate) --- -2.10.2 - + AC_CHECK_TOOL(OBJCOPY, objcopy) diff --git a/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch deleted file mode 100644 index 586b5aab7d..0000000000 --- a/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 96026a3763264eb41a2c3e374f232f6e543284a8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 9 Nov 2016 19:33:49 -0800 -Subject: [PATCH 08/19] nspawn: Use execvpe only when libc supports it - -Upstream-Status: Denied [no desire for uclibc support] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/nspawn/nspawn.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 9b9ae90..19b47cd 100644 ---- a/src/nspawn/nspawn.c -+++ b/src/nspawn/nspawn.c -@@ -123,6 +123,8 @@ typedef enum LinkJournal { - LINK_GUEST - } LinkJournal; - -+#include "config.h" -+ - static char *arg_directory = NULL; - static char *arg_template = NULL; - static char *arg_chdir = NULL; -@@ -2871,7 +2873,12 @@ static int inner_child( - a[0] = (char*) "/sbin/init"; - execve(a[0], a, env_use); - } else if (!strv_isempty(arg_parameters)) -+#ifdef HAVE_EXECVPE - execvpe(arg_parameters[0], arg_parameters, env_use); -+#else -+ environ = env_use; -+ execvp(arg_parameters[0], arg_parameters); -+#endif /* HAVE_EXECVPE */ - else { - if (!arg_chdir) - /* If we cannot change the directory, we'll end up in /, that is expected. */ --- -2.10.2 - diff --git a/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch b/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch deleted file mode 100644 index f150bb087a..0000000000 --- a/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 085c8b6f253726ad547e7be84ff3f2b99701488b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 9 Nov 2016 19:38:07 -0800 -Subject: [PATCH 09/19] util: bypass unimplemented _SC_PHYS_PAGES system - configuration API on uclibc - -Upstream-Status: Inappropriate [uclibc-specific] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/basic/util.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/src/basic/util.c b/src/basic/util.c -index c1b5ca1..4c62d43 100644 ---- a/src/basic/util.c -+++ b/src/basic/util.c -@@ -742,6 +742,20 @@ uint64_t physical_memory(void) { - * In order to support containers nicely that have a configured memory limit we'll take the minimum of the - * physically reported amount of memory and the limit configured for the root cgroup, if there is any. */ - -+#ifdef __UCLIBC__ -+ char line[128]; -+ FILE *f = fopen("/proc/meminfo", "r"); -+ if (f == NULL) -+ return 0; -+ while (!feof(f) && fgets(line, sizeof(line)-1, f)) { -+ if (sscanf(line, "MemTotal: %li kB", &mem) == 1) { -+ mem *= 1024; -+ break; -+ } -+ } -+ fclose(f); -+ return (uint64_t) mem; -+#else - sc = sysconf(_SC_PHYS_PAGES); - assert(sc > 0); - -@@ -762,6 +776,7 @@ uint64_t physical_memory(void) { - lim *= ps; - - return MIN(mem, lim); -+#endif - } - - uint64_t physical_memory_scale(uint64_t v, uint64_t max) { --- -2.10.2 - diff --git a/meta/recipes-core/systemd/systemd_232.bb b/meta/recipes-core/systemd/systemd_232.bb index a6e6401da7..d54e92707f 100644 --- a/meta/recipes-core/systemd/systemd_232.bb +++ b/meta/recipes-core/systemd/systemd_232.bb @@ -18,10 +18,7 @@ SRC_URI += " \ file://0003-define-exp10-if-missing.patch \ file://0004-Use-getenv-when-secure-versions-are-not-available.patch \ file://0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ - file://0006-configure-Check-for-additional-features-that-uclibc-.patch \ file://0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch \ - file://0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch \ - file://0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \ file://0010-implment-systemd-sysv-install-for-OE.patch \ file://0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch \ file://0012-rules-whitelist-hd-devices.patch \ |