* [PATCH 1/6] gcc5: Upgrade gcc-5.2 -> gcc-5.3
2015-12-14 6:22 [PATCH 0/6] gcc/uclibc/musl updates Khem Raj
@ 2015-12-14 6:23 ` Khem Raj
2015-12-14 6:23 ` [PATCH 2/6] uclibc: Switch to using uclibc-ng Khem Raj
` (4 subsequent siblings)
5 siblings, 0 replies; 17+ messages in thread
From: Khem Raj @ 2015-12-14 6:23 UTC (permalink / raw)
To: openembedded-core
Minor bugfix upgrade to gcc 5.3 for detailed list of fixes in 5.3 see
https://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&list_id=132738&resolution=FIXED&target_milestone=5.3
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../gcc/gcc-5.2/0037-pr65779.patch | 173 ---------------------
.../gcc/gcc-5.2/0043-fix-arm-thumb.patch | 39 -----
.../gcc/{gcc-5.2.inc => gcc-5.3.inc} | 31 ++--
.../0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 10 +-
.../{gcc-5.2 => gcc-5.3}/0002-uclibc-conf.patch | 6 +-
.../0003-gcc-uclibc-locale-ctype_touplow_t.patch | 6 +-
.../{gcc-5.2 => gcc-5.3}/0004-uclibc-locale.patch | 18 +--
.../0005-uclibc-locale-no__x.patch | 6 +-
.../0006-uclibc-locale-wchar_fix.patch | 6 +-
.../0007-uclibc-locale-update.patch | 6 +-
.../0008-missing-execinfo_h.patch | 6 +-
.../{gcc-5.2 => gcc-5.3}/0009-c99-snprintf.patch | 6 +-
.../0010-gcc-poison-system-directories.patch | 26 ++--
.../0011-gcc-poison-dir-extend.patch | 6 +-
.../0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 8 +-
.../0013-64-bit-multilib-hack.patch | 6 +-
.../0014-optional-libstdc.patch | 12 +-
...0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch | 14 +-
.../0016-COLLECT_GCC_OPTIONS.patch | 6 +-
...efaults.h-in-B-instead-of-S-and-t-oe-in-B.patch | 14 +-
.../0018-fortran-cross-compile-hack.patch | 10 +-
.../0019-libgcc-sjlj-check.patch | 10 +-
.../0020-cpp-honor-sysroot.patch | 6 +-
.../0021-MIPS64-Default-to-N64-ABI.patch | 10 +-
...C_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 8 +-
...0023-gcc-Fix-argument-list-too-long-error.patch | 10 +-
.../{gcc-5.2 => gcc-5.3}/0024-Disable-sdt.patch | 22 +--
.../gcc/{gcc-5.2 => gcc-5.3}/0025-libtool.patch | 6 +-
...4-pass-fix-v4bx-to-linker-to-support-EABI.patch | 6 +-
...tilib-config-files-from-B-instead-of-usin.patch | 14 +-
...-libdir-from-.la-which-usually-points-to-.patch | 6 +-
.../gcc/{gcc-5.2 => gcc-5.3}/0029-export-CPP.patch | 6 +-
...AltiVec-generation-on-powepc-linux-target.patch | 10 +-
...-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch | 6 +-
| 10 +-
...-t-build-with-disable-dependency-tracking.patch | 6 +-
...h-host-directory-during-relink-if-inst_pr.patch | 6 +-
...-link-the-plugins-with-libgomp-explicitly.patch | 6 +-
...IBS_DIR-replacement-instead-of-hardcoding.patch | 8 +-
.../0037-aarch64-Add-support-for-musl-ldso.patch | 26 ++++
.../0038-fix-g-sysroot.patch} | 32 ++--
...ibcc1-fix-libcc1-s-install-path-and-rpath.patch | 11 +-
...handle-sysroot-support-for-nativesdk-gcc.patch} | 21 ++-
...t-sysroot-gcc-version-specific-dirs-with.patch} | 38 +++--
...various-_FOR_BUILD-and-related-variables.patch} | 24 ++-
.../0043-libstdc-Support-musl.patch} | 22 ++-
...-as-a-musl-libc-specifier-and-the-necess.patch} | 149 +++++++++---------
.../0045-Support-for-arm-linux-musl.patch} | 146 +++++++++--------
...t-rid-of-ever-broken-fixincludes-on-musl.patch} | 22 ++-
...s-canadian_5.2.bb => gcc-cross-canadian_5.3.bb} | 0
...oss-initial_5.2.bb => gcc-cross-initial_5.3.bb} | 0
.../gcc/{gcc-cross_5.2.bb => gcc-cross_5.3.bb} | 0
...-initial_5.2.bb => gcc-crosssdk-initial_5.3.bb} | 0
.../{gcc-crosssdk_5.2.bb => gcc-crosssdk_5.3.bb} | 0
meta/recipes-devtools/gcc/gcc-runtime.inc | 4 +-
.../gcc/{gcc-runtime_5.2.bb => gcc-runtime_5.3.bb} | 0
...gcc-sanitizers_5.2.bb => gcc-sanitizers_5.3.bb} | 0
.../gcc/{gcc-source_5.2.bb => gcc-source_5.3.bb} | 0
.../gcc/{gcc_5.2.bb => gcc_5.3.bb} | 0
...libgcc-initial_5.2.bb => libgcc-initial_5.3.bb} | 0
.../gcc/{libgcc_5.2.bb => libgcc_5.3.bb} | 0
.../gcc/{libgfortran_5.2.bb => libgfortran_5.3.bb} | 0
62 files changed, 488 insertions(+), 578 deletions(-)
delete mode 100644 meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch
delete mode 100644 meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch
rename meta/recipes-devtools/gcc/{gcc-5.2.inc => gcc-5.3.inc} (83%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (84%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0002-uclibc-conf.patch (93%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0003-gcc-uclibc-locale-ctype_touplow_t.patch (95%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0004-uclibc-locale.patch (99%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0005-uclibc-locale-no__x.patch (98%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0006-uclibc-locale-wchar_fix.patch (95%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0007-uclibc-locale-update.patch (99%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0008-missing-execinfo_h.patch (87%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0009-c99-snprintf.patch (85%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0010-gcc-poison-system-directories.patch (92%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0011-gcc-poison-dir-extend.patch (92%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch (94%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0013-64-bit-multilib-hack.patch (97%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0014-optional-libstdc.patch (93%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch (85%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0016-COLLECT_GCC_OPTIONS.patch (89%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch (91%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0018-fortran-cross-compile-hack.patch (87%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0019-libgcc-sjlj-check.patch (92%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0020-cpp-honor-sysroot.patch (94%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0021-MIPS64-Default-to-N64-ABI.patch (86%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch (98%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0023-gcc-Fix-argument-list-too-long-error.patch (86%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0024-Disable-sdt.patch (88%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0025-libtool.patch (91%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch (91%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch (89%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch (84%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0029-export-CPP.patch (95%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch (88%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch (91%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0032-Ensure-target-gcc-headers-can-be-included.patch (93%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch (92%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch (87%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch (96%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch (82%)
create mode 100644 meta/recipes-devtools/gcc/gcc-5.3/0037-aarch64-Add-support-for-musl-ldso.patch
rename meta/recipes-devtools/gcc/{gcc-5.2/0038-fix-g++-sysroot.patch => gcc-5.3/0038-fix-g-sysroot.patch} (64%)
rename meta/recipes-devtools/gcc/{gcc-5.2 => gcc-5.3}/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch (90%)
rename meta/recipes-devtools/gcc/{gcc-5.2/0040-nativesdk-gcc-support.patch => gcc-5.3/0040-handle-sysroot-support-for-nativesdk-gcc.patch} (93%)
rename meta/recipes-devtools/gcc/{gcc-5.2/0041-handle-target-sysroot-multilib.patch => gcc-5.3/0041-Search-target-sysroot-gcc-version-specific-dirs-with.patch} (73%)
rename meta/recipes-devtools/gcc/{gcc-5.2/0042-cxxflags-for-build.patch => gcc-5.3/0042-Fix-various-_FOR_BUILD-and-related-variables.patch} (88%)
rename meta/recipes-devtools/gcc/{gcc-5.2/0043-libstdc-musl.patch => gcc-5.3/0043-libstdc-Support-musl.patch} (56%)
rename meta/recipes-devtools/gcc/{gcc-5.2/0044-gcc-musl-support.patch => gcc-5.3/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch} (75%)
rename meta/recipes-devtools/gcc/{gcc-5.2/0045-musl-dynamic-linker.patch => gcc-5.3/0045-Support-for-arm-linux-musl.patch} (68%)
rename meta/recipes-devtools/gcc/{gcc-5.2/0046-musl-no-fixincludes.patch => gcc-5.3/0046-Get-rid-of-ever-broken-fixincludes-on-musl.patch} (45%)
rename meta/recipes-devtools/gcc/{gcc-cross-canadian_5.2.bb => gcc-cross-canadian_5.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-cross-initial_5.2.bb => gcc-cross-initial_5.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-cross_5.2.bb => gcc-cross_5.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-crosssdk-initial_5.2.bb => gcc-crosssdk-initial_5.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-crosssdk_5.2.bb => gcc-crosssdk_5.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-runtime_5.2.bb => gcc-runtime_5.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-sanitizers_5.2.bb => gcc-sanitizers_5.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-source_5.2.bb => gcc-source_5.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc_5.2.bb => gcc_5.3.bb} (100%)
rename meta/recipes-devtools/gcc/{libgcc-initial_5.2.bb => libgcc-initial_5.3.bb} (100%)
rename meta/recipes-devtools/gcc/{libgcc_5.2.bb => libgcc_5.3.bb} (100%)
rename meta/recipes-devtools/gcc/{libgfortran_5.2.bb => libgfortran_5.3.bb} (100%)
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch b/meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch
deleted file mode 100644
index 1424673..0000000
--- a/meta/recipes-devtools/gcc/gcc-5.2/0037-pr65779.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-List-Id: <gcc-patches.gcc.gnu.org>
-List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
-List-Post: <mailto:gcc-patches at gcc dot gnu dot org>
-List-Help: <mailto:gcc-patches-help at gcc dot gnu dot org>
-Date: Mon, 20 Apr 2015 12:40:49 +0930
-From: Alan Modra <amodra at gmail dot com>
-To: gcc-patches at gcc dot gnu dot org
-Subject: [Patch] pr65779 - [5/6 Regression] undefined local symbol on powerpc
-
-This patch removes bogus debug info left around by shrink-wrapping,
-which on some powerpc targets with just the right register allocation
-led to assembly errors.
-
-Bootstrapped and regression tested powerpc64-linux and x86_64-linux.
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65779
-
-gcc/
- PR debug/65779
- * shrink-wrap.c (insn_uses_reg): New function.
- (move_insn_for_shrink_wrap): Remove debug insns using regs set
- by the moved insn.
-gcc/testsuite/
- * gcc.dg/pr65779.c: New.
-
-Upstream-Status: Pending (from mailing list, not merged yet)
-
-Index: a/gcc/shrink-wrap.c
-===================================================================
---- a/gcc/shrink-wrap.c.orig
-+++ b/gcc/shrink-wrap.c
-@@ -182,6 +182,21 @@ live_edge_for_reg (basic_block bb, int r
- return live_edge;
- }
-
-+static bool
-+insn_uses_reg (rtx_insn *insn, unsigned int regno, unsigned int end_regno)
-+{
-+ df_ref use;
-+
-+ FOR_EACH_INSN_USE (use, insn)
-+ {
-+ rtx reg = DF_REF_REG (use);
-+
-+ if (REG_P (reg) && REGNO (reg) >= regno && REGNO (reg) < end_regno)
-+ return true;
-+ }
-+ return false;
-+}
-+
- /* Try to move INSN from BB to a successor. Return true on success.
- USES and DEFS are the set of registers that are used and defined
- after INSN in BB. SPLIT_P indicates whether a live edge from BB
-@@ -340,10 +355,15 @@ move_insn_for_shrink_wrap (basic_block b
- *split_p = true;
- }
-
-+ vec<basic_block> live_bbs;
-+ if (MAY_HAVE_DEBUG_INSNS)
-+ live_bbs.create (5);
- /* At this point we are committed to moving INSN, but let's try to
- move it as far as we can. */
- do
- {
-+ if (MAY_HAVE_DEBUG_INSNS)
-+ live_bbs.safe_push (bb);
- live_out = df_get_live_out (bb);
- live_in = df_get_live_in (next_block);
- bb = next_block;
-@@ -426,6 +446,34 @@ move_insn_for_shrink_wrap (basic_block b
- SET_REGNO_REG_SET (bb_uses, i);
- }
-
-+ /* Remove debug insns using regs set by the insn we are moving. */
-+ if (MAY_HAVE_DEBUG_INSNS)
-+ {
-+ while (!live_bbs.is_empty ())
-+ {
-+ rtx_insn *dinsn;
-+ basic_block tmp_bb = live_bbs.pop ();
-+
-+ FOR_BB_INSNS_REVERSE (tmp_bb, dinsn)
-+ {
-+ if (dinsn == insn)
-+ break;
-+ if (DEBUG_INSN_P (dinsn)
-+ && insn_uses_reg (dinsn, dregno, end_dregno))
-+ {
-+ if (*split_p)
-+ /* If split, then we will be moving insn into a
-+ newly created block immediately after the entry
-+ block. Move the debug info there too. */
-+ emit_debug_insn_after (PATTERN (dinsn), bb_note (bb));
-+ delete_insn (dinsn);
-+ break;
-+ }
-+ }
-+ }
-+ live_bbs.release ();
-+ }
-+
- emit_insn_after (PATTERN (insn), bb_note (bb));
- delete_insn (insn);
- return true;
-Index: b/gcc/testsuite/gcc.dg/pr65779.c
-===================================================================
---- /dev/null
-+++ b/gcc/testsuite/gcc.dg/pr65779.c
-@@ -0,0 +1,64 @@
-+/* { dg-do run } */
-+/* { dg-options "-O2 -g" } */
-+/* { dg-additional-options "-mrelocatable" { target powerpc-*-rtems* } } */
-+
-+unsigned long __attribute__ ((noinline))
-+adler32 (unsigned long adler, unsigned char *buf, unsigned int len)
-+{
-+ unsigned long s1 = adler & 0xffff;
-+ unsigned long s2 = (adler >> 16) & 0xffff;
-+ int k;
-+
-+ if (buf == 0)
-+ return 1L;
-+
-+ while (len > 0)
-+ {
-+ k = len < 5552 ? len : 5552;
-+ len -= k;
-+ while (k >= 16)
-+ {
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ s1 += *buf++; s2 += s1;
-+ k -= 16;
-+ }
-+ if (k != 0)
-+ do
-+ {
-+ s1 += *buf++; s2 += s1;
-+ } while (--k);
-+ s1 &= 0xffffffffUL;
-+ s2 &= 0xffffffffUL;
-+ s1 %= 65521L;
-+ s2 %= 65521L;
-+ }
-+ return (s2 << 16) | s1;
-+}
-+
-+unsigned char buf[] = { 0, 1, 2, 3, 4, 5, 6, 7,
-+ 8, 9, 10, 11, 12, 13, 14, 15,
-+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-+ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-+ 0x55, 0xaa };
-+int
-+main ()
-+{
-+ unsigned long x = adler32 (0, buf, sizeof buf);
-+ if (x != 0x640409efUL)
-+ __builtin_abort ();
-+ return 0;
-+}
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch b/meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch
deleted file mode 100644
index 2f262e3..0000000
--- a/meta/recipes-devtools/gcc/gcc-5.2/0043-fix-arm-thumb.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream-Status: Accepted
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
----
-
-2015-11-25 Vladimir Makarov <vmakarov@redhat.com>
-
- PR rtl-optimization/67954
- * lra-constraints.c (curr_insn_transform): Add check on scratch
- pseudo when change class to NO_REGS. Add an assert.
-
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230894 138bc75d-0d04-0410-961f-82ee72b054a4
----
-
-diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
-index 4670e81..c62bf6a 100644
---- a/gcc/lra-constraints.c
-+++ b/gcc/lra-constraints.c
-@@ -3725,7 +3725,8 @@ curr_insn_transform (bool check_only_p)
- assigment pass and the scratch pseudo will be
- spilled. Spilled scratch pseudos are transformed
- back to scratches at the LRA end. */
-- && lra_former_scratch_operand_p (curr_insn, i))
-+ && lra_former_scratch_operand_p (curr_insn, i)
-+ && lra_former_scratch_p (REGNO (op)))
- {
- int regno = REGNO (op);
- lra_change_class (regno, NO_REGS, " Change to", true);
-@@ -3734,6 +3735,8 @@ curr_insn_transform (bool check_only_p)
- spilled pseudo as there is only one such insn, the
- current one. */
- reg_renumber[regno] = -1;
-+ lra_assert (bitmap_single_bit_set_p
-+ (&lra_reg_info[REGNO (op)].insn_bitmap));
- }
- /* We can do an optional reload. If the pseudo got a hard
- reg, we might improve the code through inheritance. If
diff --git a/meta/recipes-devtools/gcc/gcc-5.2.inc b/meta/recipes-devtools/gcc/gcc-5.3.inc
similarity index 83%
rename from meta/recipes-devtools/gcc/gcc-5.2.inc
rename to meta/recipes-devtools/gcc/gcc-5.3.inc
index 2ebc675..3ce0893 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-5.3.inc
@@ -2,15 +2,15 @@ require gcc-common.inc
# Third digit in PV should be incremented after a minor release
-PV = "5.2.0"
+PV = "5.3.0"
#SNAP = "5-20150405"
# BINV should be incremented to a revision after a minor gcc release
-BINV = "5.2.0"
+BINV = "5.3.0"
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-5.2:${FILE_DIRNAME}/gcc-5.2/backport:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-5.3:${FILE_DIRNAME}/gcc-5.3/backport:"
DEPENDS =+ "mpfr gmp libmpc zlib"
NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"
@@ -26,8 +26,6 @@ LIC_FILES_CHKSUM = "\
"
#BASEURI = "http://www.netgull.com/gcc/snapshots/${SNAP}/gcc-${SNAP}.tar.bz2"
BASEURI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2"
-SRC_URI[md5sum] = "a51bcfeb3da7dd4c623e27207ed43467"
-SRC_URI[sha256sum] = "5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad"
SRC_URI = "\
${BASEURI} \
@@ -68,20 +66,23 @@ SRC_URI = "\
file://0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch \
file://0035-Dont-link-the-plugins-with-libgomp-explicitly.patch \
file://0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch \
- file://0037-pr65779.patch \
- file://0038-fix-g++-sysroot.patch \
+ file://0037-aarch64-Add-support-for-musl-ldso.patch \
+ file://0038-fix-g-sysroot.patch \
file://0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch \
- file://0040-nativesdk-gcc-support.patch \
- file://0041-handle-target-sysroot-multilib.patch \
- file://0042-cxxflags-for-build.patch \
- file://0043-fix-arm-thumb.patch \
- file://0043-libstdc-musl.patch \
- file://0044-gcc-musl-support.patch \
- file://0045-musl-dynamic-linker.patch \
- file://0046-musl-no-fixincludes.patch \
+ file://0040-handle-sysroot-support-for-nativesdk-gcc.patch \
+ file://0041-Search-target-sysroot-gcc-version-specific-dirs-with.patch \
+ file://0042-Fix-various-_FOR_BUILD-and-related-variables.patch \
+ file://0043-libstdc-Support-musl.patch \
+ file://0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch \
+ file://0045-Support-for-arm-linux-musl.patch \
+ file://0046-Get-rid-of-ever-broken-fixincludes-on-musl.patch \
"
BACKPORTS = ""
+
+SRC_URI[md5sum] = "c9616fd448f980259c31de613e575719"
+SRC_URI[sha256sum] = "b84f5592e9218b73dbae612b5253035a7b34a9a1f7688d2e1bfaaf7267d5c4db"
+
#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${SNAP}"
S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}"
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-5.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
similarity index 84%
rename from meta/recipes-devtools/gcc/gcc-5.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
index 2c766f4..1aead96 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
@@ -1,7 +1,7 @@
-From a0fee0cee3d4bd4aab1e3a8e04446f99d918c4ff Mon Sep 17 00:00:00 2001
+From 6029bb338305a5d1403ee23427ed8d58eae1ff53 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:37:11 +0400
-Subject: [PATCH 01/35] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET
+Subject: [PATCH 01/46] gcc-4.3.1: ARCH_FLAGS_FOR_TARGET
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -12,7 +12,7 @@ Upstream-Status: Inappropriate [embedded specific]
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
-index 7616f88..50e7cbc 100755
+index a3f66ba..1cba3a9 100755
--- a/configure
+++ b/configure
@@ -7464,7 +7464,7 @@ fi
@@ -25,7 +25,7 @@ index 7616f88..50e7cbc 100755
*" newlib "*)
case " $target_configargs " in
diff --git a/configure.ac b/configure.ac
-index 8c85a08..f34af7e 100644
+index 987dfab..d3adb95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3104,7 +3104,7 @@ fi
@@ -38,5 +38,5 @@ index 8c85a08..f34af7e 100644
*" newlib "*)
case " $target_configargs " in
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0002-uclibc-conf.patch b/meta/recipes-devtools/gcc/gcc-5.3/0002-uclibc-conf.patch
similarity index 93%
rename from meta/recipes-devtools/gcc/gcc-5.2/0002-uclibc-conf.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0002-uclibc-conf.patch
index 69d33a0..8d6aeb5 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0002-uclibc-conf.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0002-uclibc-conf.patch
@@ -1,7 +1,7 @@
-From 7635248a4c9b51d723d721acaeeb5f2f11957987 Mon Sep 17 00:00:00 2001
+From b67c3a844bccec1766a7ec120e2d18cdcbc5f114 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:38:25 +0400
-Subject: [PATCH 02/35] uclibc-conf
+Subject: [PATCH 02/46] uclibc-conf
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -49,5 +49,5 @@ index 743d951..ae4ea60 100755
need_lib_prefix=no
need_version=no
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch b/meta/recipes-devtools/gcc/gcc-5.3/0003-gcc-uclibc-locale-ctype_touplow_t.patch
similarity index 95%
rename from meta/recipes-devtools/gcc/gcc-5.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0003-gcc-uclibc-locale-ctype_touplow_t.patch
index bca254d..bd03263 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0003-gcc-uclibc-locale-ctype_touplow_t.patch
@@ -1,7 +1,7 @@
-From 3aee58ad043af33ab00c9cd7bc88f0cade83f236 Mon Sep 17 00:00:00 2001
+From 9bcb3a1848ff0f8990301ca09a25b15c2cf90c6f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:40:12 +0400
-Subject: [PATCH 03/35] gcc-uclibc-locale-ctype_touplow_t
+Subject: [PATCH 03/46] gcc-uclibc-locale-ctype_touplow_t
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -83,5 +83,5 @@ index fd52b73..2627cf3 100644
// NB: Offsets into ctype<char>::_M_table force a particular size
// on the mask type. Because of this, we don't use an enum.
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0004-uclibc-locale.patch b/meta/recipes-devtools/gcc/gcc-5.3/0004-uclibc-locale.patch
similarity index 99%
rename from meta/recipes-devtools/gcc/gcc-5.2/0004-uclibc-locale.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0004-uclibc-locale.patch
index 03947a7..656265a 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0004-uclibc-locale.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0004-uclibc-locale.patch
@@ -1,7 +1,7 @@
-From 9f73e06315c94629fb902bd94219667cf8307b8f Mon Sep 17 00:00:00 2001
+From bd9dd472d162fc72522f96f70f6391c7c63d2bf7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:41:39 +0400
-Subject: [PATCH 04/35] uclibc-locale
+Subject: [PATCH 04/46] uclibc-locale
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -38,10 +38,10 @@ Upstream-Status: Pending
create mode 100644 libstdc++-v3/config/locale/uclibc/time_members.h
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
-index a1e301f..0fe9326 100644
+index 826ef86..79cc716 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
-@@ -1983,6 +1983,9 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
+@@ -2029,6 +2029,9 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
# Default to "generic".
if test $enable_clocale_flag = auto; then
case ${target_os} in
@@ -51,7 +51,7 @@ index a1e301f..0fe9326 100644
linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
enable_clocale_flag=gnu
;;
-@@ -2167,6 +2170,40 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
+@@ -2213,6 +2216,40 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
CTIME_CC=config/locale/generic/time_members.cc
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
;;
@@ -2737,10 +2737,10 @@ index 0000000..ba8e858
+ _S_destroy_c_locale(_M_c_locale_timepunct);
+ }
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index f5b28f4..fbad667 100755
+index 8cd4c76..217012e 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
-@@ -15913,6 +15913,9 @@ fi
+@@ -15918,6 +15918,9 @@ fi
# Default to "generic".
if test $enable_clocale_flag = auto; then
case ${target_os} in
@@ -2750,7 +2750,7 @@ index f5b28f4..fbad667 100755
linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
enable_clocale_flag=gnu
;;
-@@ -16191,6 +16194,78 @@ $as_echo "newlib" >&6; }
+@@ -16196,6 +16199,78 @@ $as_echo "newlib" >&6; }
CTIME_CC=config/locale/generic/time_members.cc
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
;;
@@ -2858,5 +2858,5 @@ index aa1b2fa..45c4617 100644
using ::wcsncat;
using ::wcsncmp;
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0005-uclibc-locale-no__x.patch b/meta/recipes-devtools/gcc/gcc-5.3/0005-uclibc-locale-no__x.patch
similarity index 98%
rename from meta/recipes-devtools/gcc/gcc-5.2/0005-uclibc-locale-no__x.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0005-uclibc-locale-no__x.patch
index ac053ea..19a86a4 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0005-uclibc-locale-no__x.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0005-uclibc-locale-no__x.patch
@@ -1,7 +1,7 @@
-From a8e683917a3e8a6642639e65c06d4d4fc46cc8ab Mon Sep 17 00:00:00 2001
+From 72a1a4af3c18627f59aa5ba1f753a89011b4e4f0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:42:36 +0400
-Subject: [PATCH 05/35] uclibc-locale-no__x
+Subject: [PATCH 05/46] uclibc-locale-no__x
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -253,5 +253,5 @@ index e0707d7..d848ed5 100644
namespace std
{
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0006-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-5.3/0006-uclibc-locale-wchar_fix.patch
similarity index 95%
rename from meta/recipes-devtools/gcc/gcc-5.2/0006-uclibc-locale-wchar_fix.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0006-uclibc-locale-wchar_fix.patch
index 9112a2b..d7dbe68 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0006-uclibc-locale-wchar_fix.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0006-uclibc-locale-wchar_fix.patch
@@ -1,7 +1,7 @@
-From cdb9e9c9440beb59bc20476eea5a9cf2538cd194 Mon Sep 17 00:00:00 2001
+From b1298344f0c221c382a95af689f7f3ecd864f531 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:45:57 +0400
-Subject: [PATCH 06/35] uclibc-locale-wchar_fix
+Subject: [PATCH 06/46] uclibc-locale-wchar_fix
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -64,5 +64,5 @@ index 2c70642..d5c8961 100644
if (_M_data->_M_thousands_sep == L'\0')
_M_data->_M_grouping = "";
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0007-uclibc-locale-update.patch b/meta/recipes-devtools/gcc/gcc-5.3/0007-uclibc-locale-update.patch
similarity index 99%
rename from meta/recipes-devtools/gcc/gcc-5.2/0007-uclibc-locale-update.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0007-uclibc-locale-update.patch
index 728b790..cde7499 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0007-uclibc-locale-update.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0007-uclibc-locale-update.patch
@@ -1,7 +1,7 @@
-From 244b9d1b5cc6d5382935192998531ee70afb262d Mon Sep 17 00:00:00 2001
+From e9d7cb62741c22d667fe56e98d50753d89aefdc3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:46:58 +0400
-Subject: [PATCH 07/35] uclibc-locale-update
+Subject: [PATCH 07/46] uclibc-locale-update
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -538,5 +538,5 @@ index ba8e858..1665dde 100644
template<typename _CharT>
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0008-missing-execinfo_h.patch b/meta/recipes-devtools/gcc/gcc-5.3/0008-missing-execinfo_h.patch
similarity index 87%
rename from meta/recipes-devtools/gcc/gcc-5.2/0008-missing-execinfo_h.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0008-missing-execinfo_h.patch
index b2f6b18..9f87931 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0008-missing-execinfo_h.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0008-missing-execinfo_h.patch
@@ -1,7 +1,7 @@
-From 0a80f60de08bd5829ca1b3758f70a92b61dda143 Mon Sep 17 00:00:00 2001
+From 9b7442069eb68a42d2437181c1b2e710dd077e8b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:48:10 +0400
-Subject: [PATCH 08/35] missing-execinfo_h
+Subject: [PATCH 08/46] missing-execinfo_h
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -24,5 +24,5 @@ index 6b38f2d..fca98ff 100644
# define GC_HAVE_BUILTIN_BACKTRACE
# endif
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0009-c99-snprintf.patch b/meta/recipes-devtools/gcc/gcc-5.3/0009-c99-snprintf.patch
similarity index 85%
rename from meta/recipes-devtools/gcc/gcc-5.2/0009-c99-snprintf.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0009-c99-snprintf.patch
index 525b2a1..6b236c6 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0009-c99-snprintf.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0009-c99-snprintf.patch
@@ -1,7 +1,7 @@
-From 7b7caf4305a54fa4dfdd0efd5bd41cb94cbcf43d Mon Sep 17 00:00:00 2001
+From fde97f80d2d931ed3fa4a86294799366b2359331 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:49:03 +0400
-Subject: [PATCH 09/35] c99-snprintf
+Subject: [PATCH 09/46] c99-snprintf
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -24,5 +24,5 @@ index 37f01ca..f00c06d 100644
#undef snprintf
#undef vfscanf
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0010-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-5.3/0010-gcc-poison-system-directories.patch
similarity index 92%
rename from meta/recipes-devtools/gcc/gcc-5.2/0010-gcc-poison-system-directories.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0010-gcc-poison-system-directories.patch
index 4e02ef8..2da8877 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0010-gcc-poison-system-directories.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0010-gcc-poison-system-directories.patch
@@ -1,7 +1,7 @@
-From d1e85a363ffcd259e9b0841b85ca10af2f31bd72 Mon Sep 17 00:00:00 2001
+From 7a90e62d557c78ae52006dff30c99006e10d9357 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 08:59:00 +0400
-Subject: [PATCH 10/35] gcc: poison-system-directories
+Subject: [PATCH 10/46] gcc: poison-system-directories
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -17,7 +17,7 @@ Upstream-Status: Inappropriate [distribution: codesourcery]
7 files changed, 66 insertions(+)
diff --git a/gcc/common.opt b/gcc/common.opt
-index b49ac46..783d231 100644
+index 1218a71..bfba114 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -623,6 +623,10 @@ Wreturn-local-addr
@@ -32,7 +32,7 @@ index b49ac46..783d231 100644
Common Var(warn_shadow) Warning
Warn when one local variable shadows another
diff --git a/gcc/config.in b/gcc/config.in
-index f2ed301..f290c6b 100644
+index 5335258..f079826 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -168,6 +168,12 @@
@@ -49,10 +49,10 @@ index f2ed301..f290c6b 100644
optimizer and back end) to be checked for dynamic type safety at runtime.
This is quite expensive. */
diff --git a/gcc/configure b/gcc/configure
-index 9523773..181748e 100755
+index 3c92795..34371a3 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -932,6 +932,7 @@ with_system_zlib
+@@ -933,6 +933,7 @@ with_system_zlib
enable_maintainer_mode
enable_link_mutex
enable_version_specific_runtime_libs
@@ -60,7 +60,7 @@ index 9523773..181748e 100755
enable_plugin
enable_host_shared
enable_libquadmath_support
-@@ -1661,6 +1662,8 @@ Optional Features:
+@@ -1670,6 +1671,8 @@ Optional Features:
--enable-version-specific-runtime-libs
specify that runtime libraries should be installed
in a compiler-specific directory
@@ -69,7 +69,7 @@ index 9523773..181748e 100755
--enable-plugin enable plugin support
--enable-host-shared build host code as shared libraries
--disable-libquadmath-support
-@@ -28087,6 +28090,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
+@@ -28211,6 +28214,19 @@ if test "${enable_version_specific_runtime_libs+set}" = set; then :
fi
@@ -90,10 +90,10 @@ index 9523773..181748e 100755
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 68b0ee8..8b07078 100644
+index d414081..240d322 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
-@@ -5571,6 +5571,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
+@@ -5654,6 +5654,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
[specify that runtime libraries should be
installed in a compiler-specific directory])])
@@ -111,7 +111,7 @@ index 68b0ee8..8b07078 100644
AC_SUBST(subdirs)
AC_SUBST(srcdir)
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 520c2c5..0df8a47 100644
+index d3be589..c81b55b 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -269,6 +269,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -122,7 +122,7 @@ index 520c2c5..0df8a47 100644
-Wredundant-decls -Wno-return-local-addr @gol
-Wreturn-type -Wsequence-point -Wshadow -Wno-shadow-ivar @gol
-Wshift-count-negative -Wshift-count-overflow @gol
-@@ -4432,6 +4433,14 @@ made up of data only and thus requires no special treatment. But, for
+@@ -4433,6 +4434,14 @@ made up of data only and thus requires no special treatment. But, for
most targets, it is made up of code and thus requires the stack to be
made executable in order for the program to work properly.
@@ -188,5 +188,5 @@ index 6c54ca6..cc0c921 100644
/* Use given -I paths for #include "..." but not #include <...>, and
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0011-gcc-poison-dir-extend.patch b/meta/recipes-devtools/gcc/gcc-5.3/0011-gcc-poison-dir-extend.patch
similarity index 92%
rename from meta/recipes-devtools/gcc/gcc-5.2/0011-gcc-poison-dir-extend.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0011-gcc-poison-dir-extend.patch
index 067d985..511e694 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0011-gcc-poison-dir-extend.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0011-gcc-poison-dir-extend.patch
@@ -1,7 +1,7 @@
-From f158fcc084e88b1d8d1ecf5b005d377765aef16e Mon Sep 17 00:00:00 2001
+From db406054de6b0967cd76cbb998f05b0c5af0bd94 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:00:34 +0400
-Subject: [PATCH 11/35] gcc-poison-dir-extend
+Subject: [PATCH 11/46] gcc-poison-dir-extend
Add /sw/include and /opt/include based on the original
zecke-no-host-includes.patch patch. The original patch checked for
@@ -35,5 +35,5 @@ index cc0c921..0bc1f67 100644
"include location \"%s\" is unsafe for "
"cross-compilation",
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-5.3/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
similarity index 94%
rename from meta/recipes-devtools/gcc/gcc-5.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
index befca73..750bbc8 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -1,7 +1,7 @@
-From a54239cbdc6f93c6d74ea6b078f1470770c4f5aa Mon Sep 17 00:00:00 2001
+From 278d293c4cee9482a23aa3443741861ff2f67212 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:08:31 +0400
-Subject: [PATCH 12/35] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET
+Subject: [PATCH 12/46] gcc-4.3.3: SYSROOT_CFLAGS_FOR_TARGET
Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it.
@@ -26,7 +26,7 @@ Upstream-Status: Pending
1 file changed, 32 insertions(+)
diff --git a/configure b/configure
-index 50e7cbc..6b97693 100755
+index 1cba3a9..9cae8da 100755
--- a/configure
+++ b/configure
@@ -6733,6 +6733,38 @@ fi
@@ -69,5 +69,5 @@ index 50e7cbc..6b97693 100755
# the named directory are copied to $(tooldir)/sys-include.
if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0013-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-5.3/0013-64-bit-multilib-hack.patch
similarity index 97%
rename from meta/recipes-devtools/gcc/gcc-5.2/0013-64-bit-multilib-hack.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0013-64-bit-multilib-hack.patch
index 67c0661..45aaf4c 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0013-64-bit-multilib-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0013-64-bit-multilib-hack.patch
@@ -1,7 +1,7 @@
-From d5151bebd079e981dc710f2a031830d89cb1e72e Mon Sep 17 00:00:00 2001
+From bdde4f5efa3c89ac7ee0bc05f322f27e3dabeab9 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:10:06 +0400
-Subject: [PATCH 13/35] 64-bit multilib hack.
+Subject: [PATCH 13/46] 64-bit multilib hack.
GCC has internal multilib handling code but it assumes a very specific rigid directory
layout. The build system implementation of multilib layout is very generic and allows
@@ -81,5 +81,5 @@ index b6b351d..1d5b37a 100644
rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
$(COMPILE) $<
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0014-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc-5.3/0014-optional-libstdc.patch
similarity index 93%
rename from meta/recipes-devtools/gcc/gcc-5.2/0014-optional-libstdc.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0014-optional-libstdc.patch
index 374fe43..73741f8 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0014-optional-libstdc.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0014-optional-libstdc.patch
@@ -1,7 +1,7 @@
-From d7b42d93d077b2523c26f0dff0b6c44fdfff9d3c Mon Sep 17 00:00:00 2001
+From a13763f8a1d413a432e7b40835a062f86208f29a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:12:56 +0400
-Subject: [PATCH 14/35] optional libstdc
+Subject: [PATCH 14/46] optional libstdc
gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++
will not run correctly since by default the linker will try to link against libstdc++
@@ -25,7 +25,7 @@ Upstream-Status: Inappropriate [embedded specific]
4 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
-index 983f4a8..96924f6 100644
+index 4162566..453ec8e 100644
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -1543,6 +1543,10 @@ nostdinc++
@@ -52,7 +52,7 @@ index 6536d7e..f57a5d4 100644
library = -1;
break;
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 0df8a47..73856d0 100644
+index c81b55b..6d3f68c 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -195,6 +195,7 @@ in the following sections.
@@ -72,7 +72,7 @@ index 0df8a47..73856d0 100644
-T @var{script} -Wl,@var{option} -Xlinker @var{option} @gol
-u @var{symbol} -z @var{keyword}}
-@@ -11185,6 +11186,11 @@ These entries are usually resolved by entries in
+@@ -11187,6 +11188,11 @@ These entries are usually resolved by entries in
libc. These entry points should be supplied through some other
mechanism when this option is specified.
@@ -97,5 +97,5 @@ index 675bcc1..a37ec8b 100644
#endif
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch b/meta/recipes-devtools/gcc/gcc-5.3/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
similarity index 85%
rename from meta/recipes-devtools/gcc/gcc-5.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
index 6cf1e3d..1b62ef8 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
@@ -1,7 +1,7 @@
-From ad1592791698286b80626ddd5679ff2ef457ab76 Mon Sep 17 00:00:00 2001
+From 4bd21a1d63cfb14e261d90adc0c5d4f9462dc555 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:14:20 +0400
-Subject: [PATCH 15/35] gcc: disable MASK_RELAX_PIC_CALLS bit
+Subject: [PATCH 15/46] gcc: disable MASK_RELAX_PIC_CALLS bit
The new feature added after 4.3.3
"http://www.pubbs.net/200909/gcc/94048-patch-add-support-for-rmipsjalr.html"
@@ -19,10 +19,10 @@ Upstream-Status: Inappropriate [configuration]
2 files changed, 14 deletions(-)
diff --git a/gcc/configure b/gcc/configure
-index 181748e..9009064 100755
+index 34371a3..8caecdc 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -26451,13 +26451,6 @@ $as_echo_n "checking assembler and linker for explicit JALR relocation... " >&6;
+@@ -26479,13 +26479,6 @@ $as_echo_n "checking assembler and linker for explicit JALR relocation... " >&6;
rm -f conftest.*
fi
fi
@@ -37,10 +37,10 @@ index 181748e..9009064 100755
$as_echo "$gcc_cv_as_ld_jalr_reloc" >&6; }
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 8b07078..c7a28b4 100644
+index 240d322..57819ff 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
-@@ -4361,13 +4361,6 @@ x:
+@@ -4384,13 +4384,6 @@ x:
rm -f conftest.*
fi
fi
@@ -55,5 +55,5 @@ index 8b07078..c7a28b4 100644
AC_CACHE_CHECK([linker for .eh_frame personality relaxation],
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0016-COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc-5.3/0016-COLLECT_GCC_OPTIONS.patch
similarity index 89%
rename from meta/recipes-devtools/gcc/gcc-5.2/0016-COLLECT_GCC_OPTIONS.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0016-COLLECT_GCC_OPTIONS.patch
index 359de35..e6ae262 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0016-COLLECT_GCC_OPTIONS.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0016-COLLECT_GCC_OPTIONS.patch
@@ -1,7 +1,7 @@
-From 2b22ee2e44688f8a72b9af76a0431d86bac00d47 Mon Sep 17 00:00:00 2001
+From 92427ebb94dc66f8e64ebf3ffbcd6dd5ce0935c1 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:16:28 +0400
-Subject: [PATCH 16/35] COLLECT_GCC_OPTIONS
+Subject: [PATCH 16/46] COLLECT_GCC_OPTIONS
This patch adds --sysroot into COLLECT_GCC_OPTIONS which is used to
invoke collect2.
@@ -34,5 +34,5 @@ index a37ec8b..87b47c5 100644
{
const char *const *args;
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-5.3/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
similarity index 91%
rename from meta/recipes-devtools/gcc/gcc-5.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
index 8506131..b89a279 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
@@ -1,7 +1,7 @@
-From 12f467bc6d8953ba342fe5166b9a2f397b334794 Mon Sep 17 00:00:00 2001
+From b1f3118e439459c26a3e19c617b7b0c93745e77a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:17:25 +0400
-Subject: [PATCH 17/35] Use the defaults.h in ${B} instead of ${S}, and t-oe in
+Subject: [PATCH 17/46] Use the defaults.h in ${B} instead of ${S}, and t-oe in
${B}
Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that
@@ -27,7 +27,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index 4ab7405..661ae17 100644
+index 07c6f0a..e1e63e8 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -502,7 +502,7 @@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
@@ -40,10 +40,10 @@ index 4ab7405..661ae17 100644
TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
diff --git a/gcc/configure b/gcc/configure
-index 9009064..f059c2f 100755
+index 8caecdc..8ec3d40 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -11841,8 +11841,8 @@ for f in $tm_file; do
+@@ -11850,8 +11850,8 @@ for f in $tm_file; do
tm_include_list="${tm_include_list} $f"
;;
defaults.h )
@@ -55,7 +55,7 @@ index 9009064..f059c2f 100755
* )
tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index c7a28b4..2e668a5 100644
+index 57819ff..643a47e 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1832,8 +1832,8 @@ for f in $tm_file; do
@@ -92,5 +92,5 @@ index c32f087..6803ab9 100644
# Add multiple inclusion protection guard, part two.
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0018-fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-5.3/0018-fortran-cross-compile-hack.patch
similarity index 87%
rename from meta/recipes-devtools/gcc/gcc-5.2/0018-fortran-cross-compile-hack.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0018-fortran-cross-compile-hack.patch
index da73392..e8ba325 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0018-fortran-cross-compile-hack.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0018-fortran-cross-compile-hack.patch
@@ -1,7 +1,7 @@
-From 95506b44c9ef4725fef52fa864d3d3fcf931e443 Mon Sep 17 00:00:00 2001
+From d11c73c1295565ff3766ae04e2a410a89fc84dd5 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:20:01 +0400
-Subject: [PATCH 18/35] fortran cross-compile hack.
+Subject: [PATCH 18/46] fortran cross-compile hack.
* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used
used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross
@@ -16,7 +16,7 @@ Upstream-Status: Inappropriate [embedded specific]
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libgfortran/configure b/libgfortran/configure
-index e1592f7..76d19b3 100755
+index bb3107b..5d47e65 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -12747,7 +12747,7 @@ esac
@@ -29,7 +29,7 @@ index e1592f7..76d19b3 100755
ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
-index 35a8b39..6a0d8a9 100644
+index adafb3f..b4ade28 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -240,7 +240,7 @@ AC_SUBST(enable_static)
@@ -42,5 +42,5 @@ index 35a8b39..6a0d8a9 100644
# extra LD Flags which are required for targets
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0019-libgcc-sjlj-check.patch b/meta/recipes-devtools/gcc/gcc-5.3/0019-libgcc-sjlj-check.patch
similarity index 92%
rename from meta/recipes-devtools/gcc/gcc-5.2/0019-libgcc-sjlj-check.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0019-libgcc-sjlj-check.patch
index ec5394a..01a4d1f 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0019-libgcc-sjlj-check.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0019-libgcc-sjlj-check.patch
@@ -1,7 +1,7 @@
-From 94f619cd3257e35e20a877640d0cb90c2b3efc15 Mon Sep 17 00:00:00 2001
+From 7b40212ed6c0c9fe4efe51f31bccd3d9f892f238 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:20:50 +0400
-Subject: [PATCH 19/35] libgcc-sjlj-check
+Subject: [PATCH 19/46] libgcc-sjlj-check
ac_fn_c_try_compile doesnt seem to keep the intermediate files
which are needed for sjlj test to pass since it greps into the
@@ -17,7 +17,7 @@ Upstream-Status: Pending
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/libgcc/configure b/libgcc/configure
-index 08c9319..5ffaeb3 100644
+index 203d384..6aef3e7 100644
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -4570,17 +4570,19 @@ void foo ()
@@ -45,7 +45,7 @@ index 08c9319..5ffaeb3 100644
fi
diff --git a/libgcc/configure.ac b/libgcc/configure.ac
-index 1c405e8..f52975d 100644
+index a10a952..cc324f3 100644
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -255,16 +255,14 @@ void foo ()
@@ -70,5 +70,5 @@ index 1c405e8..f52975d 100644
])
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0020-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc-5.3/0020-cpp-honor-sysroot.patch
similarity index 94%
rename from meta/recipes-devtools/gcc/gcc-5.2/0020-cpp-honor-sysroot.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0020-cpp-honor-sysroot.patch
index 71bc68b..13f66d4 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0020-cpp-honor-sysroot.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0020-cpp-honor-sysroot.patch
@@ -1,7 +1,7 @@
-From 6e6283d645c83ca534219a02ae882a3d7be95ff1 Mon Sep 17 00:00:00 2001
+From 5f9759a85fff3d78e3f71ae01c970b10d326c406 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:22:00 +0400
-Subject: [PATCH 20/35] cpp: honor sysroot.
+Subject: [PATCH 20/46] cpp: honor sysroot.
Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile
preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location
@@ -50,5 +50,5 @@ index 87b47c5..e6efae7 100644
{"@assembler",
"%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0021-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc-5.3/0021-MIPS64-Default-to-N64-ABI.patch
similarity index 86%
rename from meta/recipes-devtools/gcc/gcc-5.2/0021-MIPS64-Default-to-N64-ABI.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0021-MIPS64-Default-to-N64-ABI.patch
index caad489..c7cffe4 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0021-MIPS64-Default-to-N64-ABI.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0021-MIPS64-Default-to-N64-ABI.patch
@@ -1,7 +1,7 @@
-From 7f766fc47f9388dd0094852a43f1af2568b4b9b2 Mon Sep 17 00:00:00 2001
+From 34d22ab6cfd2dfe6dd171c8d0b31cafcdeb86298 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:23:08 +0400
-Subject: [PATCH 21/35] MIPS64: Default to N64 ABI
+Subject: [PATCH 21/46] MIPS64: Default to N64 ABI
MIPS64 defaults to n32 ABI, this patch makes it
so that it defaults to N64 ABI
@@ -14,10 +14,10 @@ Upstream-Status: Inappropriate [OE config specific]
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gcc/config.gcc b/gcc/config.gcc
-index cb08a5c..b155744 100644
+index c835734..dd0739d 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
-@@ -2011,29 +2011,29 @@ mips*-*-linux*) # Linux MIPS, either endian.
+@@ -2017,29 +2017,29 @@ mips*-*-linux*) # Linux MIPS, either endian.
default_mips_arch=mips32
;;
mips64el-st-linux-gnu)
@@ -53,5 +53,5 @@ index cb08a5c..b155744 100644
;;
esac
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-5.3/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
similarity index 98%
rename from meta/recipes-devtools/gcc/gcc-5.2/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
index 54520d0..6208351 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0022-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
@@ -1,7 +1,7 @@
-From 4f94added8b7043642386b31ed4c3a1bd016f316 Mon Sep 17 00:00:00 2001
+From f6b41b62ea62a0f1447d9fc235f7fd2bbf3fe7c2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:24:50 +0400
-Subject: [PATCH 22/35] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
+Subject: [PATCH 22/46] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
relative to SYSTEMLIBS_DIR
This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
@@ -60,7 +60,7 @@ index e9d65dc..cfdf3f0 100644
#define GLIBC_DYNAMIC_LINKER \
diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
-index 1279cba..1dde747 100644
+index 49ad954..a5ab559 100644
--- a/gcc/config/arm/linux-elf.h
+++ b/gcc/config/arm/linux-elf.h
@@ -62,7 +62,7 @@
@@ -212,5 +212,5 @@ index fa805fd..0eb4acd 100644
#ifdef SPARC_BI_ARCH
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0023-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc-5.3/0023-gcc-Fix-argument-list-too-long-error.patch
similarity index 86%
rename from meta/recipes-devtools/gcc/gcc-5.2/0023-gcc-Fix-argument-list-too-long-error.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0023-gcc-Fix-argument-list-too-long-error.patch
index b337df5..be91c9e 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0023-gcc-Fix-argument-list-too-long-error.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0023-gcc-Fix-argument-list-too-long-error.patch
@@ -1,7 +1,7 @@
-From 8db606205487ebb03eae788826faf64bd6918450 Mon Sep 17 00:00:00 2001
+From 9701f596bbe5bf51bbf48661bc515b45d4b6f4d2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:26:37 +0400
-Subject: [PATCH 23/35] gcc: Fix argument list too long error.
+Subject: [PATCH 23/46] gcc: Fix argument list too long error.
There would be an "Argument list too long" error when the
build directory is longer than 200, this is caused by:
@@ -23,10 +23,10 @@ Upstream-Status: Pending
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index 661ae17..9470a92 100644
+index e1e63e8..7b49f88 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
-@@ -3255,7 +3255,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
+@@ -3262,7 +3262,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
# We keep the directory structure for files in config or c-family and .def
# files. All other files are flattened to a single directory.
$(mkinstalldirs) $(DESTDIR)$(plugin_includedir)
@@ -36,5 +36,5 @@ index 661ae17..9470a92 100644
for file in $$headers; do \
if [ -f $$file ] ; then \
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0024-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc-5.3/0024-Disable-sdt.patch
similarity index 88%
rename from meta/recipes-devtools/gcc/gcc-5.2/0024-Disable-sdt.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0024-Disable-sdt.patch
index 9f219ca..b23ce97 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0024-Disable-sdt.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0024-Disable-sdt.patch
@@ -1,7 +1,7 @@
-From e136342d2f7c0bdb1cf4b57ad3440d3c9e710322 Mon Sep 17 00:00:00 2001
+From 946e047614103e1f2982613c7aa5f76587500c0e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:28:10 +0400
-Subject: [PATCH 24/35] Disable sdt.
+Subject: [PATCH 24/46] Disable sdt.
We don't list dtrace in DEPENDS so we shouldn't be depending on this header.
It may or may not exist from preivous builds though. To be determinstic, disable
@@ -25,10 +25,10 @@ Upstream-Status: Inappropriate [hack]
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/gcc/configure b/gcc/configure
-index f059c2f..98853b3 100755
+index 8ec3d40..eaa3b07 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -27733,12 +27733,12 @@ fi
+@@ -27857,12 +27857,12 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sdt.h in the target C library" >&5
$as_echo_n "checking sys/sdt.h in the target C library... " >&6; }
have_sys_sdt_h=no
@@ -48,10 +48,10 @@ index f059c2f..98853b3 100755
$as_echo "$have_sys_sdt_h" >&6; }
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 2e668a5..52cdcb8 100644
+index 643a47e..9f6cacb 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
-@@ -5232,15 +5232,15 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then
+@@ -5315,15 +5315,15 @@ if test x$gcc_cv_libc_provides_ssp = xyes; then
fi
# Test for <sys/sdt.h> on the target.
@@ -77,10 +77,10 @@ index 2e668a5..52cdcb8 100644
# Check if TFmode long double should be used by default or not.
# Some glibc targets used DFmode long double, but with glibc 2.4
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index fbad667..7d5a6c6 100755
+index 217012e..81240b9 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
-@@ -20897,11 +20897,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -20964,11 +20964,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -96,10 +96,10 @@ index fbad667..7d5a6c6 100755
$as_echo "$glibcxx_cv_sys_sdt_h" >&6; }
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
-index 7a7c1d8..b13eabc 100644
+index 580fb8b..5a41083 100644
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
-@@ -229,7 +229,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
+@@ -230,7 +230,7 @@ GLIBCXX_CHECK_SC_NPROCESSORS_ONLN
GLIBCXX_CHECK_SC_NPROC_ONLN
GLIBCXX_CHECK_PTHREADS_NUM_PROCESSORS_NP
GLIBCXX_CHECK_SYSCTL_HW_NCPU
@@ -109,5 +109,5 @@ index 7a7c1d8..b13eabc 100644
# Check for available headers.
AC_CHECK_HEADERS([endian.h execinfo.h float.h fp.h ieeefp.h inttypes.h \
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0025-libtool.patch b/meta/recipes-devtools/gcc/gcc-5.3/0025-libtool.patch
similarity index 91%
rename from meta/recipes-devtools/gcc/gcc-5.2/0025-libtool.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0025-libtool.patch
index b8977d6..8d5eb97 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0025-libtool.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0025-libtool.patch
@@ -1,7 +1,7 @@
-From 1ca54967d8f67ab0eca772334e5c925a5e8c80cc Mon Sep 17 00:00:00 2001
+From f68c5b78751660505b22b46dad99240db0df3456 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:29:11 +0400
-Subject: [PATCH 25/35] libtool
+Subject: [PATCH 25/46] libtool
libstdc++ from gcc-runtime gets created with -rpath=/usr/lib/../lib for qemux86-64
when running on am x86_64 build host.
@@ -38,5 +38,5 @@ index 9503ec8..0121fba 100644
oldlibs=
if test -z "$rpath"; then
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc-5.3/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
similarity index 91%
rename from meta/recipes-devtools/gcc/gcc-5.2/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
index a8a652a..a22d95f 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0026-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
@@ -1,7 +1,7 @@
-From 5f5ca57fcec4bafe3780371d1342acd40c608697 Mon Sep 17 00:00:00 2001
+From 4c75e349aa7abd1e285720328b23690636bea242 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:30:32 +0400
-Subject: [PATCH 26/35] gcc: armv4: pass fix-v4bx to linker to support EABI.
+Subject: [PATCH 26/46] gcc: armv4: pass fix-v4bx to linker to support EABI.
The LINK_SPEC for linux gets overwritten by linux-eabi.h which
means the value of TARGET_FIX_V4BX_SPEC gets lost and as a result
@@ -39,5 +39,5 @@ index cfdf3f0..048a062 100644
LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC)
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc-5.3/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch
similarity index 89%
rename from meta/recipes-devtools/gcc/gcc-5.2/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch
index 445da37..46815d1 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0027-Use-the-multilib-config-files-from-B-instead-of-usin.patch
@@ -1,7 +1,7 @@
-From 484e8c1e8d43e626ee2ddbde9eb8e0af7a176aef Mon Sep 17 00:00:00 2001
+From 8217dd7fb318f9abc6564f67b424c433d8398d61 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 29 Mar 2013 09:33:04 +0400
-Subject: [PATCH 27/35] Use the multilib config files from ${B} instead of
+Subject: [PATCH 27/46] Use the multilib config files from ${B} instead of
using the ones from ${S}
Use the multilib config files from ${B} instead of using the ones from ${S}
@@ -18,10 +18,10 @@ Upstream-Status: Inappropriate [configuration]
2 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/gcc/configure b/gcc/configure
-index 98853b3..d0ec50f 100755
+index eaa3b07..9b60aad 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -11821,10 +11821,20 @@ done
+@@ -11830,10 +11830,20 @@ done
tmake_file_=
for f in ${tmake_file}
do
@@ -46,7 +46,7 @@ index 98853b3..d0ec50f 100755
done
tmake_file="${tmake_file_}"
-@@ -11835,6 +11845,10 @@ tm_file_list="options.h"
+@@ -11844,6 +11854,10 @@ tm_file_list="options.h"
tm_include_list="options.h insn-constants.h"
for f in $tm_file; do
case $f in
@@ -58,7 +58,7 @@ index 98853b3..d0ec50f 100755
f=`echo $f | sed 's/^..//'`
tm_file_list="${tm_file_list} $f"
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 52cdcb8..3cf606a 100644
+index 9f6cacb..e1e54f2 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1812,10 +1812,20 @@ done
@@ -98,5 +98,5 @@ index 52cdcb8..3cf606a 100644
f=`echo $f | sed 's/^..//'`
tm_file_list="${tm_file_list} $f"
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc-5.3/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
similarity index 84%
rename from meta/recipes-devtools/gcc/gcc-5.2/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
index 4902e90..60ddd9c 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0028-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
@@ -1,7 +1,7 @@
-From 112ca9f860114bc79273a79ed42722fdc9ded6ea Mon Sep 17 00:00:00 2001
+From 08a0e45b308fc97d06f5c3ef77a257e7a6bd1a48 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 09:39:38 +0000
-Subject: [PATCH 28/35] Avoid using libdir from .la which usually points to a
+Subject: [PATCH 28/46] Avoid using libdir from .la which usually points to a
host path
Upstream-Status: Inappropriate [embedded specific]
@@ -27,5 +27,5 @@ index 0121fba..52bdbdb 100644
absdir="$libdir"
fi
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0029-export-CPP.patch b/meta/recipes-devtools/gcc/gcc-5.3/0029-export-CPP.patch
similarity index 95%
rename from meta/recipes-devtools/gcc/gcc-5.2/0029-export-CPP.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0029-export-CPP.patch
index 0a05ae5..62195aa 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0029-export-CPP.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0029-export-CPP.patch
@@ -1,7 +1,7 @@
-From a983033f1327a692af55be8d1aa61aede18c4afb Mon Sep 17 00:00:00 2001
+From 95f494d1544857ad38949a7da37e2d7264475233 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 09:40:59 +0000
-Subject: [PATCH 29/35] export CPP
+Subject: [PATCH 29/46] export CPP
The OE environment sets and exports CPP as being the target gcc. When
building gcc-cross-canadian for a mingw targetted sdk, the following can be found
@@ -49,5 +49,5 @@ index 36b4008..a783e1e 100644
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
CXX="$(CXX_FOR_BUILD)"; export CXX; \
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch b/meta/recipes-devtools/gcc/gcc-5.3/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
similarity index 88%
rename from meta/recipes-devtools/gcc/gcc-5.2/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
index 873dca9..e7ca360 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0030-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
@@ -1,7 +1,7 @@
-From 3d870a184c05df1338db1870301c4144ba99fc3d Mon Sep 17 00:00:00 2001
+From 4ed8c1fd9dc05f7a9db9298a55396c8f0ff549a7 Mon Sep 17 00:00:00 2001
From: Alexandru-Cezar Sardan <alexandru.sardan@freescale.com>
Date: Wed, 5 Feb 2014 16:52:31 +0200
-Subject: [PATCH 30/35] Enable SPE & AltiVec generation on powepc*linux target
+Subject: [PATCH 30/46] Enable SPE & AltiVec generation on powepc*linux target
When is configured with --target=powerpc-linux, the resulting GCC will
not be able to generate code for SPE targets (e500v1/v2).
@@ -20,10 +20,10 @@ Signed-off-by: Alexandru-Cezar Sardan <alexandru.sardan@freescale.com>
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gcc/config.gcc b/gcc/config.gcc
-index b155744..0541b8a 100644
+index dd0739d..3825bd5 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
-@@ -2337,7 +2337,14 @@ powerpc-*-rtems*)
+@@ -2343,7 +2343,14 @@ powerpc-*-rtems*)
tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-rtems rs6000/t-ppccomm"
;;
powerpc*-*-linux*)
@@ -40,5 +40,5 @@ index b155744..0541b8a 100644
tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppccomm"
extra_objs="$extra_objs rs6000-linux.o"
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch b/meta/recipes-devtools/gcc/gcc-5.3/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
similarity index 91%
rename from meta/recipes-devtools/gcc/gcc-5.2/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
index f06cba8..f2bc664 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0031-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
@@ -1,7 +1,7 @@
-From a824cd3f45875f6c1c47ccdbf33534947bd2b587 Mon Sep 17 00:00:00 2001
+From bb6fea821483aa3259b34e101a39c993edd01411 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 10:21:55 +0000
-Subject: [PATCH 31/35] Disable the MULTILIB_OSDIRNAMES and other multilib
+Subject: [PATCH 31/46] Disable the MULTILIB_OSDIRNAMES and other multilib
options.
Hard coding the MULTILIB_OSDIRNAMES with ../lib64 is causing problems on
@@ -38,5 +38,5 @@ index c296376..3bb59bf 100644
-MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32
+#MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32
--
-2.1.4
+2.6.3
--git a/meta/recipes-devtools/gcc/gcc-5.2/0032-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-5.3/0032-Ensure-target-gcc-headers-can-be-included.patch
similarity index 93%
rename from meta/recipes-devtools/gcc/gcc-5.2/0032-Ensure-target-gcc-headers-can-be-included.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0032-Ensure-target-gcc-headers-can-be-included.patch
index 4513306..89503ff 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0032-Ensure-target-gcc-headers-can-be-included.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0032-Ensure-target-gcc-headers-can-be-included.patch
@@ -1,7 +1,7 @@
-From e60090f7c537c84fd1b22307edd9f386228c7339 Mon Sep 17 00:00:00 2001
+From bb26f90f5e0accc3539f62b6fec663682959dd36 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 10:25:11 +0000
-Subject: [PATCH 32/35] Ensure target gcc headers can be included
+Subject: [PATCH 32/46] Ensure target gcc headers can be included
There are a few headers installed as part of the OpenEmbedded
gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index 9470a92..1497ede 100644
+index 7b49f88..cd5bc4a 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -582,6 +582,7 @@ libexecdir = @libexecdir@
@@ -34,7 +34,7 @@ index 9470a92..1497ede 100644
# Directory in which the compiler finds executables
libexecsubdir = $(libexecdir)/gcc/$(real_target_noncanonical)/$(version)$(accel_dir_suffix)
# Directory in which all plugin resources are installed
-@@ -2603,6 +2604,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\"
+@@ -2610,6 +2611,7 @@ CFLAGS-intl.o += -DLOCALEDIR=\"$(localedir)\"
PREPROCESSOR_DEFINES = \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
@@ -94,5 +94,5 @@ index e6efae7..3ca27b9 100644
#undef MD_EXEC_PREFIX
#undef MD_STARTFILE_PREFIX
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/meta/recipes-devtools/gcc/gcc-5.3/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
similarity index 92%
rename from meta/recipes-devtools/gcc/gcc-5.2/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
index 519e413..19d480f 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0033-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
@@ -1,7 +1,7 @@
-From 997f9e939f85f651b22a48251cfb1444831d54ca Mon Sep 17 00:00:00 2001
+From 629fcc7d0075c9b4261da6435e122429fb028ec0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 11:17:19 +0000
-Subject: [PATCH 33/35] gcc 4.8+ won't build with --disable-dependency-tracking
+Subject: [PATCH 33/46] gcc 4.8+ won't build with --disable-dependency-tracking
since the *.Ppo files don't get created unless --enable-dependency-tracking is true.
@@ -50,5 +50,5 @@ index 9288652..3720256 100644
M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
M_FILE = $(PAT_BASE)_n.c
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc-5.3/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch
similarity index 87%
rename from meta/recipes-devtools/gcc/gcc-5.2/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch
index 207cd7c..a453fa6 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0034-Don-t-search-host-directory-during-relink-if-inst_pr.patch
@@ -1,7 +1,7 @@
-From c94da257a219873b946e08306141af7749679f67 Mon Sep 17 00:00:00 2001
+From a4efc9ca85734c283d4da09b628121e1c1f49c4e Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 3 Mar 2015 08:21:19 +0000
-Subject: [PATCH 34/35] Don't search host directory during "relink" if
+Subject: [PATCH 34/46] Don't search host directory during "relink" if
$inst_prefix is provided
http://lists.gnu.org/archive/html/libtool-patches/2011-01/msg00026.html
@@ -34,5 +34,5 @@ index 52bdbdb..82bcec3 100644
esac
fi
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch b/meta/recipes-devtools/gcc/gcc-5.3/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch
similarity index 96%
rename from meta/recipes-devtools/gcc/gcc-5.2/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch
index b75f385..6ed589b 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0035-Dont-link-the-plugins-with-libgomp-explicitly.patch
@@ -1,7 +1,7 @@
-From 3a09545f3d18ce492ef55639215a072282de03d0 Mon Sep 17 00:00:00 2001
+From 5b0125a792842ae02df507bc55555661cb10f9a3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 8 Mar 2015 03:41:39 +0000
-Subject: [PATCH 35/35] Dont link the plugins with libgomp explicitly
+Subject: [PATCH 35/46] Dont link the plugins with libgomp explicitly
They are dlopened by libgomp anyway. This fixes
the libtool relink issue which causes issues during
@@ -79,5 +79,5 @@ index 167485f..d2c5428 100644
-libgomp_plugin_host_nonshm_la_LIBADD = libgomp.la
libgomp_plugin_host_nonshm_la_LIBTOOLFLAGS = --tag=disable-static
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-5.3/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
similarity index 82%
rename from meta/recipes-devtools/gcc/gcc-5.2/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
index b691946..41c0294 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0036-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
@@ -1,7 +1,7 @@
-From 861bcfd4ae814f351e0c668ee26d01d1331e0422 Mon Sep 17 00:00:00 2001
+From b0b0688176a9482777e9b2e98408bfc4505d31af Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 28 Apr 2015 23:15:27 -0700
-Subject: [PATCH 36/37] Use SYSTEMLIBS_DIR replacement instead of hardcoding
+Subject: [PATCH 36/46] Use SYSTEMLIBS_DIR replacement instead of hardcoding
base_libdir
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -10,7 +10,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
-index 9abb252..79525ee 100644
+index 257acf0..abeb948 100644
--- a/gcc/config/aarch64/aarch64-linux.h
+++ b/gcc/config/aarch64/aarch64-linux.h
@@ -21,7 +21,7 @@
@@ -23,5 +23,5 @@ index 9abb252..79525ee 100644
#undef ASAN_CC1_SPEC
#define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
--
-2.1.4
+2.6.3
diff --git a/meta/recipes-devtools/gcc/gcc-5.3/0037-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc-5.3/0037-aarch64-Add-support-for-musl-ldso.patch
new file mode 100644
index 0000000..30dbe74
--- /dev/null
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0037-aarch64-Add-support-for-musl-ldso.patch
@@ -0,0 +1,26 @@
+From 420ca64a86d560a77ee596a9774d672b08ca8278 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 28 Apr 2015 23:18:39 -0700
+Subject: [PATCH 37/46] aarch64: Add support for musl ldso
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/aarch64/aarch64-linux.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
+index abeb948..f9e65fc 100644
+--- a/gcc/config/aarch64/aarch64-linux.h
++++ b/gcc/config/aarch64/aarch64-linux.h
+@@ -23,6 +23,8 @@
+
+ #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
+
++#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
++
+ #undef ASAN_CC1_SPEC
+ #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
+
+--
+2.6.3
+
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0038-fix-g++-sysroot.patch b/meta/recipes-devtools/gcc/gcc-5.3/0038-fix-g-sysroot.patch
similarity index 64%
rename from meta/recipes-devtools/gcc/gcc-5.2/0038-fix-g++-sysroot.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0038-fix-g-sysroot.patch
index f024dd5..9ba574a 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0038-fix-g++-sysroot.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0038-fix-g-sysroot.patch
@@ -1,3 +1,8 @@
+From 8df3e7007a22c9d6be5d5ae4b9b169c5c8431917 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 27 May 2015 17:06:06 -0700
+Subject: [PATCH 38/46] fix g++ sysroot
+
Portions of
http://www.mail-archive.com/gcc-patches@gcc.gnu.org/msg26013.html
@@ -11,12 +16,16 @@ with c++ test.cpp fails unable to find the header. strace shows it looking in
usr/include/xxxx rather than /usr/include/xxxx
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/configure | 4 +++-
+ gcc/configure.ac | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
-Index: gcc-4.8.1/gcc/configure.ac
-===================================================================
---- gcc-4.8.1.orig/gcc/configure.ac 2013-07-15 15:55:49.488399132 -0700
-+++ gcc-4.8.1/gcc/configure.ac 2013-07-15 16:02:31.772406679 -0700
-@@ -148,7 +148,9 @@
+diff --git a/gcc/configure b/gcc/configure
+index 9b60aad..6df594c 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -3375,7 +3375,9 @@ gcc_gxx_include_dir_add_sysroot=0
if test "${with_sysroot+set}" = set; then
gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
if test "${gcc_gxx_without_sysroot}"; then
@@ -27,11 +36,11 @@ Index: gcc-4.8.1/gcc/configure.ac
gcc_gxx_include_dir_add_sysroot=1
fi
fi
-Index: gcc-4.8.1/gcc/configure
-===================================================================
---- gcc-4.8.1.orig/gcc/configure 2013-07-15 15:55:49.472399132 -0700
-+++ gcc-4.8.1/gcc/configure 2013-07-15 16:02:31.780406680 -0700
-@@ -3325,7 +3325,9 @@
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index e1e54f2..3bb2173 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -152,7 +152,9 @@ gcc_gxx_include_dir_add_sysroot=0
if test "${with_sysroot+set}" = set; then
gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
if test "${gcc_gxx_without_sysroot}"; then
@@ -42,3 +51,6 @@ Index: gcc-4.8.1/gcc/configure
gcc_gxx_include_dir_add_sysroot=1
fi
fi
+--
+2.6.3
+
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc-5.3/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
similarity index 90%
rename from meta/recipes-devtools/gcc/gcc-5.2/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
index 2f025c6..2e0df96 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0039-libcc1-fix-libcc1-s-install-path-and-rpath.patch
@@ -1,7 +1,7 @@
-From acea0df9997a47f8b8224b6ca1618c8c9dfbe6d5 Mon Sep 17 00:00:00 2001
+From 1eede9e4a10d3532db826a6eeced695df3ad5b89 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Sun, 5 Jul 2015 20:25:18 -0700
-Subject: [PATCH] libcc1: fix libcc1's install path and rpath
+Subject: [PATCH 39/46] libcc1: fix libcc1's install path and rpath
* Install libcc1.so and libcc1plugin.so into
$(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version), as what we
@@ -15,8 +15,8 @@ Upstream-Status: Inappropriate [OE configuration]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
- libcc1/Makefile.am | 4 ++--
- libcc1/Makefile.in | 4 ++--
+ libcc1/Makefile.am | 4 ++--
+ libcc1/Makefile.in | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am
@@ -49,3 +49,6 @@ index 1916134..c8995d2 100644
@ENABLE_PLUGIN_TRUE@plugin_LTLIBRARIES = libcc1plugin.la
@ENABLE_PLUGIN_TRUE@cc1lib_LTLIBRARIES = libcc1.la
BUILT_SOURCES = compiler-name.h
+--
+2.6.3
+
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0040-nativesdk-gcc-support.patch b/meta/recipes-devtools/gcc/gcc-5.3/0040-handle-sysroot-support-for-nativesdk-gcc.patch
similarity index 93%
rename from meta/recipes-devtools/gcc/gcc-5.2/0040-nativesdk-gcc-support.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0040-handle-sysroot-support-for-nativesdk-gcc.patch
index fd81ae2..11e1310 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0040-nativesdk-gcc-support.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0040-handle-sysroot-support-for-nativesdk-gcc.patch
@@ -1,3 +1,8 @@
+From b41674d357c4ba320b9860e0f313d2f5a332f27d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 7 Dec 2015 23:39:54 +0000
+Subject: [PATCH 40/46] handle sysroot support for nativesdk-gcc
+
Being able to build a nativesdk gcc is useful, particularly in cases
where the host compiler may be of an incompatible version (or a 32
bit compiler is needed).
@@ -15,11 +20,18 @@ a) Add %r into spec file markup which can be used for injected paths
b) Add other paths which need relocation into a .gccrelocprefix section
which the relocation code will notice and adjust automatically.
-
Upstream-Status: Inappropriate
RP 2015/7/28
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/cppdefault.c | 50 +++++++++++++++++++++++++++++++++++++-------------
+ gcc/cppdefault.h | 3 ++-
+ gcc/gcc.c | 20 ++++++++++++++------
+ 3 files changed, 53 insertions(+), 20 deletions(-)
+
diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
+index 03a0287..f44c1d8 100644
--- a/gcc/cppdefault.c
+++ b/gcc/cppdefault.c
@@ -35,6 +35,30 @@
@@ -123,6 +135,7 @@ diff --git a/gcc/cppdefault.c b/gcc/cppdefault.c
{ 0, 0, 0, 0, 0, 0 }
};
diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
+index c98644f..4198669 100644
--- a/gcc/cppdefault.h
+++ b/gcc/cppdefault.h
@@ -33,7 +33,8 @@
@@ -136,6 +149,7 @@ diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
(see update_path in prefix.c) */
const char cplusplus; /* Only look here if we're compiling C++. */
diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 3ca27b9..2b7756e 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -120,6 +120,8 @@ static const char *target_system_root = TARGET_SYSTEM_ROOT;
@@ -182,7 +196,7 @@ diff --git a/gcc/gcc.c b/gcc/gcc.c
= STANDARD_STARTFILE_PREFIX_2;
/* A relative path to be used in finding the location of tools
-@@ -5550,6 +5553,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
+@@ -5523,6 +5526,11 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
}
break;
@@ -194,3 +208,6 @@ diff --git a/gcc/gcc.c b/gcc/gcc.c
case 'S':
value = do_spec_1 (startfile_spec, 0, NULL);
if (value != 0)
+--
+2.6.3
+
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0041-handle-target-sysroot-multilib.patch b/meta/recipes-devtools/gcc/gcc-5.3/0041-Search-target-sysroot-gcc-version-specific-dirs-with.patch
similarity index 73%
rename from meta/recipes-devtools/gcc/gcc-5.2/0041-handle-target-sysroot-multilib.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0041-Search-target-sysroot-gcc-version-specific-dirs-with.patch
index 5356984..5a504a1 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0041-handle-target-sysroot-multilib.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0041-Search-target-sysroot-gcc-version-specific-dirs-with.patch
@@ -1,18 +1,24 @@
-Search target sysroot gcc version specific dirs with multilib.
+From 99cadb4d8415dd5a275d7d6410f20db33d0f8433 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 7 Dec 2015 23:41:45 +0000
+Subject: [PATCH 41/46] Search target sysroot gcc version specific dirs with
+ multilib.
We install the gcc libraries (such as crtbegin.p) into
<sysroot><libdir>/<target-sys>/5.2.0/
-which is a default search path for GCC (aka multi_suffix in the
+which is a default search path for GCC (aka multi_suffix in the
code below). <target-sys> is 'machine' in gcc's terminology. We use
-these directories so that multiple gcc versions could in theory
+these directories so that multiple gcc versions could in theory
co-exist on target.
-We only want to build one gcc-cross-canadian per arch and have this work
+We only want to build one gcc-cross-canadian per arch and have this work
for all multilibs. <target-sys> can be handled by mapping the multilib
-<target-sys> to the one used by gcc-cross-canadian, e.g. mips64-polkmllib32-linux
+<target-sys> to the one used by gcc-cross-canadian, e.g.
+mips64-polkmllib32-linux
is symlinked to by mips64-poky-linux.
-The default gcc search path in the target sysroot for a "lib64" mutlilib is:
+The default gcc search path in the target sysroot for a "lib64" mutlilib
+is:
<sysroot>/lib32/mips64-poky-linux/5.2.0/
<sysroot>/lib32/../lib64/
@@ -39,11 +45,16 @@ binaries can be found first. With this change the search path becomes:
Upstream-Status: Pending
RP 2015/7/31
-Index: gcc-5.2.0/gcc/gcc.c
-===================================================================
---- gcc-5.2.0.orig/gcc/gcc.c
-+++ gcc-5.2.0/gcc/gcc.c
-@@ -2305,7 +2305,7 @@ for_each_path (const struct path_prefix
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/gcc.c | 29 ++++++++++++++++++++++++++++-
+ 1 file changed, 28 insertions(+), 1 deletion(-)
+
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 2b7756e..8f53aea 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -2305,7 +2305,7 @@ for_each_path (const struct path_prefix *paths,
if (path == NULL)
{
len = paths->max_len + extra_space + 1;
@@ -52,7 +63,7 @@ Index: gcc-5.2.0/gcc/gcc.c
path = XNEWVEC (char, len);
}
-@@ -2317,6 +2317,33 @@ for_each_path (const struct path_prefix
+@@ -2317,6 +2317,33 @@ for_each_path (const struct path_prefix *paths,
/* Look first in MACHINE/VERSION subdirectory. */
if (!skip_multi_dir)
{
@@ -86,3 +97,6 @@ Index: gcc-5.2.0/gcc/gcc.c
memcpy (path + len, multi_suffix, suffix_len + 1);
ret = callback (path, callback_info);
if (ret)
+--
+2.6.3
+
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0042-cxxflags-for-build.patch b/meta/recipes-devtools/gcc/gcc-5.3/0042-Fix-various-_FOR_BUILD-and-related-variables.patch
similarity index 88%
rename from meta/recipes-devtools/gcc/gcc-5.2/0042-cxxflags-for-build.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0042-Fix-various-_FOR_BUILD-and-related-variables.patch
index 1105e29..5af764b 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0042-cxxflags-for-build.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0042-Fix-various-_FOR_BUILD-and-related-variables.patch
@@ -1,4 +1,7 @@
-Fix various _FOR_BUILD and related variables
+From 78e77206902349c9256f06c3dd179197a39af2e1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 7 Dec 2015 23:42:45 +0000
+Subject: [PATCH 42/46] Fix various _FOR_BUILD and related variables
When doing a FOR_BUILD thing, you have to override CFLAGS with
CFLAGS_FOR_BUILD. And if you use C++, you also have to override
@@ -13,9 +16,17 @@ Upstream-Status: Pending
Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile.in | 6 ++++++
+ Makefile.tpl | 5 +++++
+ gcc/Makefile.in | 2 +-
+ gcc/configure | 2 +-
+ gcc/configure.ac | 2 +-
+ 5 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 9370174..011c29a 100644
+index a783e1e..8b6d3d2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -152,6 +152,7 @@ BUILD_EXPORTS = \
@@ -44,7 +55,7 @@ index 9370174..011c29a 100644
ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
CFLAGS="$(CFLAGS)"; export CFLAGS; \
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
-@@ -711,6 +715,7 @@ BASE_FLAGS_TO_PASS = \
+@@ -710,6 +715,7 @@ BASE_FLAGS_TO_PASS = \
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
@@ -96,7 +107,7 @@ index cd5bc4a..98ae4f4 100644
# Actual name to use when installing a native compiler.
GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
diff --git a/gcc/configure b/gcc/configure
-index c7ac14b..5ac63e4 100755
+index 6df594c..fcb05e7 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -11521,7 +11521,7 @@ else
@@ -109,7 +120,7 @@ index c7ac14b..5ac63e4 100755
--enable-languages=${enable_languages-all} \
--target=$target_alias --host=$build_alias --build=$build_alias
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 50856e6..17a4dfd 100644
+index 3bb2173..923bc9a 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1633,7 +1633,7 @@ else
@@ -121,3 +132,6 @@ index 50856e6..17a4dfd 100644
${realsrcdir}/configure \
--enable-languages=${enable_languages-all} \
--target=$target_alias --host=$build_alias --build=$build_alias
+--
+2.6.3
+
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0043-libstdc-musl.patch b/meta/recipes-devtools/gcc/gcc-5.3/0043-libstdc-Support-musl.patch
similarity index 56%
rename from meta/recipes-devtools/gcc/gcc-5.2/0043-libstdc-musl.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0043-libstdc-Support-musl.patch
index 048e481..bad8402 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0043-libstdc-musl.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0043-libstdc-Support-musl.patch
@@ -1,11 +1,20 @@
+From df430b943a2df6b72054c808d4b93338a82562de Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 8 Dec 2015 08:23:34 +0000
+Subject: [PATCH 43/46] libstdc++: Support musl
+
Upstream-Status: Pending
+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libstdc++-v3/configure.host | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
-Index: gcc-4.9-20140316/libstdc++-v3/configure.host
-===================================================================
---- gcc-4.9-20140316.orig/libstdc++-v3/configure.host 2014-03-26 01:12:19.466008193 -0700
-+++ gcc-4.9-20140316/libstdc++-v3/configure.host 2014-03-26 01:43:48.222684357 -0700
-@@ -264,14 +264,24 @@
+diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
+index 640199c..1756444 100644
+--- a/libstdc++-v3/configure.host
++++ b/libstdc++-v3/configure.host
+@@ -274,14 +274,24 @@ case "${host_os}" in
os_include_dir="os/bsd/freebsd"
;;
gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
@@ -30,3 +39,6 @@ Index: gcc-4.9-20140316/libstdc++-v3/configure.host
hpux*)
os_include_dir="os/hpux"
;;
+--
+2.6.3
+
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0044-gcc-musl-support.patch b/meta/recipes-devtools/gcc/gcc-5.3/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
similarity index 75%
rename from meta/recipes-devtools/gcc/gcc-5.2/0044-gcc-musl-support.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
index 4d1ab87..b91c02d 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0044-gcc-musl-support.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0044-Adding-mmusl-as-a-musl-libc-specifier-and-the-necess.patch
@@ -1,15 +1,25 @@
-# HG changeset patch
-# Parent e5b4564f249f8634194bdabef4b3057d0e54ee97
-Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker.
+From 0b54799d80fb859c7b142467e4d42c99db59df50 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 8 Dec 2015 08:30:35 +0000
+Subject: [PATCH 44/46] Adding -mmusl as a musl libc specifier, and the
+ necessary hacks for it to know how to find musl's dynamic linker.
Upstream-Status: Backport [partial]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config.gcc | 10 ++++-
+ gcc/config/linux.h | 100 +++++++++++++++++++++++++++++++++++++-----
+ gcc/config/linux.opt | 4 ++
+ gcc/config/rs6000/secureplt.h | 1 +
+ gcc/config/rs6000/sysv4.h | 5 +++
+ gcc/ginclude/stddef.h | 3 ++
+ 6 files changed, 110 insertions(+), 13 deletions(-)
-Index: gcc-4.9.0/gcc/config.gcc
-===================================================================
---- gcc-4.9.0.orig/gcc/config.gcc 2014-04-22 22:44:17.153567150 -0700
-+++ gcc-4.9.0/gcc/config.gcc 2014-04-23 23:54:31.427357051 -0700
-@@ -594,7 +594,7 @@
+diff --git a/gcc/config.gcc b/gcc/config.gcc
+index 3825bd5..39ce047 100644
+--- a/gcc/config.gcc
++++ b/gcc/config.gcc
+@@ -575,7 +575,7 @@ case ${target} in
esac
# Common C libraries.
@@ -18,7 +28,7 @@ Index: gcc-4.9.0/gcc/config.gcc
# 32-bit x86 processors supported by --with-arch=. Each processor
# MUST be separated by exactly one space.
-@@ -719,6 +719,9 @@
+@@ -720,6 +720,9 @@ case ${target} in
*-*-*uclibc*)
tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
;;
@@ -28,7 +38,7 @@ Index: gcc-4.9.0/gcc/config.gcc
*)
tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
;;
-@@ -2328,6 +2331,11 @@
+@@ -2420,6 +2423,11 @@ powerpc*-*-linux*)
powerpc*-*-linux*paired*)
tm_file="${tm_file} rs6000/750cl.h" ;;
esac
@@ -40,11 +50,11 @@ Index: gcc-4.9.0/gcc/config.gcc
if test x${enable_secureplt} = xyes; then
tm_file="rs6000/secureplt.h ${tm_file}"
fi
-Index: gcc-4.9.0/gcc/config/linux.h
-===================================================================
---- gcc-4.9.0.orig/gcc/config/linux.h 2014-01-02 14:23:26.000000000 -0800
-+++ gcc-4.9.0/gcc/config/linux.h 2014-04-24 00:11:29.034028895 -0700
-@@ -32,10 +32,12 @@
+diff --git a/gcc/config/linux.h b/gcc/config/linux.h
+index 22b9be5..ca9a17f 100644
+--- a/gcc/config/linux.h
++++ b/gcc/config/linux.h
+@@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
#define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
@@ -57,7 +67,7 @@ Index: gcc-4.9.0/gcc/config/linux.h
#endif
#define GNU_USER_TARGET_OS_CPP_BUILTINS() \
-@@ -53,18 +55,21 @@
+@@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
uClibc or Bionic is the default C library and whether
-muclibc or -mglibc or -mbionic has been passed to change the default. */
@@ -87,7 +97,7 @@ Index: gcc-4.9.0/gcc/config/linux.h
#else
#error "Unsupported DEFAULT_LIBC"
#endif /* DEFAULT_LIBC */
-@@ -84,16 +89,16 @@
+@@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define GNU_USER_DYNAMIC_LINKER \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
@@ -108,7 +118,7 @@ Index: gcc-4.9.0/gcc/config/linux.h
/* Whether we have Bionic libc runtime */
#undef TARGET_HAS_BIONIC
-@@ -127,3 +132,74 @@
+@@ -123,3 +128,74 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
# define TARGET_LIBC_HAS_FUNCTION linux_libc_has_function
#endif
@@ -183,11 +193,11 @@ Index: gcc-4.9.0/gcc/config/linux.h
+ { 0, 0, 0, 0, 0, 0 } \
+ }
+#endif
-Index: gcc-4.9.0/gcc/config/linux.opt
-===================================================================
---- gcc-4.9.0.orig/gcc/config/linux.opt 2014-01-02 14:23:26.000000000 -0800
-+++ gcc-4.9.0/gcc/config/linux.opt 2014-04-22 22:44:17.280233817 -0700
-@@ -30,3 +30,7 @@
+diff --git a/gcc/config/linux.opt b/gcc/config/linux.opt
+index c054338..9334f74 100644
+--- a/gcc/config/linux.opt
++++ b/gcc/config/linux.opt
+@@ -30,3 +30,7 @@ Use GNU C library
muclibc
Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
Use uClibc C library
@@ -195,48 +205,20 @@ Index: gcc-4.9.0/gcc/config/linux.opt
+mmusl
+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
+Use musl C library
-Index: gcc-4.9.0/gcc/ginclude/stddef.h
-===================================================================
---- gcc-4.9.0.orig/gcc/ginclude/stddef.h 2014-01-02 14:23:26.000000000 -0800
-+++ gcc-4.9.0/gcc/ginclude/stddef.h 2014-04-22 22:44:17.280233817 -0700
-@@ -181,6 +181,7 @@
- #ifndef _GCC_SIZE_T
- #ifndef _SIZET_
- #ifndef __size_t
-+#ifndef __DEFINED_size_t /* musl */
- #define __size_t__ /* BeOS */
- #define __SIZE_T__ /* Cray Unicos/Mk */
- #define _SIZE_T
-@@ -197,6 +198,7 @@
- #define ___int_size_t_h
- #define _GCC_SIZE_T
- #define _SIZET_
-+#define __DEFINED_size_t /* musl */
- #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
- || defined(__FreeBSD_kernel__)
- /* __size_t is a typedef on FreeBSD 5, must not trash it. */
-@@ -214,6 +216,7 @@
- typedef long ssize_t;
- #endif /* __BEOS__ */
- #endif /* !(defined (__GNUG__) && defined (size_t)) */
-+#endif /* __DEFINED_size_t */
- #endif /* __size_t */
- #endif /* _SIZET_ */
- #endif /* _GCC_SIZE_T */
-Index: gcc-4.9.0/gcc/config/rs6000/secureplt.h
-===================================================================
---- gcc-4.9.0.orig/gcc/config/rs6000/secureplt.h 2014-01-02 14:23:26.000000000 -0800
-+++ gcc-4.9.0/gcc/config/rs6000/secureplt.h 2014-04-23 23:55:15.114024175 -0700
-@@ -18,3 +18,4 @@
+diff --git a/gcc/config/rs6000/secureplt.h b/gcc/config/rs6000/secureplt.h
+index b463463..77edf2a 100644
+--- a/gcc/config/rs6000/secureplt.h
++++ b/gcc/config/rs6000/secureplt.h
+@@ -18,3 +18,4 @@ along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
#define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-Index: gcc-4.9.0/gcc/config/rs6000/sysv4.h
-===================================================================
---- gcc-4.9.0.orig/gcc/config/rs6000/sysv4.h 2014-04-23 23:52:13.854023015 -0700
-+++ gcc-4.9.0/gcc/config/rs6000/sysv4.h 2014-04-24 00:10:55.550695334 -0700
-@@ -538,6 +538,10 @@
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+index c6c31dc..7cd07e0 100644
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -538,6 +538,10 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
#define CC1_SECURE_PLT_DEFAULT_SPEC ""
#endif
@@ -245,19 +227,9 @@ Index: gcc-4.9.0/gcc/config/rs6000/sysv4.h
+#endif
+
/* Pass -G xxx to the compiler. */
+ #undef CC1_SPEC
#define CC1_SPEC "%{G*} %(cc1_cpu)" \
- "%{meabi: %{!mcall-*: -mcall-sysv }} \
-@@ -585,7 +589,8 @@
-
- /* Override the default target of the linker. */
- #define LINK_TARGET_SPEC \
-- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
-+ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
-+ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
-
- /* Any specific OS flags. */
- #define LINK_OS_SPEC "\
-@@ -894,6 +899,7 @@
+@@ -889,6 +893,7 @@ ncrtn.o%s"
{ "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \
{ "link_os_default", LINK_OS_DEFAULT_SPEC }, \
{ "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \
@@ -265,3 +237,34 @@ Index: gcc-4.9.0/gcc/config/rs6000/sysv4.h
{ "cpp_os_ads", CPP_OS_ADS_SPEC }, \
{ "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \
{ "cpp_os_mvme", CPP_OS_MVME_SPEC }, \
+diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
+index f20a41b..eb879ef 100644
+--- a/gcc/ginclude/stddef.h
++++ b/gcc/ginclude/stddef.h
+@@ -184,6 +184,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #ifndef _GCC_SIZE_T
+ #ifndef _SIZET_
+ #ifndef __size_t
++#ifndef __DEFINED_size_t /* musl */
+ #define __size_t__ /* BeOS */
+ #define __SIZE_T__ /* Cray Unicos/Mk */
+ #define _SIZE_T
+@@ -200,6 +201,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
+ #define ___int_size_t_h
+ #define _GCC_SIZE_T
+ #define _SIZET_
++#define __DEFINED_size_t /* musl */
+ #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+ || defined(__DragonFly__) \
+ || defined(__FreeBSD_kernel__)
+@@ -218,6 +220,7 @@ typedef __SIZE_TYPE__ size_t;
+ typedef long ssize_t;
+ #endif /* __BEOS__ */
+ #endif /* !(defined (__GNUG__) && defined (size_t)) */
++#endif /* __DEFINED_size_t */
+ #endif /* __size_t */
+ #endif /* _SIZET_ */
+ #endif /* _GCC_SIZE_T */
+--
+2.6.3
+
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0045-musl-dynamic-linker.patch b/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch
similarity index 68%
rename from meta/recipes-devtools/gcc/gcc-5.2/0045-musl-dynamic-linker.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch
index 3dadb95..7f7307b 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0045-musl-dynamic-linker.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0045-Support-for-arm-linux-musl.patch
@@ -1,15 +1,38 @@
-# HG changeset patch
-# Parent 6738fd6f6fcc2a72f2ba527bda3325642af26885
-Support for arm-linux-musl.
+From a32a7901315bf01d0605e43cb7d0427a6d7e4b75 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 8 Dec 2015 08:31:52 +0000
+Subject: [PATCH 45/46] Support for arm-linux-musl.
Upstream-Status: backport [partial]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ gcc/config/aarch64/aarch64-linux.h | 1 +
+ gcc/config/arm/linux-eabi.h | 17 +++++++++++++++++
+ gcc/config/i386/linux.h | 1 +
+ gcc/config/i386/linux64.h | 5 +++++
+ gcc/config/mips/linux.h | 6 +++++-
+ gcc/config/rs6000/linux64.h | 13 +++++++++----
+ gcc/config/rs6000/sysv4.h | 10 +++++++---
+ libitm/config/arm/hwcap.cc | 4 ++++
+ libitm/config/linux/x86/tls.h | 8 ++++++--
+ 9 files changed, 55 insertions(+), 10 deletions(-)
-
-Index: gcc-5.1.0/gcc/config/arm/linux-eabi.h
-===================================================================
---- gcc-5.1.0.orig/gcc/config/arm/linux-eabi.h
-+++ gcc-5.1.0/gcc/config/arm/linux-eabi.h
+diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
+index f9e65fc..1b2d0c0 100644
+--- a/gcc/config/aarch64/aarch64-linux.h
++++ b/gcc/config/aarch64/aarch64-linux.h
+@@ -22,6 +22,7 @@
+ #define GCC_AARCH64_LINUX_H
+
+ #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
++#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
+
+ #define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
+
+diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
+index 048a062..adb9c44 100644
+--- a/gcc/config/arm/linux-eabi.h
++++ b/gcc/config/arm/linux-eabi.h
@@ -81,6 +81,23 @@
#undef TARGET_FIX_V4BX_SPEC
#define TARGET_FIX_V4BX_SPEC "%{mcpu=arm8|mcpu=arm810|mcpu=strongarm*|march=armv4: --fix-v4bx}"
@@ -34,36 +57,20 @@ Index: gcc-5.1.0/gcc/config/arm/linux-eabi.h
/* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
use the GNU/Linux version, not the generic BPABI version. */
#undef LINK_SPEC
-Index: gcc-5.1.0/libitm/config/arm/hwcap.cc
-===================================================================
---- gcc-5.1.0.orig/libitm/config/arm/hwcap.cc
-+++ gcc-5.1.0/libitm/config/arm/hwcap.cc
-@@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0
-
- #ifdef __linux__
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <sys/fcntl.h>
-+#else
-+#include <fcntl.h>
-+#endif
- #include <elf.h>
-
- static void __attribute__((constructor))
-Index: gcc-5.1.0/gcc/config/i386/linux.h
-===================================================================
---- gcc-5.1.0.orig/gcc/config/i386/linux.h
-+++ gcc-5.1.0/gcc/config/i386/linux.h
-@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3.
+diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
+index 21ba2b2..e2b81e5 100644
+--- a/gcc/config/i386/linux.h
++++ b/gcc/config/i386/linux.h
+@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3. If not see
#define GNU_USER_LINK_EMULATION "elf_i386"
#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2"
+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-i386.so.1"
-Index: gcc-5.1.0/gcc/config/i386/linux64.h
-===================================================================
---- gcc-5.1.0.orig/gcc/config/i386/linux64.h
-+++ gcc-5.1.0/gcc/config/i386/linux64.h
-@@ -30,3 +30,8 @@ see the files COPYING3 and COPYING.RUNTI
+diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
+index 6185cce..5a3a977 100644
+--- a/gcc/config/i386/linux64.h
++++ b/gcc/config/i386/linux64.h
+@@ -30,3 +30,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2"
#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2"
#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2"
@@ -72,11 +79,11 @@ Index: gcc-5.1.0/gcc/config/i386/linux64.h
+#define MUSL_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-musl-x86_64.so.1"
+#define MUSL_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-musl-x32.so.1"
+
-Index: gcc-5.1.0/gcc/config/mips/linux.h
-===================================================================
---- gcc-5.1.0.orig/gcc/config/mips/linux.h
-+++ gcc-5.1.0/gcc/config/mips/linux.h
-@@ -21,6 +21,10 @@ along with GCC; see the file COPYING3.
+diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
+index c306afb..44d4c12 100644
+--- a/gcc/config/mips/linux.h
++++ b/gcc/config/mips/linux.h
+@@ -21,6 +21,10 @@ along with GCC; see the file COPYING3. If not see
#define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
#define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
@@ -87,16 +94,16 @@ Index: gcc-5.1.0/gcc/config/mips/linux.h
#define GLIBC_DYNAMIC_LINKER32 \
"%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}"
#define GLIBC_DYNAMIC_LINKER64 \
-@@ -40,4 +44,4 @@ along with GCC; see the file COPYING3.
+@@ -40,4 +44,4 @@ along with GCC; see the file COPYING3. If not see
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
#define GNU_USER_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32)
+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
-Index: gcc-5.1.0/gcc/config/rs6000/linux64.h
-===================================================================
---- gcc-5.1.0.orig/gcc/config/rs6000/linux64.h
-+++ gcc-5.1.0/gcc/config/rs6000/linux64.h
+diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
+index 31c4338..679da4b 100644
+--- a/gcc/config/rs6000/linux64.h
++++ b/gcc/config/rs6000/linux64.h
@@ -365,17 +365,22 @@ extern int dot_symbols;
#endif
#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0"
@@ -124,11 +131,11 @@ Index: gcc-5.1.0/gcc/config/rs6000/linux64.h
#undef DEFAULT_ASM_ENDIAN
#if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-Index: gcc-5.1.0/gcc/config/rs6000/sysv4.h
-===================================================================
---- gcc-5.1.0.orig/gcc/config/rs6000/sysv4.h
-+++ gcc-5.1.0/gcc/config/rs6000/sysv4.h
-@@ -769,15 +769,19 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
+index 7cd07e0..8794fa5 100644
+--- a/gcc/config/rs6000/sysv4.h
++++ b/gcc/config/rs6000/sysv4.h
+@@ -763,15 +763,19 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEFAULT_ASM_ENDIAN)
#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
@@ -151,10 +158,26 @@ Index: gcc-5.1.0/gcc/config/rs6000/sysv4.h
#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
%{rdynamic:-export-dynamic} \
-Index: gcc-5.1.0/libitm/config/linux/x86/tls.h
-===================================================================
---- gcc-5.1.0.orig/libitm/config/linux/x86/tls.h
-+++ gcc-5.1.0/libitm/config/linux/x86/tls.h
+diff --git a/libitm/config/arm/hwcap.cc b/libitm/config/arm/hwcap.cc
+index a1c2cfd..dd4fad2 100644
+--- a/libitm/config/arm/hwcap.cc
++++ b/libitm/config/arm/hwcap.cc
+@@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0
+
+ #ifdef __linux__
+ #include <unistd.h>
++#ifdef __GLIBC__
+ #include <sys/fcntl.h>
++#else
++#include <fcntl.h>
++#endif
+ #include <elf.h>
+
+ static void __attribute__((constructor))
+diff --git a/libitm/config/linux/x86/tls.h b/libitm/config/linux/x86/tls.h
+index e731ab7..54ad8b6 100644
+--- a/libitm/config/linux/x86/tls.h
++++ b/libitm/config/linux/x86/tls.h
@@ -25,16 +25,19 @@
#ifndef LIBITM_X86_TLS_H
#define LIBITM_X86_TLS_H 1
@@ -177,22 +200,13 @@ Index: gcc-5.1.0/libitm/config/linux/x86/tls.h
namespace GTM HIDDEN {
#ifdef __x86_64__
-@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct a
+@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct abi_dispatch *x)
} // namespace GTM
#endif /* >= GLIBC 2.10 */
+#endif
#endif // LIBITM_X86_TLS_H
-Index: gcc-5.1.0/gcc/config/aarch64/aarch64-linux.h
-===================================================================
---- gcc-5.1.0.orig/gcc/config/aarch64/aarch64-linux.h
-+++ gcc-5.1.0/gcc/config/aarch64/aarch64-linux.h
-@@ -22,6 +22,7 @@
- #define GCC_AARCH64_LINUX_H
-
- #define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
-+#define MUSL_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-musl-aarch64.so.1"
-
- #undef ASAN_CC1_SPEC
- #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}"
+--
+2.6.3
+
diff --git a/meta/recipes-devtools/gcc/gcc-5.2/0046-musl-no-fixincludes.patch b/meta/recipes-devtools/gcc/gcc-5.3/0046-Get-rid-of-ever-broken-fixincludes-on-musl.patch
similarity index 45%
rename from meta/recipes-devtools/gcc/gcc-5.2/0046-musl-no-fixincludes.patch
rename to meta/recipes-devtools/gcc/gcc-5.3/0046-Get-rid-of-ever-broken-fixincludes-on-musl.patch
index 05fe52f..ddb0fc4 100644
--- a/meta/recipes-devtools/gcc/gcc-5.2/0046-musl-no-fixincludes.patch
+++ b/meta/recipes-devtools/gcc/gcc-5.3/0046-Get-rid-of-ever-broken-fixincludes-on-musl.patch
@@ -1,15 +1,18 @@
-# HG changeset patch
-# Parent 600a8a422ccaf5627ad1f5a138e7398df2b9e9d8
-Get rid of ever-broken fixincludes on musl.
+From 047116e8c9cbb340264f4f28db3f21a68ba57ff3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 8 Dec 2015 08:32:24 +0000
+Subject: [PATCH 46/46] Get rid of ever-broken fixincludes on musl.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ fixincludes/mkfixinc.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: gcc-4.9-20140316/fixincludes/mkfixinc.sh
-===================================================================
---- gcc-4.9-20140316.orig/fixincludes/mkfixinc.sh
-+++ gcc-4.9-20140316/fixincludes/mkfixinc.sh
+diff --git a/fixincludes/mkfixinc.sh b/fixincludes/mkfixinc.sh
+index 6653fedb..0d96c8c 100755
+--- a/fixincludes/mkfixinc.sh
++++ b/fixincludes/mkfixinc.sh
@@ -19,7 +19,8 @@ case $machine in
powerpc-*-eabi* | \
powerpc-*-rtems* | \
@@ -20,3 +23,6 @@ Index: gcc-4.9-20140316/fixincludes/mkfixinc.sh
# IF there is no include fixing,
# THEN create a no-op fixer and exit
(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
+--
+2.6.3
+
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_5.2.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-cross-canadian_5.2.bb
rename to meta/recipes-devtools/gcc/gcc-cross-canadian_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_5.2.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-cross-initial_5.2.bb
rename to meta/recipes-devtools/gcc/gcc-cross-initial_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_5.2.bb b/meta/recipes-devtools/gcc/gcc-cross_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-cross_5.2.bb
rename to meta/recipes-devtools/gcc/gcc-cross_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.2.bb
rename to meta/recipes-devtools/gcc/gcc-crosssdk-initial_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_5.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-crosssdk_5.2.bb
rename to meta/recipes-devtools/gcc/gcc-crosssdk_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 690d780..c31072a 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -143,11 +143,11 @@ FILES_libstdc++ = "${libdir}/libstdc++.so.*"
FILES_libstdc++-dev = "\
${includedir}/c++/ \
${libdir}/libstdc++.so \
- ${libdir}/libstdc++.la \
+ ${libdir}/libstdc++*.la \
${libdir}/libsupc++.la \
"
FILES_libstdc++-staticdev = "\
- ${libdir}/libstdc++.a \
+ ${libdir}/libstdc++*.a \
${libdir}/libsupc++.a \
"
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_5.2.bb b/meta/recipes-devtools/gcc/gcc-runtime_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-runtime_5.2.bb
rename to meta/recipes-devtools/gcc/gcc-runtime_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_5.2.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-sanitizers_5.2.bb
rename to meta/recipes-devtools/gcc/gcc-sanitizers_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-source_5.2.bb b/meta/recipes-devtools/gcc/gcc-source_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-source_5.2.bb
rename to meta/recipes-devtools/gcc/gcc-source_5.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc_5.2.bb b/meta/recipes-devtools/gcc/gcc_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc_5.2.bb
rename to meta/recipes-devtools/gcc/gcc_5.3.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_5.2.bb b/meta/recipes-devtools/gcc/libgcc-initial_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/libgcc-initial_5.2.bb
rename to meta/recipes-devtools/gcc/libgcc-initial_5.3.bb
diff --git a/meta/recipes-devtools/gcc/libgcc_5.2.bb b/meta/recipes-devtools/gcc/libgcc_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/libgcc_5.2.bb
rename to meta/recipes-devtools/gcc/libgcc_5.3.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran_5.2.bb b/meta/recipes-devtools/gcc/libgfortran_5.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/libgfortran_5.2.bb
rename to meta/recipes-devtools/gcc/libgfortran_5.3.bb
--
2.6.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 2/6] uclibc: Switch to using uclibc-ng
2015-12-14 6:22 [PATCH 0/6] gcc/uclibc/musl updates Khem Raj
2015-12-14 6:23 ` [PATCH 1/6] gcc5: Upgrade gcc-5.2 -> gcc-5.3 Khem Raj
@ 2015-12-14 6:23 ` Khem Raj
2015-12-14 12:20 ` Burton, Ross
2015-12-14 12:25 ` Burton, Ross
2015-12-14 6:23 ` [PATCH 3/6] packagegroup-core-sdk: Disable sanitizers for uclibc Khem Raj
` (3 subsequent siblings)
5 siblings, 2 replies; 17+ messages in thread
From: Khem Raj @ 2015-12-14 6:23 UTC (permalink / raw)
To: openembedded-core
uclibc-ng is a maintained fork of uclibc project. Lets switch to using that
add patches to fix memory leak in canonicalize_file_name-memory
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/recipes-core/uclibc/uclibc-config.inc | 1 +
meta/recipes-core/uclibc/uclibc-git.inc | 21 +-
...ert-glibc-compat-bump-glibc-minor-version.patch | 26 +++
...-AT_EMPTY_PATH-for-all-and-O_PATH-for-arm.patch | 42 ----
...zes-away-the-write-only-static-functions-.patch | 51 -----
.../uclibc/uclibc-git/0001-wire-in-syncfs.patch | 49 -----
...t-localised-optimizations-this-helps-to-h.patch | 30 ---
.../0005-Always-use-O2-for-compiling-fork.c.patch | 33 ---
...-ldso-limited-support-for-ORIGIN-in-rpath.patch | 233 ---------------------
...rk-Hide-pthread_atfork-in-shared-versions.patch | 35 ----
...stdlib-canonicalize_file_name-memory-leak.patch | 36 ++++
meta/recipes-core/uclibc/uclibc-git/uClibc.distro | 4 +-
meta/recipes-core/uclibc/uclibc.inc | 8 +-
meta/recipes-core/uclibc/uclibc_git.bb | 5 +
15 files changed, 80 insertions(+), 496 deletions(-)
create mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-Revert-glibc-compat-bump-glibc-minor-version.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-fcntl-Add-AT_EMPTY_PATH-for-all-and-O_PATH-for-arm.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-gcc5-optimizes-away-the-write-only-static-functions-.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/0001-wire-in-syncfs.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/0004-Dont-support-localised-optimizations-this-helps-to-h.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/0005-Always-use-O2-for-compiling-fork.c.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-git/0007-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch
create mode 100644 meta/recipes-core/uclibc/uclibc-git/libc-stdlib-canonicalize_file_name-memory-leak.patch
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index f205524..51be202 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -27,7 +27,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
BINUVERSION ?= "2.25%"
GDBVERSION ?= "7.9%"
GLIBCVERSION ?= "2.22"
-UCLIBCVERSION ?= "0.9.33+git%"
+UCLIBCVERSION ?= "1.0%"
LINUXLIBCVERSION ?= "4.1"
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
diff --git a/meta/recipes-core/uclibc/uclibc-config.inc b/meta/recipes-core/uclibc/uclibc-config.inc
index 8b9e41c..ed7b522 100644
--- a/meta/recipes-core/uclibc/uclibc-config.inc
+++ b/meta/recipes-core/uclibc/uclibc-config.inc
@@ -119,6 +119,7 @@ def features_to_uclibc_settings(d):
uclibc_cfg('thumb-interwork', distro_features,'USE_BX', cnf, rem)
uclibc_cfg('xattr', distro_features, 'UCLIBC_HAS_XATTR', cnf, rem)
uclibc_cfg('ssp', distro_features, 'UCLIBC_HAS_SSP', cnf, rem)
+ uclibc_cfg('ssp', distro_features, 'UCLIBC_BUILD_SSP', cnf, rem)
uclibc_cfg('argp', distro_features, 'UCLIBC_HAS_ARGP', cnf, rem)
uclibc_cfg('libc-posix-clang-wchar', distro_features,'UCLIBC_HAS_WCHAR', cnf, rem)
return "\n".join(cnf), "\n".join(rem)
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc b/meta/recipes-core/uclibc/uclibc-git.inc
index 716a647..b84912b 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/meta/recipes-core/uclibc/uclibc-git.inc
@@ -1,24 +1,19 @@
-SRCREV = "ca1c74d67dd115d059a875150e10b8560a9c35a8"
+SRCREV = "d1b81113b43a6d26dec4e0e58a380895d121006e"
-PV = "0.9.33+git${SRCPV}"
+PV = "1.0.9+git${SRCPV}"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/uclibc-git:"
-SRC_URI = "git://uclibc.org/uClibc.git;branch=master \
+SRC_URI = "git://uclibc-ng.org/git/uclibc-ng;branch=1.0 \
+ file://0001-Disable-lrount_tes-function.patch \
+ file://0001-Revert-glibc-compat-bump-glibc-minor-version.patch \
+ file://0002-Add-implementation-for-copysignl-for-ppc.patch \
+ file://0003-Add-argp-implementation.patch \
+ file://libc-stdlib-canonicalize_file_name-memory-leak.patch \
file://uClibc.machine \
file://uClibc.distro \
file://obstack.cfg \
file://locale.cfg \
- file://0001-Disable-lrount_tes-function.patch \
- file://0002-Add-implementation-for-copysignl-for-ppc.patch \
- file://0003-Add-argp-implementation.patch \
- file://0004-Dont-support-localised-optimizations-this-helps-to-h.patch \
- file://0005-Always-use-O2-for-compiling-fork.c.patch \
- file://0006-ldso-limited-support-for-ORIGIN-in-rpath.patch \
- file://0007-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch \
- file://0001-gcc5-optimizes-away-the-write-only-static-functions-.patch \
- file://0001-fcntl-Add-AT_EMPTY_PATH-for-all-and-O_PATH-for-arm.patch \
- file://0001-wire-in-syncfs.patch \
"
S = "${WORKDIR}/git"
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-Revert-glibc-compat-bump-glibc-minor-version.patch b/meta/recipes-core/uclibc/uclibc-git/0001-Revert-glibc-compat-bump-glibc-minor-version.patch
new file mode 100644
index 0000000..1f5bec1
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-git/0001-Revert-glibc-compat-bump-glibc-minor-version.patch
@@ -0,0 +1,26 @@
+From f9f566849ad0785b2fd3fd6c4c5d324f9f822aac Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 13 Dec 2015 17:25:11 +0000
+Subject: [PATCH] Revert "glibc compat: bump glibc minor version"
+
+This reverts commit 4ff3a6c8eb91db71d6dc3d2932b66e848bd20ac3.
+---
+ include/features.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/features.h b/include/features.h
+index f6fbbf4..dcf1348 100644
+--- a/include/features.h
++++ b/include/features.h
+@@ -393,7 +393,7 @@ uClibc was built without large file support enabled.
+ these macros to test for features in specific releases. */
+ /* Don't do it, if you want to keep uClibc happy. */
+ #define __GLIBC__ 2
+-#define __GLIBC_MINOR__ 10
++#define __GLIBC_MINOR__ 2
+ #endif
+
+ #define __GLIBC_PREREQ(maj, min) \
+--
+2.6.4
+
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-fcntl-Add-AT_EMPTY_PATH-for-all-and-O_PATH-for-arm.patch b/meta/recipes-core/uclibc/uclibc-git/0001-fcntl-Add-AT_EMPTY_PATH-for-all-and-O_PATH-for-arm.patch
deleted file mode 100644
index 6942db4..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-fcntl-Add-AT_EMPTY_PATH-for-all-and-O_PATH-for-arm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4c8f5fe7d41493e8e181941ae5a01713155f44d1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 15 Oct 2015 15:34:39 +0000
-Subject: [PATCH] fcntl: Add AT_EMPTY_PATH for all and O_PATH for arm
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- include/fcntl.h | 3 +++
- libc/sysdeps/linux/arm/bits/fcntl.h | 1 +
- 2 files changed, 4 insertions(+)
-
-diff --git a/include/fcntl.h b/include/fcntl.h
-index 11000dd..8a7ad9b 100644
---- a/include/fcntl.h
-+++ b/include/fcntl.h
-@@ -65,6 +65,9 @@ __BEGIN_DECLS
- # define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */
- # define AT_EACCESS 0x200 /* Test access permitted for
- effective IDs, not real IDs. */
-+# ifdef __USE_GNU
-+# define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname. */
-+# endif
- #endif
-
- /* Do the file control operation described by CMD on FD.
-diff --git a/libc/sysdeps/linux/arm/bits/fcntl.h b/libc/sysdeps/linux/arm/bits/fcntl.h
-index aedc154..c6ba958 100644
---- a/libc/sysdeps/linux/arm/bits/fcntl.h
-+++ b/libc/sysdeps/linux/arm/bits/fcntl.h
-@@ -50,6 +50,7 @@
- # define O_DIRECT 0200000 /* Direct disk access. */
- # define O_NOATIME 01000000 /* Do not set atime. */
- # define O_CLOEXEC 02000000 /* Set close_on_exec. */
-+# define O_PATH 010000000 /* Resolve pathname but do not open file. */
- #endif
-
- /* For now Linux has synchronisity options for data and read operations.
---
-2.6.1
-
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-gcc5-optimizes-away-the-write-only-static-functions-.patch b/meta/recipes-core/uclibc/uclibc-git/0001-gcc5-optimizes-away-the-write-only-static-functions-.patch
deleted file mode 100644
index e622f87..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-gcc5-optimizes-away-the-write-only-static-functions-.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 2659fb25d32f4b29c1c96aa5730fe40e19d53ab0 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 14 Oct 2015 17:38:37 -0700
-Subject: [PATCH] gcc5 optimizes away the write only static functions and we
- end up with
-
- librt/librt_so.a(rt-unwind-resume.oS): In function `_Unwind_Resume':
- rt-unwind-resume.c:(.text+0x3c): undefined reference to `libgcc_s_resume'
- collect2: error: ld returned 1 exit status
- make[2]: *** [lib/librt.so] Error 1
-
-marking these functions explicitly used with __attribute_used__ avoids
-that optimization.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 2 +-
- libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-index f4d6f41..0c2edd7 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
-@@ -27,7 +27,7 @@
- #define __libc_fatal(x) {/*write(STDERR_FILENO, x, strlen(x));*/ abort();}
-
- static void *libgcc_s_handle;
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
- (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
- static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-index f9a4ffb..f0c3047 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/unwind-resume.c
-@@ -25,7 +25,7 @@
- #define __libc_dlclose dlclose
- #define __libc_fatal(x) {/*write(STDERR_FILENO, x, strlen(x));*/ abort();}
-
--static void (*libgcc_s_resume) (struct _Unwind_Exception *exc);
-+static void (*libgcc_s_resume) (struct _Unwind_Exception *exc) __attribute_used__;
- static _Unwind_Reason_Code (*libgcc_s_personality)
- (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
-
---
-2.6.1
-
diff --git a/meta/recipes-core/uclibc/uclibc-git/0001-wire-in-syncfs.patch b/meta/recipes-core/uclibc/uclibc-git/0001-wire-in-syncfs.patch
deleted file mode 100644
index 079ad6b..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/0001-wire-in-syncfs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4f2db1b46bda5e376245ec36198b137709f069e8 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 15 Oct 2015 17:03:37 +0000
-Subject: [PATCH] wire in syncfs
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- include/unistd.h | 2 +-
- libc/sysdeps/linux/common/syncfs.c | 13 +++++++++++++
- 2 files changed, 14 insertions(+), 1 deletion(-)
- create mode 100644 libc/sysdeps/linux/common/syncfs.c
-
-diff --git a/include/unistd.h b/include/unistd.h
-index 3793d2d..d01bb08 100644
---- a/include/unistd.h
-+++ b/include/unistd.h
-@@ -1073,7 +1073,7 @@ extern char *getpass (const char *__prompt) __nonnull ((1));
- extern int fsync (int __fd);
- #endif /* Use BSD || X/Open || Unix98. */
-
--#if 0 /*def __USE_GNU */
-+#ifdef __USE_GNU
- /* Make all changes done to all files on the file system associated
- * with FD actually appear on disk. */
- extern int syncfs (int __fd) __THROW;
-diff --git a/libc/sysdeps/linux/common/syncfs.c b/libc/sysdeps/linux/common/syncfs.c
-new file mode 100644
-index 0000000..d2eed05
---- /dev/null
-+++ b/libc/sysdeps/linux/common/syncfs.c
-@@ -0,0 +1,13 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * fsync() for uClibc
-+ *
-+ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
-+ *
-+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-+ */
-+
-+#include <sys/syscall.h>
-+#include <unistd.h>
-+
-+_syscall1(int, syncfs, int, fd)
---
-2.6.1
-
diff --git a/meta/recipes-core/uclibc/uclibc-git/0004-Dont-support-localised-optimizations-this-helps-to-h.patch b/meta/recipes-core/uclibc/uclibc-git/0004-Dont-support-localised-optimizations-this-helps-to-h.patch
deleted file mode 100644
index 629e13c..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/0004-Dont-support-localised-optimizations-this-helps-to-h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 31785c544abe8b215dbb2264fb11ee7051515797 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 16 Aug 2015 20:58:59 -0700
-Subject: [PATCH 4/7] Dont support localised optimizations this helps to have a
- global -O level
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- libpthread/nptl/pthread_mutex_timedlock.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libpthread/nptl/pthread_mutex_timedlock.c b/libpthread/nptl/pthread_mutex_timedlock.c
-index 04187f6..f56f6c5 100644
---- a/libpthread/nptl/pthread_mutex_timedlock.c
-+++ b/libpthread/nptl/pthread_mutex_timedlock.c
-@@ -28,7 +28,9 @@
- * error: can't find a register in class ‘GENERAL_REGS’ while reloading ‘asm’
- */
- int
-+#ifndef __OPTIMIZE__
- attribute_optimize("Os")
-+#endif
- pthread_mutex_timedlock (
- pthread_mutex_t *mutex,
- const struct timespec *abstime)
---
-2.1.4
-
diff --git a/meta/recipes-core/uclibc/uclibc-git/0005-Always-use-O2-for-compiling-fork.c.patch b/meta/recipes-core/uclibc/uclibc-git/0005-Always-use-O2-for-compiling-fork.c.patch
deleted file mode 100644
index ad9b246..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/0005-Always-use-O2-for-compiling-fork.c.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 883debc22e30a947fe5858cc07ee5aebd3d07a2e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 16 Aug 2015 20:59:56 -0700
-Subject: [PATCH 5/7] Always use -O2 for compiling fork.c
-
-When compiling in thumb mode for arm with -Os gcc gives up since it can
-not find registers to spill. So we use -O2 option for compiling fork.c
-It may be addressable in gcc.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
-index 0ea0b29..0767e9c 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/Makefile.arch
-@@ -21,3 +21,9 @@ ASFLAGS-pt-vfork.S = -marm
- CFLAGS-OMIT-pt-vfork.S = -mthumb
- ASFLAGS-vfork.S = -marm
- CFLAGS-OMIT-vfork.S = -mthumb
-+
-+# For arm fork.c does not compile with -Os when compiling
-+# in thumb1 mode
-+ifeq ($(COMPILE_IN_THUMB_MODE),y)
-+CFLAGS-fork.c = -O2
-+endif
---
-2.1.4
-
diff --git a/meta/recipes-core/uclibc/uclibc-git/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch b/meta/recipes-core/uclibc/uclibc-git/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch
deleted file mode 100644
index f0d8737..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/0006-ldso-limited-support-for-ORIGIN-in-rpath.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-From b40c129ed2d53b69463883a5422dd4a012a398f9 Mon Sep 17 00:00:00 2001
-From: Junling Zheng <zhengjunling@huawei.com>
-Date: Fri, 3 Apr 2015 05:02:27 +0000
-Subject: [PATCH 6/7] ldso: limited support for $ORIGIN in rpath
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Derived from:
-http://lists.busybox.net/pipermail/uclibc/2011-March/045003.html
-
-However, the above patch introduced '_dl_strchr' in ldso/ldso/dl-elf.c,
-and caused the following undefined referencing compiling error:
-
- | .../libdl.a(libdl.os): In function `search_for_named_library':
- | .../dl-elf.c:156: undefined reference to `_dl_strchr'
- | collect2: error: ld returned 1 exit status
-
-This problem would be reproduced through compiling gdb in static mode
-using uclibc.
-
-So, add the definition of '_dl_strchr' to fix it. The '_dl_strstr' is
-added as well.
-
-Upstream-Status: Submitted
-
-Signed-off-by: Timo Teräs <timo.teras at iki.fi>
-Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- ldso/include/dl-string.h | 2 ++
- ldso/ldso/dl-elf.c | 79 +++++++++++++++++++++++++-----------------------
- ldso/ldso/ldso.c | 18 +++++++++--
- 3 files changed, 59 insertions(+), 40 deletions(-)
-
-diff --git a/ldso/include/dl-string.h b/ldso/include/dl-string.h
-index aacad10..14ae617 100644
---- a/ldso/include/dl-string.h
-+++ b/ldso/include/dl-string.h
-@@ -204,7 +204,9 @@ static __always_inline char * _dl_get_last_path_component(char *path)
- # define _dl_strcat strcat
- # define _dl_strcpy strcpy
- # define _dl_strcmp strcmp
-+# define _dl_strchr strchr
- # define _dl_strrchr strrchr
-+# define _dl_strstr strstr
- # define _dl_memcpy memcpy
- # define _dl_memcmp memcmp
- # define _dl_memset memset
-diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
-index 5631905..6ab7afe 100644
---- a/ldso/ldso/dl-elf.c
-+++ b/ldso/ldso/dl-elf.c
-@@ -133,56 +133,60 @@ _dl_protect_relro (struct elf_resolve *l)
- * in uClibc/ldso/util/ldd.c */
- static struct elf_resolve *
- search_for_named_library(const char *name, unsigned rflags, const char *path_list,
-- struct dyn_elf **rpnt)
-+ struct dyn_elf **rpnt, const char* origin)
- {
-- char *path, *path_n, *mylibname;
-+ char *mylibname;
-+ const char *p, *pn;
- struct elf_resolve *tpnt;
-- int done;
-+ int plen;
-
- if (path_list==NULL)
- return NULL;
-
-- /* We need a writable copy of this string, but we don't
-- * need this allocated permanently since we don't want
-- * to leak memory, so use alloca to put path on the stack */
-- done = _dl_strlen(path_list);
-- path = alloca(done + 1);
--
- /* another bit of local storage */
- mylibname = alloca(2050);
-
-- _dl_memcpy(path, path_list, done+1);
--
- /* Unlike ldd.c, don't bother to eliminate double //s */
-
- /* Replace colons with zeros in path_list */
- /* : at the beginning or end of path maps to CWD */
- /* :: anywhere maps CWD */
- /* "" maps to CWD */
-- done = 0;
-- path_n = path;
-- do {
-- if (*path == 0) {
-- *path = ':';
-- done = 1;
-+ for (p = path_list; p != NULL; p = pn) {
-+ pn = _dl_strchr(p + 1, ':');
-+ if (pn != NULL) {
-+ plen = pn - p;
-+ pn++;
-+ } else
-+ plen = _dl_strlen(p);
-+
-+ if (plen >= 7 && _dl_memcmp(p, "$ORIGIN", 7) == 0) {
-+ int olen;
-+ if (rflags && plen != 7)
-+ continue;
-+ if (origin == NULL)
-+ continue;
-+ for (olen = _dl_strlen(origin) - 1; olen >= 0 && origin[olen] != '/'; olen--)
-+ ;
-+ if (olen <= 0)
-+ continue;
-+ _dl_memcpy(&mylibname[0], origin, olen);
-+ _dl_memcpy(&mylibname[olen], p + 7, plen - 7);
-+ mylibname[olen + plen - 7] = 0;
-+ } else if (plen != 0) {
-+ _dl_memcpy(mylibname, p, plen);
-+ mylibname[plen] = 0;
-+ } else {
-+ _dl_strcpy(mylibname, ".");
- }
-- if (*path == ':') {
-- *path = 0;
-- if (*path_n)
-- _dl_strcpy(mylibname, path_n);
-- else
-- _dl_strcpy(mylibname, "."); /* Assume current dir if empty path */
-- _dl_strcat(mylibname, "/");
-- _dl_strcat(mylibname, name);
-+ _dl_strcat(mylibname, "/");
-+ _dl_strcat(mylibname, name);
- #ifdef __LDSO_SAFE_RUNPATH__
-- if (*mylibname == '/')
-+ if (*mylibname == '/')
- #endif
-- if ((tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname)) != NULL)
-- return tpnt;
-- path_n = path+1;
-- }
-- path++;
-- } while (!done);
-+ if ((tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname)) != NULL)
-+ return tpnt;
-+ }
- return NULL;
- }
-
-@@ -234,7 +238,8 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp
- if (pnt) {
- pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
- _dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt);
-- if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL)
-+ if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt,
-+ tpnt->libname)) != NULL)
- return tpnt1;
- }
- #endif
-@@ -243,7 +248,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp
- /* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */
- if (_dl_library_path) {
- _dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path);
-- if ((tpnt1 = search_for_named_library(libname, rflags, _dl_library_path, rpnt)) != NULL)
-+ if ((tpnt1 = search_for_named_library(libname, rflags, _dl_library_path, rpnt, NULL)) != NULL)
- {
- return tpnt1;
- }
-@@ -257,7 +262,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp
- if (pnt) {
- pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
- _dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt);
-- if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL)
-+ if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, NULL)) != NULL)
- return tpnt1;
- }
- #endif
-@@ -291,7 +296,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp
- /* Look for libraries wherever the shared library loader
- * was installed */
- _dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath);
-- tpnt1 = search_for_named_library(libname, rflags, _dl_ldsopath, rpnt);
-+ tpnt1 = search_for_named_library(libname, rflags, _dl_ldsopath, rpnt, NULL);
- if (tpnt1 != NULL)
- return tpnt1;
- #endif
-@@ -304,7 +309,7 @@ struct elf_resolve *_dl_load_shared_library(unsigned rflags, struct dyn_elf **rp
- #ifndef __LDSO_CACHE_SUPPORT__
- ":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib"
- #endif
-- , rpnt);
-+ , rpnt, NULL);
- if (tpnt1 != NULL)
- return tpnt1;
-
-diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
-index f38f9e3..3812908 100644
---- a/ldso/ldso/ldso.c
-+++ b/ldso/ldso/ldso.c
-@@ -402,6 +402,20 @@ static ptrdiff_t _dl_build_local_scope (struct elf_resolve **list,
- p += _dl_build_local_scope (p, q->tpnt);
- return p - list;
- }
-+
-+static void _dl_setup_progname(const char *argv0)
-+{
-+ char image[PATH_MAX];
-+ ssize_t s;
-+
-+ s = _dl_readlink("/proc/self/exe", image, sizeof(image));
-+ if (s > 0 && image[0] == '/') {
-+ image[s] = 0;
-+ _dl_progname = _dl_strdup(image);
-+ } else if (argv0) {
-+ _dl_progname = argv0;
-+ }
-+}
-
- void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
- ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv
-@@ -454,9 +468,7 @@ void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
- * been fixed up by now. Still no function calls outside of this
- * library, since the dynamic resolver is not yet ready.
- */
-- if (argv[0]) {
-- _dl_progname = argv[0];
-- }
-+ _dl_setup_progname(argv[0]);
-
- #ifdef __DSBT__
- _dl_ldso_dsbt = (void *)tpnt->dynamic_info[DT_DSBT_BASE_IDX];
---
-2.1.4
-
diff --git a/meta/recipes-core/uclibc/uclibc-git/0007-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch b/meta/recipes-core/uclibc/uclibc-git/0007-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch
deleted file mode 100644
index ee932c3..0000000
--- a/meta/recipes-core/uclibc/uclibc-git/0007-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 90516af9f776f9c2835b47fc52775dcb307a85ac Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 23 Jun 2012 15:59:01 -0700
-Subject: [PATCH 7/7] nptl/atfork: Hide pthread_atfork in shared versions
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
----
- libpthread/nptl/Makefile.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
-index 55eeba2..8cb8fa9 100644
---- a/libpthread/nptl/Makefile.in
-+++ b/libpthread/nptl/Makefile.in
-@@ -16,6 +16,7 @@ libc-shared-routines-y = forward.c libc-cancellation.c
- libc-static-routines-y = alloca_cutoff.c libc-cancellation.c
- libpthread-shared-only-routines-y = version.c
- libpthread-static-only-routines-y = pthread_atfork.c
-+
- libpthread-routines- += $(notdir $(wildcard $(libpthread_DIR)/gen_*.c)) # dummy generated files
- libpthread-routines- += allocatestack.c # dummy included by pthread_create.c
- libpthread-routines- += pthread_mutex_getprioceiling.c pthread_mutex_setprioceiling.c # XXX: delete those or use them!
-@@ -201,7 +202,7 @@ CFLAGS-msgsnd.c = -fexceptions -fasynchronous-unwind-tables
- CFLAGS-tcdrain.c = -fexceptions -fasynchronous-unwind-tables
-
- CFLAGS-pt-system.c = -fexceptions -I$(top_srcdir)libc/stdlib
--
-+CFLAGS-pthread_atfork.c = -DNOT_IN_libc
- #
- # The rest of this file is uClibc specific.
- #
---
-2.1.4
-
diff --git a/meta/recipes-core/uclibc/uclibc-git/libc-stdlib-canonicalize_file_name-memory-leak.patch b/meta/recipes-core/uclibc/uclibc-git/libc-stdlib-canonicalize_file_name-memory-leak.patch
new file mode 100644
index 0000000..8b36cfc
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-git/libc-stdlib-canonicalize_file_name-memory-leak.patch
@@ -0,0 +1,36 @@
+diff --git a/libc/stdlib/canonicalize.c b/libc/stdlib/canonicalize.c
+index 06e710a..da09d58 100644
+--- a/libc/stdlib/canonicalize.c
++++ b/libc/stdlib/canonicalize.c
+@@ -9,30 +9,11 @@
+ */
+
+ #include <stdlib.h>
+-#include <limits.h>
+
+ #ifdef __USE_GNU
+
+-#ifndef PATH_MAX
+-# ifdef _POSIX_VERSION
+-# define PATH_MAX _POSIX_PATH_MAX
+-# else
+-# ifdef MAXPATHLEN
+-# define PATH_MAX MAXPATHLEN
+-# else
+-# define PATH_MAX 1024
+-# endif
+-# endif
+-#endif
+-
+ char * canonicalize_file_name (const char *name)
+ {
+- char *buf = (char *) malloc(PATH_MAX);
+-
+- if(unlikely(buf == NULL))
+- return NULL;
+-
+- *buf='\0';
+- return realpath (name, buf);
++ return realpath (name, NULL);
+ }
+ #endif
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
index 3827b66..7785ce8 100644
--- a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
+++ b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
@@ -79,11 +79,11 @@ UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-UCLIBC_HAS_STDIO_BUFSIZ_256=y
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 533aa3d..ff7d744 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -13,7 +13,6 @@ SECTION = "libs"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \
file://${S}/test/regex/testregex.c;beginline=1;endline=31;md5=234efb227d0a40677f895e4a1e26e960"
-PR = "r9"
require uclibc-config.inc
@@ -60,18 +59,13 @@ export V="2"
CFLAGS_arm := "${@oe_filter_out('-fno-omit-frame-pointer', '${CFLAGS}', d)}"
UCLIBC_EXTRA_CFLAGS := "${@oe_filter_out('(-I\S+|-i\S+)', '${CFLAGS}', d)}"
-do_compile_prepend () {
- unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
- oe_runmake pregen
-}
-
configmangle = '/^KERNEL_HEADERS/d; \
/^RUNTIME_PREFIX/d; \
/^DEVEL_PREFIX/d; \
/^SHARED_LIB_LOADER_PREFIX/d; \
/^UCLIBC_EXTRA_CFLAGS/d; \
s,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g; \
- ${@["","s,.*COMPILE_IN_THUMB_MODE.*,COMPILE_IN_THUMB_MODE=y,;"][d.getVar("ARM_INSTRUCTION_SET", True) != "arm"]} \
+ ${@["","s,.*COMPILE_IN_THUMB_MODE.*,COMPILE_IN_THUMB_MODE=y,;"][d.getVar("ARM_INSTRUCTION_SET", True) == "thumb"]} \
${@["","s,.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y,;"][d.getVar("USE_NLS", True) == "yes"]} \
${@["","s,.*LDSO_GNU_HASH_SUPPORT.*,# LDSO_GNU_HASH_SUPPORT is not set,;"][d.getVar("TARGET_ARCH", True) in ['mips', 'mipsel', 'mips64', 'mips64el', 'avr32']]} \
/^CROSS/d; \
diff --git a/meta/recipes-core/uclibc/uclibc_git.bb b/meta/recipes-core/uclibc/uclibc_git.bb
index fd02b3d..81756ac 100644
--- a/meta/recipes-core/uclibc/uclibc_git.bb
+++ b/meta/recipes-core/uclibc/uclibc_git.bb
@@ -13,6 +13,11 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \
linux-libc-headers ncurses-native \
libgcc-initial kern-tools-native"
+#do_compile_prepend () {
+# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+# oe_runmake pregen
+#}
+#
RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
# uclibc does not really have libsegfault but then using the one from glibc is also not
--
2.6.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 2/6] uclibc: Switch to using uclibc-ng
2015-12-14 6:23 ` [PATCH 2/6] uclibc: Switch to using uclibc-ng Khem Raj
@ 2015-12-14 12:20 ` Burton, Ross
2015-12-14 15:37 ` Khem Raj
2015-12-14 20:43 ` Khem Raj
2015-12-14 12:25 ` Burton, Ross
1 sibling, 2 replies; 17+ messages in thread
From: Burton, Ross @ 2015-12-14 12:20 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 645 bytes --]
On 14 December 2015 at 06:23, Khem Raj <raj.khem@gmail.com> wrote:
> diff --git a/meta/recipes-core/uclibc/uclibc_git.bb
> b/meta/recipes-core/uclibc/uclibc_git.bb
> index fd02b3d..81756ac 100644
> --- a/meta/recipes-core/uclibc/uclibc_git.bb
> +++ b/meta/recipes-core/uclibc/uclibc_git.bb
> @@ -13,6 +13,11 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \
> linux-libc-headers ncurses-native \
> libgcc-initial kern-tools-native"
>
> +#do_compile_prepend () {
> +# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
> +# oe_runmake pregen
> +#}
> +#
>
Was this for testing? Presumably I can drop it?
Ross
[-- Attachment #2: Type: text/html, Size: 1365 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 2/6] uclibc: Switch to using uclibc-ng
2015-12-14 12:20 ` Burton, Ross
@ 2015-12-14 15:37 ` Khem Raj
2015-12-14 20:43 ` Khem Raj
1 sibling, 0 replies; 17+ messages in thread
From: Khem Raj @ 2015-12-14 15:37 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
On Mon, Dec 14, 2015 at 4:20 AM, Burton, Ross <ross.burton@intel.com> wrote:
> Was this for testing? Presumably I can drop it?
yes drop it.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/6] uclibc: Switch to using uclibc-ng
2015-12-14 12:20 ` Burton, Ross
2015-12-14 15:37 ` Khem Raj
@ 2015-12-14 20:43 ` Khem Raj
1 sibling, 0 replies; 17+ messages in thread
From: Khem Raj @ 2015-12-14 20:43 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1.1: Type: text/plain, Size: 911 bytes --]
> On Dec 14, 2015, at 4:20 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
>
> On 14 December 2015 at 06:23, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> diff --git a/meta/recipes-core/uclibc/uclibc_git.bb <http://uclibc_git.bb/> b/meta/recipes-core/uclibc/uclibc_git.bb <http://uclibc_git.bb/>
> index fd02b3d..81756ac 100644
> --- a/meta/recipes-core/uclibc/uclibc_git.bb <http://uclibc_git.bb/>
> +++ b/meta/recipes-core/uclibc/uclibc_git.bb <http://uclibc_git.bb/>
> @@ -13,6 +13,11 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \
> linux-libc-headers ncurses-native \
> libgcc-initial kern-tools-native"
>
> +#do_compile_prepend () {
> +# unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
> +# oe_runmake pregen
> +#}
> +#
>
> Was this for testing? Presumably I can drop it?
Its dropped from updated patch on pull branch
>
> Ross
[-- Attachment #1.2: Type: text/html, Size: 2319 bytes --]
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/6] uclibc: Switch to using uclibc-ng
2015-12-14 6:23 ` [PATCH 2/6] uclibc: Switch to using uclibc-ng Khem Raj
2015-12-14 12:20 ` Burton, Ross
@ 2015-12-14 12:25 ` Burton, Ross
2015-12-14 20:43 ` Khem Raj
1 sibling, 1 reply; 17+ messages in thread
From: Burton, Ross @ 2015-12-14 12:25 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 1207 bytes --]
On 14 December 2015 at 06:23, Khem Raj <raj.khem@gmail.com> wrote:
> --- /dev/null
> +++
> b/meta/recipes-core/uclibc/uclibc-git/0001-Revert-glibc-compat-bump-glibc-minor-version.patch
> @@ -0,0 +1,26 @@
> +From f9f566849ad0785b2fd3fd6c4c5d324f9f822aac Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Sun, 13 Dec 2015 17:25:11 +0000
> +Subject: [PATCH] Revert "glibc compat: bump glibc minor version"
> +
> +This reverts commit 4ff3a6c8eb91db71d6dc3d2932b66e848bd20ac3.
>
No explanation, no signed-off-by, no upstream-status.
> diff --git
> a/meta/recipes-core/uclibc/uclibc-git/libc-stdlib-canonicalize_file_name-memory-leak.patch
> b/meta/recipes-core/uclibc/uclibc-git/libc-stdlib-canonicalize_file_name-memory-leak.patch
> new file mode 100644
> index 0000000..8b36cfc
> --- /dev/null
> +++
> b/meta/recipes-core/uclibc/uclibc-git/libc-stdlib-canonicalize_file_name-memory-leak.patch
> @@ -0,0 +1,36 @@
> +diff --git a/libc/stdlib/canonicalize.c b/libc/stdlib/canonicalize.c
> +index 06e710a..da09d58 100644
> +--- a/libc/stdlib/canonicalize.c
> ++++ b/libc/stdlib/canonicalize.c
>
No comment, no upstream-status, no signed-off-by.
Ross
[-- Attachment #2: Type: text/html, Size: 1754 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 2/6] uclibc: Switch to using uclibc-ng
2015-12-14 12:25 ` Burton, Ross
@ 2015-12-14 20:43 ` Khem Raj
0 siblings, 0 replies; 17+ messages in thread
From: Khem Raj @ 2015-12-14 20:43 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1.1: Type: text/plain, Size: 1405 bytes --]
> On Dec 14, 2015, at 4:25 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 14 December 2015 at 06:23, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote:
> --- /dev/null
> +++ b/meta/recipes-core/uclibc/uclibc-git/0001-Revert-glibc-compat-bump-glibc-minor-version.patch
> @@ -0,0 +1,26 @@
> +From f9f566849ad0785b2fd3fd6c4c5d324f9f822aac Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>>
> +Date: Sun, 13 Dec 2015 17:25:11 +0000
> +Subject: [PATCH] Revert "glibc compat: bump glibc minor version"
> +
> +This reverts commit 4ff3a6c8eb91db71d6dc3d2932b66e848bd20ac3.
>
> No explanation, no signed-off-by, no upstream-status.
>
> diff --git a/meta/recipes-core/uclibc/uclibc-git/libc-stdlib-canonicalize_file_name-memory-leak.patch b/meta/recipes-core/uclibc/uclibc-git/libc-stdlib-canonicalize_file_name-memory-leak.patch
> new file mode 100644
> index 0000000..8b36cfc
> --- /dev/null
> +++ b/meta/recipes-core/uclibc/uclibc-git/libc-stdlib-canonicalize_file_name-memory-leak.patch
> @@ -0,0 +1,36 @@
> +diff --git a/libc/stdlib/canonicalize.c b/libc/stdlib/canonicalize.c
> +index 06e710a..da09d58 100644
> +--- a/libc/stdlib/canonicalize.c
> ++++ b/libc/stdlib/canonicalize.c
>
> No comment, no upstream-status, no signed-off-by.
Ross
Addressed all comments. Updated the pull branch.
>
> Ross
[-- Attachment #1.2: Type: text/html, Size: 2868 bytes --]
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 3/6] packagegroup-core-sdk: Disable sanitizers for uclibc
2015-12-14 6:22 [PATCH 0/6] gcc/uclibc/musl updates Khem Raj
2015-12-14 6:23 ` [PATCH 1/6] gcc5: Upgrade gcc-5.2 -> gcc-5.3 Khem Raj
2015-12-14 6:23 ` [PATCH 2/6] uclibc: Switch to using uclibc-ng Khem Raj
@ 2015-12-14 6:23 ` Khem Raj
2015-12-14 6:23 ` [PATCH 4/6] util-linux: Upgrade to 2.27.1 Khem Raj
` (2 subsequent siblings)
5 siblings, 0 replies; 17+ messages in thread
From: Khem Raj @ 2015-12-14 6:23 UTC (permalink / raw)
To: openembedded-core
They dont build for non-glibc C libraries yet
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index 3badd0e..46cb6ee 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -35,6 +35,7 @@ SANITIZERS_mips64n32 = ""
SANITIZERS_powerpc64 = ""
SANITIZERS_sparc = ""
SANITIZERS_libc-musl = ""
+SANITIZERS_libc-uclibc = ""
RRECOMMENDS_packagegroup-core-sdk = "\
libgomp \
--
2.6.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 4/6] util-linux: Upgrade to 2.27.1
2015-12-14 6:22 [PATCH 0/6] gcc/uclibc/musl updates Khem Raj
` (2 preceding siblings ...)
2015-12-14 6:23 ` [PATCH 3/6] packagegroup-core-sdk: Disable sanitizers for uclibc Khem Raj
@ 2015-12-14 6:23 ` Khem Raj
2015-12-14 6:23 ` [PATCH 5/6] systemd: Upgrade to 228 Khem Raj
2015-12-14 6:23 ` [PATCH 6/6] musl: Update to latest 1.1.12 release Khem Raj
5 siblings, 0 replies; 17+ messages in thread
From: Khem Raj @ 2015-12-14 6:23 UTC (permalink / raw)
To: openembedded-core
Patches that are dropped are already available upstream in 2.27 release
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../util-linux/util-linux/fix-parallel-build.patch | 35 ----------------------
.../util-linux/uclibc-__progname-conflict.patch | 32 --------------------
.../util-linux-ng-replace-siginterrupt.patch | 33 --------------------
.../{util-linux_2.26.2.bb => util-linux_2.27.1.bb} | 11 +++----
4 files changed, 4 insertions(+), 107 deletions(-)
delete mode 100644 meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
rename meta/recipes-core/util-linux/{util-linux_2.26.2.bb => util-linux_2.27.1.bb} (72%)
diff --git a/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch b/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch
deleted file mode 100644
index adb271c..0000000
--- a/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 774f55f9dd22c01e4041a183d8dff14811f29114 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Fri, 4 Apr 2014 17:33:04 +0800
-Subject: [PATCH] sys-utils/Makemodule.am: fix parallel build issue
-
-The rule SETARCH_MAN_LINKS is used for the files under the sys-utils
-dir, for example:
-
-echo ".so man8/setarch.8" > sys-utils/linux32.8
-
-but it depends on nothing so that the sys-utils dir may not exist, we
-can create the sys-utils dir to fix problem.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- sys-utils/Makemodule.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
-index 6265282..62ead37 100644
---- a/sys-utils/Makemodule.am
-+++ b/sys-utils/Makemodule.am
-@@ -124,6 +124,7 @@ man_MANS += $(SETARCH_MAN_LINKS)
- CLEANFILES += $(SETARCH_MAN_LINKS)
-
- $(SETARCH_MAN_LINKS):
-+ $(MKDIR_P) sys-utils
- $(AM_V_GEN)echo ".so man8/setarch.8" > $@
-
- install-exec-hook-setarch:
---
-1.8.2.1
-
diff --git a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
deleted file mode 100644
index 5031a73..0000000
--- a/meta/recipes-core/util-linux/util-linux/uclibc-__progname-conflict.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-configure should include errno.h instead of argp.h when
-checking for presence of program_invocation_short_name
-uclibc defines this to be const char* unlike util-linux-ng
-which defines this to be char* so this error goes unnoticed
-on glibc/eglibc systems.
-
-here is the error it fixes
-
-in file included from mountP.h:14:0,
- from cache.c:29:
-/home/kraj/work/slugos/build/tmp-slugos-uclibc/sysroots/nslu2le/usr/include/errno.h:55:46: error: conflicting types for '__progname'
-../../../include/c.h:118:14: note: previous declaration of '__progname' was here
-make[3]: *** [cache.lo] Error 1
-
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-
-Upstream-Status: Pending
-Index: util-linux-2.22.1/configure.ac
-===================================================================
---- util-linux-2.22.1.orig/configure.ac
-+++ util-linux-2.22.1/configure.ac
-@@ -372,7 +372,7 @@ esac
-
- AC_MSG_CHECKING([whether program_invocation_short_name is defined])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-- #include <argp.h>
-+ #include <errno.h>
- ]], [[
- program_invocation_short_name = "test";
- ]])], [
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
deleted file mode 100644
index 6717a75..0000000
--- a/meta/recipes-core/util-linux/util-linux/util-linux-ng-replace-siginterrupt.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- login-utils/login.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/login-utils/login.c b/login-utils/login.c
-index ebb76f5..38c881b 100644
---- a/login-utils/login.c
-+++ b/login-utils/login.c
-@@ -1110,6 +1110,7 @@ int main(int argc, char **argv)
- char *buff;
- int childArgc = 0;
- int retcode;
-+ struct sigaction act;
-
- char *pwdbuf = NULL;
- struct passwd *pwd = NULL, _pwd;
-@@ -1123,7 +1124,9 @@ int main(int argc, char **argv)
- timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
-
- signal(SIGALRM, timedout);
-- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioctl() */
-+ (void) sigaction(SIGALRM, NULL, &act);
-+ act.sa_flags &= ~SA_RESTART;
-+ sigaction(SIGALRM, &act, NULL);
- alarm(timeout);
- signal(SIGQUIT, SIG_IGN);
- signal(SIGINT, SIG_IGN);
---
-1.9.1
-
diff --git a/meta/recipes-core/util-linux/util-linux_2.26.2.bb b/meta/recipes-core/util-linux/util-linux_2.27.1.bb
similarity index 72%
rename from meta/recipes-core/util-linux/util-linux_2.26.2.bb
rename to meta/recipes-core/util-linux/util-linux_2.27.1.bb
index 02e42c1..14a77ca 100644
--- a/meta/recipes-core/util-linux/util-linux_2.26.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.27.1.bb
@@ -1,4 +1,4 @@
-MAJOR_VERSION = "2.26"
+MAJOR_VERSION = "2.27"
require util-linux.inc
# To support older hosts, we need to patch and/or revert
@@ -8,11 +8,8 @@ OLDHOST_class-native = "file://util-linux-native.patch \
file://util-linux-native-qsort.patch \
"
-SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
- file://util-linux-ng-2.16-mount_lock_path.patch \
- file://uclibc-__progname-conflict.patch \
+SRC_URI += "file://util-linux-ng-2.16-mount_lock_path.patch \
file://configure-sbindir.patch \
- file://fix-parallel-build.patch \
file://runuser.pamd \
file://runuser-l.pamd \
${OLDHOST} \
@@ -23,8 +20,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
file://display_testname_for_subtest.patch \
file://avoid_parallel_tests.patch \
"
-SRC_URI[md5sum] = "9bdf368c395f1b70325d0eb22c7f48fb"
-SRC_URI[sha256sum] = "0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666"
+SRC_URI[md5sum] = "3cd2698d1363a2c64091c2dadc974647"
+SRC_URI[sha256sum] = "0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290"
CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
--
2.6.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 5/6] systemd: Upgrade to 228
2015-12-14 6:22 [PATCH 0/6] gcc/uclibc/musl updates Khem Raj
` (3 preceding siblings ...)
2015-12-14 6:23 ` [PATCH 4/6] util-linux: Upgrade to 2.27.1 Khem Raj
@ 2015-12-14 6:23 ` Khem Raj
2015-12-17 20:30 ` Andre McCurdy
2015-12-14 6:23 ` [PATCH 6/6] musl: Update to latest 1.1.12 release Khem Raj
5 siblings, 1 reply; 17+ messages in thread
From: Khem Raj @ 2015-12-14 6:23 UTC (permalink / raw)
To: openembedded-core
Forward port all patches and format them to be git am'able
Drop patches specific to uclibc's missing features which now
are there in uclibc-ng
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../systemd/0001-define-exp10-if-missing.patch | 33 +++++
.../systemd/0001-fix-build-on-uClibc-exp10.patch | 22 ---
...-getty-to-agetty-in-console-setup-system.patch} | 6 +-
...v-when-secure-versions-are-not-available.patch} | 11 +-
...c-Change-the-default-device-timeout-to-2.patch} | 22 +--
...-install-dependency-links-at-install-tim.patch} | 35 ++---
...eck-for-additional-features-that-uclibc-.patch} | 17 ++-
...nal-Use-posix-fallocate-only-if-available.patch | 96 --------------
...n-Use-execvpe-only-when-libc-supports-it.patch} | 31 +++--
...til-Use-mkostemp-only-if-libc-supports-it.patch | 42 ------
...-unimplemented-_SC_PHYS_PAGES-system-conf.patch | 16 +--
...009-implment-systemd-sysv-install-for-OE.patch} | 15 ++-
...nes-Build-conditionally-when-HAVE_MYHOSTN.patch | 38 ++++++
...patch => 0011-rules-whitelist-hd-devices.patch} | 6 +-
...or-add-support-for-executing-scripts-und.patch} | 68 +++++-----
...-Make-root-s-home-directory-configurable.patch} | 147 +++++++++++----------
...014-systemd-user-avoid-using-system-auth.patch} | 25 ++--
...vert-rules-remove-firmware-loading-rules.patch} | 6 +-
...remove-userspace-firmware-loading-suppor.patch} | 132 +++++++++---------
.../systemd/{systemd_225.bb => systemd_228.bb} | 44 +++---
20 files changed, 371 insertions(+), 441 deletions(-)
create mode 100644 meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
rename meta/recipes-core/systemd/systemd/{0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch => 0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch} (89%)
rename meta/recipes-core/systemd/systemd/{0022-Use-getenv-when-secure-versions-are-not-available.patch => 0003-Use-getenv-when-secure-versions-are-not-available.patch} (79%)
rename meta/recipes-core/systemd/systemd/{qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch => 0004-core-device.c-Change-the-default-device-timeout-to-2.patch} (65%)
rename meta/recipes-core/systemd/systemd/{0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch => 0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch} (65%)
rename meta/recipes-core/systemd/systemd/{0004-configure-Check-for-additional-features-that-uclibc-.patch => 0006-configure-Check-for-additional-features-that-uclibc-.patch} (76%)
delete mode 100644 meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
rename meta/recipes-core/systemd/systemd/{0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch => 0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch} (50%)
delete mode 100644 meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
rename meta/recipes-core/systemd/systemd/{0012-implment-systemd-sysv-install-for-OE.patch => 0009-implment-systemd-sysv-install-for-OE.patch} (75%)
create mode 100644 meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
rename meta/recipes-core/systemd/systemd/{rules-whitelist-hd-devices.patch => 0011-rules-whitelist-hd-devices.patch} (90%)
rename meta/recipes-core/systemd/systemd/{0009-sysv-generator-add-support-for-executing-scripts-und.patch => 0012-sysv-generator-add-support-for-executing-scripts-und.patch} (77%)
rename meta/recipes-core/systemd/systemd/{0010-Make-root-s-home-directory-configurable.patch => 0013-Make-root-s-home-directory-configurable.patch} (64%)
rename meta/recipes-core/systemd/systemd/{0011-systemd-user-avoid-using-system-auth.patch => 0014-systemd-user-avoid-using-system-auth.patch} (54%)
rename meta/recipes-core/systemd/systemd/{0014-Revert-rules-remove-firmware-loading-rules.patch => 0015-Revert-rules-remove-firmware-loading-rules.patch} (83%)
rename meta/recipes-core/systemd/systemd/{0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch => 0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (79%)
rename meta/recipes-core/systemd/{systemd_225.bb => systemd_228.bb} (93%)
diff --git a/meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch b/meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch
new file mode 100644
index 0000000..8bb775f
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch
@@ -0,0 +1,33 @@
+From ddad25c809846e08ea39bef49cc668f95d53304a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 14 Dec 2015 00:42:49 +0000
+Subject: [PATCH 01/16] define exp10 if missing
+
+Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
+
+exp10 extension is not part of uClibc, so compute it.
+
+Upstream-Status: Pending
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/basic/missing.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/basic/missing.h b/src/basic/missing.h
+index d539ed0..09a233b 100644
+--- a/src/basic/missing.h
++++ b/src/basic/missing.h
+@@ -1125,3 +1125,8 @@ static inline key_serial_t request_key(const char *type, const char *description
+ #ifndef KEY_SPEC_USER_KEYRING
+ #define KEY_SPEC_USER_KEYRING -4
+ #endif
++
++#ifdef __UCLIBC__
++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
++#define exp10(x) (exp((x) * log(10)))
++#endif /* __UCLIBC__ */
+--
+2.6.4
+
diff --git a/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch b/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
deleted file mode 100644
index 76ce4b7..0000000
--- a/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
-
-exp10 extension is not part of uClibc, so compute it.
-
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
-Upstream-Status: Pending
-
-Index: git/src/basic/missing.h
-===================================================================
---- git.orig/src/basic/missing.h
-+++ git/src/basic/missing.h
-@@ -1036,3 +1036,8 @@ static inline int kcmp(pid_t pid1, pid_t
- #ifndef INPUT_PROP_ACCELEROMETER
- #define INPUT_PROP_ACCELEROMETER 0x06
- #endif
-+
-+#ifdef __UCLIBC__
-+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
-+#define exp10(x) (exp((x) * log(10)))
-+#endif /* __UCLIBC__ */
diff --git a/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch b/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
similarity index 89%
rename from meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch
rename to meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
index b6ab5ef..55ff0ce 100644
--- a/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch
+++ b/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
@@ -1,7 +1,7 @@
-From 100e50604efc4032001a2de6a6b47853c0003817 Mon Sep 17 00:00:00 2001
+From bfb6562cdbec73d03765ce707e9e0cac138fd223 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 05:29:15 +0000
-Subject: [PATCH 01/11] units: Prefer getty to agetty in console setup systemd
+Subject: [PATCH 02/16] units: Prefer getty to agetty in console setup systemd
units
Upstream-Status: Inappropriate [configuration specific]
@@ -40,5 +40,5 @@ index 4522d0d..e6d499d 100644
Restart=always
UtmpIdentifier=%I
--
-2.1.4
+2.6.4
diff --git a/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch b/meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch
similarity index 79%
rename from meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch
rename to meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch
index 5af78d5..cbf69d1 100644
--- a/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch
+++ b/meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch
@@ -1,7 +1,7 @@
-From cb71e4beea3b3b11e5951f95c829cd2eee9fcf7b Mon Sep 17 00:00:00 2001
+From 9e79bb4bea758f25803e9f7ff2c5835ac4204230 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 12 Sep 2015 19:10:04 +0000
-Subject: [PATCH 22/31] Use getenv when secure versions are not available
+Subject: [PATCH 03/16] Use getenv when secure versions are not available
musl doesnt implement secure version, so we default
to it if configure does not detect a secure imeplementation
@@ -9,15 +9,14 @@ to it if configure does not detect a secure imeplementation
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Denied
---
-
src/basic/missing.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/basic/missing.h b/src/basic/missing.h
-index bf9b490..d6dbc7d 100644
+index 09a233b..3c37466 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
-@@ -584,13 +584,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
+@@ -582,13 +582,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags);
}
#endif
@@ -35,5 +34,5 @@ index bf9b490..d6dbc7d 100644
#ifndef CIFS_MAGIC_NUMBER
--
-2.5.2
+2.6.4
diff --git a/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch b/meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch
similarity index 65%
rename from meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch
rename to meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch
index c7e1711..74629fc 100644
--- a/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch
+++ b/meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch
@@ -1,23 +1,25 @@
-Upstream-Status: Inappropriate [Specific case QEMU/AB]
-
-From 7b8c4e0a67a79a75e1bd77df3a452a5497322108 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
-Date: Thu, 27 Aug 2015 17:58:26 -0500
-Subject: [PATCH] core/device.c: Change the default device timeout to 240 sec.
+From ef867afd27e8fed558e82430759d8d2c7efb6608 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 14 Dec 2015 04:09:19 +0000
+Subject: [PATCH 04/16] core/device.c: Change the default device timeout to 240
+ sec.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
+Upstream-Status: Inappropriate [Specific case QEMU/AB]
+
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/core/device.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/device.c b/src/core/device.c
-index e7efcf0..4ed8f08 100644
+index bcd4d11..f41bb54 100644
--- a/src/core/device.c
+++ b/src/core/device.c
-@@ -110,7 +110,7 @@ static void device_init(Unit *u) {
+@@ -114,7 +114,7 @@ static void device_init(Unit *u) {
* indefinitely for plugged in devices, something which cannot
* happen for the other units since their operations time out
* anyway. */
@@ -25,7 +27,7 @@ index e7efcf0..4ed8f08 100644
+ u->job_timeout = (240 * USEC_PER_SEC);
u->ignore_on_isolate = true;
- u->ignore_on_snapshot = true;
+ }
--
-1.9.1
+2.6.4
diff --git a/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
similarity index 65%
rename from meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
rename to meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
index 0e20fd0..0b75fac 100644
--- a/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ b/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
@@ -1,7 +1,7 @@
-From 184a89caacfa00f07e7275bca592bd7dda1b541e Mon Sep 17 00:00:00 2001
+From 319873d22a6b1225ae41aa38bc976e723326ba20 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 05:03:44 +0000
-Subject: [PATCH 03/11] binfmt: Don't install dependency links at install time
+Subject: [PATCH 05/16] binfmt: Don't install dependency links at install time
for the binfmt services
use [Install] blocks so that they get created when the service is enabled
@@ -23,11 +23,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
units/systemd-binfmt.service.in | 5 +++++
3 files changed, 8 insertions(+), 4 deletions(-)
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am
-+++ git/Makefile.am
-@@ -4271,10 +4271,6 @@ INSTALL_DIRS += \
+diff --git a/Makefile.am b/Makefile.am
+index 00a92e3..4c1143a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4455,10 +4455,6 @@ INSTALL_DIRS += \
$(prefix)/lib/binfmt.d \
$(sysconfdir)/binfmt.d
@@ -38,10 +38,10 @@ Index: git/Makefile.am
endif
EXTRA_DIST += \
-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
+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/
[Automount]
@@ -49,11 +49,11 @@ Index: git/units/proc-sys-fs-binfmt_misc.automount
+
+[Install]
+WantedBy=sysinit.target
-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=man:systemd-binfmt.service
+diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
+index d53073e..8c57ee0 100644
+--- a/units/systemd-binfmt.service.in
++++ b/units/systemd-binfmt.service.in
+@@ -11,6 +11,8 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5)
Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
DefaultDependencies=no
Conflicts=shutdown.target
@@ -69,3 +69,6 @@ Index: git/units/systemd-binfmt.service.in
+
+[Install]
+WantedBy=sysinit.target
+--
+2.6.4
+
diff --git a/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
similarity index 76%
rename from meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch
rename to meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
index 8078da9..a2c40b5 100644
--- a/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch
+++ b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
@@ -1,7 +1,7 @@
-From 4e2e8dbf3f23ab7dca32286cc0f37bff6ac49e22 Mon Sep 17 00:00:00 2001
+From d1fe5d2dd38cdef984296f453c65ccaebb71d1a9 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 04/11] configure: Check for additional features that uclibc
+Subject: [PATCH 06/16] configure: Check for additional features that uclibc
doesnt support
This helps in supporting uclibc which does not have all features that
@@ -14,11 +14,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
configure.ac | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac
-+++ git/configure.ac
-@@ -110,6 +110,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount], [/
+diff --git a/configure.ac b/configure.ac
+index 3128ca8..49f73a4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -112,6 +112,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 ***])])
@@ -43,3 +43,6 @@ Index: git/configure.ac
M4_DEFINES=
AC_CHECK_TOOL(OBJCOPY, objcopy)
+--
+2.6.4
+
diff --git a/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch b/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
deleted file mode 100644
index 631dd77..0000000
--- a/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 34a61b6c9eed3fad360066fb63132ebc7e0aaaa6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 20 Feb 2015 05:12:48 +0000
-Subject: [PATCH 06/11] journal: Use posix fallocate only if available
-
-Some architecture ports in uclibc did not support it in past
-
-Upstream-Status: Denied [no desire for uclibc support]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- src/journal/journal-file.c | 16 +++++++++++++++-
- src/journal/journald-kmsg.c | 15 ++++++++++++++-
- 2 files changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 2845e05..9431171 100644
---- a/src/journal/journal-file.c
-+++ b/src/journal/journal-file.c
-@@ -36,6 +36,8 @@
- #include "compress.h"
- #include "fsprg.h"
-
-+#include "config.h"
-+
- #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
- #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
-
-@@ -354,7 +356,7 @@ static int journal_file_fstat(JournalFile *f) {
-
- static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
- uint64_t old_size, new_size;
-- int r;
-+ int r = 0;
-
- assert(f);
-
-@@ -418,9 +420,21 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
- /* Note that the glibc fallocate() fallback is very
- inefficient, hence we try to minimize the allocation area
- as we can. */
-+#ifdef HAVE_POSIX_FALLOCATE
- r = posix_fallocate(f->fd, old_size, new_size - old_size);
- if (r != 0)
- return -r;
-+#else
-+ /* Write something every 512 bytes to make sure the block is allocated */
-+ uint64_t len = new_size - old_size;
-+ uint64_t offset = old_size;
-+ for (offset += (len-1) % 512; len > 0; offset += 512) {
-+ len -= 512;
-+ if (pwrite(f->fd, "", 1, offset) != 1)
-+ return -errno;
-+ }
-+
-+#endif /* HAVE_POSIX_FALLOCATE */
-
- f->header->arena_size = htole64(new_size - le64toh(f->header->header_size));
-
-diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
-index c4216c4..a998ed5 100644
---- a/src/journal/journald-kmsg.c
-+++ b/src/journal/journald-kmsg.c
-@@ -436,6 +436,7 @@ fail:
- int server_open_kernel_seqnum(Server *s) {
- _cleanup_close_ int fd;
- uint64_t *p;
-+ int r = 0;
-
- assert(s);
-
-@@ -449,7 +450,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);
-+#endif /* HAVE_POSIX_FALLOCATE */
-+ if (r < 0) {
- log_error_errno(errno, "Failed to allocate sequential number file, ignoring: %m");
- return 0;
- }
---
-2.1.4
-
diff --git a/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch
similarity index 50%
rename from meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch
rename to meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch
index 55a0088..85d3907 100644
--- a/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch
+++ b/meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch
@@ -1,7 +1,7 @@
-From a7417c2e6950d55c22c1b0d15783898b8ff229ef Mon Sep 17 00:00:00 2001
+From 529e7e2f7f6a5dc0e4527ff5c2237b19ece2f112 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 05:10:37 +0000
-Subject: [PATCH 05/11] nspawn: Use execvpe only when libc supports it
+Subject: [PATCH 07/16] nspawn: Use execvpe only when libc supports it
Upstream-Status: Denied [no desire for uclibc support]
@@ -10,29 +10,32 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
src/nspawn/nspawn.c | 7 +++++++
1 file changed, 7 insertions(+)
-Index: git/src/nspawn/nspawn.c
-===================================================================
---- git.orig/src/nspawn/nspawn.c
-+++ git/src/nspawn/nspawn.c
-@@ -143,6 +143,8 @@ typedef struct CustomMount {
- char **lower;
- } CustomMount;
+diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
+index a4e13bd..4def6ba 100644
+--- a/src/nspawn/nspawn.c
++++ b/src/nspawn/nspawn.c
+@@ -112,6 +112,8 @@ typedef enum LinkJournal {
+ LINK_GUEST
+ } LinkJournal;
+#include "config.h"
+
static char *arg_directory = NULL;
static char *arg_template = NULL;
static char *arg_user = NULL;
-@@ -4238,7 +4240,12 @@ static int inner_child(
+@@ -2595,7 +2597,12 @@ static int inner_child(
a[0] = (char*) "/sbin/init";
execve(a[0], a, env_use);
- } else if (argc > optind)
+ } else if (!strv_isempty(arg_parameters))
+#ifdef HAVE_EXECVPE
- execvpe(argv[optind], argv + optind, env_use);
+ execvpe(arg_parameters[0], arg_parameters, env_use);
+#else
+ environ = env_use;
-+ execvp(argv[optind], argv + optind);
++ execvp(arg_parameters[0], arg_parameters);
+#endif /* HAVE_EXECVPE */
else {
- chdir(home ? home : "/root");
+ chdir(home ?: "/root");
execle("/bin/bash", "-bash", NULL, env_use);
+--
+2.6.4
+
diff --git a/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
deleted file mode 100644
index b8ab7c4..0000000
--- a/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f771407d3e0288ca0c06a894194d3ddad69b9a8e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 20 Feb 2015 05:17:05 +0000
-Subject: [PATCH 07/11] util: Use mkostemp only if libc supports it
-
-Upstream-Status: Denied [no desire for uclibc support]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/basic/util.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/basic/util.c b/src/basic/util.c
-index dc65280..72f4665 100644
---- a/src/basic/util.c
-+++ b/src/basic/util.c
-@@ -97,6 +97,8 @@
- #include "def.h"
- #include "sparse-endian.h"
-
-+#include "config.h"
-+
- int saved_argc = 0;
- char **saved_argv = NULL;
-
-@@ -6682,7 +6684,13 @@ int mkostemp_safe(char *pattern, int flags) {
-
- 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;
-
---
-2.1.4
-
diff --git a/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch b/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
index 3f4d4de..8d71ecb 100644
--- a/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
+++ b/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
@@ -1,7 +1,7 @@
-From b45ea3bfd6635744c8a6b74d0ac701b44bb1d294 Mon Sep 17 00:00:00 2001
+From 83944758dc0703afea81f3c7aa0ad926bc5df757 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 20 Feb 2015 05:19:37 +0000
-Subject: [PATCH 08/11] util: bypass unimplemented _SC_PHYS_PAGES system
+Date: Mon, 14 Dec 2015 00:47:53 +0000
+Subject: [PATCH 08/16] util: bypass unimplemented _SC_PHYS_PAGES system
configuration API on uclibc
Upstream-Status: Inappropriate [uclibc-specific]
@@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 15 insertions(+)
diff --git a/src/basic/util.c b/src/basic/util.c
-index 72f4665..cbbe3b1 100644
+index 9e0b576..65f0edf 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
-@@ -6793,10 +6793,25 @@ uint64_t physical_memory(void) {
+@@ -769,10 +769,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 */
@@ -25,7 +25,7 @@ index 72f4665..cbbe3b1 100644
+ if (f == NULL)
+ return 0;
+ while (!feof(f) && fgets(line, sizeof(line)-1, f)) {
-+ if (sscanf(line, "MemTotal: %l kB", &mem) == 1) {
++ if (sscanf(line, "MemTotal: %li kB", &mem) == 1) {
+ mem *= 1024;
+ break;
+ }
@@ -40,7 +40,7 @@ index 72f4665..cbbe3b1 100644
+#endif
}
- void hexdump(FILE *f, const void *p, size_t s) {
+ int update_reboot_param_file(const char *param) {
--
-2.1.4
+2.6.4
diff --git a/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch
similarity index 75%
rename from meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch
rename to meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch
index 68b45a9..a139684 100644
--- a/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch
+++ b/meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch
@@ -1,7 +1,7 @@
-From 5f8b9f2d276c0ddbcbf5423733a23f043d688009 Mon Sep 17 00:00:00 2001
+From 81c3d92b5bc5786cbd93b1e5ed82884e8caf2254 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 5 Sep 2015 06:31:47 +0000
-Subject: [PATCH] implment systemd-sysv-install for OE
+Subject: [PATCH 09/16] implment systemd-sysv-install for OE
Use update-rc.d for enabling/disabling and status command
to check the status of the sysv service
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
src/systemctl/systemd-sysv-install.SKELETON | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-Index: git/src/systemctl/systemd-sysv-install.SKELETON
-===================================================================
---- git.orig/src/systemctl/systemd-sysv-install.SKELETON
-+++ git/src/systemctl/systemd-sysv-install.SKELETON
+diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON
+index a53a3e6..5d877b0 100755
+--- a/src/systemctl/systemd-sysv-install.SKELETON
++++ b/src/systemctl/systemd-sysv-install.SKELETON
@@ -30,17 +30,17 @@ case "$1" in
enable)
# call the command to enable SysV init script $NAME here
@@ -38,3 +38,6 @@ Index: git/src/systemctl/systemd-sysv-install.SKELETON
;;
*)
usage ;;
+--
+2.6.4
+
diff --git a/meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch b/meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
new file mode 100644
index 0000000..8cec071
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
@@ -0,0 +1,38 @@
+From d4b7f9b771a538c2356c4c77461f3b4790043556 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 14 Dec 2015 00:50:01 +0000
+Subject: [PATCH 10/16] nss-mymachines: Build conditionally when
+ HAVE_MYHOSTNAME is set
+
+Fixes build failures when building with --disable-myhostname
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4c1143a..cf559be 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4961,6 +4961,7 @@ SYSTEM_UNIT_ALIASES += \
+ BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.machine1.busname
+
++if HAVE_MYHOSTNAME
+ libnss_mymachines_la_SOURCES = \
+ src/nss-mymachines/nss-mymachines.sym \
+ src/nss-mymachines/nss-mymachines.c
+@@ -4981,6 +4982,7 @@ lib_LTLIBRARIES += \
+ libnss_mymachines.la
+
+ endif
++endif
+
+ polkitpolicy_in_files += \
+ src/machine/org.freedesktop.machine1.policy.in
+--
+2.6.4
+
diff --git a/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch
similarity index 90%
rename from meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch
rename to meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch
index 8975b05..03fdbff 100644
--- a/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch
+++ b/meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch
@@ -1,7 +1,7 @@
-From f77b7e5626e70c3a775e993816a33af5a61dea42 Mon Sep 17 00:00:00 2001
+From ae6c9dcb00919e1dd2793fd1b82125d123f69a90 Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Wed, 16 Sep 2015 13:55:58 +0200
-Subject: [PATCH] rules: whitelist hd* devices
+Subject: [PATCH 11/16] rules: whitelist hd* devices
qemu by default emulates IDE and the linux-yocto kernel(s) use
CONFIG_IDE instead of the more modern libsata, so disks appear as
@@ -28,5 +28,5 @@ index 0b14bb4..1c4d97a 100644
# ignore partitions that span the entire disk
TEST=="whole_disk", GOTO="persistent_storage_end"
--
-2.1.4
+2.6.4
diff --git a/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch b/meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch
similarity index 77%
rename from meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch
rename to meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch
index 9ea3e83..82feff0 100644
--- a/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch
+++ b/meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch
@@ -1,7 +1,7 @@
-From 8791b5b3934c55694872b6915a67340683ead91b Mon Sep 17 00:00:00 2001
+From 9e6c907ff1f17deb96c66a607653db4c7da34289 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 20 Feb 2015 05:22:52 +0000
-Subject: [PATCH 09/11] sysv-generator: add support for executing scripts under
+Date: Mon, 14 Dec 2015 05:09:53 +0000
+Subject: [PATCH 12/16] sysv-generator: add support for executing scripts under
/etc/rcS.d/
To be compatible, all services translated from scripts under /etc/rcS.d would
@@ -12,14 +12,14 @@ Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/sysv-generator/sysv-generator.c | 50 ++++++++++++++++++++++++++++---------
- 1 file changed, 38 insertions(+), 12 deletions(-)
+ src/sysv-generator/sysv-generator.c | 50 +++++++++++++++++++++++++++++--------
+ 1 file changed, 39 insertions(+), 11 deletions(-)
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index bd67f32..6756cc6 100644
+index 5075548..32d3687 100644
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
-@@ -42,7 +42,8 @@
+@@ -46,7 +46,8 @@
typedef enum RunlevelType {
RUNLEVEL_UP,
@@ -29,7 +29,7 @@ index bd67f32..6756cc6 100644
} RunlevelType;
static const struct {
-@@ -57,6 +58,9 @@ static const struct {
+@@ -61,6 +62,9 @@ static const struct {
{ "rc4.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
{ "rc5.d", SPECIAL_GRAPHICAL_TARGET, RUNLEVEL_UP },
@@ -39,7 +39,7 @@ index bd67f32..6756cc6 100644
/* Standard SysV runlevels for shutdown */
{ "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN },
{ "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN }
-@@ -65,7 +69,7 @@ static const struct {
+@@ -69,7 +73,7 @@ static const struct {
directories in this order, and we want to make sure that
sysv_start_priority is known when we first load the
unit. And that value we only know from S links. Hence
@@ -47,19 +47,19 @@ index bd67f32..6756cc6 100644
+ UP/SYSINIT must be read before DOWN */
};
- typedef struct SysvStub {
-@@ -81,6 +85,8 @@ typedef struct SysvStub {
- char **conflicts;
+ const char *arg_dest = "/tmp";
+@@ -88,6 +92,8 @@ typedef struct SysvStub {
bool has_lsb;
bool reload;
+ bool loaded;
+ bool default_dependencies;
+ bool from_rcsd;
} SysvStub;
- const char *arg_dest = "/tmp";
-@@ -183,6 +189,9 @@ static int generate_unit_file(SysvStub *s) {
- "Description=%s\n",
- s->path, s->description);
+ static void free_sysvstub(SysvStub *s) {
+@@ -204,6 +210,9 @@ static int generate_unit_file(SysvStub *s) {
+ if (s->description)
+ fprintf(f, "Description=%s\n", s->description);
+ if (!s->default_dependencies)
+ fprintf(f, "DefaultDependencies=no\n");
@@ -67,7 +67,7 @@ index bd67f32..6756cc6 100644
if (!isempty(before))
fprintf(f, "Before=%s\n", before);
if (!isempty(after))
-@@ -704,18 +713,30 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
+@@ -722,17 +731,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
if (s->has_lsb && other->has_lsb)
continue;
@@ -79,15 +79,14 @@ index bd67f32..6756cc6 100644
+ r = strv_extend(&s->before, other->name);
if (r < 0)
return log_oom();
-- }
-- else if (other->sysv_start_priority > s->sysv_start_priority) {
+
+- } else if (other->sysv_start_priority > s->sysv_start_priority) {
- r = strv_extend(&s->before, other->name);
+ } else if (other->from_rcsd && !s->from_rcsd) {
+ r = strv_extend(&s->after, other->name);
if (r < 0)
return log_oom();
-- }
-- else
+- } else
- continue;
+ } else {
+ if (other->sysv_start_priority < s->sysv_start_priority) {
@@ -102,11 +101,11 @@ index bd67f32..6756cc6 100644
+ }
+ else
+ continue;
-+ }
++ }
/* FIXME: Maybe we should compare the name here lexicographically? */
}
-@@ -778,6 +799,8 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
+@@ -799,6 +822,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) {
return log_oom();
service->sysv_start_priority = -1;
@@ -114,22 +113,23 @@ index bd67f32..6756cc6 100644
+ service->from_rcsd = false;
service->name = name;
service->path = fpath;
-
-@@ -864,9 +887,11 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
+ name = fpath = NULL;
+@@ -882,9 +907,11 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic
if (de->d_name[0] == 'S') {
-- if (rcnd_table[i].type == RUNLEVEL_UP) {
+- if (rcnd_table[i].type == RUNLEVEL_UP)
+ if (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT) {
- service->sysv_start_priority =
- MAX(a*10 + b, service->sysv_start_priority);
+ service->sysv_start_priority = MAX(a*10 + b, service->sysv_start_priority);
+-
+ service->default_dependencies = (rcnd_table[i].type == RUNLEVEL_SYSINIT)?false:true;
+ service->from_rcsd = (rcnd_table[i].type == RUNLEVEL_SYSINIT)?true:false;
- }
-
++ }
r = set_ensure_allocated(&runlevel_services[i], NULL);
-@@ -878,7 +903,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
- goto finish;
+ if (r < 0) {
+ log_oom();
+@@ -898,7 +925,8 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic
+ }
} else if (de->d_name[0] == 'K' &&
- (rcnd_table[i].type == RUNLEVEL_DOWN)) {
@@ -137,7 +137,7 @@ index bd67f32..6756cc6 100644
+ rcnd_table[i].type == RUNLEVEL_SYSINIT)) {
r = set_ensure_allocated(&shutdown_services, NULL);
- if (r < 0)
+ if (r < 0) {
--
-2.1.4
+2.6.4
diff --git a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
similarity index 64%
rename from meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
rename to meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
index ed7ff5b..ea0b3e2 100644
--- a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
+++ b/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
@@ -1,7 +1,7 @@
-From 3dc731c1d270e2e143de621db9bd898299fd849d Mon Sep 17 00:00:00 2001
+From 1ba00ff6ed3f0626892f57cdd8d9788692c7bf14 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 20 Feb 2015 05:24:49 +0000
-Subject: [PATCH 10/11] Make root's home directory configurable
+Date: Mon, 14 Dec 2015 05:18:20 +0000
+Subject: [PATCH 13/16] Make root's home directory configurable
OpenEmbedded has a configurable home directory for root. Allow
systemd to be built using its idea of what root's home directory
@@ -17,19 +17,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile.am | 2 ++
configure.ac | 7 +++++++
- src/core/unit-printf.c | 2 +-
+ src/basic/user-util.c | 4 ++--
+ src/core/namespace.c | 2 +-
src/nspawn/nspawn.c | 4 ++--
- src/basic/util.c | 4 ++--
units/console-shell.service.m4.in | 4 ++--
units/emergency.service.in | 4 ++--
units/rescue.service.in | 4 ++--
8 files changed, 20 insertions(+), 11 deletions(-)
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am
-+++ git/Makefile.am
-@@ -208,6 +208,7 @@ AM_CPPFLAGS = \
+diff --git a/Makefile.am b/Makefile.am
+index cf559be..a511c3d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -210,6 +210,7 @@ AM_CPPFLAGS = \
-DLIBDIR=\"$(libdir)\" \
-DROOTLIBDIR=\"$(rootlibdir)\" \
-DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
@@ -37,7 +37,7 @@ Index: git/Makefile.am
-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/basic \
-@@ -5615,6 +5616,7 @@ EXTRA_DIST += \
+@@ -5876,6 +5877,7 @@ EXTRA_DIST += \
substitutions = \
'|rootlibexecdir=$(rootlibexecdir)|' \
'|rootbindir=$(rootbindir)|' \
@@ -45,11 +45,11 @@ Index: git/Makefile.am
'|bindir=$(bindir)|' \
'|SYSTEMCTL=$(rootbindir)/systemctl|' \
'|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac
-+++ git/configure.ac
-@@ -1383,6 +1383,11 @@ AC_ARG_WITH([rootlibdir],
+diff --git a/configure.ac b/configure.ac
+index 49f73a4..a3e639d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1434,6 +1434,11 @@ AC_ARG_WITH([rootlibdir],
[with_rootlibdir=${libdir}])
AX_NORMALIZE_PATH([with_rootlibdir])
@@ -61,7 +61,7 @@ Index: git/configure.ac
AC_ARG_WITH([pamlibdir],
AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
[],
-@@ -1474,6 +1479,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
+@@ -1517,6 +1522,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
AC_SUBST([pamconfdir], [$with_pamconfdir])
AC_SUBST([rootprefix], [$with_rootprefix])
AC_SUBST([rootlibdir], [$with_rootlibdir])
@@ -69,7 +69,7 @@ Index: git/configure.ac
AC_CONFIG_FILES([
Makefile
-@@ -1563,6 +1569,7 @@ AC_MSG_RESULT([
+@@ -1606,6 +1612,7 @@ AC_MSG_RESULT([
includedir: ${includedir}
lib dir: ${libdir}
rootlib dir: ${with_rootlibdir}
@@ -77,46 +77,11 @@ Index: git/configure.ac
SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
Build Python: ${PYTHON}
-Index: git/src/core/unit-printf.c
-===================================================================
---- git.orig/src/core/unit-printf.c
-+++ git/src/core/unit-printf.c
-@@ -237,7 +237,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 -EOPNOTSUPP;
-
-Index: git/src/nspawn/nspawn.c
-===================================================================
---- git.orig/src/nspawn/nspawn.c
-+++ git/src/nspawn/nspawn.c
-@@ -4176,7 +4176,7 @@ static int inner_child(
- if (envp[n_env])
- n_env ++;
-
-- 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))
- return log_oom();
-@@ -4247,7 +4247,7 @@ static int inner_child(
- 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);
- }
-Index: git/src/basic/util.c
-===================================================================
---- git.orig/src/basic/util.c
-+++ git/src/basic/util.c
-@@ -3233,7 +3233,7 @@ int get_user_creds(
+diff --git a/src/basic/user-util.c b/src/basic/user-util.c
+index 56e1a3b..c3d0ec3 100644
+--- a/src/basic/user-util.c
++++ b/src/basic/user-util.c
+@@ -124,7 +124,7 @@ int get_user_creds(
*gid = 0;
if (home)
@@ -125,7 +90,7 @@ Index: git/src/basic/util.c
if (shell)
*shell = "/bin/sh";
-@@ -4069,7 +4069,7 @@ int get_home_dir(char **_h) {
+@@ -355,7 +355,7 @@ int get_home_dir(char **_h) {
/* Hardcode home directory for root to avoid NSS */
u = getuid();
if (u == 0) {
@@ -134,10 +99,45 @@ Index: git/src/basic/util.c
if (!h)
return -ENOMEM;
-Index: git/units/console-shell.service.m4.in
-===================================================================
---- git.orig/units/console-shell.service.m4.in
-+++ git/units/console-shell.service.m4.in
+diff --git a/src/core/namespace.c b/src/core/namespace.c
+index 81ba09e..1a1f276 100644
+--- a/src/core/namespace.c
++++ b/src/core/namespace.c
+@@ -494,7 +494,7 @@ int setup_namespace(
+ home_dir = strjoina("-", home_dir);
+ run_user_dir = prefix_roota(root_directory, "/run/user");
+ run_user_dir = strjoina("-", run_user_dir);
+- root_dir = prefix_roota(root_directory, "/root");
++ root_dir = prefix_roota(root_directory, ROOTHOMEDIR);
+ root_dir = strjoina("-", root_dir);
+
+ r = append_mounts(&m, STRV_MAKE(home_dir, run_user_dir, root_dir),
+diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
+index 4def6ba..2081953 100644
+--- a/src/nspawn/nspawn.c
++++ b/src/nspawn/nspawn.c
+@@ -2530,7 +2530,7 @@ static int inner_child(
+ if (envp[n_env])
+ n_env ++;
+
+- 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))
+ return log_oom();
+@@ -2604,7 +2604,7 @@ static int inner_child(
+ execvp(arg_parameters[0], arg_parameters);
+ #endif /* HAVE_EXECVPE */
+ else {
+- chdir(home ?: "/root");
++ chdir(home ?: ROOTHOMEDIR);
+ execle("/bin/bash", "-bash", NULL, env_use);
+ execle("/bin/sh", "-sh", NULL, env_use);
+ }
+diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
+index 5c80722..efde5f0 100644
+--- a/units/console-shell.service.m4.in
++++ b/units/console-shell.service.m4.in
@@ -15,8 +15,8 @@ After=rc-local.service
Before=getty.target
@@ -149,10 +149,10 @@ Index: git/units/console-shell.service.m4.in
ExecStart=-@SULOGIN@
ExecStopPost=-@SYSTEMCTL@ poweroff
Type=idle
-Index: git/units/emergency.service.in
-===================================================================
---- git.orig/units/emergency.service.in
-+++ git/units/emergency.service.in
+diff --git a/units/emergency.service.in b/units/emergency.service.in
+index 8dc3cbd..eb046c2 100644
+--- a/units/emergency.service.in
++++ b/units/emergency.service.in
@@ -14,8 +14,8 @@ Conflicts=rescue.service
Before=shutdown.target
@@ -164,11 +164,11 @@ Index: git/units/emergency.service.in
ExecStartPre=-/bin/plymouth --wait 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" or ^D to\\ntry again to boot into default mode.'
ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=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
+diff --git a/units/rescue.service.in b/units/rescue.service.in
+index 432e4f3..afa3e82 100644
+--- a/units/rescue.service.in
++++ b/units/rescue.service.in
+@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.service
Before=shutdown.target
[Service]
@@ -179,3 +179,6 @@ Index: git/units/rescue.service.in
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" or ^D to\\nboot into default mode.'
ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
+--
+2.6.4
+
diff --git a/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch b/meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch
similarity index 54%
rename from meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch
rename to meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch
index e562bca..11be097 100644
--- a/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch
+++ b/meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch
@@ -1,7 +1,7 @@
-From 7e202f71785bf5a67c8a4f6b58d3585608fbfdc4 Mon Sep 17 00:00:00 2001
+From 548a8d5d456c531444498b3ce8cec3f3dd374cf8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 05:26:25 +0000
-Subject: [PATCH 11/11] systemd-user: avoid using system-auth
+Subject: [PATCH 14/16] 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.
@@ -11,21 +11,26 @@ Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- src/login/systemd-user | 4 ++--
+ src/login/systemd-user.m4 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/src/login/systemd-user b/src/login/systemd-user
-index 8112d74..99635af 100644
---- a/src/login/systemd-user
-+++ b/src/login/systemd-user
-@@ -2,5 +2,5 @@
+diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
+index 7933508..16b73d2 100644
+--- a/src/login/systemd-user.m4
++++ b/src/login/systemd-user.m4
+@@ -2,10 +2,10 @@
#
# Used by systemd --user instances.
-account include system-auth
--session include system-auth
+account include common-account
+
+ m4_ifdef(`HAVE_SELINUX',
+ session required pam_selinux.so close
+ session required pam_selinux.so nottys open
+ )m4_dnl
+-session include system-auth
+session include common-session
--
-2.1.4
+2.6.4
diff --git a/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch b/meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch
similarity index 83%
rename from meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
rename to meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch
index fe2ba53..7cc3922 100644
--- a/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
+++ b/meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch
@@ -1,7 +1,7 @@
-From 4f0a722489154da99e7f6b3051afde984eed2f74 Mon Sep 17 00:00:00 2001
+From 6b2b8d20f884bd5a3d928175e422023f6c9d056b Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Thu, 19 Mar 2015 15:01:29 +1100
-Subject: [PATCH] Revert "rules: remove firmware loading rules"
+Subject: [PATCH 15/16] Revert "rules: remove firmware loading rules"
This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19.
Userspace firmware loading support is needed for Linux < 3.7.
@@ -24,5 +24,5 @@ index 0000000..f0ae684
+
+SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware"
--
-2.3.3
+2.6.4
diff --git a/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
similarity index 79%
rename from meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
rename to meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
index 6308cc7..03ab0d4 100644
--- a/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
+++ b/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
@@ -1,7 +1,8 @@
-From 7f074def4e32045353ba4336d703e17b8de7ec4e Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Thu, 19 Mar 2015 15:01:33 +1100
-Subject: [PATCH] Revert "udev: remove userspace firmware loading support"
+From d3661ec7fb4557c47f001986cbb8a684b8dbae4a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 14 Dec 2015 05:33:32 +0000
+Subject: [PATCH 16/16] Revert "udev: remove userspace firmware loading
+ support"
This reverts commit be2ea723b1d023b3d385d3b791ee4607cbfb20ca.
Userspace firmware loading support is needed for Linux < 3.7.
@@ -9,23 +10,24 @@ Userspace firmware loading support is needed for Linux < 3.7.
Upstream-Status: Inappropriate [OE specific]
Signed-off-by: Jonathan Liu <net147@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile.am | 12 +++
- README | 9 ++-
+ README | 6 +-
TODO | 1 +
- configure.ac | 20 +++++
+ configure.ac | 25 +++++++
src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++
src/udev/udev-builtin.c | 3 +
src/udev/udev.h | 6 ++
src/udev/udevd.c | 13 ++++
- 8 files changed, 214 insertions(+), 4 deletions(-)
+ 8 files changed, 217 insertions(+), 3 deletions(-)
create mode 100644 src/udev/udev-builtin-firmware.c
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am
-+++ git/Makefile.am
-@@ -3470,6 +3470,18 @@ libudev_core_la_LIBADD = \
+diff --git a/Makefile.am b/Makefile.am
+index a511c3d..6181e55 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3650,6 +3650,18 @@ libudev_core_la_LIBADD = \
$(BLKID_LIBS) \
$(KMOD_LIBS)
@@ -44,21 +46,11 @@ Index: git/Makefile.am
if HAVE_KMOD
libudev_core_la_SOURCES += \
src/udev/udev-builtin-kmod.c
-Index: git/README
-===================================================================
---- git.orig/README
-+++ git/README
-@@ -36,7 +36,8 @@ LICENSE:
- - except src/udev/* which is (currently still) GPLv2, GPLv2+
-
- REQUIREMENTS:
-- Linux kernel >= 3.7
-+ Linux kernel >= 3.0
-+ Linux kernel >= 3.3 for loop device partition support features with nspawn
- Linux kernel >= 3.8 for Smack support
-
- Kernel Config Options:
-@@ -51,14 +52,14 @@ REQUIREMENTS:
+diff --git a/README b/README
+index bf67f8c..87b6f70 100644
+--- a/README
++++ b/README
+@@ -51,14 +51,14 @@ REQUIREMENTS:
CONFIG_PROC_FS
CONFIG_FHANDLE (libudev, mount and bind mount handling)
@@ -76,24 +68,24 @@ Index: git/README
CONFIG_FW_LOADER_USER_HELPER=n
Some udev rules and virtualization detection relies on it:
-Index: git/TODO
-===================================================================
---- git.orig/TODO
-+++ git/TODO
-@@ -754,6 +754,7 @@ Features:
- * ExecOnFailure=/usr/bin/foo
+diff --git a/TODO b/TODO
+index 369805f..ce97674 100644
+--- a/TODO
++++ b/TODO
+@@ -635,6 +635,7 @@ Features:
+ * rename "userspace" to "core-os"
* udev:
+ - remove src/udev/udev-builtin-firmware.c (CONFIG_FW_LOADER_USER_HELPER=n)
- move to LGPL
- kill scsi_id
- add trigger --subsystem-match=usb/usb_device device
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac
-+++ git/configure.ac
-@@ -1268,6 +1268,26 @@ fi
- AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
+diff --git a/configure.ac b/configure.ac
+index a3e639d..00736f5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1317,6 +1317,25 @@ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database
+ AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
# ------------------------------------------------------------------------------
+AC_ARG_WITH(firmware-path,
@@ -114,23 +106,28 @@ Index: git/configure.ac
+AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])
+AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
+
-+
+# ------------------------------------------------------------------------------
- AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database support])],
- enable_hwdb=$enableval, enable_hwdb=yes)
- AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
-@@ -1574,6 +1594,7 @@ AC_MSG_RESULT([
+ have_manpages=no
+ AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
+ AS_IF([test "x$enable_manpages" != xno], [
+@@ -1616,6 +1635,12 @@ AC_MSG_RESULT([
+ SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
Build Python: ${PYTHON}
- sphinx binary: ${SPHINX_BUILD}
++<<<<<<< HEAD
++=======
++ Installation Python: ${PYTHON_BINARY}
++ sphinx binary: ${SPHINX_BUILD}
+ firmware path: ${FIRMWARE_PATH}
++>>>>>>> parent of be2ea72... udev: remove userspace firmware loading support
PAM modules dir: ${with_pamlibdir}
PAM configuration dir: ${with_pamconfdir}
D-Bus policy dir: ${with_dbuspolicydir}
-Index: git/src/udev/udev-builtin-firmware.c
-===================================================================
+diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
+new file mode 100644
+index 0000000..bd8c2fb
--- /dev/null
-+++ git/src/udev/udev-builtin-firmware.c
++++ b/src/udev/udev-builtin-firmware.c
@@ -0,0 +1,154 @@
+/*
+ * firmware - Kernel firmware loader
@@ -286,11 +283,11 @@ Index: git/src/udev/udev-builtin-firmware.c
+ .help = "kernel firmware loader",
+ .run_once = true,
+};
-Index: git/src/udev/udev-builtin.c
-===================================================================
---- git.orig/src/udev/udev-builtin.c
-+++ git/src/udev/udev-builtin.c
-@@ -30,6 +30,9 @@ static const struct udev_builtin *builti
+diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
+index 18fb661..d0280bf 100644
+--- a/src/udev/udev-builtin.c
++++ b/src/udev/udev-builtin.c
+@@ -33,6 +33,9 @@ static const struct udev_builtin *builtins[] = {
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
#endif
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
@@ -300,11 +297,11 @@ Index: git/src/udev/udev-builtin.c
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
[UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
-Index: git/src/udev/udev.h
-===================================================================
---- git.orig/src/udev/udev.h
-+++ git/src/udev/udev.h
-@@ -146,6 +146,9 @@ enum udev_builtin_cmd {
+diff --git a/src/udev/udev.h b/src/udev/udev.h
+index 4f40020..8f3560f 100644
+--- a/src/udev/udev.h
++++ b/src/udev/udev.h
+@@ -149,6 +149,9 @@ enum udev_builtin_cmd {
UDEV_BUILTIN_BLKID,
#endif
UDEV_BUILTIN_BTRFS,
@@ -314,7 +311,7 @@ Index: git/src/udev/udev.h
UDEV_BUILTIN_HWDB,
UDEV_BUILTIN_INPUT_ID,
UDEV_BUILTIN_KEYBOARD,
-@@ -174,6 +177,9 @@ struct udev_builtin {
+@@ -177,6 +180,9 @@ struct udev_builtin {
extern const struct udev_builtin udev_builtin_blkid;
#endif
extern const struct udev_builtin udev_builtin_btrfs;
@@ -324,11 +321,11 @@ Index: git/src/udev/udev.h
extern const struct udev_builtin udev_builtin_hwdb;
extern const struct udev_builtin udev_builtin_input_id;
extern const struct udev_builtin udev_builtin_keyboard;
-Index: git/src/udev/udevd.c
-===================================================================
---- git.orig/src/udev/udevd.c
-+++ git/src/udev/udevd.c
-@@ -116,6 +116,9 @@ struct event {
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index 366e7fb..7ca1b51 100644
+--- a/src/udev/udevd.c
++++ b/src/udev/udevd.c
+@@ -127,6 +127,9 @@ struct event {
bool is_block;
sd_event_source *timeout_warning;
sd_event_source *timeout;
@@ -338,7 +335,7 @@ Index: git/src/udev/udevd.c
};
static inline struct event *node_to_event(struct udev_list_node *node) {
-@@ -607,6 +610,10 @@ static int event_queue_insert(Manager *m
+@@ -615,6 +618,10 @@ static int event_queue_insert(Manager *manager, struct udev_device *dev) {
event->devnum = udev_device_get_devnum(dev);
event->is_block = streq("block", udev_device_get_subsystem(dev));
event->ifindex = udev_device_get_ifindex(dev);
@@ -349,7 +346,7 @@ Index: git/src/udev/udevd.c
log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev),
udev_device_get_action(dev), udev_device_get_subsystem(dev));
-@@ -692,6 +699,12 @@ static bool is_devpath_busy(Manager *man
+@@ -700,6 +707,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) {
return true;
}
@@ -362,3 +359,6 @@ Index: git/src/udev/udevd.c
/* parent device event found */
if (event->devpath[common] == '/') {
event->delaying_seqnum = loop_event->seqnum;
+--
+2.6.4
+
diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_228.bb
similarity index 93%
rename from meta/recipes-core/systemd/systemd_225.bb
rename to meta/recipes-core/systemd/systemd_228.bb
index 428158a..551a82f 100644
--- a/meta/recipes-core/systemd/systemd_225.bb
+++ b/meta/recipes-core/systemd/systemd_228.bb
@@ -24,39 +24,38 @@ SECTION = "base/shell"
inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext
-SRCREV = "e1439a1472c5f691733b8ef10e702beac2496a63"
+SRCREV = "dd050decb6ad131ebdeabb71c4f9ecb4733269c0"
-PV = "225+git${SRCPV}"
+PV = "228+git${SRCPV}"
SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
- 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://0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
+ file://0006-configure-Check-for-additional-features-that-uclibc-.patch \
+ file://0007-nspawn-Use-execvpe-only-when-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://0012-implment-systemd-sysv-install-for-OE.patch \
- file://0014-Revert-rules-remove-firmware-loading-rules.patch \
- file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
+ file://0009-implment-systemd-sysv-install-for-OE.patch \
+ file://0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch \
+ file://0011-rules-whitelist-hd-devices.patch \
+ file://0012-sysv-generator-add-support-for-executing-scripts-und.patch \
+ file://0013-Make-root-s-home-directory-configurable.patch \
+ file://0014-systemd-user-avoid-using-system-auth.patch \
+ file://0015-Revert-rules-remove-firmware-loading-rules.patch \
+ file://0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
file://touchscreen.rules \
file://00-create-volatile.conf \
file://init \
file://run-ptest \
- file://rules-whitelist-hd-devices.patch \
"
-SRC_URI_append_qemuall = " file://qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch"
+SRC_URI_append_libc-uclibc = "\
+ file://0001-define-exp10-if-missing.patch \
+ file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \
+ file://0003-Use-getenv-when-secure-versions-are-not-available.patch \
+ "
+SRC_URI_append_qemuall = " file://0004-core-device.c-Change-the-default-device-timeout-to-2.patch "
S = "${WORKDIR}/git"
-SRC_URI_append_libc-uclibc = "\
- file://0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch \
- file://0022-Use-getenv-when-secure-versions-are-not-available.patch \
- file://0001-fix-build-on-uClibc-exp10.patch \
- "
-LDFLAGS_append_libc-uclibc = " -lrt"
+LDFLAGS_append_libc-uclibc = " -lrt -lssp_nonshared -lssp "
GTKDOC_DOCDIR = "${S}/docs/"
@@ -65,7 +64,6 @@ PACKAGECONFIG ??= "xz ldconfig \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
"
-
PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl"
# Sign the journal for anti-tampering
PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
@@ -127,7 +125,7 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
--with-firmware-path=/lib/firmware \
"
# uclibc does not have NSS
-EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "
+EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname --disable-sysusers"
# per the systemd README, define VALGRIND=1 to run under valgrind
CFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '', d)}"
--
2.6.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 5/6] systemd: Upgrade to 228
2015-12-14 6:23 ` [PATCH 5/6] systemd: Upgrade to 228 Khem Raj
@ 2015-12-17 20:30 ` Andre McCurdy
2015-12-17 20:42 ` Burton, Ross
2015-12-17 20:55 ` Khem Raj
0 siblings, 2 replies; 17+ messages in thread
From: Andre McCurdy @ 2015-12-17 20:30 UTC (permalink / raw)
To: Khem Raj; +Cc: OE Core mailing list
On Sun, Dec 13, 2015 at 10:23 PM, Khem Raj <raj.khem@gmail.com> wrote:
> Forward port all patches and format them to be git am'able
> Drop patches specific to uclibc's missing features which now
> are there in uclibc-ng
It looks like you have some unresolved merge conflict markers in
0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch ?
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> .../systemd/0001-define-exp10-if-missing.patch | 33 +++++
> .../systemd/0001-fix-build-on-uClibc-exp10.patch | 22 ---
> ...-getty-to-agetty-in-console-setup-system.patch} | 6 +-
> ...v-when-secure-versions-are-not-available.patch} | 11 +-
> ...c-Change-the-default-device-timeout-to-2.patch} | 22 +--
> ...-install-dependency-links-at-install-tim.patch} | 35 ++---
> ...eck-for-additional-features-that-uclibc-.patch} | 17 ++-
> ...nal-Use-posix-fallocate-only-if-available.patch | 96 --------------
> ...n-Use-execvpe-only-when-libc-supports-it.patch} | 31 +++--
> ...til-Use-mkostemp-only-if-libc-supports-it.patch | 42 ------
> ...-unimplemented-_SC_PHYS_PAGES-system-conf.patch | 16 +--
> ...009-implment-systemd-sysv-install-for-OE.patch} | 15 ++-
> ...nes-Build-conditionally-when-HAVE_MYHOSTN.patch | 38 ++++++
> ...patch => 0011-rules-whitelist-hd-devices.patch} | 6 +-
> ...or-add-support-for-executing-scripts-und.patch} | 68 +++++-----
> ...-Make-root-s-home-directory-configurable.patch} | 147 +++++++++++----------
> ...014-systemd-user-avoid-using-system-auth.patch} | 25 ++--
> ...vert-rules-remove-firmware-loading-rules.patch} | 6 +-
> ...remove-userspace-firmware-loading-suppor.patch} | 132 +++++++++---------
> .../systemd/{systemd_225.bb => systemd_228.bb} | 44 +++---
> 20 files changed, 371 insertions(+), 441 deletions(-)
> create mode 100644 meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch
> delete mode 100644 meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
> rename meta/recipes-core/systemd/systemd/{0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch => 0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch} (89%)
> rename meta/recipes-core/systemd/systemd/{0022-Use-getenv-when-secure-versions-are-not-available.patch => 0003-Use-getenv-when-secure-versions-are-not-available.patch} (79%)
> rename meta/recipes-core/systemd/systemd/{qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch => 0004-core-device.c-Change-the-default-device-timeout-to-2.patch} (65%)
> rename meta/recipes-core/systemd/systemd/{0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch => 0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch} (65%)
> rename meta/recipes-core/systemd/systemd/{0004-configure-Check-for-additional-features-that-uclibc-.patch => 0006-configure-Check-for-additional-features-that-uclibc-.patch} (76%)
> delete mode 100644 meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
> rename meta/recipes-core/systemd/systemd/{0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch => 0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch} (50%)
> delete mode 100644 meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
> rename meta/recipes-core/systemd/systemd/{0012-implment-systemd-sysv-install-for-OE.patch => 0009-implment-systemd-sysv-install-for-OE.patch} (75%)
> create mode 100644 meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
> rename meta/recipes-core/systemd/systemd/{rules-whitelist-hd-devices.patch => 0011-rules-whitelist-hd-devices.patch} (90%)
> rename meta/recipes-core/systemd/systemd/{0009-sysv-generator-add-support-for-executing-scripts-und.patch => 0012-sysv-generator-add-support-for-executing-scripts-und.patch} (77%)
> rename meta/recipes-core/systemd/systemd/{0010-Make-root-s-home-directory-configurable.patch => 0013-Make-root-s-home-directory-configurable.patch} (64%)
> rename meta/recipes-core/systemd/systemd/{0011-systemd-user-avoid-using-system-auth.patch => 0014-systemd-user-avoid-using-system-auth.patch} (54%)
> rename meta/recipes-core/systemd/systemd/{0014-Revert-rules-remove-firmware-loading-rules.patch => 0015-Revert-rules-remove-firmware-loading-rules.patch} (83%)
> rename meta/recipes-core/systemd/systemd/{0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch => 0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (79%)
> rename meta/recipes-core/systemd/{systemd_225.bb => systemd_228.bb} (93%)
>
> diff --git a/meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch b/meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch
> new file mode 100644
> index 0000000..8bb775f
> --- /dev/null
> +++ b/meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch
> @@ -0,0 +1,33 @@
> +From ddad25c809846e08ea39bef49cc668f95d53304a Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Mon, 14 Dec 2015 00:42:49 +0000
> +Subject: [PATCH 01/16] define exp10 if missing
> +
> +Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
> +
> +exp10 extension is not part of uClibc, so compute it.
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + src/basic/missing.h | 5 +++++
> + 1 file changed, 5 insertions(+)
> +
> +diff --git a/src/basic/missing.h b/src/basic/missing.h
> +index d539ed0..09a233b 100644
> +--- a/src/basic/missing.h
> ++++ b/src/basic/missing.h
> +@@ -1125,3 +1125,8 @@ static inline key_serial_t request_key(const char *type, const char *description
> + #ifndef KEY_SPEC_USER_KEYRING
> + #define KEY_SPEC_USER_KEYRING -4
> + #endif
> ++
> ++#ifdef __UCLIBC__
> ++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
> ++#define exp10(x) (exp((x) * log(10)))
> ++#endif /* __UCLIBC__ */
> +--
> +2.6.4
> +
> diff --git a/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch b/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
> deleted file mode 100644
> index 76ce4b7..0000000
> --- a/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
> -
> -exp10 extension is not part of uClibc, so compute it.
> -
> -
> -Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> -
> -Upstream-Status: Pending
> -
> -Index: git/src/basic/missing.h
> -===================================================================
> ---- git.orig/src/basic/missing.h
> -+++ git/src/basic/missing.h
> -@@ -1036,3 +1036,8 @@ static inline int kcmp(pid_t pid1, pid_t
> - #ifndef INPUT_PROP_ACCELEROMETER
> - #define INPUT_PROP_ACCELEROMETER 0x06
> - #endif
> -+
> -+#ifdef __UCLIBC__
> -+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
> -+#define exp10(x) (exp((x) * log(10)))
> -+#endif /* __UCLIBC__ */
> diff --git a/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch b/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
> similarity index 89%
> rename from meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch
> rename to meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
> index b6ab5ef..55ff0ce 100644
> --- a/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch
> +++ b/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
> @@ -1,7 +1,7 @@
> -From 100e50604efc4032001a2de6a6b47853c0003817 Mon Sep 17 00:00:00 2001
> +From bfb6562cdbec73d03765ce707e9e0cac138fd223 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Fri, 20 Feb 2015 05:29:15 +0000
> -Subject: [PATCH 01/11] units: Prefer getty to agetty in console setup systemd
> +Subject: [PATCH 02/16] units: Prefer getty to agetty in console setup systemd
> units
>
> Upstream-Status: Inappropriate [configuration specific]
> @@ -40,5 +40,5 @@ index 4522d0d..e6d499d 100644
> Restart=always
> UtmpIdentifier=%I
> --
> -2.1.4
> +2.6.4
>
> diff --git a/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch b/meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch
> similarity index 79%
> rename from meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch
> rename to meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch
> index 5af78d5..cbf69d1 100644
> --- a/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch
> +++ b/meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch
> @@ -1,7 +1,7 @@
> -From cb71e4beea3b3b11e5951f95c829cd2eee9fcf7b Mon Sep 17 00:00:00 2001
> +From 9e79bb4bea758f25803e9f7ff2c5835ac4204230 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Sat, 12 Sep 2015 19:10:04 +0000
> -Subject: [PATCH 22/31] Use getenv when secure versions are not available
> +Subject: [PATCH 03/16] Use getenv when secure versions are not available
>
> musl doesnt implement secure version, so we default
> to it if configure does not detect a secure imeplementation
> @@ -9,15 +9,14 @@ to it if configure does not detect a secure imeplementation
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> Upstream-Status: Denied
> ---
> -
> src/basic/missing.h | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/src/basic/missing.h b/src/basic/missing.h
> -index bf9b490..d6dbc7d 100644
> +index 09a233b..3c37466 100644
> --- a/src/basic/missing.h
> +++ b/src/basic/missing.h
> -@@ -584,13 +584,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
> +@@ -582,13 +582,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
> return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags);
> }
> #endif
> @@ -35,5 +34,5 @@ index bf9b490..d6dbc7d 100644
>
> #ifndef CIFS_MAGIC_NUMBER
> --
> -2.5.2
> +2.6.4
>
> diff --git a/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch b/meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch
> similarity index 65%
> rename from meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch
> rename to meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch
> index c7e1711..74629fc 100644
> --- a/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch
> +++ b/meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch
> @@ -1,23 +1,25 @@
> -Upstream-Status: Inappropriate [Specific case QEMU/AB]
> -
> -From 7b8c4e0a67a79a75e1bd77df3a452a5497322108 Mon Sep 17 00:00:00 2001
> -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
> -Date: Thu, 27 Aug 2015 17:58:26 -0500
> -Subject: [PATCH] core/device.c: Change the default device timeout to 240 sec.
> +From ef867afd27e8fed558e82430759d8d2c7efb6608 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Mon, 14 Dec 2015 04:09:19 +0000
> +Subject: [PATCH 04/16] core/device.c: Change the default device timeout to 240
> + sec.
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> +Upstream-Status: Inappropriate [Specific case QEMU/AB]
> +
> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> src/core/device.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/core/device.c b/src/core/device.c
> -index e7efcf0..4ed8f08 100644
> +index bcd4d11..f41bb54 100644
> --- a/src/core/device.c
> +++ b/src/core/device.c
> -@@ -110,7 +110,7 @@ static void device_init(Unit *u) {
> +@@ -114,7 +114,7 @@ static void device_init(Unit *u) {
> * indefinitely for plugged in devices, something which cannot
> * happen for the other units since their operations time out
> * anyway. */
> @@ -25,7 +27,7 @@ index e7efcf0..4ed8f08 100644
> + u->job_timeout = (240 * USEC_PER_SEC);
>
> u->ignore_on_isolate = true;
> - u->ignore_on_snapshot = true;
> + }
> --
> -1.9.1
> +2.6.4
>
> diff --git a/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> similarity index 65%
> rename from meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> rename to meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> index 0e20fd0..0b75fac 100644
> --- a/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> +++ b/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
> @@ -1,7 +1,7 @@
> -From 184a89caacfa00f07e7275bca592bd7dda1b541e Mon Sep 17 00:00:00 2001
> +From 319873d22a6b1225ae41aa38bc976e723326ba20 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Fri, 20 Feb 2015 05:03:44 +0000
> -Subject: [PATCH 03/11] binfmt: Don't install dependency links at install time
> +Subject: [PATCH 05/16] binfmt: Don't install dependency links at install time
> for the binfmt services
>
> use [Install] blocks so that they get created when the service is enabled
> @@ -23,11 +23,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> units/systemd-binfmt.service.in | 5 +++++
> 3 files changed, 8 insertions(+), 4 deletions(-)
>
> -Index: git/Makefile.am
> -===================================================================
> ---- git.orig/Makefile.am
> -+++ git/Makefile.am
> -@@ -4271,10 +4271,6 @@ INSTALL_DIRS += \
> +diff --git a/Makefile.am b/Makefile.am
> +index 00a92e3..4c1143a 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -4455,10 +4455,6 @@ INSTALL_DIRS += \
> $(prefix)/lib/binfmt.d \
> $(sysconfdir)/binfmt.d
>
> @@ -38,10 +38,10 @@ Index: git/Makefile.am
> endif
>
> EXTRA_DIST += \
> -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
> +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/
>
> [Automount]
> @@ -49,11 +49,11 @@ Index: git/units/proc-sys-fs-binfmt_misc.automount
> +
> +[Install]
> +WantedBy=sysinit.target
> -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=man:systemd-binfmt.service
> +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
> +index d53073e..8c57ee0 100644
> +--- a/units/systemd-binfmt.service.in
> ++++ b/units/systemd-binfmt.service.in
> +@@ -11,6 +11,8 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5)
> Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
> DefaultDependencies=no
> Conflicts=shutdown.target
> @@ -69,3 +69,6 @@ Index: git/units/systemd-binfmt.service.in
> +
> +[Install]
> +WantedBy=sysinit.target
> +--
> +2.6.4
> +
> diff --git a/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
> similarity index 76%
> rename from meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch
> rename to meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
> index 8078da9..a2c40b5 100644
> --- a/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch
> +++ b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
> @@ -1,7 +1,7 @@
> -From 4e2e8dbf3f23ab7dca32286cc0f37bff6ac49e22 Mon Sep 17 00:00:00 2001
> +From d1fe5d2dd38cdef984296f453c65ccaebb71d1a9 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 04/11] configure: Check for additional features that uclibc
> +Subject: [PATCH 06/16] configure: Check for additional features that uclibc
> doesnt support
>
> This helps in supporting uclibc which does not have all features that
> @@ -14,11 +14,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> configure.ac | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> -Index: git/configure.ac
> -===================================================================
> ---- git.orig/configure.ac
> -+++ git/configure.ac
> -@@ -110,6 +110,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount], [/
> +diff --git a/configure.ac b/configure.ac
> +index 3128ca8..49f73a4 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -112,6 +112,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 ***])])
>
> @@ -43,3 +43,6 @@ Index: git/configure.ac
> M4_DEFINES=
>
> AC_CHECK_TOOL(OBJCOPY, objcopy)
> +--
> +2.6.4
> +
> diff --git a/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch b/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
> deleted file mode 100644
> index 631dd77..0000000
> --- a/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
> +++ /dev/null
> @@ -1,96 +0,0 @@
> -From 34a61b6c9eed3fad360066fb63132ebc7e0aaaa6 Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 20 Feb 2015 05:12:48 +0000
> -Subject: [PATCH 06/11] journal: Use posix fallocate only if available
> -
> -Some architecture ports in uclibc did not support it in past
> -
> -Upstream-Status: Denied [no desire for uclibc support]
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ----
> - src/journal/journal-file.c | 16 +++++++++++++++-
> - src/journal/journald-kmsg.c | 15 ++++++++++++++-
> - 2 files changed, 29 insertions(+), 2 deletions(-)
> -
> -diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
> -index 2845e05..9431171 100644
> ---- a/src/journal/journal-file.c
> -+++ b/src/journal/journal-file.c
> -@@ -36,6 +36,8 @@
> - #include "compress.h"
> - #include "fsprg.h"
> -
> -+#include "config.h"
> -+
> - #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
> - #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
> -
> -@@ -354,7 +356,7 @@ static int journal_file_fstat(JournalFile *f) {
> -
> - static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
> - uint64_t old_size, new_size;
> -- int r;
> -+ int r = 0;
> -
> - assert(f);
> -
> -@@ -418,9 +420,21 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
> - /* Note that the glibc fallocate() fallback is very
> - inefficient, hence we try to minimize the allocation area
> - as we can. */
> -+#ifdef HAVE_POSIX_FALLOCATE
> - r = posix_fallocate(f->fd, old_size, new_size - old_size);
> - if (r != 0)
> - return -r;
> -+#else
> -+ /* Write something every 512 bytes to make sure the block is allocated */
> -+ uint64_t len = new_size - old_size;
> -+ uint64_t offset = old_size;
> -+ for (offset += (len-1) % 512; len > 0; offset += 512) {
> -+ len -= 512;
> -+ if (pwrite(f->fd, "", 1, offset) != 1)
> -+ return -errno;
> -+ }
> -+
> -+#endif /* HAVE_POSIX_FALLOCATE */
> -
> - f->header->arena_size = htole64(new_size - le64toh(f->header->header_size));
> -
> -diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
> -index c4216c4..a998ed5 100644
> ---- a/src/journal/journald-kmsg.c
> -+++ b/src/journal/journald-kmsg.c
> -@@ -436,6 +436,7 @@ fail:
> - int server_open_kernel_seqnum(Server *s) {
> - _cleanup_close_ int fd;
> - uint64_t *p;
> -+ int r = 0;
> -
> - assert(s);
> -
> -@@ -449,7 +450,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);
> -+#endif /* HAVE_POSIX_FALLOCATE */
> -+ if (r < 0) {
> - log_error_errno(errno, "Failed to allocate sequential number file, ignoring: %m");
> - return 0;
> - }
> ---
> -2.1.4
> -
> diff --git a/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch
> similarity index 50%
> rename from meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch
> rename to meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch
> index 55a0088..85d3907 100644
> --- a/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch
> +++ b/meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch
> @@ -1,7 +1,7 @@
> -From a7417c2e6950d55c22c1b0d15783898b8ff229ef Mon Sep 17 00:00:00 2001
> +From 529e7e2f7f6a5dc0e4527ff5c2237b19ece2f112 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Fri, 20 Feb 2015 05:10:37 +0000
> -Subject: [PATCH 05/11] nspawn: Use execvpe only when libc supports it
> +Subject: [PATCH 07/16] nspawn: Use execvpe only when libc supports it
>
> Upstream-Status: Denied [no desire for uclibc support]
>
> @@ -10,29 +10,32 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> src/nspawn/nspawn.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> -Index: git/src/nspawn/nspawn.c
> -===================================================================
> ---- git.orig/src/nspawn/nspawn.c
> -+++ git/src/nspawn/nspawn.c
> -@@ -143,6 +143,8 @@ typedef struct CustomMount {
> - char **lower;
> - } CustomMount;
> +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
> +index a4e13bd..4def6ba 100644
> +--- a/src/nspawn/nspawn.c
> ++++ b/src/nspawn/nspawn.c
> +@@ -112,6 +112,8 @@ typedef enum LinkJournal {
> + LINK_GUEST
> + } LinkJournal;
>
> +#include "config.h"
> +
> static char *arg_directory = NULL;
> static char *arg_template = NULL;
> static char *arg_user = NULL;
> -@@ -4238,7 +4240,12 @@ static int inner_child(
> +@@ -2595,7 +2597,12 @@ static int inner_child(
> a[0] = (char*) "/sbin/init";
> execve(a[0], a, env_use);
> - } else if (argc > optind)
> + } else if (!strv_isempty(arg_parameters))
> +#ifdef HAVE_EXECVPE
> - execvpe(argv[optind], argv + optind, env_use);
> + execvpe(arg_parameters[0], arg_parameters, env_use);
> +#else
> + environ = env_use;
> -+ execvp(argv[optind], argv + optind);
> ++ execvp(arg_parameters[0], arg_parameters);
> +#endif /* HAVE_EXECVPE */
> else {
> - chdir(home ? home : "/root");
> + chdir(home ?: "/root");
> execle("/bin/bash", "-bash", NULL, env_use);
> +--
> +2.6.4
> +
> diff --git a/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
> deleted file mode 100644
> index b8ab7c4..0000000
> --- a/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -From f771407d3e0288ca0c06a894194d3ddad69b9a8e Mon Sep 17 00:00:00 2001
> -From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 20 Feb 2015 05:17:05 +0000
> -Subject: [PATCH 07/11] util: Use mkostemp only if libc supports it
> -
> -Upstream-Status: Denied [no desire for uclibc support]
> -
> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ----
> - src/basic/util.c | 8 ++++++++
> - 1 file changed, 8 insertions(+)
> -
> -diff --git a/src/basic/util.c b/src/basic/util.c
> -index dc65280..72f4665 100644
> ---- a/src/basic/util.c
> -+++ b/src/basic/util.c
> -@@ -97,6 +97,8 @@
> - #include "def.h"
> - #include "sparse-endian.h"
> -
> -+#include "config.h"
> -+
> - int saved_argc = 0;
> - char **saved_argv = NULL;
> -
> -@@ -6682,7 +6684,13 @@ int mkostemp_safe(char *pattern, int flags) {
> -
> - 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;
> -
> ---
> -2.1.4
> -
> diff --git a/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch b/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
> index 3f4d4de..8d71ecb 100644
> --- a/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
> +++ b/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
> @@ -1,7 +1,7 @@
> -From b45ea3bfd6635744c8a6b74d0ac701b44bb1d294 Mon Sep 17 00:00:00 2001
> +From 83944758dc0703afea81f3c7aa0ad926bc5df757 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 20 Feb 2015 05:19:37 +0000
> -Subject: [PATCH 08/11] util: bypass unimplemented _SC_PHYS_PAGES system
> +Date: Mon, 14 Dec 2015 00:47:53 +0000
> +Subject: [PATCH 08/16] util: bypass unimplemented _SC_PHYS_PAGES system
> configuration API on uclibc
>
> Upstream-Status: Inappropriate [uclibc-specific]
> @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> 1 file changed, 15 insertions(+)
>
> diff --git a/src/basic/util.c b/src/basic/util.c
> -index 72f4665..cbbe3b1 100644
> +index 9e0b576..65f0edf 100644
> --- a/src/basic/util.c
> +++ b/src/basic/util.c
> -@@ -6793,10 +6793,25 @@ uint64_t physical_memory(void) {
> +@@ -769,10 +769,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 */
>
> @@ -25,7 +25,7 @@ index 72f4665..cbbe3b1 100644
> + if (f == NULL)
> + return 0;
> + while (!feof(f) && fgets(line, sizeof(line)-1, f)) {
> -+ if (sscanf(line, "MemTotal: %l kB", &mem) == 1) {
> ++ if (sscanf(line, "MemTotal: %li kB", &mem) == 1) {
> + mem *= 1024;
> + break;
> + }
> @@ -40,7 +40,7 @@ index 72f4665..cbbe3b1 100644
> +#endif
> }
>
> - void hexdump(FILE *f, const void *p, size_t s) {
> + int update_reboot_param_file(const char *param) {
> --
> -2.1.4
> +2.6.4
>
> diff --git a/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch
> similarity index 75%
> rename from meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch
> rename to meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch
> index 68b45a9..a139684 100644
> --- a/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch
> +++ b/meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch
> @@ -1,7 +1,7 @@
> -From 5f8b9f2d276c0ddbcbf5423733a23f043d688009 Mon Sep 17 00:00:00 2001
> +From 81c3d92b5bc5786cbd93b1e5ed82884e8caf2254 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Sat, 5 Sep 2015 06:31:47 +0000
> -Subject: [PATCH] implment systemd-sysv-install for OE
> +Subject: [PATCH 09/16] implment systemd-sysv-install for OE
>
> Use update-rc.d for enabling/disabling and status command
> to check the status of the sysv service
> @@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> src/systemctl/systemd-sysv-install.SKELETON | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> -Index: git/src/systemctl/systemd-sysv-install.SKELETON
> -===================================================================
> ---- git.orig/src/systemctl/systemd-sysv-install.SKELETON
> -+++ git/src/systemctl/systemd-sysv-install.SKELETON
> +diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON
> +index a53a3e6..5d877b0 100755
> +--- a/src/systemctl/systemd-sysv-install.SKELETON
> ++++ b/src/systemctl/systemd-sysv-install.SKELETON
> @@ -30,17 +30,17 @@ case "$1" in
> enable)
> # call the command to enable SysV init script $NAME here
> @@ -38,3 +38,6 @@ Index: git/src/systemctl/systemd-sysv-install.SKELETON
> ;;
> *)
> usage ;;
> +--
> +2.6.4
> +
> diff --git a/meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch b/meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
> new file mode 100644
> index 0000000..8cec071
> --- /dev/null
> +++ b/meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
> @@ -0,0 +1,38 @@
> +From d4b7f9b771a538c2356c4c77461f3b4790043556 Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Mon, 14 Dec 2015 00:50:01 +0000
> +Subject: [PATCH 10/16] nss-mymachines: Build conditionally when
> + HAVE_MYHOSTNAME is set
> +
> +Fixes build failures when building with --disable-myhostname
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> +---
> + Makefile.am | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 4c1143a..cf559be 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -4961,6 +4961,7 @@ SYSTEM_UNIT_ALIASES += \
> + BUSNAMES_TARGET_WANTS += \
> + org.freedesktop.machine1.busname
> +
> ++if HAVE_MYHOSTNAME
> + libnss_mymachines_la_SOURCES = \
> + src/nss-mymachines/nss-mymachines.sym \
> + src/nss-mymachines/nss-mymachines.c
> +@@ -4981,6 +4982,7 @@ lib_LTLIBRARIES += \
> + libnss_mymachines.la
> +
> + endif
> ++endif
> +
> + polkitpolicy_in_files += \
> + src/machine/org.freedesktop.machine1.policy.in
> +--
> +2.6.4
> +
> diff --git a/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch
> similarity index 90%
> rename from meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch
> rename to meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch
> index 8975b05..03fdbff 100644
> --- a/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch
> +++ b/meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch
> @@ -1,7 +1,7 @@
> -From f77b7e5626e70c3a775e993816a33af5a61dea42 Mon Sep 17 00:00:00 2001
> +From ae6c9dcb00919e1dd2793fd1b82125d123f69a90 Mon Sep 17 00:00:00 2001
> From: Patrick Ohly <patrick.ohly@intel.com>
> Date: Wed, 16 Sep 2015 13:55:58 +0200
> -Subject: [PATCH] rules: whitelist hd* devices
> +Subject: [PATCH 11/16] rules: whitelist hd* devices
>
> qemu by default emulates IDE and the linux-yocto kernel(s) use
> CONFIG_IDE instead of the more modern libsata, so disks appear as
> @@ -28,5 +28,5 @@ index 0b14bb4..1c4d97a 100644
> # ignore partitions that span the entire disk
> TEST=="whole_disk", GOTO="persistent_storage_end"
> --
> -2.1.4
> +2.6.4
>
> diff --git a/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch b/meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch
> similarity index 77%
> rename from meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch
> rename to meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch
> index 9ea3e83..82feff0 100644
> --- a/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch
> +++ b/meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch
> @@ -1,7 +1,7 @@
> -From 8791b5b3934c55694872b6915a67340683ead91b Mon Sep 17 00:00:00 2001
> +From 9e6c907ff1f17deb96c66a607653db4c7da34289 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 20 Feb 2015 05:22:52 +0000
> -Subject: [PATCH 09/11] sysv-generator: add support for executing scripts under
> +Date: Mon, 14 Dec 2015 05:09:53 +0000
> +Subject: [PATCH 12/16] sysv-generator: add support for executing scripts under
> /etc/rcS.d/
>
> To be compatible, all services translated from scripts under /etc/rcS.d would
> @@ -12,14 +12,14 @@ Upstream-Status: Inappropriate [OE specific]
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> - src/sysv-generator/sysv-generator.c | 50 ++++++++++++++++++++++++++++---------
> - 1 file changed, 38 insertions(+), 12 deletions(-)
> + src/sysv-generator/sysv-generator.c | 50 +++++++++++++++++++++++++++++--------
> + 1 file changed, 39 insertions(+), 11 deletions(-)
>
> diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
> -index bd67f32..6756cc6 100644
> +index 5075548..32d3687 100644
> --- a/src/sysv-generator/sysv-generator.c
> +++ b/src/sysv-generator/sysv-generator.c
> -@@ -42,7 +42,8 @@
> +@@ -46,7 +46,8 @@
>
> typedef enum RunlevelType {
> RUNLEVEL_UP,
> @@ -29,7 +29,7 @@ index bd67f32..6756cc6 100644
> } RunlevelType;
>
> static const struct {
> -@@ -57,6 +58,9 @@ static const struct {
> +@@ -61,6 +62,9 @@ static const struct {
> { "rc4.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
> { "rc5.d", SPECIAL_GRAPHICAL_TARGET, RUNLEVEL_UP },
>
> @@ -39,7 +39,7 @@ index bd67f32..6756cc6 100644
> /* Standard SysV runlevels for shutdown */
> { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN },
> { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN }
> -@@ -65,7 +69,7 @@ static const struct {
> +@@ -69,7 +73,7 @@ static const struct {
> directories in this order, and we want to make sure that
> sysv_start_priority is known when we first load the
> unit. And that value we only know from S links. Hence
> @@ -47,19 +47,19 @@ index bd67f32..6756cc6 100644
> + UP/SYSINIT must be read before DOWN */
> };
>
> - typedef struct SysvStub {
> -@@ -81,6 +85,8 @@ typedef struct SysvStub {
> - char **conflicts;
> + const char *arg_dest = "/tmp";
> +@@ -88,6 +92,8 @@ typedef struct SysvStub {
> bool has_lsb;
> bool reload;
> + bool loaded;
> + bool default_dependencies;
> + bool from_rcsd;
> } SysvStub;
>
> - const char *arg_dest = "/tmp";
> -@@ -183,6 +189,9 @@ static int generate_unit_file(SysvStub *s) {
> - "Description=%s\n",
> - s->path, s->description);
> + static void free_sysvstub(SysvStub *s) {
> +@@ -204,6 +210,9 @@ static int generate_unit_file(SysvStub *s) {
> + if (s->description)
> + fprintf(f, "Description=%s\n", s->description);
>
> + if (!s->default_dependencies)
> + fprintf(f, "DefaultDependencies=no\n");
> @@ -67,7 +67,7 @@ index bd67f32..6756cc6 100644
> if (!isempty(before))
> fprintf(f, "Before=%s\n", before);
> if (!isempty(after))
> -@@ -704,18 +713,30 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
> +@@ -722,17 +731,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
> if (s->has_lsb && other->has_lsb)
> continue;
>
> @@ -79,15 +79,14 @@ index bd67f32..6756cc6 100644
> + r = strv_extend(&s->before, other->name);
> if (r < 0)
> return log_oom();
> -- }
> -- else if (other->sysv_start_priority > s->sysv_start_priority) {
> +
> +- } else if (other->sysv_start_priority > s->sysv_start_priority) {
> - r = strv_extend(&s->before, other->name);
> + } else if (other->from_rcsd && !s->from_rcsd) {
> + r = strv_extend(&s->after, other->name);
> if (r < 0)
> return log_oom();
> -- }
> -- else
> +- } else
> - continue;
> + } else {
> + if (other->sysv_start_priority < s->sysv_start_priority) {
> @@ -102,11 +101,11 @@ index bd67f32..6756cc6 100644
> + }
> + else
> + continue;
> -+ }
> ++ }
>
> /* FIXME: Maybe we should compare the name here lexicographically? */
> }
> -@@ -778,6 +799,8 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
> +@@ -799,6 +822,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) {
> return log_oom();
>
> service->sysv_start_priority = -1;
> @@ -114,22 +113,23 @@ index bd67f32..6756cc6 100644
> + service->from_rcsd = false;
> service->name = name;
> service->path = fpath;
> -
> -@@ -864,9 +887,11 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
> + name = fpath = NULL;
> +@@ -882,9 +907,11 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic
>
> if (de->d_name[0] == 'S') {
>
> -- if (rcnd_table[i].type == RUNLEVEL_UP) {
> +- if (rcnd_table[i].type == RUNLEVEL_UP)
> + if (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT) {
> - service->sysv_start_priority =
> - MAX(a*10 + b, service->sysv_start_priority);
> + service->sysv_start_priority = MAX(a*10 + b, service->sysv_start_priority);
> +-
> + service->default_dependencies = (rcnd_table[i].type == RUNLEVEL_SYSINIT)?false:true;
> + service->from_rcsd = (rcnd_table[i].type == RUNLEVEL_SYSINIT)?true:false;
> - }
> -
> ++ }
> r = set_ensure_allocated(&runlevel_services[i], NULL);
> -@@ -878,7 +903,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
> - goto finish;
> + if (r < 0) {
> + log_oom();
> +@@ -898,7 +925,8 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic
> + }
>
> } else if (de->d_name[0] == 'K' &&
> - (rcnd_table[i].type == RUNLEVEL_DOWN)) {
> @@ -137,7 +137,7 @@ index bd67f32..6756cc6 100644
> + rcnd_table[i].type == RUNLEVEL_SYSINIT)) {
>
> r = set_ensure_allocated(&shutdown_services, NULL);
> - if (r < 0)
> + if (r < 0) {
> --
> -2.1.4
> +2.6.4
>
> diff --git a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
> similarity index 64%
> rename from meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
> rename to meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
> index ed7ff5b..ea0b3e2 100644
> --- a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
> +++ b/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
> @@ -1,7 +1,7 @@
> -From 3dc731c1d270e2e143de621db9bd898299fd849d Mon Sep 17 00:00:00 2001
> +From 1ba00ff6ed3f0626892f57cdd8d9788692c7bf14 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> -Date: Fri, 20 Feb 2015 05:24:49 +0000
> -Subject: [PATCH 10/11] Make root's home directory configurable
> +Date: Mon, 14 Dec 2015 05:18:20 +0000
> +Subject: [PATCH 13/16] Make root's home directory configurable
>
> OpenEmbedded has a configurable home directory for root. Allow
> systemd to be built using its idea of what root's home directory
> @@ -17,19 +17,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> Makefile.am | 2 ++
> configure.ac | 7 +++++++
> - src/core/unit-printf.c | 2 +-
> + src/basic/user-util.c | 4 ++--
> + src/core/namespace.c | 2 +-
> src/nspawn/nspawn.c | 4 ++--
> - src/basic/util.c | 4 ++--
> units/console-shell.service.m4.in | 4 ++--
> units/emergency.service.in | 4 ++--
> units/rescue.service.in | 4 ++--
> 8 files changed, 20 insertions(+), 11 deletions(-)
>
> -Index: git/Makefile.am
> -===================================================================
> ---- git.orig/Makefile.am
> -+++ git/Makefile.am
> -@@ -208,6 +208,7 @@ AM_CPPFLAGS = \
> +diff --git a/Makefile.am b/Makefile.am
> +index cf559be..a511c3d 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -210,6 +210,7 @@ AM_CPPFLAGS = \
> -DLIBDIR=\"$(libdir)\" \
> -DROOTLIBDIR=\"$(rootlibdir)\" \
> -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
> @@ -37,7 +37,7 @@ Index: git/Makefile.am
> -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
> -I $(top_srcdir)/src \
> -I $(top_builddir)/src/basic \
> -@@ -5615,6 +5616,7 @@ EXTRA_DIST += \
> +@@ -5876,6 +5877,7 @@ EXTRA_DIST += \
> substitutions = \
> '|rootlibexecdir=$(rootlibexecdir)|' \
> '|rootbindir=$(rootbindir)|' \
> @@ -45,11 +45,11 @@ Index: git/Makefile.am
> '|bindir=$(bindir)|' \
> '|SYSTEMCTL=$(rootbindir)/systemctl|' \
> '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
> -Index: git/configure.ac
> -===================================================================
> ---- git.orig/configure.ac
> -+++ git/configure.ac
> -@@ -1383,6 +1383,11 @@ AC_ARG_WITH([rootlibdir],
> +diff --git a/configure.ac b/configure.ac
> +index 49f73a4..a3e639d 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -1434,6 +1434,11 @@ AC_ARG_WITH([rootlibdir],
> [with_rootlibdir=${libdir}])
> AX_NORMALIZE_PATH([with_rootlibdir])
>
> @@ -61,7 +61,7 @@ Index: git/configure.ac
> AC_ARG_WITH([pamlibdir],
> AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
> [],
> -@@ -1474,6 +1479,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
> +@@ -1517,6 +1522,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
> AC_SUBST([pamconfdir], [$with_pamconfdir])
> AC_SUBST([rootprefix], [$with_rootprefix])
> AC_SUBST([rootlibdir], [$with_rootlibdir])
> @@ -69,7 +69,7 @@ Index: git/configure.ac
>
> AC_CONFIG_FILES([
> Makefile
> -@@ -1563,6 +1569,7 @@ AC_MSG_RESULT([
> +@@ -1606,6 +1612,7 @@ AC_MSG_RESULT([
> includedir: ${includedir}
> lib dir: ${libdir}
> rootlib dir: ${with_rootlibdir}
> @@ -77,46 +77,11 @@ Index: git/configure.ac
> SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
> SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
> Build Python: ${PYTHON}
> -Index: git/src/core/unit-printf.c
> -===================================================================
> ---- git.orig/src/core/unit-printf.c
> -+++ git/src/core/unit-printf.c
> -@@ -237,7 +237,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 -EOPNOTSUPP;
> -
> -Index: git/src/nspawn/nspawn.c
> -===================================================================
> ---- git.orig/src/nspawn/nspawn.c
> -+++ git/src/nspawn/nspawn.c
> -@@ -4176,7 +4176,7 @@ static int inner_child(
> - if (envp[n_env])
> - n_env ++;
> -
> -- 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))
> - return log_oom();
> -@@ -4247,7 +4247,7 @@ static int inner_child(
> - 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);
> - }
> -Index: git/src/basic/util.c
> -===================================================================
> ---- git.orig/src/basic/util.c
> -+++ git/src/basic/util.c
> -@@ -3233,7 +3233,7 @@ int get_user_creds(
> +diff --git a/src/basic/user-util.c b/src/basic/user-util.c
> +index 56e1a3b..c3d0ec3 100644
> +--- a/src/basic/user-util.c
> ++++ b/src/basic/user-util.c
> +@@ -124,7 +124,7 @@ int get_user_creds(
> *gid = 0;
>
> if (home)
> @@ -125,7 +90,7 @@ Index: git/src/basic/util.c
>
> if (shell)
> *shell = "/bin/sh";
> -@@ -4069,7 +4069,7 @@ int get_home_dir(char **_h) {
> +@@ -355,7 +355,7 @@ int get_home_dir(char **_h) {
> /* Hardcode home directory for root to avoid NSS */
> u = getuid();
> if (u == 0) {
> @@ -134,10 +99,45 @@ Index: git/src/basic/util.c
> if (!h)
> return -ENOMEM;
>
> -Index: git/units/console-shell.service.m4.in
> -===================================================================
> ---- git.orig/units/console-shell.service.m4.in
> -+++ git/units/console-shell.service.m4.in
> +diff --git a/src/core/namespace.c b/src/core/namespace.c
> +index 81ba09e..1a1f276 100644
> +--- a/src/core/namespace.c
> ++++ b/src/core/namespace.c
> +@@ -494,7 +494,7 @@ int setup_namespace(
> + home_dir = strjoina("-", home_dir);
> + run_user_dir = prefix_roota(root_directory, "/run/user");
> + run_user_dir = strjoina("-", run_user_dir);
> +- root_dir = prefix_roota(root_directory, "/root");
> ++ root_dir = prefix_roota(root_directory, ROOTHOMEDIR);
> + root_dir = strjoina("-", root_dir);
> +
> + r = append_mounts(&m, STRV_MAKE(home_dir, run_user_dir, root_dir),
> +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
> +index 4def6ba..2081953 100644
> +--- a/src/nspawn/nspawn.c
> ++++ b/src/nspawn/nspawn.c
> +@@ -2530,7 +2530,7 @@ static int inner_child(
> + if (envp[n_env])
> + n_env ++;
> +
> +- 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))
> + return log_oom();
> +@@ -2604,7 +2604,7 @@ static int inner_child(
> + execvp(arg_parameters[0], arg_parameters);
> + #endif /* HAVE_EXECVPE */
> + else {
> +- chdir(home ?: "/root");
> ++ chdir(home ?: ROOTHOMEDIR);
> + execle("/bin/bash", "-bash", NULL, env_use);
> + execle("/bin/sh", "-sh", NULL, env_use);
> + }
> +diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
> +index 5c80722..efde5f0 100644
> +--- a/units/console-shell.service.m4.in
> ++++ b/units/console-shell.service.m4.in
> @@ -15,8 +15,8 @@ After=rc-local.service
> Before=getty.target
>
> @@ -149,10 +149,10 @@ Index: git/units/console-shell.service.m4.in
> ExecStart=-@SULOGIN@
> ExecStopPost=-@SYSTEMCTL@ poweroff
> Type=idle
> -Index: git/units/emergency.service.in
> -===================================================================
> ---- git.orig/units/emergency.service.in
> -+++ git/units/emergency.service.in
> +diff --git a/units/emergency.service.in b/units/emergency.service.in
> +index 8dc3cbd..eb046c2 100644
> +--- a/units/emergency.service.in
> ++++ b/units/emergency.service.in
> @@ -14,8 +14,8 @@ Conflicts=rescue.service
> Before=shutdown.target
>
> @@ -164,11 +164,11 @@ Index: git/units/emergency.service.in
> ExecStartPre=-/bin/plymouth --wait 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" or ^D to\\ntry again to boot into default mode.'
> ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=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
> +diff --git a/units/rescue.service.in b/units/rescue.service.in
> +index 432e4f3..afa3e82 100644
> +--- a/units/rescue.service.in
> ++++ b/units/rescue.service.in
> +@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.service
> Before=shutdown.target
>
> [Service]
> @@ -179,3 +179,6 @@ Index: git/units/rescue.service.in
> 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" or ^D to\\nboot into default mode.'
> ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
> +--
> +2.6.4
> +
> diff --git a/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch b/meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch
> similarity index 54%
> rename from meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch
> rename to meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch
> index e562bca..11be097 100644
> --- a/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch
> +++ b/meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch
> @@ -1,7 +1,7 @@
> -From 7e202f71785bf5a67c8a4f6b58d3585608fbfdc4 Mon Sep 17 00:00:00 2001
> +From 548a8d5d456c531444498b3ce8cec3f3dd374cf8 Mon Sep 17 00:00:00 2001
> From: Khem Raj <raj.khem@gmail.com>
> Date: Fri, 20 Feb 2015 05:26:25 +0000
> -Subject: [PATCH 11/11] systemd-user: avoid using system-auth
> +Subject: [PATCH 14/16] 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.
> @@ -11,21 +11,26 @@ Upstream-Status: Inappropriate [oe specific]
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> - src/login/systemd-user | 4 ++--
> + src/login/systemd-user.m4 | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> -diff --git a/src/login/systemd-user b/src/login/systemd-user
> -index 8112d74..99635af 100644
> ---- a/src/login/systemd-user
> -+++ b/src/login/systemd-user
> -@@ -2,5 +2,5 @@
> +diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
> +index 7933508..16b73d2 100644
> +--- a/src/login/systemd-user.m4
> ++++ b/src/login/systemd-user.m4
> +@@ -2,10 +2,10 @@
> #
> # Used by systemd --user instances.
>
> -account include system-auth
> --session include system-auth
> +account include common-account
> +
> + m4_ifdef(`HAVE_SELINUX',
> + session required pam_selinux.so close
> + session required pam_selinux.so nottys open
> + )m4_dnl
> +-session include system-auth
> +session include common-session
> --
> -2.1.4
> +2.6.4
>
> diff --git a/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch b/meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch
> similarity index 83%
> rename from meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
> rename to meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch
> index fe2ba53..7cc3922 100644
> --- a/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
> +++ b/meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch
> @@ -1,7 +1,7 @@
> -From 4f0a722489154da99e7f6b3051afde984eed2f74 Mon Sep 17 00:00:00 2001
> +From 6b2b8d20f884bd5a3d928175e422023f6c9d056b Mon Sep 17 00:00:00 2001
> From: Jonathan Liu <net147@gmail.com>
> Date: Thu, 19 Mar 2015 15:01:29 +1100
> -Subject: [PATCH] Revert "rules: remove firmware loading rules"
> +Subject: [PATCH 15/16] Revert "rules: remove firmware loading rules"
>
> This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19.
> Userspace firmware loading support is needed for Linux < 3.7.
> @@ -24,5 +24,5 @@ index 0000000..f0ae684
> +
> +SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware"
> --
> -2.3.3
> +2.6.4
>
> diff --git a/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
> similarity index 79%
> rename from meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
> rename to meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
> index 6308cc7..03ab0d4 100644
> --- a/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
> +++ b/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
> @@ -1,7 +1,8 @@
> -From 7f074def4e32045353ba4336d703e17b8de7ec4e Mon Sep 17 00:00:00 2001
> -From: Jonathan Liu <net147@gmail.com>
> -Date: Thu, 19 Mar 2015 15:01:33 +1100
> -Subject: [PATCH] Revert "udev: remove userspace firmware loading support"
> +From d3661ec7fb4557c47f001986cbb8a684b8dbae4a Mon Sep 17 00:00:00 2001
> +From: Khem Raj <raj.khem@gmail.com>
> +Date: Mon, 14 Dec 2015 05:33:32 +0000
> +Subject: [PATCH 16/16] Revert "udev: remove userspace firmware loading
> + support"
>
> This reverts commit be2ea723b1d023b3d385d3b791ee4607cbfb20ca.
> Userspace firmware loading support is needed for Linux < 3.7.
> @@ -9,23 +10,24 @@ Userspace firmware loading support is needed for Linux < 3.7.
> Upstream-Status: Inappropriate [OE specific]
>
> Signed-off-by: Jonathan Liu <net147@gmail.com>
> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> Makefile.am | 12 +++
> - README | 9 ++-
> + README | 6 +-
> TODO | 1 +
> - configure.ac | 20 +++++
> + configure.ac | 25 +++++++
> src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++
> src/udev/udev-builtin.c | 3 +
> src/udev/udev.h | 6 ++
> src/udev/udevd.c | 13 ++++
> - 8 files changed, 214 insertions(+), 4 deletions(-)
> + 8 files changed, 217 insertions(+), 3 deletions(-)
> create mode 100644 src/udev/udev-builtin-firmware.c
>
> -Index: git/Makefile.am
> -===================================================================
> ---- git.orig/Makefile.am
> -+++ git/Makefile.am
> -@@ -3470,6 +3470,18 @@ libudev_core_la_LIBADD = \
> +diff --git a/Makefile.am b/Makefile.am
> +index a511c3d..6181e55 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -3650,6 +3650,18 @@ libudev_core_la_LIBADD = \
> $(BLKID_LIBS) \
> $(KMOD_LIBS)
>
> @@ -44,21 +46,11 @@ Index: git/Makefile.am
> if HAVE_KMOD
> libudev_core_la_SOURCES += \
> src/udev/udev-builtin-kmod.c
> -Index: git/README
> -===================================================================
> ---- git.orig/README
> -+++ git/README
> -@@ -36,7 +36,8 @@ LICENSE:
> - - except src/udev/* which is (currently still) GPLv2, GPLv2+
> -
> - REQUIREMENTS:
> -- Linux kernel >= 3.7
> -+ Linux kernel >= 3.0
> -+ Linux kernel >= 3.3 for loop device partition support features with nspawn
> - Linux kernel >= 3.8 for Smack support
> -
> - Kernel Config Options:
> -@@ -51,14 +52,14 @@ REQUIREMENTS:
> +diff --git a/README b/README
> +index bf67f8c..87b6f70 100644
> +--- a/README
> ++++ b/README
> +@@ -51,14 +51,14 @@ REQUIREMENTS:
> CONFIG_PROC_FS
> CONFIG_FHANDLE (libudev, mount and bind mount handling)
>
> @@ -76,24 +68,24 @@ Index: git/README
> CONFIG_FW_LOADER_USER_HELPER=n
>
> Some udev rules and virtualization detection relies on it:
> -Index: git/TODO
> -===================================================================
> ---- git.orig/TODO
> -+++ git/TODO
> -@@ -754,6 +754,7 @@ Features:
> - * ExecOnFailure=/usr/bin/foo
> +diff --git a/TODO b/TODO
> +index 369805f..ce97674 100644
> +--- a/TODO
> ++++ b/TODO
> +@@ -635,6 +635,7 @@ Features:
> + * rename "userspace" to "core-os"
>
> * udev:
> + - remove src/udev/udev-builtin-firmware.c (CONFIG_FW_LOADER_USER_HELPER=n)
> - move to LGPL
> - kill scsi_id
> - add trigger --subsystem-match=usb/usb_device device
> -Index: git/configure.ac
> -===================================================================
> ---- git.orig/configure.ac
> -+++ git/configure.ac
> -@@ -1268,6 +1268,26 @@ fi
> - AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
> +diff --git a/configure.ac b/configure.ac
> +index a3e639d..00736f5 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -1317,6 +1317,25 @@ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database
> + AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
>
> # ------------------------------------------------------------------------------
> +AC_ARG_WITH(firmware-path,
> @@ -114,23 +106,28 @@ Index: git/configure.ac
> +AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])
> +AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
> +
> -+
> +# ------------------------------------------------------------------------------
> - AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database support])],
> - enable_hwdb=$enableval, enable_hwdb=yes)
> - AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
> -@@ -1574,6 +1594,7 @@ AC_MSG_RESULT([
> + have_manpages=no
> + AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
> + AS_IF([test "x$enable_manpages" != xno], [
> +@@ -1616,6 +1635,12 @@ AC_MSG_RESULT([
> + SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
> SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
> Build Python: ${PYTHON}
> - sphinx binary: ${SPHINX_BUILD}
> ++<<<<<<< HEAD
> ++=======
> ++ Installation Python: ${PYTHON_BINARY}
> ++ sphinx binary: ${SPHINX_BUILD}
> + firmware path: ${FIRMWARE_PATH}
> ++>>>>>>> parent of be2ea72... udev: remove userspace firmware loading support
> PAM modules dir: ${with_pamlibdir}
> PAM configuration dir: ${with_pamconfdir}
> D-Bus policy dir: ${with_dbuspolicydir}
> -Index: git/src/udev/udev-builtin-firmware.c
> -===================================================================
> +diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
> +new file mode 100644
> +index 0000000..bd8c2fb
> --- /dev/null
> -+++ git/src/udev/udev-builtin-firmware.c
> ++++ b/src/udev/udev-builtin-firmware.c
> @@ -0,0 +1,154 @@
> +/*
> + * firmware - Kernel firmware loader
> @@ -286,11 +283,11 @@ Index: git/src/udev/udev-builtin-firmware.c
> + .help = "kernel firmware loader",
> + .run_once = true,
> +};
> -Index: git/src/udev/udev-builtin.c
> -===================================================================
> ---- git.orig/src/udev/udev-builtin.c
> -+++ git/src/udev/udev-builtin.c
> -@@ -30,6 +30,9 @@ static const struct udev_builtin *builti
> +diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
> +index 18fb661..d0280bf 100644
> +--- a/src/udev/udev-builtin.c
> ++++ b/src/udev/udev-builtin.c
> +@@ -33,6 +33,9 @@ static const struct udev_builtin *builtins[] = {
> [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
> #endif
> [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
> @@ -300,11 +297,11 @@ Index: git/src/udev/udev-builtin.c
> [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
> [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
> [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
> -Index: git/src/udev/udev.h
> -===================================================================
> ---- git.orig/src/udev/udev.h
> -+++ git/src/udev/udev.h
> -@@ -146,6 +146,9 @@ enum udev_builtin_cmd {
> +diff --git a/src/udev/udev.h b/src/udev/udev.h
> +index 4f40020..8f3560f 100644
> +--- a/src/udev/udev.h
> ++++ b/src/udev/udev.h
> +@@ -149,6 +149,9 @@ enum udev_builtin_cmd {
> UDEV_BUILTIN_BLKID,
> #endif
> UDEV_BUILTIN_BTRFS,
> @@ -314,7 +311,7 @@ Index: git/src/udev/udev.h
> UDEV_BUILTIN_HWDB,
> UDEV_BUILTIN_INPUT_ID,
> UDEV_BUILTIN_KEYBOARD,
> -@@ -174,6 +177,9 @@ struct udev_builtin {
> +@@ -177,6 +180,9 @@ struct udev_builtin {
> extern const struct udev_builtin udev_builtin_blkid;
> #endif
> extern const struct udev_builtin udev_builtin_btrfs;
> @@ -324,11 +321,11 @@ Index: git/src/udev/udev.h
> extern const struct udev_builtin udev_builtin_hwdb;
> extern const struct udev_builtin udev_builtin_input_id;
> extern const struct udev_builtin udev_builtin_keyboard;
> -Index: git/src/udev/udevd.c
> -===================================================================
> ---- git.orig/src/udev/udevd.c
> -+++ git/src/udev/udevd.c
> -@@ -116,6 +116,9 @@ struct event {
> +diff --git a/src/udev/udevd.c b/src/udev/udevd.c
> +index 366e7fb..7ca1b51 100644
> +--- a/src/udev/udevd.c
> ++++ b/src/udev/udevd.c
> +@@ -127,6 +127,9 @@ struct event {
> bool is_block;
> sd_event_source *timeout_warning;
> sd_event_source *timeout;
> @@ -338,7 +335,7 @@ Index: git/src/udev/udevd.c
> };
>
> static inline struct event *node_to_event(struct udev_list_node *node) {
> -@@ -607,6 +610,10 @@ static int event_queue_insert(Manager *m
> +@@ -615,6 +618,10 @@ static int event_queue_insert(Manager *manager, struct udev_device *dev) {
> event->devnum = udev_device_get_devnum(dev);
> event->is_block = streq("block", udev_device_get_subsystem(dev));
> event->ifindex = udev_device_get_ifindex(dev);
> @@ -349,7 +346,7 @@ Index: git/src/udev/udevd.c
>
> log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev),
> udev_device_get_action(dev), udev_device_get_subsystem(dev));
> -@@ -692,6 +699,12 @@ static bool is_devpath_busy(Manager *man
> +@@ -700,6 +707,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) {
> return true;
> }
>
> @@ -362,3 +359,6 @@ Index: git/src/udev/udevd.c
> /* parent device event found */
> if (event->devpath[common] == '/') {
> event->delaying_seqnum = loop_event->seqnum;
> +--
> +2.6.4
> +
> diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_228.bb
> similarity index 93%
> rename from meta/recipes-core/systemd/systemd_225.bb
> rename to meta/recipes-core/systemd/systemd_228.bb
> index 428158a..551a82f 100644
> --- a/meta/recipes-core/systemd/systemd_225.bb
> +++ b/meta/recipes-core/systemd/systemd_228.bb
> @@ -24,39 +24,38 @@ SECTION = "base/shell"
>
> inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext
>
> -SRCREV = "e1439a1472c5f691733b8ef10e702beac2496a63"
> +SRCREV = "dd050decb6ad131ebdeabb71c4f9ecb4733269c0"
>
> -PV = "225+git${SRCPV}"
> +PV = "228+git${SRCPV}"
>
> SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
> - 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://0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
> + file://0006-configure-Check-for-additional-features-that-uclibc-.patch \
> + file://0007-nspawn-Use-execvpe-only-when-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://0012-implment-systemd-sysv-install-for-OE.patch \
> - file://0014-Revert-rules-remove-firmware-loading-rules.patch \
> - file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
> + file://0009-implment-systemd-sysv-install-for-OE.patch \
> + file://0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch \
> + file://0011-rules-whitelist-hd-devices.patch \
> + file://0012-sysv-generator-add-support-for-executing-scripts-und.patch \
> + file://0013-Make-root-s-home-directory-configurable.patch \
> + file://0014-systemd-user-avoid-using-system-auth.patch \
> + file://0015-Revert-rules-remove-firmware-loading-rules.patch \
> + file://0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
> file://touchscreen.rules \
> file://00-create-volatile.conf \
> file://init \
> file://run-ptest \
> - file://rules-whitelist-hd-devices.patch \
> "
> -SRC_URI_append_qemuall = " file://qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch"
> +SRC_URI_append_libc-uclibc = "\
> + file://0001-define-exp10-if-missing.patch \
> + file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \
> + file://0003-Use-getenv-when-secure-versions-are-not-available.patch \
> + "
> +SRC_URI_append_qemuall = " file://0004-core-device.c-Change-the-default-device-timeout-to-2.patch "
>
> S = "${WORKDIR}/git"
>
> -SRC_URI_append_libc-uclibc = "\
> - file://0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch \
> - file://0022-Use-getenv-when-secure-versions-are-not-available.patch \
> - file://0001-fix-build-on-uClibc-exp10.patch \
> - "
> -LDFLAGS_append_libc-uclibc = " -lrt"
> +LDFLAGS_append_libc-uclibc = " -lrt -lssp_nonshared -lssp "
>
> GTKDOC_DOCDIR = "${S}/docs/"
>
> @@ -65,7 +64,6 @@ PACKAGECONFIG ??= "xz ldconfig \
> ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
> ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
> "
> -
> PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl"
> # Sign the journal for anti-tampering
> PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
> @@ -127,7 +125,7 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
> --with-firmware-path=/lib/firmware \
> "
> # uclibc does not have NSS
> -EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "
> +EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname --disable-sysusers"
>
> # per the systemd README, define VALGRIND=1 to run under valgrind
> CFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '', d)}"
> --
> 2.6.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH 5/6] systemd: Upgrade to 228
2015-12-17 20:30 ` Andre McCurdy
@ 2015-12-17 20:42 ` Burton, Ross
2015-12-17 20:47 ` Andre McCurdy
2015-12-17 20:55 ` Khem Raj
1 sibling, 1 reply; 17+ messages in thread
From: Burton, Ross @ 2015-12-17 20:42 UTC (permalink / raw)
To: Andre McCurdy; +Cc: OE Core mailing list
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
On 17 December 2015 at 20:30, Andre McCurdy <armccurdy@gmail.com> wrote:
> It looks like you have some unresolved merge conflict markers in
> 0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch ?
>
0016, but yes, well spotted. Clearly nobody - myself included - reads the
logs. This just made it into master so I'll send a fix shortly.
Ross
[-- Attachment #2: Type: text/html, Size: 847 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 5/6] systemd: Upgrade to 228
2015-12-17 20:42 ` Burton, Ross
@ 2015-12-17 20:47 ` Andre McCurdy
0 siblings, 0 replies; 17+ messages in thread
From: Andre McCurdy @ 2015-12-17 20:47 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE Core mailing list
On Thu, Dec 17, 2015 at 12:42 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 17 December 2015 at 20:30, Andre McCurdy <armccurdy@gmail.com> wrote:
>>
>> It looks like you have some unresolved merge conflict markers in
>> 0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch ?
>
> 0016, but yes, well spotted. Clearly nobody - myself included - reads the
> logs. This just made it into master so I'll send a fix shortly.
Yes, I meant 0016, was just drafting an email to mention that!
I was also going to mention that the conflict markers are in the
manpages section of configure.ac, so probably got past sanity build
testing etc because by default manpages are not enabled.
> Ross
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH 5/6] systemd: Upgrade to 228
2015-12-17 20:30 ` Andre McCurdy
2015-12-17 20:42 ` Burton, Ross
@ 2015-12-17 20:55 ` Khem Raj
2015-12-17 20:57 ` Burton, Ross
1 sibling, 1 reply; 17+ messages in thread
From: Khem Raj @ 2015-12-17 20:55 UTC (permalink / raw)
To: Andre McCurdy; +Cc: OE Core mailing list
[-- Attachment #1: Type: text/plain, Size: 74662 bytes --]
> On Dec 17, 2015, at 12:30 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
>
> On Sun, Dec 13, 2015 at 10:23 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> Forward port all patches and format them to be git am'able
>> Drop patches specific to uclibc's missing features which now
>> are there in uclibc-ng
>
> It looks like you have some unresolved merge conflict markers in
> 0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch ?
Ugh yes. but they are harmless fortunately. I will send a refresh update to fix it
>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> .../systemd/0001-define-exp10-if-missing.patch | 33 +++++
>> .../systemd/0001-fix-build-on-uClibc-exp10.patch | 22 ---
>> ...-getty-to-agetty-in-console-setup-system.patch} | 6 +-
>> ...v-when-secure-versions-are-not-available.patch} | 11 +-
>> ...c-Change-the-default-device-timeout-to-2.patch} | 22 +--
>> ...-install-dependency-links-at-install-tim.patch} | 35 ++---
>> ...eck-for-additional-features-that-uclibc-.patch} | 17 ++-
>> ...nal-Use-posix-fallocate-only-if-available.patch | 96 --------------
>> ...n-Use-execvpe-only-when-libc-supports-it.patch} | 31 +++--
>> ...til-Use-mkostemp-only-if-libc-supports-it.patch | 42 ------
>> ...-unimplemented-_SC_PHYS_PAGES-system-conf.patch | 16 +--
>> ...009-implment-systemd-sysv-install-for-OE.patch} | 15 ++-
>> ...nes-Build-conditionally-when-HAVE_MYHOSTN.patch | 38 ++++++
>> ...patch => 0011-rules-whitelist-hd-devices.patch} | 6 +-
>> ...or-add-support-for-executing-scripts-und.patch} | 68 +++++-----
>> ...-Make-root-s-home-directory-configurable.patch} | 147 +++++++++++----------
>> ...014-systemd-user-avoid-using-system-auth.patch} | 25 ++--
>> ...vert-rules-remove-firmware-loading-rules.patch} | 6 +-
>> ...remove-userspace-firmware-loading-suppor.patch} | 132 +++++++++---------
>> .../systemd/{systemd_225.bb => systemd_228.bb} | 44 +++---
>> 20 files changed, 371 insertions(+), 441 deletions(-)
>> create mode 100644 meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch
>> delete mode 100644 meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
>> rename meta/recipes-core/systemd/systemd/{0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch => 0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch} (89%)
>> rename meta/recipes-core/systemd/systemd/{0022-Use-getenv-when-secure-versions-are-not-available.patch => 0003-Use-getenv-when-secure-versions-are-not-available.patch} (79%)
>> rename meta/recipes-core/systemd/systemd/{qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch => 0004-core-device.c-Change-the-default-device-timeout-to-2.patch} (65%)
>> rename meta/recipes-core/systemd/systemd/{0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch => 0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch} (65%)
>> rename meta/recipes-core/systemd/systemd/{0004-configure-Check-for-additional-features-that-uclibc-.patch => 0006-configure-Check-for-additional-features-that-uclibc-.patch} (76%)
>> delete mode 100644 meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
>> rename meta/recipes-core/systemd/systemd/{0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch => 0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch} (50%)
>> delete mode 100644 meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
>> rename meta/recipes-core/systemd/systemd/{0012-implment-systemd-sysv-install-for-OE.patch => 0009-implment-systemd-sysv-install-for-OE.patch} (75%)
>> create mode 100644 meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
>> rename meta/recipes-core/systemd/systemd/{rules-whitelist-hd-devices.patch => 0011-rules-whitelist-hd-devices.patch} (90%)
>> rename meta/recipes-core/systemd/systemd/{0009-sysv-generator-add-support-for-executing-scripts-und.patch => 0012-sysv-generator-add-support-for-executing-scripts-und.patch} (77%)
>> rename meta/recipes-core/systemd/systemd/{0010-Make-root-s-home-directory-configurable.patch => 0013-Make-root-s-home-directory-configurable.patch} (64%)
>> rename meta/recipes-core/systemd/systemd/{0011-systemd-user-avoid-using-system-auth.patch => 0014-systemd-user-avoid-using-system-auth.patch} (54%)
>> rename meta/recipes-core/systemd/systemd/{0014-Revert-rules-remove-firmware-loading-rules.patch => 0015-Revert-rules-remove-firmware-loading-rules.patch} (83%)
>> rename meta/recipes-core/systemd/systemd/{0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch => 0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (79%)
>> rename meta/recipes-core/systemd/{systemd_225.bb => systemd_228.bb} (93%)
>>
>> diff --git a/meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch b/meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch
>> new file mode 100644
>> index 0000000..8bb775f
>> --- /dev/null
>> +++ b/meta/recipes-core/systemd/systemd/0001-define-exp10-if-missing.patch
>> @@ -0,0 +1,33 @@
>> +From ddad25c809846e08ea39bef49cc668f95d53304a Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem@gmail.com>
>> +Date: Mon, 14 Dec 2015 00:42:49 +0000
>> +Subject: [PATCH 01/16] define exp10 if missing
>> +
>> +Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
>> +
>> +exp10 extension is not part of uClibc, so compute it.
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> +---
>> + src/basic/missing.h | 5 +++++
>> + 1 file changed, 5 insertions(+)
>> +
>> +diff --git a/src/basic/missing.h b/src/basic/missing.h
>> +index d539ed0..09a233b 100644
>> +--- a/src/basic/missing.h
>> ++++ b/src/basic/missing.h
>> +@@ -1125,3 +1125,8 @@ static inline key_serial_t request_key(const char *type, const char *description
>> + #ifndef KEY_SPEC_USER_KEYRING
>> + #define KEY_SPEC_USER_KEYRING -4
>> + #endif
>> ++
>> ++#ifdef __UCLIBC__
>> ++/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
>> ++#define exp10(x) (exp((x) * log(10)))
>> ++#endif /* __UCLIBC__ */
>> +--
>> +2.6.4
>> +
>> diff --git a/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch b/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
>> deleted file mode 100644
>> index 76ce4b7..0000000
>> --- a/meta/recipes-core/systemd/systemd/0001-fix-build-on-uClibc-exp10.patch
>> +++ /dev/null
>> @@ -1,22 +0,0 @@
>> -Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
>> -
>> -exp10 extension is not part of uClibc, so compute it.
>> -
>> -
>> -Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> -
>> -Upstream-Status: Pending
>> -
>> -Index: git/src/basic/missing.h
>> -===================================================================
>> ---- git.orig/src/basic/missing.h
>> -+++ git/src/basic/missing.h
>> -@@ -1036,3 +1036,8 @@ static inline int kcmp(pid_t pid1, pid_t
>> - #ifndef INPUT_PROP_ACCELEROMETER
>> - #define INPUT_PROP_ACCELEROMETER 0x06
>> - #endif
>> -+
>> -+#ifdef __UCLIBC__
>> -+/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
>> -+#define exp10(x) (exp((x) * log(10)))
>> -+#endif /* __UCLIBC__ */
>> diff --git a/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch b/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
>> similarity index 89%
>> rename from meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch
>> rename to meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
>> index b6ab5ef..55ff0ce 100644
>> --- a/meta/recipes-core/systemd/systemd/0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch
>> +++ b/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
>> @@ -1,7 +1,7 @@
>> -From 100e50604efc4032001a2de6a6b47853c0003817 Mon Sep 17 00:00:00 2001
>> +From bfb6562cdbec73d03765ce707e9e0cac138fd223 Mon Sep 17 00:00:00 2001
>> From: Khem Raj <raj.khem@gmail.com>
>> Date: Fri, 20 Feb 2015 05:29:15 +0000
>> -Subject: [PATCH 01/11] units: Prefer getty to agetty in console setup systemd
>> +Subject: [PATCH 02/16] units: Prefer getty to agetty in console setup systemd
>> units
>>
>> Upstream-Status: Inappropriate [configuration specific]
>> @@ -40,5 +40,5 @@ index 4522d0d..e6d499d 100644
>> Restart=always
>> UtmpIdentifier=%I
>> --
>> -2.1.4
>> +2.6.4
>>
>> diff --git a/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch b/meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch
>> similarity index 79%
>> rename from meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch
>> rename to meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch
>> index 5af78d5..cbf69d1 100644
>> --- a/meta/recipes-core/systemd/systemd/0022-Use-getenv-when-secure-versions-are-not-available.patch
>> +++ b/meta/recipes-core/systemd/systemd/0003-Use-getenv-when-secure-versions-are-not-available.patch
>> @@ -1,7 +1,7 @@
>> -From cb71e4beea3b3b11e5951f95c829cd2eee9fcf7b Mon Sep 17 00:00:00 2001
>> +From 9e79bb4bea758f25803e9f7ff2c5835ac4204230 Mon Sep 17 00:00:00 2001
>> From: Khem Raj <raj.khem@gmail.com>
>> Date: Sat, 12 Sep 2015 19:10:04 +0000
>> -Subject: [PATCH 22/31] Use getenv when secure versions are not available
>> +Subject: [PATCH 03/16] Use getenv when secure versions are not available
>>
>> musl doesnt implement secure version, so we default
>> to it if configure does not detect a secure imeplementation
>> @@ -9,15 +9,14 @@ to it if configure does not detect a secure imeplementation
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> Upstream-Status: Denied
>> ---
>> -
>> src/basic/missing.h | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/basic/missing.h b/src/basic/missing.h
>> -index bf9b490..d6dbc7d 100644
>> +index 09a233b..3c37466 100644
>> --- a/src/basic/missing.h
>> +++ b/src/basic/missing.h
>> -@@ -584,13 +584,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
>> +@@ -582,13 +582,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
>> return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags);
>> }
>> #endif
>> @@ -35,5 +34,5 @@ index bf9b490..d6dbc7d 100644
>>
>> #ifndef CIFS_MAGIC_NUMBER
>> --
>> -2.5.2
>> +2.6.4
>>
>> diff --git a/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch b/meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch
>> similarity index 65%
>> rename from meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch
>> rename to meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch
>> index c7e1711..74629fc 100644
>> --- a/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch
>> +++ b/meta/recipes-core/systemd/systemd/0004-core-device.c-Change-the-default-device-timeout-to-2.patch
>> @@ -1,23 +1,25 @@
>> -Upstream-Status: Inappropriate [Specific case QEMU/AB]
>> -
>> -From 7b8c4e0a67a79a75e1bd77df3a452a5497322108 Mon Sep 17 00:00:00 2001
>> -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
>> -Date: Thu, 27 Aug 2015 17:58:26 -0500
>> -Subject: [PATCH] core/device.c: Change the default device timeout to 240 sec.
>> +From ef867afd27e8fed558e82430759d8d2c7efb6608 Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem@gmail.com>
>> +Date: Mon, 14 Dec 2015 04:09:19 +0000
>> +Subject: [PATCH 04/16] core/device.c: Change the default device timeout to 240
>> + sec.
>> MIME-Version: 1.0
>> Content-Type: text/plain; charset=UTF-8
>> Content-Transfer-Encoding: 8bit
>>
>> +Upstream-Status: Inappropriate [Specific case QEMU/AB]
>> +
>> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> src/core/device.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/src/core/device.c b/src/core/device.c
>> -index e7efcf0..4ed8f08 100644
>> +index bcd4d11..f41bb54 100644
>> --- a/src/core/device.c
>> +++ b/src/core/device.c
>> -@@ -110,7 +110,7 @@ static void device_init(Unit *u) {
>> +@@ -114,7 +114,7 @@ static void device_init(Unit *u) {
>> * indefinitely for plugged in devices, something which cannot
>> * happen for the other units since their operations time out
>> * anyway. */
>> @@ -25,7 +27,7 @@ index e7efcf0..4ed8f08 100644
>> + u->job_timeout = (240 * USEC_PER_SEC);
>>
>> u->ignore_on_isolate = true;
>> - u->ignore_on_snapshot = true;
>> + }
>> --
>> -1.9.1
>> +2.6.4
>>
>> diff --git a/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
>> similarity index 65%
>> rename from meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
>> rename to meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
>> index 0e20fd0..0b75fac 100644
>> --- a/meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch
>> +++ b/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
>> @@ -1,7 +1,7 @@
>> -From 184a89caacfa00f07e7275bca592bd7dda1b541e Mon Sep 17 00:00:00 2001
>> +From 319873d22a6b1225ae41aa38bc976e723326ba20 Mon Sep 17 00:00:00 2001
>> From: Khem Raj <raj.khem@gmail.com>
>> Date: Fri, 20 Feb 2015 05:03:44 +0000
>> -Subject: [PATCH 03/11] binfmt: Don't install dependency links at install time
>> +Subject: [PATCH 05/16] binfmt: Don't install dependency links at install time
>> for the binfmt services
>>
>> use [Install] blocks so that they get created when the service is enabled
>> @@ -23,11 +23,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> units/systemd-binfmt.service.in | 5 +++++
>> 3 files changed, 8 insertions(+), 4 deletions(-)
>>
>> -Index: git/Makefile.am
>> -===================================================================
>> ---- git.orig/Makefile.am
>> -+++ git/Makefile.am
>> -@@ -4271,10 +4271,6 @@ INSTALL_DIRS += \
>> +diff --git a/Makefile.am b/Makefile.am
>> +index 00a92e3..4c1143a 100644
>> +--- a/Makefile.am
>> ++++ b/Makefile.am
>> +@@ -4455,10 +4455,6 @@ INSTALL_DIRS += \
>> $(prefix)/lib/binfmt.d \
>> $(sysconfdir)/binfmt.d
>>
>> @@ -38,10 +38,10 @@ Index: git/Makefile.am
>> endif
>>
>> EXTRA_DIST += \
>> -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
>> +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/
>>
>> [Automount]
>> @@ -49,11 +49,11 @@ Index: git/units/proc-sys-fs-binfmt_misc.automount
>> +
>> +[Install]
>> +WantedBy=sysinit.target
>> -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=man:systemd-binfmt.service
>> +diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
>> +index d53073e..8c57ee0 100644
>> +--- a/units/systemd-binfmt.service.in
>> ++++ b/units/systemd-binfmt.service.in
>> +@@ -11,6 +11,8 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5)
>> Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
>> DefaultDependencies=no
>> Conflicts=shutdown.target
>> @@ -69,3 +69,6 @@ Index: git/units/systemd-binfmt.service.in
>> +
>> +[Install]
>> +WantedBy=sysinit.target
>> +--
>> +2.6.4
>> +
>> diff --git a/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
>> similarity index 76%
>> rename from meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch
>> rename to meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
>> index 8078da9..a2c40b5 100644
>> --- a/meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch
>> +++ b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
>> @@ -1,7 +1,7 @@
>> -From 4e2e8dbf3f23ab7dca32286cc0f37bff6ac49e22 Mon Sep 17 00:00:00 2001
>> +From d1fe5d2dd38cdef984296f453c65ccaebb71d1a9 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 04/11] configure: Check for additional features that uclibc
>> +Subject: [PATCH 06/16] configure: Check for additional features that uclibc
>> doesnt support
>>
>> This helps in supporting uclibc which does not have all features that
>> @@ -14,11 +14,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> configure.ac | 18 ++++++++++++++++++
>> 1 file changed, 18 insertions(+)
>>
>> -Index: git/configure.ac
>> -===================================================================
>> ---- git.orig/configure.ac
>> -+++ git/configure.ac
>> -@@ -110,6 +110,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount], [/
>> +diff --git a/configure.ac b/configure.ac
>> +index 3128ca8..49f73a4 100644
>> +--- a/configure.ac
>> ++++ b/configure.ac
>> +@@ -112,6 +112,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 ***])])
>>
>> @@ -43,3 +43,6 @@ Index: git/configure.ac
>> M4_DEFINES=
>>
>> AC_CHECK_TOOL(OBJCOPY, objcopy)
>> +--
>> +2.6.4
>> +
>> diff --git a/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch b/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
>> deleted file mode 100644
>> index 631dd77..0000000
>> --- a/meta/recipes-core/systemd/systemd/0006-journal-Use-posix-fallocate-only-if-available.patch
>> +++ /dev/null
>> @@ -1,96 +0,0 @@
>> -From 34a61b6c9eed3fad360066fb63132ebc7e0aaaa6 Mon Sep 17 00:00:00 2001
>> -From: Khem Raj <raj.khem@gmail.com>
>> -Date: Fri, 20 Feb 2015 05:12:48 +0000
>> -Subject: [PATCH 06/11] journal: Use posix fallocate only if available
>> -
>> -Some architecture ports in uclibc did not support it in past
>> -
>> -Upstream-Status: Denied [no desire for uclibc support]
>> -
>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> -Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ----
>> - src/journal/journal-file.c | 16 +++++++++++++++-
>> - src/journal/journald-kmsg.c | 15 ++++++++++++++-
>> - 2 files changed, 29 insertions(+), 2 deletions(-)
>> -
>> -diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
>> -index 2845e05..9431171 100644
>> ---- a/src/journal/journal-file.c
>> -+++ b/src/journal/journal-file.c
>> -@@ -36,6 +36,8 @@
>> - #include "compress.h"
>> - #include "fsprg.h"
>> -
>> -+#include "config.h"
>> -+
>> - #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
>> - #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
>> -
>> -@@ -354,7 +356,7 @@ static int journal_file_fstat(JournalFile *f) {
>> -
>> - static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
>> - uint64_t old_size, new_size;
>> -- int r;
>> -+ int r = 0;
>> -
>> - assert(f);
>> -
>> -@@ -418,9 +420,21 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
>> - /* Note that the glibc fallocate() fallback is very
>> - inefficient, hence we try to minimize the allocation area
>> - as we can. */
>> -+#ifdef HAVE_POSIX_FALLOCATE
>> - r = posix_fallocate(f->fd, old_size, new_size - old_size);
>> - if (r != 0)
>> - return -r;
>> -+#else
>> -+ /* Write something every 512 bytes to make sure the block is allocated */
>> -+ uint64_t len = new_size - old_size;
>> -+ uint64_t offset = old_size;
>> -+ for (offset += (len-1) % 512; len > 0; offset += 512) {
>> -+ len -= 512;
>> -+ if (pwrite(f->fd, "", 1, offset) != 1)
>> -+ return -errno;
>> -+ }
>> -+
>> -+#endif /* HAVE_POSIX_FALLOCATE */
>> -
>> - f->header->arena_size = htole64(new_size - le64toh(f->header->header_size));
>> -
>> -diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
>> -index c4216c4..a998ed5 100644
>> ---- a/src/journal/journald-kmsg.c
>> -+++ b/src/journal/journald-kmsg.c
>> -@@ -436,6 +436,7 @@ fail:
>> - int server_open_kernel_seqnum(Server *s) {
>> - _cleanup_close_ int fd;
>> - uint64_t *p;
>> -+ int r = 0;
>> -
>> - assert(s);
>> -
>> -@@ -449,7 +450,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);
>> -+#endif /* HAVE_POSIX_FALLOCATE */
>> -+ if (r < 0) {
>> - log_error_errno(errno, "Failed to allocate sequential number file, ignoring: %m");
>> - return 0;
>> - }
>> ---
>> -2.1.4
>> -
>> diff --git a/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch
>> similarity index 50%
>> rename from meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch
>> rename to meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch
>> index 55a0088..85d3907 100644
>> --- a/meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch
>> +++ b/meta/recipes-core/systemd/systemd/0007-nspawn-Use-execvpe-only-when-libc-supports-it.patch
>> @@ -1,7 +1,7 @@
>> -From a7417c2e6950d55c22c1b0d15783898b8ff229ef Mon Sep 17 00:00:00 2001
>> +From 529e7e2f7f6a5dc0e4527ff5c2237b19ece2f112 Mon Sep 17 00:00:00 2001
>> From: Khem Raj <raj.khem@gmail.com>
>> Date: Fri, 20 Feb 2015 05:10:37 +0000
>> -Subject: [PATCH 05/11] nspawn: Use execvpe only when libc supports it
>> +Subject: [PATCH 07/16] nspawn: Use execvpe only when libc supports it
>>
>> Upstream-Status: Denied [no desire for uclibc support]
>>
>> @@ -10,29 +10,32 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> src/nspawn/nspawn.c | 7 +++++++
>> 1 file changed, 7 insertions(+)
>>
>> -Index: git/src/nspawn/nspawn.c
>> -===================================================================
>> ---- git.orig/src/nspawn/nspawn.c
>> -+++ git/src/nspawn/nspawn.c
>> -@@ -143,6 +143,8 @@ typedef struct CustomMount {
>> - char **lower;
>> - } CustomMount;
>> +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
>> +index a4e13bd..4def6ba 100644
>> +--- a/src/nspawn/nspawn.c
>> ++++ b/src/nspawn/nspawn.c
>> +@@ -112,6 +112,8 @@ typedef enum LinkJournal {
>> + LINK_GUEST
>> + } LinkJournal;
>>
>> +#include "config.h"
>> +
>> static char *arg_directory = NULL;
>> static char *arg_template = NULL;
>> static char *arg_user = NULL;
>> -@@ -4238,7 +4240,12 @@ static int inner_child(
>> +@@ -2595,7 +2597,12 @@ static int inner_child(
>> a[0] = (char*) "/sbin/init";
>> execve(a[0], a, env_use);
>> - } else if (argc > optind)
>> + } else if (!strv_isempty(arg_parameters))
>> +#ifdef HAVE_EXECVPE
>> - execvpe(argv[optind], argv + optind, env_use);
>> + execvpe(arg_parameters[0], arg_parameters, env_use);
>> +#else
>> + environ = env_use;
>> -+ execvp(argv[optind], argv + optind);
>> ++ execvp(arg_parameters[0], arg_parameters);
>> +#endif /* HAVE_EXECVPE */
>> else {
>> - chdir(home ? home : "/root");
>> + chdir(home ?: "/root");
>> execle("/bin/bash", "-bash", NULL, env_use);
>> +--
>> +2.6.4
>> +
>> diff --git a/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
>> deleted file mode 100644
>> index b8ab7c4..0000000
>> --- a/meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch
>> +++ /dev/null
>> @@ -1,42 +0,0 @@
>> -From f771407d3e0288ca0c06a894194d3ddad69b9a8e Mon Sep 17 00:00:00 2001
>> -From: Khem Raj <raj.khem@gmail.com>
>> -Date: Fri, 20 Feb 2015 05:17:05 +0000
>> -Subject: [PATCH 07/11] util: Use mkostemp only if libc supports it
>> -
>> -Upstream-Status: Denied [no desire for uclibc support]
>> -
>> -Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ----
>> - src/basic/util.c | 8 ++++++++
>> - 1 file changed, 8 insertions(+)
>> -
>> -diff --git a/src/basic/util.c b/src/basic/util.c
>> -index dc65280..72f4665 100644
>> ---- a/src/basic/util.c
>> -+++ b/src/basic/util.c
>> -@@ -97,6 +97,8 @@
>> - #include "def.h"
>> - #include "sparse-endian.h"
>> -
>> -+#include "config.h"
>> -+
>> - int saved_argc = 0;
>> - char **saved_argv = NULL;
>> -
>> -@@ -6682,7 +6684,13 @@ int mkostemp_safe(char *pattern, int flags) {
>> -
>> - 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;
>> -
>> ---
>> -2.1.4
>> -
>> diff --git a/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch b/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
>> index 3f4d4de..8d71ecb 100644
>> --- a/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
>> +++ b/meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
>> @@ -1,7 +1,7 @@
>> -From b45ea3bfd6635744c8a6b74d0ac701b44bb1d294 Mon Sep 17 00:00:00 2001
>> +From 83944758dc0703afea81f3c7aa0ad926bc5df757 Mon Sep 17 00:00:00 2001
>> From: Khem Raj <raj.khem@gmail.com>
>> -Date: Fri, 20 Feb 2015 05:19:37 +0000
>> -Subject: [PATCH 08/11] util: bypass unimplemented _SC_PHYS_PAGES system
>> +Date: Mon, 14 Dec 2015 00:47:53 +0000
>> +Subject: [PATCH 08/16] util: bypass unimplemented _SC_PHYS_PAGES system
>> configuration API on uclibc
>>
>> Upstream-Status: Inappropriate [uclibc-specific]
>> @@ -12,10 +12,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> 1 file changed, 15 insertions(+)
>>
>> diff --git a/src/basic/util.c b/src/basic/util.c
>> -index 72f4665..cbbe3b1 100644
>> +index 9e0b576..65f0edf 100644
>> --- a/src/basic/util.c
>> +++ b/src/basic/util.c
>> -@@ -6793,10 +6793,25 @@ uint64_t physical_memory(void) {
>> +@@ -769,10 +769,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 */
>>
>> @@ -25,7 +25,7 @@ index 72f4665..cbbe3b1 100644
>> + if (f == NULL)
>> + return 0;
>> + while (!feof(f) && fgets(line, sizeof(line)-1, f)) {
>> -+ if (sscanf(line, "MemTotal: %l kB", &mem) == 1) {
>> ++ if (sscanf(line, "MemTotal: %li kB", &mem) == 1) {
>> + mem *= 1024;
>> + break;
>> + }
>> @@ -40,7 +40,7 @@ index 72f4665..cbbe3b1 100644
>> +#endif
>> }
>>
>> - void hexdump(FILE *f, const void *p, size_t s) {
>> + int update_reboot_param_file(const char *param) {
>> --
>> -2.1.4
>> +2.6.4
>>
>> diff --git a/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch
>> similarity index 75%
>> rename from meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch
>> rename to meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch
>> index 68b45a9..a139684 100644
>> --- a/meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch
>> +++ b/meta/recipes-core/systemd/systemd/0009-implment-systemd-sysv-install-for-OE.patch
>> @@ -1,7 +1,7 @@
>> -From 5f8b9f2d276c0ddbcbf5423733a23f043d688009 Mon Sep 17 00:00:00 2001
>> +From 81c3d92b5bc5786cbd93b1e5ed82884e8caf2254 Mon Sep 17 00:00:00 2001
>> From: Khem Raj <raj.khem@gmail.com>
>> Date: Sat, 5 Sep 2015 06:31:47 +0000
>> -Subject: [PATCH] implment systemd-sysv-install for OE
>> +Subject: [PATCH 09/16] implment systemd-sysv-install for OE
>>
>> Use update-rc.d for enabling/disabling and status command
>> to check the status of the sysv service
>> @@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> src/systemctl/systemd-sysv-install.SKELETON | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> -Index: git/src/systemctl/systemd-sysv-install.SKELETON
>> -===================================================================
>> ---- git.orig/src/systemctl/systemd-sysv-install.SKELETON
>> -+++ git/src/systemctl/systemd-sysv-install.SKELETON
>> +diff --git a/src/systemctl/systemd-sysv-install.SKELETON b/src/systemctl/systemd-sysv-install.SKELETON
>> +index a53a3e6..5d877b0 100755
>> +--- a/src/systemctl/systemd-sysv-install.SKELETON
>> ++++ b/src/systemctl/systemd-sysv-install.SKELETON
>> @@ -30,17 +30,17 @@ case "$1" in
>> enable)
>> # call the command to enable SysV init script $NAME here
>> @@ -38,3 +38,6 @@ Index: git/src/systemctl/systemd-sysv-install.SKELETON
>> ;;
>> *)
>> usage ;;
>> +--
>> +2.6.4
>> +
>> diff --git a/meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch b/meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
>> new file mode 100644
>> index 0000000..8cec071
>> --- /dev/null
>> +++ b/meta/recipes-core/systemd/systemd/0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
>> @@ -0,0 +1,38 @@
>> +From d4b7f9b771a538c2356c4c77461f3b4790043556 Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem@gmail.com>
>> +Date: Mon, 14 Dec 2015 00:50:01 +0000
>> +Subject: [PATCH 10/16] nss-mymachines: Build conditionally when
>> + HAVE_MYHOSTNAME is set
>> +
>> +Fixes build failures when building with --disable-myhostname
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> +---
>> + Makefile.am | 2 ++
>> + 1 file changed, 2 insertions(+)
>> +
>> +diff --git a/Makefile.am b/Makefile.am
>> +index 4c1143a..cf559be 100644
>> +--- a/Makefile.am
>> ++++ b/Makefile.am
>> +@@ -4961,6 +4961,7 @@ SYSTEM_UNIT_ALIASES += \
>> + BUSNAMES_TARGET_WANTS += \
>> + org.freedesktop.machine1.busname
>> +
>> ++if HAVE_MYHOSTNAME
>> + libnss_mymachines_la_SOURCES = \
>> + src/nss-mymachines/nss-mymachines.sym \
>> + src/nss-mymachines/nss-mymachines.c
>> +@@ -4981,6 +4982,7 @@ lib_LTLIBRARIES += \
>> + libnss_mymachines.la
>> +
>> + endif
>> ++endif
>> +
>> + polkitpolicy_in_files += \
>> + src/machine/org.freedesktop.machine1.policy.in
>> +--
>> +2.6.4
>> +
>> diff --git a/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch
>> similarity index 90%
>> rename from meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch
>> rename to meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch
>> index 8975b05..03fdbff 100644
>> --- a/meta/recipes-core/systemd/systemd/rules-whitelist-hd-devices.patch
>> +++ b/meta/recipes-core/systemd/systemd/0011-rules-whitelist-hd-devices.patch
>> @@ -1,7 +1,7 @@
>> -From f77b7e5626e70c3a775e993816a33af5a61dea42 Mon Sep 17 00:00:00 2001
>> +From ae6c9dcb00919e1dd2793fd1b82125d123f69a90 Mon Sep 17 00:00:00 2001
>> From: Patrick Ohly <patrick.ohly@intel.com>
>> Date: Wed, 16 Sep 2015 13:55:58 +0200
>> -Subject: [PATCH] rules: whitelist hd* devices
>> +Subject: [PATCH 11/16] rules: whitelist hd* devices
>>
>> qemu by default emulates IDE and the linux-yocto kernel(s) use
>> CONFIG_IDE instead of the more modern libsata, so disks appear as
>> @@ -28,5 +28,5 @@ index 0b14bb4..1c4d97a 100644
>> # ignore partitions that span the entire disk
>> TEST=="whole_disk", GOTO="persistent_storage_end"
>> --
>> -2.1.4
>> +2.6.4
>>
>> diff --git a/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch b/meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch
>> similarity index 77%
>> rename from meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch
>> rename to meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch
>> index 9ea3e83..82feff0 100644
>> --- a/meta/recipes-core/systemd/systemd/0009-sysv-generator-add-support-for-executing-scripts-und.patch
>> +++ b/meta/recipes-core/systemd/systemd/0012-sysv-generator-add-support-for-executing-scripts-und.patch
>> @@ -1,7 +1,7 @@
>> -From 8791b5b3934c55694872b6915a67340683ead91b Mon Sep 17 00:00:00 2001
>> +From 9e6c907ff1f17deb96c66a607653db4c7da34289 Mon Sep 17 00:00:00 2001
>> From: Khem Raj <raj.khem@gmail.com>
>> -Date: Fri, 20 Feb 2015 05:22:52 +0000
>> -Subject: [PATCH 09/11] sysv-generator: add support for executing scripts under
>> +Date: Mon, 14 Dec 2015 05:09:53 +0000
>> +Subject: [PATCH 12/16] sysv-generator: add support for executing scripts under
>> /etc/rcS.d/
>>
>> To be compatible, all services translated from scripts under /etc/rcS.d would
>> @@ -12,14 +12,14 @@ Upstream-Status: Inappropriate [OE specific]
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> - src/sysv-generator/sysv-generator.c | 50 ++++++++++++++++++++++++++++---------
>> - 1 file changed, 38 insertions(+), 12 deletions(-)
>> + src/sysv-generator/sysv-generator.c | 50 +++++++++++++++++++++++++++++--------
>> + 1 file changed, 39 insertions(+), 11 deletions(-)
>>
>> diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
>> -index bd67f32..6756cc6 100644
>> +index 5075548..32d3687 100644
>> --- a/src/sysv-generator/sysv-generator.c
>> +++ b/src/sysv-generator/sysv-generator.c
>> -@@ -42,7 +42,8 @@
>> +@@ -46,7 +46,8 @@
>>
>> typedef enum RunlevelType {
>> RUNLEVEL_UP,
>> @@ -29,7 +29,7 @@ index bd67f32..6756cc6 100644
>> } RunlevelType;
>>
>> static const struct {
>> -@@ -57,6 +58,9 @@ static const struct {
>> +@@ -61,6 +62,9 @@ static const struct {
>> { "rc4.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
>> { "rc5.d", SPECIAL_GRAPHICAL_TARGET, RUNLEVEL_UP },
>>
>> @@ -39,7 +39,7 @@ index bd67f32..6756cc6 100644
>> /* Standard SysV runlevels for shutdown */
>> { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN },
>> { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN }
>> -@@ -65,7 +69,7 @@ static const struct {
>> +@@ -69,7 +73,7 @@ static const struct {
>> directories in this order, and we want to make sure that
>> sysv_start_priority is known when we first load the
>> unit. And that value we only know from S links. Hence
>> @@ -47,19 +47,19 @@ index bd67f32..6756cc6 100644
>> + UP/SYSINIT must be read before DOWN */
>> };
>>
>> - typedef struct SysvStub {
>> -@@ -81,6 +85,8 @@ typedef struct SysvStub {
>> - char **conflicts;
>> + const char *arg_dest = "/tmp";
>> +@@ -88,6 +92,8 @@ typedef struct SysvStub {
>> bool has_lsb;
>> bool reload;
>> + bool loaded;
>> + bool default_dependencies;
>> + bool from_rcsd;
>> } SysvStub;
>>
>> - const char *arg_dest = "/tmp";
>> -@@ -183,6 +189,9 @@ static int generate_unit_file(SysvStub *s) {
>> - "Description=%s\n",
>> - s->path, s->description);
>> + static void free_sysvstub(SysvStub *s) {
>> +@@ -204,6 +210,9 @@ static int generate_unit_file(SysvStub *s) {
>> + if (s->description)
>> + fprintf(f, "Description=%s\n", s->description);
>>
>> + if (!s->default_dependencies)
>> + fprintf(f, "DefaultDependencies=no\n");
>> @@ -67,7 +67,7 @@ index bd67f32..6756cc6 100644
>> if (!isempty(before))
>> fprintf(f, "Before=%s\n", before);
>> if (!isempty(after))
>> -@@ -704,18 +713,30 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
>> +@@ -722,17 +731,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
>> if (s->has_lsb && other->has_lsb)
>> continue;
>>
>> @@ -79,15 +79,14 @@ index bd67f32..6756cc6 100644
>> + r = strv_extend(&s->before, other->name);
>> if (r < 0)
>> return log_oom();
>> -- }
>> -- else if (other->sysv_start_priority > s->sysv_start_priority) {
>> +
>> +- } else if (other->sysv_start_priority > s->sysv_start_priority) {
>> - r = strv_extend(&s->before, other->name);
>> + } else if (other->from_rcsd && !s->from_rcsd) {
>> + r = strv_extend(&s->after, other->name);
>> if (r < 0)
>> return log_oom();
>> -- }
>> -- else
>> +- } else
>> - continue;
>> + } else {
>> + if (other->sysv_start_priority < s->sysv_start_priority) {
>> @@ -102,11 +101,11 @@ index bd67f32..6756cc6 100644
>> + }
>> + else
>> + continue;
>> -+ }
>> ++ }
>>
>> /* FIXME: Maybe we should compare the name here lexicographically? */
>> }
>> -@@ -778,6 +799,8 @@ static int enumerate_sysv(LookupPaths lp, Hashmap *all_services) {
>> +@@ -799,6 +822,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) {
>> return log_oom();
>>
>> service->sysv_start_priority = -1;
>> @@ -114,22 +113,23 @@ index bd67f32..6756cc6 100644
>> + service->from_rcsd = false;
>> service->name = name;
>> service->path = fpath;
>> -
>> -@@ -864,9 +887,11 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
>> + name = fpath = NULL;
>> +@@ -882,9 +907,11 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic
>>
>> if (de->d_name[0] == 'S') {
>>
>> -- if (rcnd_table[i].type == RUNLEVEL_UP) {
>> +- if (rcnd_table[i].type == RUNLEVEL_UP)
>> + if (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT) {
>> - service->sysv_start_priority =
>> - MAX(a*10 + b, service->sysv_start_priority);
>> + service->sysv_start_priority = MAX(a*10 + b, service->sysv_start_priority);
>> +-
>> + service->default_dependencies = (rcnd_table[i].type == RUNLEVEL_SYSINIT)?false:true;
>> + service->from_rcsd = (rcnd_table[i].type == RUNLEVEL_SYSINIT)?true:false;
>> - }
>> -
>> ++ }
>> r = set_ensure_allocated(&runlevel_services[i], NULL);
>> -@@ -878,7 +903,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
>> - goto finish;
>> + if (r < 0) {
>> + log_oom();
>> +@@ -898,7 +925,8 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic
>> + }
>>
>> } else if (de->d_name[0] == 'K' &&
>> - (rcnd_table[i].type == RUNLEVEL_DOWN)) {
>> @@ -137,7 +137,7 @@ index bd67f32..6756cc6 100644
>> + rcnd_table[i].type == RUNLEVEL_SYSINIT)) {
>>
>> r = set_ensure_allocated(&shutdown_services, NULL);
>> - if (r < 0)
>> + if (r < 0) {
>> --
>> -2.1.4
>> +2.6.4
>>
>> diff --git a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
>> similarity index 64%
>> rename from meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
>> rename to meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
>> index ed7ff5b..ea0b3e2 100644
>> --- a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch
>> +++ b/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
>> @@ -1,7 +1,7 @@
>> -From 3dc731c1d270e2e143de621db9bd898299fd849d Mon Sep 17 00:00:00 2001
>> +From 1ba00ff6ed3f0626892f57cdd8d9788692c7bf14 Mon Sep 17 00:00:00 2001
>> From: Khem Raj <raj.khem@gmail.com>
>> -Date: Fri, 20 Feb 2015 05:24:49 +0000
>> -Subject: [PATCH 10/11] Make root's home directory configurable
>> +Date: Mon, 14 Dec 2015 05:18:20 +0000
>> +Subject: [PATCH 13/16] Make root's home directory configurable
>>
>> OpenEmbedded has a configurable home directory for root. Allow
>> systemd to be built using its idea of what root's home directory
>> @@ -17,19 +17,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> Makefile.am | 2 ++
>> configure.ac | 7 +++++++
>> - src/core/unit-printf.c | 2 +-
>> + src/basic/user-util.c | 4 ++--
>> + src/core/namespace.c | 2 +-
>> src/nspawn/nspawn.c | 4 ++--
>> - src/basic/util.c | 4 ++--
>> units/console-shell.service.m4.in | 4 ++--
>> units/emergency.service.in | 4 ++--
>> units/rescue.service.in | 4 ++--
>> 8 files changed, 20 insertions(+), 11 deletions(-)
>>
>> -Index: git/Makefile.am
>> -===================================================================
>> ---- git.orig/Makefile.am
>> -+++ git/Makefile.am
>> -@@ -208,6 +208,7 @@ AM_CPPFLAGS = \
>> +diff --git a/Makefile.am b/Makefile.am
>> +index cf559be..a511c3d 100644
>> +--- a/Makefile.am
>> ++++ b/Makefile.am
>> +@@ -210,6 +210,7 @@ AM_CPPFLAGS = \
>> -DLIBDIR=\"$(libdir)\" \
>> -DROOTLIBDIR=\"$(rootlibdir)\" \
>> -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
>> @@ -37,7 +37,7 @@ Index: git/Makefile.am
>> -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
>> -I $(top_srcdir)/src \
>> -I $(top_builddir)/src/basic \
>> -@@ -5615,6 +5616,7 @@ EXTRA_DIST += \
>> +@@ -5876,6 +5877,7 @@ EXTRA_DIST += \
>> substitutions = \
>> '|rootlibexecdir=$(rootlibexecdir)|' \
>> '|rootbindir=$(rootbindir)|' \
>> @@ -45,11 +45,11 @@ Index: git/Makefile.am
>> '|bindir=$(bindir)|' \
>> '|SYSTEMCTL=$(rootbindir)/systemctl|' \
>> '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
>> -Index: git/configure.ac
>> -===================================================================
>> ---- git.orig/configure.ac
>> -+++ git/configure.ac
>> -@@ -1383,6 +1383,11 @@ AC_ARG_WITH([rootlibdir],
>> +diff --git a/configure.ac b/configure.ac
>> +index 49f73a4..a3e639d 100644
>> +--- a/configure.ac
>> ++++ b/configure.ac
>> +@@ -1434,6 +1434,11 @@ AC_ARG_WITH([rootlibdir],
>> [with_rootlibdir=${libdir}])
>> AX_NORMALIZE_PATH([with_rootlibdir])
>>
>> @@ -61,7 +61,7 @@ Index: git/configure.ac
>> AC_ARG_WITH([pamlibdir],
>> AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
>> [],
>> -@@ -1474,6 +1479,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
>> +@@ -1517,6 +1522,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
>> AC_SUBST([pamconfdir], [$with_pamconfdir])
>> AC_SUBST([rootprefix], [$with_rootprefix])
>> AC_SUBST([rootlibdir], [$with_rootlibdir])
>> @@ -69,7 +69,7 @@ Index: git/configure.ac
>>
>> AC_CONFIG_FILES([
>> Makefile
>> -@@ -1563,6 +1569,7 @@ AC_MSG_RESULT([
>> +@@ -1606,6 +1612,7 @@ AC_MSG_RESULT([
>> includedir: ${includedir}
>> lib dir: ${libdir}
>> rootlib dir: ${with_rootlibdir}
>> @@ -77,46 +77,11 @@ Index: git/configure.ac
>> SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
>> SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
>> Build Python: ${PYTHON}
>> -Index: git/src/core/unit-printf.c
>> -===================================================================
>> ---- git.orig/src/core/unit-printf.c
>> -+++ git/src/core/unit-printf.c
>> -@@ -237,7 +237,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 -EOPNOTSUPP;
>> -
>> -Index: git/src/nspawn/nspawn.c
>> -===================================================================
>> ---- git.orig/src/nspawn/nspawn.c
>> -+++ git/src/nspawn/nspawn.c
>> -@@ -4176,7 +4176,7 @@ static int inner_child(
>> - if (envp[n_env])
>> - n_env ++;
>> -
>> -- 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))
>> - return log_oom();
>> -@@ -4247,7 +4247,7 @@ static int inner_child(
>> - 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);
>> - }
>> -Index: git/src/basic/util.c
>> -===================================================================
>> ---- git.orig/src/basic/util.c
>> -+++ git/src/basic/util.c
>> -@@ -3233,7 +3233,7 @@ int get_user_creds(
>> +diff --git a/src/basic/user-util.c b/src/basic/user-util.c
>> +index 56e1a3b..c3d0ec3 100644
>> +--- a/src/basic/user-util.c
>> ++++ b/src/basic/user-util.c
>> +@@ -124,7 +124,7 @@ int get_user_creds(
>> *gid = 0;
>>
>> if (home)
>> @@ -125,7 +90,7 @@ Index: git/src/basic/util.c
>>
>> if (shell)
>> *shell = "/bin/sh";
>> -@@ -4069,7 +4069,7 @@ int get_home_dir(char **_h) {
>> +@@ -355,7 +355,7 @@ int get_home_dir(char **_h) {
>> /* Hardcode home directory for root to avoid NSS */
>> u = getuid();
>> if (u == 0) {
>> @@ -134,10 +99,45 @@ Index: git/src/basic/util.c
>> if (!h)
>> return -ENOMEM;
>>
>> -Index: git/units/console-shell.service.m4.in
>> -===================================================================
>> ---- git.orig/units/console-shell.service.m4.in
>> -+++ git/units/console-shell.service.m4.in
>> +diff --git a/src/core/namespace.c b/src/core/namespace.c
>> +index 81ba09e..1a1f276 100644
>> +--- a/src/core/namespace.c
>> ++++ b/src/core/namespace.c
>> +@@ -494,7 +494,7 @@ int setup_namespace(
>> + home_dir = strjoina("-", home_dir);
>> + run_user_dir = prefix_roota(root_directory, "/run/user");
>> + run_user_dir = strjoina("-", run_user_dir);
>> +- root_dir = prefix_roota(root_directory, "/root");
>> ++ root_dir = prefix_roota(root_directory, ROOTHOMEDIR);
>> + root_dir = strjoina("-", root_dir);
>> +
>> + r = append_mounts(&m, STRV_MAKE(home_dir, run_user_dir, root_dir),
>> +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
>> +index 4def6ba..2081953 100644
>> +--- a/src/nspawn/nspawn.c
>> ++++ b/src/nspawn/nspawn.c
>> +@@ -2530,7 +2530,7 @@ static int inner_child(
>> + if (envp[n_env])
>> + n_env ++;
>> +
>> +- 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))
>> + return log_oom();
>> +@@ -2604,7 +2604,7 @@ static int inner_child(
>> + execvp(arg_parameters[0], arg_parameters);
>> + #endif /* HAVE_EXECVPE */
>> + else {
>> +- chdir(home ?: "/root");
>> ++ chdir(home ?: ROOTHOMEDIR);
>> + execle("/bin/bash", "-bash", NULL, env_use);
>> + execle("/bin/sh", "-sh", NULL, env_use);
>> + }
>> +diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
>> +index 5c80722..efde5f0 100644
>> +--- a/units/console-shell.service.m4.in
>> ++++ b/units/console-shell.service.m4.in
>> @@ -15,8 +15,8 @@ After=rc-local.service
>> Before=getty.target
>>
>> @@ -149,10 +149,10 @@ Index: git/units/console-shell.service.m4.in
>> ExecStart=-@SULOGIN@
>> ExecStopPost=-@SYSTEMCTL@ poweroff
>> Type=idle
>> -Index: git/units/emergency.service.in
>> -===================================================================
>> ---- git.orig/units/emergency.service.in
>> -+++ git/units/emergency.service.in
>> +diff --git a/units/emergency.service.in b/units/emergency.service.in
>> +index 8dc3cbd..eb046c2 100644
>> +--- a/units/emergency.service.in
>> ++++ b/units/emergency.service.in
>> @@ -14,8 +14,8 @@ Conflicts=rescue.service
>> Before=shutdown.target
>>
>> @@ -164,11 +164,11 @@ Index: git/units/emergency.service.in
>> ExecStartPre=-/bin/plymouth --wait 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" or ^D to\\ntry again to boot into default mode.'
>> ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=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
>> +diff --git a/units/rescue.service.in b/units/rescue.service.in
>> +index 432e4f3..afa3e82 100644
>> +--- a/units/rescue.service.in
>> ++++ b/units/rescue.service.in
>> +@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.service
>> Before=shutdown.target
>>
>> [Service]
>> @@ -179,3 +179,6 @@ Index: git/units/rescue.service.in
>> 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" or ^D to\\nboot into default mode.'
>> ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
>> +--
>> +2.6.4
>> +
>> diff --git a/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch b/meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch
>> similarity index 54%
>> rename from meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch
>> rename to meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch
>> index e562bca..11be097 100644
>> --- a/meta/recipes-core/systemd/systemd/0011-systemd-user-avoid-using-system-auth.patch
>> +++ b/meta/recipes-core/systemd/systemd/0014-systemd-user-avoid-using-system-auth.patch
>> @@ -1,7 +1,7 @@
>> -From 7e202f71785bf5a67c8a4f6b58d3585608fbfdc4 Mon Sep 17 00:00:00 2001
>> +From 548a8d5d456c531444498b3ce8cec3f3dd374cf8 Mon Sep 17 00:00:00 2001
>> From: Khem Raj <raj.khem@gmail.com>
>> Date: Fri, 20 Feb 2015 05:26:25 +0000
>> -Subject: [PATCH 11/11] systemd-user: avoid using system-auth
>> +Subject: [PATCH 14/16] 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.
>> @@ -11,21 +11,26 @@ Upstream-Status: Inappropriate [oe specific]
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> - src/login/systemd-user | 4 ++--
>> + src/login/systemd-user.m4 | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> -diff --git a/src/login/systemd-user b/src/login/systemd-user
>> -index 8112d74..99635af 100644
>> ---- a/src/login/systemd-user
>> -+++ b/src/login/systemd-user
>> -@@ -2,5 +2,5 @@
>> +diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
>> +index 7933508..16b73d2 100644
>> +--- a/src/login/systemd-user.m4
>> ++++ b/src/login/systemd-user.m4
>> +@@ -2,10 +2,10 @@
>> #
>> # Used by systemd --user instances.
>>
>> -account include system-auth
>> --session include system-auth
>> +account include common-account
>> +
>> + m4_ifdef(`HAVE_SELINUX',
>> + session required pam_selinux.so close
>> + session required pam_selinux.so nottys open
>> + )m4_dnl
>> +-session include system-auth
>> +session include common-session
>> --
>> -2.1.4
>> +2.6.4
>>
>> diff --git a/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch b/meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch
>> similarity index 83%
>> rename from meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
>> rename to meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch
>> index fe2ba53..7cc3922 100644
>> --- a/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
>> +++ b/meta/recipes-core/systemd/systemd/0015-Revert-rules-remove-firmware-loading-rules.patch
>> @@ -1,7 +1,7 @@
>> -From 4f0a722489154da99e7f6b3051afde984eed2f74 Mon Sep 17 00:00:00 2001
>> +From 6b2b8d20f884bd5a3d928175e422023f6c9d056b Mon Sep 17 00:00:00 2001
>> From: Jonathan Liu <net147@gmail.com>
>> Date: Thu, 19 Mar 2015 15:01:29 +1100
>> -Subject: [PATCH] Revert "rules: remove firmware loading rules"
>> +Subject: [PATCH 15/16] Revert "rules: remove firmware loading rules"
>>
>> This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19.
>> Userspace firmware loading support is needed for Linux < 3.7.
>> @@ -24,5 +24,5 @@ index 0000000..f0ae684
>> +
>> +SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware"
>> --
>> -2.3.3
>> +2.6.4
>>
>> diff --git a/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
>> similarity index 79%
>> rename from meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
>> rename to meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
>> index 6308cc7..03ab0d4 100644
>> --- a/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
>> +++ b/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
>> @@ -1,7 +1,8 @@
>> -From 7f074def4e32045353ba4336d703e17b8de7ec4e Mon Sep 17 00:00:00 2001
>> -From: Jonathan Liu <net147@gmail.com>
>> -Date: Thu, 19 Mar 2015 15:01:33 +1100
>> -Subject: [PATCH] Revert "udev: remove userspace firmware loading support"
>> +From d3661ec7fb4557c47f001986cbb8a684b8dbae4a Mon Sep 17 00:00:00 2001
>> +From: Khem Raj <raj.khem@gmail.com>
>> +Date: Mon, 14 Dec 2015 05:33:32 +0000
>> +Subject: [PATCH 16/16] Revert "udev: remove userspace firmware loading
>> + support"
>>
>> This reverts commit be2ea723b1d023b3d385d3b791ee4607cbfb20ca.
>> Userspace firmware loading support is needed for Linux < 3.7.
>> @@ -9,23 +10,24 @@ Userspace firmware loading support is needed for Linux < 3.7.
>> Upstream-Status: Inappropriate [OE specific]
>>
>> Signed-off-by: Jonathan Liu <net147@gmail.com>
>> +Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> Makefile.am | 12 +++
>> - README | 9 ++-
>> + README | 6 +-
>> TODO | 1 +
>> - configure.ac | 20 +++++
>> + configure.ac | 25 +++++++
>> src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++
>> src/udev/udev-builtin.c | 3 +
>> src/udev/udev.h | 6 ++
>> src/udev/udevd.c | 13 ++++
>> - 8 files changed, 214 insertions(+), 4 deletions(-)
>> + 8 files changed, 217 insertions(+), 3 deletions(-)
>> create mode 100644 src/udev/udev-builtin-firmware.c
>>
>> -Index: git/Makefile.am
>> -===================================================================
>> ---- git.orig/Makefile.am
>> -+++ git/Makefile.am
>> -@@ -3470,6 +3470,18 @@ libudev_core_la_LIBADD = \
>> +diff --git a/Makefile.am b/Makefile.am
>> +index a511c3d..6181e55 100644
>> +--- a/Makefile.am
>> ++++ b/Makefile.am
>> +@@ -3650,6 +3650,18 @@ libudev_core_la_LIBADD = \
>> $(BLKID_LIBS) \
>> $(KMOD_LIBS)
>>
>> @@ -44,21 +46,11 @@ Index: git/Makefile.am
>> if HAVE_KMOD
>> libudev_core_la_SOURCES += \
>> src/udev/udev-builtin-kmod.c
>> -Index: git/README
>> -===================================================================
>> ---- git.orig/README
>> -+++ git/README
>> -@@ -36,7 +36,8 @@ LICENSE:
>> - - except src/udev/* which is (currently still) GPLv2, GPLv2+
>> -
>> - REQUIREMENTS:
>> -- Linux kernel >= 3.7
>> -+ Linux kernel >= 3.0
>> -+ Linux kernel >= 3.3 for loop device partition support features with nspawn
>> - Linux kernel >= 3.8 for Smack support
>> -
>> - Kernel Config Options:
>> -@@ -51,14 +52,14 @@ REQUIREMENTS:
>> +diff --git a/README b/README
>> +index bf67f8c..87b6f70 100644
>> +--- a/README
>> ++++ b/README
>> +@@ -51,14 +51,14 @@ REQUIREMENTS:
>> CONFIG_PROC_FS
>> CONFIG_FHANDLE (libudev, mount and bind mount handling)
>>
>> @@ -76,24 +68,24 @@ Index: git/README
>> CONFIG_FW_LOADER_USER_HELPER=n
>>
>> Some udev rules and virtualization detection relies on it:
>> -Index: git/TODO
>> -===================================================================
>> ---- git.orig/TODO
>> -+++ git/TODO
>> -@@ -754,6 +754,7 @@ Features:
>> - * ExecOnFailure=/usr/bin/foo
>> +diff --git a/TODO b/TODO
>> +index 369805f..ce97674 100644
>> +--- a/TODO
>> ++++ b/TODO
>> +@@ -635,6 +635,7 @@ Features:
>> + * rename "userspace" to "core-os"
>>
>> * udev:
>> + - remove src/udev/udev-builtin-firmware.c (CONFIG_FW_LOADER_USER_HELPER=n)
>> - move to LGPL
>> - kill scsi_id
>> - add trigger --subsystem-match=usb/usb_device device
>> -Index: git/configure.ac
>> -===================================================================
>> ---- git.orig/configure.ac
>> -+++ git/configure.ac
>> -@@ -1268,6 +1268,26 @@ fi
>> - AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
>> +diff --git a/configure.ac b/configure.ac
>> +index a3e639d..00736f5 100644
>> +--- a/configure.ac
>> ++++ b/configure.ac
>> +@@ -1317,6 +1317,25 @@ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database
>> + AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
>>
>> # ------------------------------------------------------------------------------
>> +AC_ARG_WITH(firmware-path,
>> @@ -114,23 +106,28 @@ Index: git/configure.ac
>> +AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])
>> +AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
>> +
>> -+
>> +# ------------------------------------------------------------------------------
>> - AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database support])],
>> - enable_hwdb=$enableval, enable_hwdb=yes)
>> - AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
>> -@@ -1574,6 +1594,7 @@ AC_MSG_RESULT([
>> + have_manpages=no
>> + AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
>> + AS_IF([test "x$enable_manpages" != xno], [
>> +@@ -1616,6 +1635,12 @@ AC_MSG_RESULT([
>> + SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
>> SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
>> Build Python: ${PYTHON}
>> - sphinx binary: ${SPHINX_BUILD}
>> ++<<<<<<< HEAD
>> ++=======
>> ++ Installation Python: ${PYTHON_BINARY}
>> ++ sphinx binary: ${SPHINX_BUILD}
>> + firmware path: ${FIRMWARE_PATH}
>> ++>>>>>>> parent of be2ea72... udev: remove userspace firmware loading support
>> PAM modules dir: ${with_pamlibdir}
>> PAM configuration dir: ${with_pamconfdir}
>> D-Bus policy dir: ${with_dbuspolicydir}
>> -Index: git/src/udev/udev-builtin-firmware.c
>> -===================================================================
>> +diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c
>> +new file mode 100644
>> +index 0000000..bd8c2fb
>> --- /dev/null
>> -+++ git/src/udev/udev-builtin-firmware.c
>> ++++ b/src/udev/udev-builtin-firmware.c
>> @@ -0,0 +1,154 @@
>> +/*
>> + * firmware - Kernel firmware loader
>> @@ -286,11 +283,11 @@ Index: git/src/udev/udev-builtin-firmware.c
>> + .help = "kernel firmware loader",
>> + .run_once = true,
>> +};
>> -Index: git/src/udev/udev-builtin.c
>> -===================================================================
>> ---- git.orig/src/udev/udev-builtin.c
>> -+++ git/src/udev/udev-builtin.c
>> -@@ -30,6 +30,9 @@ static const struct udev_builtin *builti
>> +diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
>> +index 18fb661..d0280bf 100644
>> +--- a/src/udev/udev-builtin.c
>> ++++ b/src/udev/udev-builtin.c
>> +@@ -33,6 +33,9 @@ static const struct udev_builtin *builtins[] = {
>> [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
>> #endif
>> [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
>> @@ -300,11 +297,11 @@ Index: git/src/udev/udev-builtin.c
>> [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
>> [UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
>> [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
>> -Index: git/src/udev/udev.h
>> -===================================================================
>> ---- git.orig/src/udev/udev.h
>> -+++ git/src/udev/udev.h
>> -@@ -146,6 +146,9 @@ enum udev_builtin_cmd {
>> +diff --git a/src/udev/udev.h b/src/udev/udev.h
>> +index 4f40020..8f3560f 100644
>> +--- a/src/udev/udev.h
>> ++++ b/src/udev/udev.h
>> +@@ -149,6 +149,9 @@ enum udev_builtin_cmd {
>> UDEV_BUILTIN_BLKID,
>> #endif
>> UDEV_BUILTIN_BTRFS,
>> @@ -314,7 +311,7 @@ Index: git/src/udev/udev.h
>> UDEV_BUILTIN_HWDB,
>> UDEV_BUILTIN_INPUT_ID,
>> UDEV_BUILTIN_KEYBOARD,
>> -@@ -174,6 +177,9 @@ struct udev_builtin {
>> +@@ -177,6 +180,9 @@ struct udev_builtin {
>> extern const struct udev_builtin udev_builtin_blkid;
>> #endif
>> extern const struct udev_builtin udev_builtin_btrfs;
>> @@ -324,11 +321,11 @@ Index: git/src/udev/udev.h
>> extern const struct udev_builtin udev_builtin_hwdb;
>> extern const struct udev_builtin udev_builtin_input_id;
>> extern const struct udev_builtin udev_builtin_keyboard;
>> -Index: git/src/udev/udevd.c
>> -===================================================================
>> ---- git.orig/src/udev/udevd.c
>> -+++ git/src/udev/udevd.c
>> -@@ -116,6 +116,9 @@ struct event {
>> +diff --git a/src/udev/udevd.c b/src/udev/udevd.c
>> +index 366e7fb..7ca1b51 100644
>> +--- a/src/udev/udevd.c
>> ++++ b/src/udev/udevd.c
>> +@@ -127,6 +127,9 @@ struct event {
>> bool is_block;
>> sd_event_source *timeout_warning;
>> sd_event_source *timeout;
>> @@ -338,7 +335,7 @@ Index: git/src/udev/udevd.c
>> };
>>
>> static inline struct event *node_to_event(struct udev_list_node *node) {
>> -@@ -607,6 +610,10 @@ static int event_queue_insert(Manager *m
>> +@@ -615,6 +618,10 @@ static int event_queue_insert(Manager *manager, struct udev_device *dev) {
>> event->devnum = udev_device_get_devnum(dev);
>> event->is_block = streq("block", udev_device_get_subsystem(dev));
>> event->ifindex = udev_device_get_ifindex(dev);
>> @@ -349,7 +346,7 @@ Index: git/src/udev/udevd.c
>>
>> log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev),
>> udev_device_get_action(dev), udev_device_get_subsystem(dev));
>> -@@ -692,6 +699,12 @@ static bool is_devpath_busy(Manager *man
>> +@@ -700,6 +707,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) {
>> return true;
>> }
>>
>> @@ -362,3 +359,6 @@ Index: git/src/udev/udevd.c
>> /* parent device event found */
>> if (event->devpath[common] == '/') {
>> event->delaying_seqnum = loop_event->seqnum;
>> +--
>> +2.6.4
>> +
>> diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_228.bb
>> similarity index 93%
>> rename from meta/recipes-core/systemd/systemd_225.bb
>> rename to meta/recipes-core/systemd/systemd_228.bb
>> index 428158a..551a82f 100644
>> --- a/meta/recipes-core/systemd/systemd_225.bb
>> +++ b/meta/recipes-core/systemd/systemd_228.bb
>> @@ -24,39 +24,38 @@ SECTION = "base/shell"
>>
>> inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext
>>
>> -SRCREV = "e1439a1472c5f691733b8ef10e702beac2496a63"
>> +SRCREV = "dd050decb6ad131ebdeabb71c4f9ecb4733269c0"
>>
>> -PV = "225+git${SRCPV}"
>> +PV = "228+git${SRCPV}"
>>
>> SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \
>> - 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://0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
>> + file://0006-configure-Check-for-additional-features-that-uclibc-.patch \
>> + file://0007-nspawn-Use-execvpe-only-when-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://0012-implment-systemd-sysv-install-for-OE.patch \
>> - file://0014-Revert-rules-remove-firmware-loading-rules.patch \
>> - file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
>> + file://0009-implment-systemd-sysv-install-for-OE.patch \
>> + file://0010-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch \
>> + file://0011-rules-whitelist-hd-devices.patch \
>> + file://0012-sysv-generator-add-support-for-executing-scripts-und.patch \
>> + file://0013-Make-root-s-home-directory-configurable.patch \
>> + file://0014-systemd-user-avoid-using-system-auth.patch \
>> + file://0015-Revert-rules-remove-firmware-loading-rules.patch \
>> + file://0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
>> file://touchscreen.rules \
>> file://00-create-volatile.conf \
>> file://init \
>> file://run-ptest \
>> - file://rules-whitelist-hd-devices.patch \
>> "
>> -SRC_URI_append_qemuall = " file://qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch"
>> +SRC_URI_append_libc-uclibc = "\
>> + file://0001-define-exp10-if-missing.patch \
>> + file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \
>> + file://0003-Use-getenv-when-secure-versions-are-not-available.patch \
>> + "
>> +SRC_URI_append_qemuall = " file://0004-core-device.c-Change-the-default-device-timeout-to-2.patch "
>>
>> S = "${WORKDIR}/git"
>>
>> -SRC_URI_append_libc-uclibc = "\
>> - file://0001-units-Prefer-getty-to-agetty-in-console-setup-system.patch \
>> - file://0022-Use-getenv-when-secure-versions-are-not-available.patch \
>> - file://0001-fix-build-on-uClibc-exp10.patch \
>> - "
>> -LDFLAGS_append_libc-uclibc = " -lrt"
>> +LDFLAGS_append_libc-uclibc = " -lrt -lssp_nonshared -lssp "
>>
>> GTKDOC_DOCDIR = "${S}/docs/"
>>
>> @@ -65,7 +64,6 @@ PACKAGECONFIG ??= "xz ldconfig \
>> ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
>> ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
>> "
>> -
>> PACKAGECONFIG[journal-upload] = "--enable-libcurl,--disable-libcurl,curl"
>> # Sign the journal for anti-tampering
>> PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
>> @@ -127,7 +125,7 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
>> --with-firmware-path=/lib/firmware \
>> "
>> # uclibc does not have NSS
>> -EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "
>> +EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname --disable-sysusers"
>>
>> # per the systemd README, define VALGRIND=1 to run under valgrind
>> CFLAGS .= "${@bb.utils.contains('PACKAGECONFIG', 'valgrind', ' -DVALGRIND=1', '', d)}"
>> --
>> 2.6.4
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 6/6] musl: Update to latest 1.1.12 release
2015-12-14 6:22 [PATCH 0/6] gcc/uclibc/musl updates Khem Raj
` (4 preceding siblings ...)
2015-12-14 6:23 ` [PATCH 5/6] systemd: Upgrade to 228 Khem Raj
@ 2015-12-14 6:23 ` Khem Raj
5 siblings, 0 replies; 17+ messages in thread
From: Khem Raj @ 2015-12-14 6:23 UTC (permalink / raw)
To: openembedded-core
point to maintained github mirror in comments
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/musl/musl_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 1feb436..051d925 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -3,11 +3,11 @@
require musl.inc
-SRCREV = "6c5cad2aa56745302c1d42d2c8baf6424d29c0f3"
+SRCREV = "3abb094d19ca4c7c4adcf373d971fb5aa05c5252"
-PV = "1.1.11+git${SRCPV}"
+PV = "1.1.12+git${SRCPV}"
-# mirror is at git://github.com/bminor/musl.git
+# mirror is at git://github.com/kraj/musl.git
SRC_URI = "git://git.musl-libc.org/musl \
"
--
2.6.4
^ permalink raw reply related [flat|nested] 17+ messages in thread