Skip to contentSkip to conversation

systemd: upgrade to 215

PATCH Superseded Chen Qi 2 participants 3 messages Jul 31, 2014

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

v4 cover systemd: upgrade to 215

The following changes since commit 7986adeac16550b33f65fded39a55f668e0e543f:

populate_sdk_base: Fix grep command usage on old hosts (2014-07-29 09:57:54 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib ChenQi/systemd_215
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/systemd_215

Chen Qi (1):
systemd: upgrade to 215

 .../0001-Fix-compilation-error-for-ppc.patch       |   41 ++++++++++++++
 .../systemd/systemd/systemd-older-kernel.patch     |   56 --------------------
 .../systemd/{systemd_213.bb => systemd_215.bb}     |    9 ++--
 3 files changed, 46 insertions(+), 60 deletions(-)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-compilation-error-for-ppc.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/systemd-older-kernel.patch
 rename meta/recipes-core/systemd/{systemd_213.bb => systemd_215.bb} (98%)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v4 1/1 systemd: upgrade to 215

Upgrade systemd from 213 to 215.

systemd-older-kernel.patch is removed as it's fixed in 215.

A new patch is added to fix compilation error for qemuppc.

0001-Fix-compilation-error-for-ppc.patch

---
 .../0001-Fix-compilation-error-for-ppc.patch       |   41 ++++++++++++++
 .../systemd/systemd/systemd-older-kernel.patch     |   56 --------------------
 .../systemd/{systemd_213.bb => systemd_215.bb}     |    9 ++--
 3 files changed, 46 insertions(+), 60 deletions(-)
 create mode 100644 meta/recipes-core/systemd/systemd/0001-Fix-compilation-error-for-ppc.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/systemd-older-kernel.patch
 rename meta/recipes-core/systemd/{systemd_213.bb => systemd_215.bb} (98%)
meta/recipes-core/systemd/systemd/0001-Fix-compilation-error-for-ppc.patch new file +41 -0
new file mode 100644
index 0000000..41cc121
@@ -0,0 +1,41 @@
+Upstream-Status: Pending
+
+Subject: Fix compilation error for ppc
+
+This patch comes from https://www.mail-archive.com/[email protected]/msg20892.html,
+but hasn't been merged.
+
+gcc does not define WORDS_BIGENDIAN for big-endian PowerPC. It defines
+__BIG_ENDIAN__ instead. So also check for __BIG_ENDIAN__ to determine if
+the system is big-endian.
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ src/shared/architecture.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/architecture.h b/src/shared/architecture.h
+index 4821d5d..ba42761 100644
+--- a/src/shared/architecture.h
++++ b/src/shared/architecture.h
+@@ -80,7 +80,7 @@ Architecture uname_architecture(void);
+ #  define native_architecture() ARCHITECTURE_X86
+ #  define LIB_ARCH_TUPLE "i386-linux-gnu"
+ #elif defined(__powerpc64__)
+-#  if defined(WORDS_BIGENDIAN)
++#  if defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__)
+ #    define native_architecture() ARCHITECTURE_PPC64
+ #    define LIB_ARCH_TUPLE "ppc64-linux-gnu"
+ #  else
+@@ -88,7 +88,7 @@ Architecture uname_architecture(void);
+ #    error "Missing LIB_ARCH_TUPLE for PPC64LE"
+ #  endif
+ #elif defined(__powerpc__)
+-#  if defined(WORDS_BIGENDIAN)
++#  if defined(WORDS_BIGENDIAN) || defined(__BIG_ENDIAN__)
+ #    define native_architecture() ARCHITECTURE_PPC
+ #    define LIB_ARCH_TUPLE "powerpc-linux-gnu"
+ #  else
+-- 
+1.7.9.5
+
meta/recipes-core/systemd/systemd/systemd-older-kernel.patch deleted +0 -56

56 lines not on this page · raw message

meta/recipes-core/systemd/systemd_215.bb renamed from meta/recipes-core/systemd/systemd_213.bb +5 -4
similarity index 98%
rename from meta/recipes-core/systemd/systemd_213.bb
rename to meta/recipes-core/systemd/systemd_215.bb
index 5de7cdc..7399c98 100644
@@ -17,9 +17,9 @@ SECTION = "base/shell"
 
 inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest
 
-SRCREV = "c9679c652b3c31f2510e8805d81630680ebc7e95"
+SRCREV = "252ff40a3827b4e8e62e03a5e2f80da3fe02bee6"
 
-PV = "213+git${SRCPV}"
+PV = "215+git${SRCPV}"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \
            file://binfmt-install.patch \
@@ -31,12 +31,12 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
            file://0001-uClibc-doesn-t-implement-pwritev-preadv.patch \
            file://uclibc-sysinfo_h.patch \
            file://uclibc-get-physmem.patch \
+           file://0001-Fix-compilation-error-for-ppc.patch \
            file://touchscreen.rules \
            file://00-create-volatile.conf \
            file://init \
            file://run-ptest \
-           file://systemd-older-kernel.patch \
-          "
+         "
 
 S = "${WORKDIR}/git"
 
@@ -231,6 +231,7 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${exec_prefix}/lib/systemd \
                 ${exec_prefix}/lib/modules-load.d \
                 ${exec_prefix}/lib/sysctl.d \
+                ${exec_prefix}/lib/sysusers.d \
                 ${localstatedir} \
                 /lib/udev/rules.d/70-uaccess.rules \
                 /lib/udev/rules.d/71-seat.rules \
Signature · 1 line
1.7.9.5
#2 lore raw
Quoted 9 lines · Chen Qi
meta/recipes-core/systemd/systemd/0001-Fix-compilation-error-for-ppc.patch new file +6 -0
@@ -0,0 +1,41 @@
+Upstream-Status: Pending
+
+Subject: Fix compilation error for ppc
+
+This patch comes from https://www.mail-archive.com/[email protected]/msg20892.html,
+but hasn't been merged.

meta/recipes-core/systemd/systemd/0001-Fix-compilation-error-for-ppc.patch line 16

Quoted 10 lines
meta/recipes-core/systemd/systemd/0001-Fix-compilation-error-for-ppc.patch new file +10 -0
+
+gcc does not define WORDS_BIGENDIAN for big-endian PowerPC. It defines
+__BIG_ENDIAN__ instead. So also check for __BIG_ENDIAN__ to determine if
+the system is big-endian.
+
+Signed-off-by: Chen Qi <[email protected]>
+---
+ src/shared/architecture.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+

you should drop this patch and backport these two patches

http://cgit.freedesktop.org/systemd/systemd/commit/?id=4f4b92ba7ae9c56cb0f181d5f95d709e085b8bd5

http://cgit.freedesktop.org/systemd/systemd/commit/?id=6017365a1d0c1c78fc34a7da63768ee5df5da511