* [PATCH 0/3] Update systemd/kmod
@ 2013-08-22 4:30 Khem Raj
2013-08-22 4:31 ` [PATCH 1/3] kmod: Upgrade to version 14 Khem Raj
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: Khem Raj @ 2013-08-22 4:30 UTC (permalink / raw)
To: openembedded-core
This patchset updates systemd to 206 and kmod to 14
kmod 14 is now minimum version needed for systemd >= 206
glib-2.0 fix is needed for minimal-image to build
with uclibc
This has been boot tested on all supported qemus in OE-Core with
minimal-image build with both eglibc/uclibc and systemd-image
on angstrom
The following changes since commit d98f08a7ad95d0b17846276b028a6614f16b6846:
genext2fs: fix memory corruption on powerpc (2013-08-20 07:11:44 -0700)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib kraj/systemd-206
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/systemd-206
Khem Raj (3):
kmod: Upgrade to version 14
systemd: Upgrade to 206
glib-2.0: Specify libiconv when building on uclibc
meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb | 1 +
...1-uClibc-doesn-t-implement-pwritev-preadv.patch | 37 +++
.../0001-use-CAP_MKNOD-ConditionCapability.patch | 32 ++
...ystemd-update-utmp-shutdown.service-into-.patch | 367 ---------------------
.../systemd/systemd/install-quotaon-once.patch | 34 --
.../systemd/systemd-pam-fix-getty-unit.patch | 24 +-
.../systemd/systemd/systemd-pam-fix-mkostemp.patch | 59 ++--
.../systemd/{systemd_204.bb => systemd_206.bb} | 19 +-
meta/recipes-kernel/kmod/kmod-native_git.bb | 1 -
meta/recipes-kernel/kmod/kmod.inc | 9 +-
...-man-page-generation-because-we-don-t-hav.patch | 26 --
.../kmod/kmod/fix-undefined-O_CLOEXEC.patch | 16 +-
meta/recipes-kernel/kmod/kmod_git.bb | 3 +-
13 files changed, 134 insertions(+), 494 deletions(-)
create mode 100644 meta/recipes-core/systemd/systemd/0001-uClibc-doesn-t-implement-pwritev-preadv.patch
create mode 100644 meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
delete mode 100644 meta/recipes-core/systemd/systemd/install-quotaon-once.patch
rename meta/recipes-core/systemd/{systemd_204.bb => systemd_206.bb} (95%)
delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch
--
1.8.3.4
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 1/3] kmod: Upgrade to version 14 2013-08-22 4:30 [PATCH 0/3] Update systemd/kmod Khem Raj @ 2013-08-22 4:31 ` Khem Raj 2013-08-22 21:54 ` Saul Wold 2013-08-22 4:31 ` [PATCH 2/3] systemd: Upgrade to 206 Khem Raj 2013-08-22 4:31 ` [PATCH 3/3] glib-2.0: Specify libiconv when building on uclibc Khem Raj 2 siblings, 1 reply; 13+ messages in thread From: Khem Raj @ 2013-08-22 4:31 UTC (permalink / raw) To: openembedded-core The update is a requirement for systemd-206 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-kernel/kmod/kmod-native_git.bb | 1 - meta/recipes-kernel/kmod/kmod.inc | 9 ++++---- ...-man-page-generation-because-we-don-t-hav.patch | 26 ---------------------- .../kmod/kmod/fix-undefined-O_CLOEXEC.patch | 16 ++++++------- meta/recipes-kernel/kmod/kmod_git.bb | 3 +-- 5 files changed, 13 insertions(+), 42 deletions(-) delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb index 8cbcdf8..afa3ad0 100644 --- a/meta/recipes-kernel/kmod/kmod-native_git.bb +++ b/meta/recipes-kernel/kmod/kmod-native_git.bb @@ -4,7 +4,6 @@ require kmod.inc inherit native -PR = "${INC_PR}.1" SRC_URI += "file://fix-undefined-O_CLOEXEC.patch" do_install_append (){ diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index a780b6c..1728a4e 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc @@ -7,8 +7,6 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/" LICENSE = "GPL-2.0+ & LGPL-2.1+" LICENSE_libkmod = "LGPL-2.1+" SECTION = "base" -PV = "9" -INC_PR = "r0" DEPENDS += "pkgconfig-native" @@ -19,17 +17,18 @@ inherit autotools gtk-doc ptest SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ file://depmod-search.conf \ - file://0001-man-disable-man-page-generation-because-we-don-t-hav.patch \ file://run-ptest \ file://ptest.patch \ " -SRCREV = "62081c0f68905b22f375156d4532fd37fa5c8d33" +SRCREV = "3b38c7fcb58be4ddc34f90454c5f5dc3693d2d85" +# Lookout for PV bump too when SRCREV is changed +PV = "14" S = "${WORKDIR}/git" EXTRA_AUTORECONF += "--install --symlink" -EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools" +EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools --disable-manpages" do_configure_prepend () { gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make diff --git a/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch b/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch deleted file mode 100644 index 5361b84..0000000 --- a/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ce6f0cabb65e67dd4d31e1e555db8bc6eaf435d3 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Fri, 24 Feb 2012 07:35:38 +0100 -Subject: [PATCH] man: disable man page generation because we don't have - working xsltproc - -Upstream-Status: Inappropriate [build system specific change] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 141c102..a8bdfd1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = . libkmod/docs man -+SUBDIRS = . libkmod/docs - - DISTCLEAN_LOCAL_HOOKS = - EXTRA_DIST = --- -1.7.8.4 - diff --git a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch index 3177e9a..0268216 100644 --- a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch +++ b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch @@ -2,16 +2,16 @@ Upstream-Status: Not applicable Index: git/libkmod/libkmod-private.h =================================================================== ---- git.orig/libkmod/libkmod-private.h -+++ git/libkmod/libkmod-private.h -@@ -1,6 +1,10 @@ - #ifndef _LIBKMOD_PRIVATE_H_ - #define _LIBKMOD_PRIVATE_H_ +--- git.orig/libkmod/libkmod-private.h 2013-08-21 10:07:51.000000000 -0700 ++++ git/libkmod/libkmod-private.h 2013-08-21 14:34:04.558278849 -0700 +@@ -9,6 +9,10 @@ + #include "macro.h" + #include "libkmod.h" +#ifndef O_CLOEXEC +# define O_CLOEXEC 0 +#endif + - #include <stdbool.h> - #include <stdio.h> - #include <syslog.h> + static _always_inline_ _printf_format_(2, 3) void + kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {} + diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb index f92ff72..b07c06e 100644 --- a/meta/recipes-kernel/kmod/kmod_git.bb +++ b/meta/recipes-kernel/kmod/kmod_git.bb @@ -3,8 +3,7 @@ require kmod.inc -PR = "${INC_PR}.0" -PV = "9+git${SRCPV}" +PV_append = "+git${SRCPV}" PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" -- 1.8.3.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] kmod: Upgrade to version 14 2013-08-22 4:31 ` [PATCH 1/3] kmod: Upgrade to version 14 Khem Raj @ 2013-08-22 21:54 ` Saul Wold 2013-08-23 4:09 ` Khem Raj 0 siblings, 1 reply; 13+ messages in thread From: Saul Wold @ 2013-08-22 21:54 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core On 08/21/2013 09:31 PM, Khem Raj wrote: > The update is a requirement for systemd-206 > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > meta/recipes-kernel/kmod/kmod-native_git.bb | 1 - > meta/recipes-kernel/kmod/kmod.inc | 9 ++++---- > ...-man-page-generation-because-we-don-t-hav.patch | 26 ---------------------- > .../kmod/kmod/fix-undefined-O_CLOEXEC.patch | 16 ++++++------- > meta/recipes-kernel/kmod/kmod_git.bb | 3 +-- > 5 files changed, 13 insertions(+), 42 deletions(-) > delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch > Did you build the native version? I am seeing failures in MUT on the autobuilder. It did pass my "sniff" test on my 2 local world builds. > | x86_64-linux-libtool: link: gcc -std=gnu99 -pipe -DANOTHER_BRICK_IN_THE -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wwrite-strings -Wno-long-long -Wno-overlength-strings -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result -Wnested-externs -Wchar-subscripts -Wtype-limits -Wuninitialized -fno-common -fdiagnostics-show-option -fvisibility=hidden -ffunction-sections -fdata-sections -isystem/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wl,--as-needed -Wl,--gc-sections -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux /usr/lib -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -o tools/test/kmod tools/kmod.o tools/lsmod.o tools/rmmod.o tools/insmod.o tools/modinfo.o tools/modprobe.o tools/depmod.o tools/log.o tools/static-nodes.o -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib libkmod/.libs/libkmod-util.a libkmod/.libs/libkmod-private.a Nice ester egg ^^^^^^^^^^^^^^^^ > | tools/kmod.o: In function `kmod_help': > | kmod.c:(.text.kmod_help+0x27): undefined reference to `_Static_assert' > | kmod.c:(.text.kmod_help+0x5c): undefined reference to `_Static_assert' > | kmod.c:(.text.kmod_help+0x7f): undefined reference to `_Static_assert' > | kmod.c:(.text.kmod_help+0xb9): undefined reference to `_Static_assert' > | tools/kmod.o: In function `main': > | kmod.c:(.text.main+0x5b): undefined reference to `_Static_assert' > | tools/kmod.o:kmod.c:(.text.main+0x8c): more undefined references to `_Static_assert' follow > | collect2: ld returned 1 exit status > | make[2]: *** [tools/test/kmod] Error 1 > | make[2]: *** Waiting for unfinished jobs.... > | x86_64-linux-libtool: link: gcc -std=gnu99 -pipe -DANOTHER_BRICK_IN_THE -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wwrite-strings -Wno-long-long -Wno-overlength-strings -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result -Wnested-externs -Wchar-subscripts -Wtype-limits -Wuninitialized -fno-common -fdiagnostics-show-option -fvisibility=hidden -ffunction-sections -fdata-sections -isystem/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wl,--as-needed -Wl,--gc-sections -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux /usr/lib -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -o tools/.libs/kmod tools/kmod.o tools/lsmod.o tools/rmmod.o tools/insmod.o tools/modinfo.o tools/modprobe.o tools/depmod.o tools/log.o tools/static-nodes.o -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib libkmod/.libs/libkmod-util.a libkmod/.libs/libkmod.so -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib > | tools/kmod.o: In function `kmod_help': > | kmod.c:(.text.kmod_help+0x27): undefined reference to `_Static_assert' > | kmod.c:(.text.kmod_help+0x5c): undefined reference to `_Static_assert' > | kmod.c:(.text.kmod_help+0x7f): undefined reference to `_Static_assert' > | kmod.c:(.text.kmod_help+0xb9): undefined reference to `_Static_assert' > | tools/kmod.o: In function `main': > | kmod.c:(.text.main+0x5b): undefined reference to `_Static_assert' > | tools/kmod.o:kmod.c:(.text.main+0x8c): more undefined references to `_Static_assert' follow > | collect2: ld returned 1 exit status > | make[2]: *** [tools/kmod] Error 1 Sau! > diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb > index 8cbcdf8..afa3ad0 100644 > --- a/meta/recipes-kernel/kmod/kmod-native_git.bb > +++ b/meta/recipes-kernel/kmod/kmod-native_git.bb > @@ -4,7 +4,6 @@ > require kmod.inc > inherit native > > -PR = "${INC_PR}.1" > SRC_URI += "file://fix-undefined-O_CLOEXEC.patch" > > do_install_append (){ > diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc > index a780b6c..1728a4e 100644 > --- a/meta/recipes-kernel/kmod/kmod.inc > +++ b/meta/recipes-kernel/kmod/kmod.inc > @@ -7,8 +7,6 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/" > LICENSE = "GPL-2.0+ & LGPL-2.1+" > LICENSE_libkmod = "LGPL-2.1+" > SECTION = "base" > -PV = "9" > -INC_PR = "r0" > > DEPENDS += "pkgconfig-native" > > @@ -19,17 +17,18 @@ inherit autotools gtk-doc ptest > > SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ > file://depmod-search.conf \ > - file://0001-man-disable-man-page-generation-because-we-don-t-hav.patch \ > file://run-ptest \ > file://ptest.patch \ > " > > -SRCREV = "62081c0f68905b22f375156d4532fd37fa5c8d33" > +SRCREV = "3b38c7fcb58be4ddc34f90454c5f5dc3693d2d85" > +# Lookout for PV bump too when SRCREV is changed > +PV = "14" > > S = "${WORKDIR}/git" > > EXTRA_AUTORECONF += "--install --symlink" > -EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools" > +EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools --disable-manpages" > > do_configure_prepend () { > gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make > diff --git a/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch b/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch > deleted file mode 100644 > index 5361b84..0000000 > --- a/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From ce6f0cabb65e67dd4d31e1e555db8bc6eaf435d3 Mon Sep 17 00:00:00 2001 > -From: Martin Jansa <Martin.Jansa@gmail.com> > -Date: Fri, 24 Feb 2012 07:35:38 +0100 > -Subject: [PATCH] man: disable man page generation because we don't have > - working xsltproc > - > -Upstream-Status: Inappropriate [build system specific change] > - > -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > ---- > - Makefile.am | 2 +- > - 1 files changed, 1 insertions(+), 1 deletions(-) > - > -diff --git a/Makefile.am b/Makefile.am > -index 141c102..a8bdfd1 100644 > ---- a/Makefile.am > -+++ b/Makefile.am > -@@ -1,4 +1,4 @@ > --SUBDIRS = . libkmod/docs man > -+SUBDIRS = . libkmod/docs > - > - DISTCLEAN_LOCAL_HOOKS = > - EXTRA_DIST = > --- > -1.7.8.4 > - > diff --git a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch > index 3177e9a..0268216 100644 > --- a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch > +++ b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch > @@ -2,16 +2,16 @@ Upstream-Status: Not applicable > > Index: git/libkmod/libkmod-private.h > =================================================================== > ---- git.orig/libkmod/libkmod-private.h > -+++ git/libkmod/libkmod-private.h > -@@ -1,6 +1,10 @@ > - #ifndef _LIBKMOD_PRIVATE_H_ > - #define _LIBKMOD_PRIVATE_H_ > +--- git.orig/libkmod/libkmod-private.h 2013-08-21 10:07:51.000000000 -0700 > ++++ git/libkmod/libkmod-private.h 2013-08-21 14:34:04.558278849 -0700 > +@@ -9,6 +9,10 @@ > + #include "macro.h" > + #include "libkmod.h" > > +#ifndef O_CLOEXEC > +# define O_CLOEXEC 0 > +#endif > + > - #include <stdbool.h> > - #include <stdio.h> > - #include <syslog.h> > + static _always_inline_ _printf_format_(2, 3) void > + kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {} > + > diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb > index f92ff72..b07c06e 100644 > --- a/meta/recipes-kernel/kmod/kmod_git.bb > +++ b/meta/recipes-kernel/kmod/kmod_git.bb > @@ -3,8 +3,7 @@ > > require kmod.inc > > -PR = "${INC_PR}.0" > -PV = "9+git${SRCPV}" > +PV_append = "+git${SRCPV}" > > PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" > RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] kmod: Upgrade to version 14 2013-08-22 21:54 ` Saul Wold @ 2013-08-23 4:09 ` Khem Raj 2013-08-23 20:37 ` Saul Wold 0 siblings, 1 reply; 13+ messages in thread From: Khem Raj @ 2013-08-23 4:09 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On Aug 22, 2013, at 2:54 PM, Saul Wold <sgw@linux.intel.com> wrote: > On 08/21/2013 09:31 PM, Khem Raj wrote: >> The update is a requirement for systemd-206 >> >> Signed-off-by: Khem Raj <raj.khem@gmail.com> >> --- >> meta/recipes-kernel/kmod/kmod-native_git.bb | 1 - >> meta/recipes-kernel/kmod/kmod.inc | 9 ++++---- >> ...-man-page-generation-because-we-don-t-hav.patch | 26 ---------------------- >> .../kmod/kmod/fix-undefined-O_CLOEXEC.patch | 16 ++++++------- >> meta/recipes-kernel/kmod/kmod_git.bb | 3 +-- >> 5 files changed, 13 insertions(+), 42 deletions(-) >> delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch >> > > Did you build the native version? I am seeing failures in MUT on the autobuilder. It did pass my "sniff" test on my 2 local world builds. yes and multiple times. what distro do you run on your build boxes ? I wonder if its some sort of race condition I use -j20 and -j16 % bitbake kmod-native Loading cache: 100% |###########################################| ETA: 00:00:00 Loaded 1197 entries from dependency cache. Build Configuration: BB_VERSION = "1.19.1" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "Ubuntu-12.04" TARGET_SYS = "x86_64-oe-linux" MACHINE = "qemux86-64" DISTRO_VERSION = "oe-core.0" TUNE_FEATURES = "m64" TARGET_FPU = "" meta = "master:2176bfd1099287056432780d0ee6b202e94bd1ee" NOTE: Resolving any missing task queue dependencies NOTE: Preparing runqueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks NOTE: Tasks Summary: Attempted 72 tasks of which 60 didn't need to be rerun and all succeeded. > >> | x86_64-linux-libtool: link: gcc -std=gnu99 -pipe -DANOTHER_BRICK_IN_THE -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wwrite-strings -Wno-long-long -Wno-overlength-strings -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result -Wnested-externs -Wchar-subscripts -Wtype-limits -Wuninitialized -fno-common -fdiagnostics-show-option -fvisibility=hidden -ffunction-sections -fdata-sections -isystem/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wl,--as-needed -Wl,--gc-sections -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux > /usr/lib -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -o tools/test/kmod tools/kmod.o tools/lsmod.o tools/rmmod.o tools/insmod.o tools/modinfo.o tools/modprobe.o tools/depmod.o tools/log.o tools/static-nodes.o -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib libkmod/.libs/libkmod-util.a libkmod/.libs/libkmod-private.a > Nice ester egg ^^^^^^^^^^^^^^^^ >> | tools/kmod.o: In function `kmod_help': >> | kmod.c:(.text.kmod_help+0x27): undefined reference to `_Static_assert' >> | kmod.c:(.text.kmod_help+0x5c): undefined reference to `_Static_assert' >> | kmod.c:(.text.kmod_help+0x7f): undefined reference to `_Static_assert' >> | kmod.c:(.text.kmod_help+0xb9): undefined reference to `_Static_assert' >> | tools/kmod.o: In function `main': >> | kmod.c:(.text.main+0x5b): undefined reference to `_Static_assert' >> | tools/kmod.o:kmod.c:(.text.main+0x8c): more undefined references to `_Static_assert' follow >> | collect2: ld returned 1 exit status >> | make[2]: *** [tools/test/kmod] Error 1 >> | make[2]: *** Waiting for unfinished jobs.... >> | x86_64-linux-libtool: link: gcc -std=gnu99 -pipe -DANOTHER_BRICK_IN_THE -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wwrite-strings -Wno-long-long -Wno-overlength-strings -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result -Wnested-externs -Wchar-subscripts -Wtype-limits -Wuninitialized -fno-common -fdiagnostics-show-option -fvisibility=hidden -ffunction-sections -fdata-sections -isystem/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wl,--as-needed -Wl,--gc-sections -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux > /usr/lib -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -o tools/.libs/kmod tools/kmod.o tools/lsmod.o tools/rmmod.o tools/insmod.o tools/modinfo.o tools/modprobe.o tools/depmod.o tools/log.o tools/static-nodes.o -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib libkmod/.libs/libkmod-util.a libkmod/.libs/libkmod.so -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib >> | tools/kmod.o: In function `kmod_help': >> | kmod.c:(.text.kmod_help+0x27): undefined reference to `_Static_assert' >> | kmod.c:(.text.kmod_help+0x5c): undefined reference to `_Static_assert' >> | kmod.c:(.text.kmod_help+0x7f): undefined reference to `_Static_assert' >> | kmod.c:(.text.kmod_help+0xb9): undefined reference to `_Static_assert' >> | tools/kmod.o: In function `main': >> | kmod.c:(.text.main+0x5b): undefined reference to `_Static_assert' >> | tools/kmod.o:kmod.c:(.text.main+0x8c): more undefined references to `_Static_assert' follow >> | collect2: ld returned 1 exit status >> | make[2]: *** [tools/kmod] Error 1 > > > Sau! > > >> diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb >> index 8cbcdf8..afa3ad0 100644 >> --- a/meta/recipes-kernel/kmod/kmod-native_git.bb >> +++ b/meta/recipes-kernel/kmod/kmod-native_git.bb >> @@ -4,7 +4,6 @@ >> require kmod.inc >> inherit native >> >> -PR = "${INC_PR}.1" >> SRC_URI += "file://fix-undefined-O_CLOEXEC.patch" >> >> do_install_append (){ >> diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc >> index a780b6c..1728a4e 100644 >> --- a/meta/recipes-kernel/kmod/kmod.inc >> +++ b/meta/recipes-kernel/kmod/kmod.inc >> @@ -7,8 +7,6 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/" >> LICENSE = "GPL-2.0+ & LGPL-2.1+" >> LICENSE_libkmod = "LGPL-2.1+" >> SECTION = "base" >> -PV = "9" >> -INC_PR = "r0" >> >> DEPENDS += "pkgconfig-native" >> >> @@ -19,17 +17,18 @@ inherit autotools gtk-doc ptest >> >> SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ >> file://depmod-search.conf \ >> - file://0001-man-disable-man-page-generation-because-we-don-t-hav.patch \ >> file://run-ptest \ >> file://ptest.patch \ >> " >> >> -SRCREV = "62081c0f68905b22f375156d4532fd37fa5c8d33" >> +SRCREV = "3b38c7fcb58be4ddc34f90454c5f5dc3693d2d85" >> +# Lookout for PV bump too when SRCREV is changed >> +PV = "14" >> >> S = "${WORKDIR}/git" >> >> EXTRA_AUTORECONF += "--install --symlink" >> -EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools" >> +EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools --disable-manpages" >> >> do_configure_prepend () { >> gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make >> diff --git a/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch b/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch >> deleted file mode 100644 >> index 5361b84..0000000 >> --- a/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch >> +++ /dev/null >> @@ -1,26 +0,0 @@ >> -From ce6f0cabb65e67dd4d31e1e555db8bc6eaf435d3 Mon Sep 17 00:00:00 2001 >> -From: Martin Jansa <Martin.Jansa@gmail.com> >> -Date: Fri, 24 Feb 2012 07:35:38 +0100 >> -Subject: [PATCH] man: disable man page generation because we don't have >> - working xsltproc >> - >> -Upstream-Status: Inappropriate [build system specific change] >> - >> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >> ---- >> - Makefile.am | 2 +- >> - 1 files changed, 1 insertions(+), 1 deletions(-) >> - >> -diff --git a/Makefile.am b/Makefile.am >> -index 141c102..a8bdfd1 100644 >> ---- a/Makefile.am >> -+++ b/Makefile.am >> -@@ -1,4 +1,4 @@ >> --SUBDIRS = . libkmod/docs man >> -+SUBDIRS = . libkmod/docs >> - >> - DISTCLEAN_LOCAL_HOOKS = >> - EXTRA_DIST = >> --- >> -1.7.8.4 >> - >> diff --git a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch >> index 3177e9a..0268216 100644 >> --- a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch >> +++ b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch >> @@ -2,16 +2,16 @@ Upstream-Status: Not applicable >> >> Index: git/libkmod/libkmod-private.h >> =================================================================== >> ---- git.orig/libkmod/libkmod-private.h >> -+++ git/libkmod/libkmod-private.h >> -@@ -1,6 +1,10 @@ >> - #ifndef _LIBKMOD_PRIVATE_H_ >> - #define _LIBKMOD_PRIVATE_H_ >> +--- git.orig/libkmod/libkmod-private.h 2013-08-21 10:07:51.000000000 -0700 >> ++++ git/libkmod/libkmod-private.h 2013-08-21 14:34:04.558278849 -0700 >> +@@ -9,6 +9,10 @@ >> + #include "macro.h" >> + #include "libkmod.h" >> >> +#ifndef O_CLOEXEC >> +# define O_CLOEXEC 0 >> +#endif >> + >> - #include <stdbool.h> >> - #include <stdio.h> >> - #include <syslog.h> >> + static _always_inline_ _printf_format_(2, 3) void >> + kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {} >> + >> diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb >> index f92ff72..b07c06e 100644 >> --- a/meta/recipes-kernel/kmod/kmod_git.bb >> +++ b/meta/recipes-kernel/kmod/kmod_git.bb >> @@ -3,8 +3,7 @@ >> >> require kmod.inc >> >> -PR = "${INC_PR}.0" >> -PV = "9+git${SRCPV}" >> +PV_append = "+git${SRCPV}" >> >> PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" >> RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" >> ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] kmod: Upgrade to version 14 2013-08-23 4:09 ` Khem Raj @ 2013-08-23 20:37 ` Saul Wold 2013-08-26 21:22 ` Khem Raj 0 siblings, 1 reply; 13+ messages in thread From: Saul Wold @ 2013-08-23 20:37 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core On 08/22/2013 09:09 PM, Khem Raj wrote: > > On Aug 22, 2013, at 2:54 PM, Saul Wold <sgw@linux.intel.com> wrote: > >> On 08/21/2013 09:31 PM, Khem Raj wrote: >>> The update is a requirement for systemd-206 >>> >>> Signed-off-by: Khem Raj <raj.khem@gmail.com> >>> --- >>> meta/recipes-kernel/kmod/kmod-native_git.bb | 1 - >>> meta/recipes-kernel/kmod/kmod.inc | 9 ++++---- >>> ...-man-page-generation-because-we-don-t-hav.patch | 26 ---------------------- >>> .../kmod/kmod/fix-undefined-O_CLOEXEC.patch | 16 ++++++------- >>> meta/recipes-kernel/kmod/kmod_git.bb | 3 +-- >>> 5 files changed, 13 insertions(+), 42 deletions(-) >>> delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch >>> >> >> Did you build the native version? I am seeing failures in MUT on the autobuilder. It did pass my "sniff" test on my 2 local world builds. > > > yes and multiple times. what distro do you run on your build boxes ? I wonder if its some sort of race condition > I use -j20 and -j16 > It's not a race condition, I built it stand alone with no parallel make. I am not sure if a host contamination issue or something else, because like you I was able to built it on two machine locally, but not on the AB. Machine are CentOS 6.4, Debian 6.0.7, but it worked on my F19 and Ubuntu 12.04 machines! Sau! > > % bitbake kmod-native > Loading cache: 100% |###########################################| ETA: 00:00:00 > Loaded 1197 entries from dependency cache. > > Build Configuration: > BB_VERSION = "1.19.1" > BUILD_SYS = "x86_64-linux" > NATIVELSBSTRING = "Ubuntu-12.04" > TARGET_SYS = "x86_64-oe-linux" > MACHINE = "qemux86-64" > DISTRO_VERSION = "oe-core.0" > TUNE_FEATURES = "m64" > TARGET_FPU = "" > meta = "master:2176bfd1099287056432780d0ee6b202e94bd1ee" > > NOTE: Resolving any missing task queue dependencies > NOTE: Preparing runqueue > NOTE: Executing SetScene Tasks > NOTE: Executing RunQueue Tasks > NOTE: Tasks Summary: Attempted 72 tasks of which 60 didn't need to be rerun and all succeeded. > > > >> >>> | x86_64-linux-libtool: link: gcc -std=gnu99 -pipe -DANOTHER_BRICK_IN_THE -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wwrite-strings -Wno-long-long -Wno-overlength-strings -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result -Wnested-externs -Wchar-subscripts -Wtype-limits -Wuninitialized -fno-common -fdiagnostics-show-option -fvisibility=hidden -ffunction-sections -fdata-sections -isystem/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wl,--as-needed -Wl,--gc-sections -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-lin ux >> /usr/lib -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -o tools/test/kmod tools/kmod.o tools/lsmod.o tools/rmmod.o tools/insmod.o tools/modinfo.o tools/modprobe.o tools/depmod.o tools/log.o tools/static-nodes.o -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib libkmod/.libs/libkmod-util.a libkmod/.libs/libkmod-private.a >> Nice ester egg ^^^^^^^^^^^^^^^^ >>> | tools/kmod.o: In function `kmod_help': >>> | kmod.c:(.text.kmod_help+0x27): undefined reference to `_Static_assert' >>> | kmod.c:(.text.kmod_help+0x5c): undefined reference to `_Static_assert' >>> | kmod.c:(.text.kmod_help+0x7f): undefined reference to `_Static_assert' >>> | kmod.c:(.text.kmod_help+0xb9): undefined reference to `_Static_assert' >>> | tools/kmod.o: In function `main': >>> | kmod.c:(.text.main+0x5b): undefined reference to `_Static_assert' >>> | tools/kmod.o:kmod.c:(.text.main+0x8c): more undefined references to `_Static_assert' follow >>> | collect2: ld returned 1 exit status >>> | make[2]: *** [tools/test/kmod] Error 1 >>> | make[2]: *** Waiting for unfinished jobs.... >>> | x86_64-linux-libtool: link: gcc -std=gnu99 -pipe -DANOTHER_BRICK_IN_THE -Wall -W -Wextra -Wno-inline -Wvla -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wwrite-strings -Wno-long-long -Wno-overlength-strings -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result -Wnested-externs -Wchar-subscripts -Wtype-limits -Wuninitialized -fno-common -fdiagnostics-show-option -fvisibility=hidden -ffunction-sections -fdata-sections -isystem/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wl,--as-needed -Wl,--gc-sections -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-lin ux >> /usr/lib -Wl,-rpath-link -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib -Wl,-O1 -o tools/.libs/kmod tools/kmod.o tools/lsmod.o tools/rmmod.o tools/insmod.o tools/modinfo.o tools/modprobe.o tools/depmod.o tools/log.o tools/static-nodes.o -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib -L/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/lib libkmod/.libs/libkmod-util.a libkmod/.libs/libkmod.so -Wl,-rpath -Wl,/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-x86/build/build/tmp/sysroots/x86_64-linux/usr/lib >>> | tools/kmod.o: In function `kmod_help': >>> | kmod.c:(.text.kmod_help+0x27): undefined reference to `_Static_assert' >>> | kmod.c:(.text.kmod_help+0x5c): undefined reference to `_Static_assert' >>> | kmod.c:(.text.kmod_help+0x7f): undefined reference to `_Static_assert' >>> | kmod.c:(.text.kmod_help+0xb9): undefined reference to `_Static_assert' >>> | tools/kmod.o: In function `main': >>> | kmod.c:(.text.main+0x5b): undefined reference to `_Static_assert' >>> | tools/kmod.o:kmod.c:(.text.main+0x8c): more undefined references to `_Static_assert' follow >>> | collect2: ld returned 1 exit status >>> | make[2]: *** [tools/kmod] Error 1 >> >> >> Sau! >> >> >>> diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb >>> index 8cbcdf8..afa3ad0 100644 >>> --- a/meta/recipes-kernel/kmod/kmod-native_git.bb >>> +++ b/meta/recipes-kernel/kmod/kmod-native_git.bb >>> @@ -4,7 +4,6 @@ >>> require kmod.inc >>> inherit native >>> >>> -PR = "${INC_PR}.1" >>> SRC_URI += "file://fix-undefined-O_CLOEXEC.patch" >>> >>> do_install_append (){ >>> diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc >>> index a780b6c..1728a4e 100644 >>> --- a/meta/recipes-kernel/kmod/kmod.inc >>> +++ b/meta/recipes-kernel/kmod/kmod.inc >>> @@ -7,8 +7,6 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/" >>> LICENSE = "GPL-2.0+ & LGPL-2.1+" >>> LICENSE_libkmod = "LGPL-2.1+" >>> SECTION = "base" >>> -PV = "9" >>> -INC_PR = "r0" >>> >>> DEPENDS += "pkgconfig-native" >>> >>> @@ -19,17 +17,18 @@ inherit autotools gtk-doc ptest >>> >>> SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ >>> file://depmod-search.conf \ >>> - file://0001-man-disable-man-page-generation-because-we-don-t-hav.patch \ >>> file://run-ptest \ >>> file://ptest.patch \ >>> " >>> >>> -SRCREV = "62081c0f68905b22f375156d4532fd37fa5c8d33" >>> +SRCREV = "3b38c7fcb58be4ddc34f90454c5f5dc3693d2d85" >>> +# Lookout for PV bump too when SRCREV is changed >>> +PV = "14" >>> >>> S = "${WORKDIR}/git" >>> >>> EXTRA_AUTORECONF += "--install --symlink" >>> -EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools" >>> +EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools --disable-manpages" >>> >>> do_configure_prepend () { >>> gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make >>> diff --git a/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch b/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch >>> deleted file mode 100644 >>> index 5361b84..0000000 >>> --- a/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch >>> +++ /dev/null >>> @@ -1,26 +0,0 @@ >>> -From ce6f0cabb65e67dd4d31e1e555db8bc6eaf435d3 Mon Sep 17 00:00:00 2001 >>> -From: Martin Jansa <Martin.Jansa@gmail.com> >>> -Date: Fri, 24 Feb 2012 07:35:38 +0100 >>> -Subject: [PATCH] man: disable man page generation because we don't have >>> - working xsltproc >>> - >>> -Upstream-Status: Inappropriate [build system specific change] >>> - >>> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> >>> ---- >>> - Makefile.am | 2 +- >>> - 1 files changed, 1 insertions(+), 1 deletions(-) >>> - >>> -diff --git a/Makefile.am b/Makefile.am >>> -index 141c102..a8bdfd1 100644 >>> ---- a/Makefile.am >>> -+++ b/Makefile.am >>> -@@ -1,4 +1,4 @@ >>> --SUBDIRS = . libkmod/docs man >>> -+SUBDIRS = . libkmod/docs >>> - >>> - DISTCLEAN_LOCAL_HOOKS = >>> - EXTRA_DIST = >>> --- >>> -1.7.8.4 >>> - >>> diff --git a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch >>> index 3177e9a..0268216 100644 >>> --- a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch >>> +++ b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch >>> @@ -2,16 +2,16 @@ Upstream-Status: Not applicable >>> >>> Index: git/libkmod/libkmod-private.h >>> =================================================================== >>> ---- git.orig/libkmod/libkmod-private.h >>> -+++ git/libkmod/libkmod-private.h >>> -@@ -1,6 +1,10 @@ >>> - #ifndef _LIBKMOD_PRIVATE_H_ >>> - #define _LIBKMOD_PRIVATE_H_ >>> +--- git.orig/libkmod/libkmod-private.h 2013-08-21 10:07:51.000000000 -0700 >>> ++++ git/libkmod/libkmod-private.h 2013-08-21 14:34:04.558278849 -0700 >>> +@@ -9,6 +9,10 @@ >>> + #include "macro.h" >>> + #include "libkmod.h" >>> >>> +#ifndef O_CLOEXEC >>> +# define O_CLOEXEC 0 >>> +#endif >>> + >>> - #include <stdbool.h> >>> - #include <stdio.h> >>> - #include <syslog.h> >>> + static _always_inline_ _printf_format_(2, 3) void >>> + kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {} >>> + >>> diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb >>> index f92ff72..b07c06e 100644 >>> --- a/meta/recipes-kernel/kmod/kmod_git.bb >>> +++ b/meta/recipes-kernel/kmod/kmod_git.bb >>> @@ -3,8 +3,7 @@ >>> >>> require kmod.inc >>> >>> -PR = "${INC_PR}.0" >>> -PV = "9+git${SRCPV}" >>> +PV_append = "+git${SRCPV}" >>> >>> PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" >>> RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" >>> > > > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] kmod: Upgrade to version 14 2013-08-23 20:37 ` Saul Wold @ 2013-08-26 21:22 ` Khem Raj 2013-08-26 22:45 ` Khem Raj 0 siblings, 1 reply; 13+ messages in thread From: Khem Raj @ 2013-08-26 21:22 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On Aug 23, 2013, at 1:37 PM, Saul Wold <sgw@linux.intel.com> wrote: > On 08/22/2013 09:09 PM, Khem Raj wrote: >> >> On Aug 22, 2013, at 2:54 PM, Saul Wold <sgw@linux.intel.com> wrote: >> >>> On 08/21/2013 09:31 PM, Khem Raj wrote: >>>> The update is a requirement for systemd-206 >>>> >>>> Signed-off-by: Khem Raj <raj.khem@gmail.com> >>>> --- >>>> meta/recipes-kernel/kmod/kmod-native_git.bb | 1 - >>>> meta/recipes-kernel/kmod/kmod.inc | 9 ++++---- >>>> ...-man-page-generation-because-we-don-t-hav.patch | 26 ---------------------- >>>> .../kmod/kmod/fix-undefined-O_CLOEXEC.patch | 16 ++++++------- >>>> meta/recipes-kernel/kmod/kmod_git.bb | 3 +-- >>>> 5 files changed, 13 insertions(+), 42 deletions(-) >>>> delete mode 100644 meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch >>>> >>> >>> Did you build the native version? I am seeing failures in MUT on the autobuilder. It did pass my "sniff" test on my 2 local world builds. >> >> >> yes and multiple times. what distro do you run on your build boxes ? I wonder if its some sort of race condition >> I use -j20 and -j16 >> > It's not a race condition, I built it stand alone with no parallel make. I am not sure if a host contamination issue or something else, because like you I was able to built it on two machine locally, but not on the AB. > > Machine are CentOS 6.4, Debian 6.0.7, but it worked on my F19 and Ubuntu 12.04 machines! I do not have access to Centos or debian to be able to reproduce this. If anyone has it please help in debugging it further. will try to offline try to poke around and see if I can get at something. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] kmod: Upgrade to version 14 2013-08-26 21:22 ` Khem Raj @ 2013-08-26 22:45 ` Khem Raj 2013-08-26 23:04 ` Saul Wold 0 siblings, 1 reply; 13+ messages in thread From: Khem Raj @ 2013-08-26 22:45 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On Aug 26, 2013, at 2:22 PM, Khem Raj <raj.khem@gmail.com> wrote: >> Machine are CentOS 6.4, Debian 6.0.7, but it worked on my F19 and Ubuntu 12.04 machines! > > > I do not have access to Centos or debian to be able to reproduce this. If anyone has it please help in debugging it further. will try to offline try to poke around and see if I can get at something. > The reason I think is that _Static_assert is too new a feature for gcc shipped with these distros, it was introduced in c11 standards. So I have created a patch to define an equivalent for kmod-native and update the pull tree. However I have no way to test it out quickly. I have made sure that it does not break the build on Ubuntu 12.04+ give it a shot and let me know how it goes. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] kmod: Upgrade to version 14 2013-08-26 22:45 ` Khem Raj @ 2013-08-26 23:04 ` Saul Wold 2013-08-27 4:49 ` Khem Raj 0 siblings, 1 reply; 13+ messages in thread From: Saul Wold @ 2013-08-26 23:04 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core On 08/26/2013 03:45 PM, Khem Raj wrote: > > On Aug 26, 2013, at 2:22 PM, Khem Raj <raj.khem@gmail.com> wrote: > >>> Machine are CentOS 6.4, Debian 6.0.7, but it worked on my F19 and Ubuntu 12.04 machines! >> >> >> I do not have access to Centos or debian to be able to reproduce this. If anyone has it please help in debugging it further. will try to offline try to poke around and see if I can get at something. >> > > The reason I think is that _Static_assert is too new a feature for gcc shipped with these distros, it was introduced > in c11 standards. So I have created a patch to define an equivalent for kmod-native and update the pull tree. However > I have no way to test it out quickly. I have made sure that it does not break the build on Ubuntu 12.04+ give it a > shot and let me know how it goes. > Yup, I have that capability and was actually working on a similar patch, you just beat me to it. Probably need a little bit more of a commit message about removing the older patch due it's being a config option and adding the Static_assert work around. Please update and resend the series. Tested-by: Saul Wold <sgw@linux.intel.com> Thanks Sau! ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/3] kmod: Upgrade to version 14 2013-08-26 23:04 ` Saul Wold @ 2013-08-27 4:49 ` Khem Raj 0 siblings, 0 replies; 13+ messages in thread From: Khem Raj @ 2013-08-27 4:49 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On Aug 26, 2013, at 4:04 PM, Saul Wold <sgw@linux.intel.com> wrote: > On 08/26/2013 03:45 PM, Khem Raj wrote: >> >> On Aug 26, 2013, at 2:22 PM, Khem Raj <raj.khem@gmail.com> wrote: >> >>>> Machine are CentOS 6.4, Debian 6.0.7, but it worked on my F19 and Ubuntu 12.04 machines! >>> >>> >>> I do not have access to Centos or debian to be able to reproduce this. If anyone has it please help in debugging it further. will try to offline try to poke around and see if I can get at something. >>> >> >> The reason I think is that _Static_assert is too new a feature for gcc shipped with these distros, it was introduced >> in c11 standards. So I have created a patch to define an equivalent for kmod-native and update the pull tree. However >> I have no way to test it out quickly. I have made sure that it does not break the build on Ubuntu 12.04+ give it a >> shot and let me know how it goes. >> > > Yup, I have that capability and was actually working on a similar patch, you just beat me to it. > > > Probably need a little bit more of a commit message about removing the older patch due it's being a config option and adding the Static_assert work around. I did not remove anything. Infact I added a patch and patch header explains what it does. Since It was not merged I took the liberty to squash it into the original commit. > > Please update and resend the series. > > Tested-by: Saul Wold <sgw@linux.intel.com> Feel free to ammend the commits. > > Thanks > Sau! > ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/3] systemd: Upgrade to 206 2013-08-22 4:30 [PATCH 0/3] Update systemd/kmod Khem Raj 2013-08-22 4:31 ` [PATCH 1/3] kmod: Upgrade to version 14 Khem Raj @ 2013-08-22 4:31 ` Khem Raj 2013-08-27 2:40 ` Jonathan Liu 2013-08-22 4:31 ` [PATCH 3/3] glib-2.0: Specify libiconv when building on uclibc Khem Raj 2 siblings, 1 reply; 13+ messages in thread From: Khem Raj @ 2013-08-22 4:31 UTC (permalink / raw) To: openembedded-core Add new PACKAGE systemd-rpm-macros, this will hold the macros which are interesting when rpm is used as package management backend Forward port uclibc only patches. Add a new patch to stub out use of preadv/pwritev in testcases Delete patches that have been merged upstream in systemd Remove force export of GPERF variable in environment this was causing AC_CHECK_TOOL to not populate GPERF variable as expected systemd needs kmod to be present on rootfs so add it to RDEPENDS some services substitute discovered kmod when the service file is generated during boot, however the discovered kmod is from native sysroot and it gets into the service file with absolute path. So specify the target path of kmod using KMOD variable so the unit files have correct pointer to kmod on target Add a patch to make sure that mknod capability is checked before the service which excercise mknod, this patch is also submitted to upstream systemd Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...1-uClibc-doesn-t-implement-pwritev-preadv.patch | 37 +++ .../0001-use-CAP_MKNOD-ConditionCapability.patch | 32 ++ ...ystemd-update-utmp-shutdown.service-into-.patch | 367 --------------------- .../systemd/systemd/install-quotaon-once.patch | 34 -- .../systemd/systemd-pam-fix-getty-unit.patch | 24 +- .../systemd/systemd/systemd-pam-fix-mkostemp.patch | 59 ++-- .../systemd/{systemd_204.bb => systemd_206.bb} | 19 +- 7 files changed, 120 insertions(+), 452 deletions(-) create mode 100644 meta/recipes-core/systemd/systemd/0001-uClibc-doesn-t-implement-pwritev-preadv.patch create mode 100644 meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch delete mode 100644 meta/recipes-core/systemd/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch delete mode 100644 meta/recipes-core/systemd/systemd/install-quotaon-once.patch rename meta/recipes-core/systemd/{systemd_204.bb => systemd_206.bb} (95%) diff --git a/meta/recipes-core/systemd/systemd/0001-uClibc-doesn-t-implement-pwritev-preadv.patch b/meta/recipes-core/systemd/systemd/0001-uClibc-doesn-t-implement-pwritev-preadv.patch new file mode 100644 index 0000000..e204a50 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-uClibc-doesn-t-implement-pwritev-preadv.patch @@ -0,0 +1,37 @@ +Upstream-Status: Inappropriate [uclibc specific] + +From 7be9273548bcb1f57d011fc252965e45dd2a058c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 21 Aug 2013 19:09:27 -0700 +Subject: [PATCH] uClibc doesn't implement pwritev/preadv + +Lets stub out the testcase for building. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libsystemd-bus/test-bus-memfd.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libsystemd-bus/test-bus-memfd.c b/src/libsystemd-bus/test-bus-memfd.c +index 05ef555..45e5e44 100644 +--- a/src/libsystemd-bus/test-bus-memfd.c ++++ b/src/libsystemd-bus/test-bus-memfd.c +@@ -145,6 +145,7 @@ int main(int argc, char *argv[]) { + /* check content */ + assert_se(memcmp(buf, "ll", 2) == 0); + ++#ifndef __UCLIBC__ + /* writev it out*/ + iov[0].iov_base = (char *)"ABC"; + iov[0].iov_len = 3; +@@ -167,6 +168,7 @@ int main(int argc, char *argv[]) { + assert_se(memcmp(bufv[0], "ABC", 3) == 0); + assert_se(memcmp(bufv[1], "DEF", 3) == 0); + assert_se(memcmp(bufv[2], "GHI", 3) == 0); ++#endif /* __UCLIBC__ */ + + sd_memfd_free(m); + +-- +1.8.3.4 + diff --git a/meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch b/meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch new file mode 100644 index 0000000..4a35c23 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-use-CAP_MKNOD-ConditionCapability.patch @@ -0,0 +1,32 @@ +Upstream-Status: Submitted + +From cfdd1eb76dced87c73bac8ec22d3a10244c9bbf6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 21 Aug 2013 20:25:19 -0700 +Subject: [PATCH] use CAP_MKNOD ConditionCapability + +Fixes errors seen when booting VMs on QEMU like + +systemd[1]: kmod-static-nodes.service: main process exited, code=exited, status=203/EXEC +systemd[1]: Failed to start Create list of required static device nodes for the current kernel. +systemd[1]: Unit kmod-static-nodes.service entered failed state. + +Make sure that mknod capability is available + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + units/kmod-static-nodes.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: systemd-206/units/kmod-static-nodes.service.in +=================================================================== +--- systemd-206.orig/units/kmod-static-nodes.service.in 2013-08-21 19:13:02.000000000 -0700 ++++ systemd-206/units/kmod-static-nodes.service.in 2013-08-21 20:39:13.310689871 -0700 +@@ -9,6 +9,7 @@ + Description=Create list of required static device nodes for the current kernel + DefaultDependencies=no + Before=sysinit.target systemd-tmpfiles-setup-dev.service ++ConditionCapability=CAP_MKNOD + + [Service] + Type=oneshot diff --git a/meta/recipes-core/systemd/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch b/meta/recipes-core/systemd/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch deleted file mode 100644 index 86fab97..0000000 --- a/meta/recipes-core/systemd/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch +++ /dev/null @@ -1,367 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Jonathan Liu <net147@gmail.com> - -From 3f92e4b4b61042391bd44de4dceb18177df0dd57 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering <lennart@poettering.net> -Date: Thu, 16 May 2013 00:19:03 +0200 -Subject: [PATCH] utmp: turn systemd-update-utmp-shutdown.service into a normal - runtime service - -With this change systemd-update-utmp-shutdown.service is replaced by -systemd-update-utmp.service which is started at boot and stays around -until shutdown. This allows us to properly order the unit against both -/var/log and auditd. - -https://bugzilla.redhat.com/show_bug.cgi?id=853104 -https://bugs.freedesktop.org/show_bug.cgi?id=64365 ---- - Makefile-man.am | 12 ++--- - Makefile.am | 8 +-- - man/systemd-update-utmp-runlevel.service.xml | 76 --------------------------- - man/systemd-update-utmp.service.xml | 76 +++++++++++++++++++++++++++ - src/update-utmp/update-utmp.c | 2 +- - units/.gitignore | 2 +- - units/systemd-update-utmp-runlevel.service.in | 8 +-- - units/systemd-update-utmp-shutdown.service.in | 19 ------- - units/systemd-update-utmp.service.in | 21 ++++++++ - 9 files changed, 114 insertions(+), 110 deletions(-) - delete mode 100644 man/systemd-update-utmp-runlevel.service.xml - create mode 100644 man/systemd-update-utmp.service.xml - delete mode 100644 units/systemd-update-utmp-shutdown.service.in - create mode 100644 units/systemd-update-utmp.service.in - -diff --git a/Makefile-man.am b/Makefile-man.am -index 7d62094..5888158 100644 ---- a/Makefile-man.am -+++ b/Makefile-man.am -@@ -72,7 +72,7 @@ MANPAGES += \ - man/systemd-tmpfiles.8 \ - man/systemd-tty-ask-password-agent.1 \ - man/systemd-udevd.service.8 \ -- man/systemd-update-utmp-runlevel.service.8 \ -+ man/systemd-update-utmp.service.8 \ - man/systemd.1 \ - man/systemd.automount.5 \ - man/systemd.device.5 \ -@@ -191,7 +191,7 @@ MANPAGES_ALIAS += \ - man/systemd-udevd-control.socket.8 \ - man/systemd-udevd-kernel.socket.8 \ - man/systemd-udevd.8 \ -- man/systemd-update-utmp-shutdown.service.8 \ -+ man/systemd-update-utmp-runlevel.service.8 \ - man/systemd-update-utmp.8 \ - man/systemd-user.conf.5 - man/SD_ALERT.3: man/sd-daemon.3 -@@ -289,8 +289,8 @@ man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8 - man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 - man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8 - man/systemd-udevd.8: man/systemd-udevd.service.8 --man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8 --man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8 -+man/systemd-update-utmp-runlevel.service.8: man/systemd-update-utmp.service.8 -+man/systemd-update-utmp.8: man/systemd-update-utmp.service.8 - man/systemd-user.conf.5: man/systemd-system.conf.5 - man/SD_ALERT.html: man/sd-daemon.html - $(html-alias) -@@ -577,10 +577,10 @@ man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html - man/systemd-udevd.html: man/systemd-udevd.service.html - $(html-alias) - --man/systemd-update-utmp-shutdown.service.html: man/systemd-update-utmp-runlevel.service.html -+man/systemd-update-utmp-runlevel.service.html: man/systemd-update-utmp.service.html - $(html-alias) - --man/systemd-update-utmp.html: man/systemd-update-utmp-runlevel.service.html -+man/systemd-update-utmp.html: man/systemd-update-utmp.service.html - $(html-alias) - - man/systemd-user.conf.html: man/systemd-system.conf.html -diff --git a/Makefile.am b/Makefile.am -index 8d8139c..4c5e6fc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \ - units/systemd-initctl.service \ - units/systemd-shutdownd.service \ - units/systemd-remount-fs.service \ -+ units/systemd-update-utmp.service \ - units/systemd-update-utmp-runlevel.service \ -- units/systemd-update-utmp-shutdown.service \ - units/systemd-tmpfiles-setup-dev.service \ - units/systemd-tmpfiles-setup.service \ - units/systemd-tmpfiles-clean.service \ -@@ -463,8 +463,8 @@ EXTRA_DIST += \ - units/systemd-initctl.service.in \ - units/systemd-shutdownd.service.in \ - units/systemd-remount-fs.service.in \ -+ units/systemd-update-utmp.service.in \ - units/systemd-update-utmp-runlevel.service.in \ -- units/systemd-update-utmp-shutdown.service.in \ - units/systemd-tmpfiles-setup-dev.service.in \ - units/systemd-tmpfiles-setup.service.in \ - units/systemd-tmpfiles-clean.service.in \ -@@ -4070,8 +4070,8 @@ RUNLEVEL4_TARGET_WANTS += \ - RUNLEVEL5_TARGET_WANTS += \ - systemd-update-utmp-runlevel.service - endif --SHUTDOWN_TARGET_WANTS += \ -- systemd-update-utmp-shutdown.service -+SYSINIT_TARGET_WANTS += \ -+ systemd-update-utmp.service - LOCAL_FS_TARGET_WANTS += \ - systemd-remount-fs.service \ - systemd-fsck-root.service \ -diff --git a/man/systemd-update-utmp-runlevel.service.xml b/man/systemd-update-utmp-runlevel.service.xml -deleted file mode 100644 -index 867b958..0000000 ---- a/man/systemd-update-utmp-runlevel.service.xml -+++ /dev/null -@@ -1,76 +0,0 @@ --<?xml version="1.0"?> --<!--*-nxml-*--> --<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> --<!-- -- This file is part of systemd. -- -- Copyright 2012 Lennart Poettering -- -- systemd is free software; you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2.1 of the License, or -- (at your option) any later version. -- -- systemd is distributed in the hope that it will be useful, but -- WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- Lesser General Public License for more details. -- -- You should have received a copy of the GNU Lesser General Public License -- along with systemd; If not, see <http://www.gnu.org/licenses/>. ----> --<refentry id="systemd-update-utmp-runlevel.service"> -- -- <refentryinfo> -- <title>systemd-update-utmp-runlevel.service</title> -- <productname>systemd</productname> -- -- <authorgroup> -- <author> -- <contrib>Developer</contrib> -- <firstname>Lennart</firstname> -- <surname>Poettering</surname> -- <email>lennart@poettering.net</email> -- </author> -- </authorgroup> -- </refentryinfo> -- -- <refmeta> -- <refentrytitle>systemd-update-utmp-runlevel.service</refentrytitle> -- <manvolnum>8</manvolnum> -- </refmeta> -- -- <refnamediv> -- <refname>systemd-update-utmp-runlevel.service</refname> -- <refname>systemd-update-utmp-shutdown.service</refname> -- <refname>systemd-update-utmp</refname> -- <refpurpose>Write audit and utmp updates at runlevel -- changes and shutdown</refpurpose> -- </refnamediv> -- -- <refsynopsisdiv> -- <para><filename>systemd-update-utmp-runlevel.service</filename></para> -- <para><filename>systemd-update-utmp-shutdown.service</filename></para> -- <para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para> -- </refsynopsisdiv> -- -- <refsect1> -- <title>Description</title> -- -- <para><filename>systemd-update-utmp-runlevel.service</filename> -- is a service that writes SysV runlevel changes to utmp -- and wtmp, as well as the audit logs, as they -- occur. <filename>systemd-update-utmp-shutdown.service</filename> -- does the same for shut-down requests.</para> -- </refsect1> -- -- <refsect1> -- <title>See Also</title> -- <para> -- <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, -- <citerefentry><refentrytitle>utmp</refentrytitle><manvolnum>5</manvolnum></citerefentry>, -- <citerefentry><refentrytitle>auditd</refentrytitle><manvolnum>8</manvolnum></citerefentry> -- </para> -- </refsect1> -- --</refentry> -diff --git a/man/systemd-update-utmp.service.xml b/man/systemd-update-utmp.service.xml -new file mode 100644 -index 0000000..846fc95 ---- /dev/null -+++ b/man/systemd-update-utmp.service.xml -@@ -0,0 +1,76 @@ -+<?xml version="1.0"?> -+<!--*-nxml-*--> -+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> -+<!-- -+ This file is part of systemd. -+ -+ Copyright 2012 Lennart Poettering -+ -+ systemd is free software; you can redistribute it and/or modify it -+ under the terms of the GNU Lesser General Public License as published by -+ the Free Software Foundation; either version 2.1 of the License, or -+ (at your option) any later version. -+ -+ systemd is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public License -+ along with systemd; If not, see <http://www.gnu.org/licenses/>. -+--> -+<refentry id="systemd-update-utmp.service"> -+ -+ <refentryinfo> -+ <title>systemd-update-utmp.service</title> -+ <productname>systemd</productname> -+ -+ <authorgroup> -+ <author> -+ <contrib>Developer</contrib> -+ <firstname>Lennart</firstname> -+ <surname>Poettering</surname> -+ <email>lennart@poettering.net</email> -+ </author> -+ </authorgroup> -+ </refentryinfo> -+ -+ <refmeta> -+ <refentrytitle>systemd-update-utmp.service</refentrytitle> -+ <manvolnum>8</manvolnum> -+ </refmeta> -+ -+ <refnamediv> -+ <refname>systemd-update-utmp.service</refname> -+ <refname>systemd-update-utmp-runlevel.service</refname> -+ <refname>systemd-update-utmp</refname> -+ <refpurpose>Write audit and utmp updates at bootup, runlevel -+ changes and shutdown</refpurpose> -+ </refnamediv> -+ -+ <refsynopsisdiv> -+ <para><filename>systemd-update-utmp.service</filename></para> -+ <para><filename>systemd-update-utmp-runlevel.service</filename></para> -+ <para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para> -+ </refsynopsisdiv> -+ -+ <refsect1> -+ <title>Description</title> -+ -+ <para><filename>systemd-update-utmp-runlevel.service</filename> -+ is a service that writes SysV runlevel changes to utmp -+ and wtmp, as well as the audit logs, as they -+ occur. <filename>systemd-update-utmp.service</filename> -+ does the same for system reboots and shut-down requests.</para> -+ </refsect1> -+ -+ <refsect1> -+ <title>See Also</title> -+ <para> -+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>, -+ <citerefentry><refentrytitle>utmp</refentrytitle><manvolnum>5</manvolnum></citerefentry>, -+ <citerefentry><refentrytitle>auditd</refentrytitle><manvolnum>8</manvolnum></citerefentry> -+ </para> -+ </refsect1> -+ -+</refentry> -diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c -index 9184025..202aa98 100644 ---- a/src/update-utmp/update-utmp.c -+++ b/src/update-utmp/update-utmp.c -@@ -104,7 +104,7 @@ static int get_current_runlevel(Context *c) { - { '3', SPECIAL_RUNLEVEL3_TARGET }, - { '4', SPECIAL_RUNLEVEL4_TARGET }, - { '2', SPECIAL_RUNLEVEL2_TARGET }, -- { 'S', SPECIAL_RESCUE_TARGET }, -+ { '1', SPECIAL_RESCUE_TARGET }, - }; - const char - *interface = "org.freedesktop.systemd1.Unit", -diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in -index 27fae2c..99783e2 100644 ---- a/units/systemd-update-utmp-runlevel.service.in -+++ b/units/systemd-update-utmp-runlevel.service.in -@@ -7,12 +7,14 @@ - - [Unit] - Description=Update UTMP about System Runlevel Changes --Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5) -+Documentation=man:systemd-update-utmp.service(8) man:utmp(5) - DefaultDependencies=no - RequiresMountsFor=/var/log/wtmp --After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service -+Conflicts=shutdown.target -+Requisite=systemd-update-utmp.service -+After=systemd-update-utmp.service - After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target --Before=final.target -+Before=shutdown.target - - [Service] - Type=oneshot -diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in -deleted file mode 100644 -index aa93562..0000000 ---- a/units/systemd-update-utmp-shutdown.service.in -+++ /dev/null -@@ -1,19 +0,0 @@ --# This file is part of systemd. --# --# systemd is free software; you can redistribute it and/or modify it --# under the terms of the GNU Lesser General Public License as published by --# the Free Software Foundation; either version 2.1 of the License, or --# (at your option) any later version. -- --[Unit] --Description=Update UTMP about System Shutdown --Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5) --DefaultDependencies=no --RequiresMountsFor=/var/log/wtmp --After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service --After=systemd-update-utmp-runlevel.service --Before=final.target -- --[Service] --Type=oneshot --ExecStart=@rootlibexecdir@/systemd-update-utmp shutdown -diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in -new file mode 100644 -index 0000000..e7c20a5 ---- /dev/null -+++ b/units/systemd-update-utmp.service.in -@@ -0,0 +1,21 @@ -+# This file is part of systemd. -+# -+# systemd is free software; you can redistribute it and/or modify it -+# under the terms of the GNU Lesser General Public License as published by -+# the Free Software Foundation; either version 2.1 of the License, or -+# (at your option) any later version. -+ -+[Unit] -+Description=Update UTMP about System Reboot/Shutdown -+Documentation=man:systemd-update-utmp.service(8) man:utmp(5) -+DefaultDependencies=no -+RequiresMountsFor=/var/log/wtmp -+Conflicts=shutdown.target -+After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service -+Before=sysinit.target shutdown.target -+ -+[Service] -+Type=oneshot -+RemainAfterExit=yes -+ExecStart=@rootlibexecdir@/systemd-update-utmp reboot -+ExecStop=@rootlibexecdir@/systemd-update-utmp shutdown --- -1.8.2.3 - diff --git a/meta/recipes-core/systemd/systemd/install-quotaon-once.patch b/meta/recipes-core/systemd/systemd/install-quotaon-once.patch deleted file mode 100644 index 6b7cf2f..0000000 --- a/meta/recipes-core/systemd/systemd/install-quotaon-once.patch +++ /dev/null @@ -1,34 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 622004565eca385c685086cd478aa79afe73b785 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Tue, 11 Jun 2013 17:16:37 +0100 -Subject: [PATCH] build-sys: don't install quotaon.service twice - -quotaon.service is already installed through dist_systemunit_DATA, so it doesn't -need to be added to nodist_systemunit_DATA. Installing the same file twice -results in a race condition where the install process can fail. - -https://bugs.freedesktop.org/show_bug.cgi?id=65659 - -[zj: actually remove quotaon.service from the other list.] ---- - Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 3a196a6..d444eac 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -401,7 +401,6 @@ dist_systemunit_DATA = \ - units/bluetooth.target \ - units/smartcard.target \ - units/systemd-tmpfiles-clean.timer \ -- units/quotaon.service \ - units/systemd-ask-password-wall.path \ - units/systemd-ask-password-console.path \ - units/systemd-udevd-control.socket \ --- -1.7.10.4 - diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch index 72d1411..ceb8483 100644 --- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch +++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-getty-unit.patch @@ -7,29 +7,29 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> units/serial-getty@.service.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: systemd-196/units/getty@.service.m4 +Index: systemd-206/units/getty@.service.m4 =================================================================== ---- systemd-196.orig/units/getty@.service.m4 2012-11-20 12:39:16.000000000 -0800 -+++ systemd-196/units/getty@.service.m4 2013-01-21 16:08:03.707533381 -0800 -@@ -45,7 +45,7 @@ +--- systemd-206.orig/units/getty@.service.m4 2013-07-21 15:43:28.000000000 -0700 ++++ systemd-206/units/getty@.service.m4 2013-08-21 08:45:48.569886828 -0700 +@@ -27,7 +27,7 @@ [Service] # the VT is cleared by TTYVTDisallocate --ExecStart=-/sbin/agetty --noclear %I 38400 linux -+ExecStart=-/sbin/getty -L %I 115200 linux +-ExecStart=-/sbin/agetty --noclear %I ++ExecStart=-/sbin/getty -L %I Type=idle Restart=always RestartSec=0 -Index: systemd-196/units/serial-getty@.service.m4 +Index: systemd-206/units/serial-getty@.service.m4 =================================================================== ---- systemd-196.orig/units/serial-getty@.service.m4 2012-11-20 12:39:16.000000000 -0800 -+++ systemd-196/units/serial-getty@.service.m4 2013-01-21 16:09:01.763535039 -0800 -@@ -40,7 +40,7 @@ +--- systemd-206.orig/units/serial-getty@.service.m4 2013-07-21 15:43:28.000000000 -0700 ++++ systemd-206/units/serial-getty@.service.m4 2013-08-21 08:48:52.337890275 -0700 +@@ -22,7 +22,7 @@ IgnoreOnIsolate=yes [Service] --ExecStart=-/sbin/agetty -s %I 115200,38400,9600 vt102 -+ExecStart=-/sbin/getty -L %I 115200 vt102 +-ExecStart=-/sbin/agetty --keep-baud %I 115200,38400,9600 ++ExecStart=-/sbin/getty -L %I 115200 Type=idle Restart=always RestartSec=0 diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch index 0ea2da3..99ea573 100644 --- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch +++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-mkostemp.patch @@ -1,10 +1,10 @@ Upstream-Status: Denied [no desire for uclibc support] Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: systemd-204/src/journal/journal-send.c +Index: systemd-206/src/journal/journal-send.c =================================================================== ---- systemd-204.orig/src/journal/journal-send.c 2013-05-06 12:06:04.000000000 -0700 -+++ systemd-204/src/journal/journal-send.c 2013-05-23 11:21:14.500338688 -0700 +--- systemd-206.orig/src/journal/journal-send.c 2013-07-21 15:43:28.000000000 -0700 ++++ systemd-206/src/journal/journal-send.c 2013-08-21 08:50:50.825892498 -0700 @@ -46,6 +46,8 @@ memcpy(*_f + 10, _func, _fl); \ } while(false) @@ -14,7 +14,7 @@ Index: systemd-204/src/journal/journal-send.c /* We open a single fd, and we'll share it with the current process, * all its threads, and all its subprocesses. This means we need to * initialize it atomically, and need to operate on it atomically -@@ -312,8 +314,13 @@ +@@ -311,8 +313,13 @@ /* Message doesn't fit... Let's dump the data in a temporary * file and just pass a file descriptor of it to the other * side */ @@ -29,20 +29,19 @@ Index: systemd-204/src/journal/journal-send.c if (buffer_fd < 0) return -errno; -Index: systemd-204/src/core/manager.c +Index: systemd-206/src/core/manager.c =================================================================== ---- systemd-204.orig/src/core/manager.c 2013-04-25 17:53:56.000000000 -0700 -+++ systemd-204/src/core/manager.c 2013-05-23 11:23:15.864340878 -0700 -@@ -72,6 +72,8 @@ +--- systemd-206.orig/src/core/manager.c 2013-07-21 15:43:28.000000000 -0700 ++++ systemd-206/src/core/manager.c 2013-08-21 08:51:35.209893331 -0700 +@@ -71,6 +71,7 @@ #include "audit-fd.h" + #include "efivars.h" #include "env-util.h" - +#include "config.h" -+ - /* As soon as 16 units are in our GC queue, make sure to run a gc sweep */ - #define GC_QUEUE_ENTRIES_MAX 16 -@@ -1973,7 +1975,12 @@ + /* As soon as 5s passed since a unit was added to our GC queue, make sure to run a gc sweep */ + #define GC_QUEUE_USEC_MAX (10*USEC_PER_SEC) +@@ -2058,7 +2059,12 @@ return -ENOMEM; RUN_WITH_UMASK(0077) { @@ -55,10 +54,10 @@ Index: systemd-204/src/core/manager.c } if (fd < 0) { -Index: systemd-204/src/shared/util.c +Index: systemd-206/src/shared/util.c =================================================================== ---- systemd-204.orig/src/shared/util.c 2013-05-07 12:07:22.000000000 -0700 -+++ systemd-204/src/shared/util.c 2013-05-23 11:19:35.028336822 -0700 +--- systemd-206.orig/src/shared/util.c 2013-07-21 15:43:28.000000000 -0700 ++++ systemd-206/src/shared/util.c 2013-08-21 08:50:50.829892498 -0700 @@ -74,6 +74,8 @@ #include "env-util.h" #include "fileio.h" @@ -68,7 +67,7 @@ Index: systemd-204/src/shared/util.c int saved_argc = 0; char **saved_argv = NULL; -@@ -3921,7 +3923,12 @@ +@@ -3980,7 +3982,12 @@ t[k] = '.'; stpcpy(stpcpy(t+k+1, fn), "XXXXXX"); @@ -81,10 +80,10 @@ Index: systemd-204/src/shared/util.c if (fd < 0) { free(t); return -errno; -Index: systemd-204/src/shared/ask-password-api.c +Index: systemd-206/src/shared/ask-password-api.c =================================================================== ---- systemd-204.orig/src/shared/ask-password-api.c 2013-04-08 08:26:34.000000000 -0700 -+++ systemd-204/src/shared/ask-password-api.c 2013-05-23 11:24:43.456342451 -0700 +--- systemd-206.orig/src/shared/ask-password-api.c 2013-07-21 15:43:28.000000000 -0700 ++++ systemd-206/src/shared/ask-password-api.c 2013-08-21 08:50:50.829892498 -0700 @@ -37,6 +37,8 @@ #include "ask-password-api.h" @@ -107,11 +106,11 @@ Index: systemd-204/src/shared/ask-password-api.c } if (fd < 0) { -Index: systemd-204/src/journal/journalctl.c +Index: systemd-206/src/journal/journalctl.c =================================================================== ---- systemd-204.orig/src/journal/journalctl.c 2013-05-07 12:07:22.000000000 -0700 -+++ systemd-204/src/journal/journalctl.c 2013-05-23 11:19:35.028336822 -0700 -@@ -755,7 +755,13 @@ +--- systemd-206.orig/src/journal/journalctl.c 2013-07-21 15:43:28.000000000 -0700 ++++ systemd-206/src/journal/journalctl.c 2013-08-21 08:50:50.833892498 -0700 +@@ -1005,7 +1005,13 @@ n /= arg_interval; close_nointr_nofail(fd); @@ -125,11 +124,11 @@ Index: systemd-204/src/journal/journalctl.c if (fd < 0) { log_error("Failed to open %s: %m", k); r = -errno; -Index: systemd-204/src/journal/journal-verify.c +Index: systemd-206/src/journal/journal-verify.c =================================================================== ---- systemd-204.orig/src/journal/journal-verify.c 2012-11-20 13:42:23.000000000 -0800 -+++ systemd-204/src/journal/journal-verify.c 2013-05-23 11:19:35.032336822 -0700 -@@ -700,8 +700,12 @@ +--- systemd-206.orig/src/journal/journal-verify.c 2013-07-21 15:43:28.000000000 -0700 ++++ systemd-206/src/journal/journal-verify.c 2013-08-21 08:50:50.833892498 -0700 +@@ -811,8 +811,12 @@ #endif } else if (f->seal) return -ENOKEY; @@ -143,7 +142,7 @@ Index: systemd-204/src/journal/journal-verify.c if (data_fd < 0) { log_error("Failed to create data file: %m"); r = -errno; -@@ -709,7 +713,12 @@ +@@ -820,7 +824,12 @@ } unlink(data_path); @@ -156,7 +155,7 @@ Index: systemd-204/src/journal/journal-verify.c if (entry_fd < 0) { log_error("Failed to create entry file: %m"); r = -errno; -@@ -717,7 +726,12 @@ +@@ -828,7 +837,12 @@ } unlink(entry_path); diff --git a/meta/recipes-core/systemd/systemd_204.bb b/meta/recipes-core/systemd/systemd_206.bb similarity index 95% rename from meta/recipes-core/systemd/systemd_204.bb rename to meta/recipes-core/systemd/systemd_206.bb index 6261367..f05aa1b 100644 --- a/meta/recipes-core/systemd/systemd_204.bb +++ b/meta/recipes-core/systemd/systemd_206.bb @@ -18,15 +18,14 @@ SECTION = "base/shell" inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \ + file://0001-use-CAP_MKNOD-ConditionCapability.patch \ file://touchscreen.rules \ ${UCLIBCPATCHES} \ - file://0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch \ - file://install-quotaon-once.patch \ file://00-create-volatile.conf \ file://init \ " -SRC_URI[md5sum] = "a07619bb19f48164fbf0761d12fd39a8" -SRC_URI[sha256sum] = "072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b" +SRC_URI[md5sum] = "89e36f2d3ba963020b72738549954cbc" +SRC_URI[sha256sum] = "4c993de071118ea1df7ffc4be26ef0b0d78354ef15b2743a2783d20edfcde9de" UCLIBCPATCHES = "" UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \ @@ -36,6 +35,7 @@ UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \ file://systemd-pam-fix-mkostemp.patch \ file://systemd-pam-fix-msformat.patch \ file://optional_secure_getenv.patch \ + file://0001-uClibc-doesn-t-implement-pwritev-preadv.patch \ " LDFLAGS_libc-uclibc_append = " -lrt" @@ -80,9 +80,7 @@ EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname " do_configure_prepend() { export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}" - - export GPERF="${HOST_PREFIX}gperf" - + export KMOD="${base_bindir}/kmod" sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service* } @@ -120,7 +118,7 @@ python populate_packages_prepend (){ } PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*" -PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install" +PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install ${PN}-rpm-macros" USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" @@ -140,6 +138,9 @@ FILES_${PN}-kernel-install = "${bindir}/kernel-install \ ${sysconfdir}/kernel/ \ ${exec_prefix}/lib/kernel \ " +FILES_${PN}-rpm-macros = "${libdir}/rpm \ + " + RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts" CONFFILES_${PN} = "${sysconfdir}/systemd/journald.conf \ @@ -189,7 +190,7 @@ FILES_${PN} = " ${base_bindir}/* \ FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" -RDEPENDS_${PN} += "dbus util-linux-mount" +RDEPENDS_${PN} += "kmod dbus util-linux-mount" RRECOMMENDS_${PN} += "systemd-serialgetty systemd-compat-units \ util-linux-agetty \ -- 1.8.3.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 2/3] systemd: Upgrade to 206 2013-08-22 4:31 ` [PATCH 2/3] systemd: Upgrade to 206 Khem Raj @ 2013-08-27 2:40 ` Jonathan Liu 2013-08-27 4:53 ` Khem Raj 0 siblings, 1 reply; 13+ messages in thread From: Jonathan Liu @ 2013-08-27 2:40 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-core@lists.openembedded.org On 22 August 2013 14:31, Khem Raj <raj.khem@gmail.com> wrote: > Add new PACKAGE systemd-rpm-macros, this will hold > the macros which are interesting when rpm is used as > package management backend > > Forward port uclibc only patches. Add a new patch > to stub out use of preadv/pwritev in testcases > > Delete patches that have been merged upstream in systemd > > Remove force export of GPERF variable in environment > this was causing AC_CHECK_TOOL to not populate GPERF > variable as expected > > systemd needs kmod to be present on rootfs so add it > to RDEPENDS > > some services substitute discovered kmod when the service > file is generated during boot, however the discovered kmod > is from native sysroot and it gets into the service file > with absolute path. So specify the target path of kmod using > KMOD variable so the unit files have correct pointer to kmod > on target > > Add a patch to make sure that mknod capability is checked > before the service which excercise mknod, this patch is also > submitted to upstream systemd > > Signed-off-by: Khem Raj <raj.khem@gmail.com> Arch Linux had some issues with systemd 206 with regard to device nodes in /dev getting wrong permissions: https://bugs.archlinux.org/task/36259 I wonder if we need to add patches for that as well: http://cgit.freedesktop.org/systemd/systemd/patch/?id=15a722007dc1d8a9a11934b2ab528cf4d25b6c62 http://cgit.freedesktop.org/systemd/systemd/patch/?id=a2aced4add1964f82cfd250f1fee8de9d974b507 http://cgit.freedesktop.org/systemd/systemd/patch/?id=5c7951141fa9f33e1b97de97586cc16bce2776e0 http://cgit.freedesktop.org/systemd/systemd/patch/?id=ec99834cb0e76a9e7096bd42249053712db9c32d Regards, Jonathan ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/3] systemd: Upgrade to 206 2013-08-27 2:40 ` Jonathan Liu @ 2013-08-27 4:53 ` Khem Raj 0 siblings, 0 replies; 13+ messages in thread From: Khem Raj @ 2013-08-27 4:53 UTC (permalink / raw) To: Jonathan Liu; +Cc: openembedded-core@lists.openembedded.org On Aug 26, 2013, at 7:40 PM, Jonathan Liu <net147@gmail.com> wrote: > On 22 August 2013 14:31, Khem Raj <raj.khem@gmail.com> wrote: >> Add new PACKAGE systemd-rpm-macros, this will hold >> the macros which are interesting when rpm is used as >> package management backend >> >> Forward port uclibc only patches. Add a new patch >> to stub out use of preadv/pwritev in testcases >> >> Delete patches that have been merged upstream in systemd >> >> Remove force export of GPERF variable in environment >> this was causing AC_CHECK_TOOL to not populate GPERF >> variable as expected >> >> systemd needs kmod to be present on rootfs so add it >> to RDEPENDS >> >> some services substitute discovered kmod when the service >> file is generated during boot, however the discovered kmod >> is from native sysroot and it gets into the service file >> with absolute path. So specify the target path of kmod using >> KMOD variable so the unit files have correct pointer to kmod >> on target >> >> Add a patch to make sure that mknod capability is checked >> before the service which excercise mknod, this patch is also >> submitted to upstream systemd >> >> Signed-off-by: Khem Raj <raj.khem@gmail.com> > > Arch Linux had some issues with systemd 206 with regard to device > nodes in /dev getting wrong permissions: > https://bugs.archlinux.org/task/36259 > > I wonder if we need to add patches for that as well: > http://cgit.freedesktop.org/systemd/systemd/patch/?id=15a722007dc1d8a9a11934b2ab528cf4d25b6c62 > http://cgit.freedesktop.org/systemd/systemd/patch/?id=a2aced4add1964f82cfd250f1fee8de9d974b507 > http://cgit.freedesktop.org/systemd/systemd/patch/?id=5c7951141fa9f33e1b97de97586cc16bce2776e0 > http://cgit.freedesktop.org/systemd/systemd/patch/?id=ec99834cb0e76a9e7096bd42249053712db9c32d With the testing on 3.8 kernel at that time, I did not have see issues. However if we are able to have reproducers we can cherry pick needed fixes at later stage. Lets see the breakage for our case first. > > Regards, > Jonathan ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/3] glib-2.0: Specify libiconv when building on uclibc 2013-08-22 4:30 [PATCH 0/3] Update systemd/kmod Khem Raj 2013-08-22 4:31 ` [PATCH 1/3] kmod: Upgrade to version 14 Khem Raj 2013-08-22 4:31 ` [PATCH 2/3] systemd: Upgrade to 206 Khem Raj @ 2013-08-22 4:31 ` Khem Raj 2 siblings, 0 replies; 13+ messages in thread From: Khem Raj @ 2013-08-22 4:31 UTC (permalink / raw) To: openembedded-core We use GNU libiconv seprate package on uclibc specifying this makes the configure clear of not trying to detect glibc/iconv and then also finding libiconv in sysroot and confusing itself with errors like | gconvert.c:66:2: error: #error GNU libiconv not in use but included iconv.h is from libiconv | #error GNU libiconv not in use but included iconv.h is from libiconv | ^ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb index 3ba49b6..0918bf5 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb @@ -44,6 +44,7 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\ eglibc-charmap-invariant \ eglibc-localedata-translit-cjk-variants \ " +EXTRA_OECONF_append_class-target_libc-uclibc = " --with-libiconv=gnu" do_configure_prepend() { sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in -- 1.8.3.4 ^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-08-27 4:52 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-08-22 4:30 [PATCH 0/3] Update systemd/kmod Khem Raj 2013-08-22 4:31 ` [PATCH 1/3] kmod: Upgrade to version 14 Khem Raj 2013-08-22 21:54 ` Saul Wold 2013-08-23 4:09 ` Khem Raj 2013-08-23 20:37 ` Saul Wold 2013-08-26 21:22 ` Khem Raj 2013-08-26 22:45 ` Khem Raj 2013-08-26 23:04 ` Saul Wold 2013-08-27 4:49 ` Khem Raj 2013-08-22 4:31 ` [PATCH 2/3] systemd: Upgrade to 206 Khem Raj 2013-08-27 2:40 ` Jonathan Liu 2013-08-27 4:53 ` Khem Raj 2013-08-22 4:31 ` [PATCH 3/3] glib-2.0: Specify libiconv when building on uclibc Khem Raj
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox