* [PATCH 1/1] git: upgrade to 2.11.0
From: Chen Qi @ 2016-12-02 8:35 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1480667707.git.Qi.Chen@windriver.com>
Upgrade git to 2.11.0.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
meta/recipes-devtools/git/git_2.11.0.bb | 11 +++++++++++
meta/recipes-devtools/git/git_2.9.3.bb | 11 -----------
2 files changed, 11 insertions(+), 11 deletions(-)
create mode 100644 meta/recipes-devtools/git/git_2.11.0.bb
delete mode 100644 meta/recipes-devtools/git/git_2.9.3.bb
diff --git a/meta/recipes-devtools/git/git_2.11.0.bb b/meta/recipes-devtools/git/git_2.11.0.bb
new file mode 100644
index 0000000..0ca8a38
--- /dev/null
+++ b/meta/recipes-devtools/git/git_2.11.0.bb
@@ -0,0 +1,11 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+ ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+ "
+EXTRA_OEMAKE += "NO_GETTEXT=1"
+
+SRC_URI[tarball.md5sum] = "eac9324afcf4c95ab11acb2e2283e376"
+SRC_URI[tarball.sha256sum] = "d3be9961c799562565f158ce5b836e2b90f38502d3992a115dfb653d7825fd7e"
+SRC_URI[manpages.md5sum] = "cc86bfaf75174e3c8a10615e97bf3e55"
+SRC_URI[manpages.sha256sum] = "437a0128acd707edce24e1a310ab2f09f9a09ee42de58a8e7641362012dcfe22"
diff --git a/meta/recipes-devtools/git/git_2.9.3.bb b/meta/recipes-devtools/git/git_2.9.3.bb
deleted file mode 100644
index d59f3d2..0000000
--- a/meta/recipes-devtools/git/git_2.9.3.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require git.inc
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
- ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
- "
-EXTRA_OEMAKE += "NO_GETTEXT=1"
-
-SRC_URI[tarball.md5sum] = "c783361be894b8bfa5373811b1b65602"
-SRC_URI[tarball.sha256sum] = "a252b6636b12d5ba57732c8469701544c26c2b1689933bd1b425e603cbb247c0"
-SRC_URI[manpages.md5sum] = "66fafd61d65f9d2d99581133170eb186"
-SRC_URI[manpages.sha256sum] = "8ea1a55b048fafbf0c0c6fcbca4b5b0f5e9917893221fc7345c09051d65832ce"
--
1.9.1
^ permalink raw reply related
* [PATCH 0/1] git: upgrade to 2.11.0
From: Chen Qi @ 2016-12-02 8:35 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 11063a01d4511b2688ea7ba2d7359e4e07328c66:
ruby: upgrade to 2.3.1 (2016-11-30 15:47:17 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib ChenQi/git-2.11.0
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/git-2.11.0
Chen Qi (1):
git: upgrade to 2.11.0
meta/recipes-devtools/git/git_2.11.0.bb | 11 +++++++++++
meta/recipes-devtools/git/git_2.9.3.bb | 11 -----------
2 files changed, 11 insertions(+), 11 deletions(-)
create mode 100644 meta/recipes-devtools/git/git_2.11.0.bb
delete mode 100644 meta/recipes-devtools/git/git_2.9.3.bb
--
1.9.1
^ permalink raw reply
* Re: Debugfs + nfs-utils-client + ipkg
From: Robert Yang @ 2016-12-02 7:17 UTC (permalink / raw)
To: Michael Gloff, OE Core
In-Reply-To: <CALXw4G5XD=N5QJg8OgvOGi-BDsAqUgmFqMddumdAq6MkC_LY5A@mail.gmail.com>
Hi Michael,
On 12/02/2016 11:19 AM, Michael Gloff wrote:
> I've run into an issue recently when trying to build an image along with the
> companion debugfs. This error only occurs if 'nfs-utils-client' is added to
> IMAGE_INSTALL and ipkg packages are selected. I don't get the error with RPM or
> with removing nfs-utils-client. Also, I can see the missing files are present at
> some point during do_rootfs, but then must be getting wiped out? I noticed this
> in Krogoth first, but can reproduce in latest master. Any ideas?
Maybe something is wrong with opkg, it only happens when files are in
/var/lib/foo, here is a *workaround*:
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index a348b97..ba072c0 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -951,7 +951,7 @@ class OpkgRootfs(DpkgOpkgRootfs):
if self.progress_reporter:
self.progress_reporter.next_stage()
- self._setup_dbg_rootfs(['/etc', '/var/lib/opkg', '/usr/lib/ssl'])
+ self._setup_dbg_rootfs(['/etc', '/var/lib/opkg', '/usr/lib/ssl',
'/var/lib/nfs'])
execute_pre_post_process(self.d, opkg_post_process_cmds)
This is not a regular fix, you can file a bug here:
https://bugzilla.yoctoproject.org/
We may fix it later.
// Robert
>
> developer@OEBuilder:~/oe/recipes/poky/build$ bitbake core-image-minimal
> Loading cache: 100%
> |##########################################################################################################################################################|
> Time: 0:00:00
> Loaded 1304 entries from dependency cache.
> NOTE: Resolving any missing task queue dependencies
>
> Build Configuration:
> BB_VERSION = "1.32.0"
> BUILD_SYS = "x86_64-linux"
> NATIVELSBSTRING = "universal"
> TARGET_SYS = "i586-poky-linux"
> MACHINE = "qemux86"
> DISTRO = "poky"
> DISTRO_VERSION = "2.2"
> TUNE_FEATURES = "m32 i586"
> TARGET_FPU = ""
> meta
> meta-poky
> meta-yocto-bsp = "master:9e63f81c78e284c9b325fe04a1b59e61c7ad8a1a"
>
> Initialising tasks: 100%
> |#####################################################################################################################################################|
> Time: 0:00:03
> NOTE: Executing SetScene Tasks
> NOTE: Executing RunQueue Tasks
> ERROR: core-image-minimal-1.0-r0 do_rootfs: Cannot get the installed packages
> list. Command
> '/home/developer/oe/recipes/poky/build/tmp/sysroots/x86_64-linux/usr/bin/opkg -f
> /home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/opkg.conf
> -o
> /home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs
> --force_postinstall --prefer-arch-to-version status' returned 0 and stderr:
> Collected errors:
> * file_md5sum_alloc: Failed to open file
> /home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs/var/lib/nfs/etab:
> No such file or directory.
> * file_md5sum_alloc: Failed to open file
> /home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs/var/lib/nfs/rmtab:
> No such file or directory.
> * file_md5sum_alloc: Failed to open file
> /home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs/var/lib/nfs/xtab:
> No such file or directory.
> * file_md5sum_alloc: Failed to open file
> /home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs/var/lib/nfs/statd/state:
> No such file or directory.
>
> ERROR: core-image-minimal-1.0-r0 do_rootfs: Function failed: do_rootfs
> ERROR: Logfile of failure stored in:
> /home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.5361
> ERROR: Task
> (/home/developer/oe/recipes/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs)
> failed with exit code '1'
> NOTE: Tasks Summary: Attempted 2168 tasks of which 2167 didn't need to be rerun
> and 1 failed.
>
> Summary: 1 task failed:
>
> /home/developer/oe/recipes/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs
> Summary: There were 2 ERROR messages shown, returning a non-zero exit code.
>
> Thanks,
>
> Michael Gloff
> mgloff@emacinc.com <mailto:mgloff@emacinc.com>
>
>
^ permalink raw reply related
* Re: non-standard library locations and rpath
From: Khem Raj @ 2016-12-02 7:08 UTC (permalink / raw)
To: Jack Mitchell; +Cc: OE-core
In-Reply-To: <68b7f401-a888-ff73-45d5-b0df76f170c4@embed.me.uk>
On Thu, Dec 1, 2016 at 8:18 AM, Jack Mitchell <ml@embed.me.uk> wrote:
> I'm having some troubles with shared library, shared library dependencies
> and rpaths. I have libfoo, which depends on libbar when I try to link libfoo
> with my app, it requires libbar to be found. libbar is in a non-standard
> location, /usr/local/bar when I compiled libfoo, I used -Wl,rpath-link
> ${STAGING_SYSROOT}/usr/local/bar and -Wl,rpath /usr/local/bar. Now when I
> come to try link my app with libfoo, it fails to link as it can't find
> libbar, which I assume means the rpath in libfoo isn't being properly
> prepending with sysroot what is the proper way to support this in OE? My
> library has the following rpath information:
>
> 0x0000000f (RPATH) Library rpath: [$ORIGIN/../lib:/usr/local/bar]
>
> So why isn't the rpath being prepended with the sysroot when I compile my
> app and link libfoo? The apps build system is using cmake, but this should
> be a built in linker feature, correct?
Only first path ( before :) is relative to location of binary at runtime
>
> Cheers,
> Jack.
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply
* [PATCH v3] ltp: 20160126 -> 20160920
From: huangqy @ 2016-12-02 14:53 UTC (permalink / raw)
To: openembedded-core; +Cc: Wang Xin
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
1)Upgrade ltp from 20160126 to 20160920.
2)Delete some patches, since they are integrated upstream.
0001-ltp-Don-t-link-against-libfl.patch
0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
0007-replace-SIGCLD-with-SIGCHLD.patch
0009-Guard-error.h-with-__GLIBC__.patch
0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
0013-include-fcntl.h-for-getting-O_-definitions.patch
0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
0017-replace-sigval_t-with-union-sigval.patch
0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
0022-include-sys-types.h.patch
0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
0029-trace_shed-Fix-build-with-musl.patch
0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
0032-regen.sh-Include-asm-unistd.h-explicitly.patch
3)Modify one patch, since the data has been changed.
0011-Rename-sigset-variable-to-sigset1.patch
0035-fix-test_proc_kill-hang.patch
4)Add some new patches.
0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
0002-initialize-recursive-mutex-in-a-portable-way.patch
0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch
5)Modify security_flags.inc to fix error:
/
|In file included from ../../../../include/old/test.h:47:0,
| from faccessat01.c:44:
|faccessat01.c: In function 'setup':
|../../../../include/old/old_safe_file_ops.h:55:27: error: format not a string literal and no format arguments [-Werror=format-security]
| (path), (fmt), ## __VA_ARGS__)
\
Signed-off-by: Wang Xin <wangxin2015.fnst@cn.fujitsu.com>
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
meta/conf/distro/include/security_flags.inc | 2 +
...-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch | 32 ++
.../ltp/0001-ltp-Don-t-link-against-libfl.patch | 30 --
...tialize-recursive-mutex-in-a-portable-way.patch | 167 +++++++++
...n-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch | 120 +++++++
...move-unused-__BEGIN_DECLS-and-__END_DECLS.patch | 48 +++
...sendfile-Use-off64_t-instead-of-__off64_t.patch | 31 --
.../ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch | 394 ---------------------
.../ltp/0009-Guard-error.h-with-__GLIBC__.patch | 270 --------------
.../0011-Rename-sigset-variable-to-sigset1.patch | 60 ++--
...fsstress.c-Replace-__int64_t-with-int64_t.patch | 351 ------------------
...nclude-fcntl.h-for-getting-O_-definitions.patch | 67 ----
...ing-Include-sys-types.h-for-pid_t-definit.patch | 56 ---
...015-mincore01-Rename-PAGESIZE-to-pagesize.patch | 64 ----
| 45 ---
.../0017-replace-sigval_t-with-union-sigval.patch | 88 -----
...lace-canonicalize_file_name-with-realpath.patch | 32 --
.../ltp/ltp/0022-include-sys-types.h.patch | 29 --
...sconf01-Use-_SC_2_C_VERSION-conditionally.patch | 29 --
.../ltp/0029-trace_shed-Fix-build-with-musl.patch | 32 --
...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 33 --
...age-size-offset-as-per-page-size-alignmen.patch | 33 --
...-regen.sh-Include-asm-unistd.h-explicitly.patch | 30 --
.../ltp/ltp/0035-fix-test_proc_kill-hang.patch | 25 +-
.../ltp/{ltp_20160126.bb => ltp_20160920.bb} | 23 +-
25 files changed, 420 insertions(+), 1671 deletions(-)
create mode 100644 meta/recipes-extended/ltp/ltp/0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
create mode 100644 meta/recipes-extended/ltp/ltp/0002-initialize-recursive-mutex-in-a-portable-way.patch
create mode 100644 meta/recipes-extended/ltp/ltp/0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
create mode 100644 meta/recipes-extended/ltp/ltp/0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
delete mode 100644 meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch
rename meta/recipes-extended/ltp/{ltp_20160126.bb => ltp_20160920.bb} (82%)
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index eca835e..290f338 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -115,4 +115,6 @@ SECURITY_LDFLAGS_pn-xf86-video-vesa = "${SECURITY_X_LDFLAGS}"
SECURITY_LDFLAGS_pn-xf86-video-vmware = "${SECURITY_X_LDFLAGS}"
SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}"
+SECURITY_STRINGFORMAT_pn-ltp = ""
+
TARGET_CC_ARCH_append_pn-binutils = " ${SECURITY_CFLAGS} ${SELECTED_OPTIMIZATION}"
diff --git a/meta/recipes-extended/ltp/ltp/0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch b/meta/recipes-extended/ltp/ltp/0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
new file mode 100644
index 0000000..b035804
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
@@ -0,0 +1,32 @@
+From f381b5d58ea02e9001a1885db99d577ef3e49da5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 23 Jul 2016 05:25:32 +0000
+Subject: [PATCH 17/17] Define __SIGRTMIN and __SIGRTMAX on musl
+
+These defines are glibc internal symbols
+actually LTP should not have used it at all
+even the header in glibc states that
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/Makefile b/lib/Makefile
+index 24d1faa..012a76f 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -26,6 +26,10 @@ include $(top_srcdir)/include/mk/env_pre.mk
+
+ CFLAGS += -I.
+
++ifeq ($(LIBC),musl)
++CFLAGS += -D__SIGRTMIN=32 -D__SIGRTMAX=64
++endif
++
+ FILTER_OUT_LIBSRCS := mount_utils.c
+
+ LIB := libltp.a
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch b/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
deleted file mode 100644
index 585b7cb..0000000
--- a/meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 14985fccf7428eaa0b45decc22bfd20fd780f621 Mon Sep 17 00:00:00 2001
-From: Chong Lu <Chong.Lu@windriver.com>
-Date: Tue, 11 Mar 2014 14:47:22 +0800
-Subject: [PATCH 01/32] ltp: Don't link against libfl
-
-We have already defined yywrap function in scan.l file. After this, we no longer need to
-link against libfl and so no longer get errors about undefined references to yylex.
-
-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- pan/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pan/Makefile b/pan/Makefile
-index 4cc6466..a4b575b 100644
---- a/pan/Makefile
-+++ b/pan/Makefile
-@@ -31,7 +31,7 @@ CPPFLAGS += -Wno-error
-
- CPPFLAGS += -I$(abs_srcdir)
-
--LDLIBS += -lm $(LEXLIB)
-+LDLIBS += -lm
-
- LFLAGS += -l
-
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0002-initialize-recursive-mutex-in-a-portable-way.patch b/meta/recipes-extended/ltp/ltp/0002-initialize-recursive-mutex-in-a-portable-way.patch
new file mode 100644
index 0000000..3d01c90
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0002-initialize-recursive-mutex-in-a-portable-way.patch
@@ -0,0 +1,167 @@
+From 9ded0866313d7d59ea1833f318f2b5b42701422d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 21 Jul 2016 05:11:18 +0000
+Subject: [PATCH 11/17] initialize recursive mutex in a portable way
+
+PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP is not in POSIX
+
+use the portable way instead: pthread_once was designed for such
+cases.
+
+Link with libpthread wherever libltp is asked for
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/mk/testcases.mk | 2 +-
+ lib/ltp.pc.in | 2 +-
+ lib/newlib_tests/Makefile | 2 +-
+ lib/tests/Makefile | 2 +-
+ lib/tst_res.c | 18 +++++++++++++++++-
+ testcases/kernel/containers/netns/Makefile | 2 +-
+ testcases/kernel/containers/share/Makefile | 2 +-
+ 7 files changed, 23 insertions(+), 7 deletions(-)
+
+diff --git a/include/mk/testcases.mk b/include/mk/testcases.mk
+index ea26d4f..eff0eee 100644
+--- a/include/mk/testcases.mk
++++ b/include/mk/testcases.mk
+@@ -49,7 +49,7 @@ CPPFLAGS += -I$(abs_top_builddir)/$(TKI_DIR)
+
+ INSTALL_DIR := testcases/bin
+
+-LDLIBS += -lltp
++LDLIBS += -lltp -lpthread
+
+ $(APICMDS_DIR) $(LIBLTP_DIR) $(abs_top_builddir)/$(TKI_DIR): %:
+ mkdir -p "$@"
+diff --git a/lib/ltp.pc.in b/lib/ltp.pc.in
+index 9620129..63cd5f4 100644
+--- a/lib/ltp.pc.in
++++ b/lib/ltp.pc.in
+@@ -6,5 +6,5 @@ libdir=@libdir@
+ Name: LTP
+ Description: Linux Test Project
+ Version: @VERSION@
+-Libs: -L${libdir} -lltp
++Libs: -L${libdir} -lltp -lpthread
+ Cflags: -I${includedir}
+diff --git a/lib/newlib_tests/Makefile b/lib/newlib_tests/Makefile
+index 0e4eeb8..9dd69fd 100644
+--- a/lib/newlib_tests/Makefile
++++ b/lib/newlib_tests/Makefile
+@@ -3,7 +3,7 @@ top_srcdir ?= ../..
+ include $(top_srcdir)/include/mk/env_pre.mk
+
+ CFLAGS += -W -Wall
+-LDLIBS += -lltp
++LDLIBS += -lltp -lpthread
+
+ test08: CFLAGS+=-pthread
+ test09: CFLAGS+=-pthread
+diff --git a/lib/tests/Makefile b/lib/tests/Makefile
+index 73a0f16..bc4476d 100644
+--- a/lib/tests/Makefile
++++ b/lib/tests/Makefile
+@@ -3,7 +3,7 @@ top_srcdir ?= ../..
+ include $(top_srcdir)/include/mk/env_pre.mk
+
+ CFLAGS += -W
+-LDLIBS += -lltp
++LDLIBS += -lltp -lpthread
+
+ tst_cleanup_once: CFLAGS += -pthread
+
+diff --git a/lib/tst_res.c b/lib/tst_res.c
+index b388d0d..ab995f8 100644
+--- a/lib/tst_res.c
++++ b/lib/tst_res.c
+@@ -79,7 +79,8 @@ int TEST_ERRNO;
+ assert(strlen(buf) > 0); \
+ } while (0)
+
+-static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++static pthread_once_t tmutex_once = PTHREAD_ONCE_INIT;
++static pthread_mutex_t tmutex;
+
+ static void check_env(void);
+ static void tst_condense(int tnum, int ttype, const char *tmesg);
+@@ -142,9 +143,20 @@ const char *strttype(int ttype)
+ #include "errnos.h"
+ #include "signame.h"
+
++static void init_tmutex(void)
++{
++ pthread_mutexattr_t attr;
++
++ pthread_mutexattr_init(&attr);
++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
++ pthread_mutex_init(&tmutex, &attr);
++ pthread_mutexattr_destroy(&attr);
++}
++
+ static void tst_res__(const char *file, const int lineno, int ttype,
+ const char *arg_fmt, ...)
+ {
++ pthread_once(&tmutex_once, init_tmutex);
+ pthread_mutex_lock(&tmutex);
+
+ char tmesg[USERMESG];
+@@ -233,6 +245,7 @@ void tst_flush(void)
+ {
+ NO_NEWLIB_ASSERT("Unknown", 0);
+
++ pthread_once(&tmutex_once, init_tmutex);
+ pthread_mutex_lock(&tmutex);
+
+ /*
+@@ -369,6 +382,7 @@ void tst_exit(void)
+ {
+ NO_NEWLIB_ASSERT("Unknown", 0);
+
++ pthread_once(&tmutex_once, init_tmutex);
+ pthread_mutex_lock(&tmutex);
+
+ tst_flush();
+@@ -441,6 +455,7 @@ static int tst_brk_entered = 0;
+ static void tst_brk__(const char *file, const int lineno, int ttype,
+ void (*func)(void), const char *arg_fmt, ...)
+ {
++ pthread_once(&tmutex_once, init_tmutex);
+ pthread_mutex_lock(&tmutex);
+
+ char tmesg[USERMESG];
+@@ -505,6 +520,7 @@ void tst_resm_hexd_(const char *file, const int lineno, int ttype,
+ {
+ NO_NEWLIB_ASSERT(file, lineno);
+
++ pthread_once(&tmutex_once, init_tmutex);
+ pthread_mutex_lock(&tmutex);
+
+ char tmesg[USERMESG];
+diff --git a/testcases/kernel/containers/netns/Makefile b/testcases/kernel/containers/netns/Makefile
+index 3756a55..b2411cd 100644
+--- a/testcases/kernel/containers/netns/Makefile
++++ b/testcases/kernel/containers/netns/Makefile
+@@ -22,6 +22,6 @@ top_srcdir ?= ../../../..
+ include $(top_srcdir)/include/mk/testcases.mk
+ include $(abs_srcdir)/../Makefile.inc
+
+-LDLIBS := -lclone -lltp
++LDLIBS := -lclone -lltp -lpthread
+
+ include $(top_srcdir)/include/mk/generic_leaf_target.mk
+diff --git a/testcases/kernel/containers/share/Makefile b/testcases/kernel/containers/share/Makefile
+index 962d688..cd79f99 100644
+--- a/testcases/kernel/containers/share/Makefile
++++ b/testcases/kernel/containers/share/Makefile
+@@ -17,6 +17,6 @@ top_srcdir ?= ../../../..
+ include $(top_srcdir)/include/mk/testcases.mk
+ include $(abs_srcdir)/../Makefile.inc
+
+-LDLIBS := -lltp
++LDLIBS := -lltp -lpthread
+
+ include $(top_srcdir)/include/mk/generic_leaf_target.mk
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp/0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch b/meta/recipes-extended/ltp/ltp/0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
new file mode 100644
index 0000000..870c598
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
@@ -0,0 +1,120 @@
+From 4665be95ffaae035fffb88a632b6156194e5c52d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 8 Jan 2016 07:14:58 +0000
+Subject: [PATCH 04/15] rt_sigaction/rt_sigprocmark: Replace SA_NOMASK with
+ SA_NODEFER
+
+Fixes musl build failure e.g.
+error: 'SA_NOMASK' undeclared here (not in a function)
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c | 4 ++--
+ testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c | 5 ++---
+ testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c | 4 ++--
+ testcases/kernel/syscalls/sigaction/sigaction02.c | 2 +-
+ testcases/misc/crash/crash01.c | 4 ++--
+ testcases/misc/crash/crash02.c | 3 +--
+ 6 files changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
+index 5cf89cc..e07b974 100644
+--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
++++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c
+@@ -57,10 +57,10 @@ static void setup(void)
+
+ static int test_flags[] =
+ { SA_RESETHAND | SA_SIGINFO, SA_RESETHAND, SA_RESETHAND | SA_SIGINFO,
+-SA_RESETHAND | SA_SIGINFO, SA_NOMASK };
++SA_RESETHAND | SA_SIGINFO, SA_NODEFER };
+ char *test_flags_list[] =
+ { "SA_RESETHAND|SA_SIGINFO", "SA_RESETHAND", "SA_RESETHAND|SA_SIGINFO",
+-"SA_RESETHAND|SA_SIGINFO", "SA_NOMASK" };
++"SA_RESETHAND|SA_SIGINFO", "SA_NODEFER" };
+
+ static void handler(int sig)
+ {
+diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
+index a1da743..594b260 100644
+--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
++++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c
+@@ -55,10 +54,10 @@ void setup(void)
+
+ static int test_flags[] =
+ { SA_RESETHAND | SA_SIGINFO, SA_RESETHAND, SA_RESETHAND | SA_SIGINFO,
+-SA_RESETHAND | SA_SIGINFO, SA_NOMASK };
++SA_RESETHAND | SA_SIGINFO, SA_NODEFER };
+ char *test_flags_list[] =
+ { "SA_RESETHAND|SA_SIGINFO", "SA_RESETHAND", "SA_RESETHAND|SA_SIGINFO",
+-"SA_RESETHAND|SA_SIGINFO", "SA_NOMASK" };
++"SA_RESETHAND|SA_SIGINFO", "SA_NODEFER" };
+
+ static struct test_case_t {
+ int exp_errno;
+diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
+index 175d220..991c87f 100644
+--- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
++++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c
+@@ -55,10 +55,10 @@ static void setup(void)
+
+ static int test_flags[] =
+ { SA_RESETHAND | SA_SIGINFO, SA_RESETHAND, SA_RESETHAND | SA_SIGINFO,
+-SA_RESETHAND | SA_SIGINFO, SA_NOMASK };
++SA_RESETHAND | SA_SIGINFO, SA_NODEFER };
+ char *test_flags_list[] =
+ { "SA_RESETHAND|SA_SIGINFO", "SA_RESETHAND", "SA_RESETHAND|SA_SIGINFO",
+-"SA_RESETHAND|SA_SIGINFO", "SA_NOMASK" };
++"SA_RESETHAND|SA_SIGINFO", "SA_NODEFER" };
+
+ static struct test_case_t {
+ int exp_errno;
+diff --git a/testcases/kernel/syscalls/sigaction/sigaction02.c b/testcases/kernel/syscalls/sigaction/sigaction02.c
+index 641a04e..8641bfc 100644
+--- a/testcases/kernel/syscalls/sigaction/sigaction02.c
++++ b/testcases/kernel/syscalls/sigaction/sigaction02.c
+@@ -91,7 +91,7 @@ int set_handler(int sig, int sig_to_mask, int flag)
+
+ if (flag == 0) {
+ sa.sa_sigaction = (void *)handler;
+- sa.sa_flags = SA_NOMASK;
++ sa.sa_flags = SA_NODEFER;
+ sigemptyset(&sa.sa_mask);
+ sigaddset(&sa.sa_mask, sig_to_mask);
+ err = sigaction(sig, &sa, NULL);
+diff --git a/testcases/misc/crash/crash01.c b/testcases/misc/crash/crash01.c
+index 0574521..614b7e8 100644
+--- a/testcases/misc/crash/crash01.c
++++ b/testcases/misc/crash/crash01.c
+@@ -409,7 +409,7 @@ void my_signal(int sig, void (*func) ())
+
+ act.sa_handler = func;
+ memset(&act.sa_mask, 0x00, sizeof(sigset_t));
+- act.sa_flags = SA_NOMASK | SA_RESTART;
++ act.sa_flags = SA_NODEFER | SA_RESTART;
+ sigaction(sig, &act, 0);
+ }
+
+diff --git a/testcases/misc/crash/crash02.c b/testcases/misc/crash/crash02.c
+index 00fee34..1aba3b9 100644
+--- a/testcases/misc/crash/crash02.c
++++ b/testcases/misc/crash/crash02.c
+@@ -49,7 +49,6 @@ TODO:
+ * Does a syscall is supposed to send SIGSEGV?
+ */
+
+-#define _GNU_SOURCE
+ #include <sys/syscall.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -358,7 +357,7 @@ void my_signal(int sig, void (*func) ())
+
+ act.sa_handler = func;
+ memset(&act.sa_mask, 0x00, sizeof(sigset_t));
+- act.sa_flags = SA_NOMASK | SA_RESTART;
++ act.sa_flags = SA_NODEFER | SA_RESTART;
+ sigaction(sig, &act, 0);
+ }
+
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp/0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch b/meta/recipes-extended/ltp/ltp/0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch
new file mode 100644
index 0000000..92fbf8f
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch
@@ -0,0 +1,48 @@
+From fc73b57669c81ea10c00e838be8931a4e58357ba Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 7 Jan 2016 19:48:14 +0000
+Subject: [PATCH 03/17] Remove unused __BEGIN_DECLS and __END_DECLS
+
+Replace __s32 definitions with int32_t
+its not a generally available typedef
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ testcases/kernel/syscalls/epoll2/include/epoll.h | 5 -----
+ utils/sctp/include/netinet/sctp.h | 10 +++-------
+ 2 files changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/utils/sctp/include/netinet/sctp.h b/utils/sctp/include/netinet/sctp.h
+index 51f5bfb..c302cdb 100644
+--- a/utils/sctp/include/netinet/sctp.h
++++ b/utils/sctp/include/netinet/sctp.h
+@@ -42,7 +42,7 @@
+ extern "C" {
+ #endif
+
+-typedef __s32 sctp_assoc_t;
++typedef int32_t sctp_assoc_t;
+
+ /* Socket option layer for SCTP */
+ #ifndef SOL_SCTP
+@@ -658,7 +656,7 @@ struct sctp_assoc_value {
+ struct sctp_paddrinfo {
+ sctp_assoc_t spinfo_assoc_id;
+ struct sockaddr_storage spinfo_address;
+- __s32 spinfo_state;
++ int32_t spinfo_state;
+ __u32 spinfo_cwnd;
+ __u32 spinfo_srtt;
+ __u32 spinfo_rto;
+@@ -693,7 +691,7 @@ enum sctp_spinfo_state {
+ */
+ struct sctp_status {
+ sctp_assoc_t sstat_assoc_id;
+- __s32 sstat_state;
++ int32_t sstat_state;
+ __u32 sstat_rwnd;
+ __u16 sstat_unackdata;
+ __u16 sstat_penddata;
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch b/meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
deleted file mode 100644
index 56a48ab..0000000
--- a/meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fb8b895385a641d74f2186fe5f20a872209692ed Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 18:24:20 +0000
-Subject: [PATCH 06/32] sendfile: Use off64_t instead of __off64_t
-
-__off64_t is specific to glibc where as off64_t is widely available
-Add _GNU_SOURCE for off64_t defines from sys/types.h
-Fixes
-<command-line>:0:7: error: unknown type name 'off64_t'
-sendfile02.c:97:18: note: in expansion of macro 'OFF_T'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/sendfile/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/syscalls/sendfile/Makefile b/testcases/kernel/syscalls/sendfile/Makefile
-index df7b63f..1bd1b57 100644
---- a/testcases/kernel/syscalls/sendfile/Makefile
-+++ b/testcases/kernel/syscalls/sendfile/Makefile
-@@ -21,6 +21,6 @@ top_srcdir ?= ../../../..
- include $(top_srcdir)/include/mk/testcases.mk
- include $(abs_srcdir)/../utils/newer_64.mk
-
--%_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DOFF_T=__off64_t
-+%_64: CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DOFF_T=off64_t -D_GNU_SOURCE
-
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch b/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
deleted file mode 100644
index 4be906e..0000000
--- a/meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
+++ /dev/null
@@ -1,394 +0,0 @@
-From 405c03171e4bf0edd698cb602cf7bd7fe1d0401a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 19:33:53 +0000
-Subject: [PATCH 07/32] replace SIGCLD with SIGCHLD
-
-its defined to use SIGCHLD anyway in
-
-bits/signum.h:#define SIGCLD SIGCHLD /* Same as SIGCHLD
-(System V). */
-
-plus it helps these tests compile with musl which adheres to posix
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/tst_sig.c | 8 ++++----
- testcases/kernel/connectors/pec/pec_listener.c | 1 +
- testcases/kernel/fs/doio/doio.c | 4 ++--
- testcases/kernel/fs/doio/growfiles.c | 2 +-
- testcases/kernel/syscalls/fcntl/fcntl11.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl17.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl19.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl20.c | 8 ++++----
- testcases/kernel/syscalls/fcntl/fcntl21.c | 8 ++++----
- testcases/kernel/syscalls/kill/kill02.c | 6 +++---
- testcases/kernel/syscalls/kill/kill12.c | 8 ++++----
- testcases/kernel/syscalls/mkdir/mkdir09.c | 12 ++++++------
- testcases/kernel/syscalls/sighold/sighold02.c | 2 +-
- testcases/network/tcp_cmds/perf_lan/pingpong.c | 2 +-
- testcases/network/tcp_cmds/perf_lan/pingpong6.c | 2 +-
- 15 files changed, 44 insertions(+), 43 deletions(-)
-
-diff --git a/lib/tst_sig.c b/lib/tst_sig.c
-index 3af5ffd..36565e1 100644
---- a/lib/tst_sig.c
-+++ b/lib/tst_sig.c
-@@ -49,7 +49,7 @@
- fork_flag - set to FORK or NOFORK depending upon whether the
- calling program executes a fork() system call. It
- is normally the case that the calling program treats
-- SIGCLD as an expected signal if fork() is being used.
-+ SIGCHLD as an expected signal if fork() is being used.
-
- handler - a pointer to the unexpected signal handler to
- be executed after an unexpected signal has been
-@@ -82,7 +82,7 @@ static void (*tst_setup_signal(int, void (*)(int))) (int);
-
- /****************************************************************************
- * tst_sig() : set-up to catch unexpected signals. fork_flag is set to NOFORK
-- * if SIGCLD is to be an "unexpected signal", otherwise it is set to
-+ * if SIGCHLD is to be an "unexpected signal", otherwise it is set to
- * FORK. cleanup points to a cleanup routine to be executed before
- * tst_exit is called (cleanup is set to NULL if no cleanup is desired).
- * handler is a pointer to the signal handling routine (if handler is
-@@ -117,7 +117,7 @@ void tst_sig(int fork_flag, void (*handler) (), void (*cleanup) ())
- for (sig = 1; sig < NSIG; sig++) {
- /*
- * SIGKILL is never unexpected.
-- * SIGCLD is only unexpected when
-+ * SIGCHLD is only unexpected when
- * no forking is being done.
- * SIGINFO is used for file quotas and should be expected
- */
-@@ -205,7 +205,7 @@ void tst_sig(int fork_flag, void (*handler) (), void (*cleanup) ())
- #endif
- break;
-
-- case SIGCLD:
-+ case SIGCHLD:
- if (fork_flag == FORK)
- continue;
-
-diff --git a/testcases/kernel/connectors/pec/pec_listener.c b/testcases/kernel/connectors/pec/pec_listener.c
-index a1beb13..002750a 100644
---- a/testcases/kernel/connectors/pec/pec_listener.c
-+++ b/testcases/kernel/connectors/pec/pec_listener.c
-@@ -20,6 +20,7 @@
- /* */
- /******************************************************************************/
-
-+#define _GNU_SOURCE
- #include <sys/socket.h>
- #include <sys/poll.h>
- #include <sys/types.h>
-diff --git a/testcases/kernel/fs/doio/doio.c b/testcases/kernel/fs/doio/doio.c
-index 4b0dec5..5f65ef9 100644
---- a/testcases/kernel/fs/doio/doio.c
-+++ b/testcases/kernel/fs/doio/doio.c
-@@ -573,7 +573,7 @@ int main(int argc, char **argv)
- case SIGTSTP:
- case SIGSTOP:
- case SIGCONT:
-- case SIGCLD:
-+ case SIGCHLD:
- case SIGBUS:
- case SIGSEGV:
- case SIGQUIT:
-@@ -615,7 +615,7 @@ int main(int argc, char **argv)
- }
-
- sigemptyset(&block_mask);
-- sigaddset(&block_mask, SIGCLD);
-+ sigaddset(&block_mask, SIGCHLD);
- sigprocmask(SIG_BLOCK, &block_mask, &omask);
-
- /*
-diff --git a/testcases/kernel/fs/doio/growfiles.c b/testcases/kernel/fs/doio/growfiles.c
-index 09e7f35..bbad230 100644
---- a/testcases/kernel/fs/doio/growfiles.c
-+++ b/testcases/kernel/fs/doio/growfiles.c
-@@ -1640,7 +1640,7 @@ int set_sig(void)
- #ifdef SIGRESTART
- case SIGRESTART:
- #endif /* SIGRESTART */
-- case SIGCLD:
-+ case SIGCHLD:
- break;
-
- default:
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl11.c b/testcases/kernel/syscalls/fcntl/fcntl11.c
-index fa6ce53..2de2b6c 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl11.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl11.c
-@@ -105,10 +105,10 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if ((sigaction(SIGCLD, &act, NULL)) < 0)
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0)
- tst_brkm(TBROK | TERRNO, cleanup,
-- "sigaction(SIGCLD, ..) failed");
-+ "sigaction(SIGCHLD, ..) failed");
- }
-
- void do_child(void)
-@@ -227,7 +227,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl17.c b/testcases/kernel/syscalls/fcntl/fcntl17.c
-index 5b03e39..6598b20 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl17.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl17.c
-@@ -150,9 +150,9 @@ int setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if (sigaction(SIGCLD, &act, NULL) < 0) {
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if (sigaction(SIGCHLD, &act, NULL) < 0) {
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);
- return 1;
- }
- return 0;
-@@ -381,7 +381,7 @@ void stop_children(void)
- {
- int arg;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- arg = STOP;
- child_free(child_pipe1[1], arg);
- child_free(child_pipe2[1], arg);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl19.c b/testcases/kernel/syscalls/fcntl/fcntl19.c
-index a542cfc..88c91d6 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl19.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl19.c
-@@ -112,9 +112,9 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if ((sigaction(SIGCLD, &act, NULL)) < 0) {
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0) {
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);
- fail = 1;
- }
- }
-@@ -265,7 +265,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl20.c b/testcases/kernel/syscalls/fcntl/fcntl20.c
-index aa06bab..99fd783 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl20.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl20.c
-@@ -109,9 +109,9 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if (sigaction(SIGCLD, &act, NULL) == -1)
-- tst_brkm(TFAIL | TERRNO, cleanup, "SIGCLD signal setup failed");
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if (sigaction(SIGCHLD, &act, NULL) == -1)
-+ tst_brkm(TFAIL | TERRNO, cleanup, "SIGCHLD signal setup failed");
- }
-
- void cleanup(void)
-@@ -264,7 +264,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl21.c b/testcases/kernel/syscalls/fcntl/fcntl21.c
-index 5307021..8f1a67c 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl21.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl21.c
-@@ -110,9 +110,9 @@ void setup(void)
- memset(&act, 0, sizeof(act));
- act.sa_handler = catch_child;
- sigemptyset(&act.sa_mask);
-- sigaddset(&act.sa_mask, SIGCLD);
-- if ((sigaction(SIGCLD, &act, NULL)) < 0) {
-- tst_resm(TFAIL, "SIGCLD signal setup failed, errno: %d", errno);
-+ sigaddset(&act.sa_mask, SIGCHLD);
-+ if ((sigaction(SIGCHLD, &act, NULL)) < 0) {
-+ tst_resm(TFAIL, "SIGCHLD signal setup failed, errno: %d", errno);
- fail = 1;
- }
- }
-@@ -272,7 +272,7 @@ void stop_child(void)
- {
- struct flock fl;
-
-- signal(SIGCLD, SIG_DFL);
-+ signal(SIGCHLD, SIG_DFL);
- fl.l_type = STOP;
- parent_put(&fl);
- wait(0);
-diff --git a/testcases/kernel/syscalls/kill/kill02.c b/testcases/kernel/syscalls/kill/kill02.c
-index 9d6cc68..08360dd 100644
---- a/testcases/kernel/syscalls/kill/kill02.c
-+++ b/testcases/kernel/syscalls/kill/kill02.c
-@@ -701,7 +701,7 @@ void setup(void)
-
- /*
- * Set to catch unexpected signals.
-- * SIGCLD is set to be ignored because we do not wait for termination status.
-+ * SIGCHLD is set to be ignored because we do not wait for termination status.
- * SIGUSR1 is set to be ignored because this is the signal we are using for
- * the test and we are not concerned with the parent getting it.
- */
-@@ -713,9 +713,9 @@ void setup(void)
- "signal(SIGUSR1, SIG_IGN) failed");
- }
-
-- if (signal(SIGCLD, SIG_IGN) == SIG_ERR) {
-+ if (signal(SIGCHLD, SIG_IGN) == SIG_ERR) {
- tst_brkm(TBROK | TERRNO, NULL,
-- "signal(SIGCLD, SIG_IGN) failed");
-+ "signal(SIGCHLD, SIG_IGN) failed");
- }
-
- TEST_PAUSE;
-diff --git a/testcases/kernel/syscalls/kill/kill12.c b/testcases/kernel/syscalls/kill/kill12.c
-index 7a47a4a..d7c4147 100644
---- a/testcases/kernel/syscalls/kill/kill12.c
-+++ b/testcases/kernel/syscalls/kill/kill12.c
-@@ -98,7 +98,7 @@ int main(int argc, char **argv)
-
- exno = 1;
-
-- if (sigset(SIGCLD, chsig) == SIG_ERR) {
-+ if (sigset(SIGCHLD, chsig) == SIG_ERR) {
- fprintf(temp, "\tsigset failed, errno = %d\n", errno);
- fail_exit();
- }
-@@ -128,7 +128,7 @@ int main(int argc, char **argv)
- sleep(1);
-
- kill(pid, sig); /* child should ignroe this sig */
-- kill(pid, SIGCLD); /* child should exit */
-+ kill(pid, SIGCHLD); /* child should exit */
-
- #ifdef BCS
- while ((npid = wait(&status)) != pid
-@@ -222,14 +222,14 @@ void do_child(void)
- int exno = 1;
-
- #ifdef UCLINUX
-- if (sigset(SIGCLD, chsig) == SIG_ERR) {
-+ if (sigset(SIGCHLD, chsig) == SIG_ERR) {
- fprintf(temp, "\tsigset failed, errno = %d\n", errno);
- fail_exit();
- }
- #endif
-
- sigset(sig, SIG_IGN); /* set to ignore signal */
-- kill(getppid(), SIGCLD); /* tell parent we are ready */
-+ kill(getppid(), SIGCHLD); /* tell parent we are ready */
- while (!chflag)
- sleep(1); /* wait for parent */
-
-diff --git a/testcases/kernel/syscalls/mkdir/mkdir09.c b/testcases/kernel/syscalls/mkdir/mkdir09.c
-index 41c20e9..07b4fb8 100644
---- a/testcases/kernel/syscalls/mkdir/mkdir09.c
-+++ b/testcases/kernel/syscalls/mkdir/mkdir09.c
-@@ -122,10 +122,10 @@ int main(int argc, char *argv[])
-
- }
-
-- /* Set up to catch SIGCLD signal */
-- if (signal(SIGCLD, chld) == SIG_ERR) {
-+ /* Set up to catch SIGCHLD signal */
-+ if (signal(SIGCHLD, chld) == SIG_ERR) {
- tst_brkm(TFAIL, cleanup,
-- "Error setting up SIGCLD signal, ERRNO = %d", errno);
-+ "Error setting up SIGCHLD signal, ERRNO = %d", errno);
-
- }
-
-@@ -236,9 +236,9 @@ int runtest(void)
- tst_brkm(TFAIL, cleanup,
- "Error resetting SIGTERM signal, ERRNO = %d", errno);
- }
-- if (signal(SIGCLD, SIG_DFL) == SIG_ERR) {
-+ if (signal(SIGCHLD, SIG_DFL) == SIG_ERR) {
- tst_brkm(TFAIL, cleanup,
-- "Error resetting SIGCLD signal, ERRNO = %d", errno);
-+ "Error resetting SIGCHLD signal, ERRNO = %d", errno);
- }
-
- if (test_time) {
-@@ -372,7 +372,7 @@ void term(int sig)
-
- void chld(int sig)
- {
-- /* Routine to handle SIGCLD signal. */
-+ /* Routine to handle SIGCHLD signal. */
-
- sigchld++;
- if (jump) {
-diff --git a/testcases/kernel/syscalls/sighold/sighold02.c b/testcases/kernel/syscalls/sighold/sighold02.c
-index e3076fb..be01874 100644
---- a/testcases/kernel/syscalls/sighold/sighold02.c
-+++ b/testcases/kernel/syscalls/sighold/sighold02.c
-@@ -77,7 +77,7 @@ static int sigs_map[NUMSIGS];
- static int skip_sig(int sig)
- {
- switch (sig) {
-- case SIGCLD:
-+ case SIGCHLD:
- case SIGKILL:
- case SIGALRM:
- case SIGSTOP:
-diff --git a/testcases/network/tcp_cmds/perf_lan/pingpong.c b/testcases/network/tcp_cmds/perf_lan/pingpong.c
-index 1196312..5b06798 100644
---- a/testcases/network/tcp_cmds/perf_lan/pingpong.c
-+++ b/testcases/network/tcp_cmds/perf_lan/pingpong.c
-@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
-
- /* Setup traps */
- signal(SIGINT, finish);
-- signal(SIGCLD, finish);
-+ signal(SIGCHLD, finish);
-
- /* Fork a child process to continue sending packets */
- tst_resm(TINFO, "Create a child process to continue to send packets");
-diff --git a/testcases/network/tcp_cmds/perf_lan/pingpong6.c b/testcases/network/tcp_cmds/perf_lan/pingpong6.c
-index 9747f58..0a0fb1d 100644
---- a/testcases/network/tcp_cmds/perf_lan/pingpong6.c
-+++ b/testcases/network/tcp_cmds/perf_lan/pingpong6.c
-@@ -153,7 +153,7 @@ char *argv[];
-
- /* Setup traps */
- signal(SIGINT, finish);
-- signal(SIGCLD, finish);
-+ signal(SIGCHLD, finish);
-
- /* Fork a child process to continue sending packets */
- printf("Create a child process to continue to send packets \n");
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch b/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch
deleted file mode 100644
index e58e5a9..0000000
--- a/meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 4ba19d64e95a874995d0b554b891b5ec35bd9495 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 19:45:35 +0000
-Subject: [PATCH 09/32] Guard error.h with __GLIBC__
-
-error API is specific to glibc so use the guard to make it conditional
-on glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/faccessat/faccessat01.c | 2 ++
- testcases/kernel/syscalls/fallocate/fallocate01.c | 2 ++
- testcases/kernel/syscalls/fchmodat/fchmodat01.c | 2 ++
- testcases/kernel/syscalls/fchownat/fchownat01.c | 2 ++
- testcases/kernel/syscalls/fchownat/fchownat02.c | 2 ++
- testcases/kernel/syscalls/fstatat/fstatat01.c | 2 ++
- testcases/kernel/syscalls/futimesat/futimesat01.c | 2 ++
- testcases/kernel/syscalls/linkat/linkat01.c | 2 ++
- testcases/kernel/syscalls/linkat/linkat02.c | 2 ++
- testcases/kernel/syscalls/mkdirat/mkdirat01.c | 2 ++
- testcases/kernel/syscalls/mknodat/mknodat01.c | 2 ++
- testcases/kernel/syscalls/mknodat/mknodat02.c | 2 ++
- testcases/kernel/syscalls/openat/openat01.c | 2 ++
- testcases/kernel/syscalls/readlinkat/readlinkat01.c | 2 ++
- testcases/kernel/syscalls/renameat/renameat01.c | 2 ++
- testcases/kernel/syscalls/symlinkat/symlinkat01.c | 2 ++
- testcases/kernel/syscalls/unlinkat/unlinkat01.c | 2 ++
- 17 files changed, 34 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/faccessat/faccessat01.c b/testcases/kernel/syscalls/faccessat/faccessat01.c
-index 7f0e87a..c72dcf0 100644
---- a/testcases/kernel/syscalls/faccessat/faccessat01.c
-+++ b/testcases/kernel/syscalls/faccessat/faccessat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fallocate/fallocate01.c b/testcases/kernel/syscalls/fallocate/fallocate01.c
-index e72b123..643c0e2 100644
---- a/testcases/kernel/syscalls/fallocate/fallocate01.c
-+++ b/testcases/kernel/syscalls/fallocate/fallocate01.c
-@@ -96,7 +96,9 @@
- #include <fcntl.h>
- #include <sys/syscall.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <inttypes.h>
- #include <sys/utsname.h>
-
-diff --git a/testcases/kernel/syscalls/fchmodat/fchmodat01.c b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
-index 19e9ad5..ae6d807 100644
---- a/testcases/kernel/syscalls/fchmodat/fchmodat01.c
-+++ b/testcases/kernel/syscalls/fchmodat/fchmodat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fchownat/fchownat01.c b/testcases/kernel/syscalls/fchownat/fchownat01.c
-index b361253..a5218af 100644
---- a/testcases/kernel/syscalls/fchownat/fchownat01.c
-+++ b/testcases/kernel/syscalls/fchownat/fchownat01.c
-@@ -28,7 +28,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fchownat/fchownat02.c b/testcases/kernel/syscalls/fchownat/fchownat02.c
-index 6b0304c..8d2863f 100644
---- a/testcases/kernel/syscalls/fchownat/fchownat02.c
-+++ b/testcases/kernel/syscalls/fchownat/fchownat02.c
-@@ -26,7 +26,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/fstatat/fstatat01.c b/testcases/kernel/syscalls/fstatat/fstatat01.c
-index 61531c6..e99fbd2 100644
---- a/testcases/kernel/syscalls/fstatat/fstatat01.c
-+++ b/testcases/kernel/syscalls/fstatat/fstatat01.c
-@@ -48,7 +48,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/futimesat/futimesat01.c b/testcases/kernel/syscalls/futimesat/futimesat01.c
-index ae8d4fe..316dd78 100644
---- a/testcases/kernel/syscalls/futimesat/futimesat01.c
-+++ b/testcases/kernel/syscalls/futimesat/futimesat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/linkat/linkat01.c b/testcases/kernel/syscalls/linkat/linkat01.c
-index fc0687b..83cbfe7 100644
---- a/testcases/kernel/syscalls/linkat/linkat01.c
-+++ b/testcases/kernel/syscalls/linkat/linkat01.c
-@@ -49,7 +49,9 @@
- #include <sys/time.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/linkat/linkat02.c b/testcases/kernel/syscalls/linkat/linkat02.c
-index e9a752a..8d7e431 100644
---- a/testcases/kernel/syscalls/linkat/linkat02.c
-+++ b/testcases/kernel/syscalls/linkat/linkat02.c
-@@ -23,7 +23,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/mkdirat/mkdirat01.c b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
-index 7e15947..1dbc038 100644
---- a/testcases/kernel/syscalls/mkdirat/mkdirat01.c
-+++ b/testcases/kernel/syscalls/mkdirat/mkdirat01.c
-@@ -30,7 +30,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/mknodat/mknodat01.c b/testcases/kernel/syscalls/mknodat/mknodat01.c
-index 26e5538..f034f05 100644
---- a/testcases/kernel/syscalls/mknodat/mknodat01.c
-+++ b/testcases/kernel/syscalls/mknodat/mknodat01.c
-@@ -29,7 +29,9 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/mknodat/mknodat02.c b/testcases/kernel/syscalls/mknodat/mknodat02.c
-index f6368fa..7d0f7c0 100644
---- a/testcases/kernel/syscalls/mknodat/mknodat02.c
-+++ b/testcases/kernel/syscalls/mknodat/mknodat02.c
-@@ -29,7 +29,9 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/openat/openat01.c b/testcases/kernel/syscalls/openat/openat01.c
-index 85f9a91..4ee0117 100644
---- a/testcases/kernel/syscalls/openat/openat01.c
-+++ b/testcases/kernel/syscalls/openat/openat01.c
-@@ -29,7 +29,9 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat01.c b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
-index 97a49e8..b162853 100644
---- a/testcases/kernel/syscalls/readlinkat/readlinkat01.c
-+++ b/testcases/kernel/syscalls/readlinkat/readlinkat01.c
-@@ -29,7 +29,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/renameat/renameat01.c b/testcases/kernel/syscalls/renameat/renameat01.c
-index f4cd51b..105a05b 100644
---- a/testcases/kernel/syscalls/renameat/renameat01.c
-+++ b/testcases/kernel/syscalls/renameat/renameat01.c
-@@ -42,7 +42,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/symlinkat/symlinkat01.c b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
-index 5c238d8..cb7a7e8 100644
---- a/testcases/kernel/syscalls/symlinkat/symlinkat01.c
-+++ b/testcases/kernel/syscalls/symlinkat/symlinkat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-diff --git a/testcases/kernel/syscalls/unlinkat/unlinkat01.c b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
-index 31fe4e7..26f6d9a 100644
---- a/testcases/kernel/syscalls/unlinkat/unlinkat01.c
-+++ b/testcases/kernel/syscalls/unlinkat/unlinkat01.c
-@@ -37,7 +37,9 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <fcntl.h>
-+#ifdef __GLIBC__
- #include <error.h>
-+#endif
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch b/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch
index 945280c..6eace63 100644
--- a/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch
+++ b/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch
@@ -20,8 +20,8 @@ index 7203e9e..fce87d6 100644
/**************/
key_t key;
--sigset_t sigset;
-+sigset_t sigset1;
+-sigset_t set;
++sigset_t set1;
#define SIZE 16*1024
@@ -29,12 +29,12 @@ index 7203e9e..fce87d6 100644
key = (key_t) getpid();
-- sigemptyset(&sigset);
-- sigaddset(&sigset, SIGUSR1);
-- sigprocmask(SIG_BLOCK, &sigset, NULL);
-+ sigemptyset(&sigset1);
-+ sigaddset(&sigset1, SIGUSR1);
-+ sigprocmask(SIG_BLOCK, &sigset1, NULL);
+- sigemptyset(&set);
+- sigaddset(&set, SIGUSR1);
+- sigprocmask(SIG_BLOCK, &set, NULL);
++ sigemptyset(&set1);
++ sigaddset(&set1, SIGUSR1);
++ sigprocmask(SIG_BLOCK, &set1, NULL);
pid = fork();
switch (pid) {
@@ -42,8 +42,8 @@ index 7203e9e..fce87d6 100644
char *cp;
int sig;
-- sigwait(&sigset, &sig);
-+ sigwait(&sigset1, &sig);
+- sigwait(&set, &sig);
++ sigwait(&set1, &sig);
chld_pid = getpid();
/*--------------------------------------------------------*/
@@ -55,8 +55,8 @@ index a3c9ca3..77b0fc9 100644
/**************/
key_t key;
--sigset_t sigset;
-+sigset_t sigset1;
+-sigset_t set;
++sigset_t set1;
int child();
static int rm_shm(int);
@@ -64,12 +64,12 @@ index a3c9ca3..77b0fc9 100644
key = (key_t) getpid();
-- sigemptyset(&sigset);
-- sigaddset(&sigset, SIGUSR1);
-- sigprocmask(SIG_BLOCK, &sigset, NULL);
-+ sigemptyset(&sigset1);
-+ sigaddset(&sigset1, SIGUSR1);
-+ sigprocmask(SIG_BLOCK, &sigset1, NULL);
+- sigemptyset(&set);
+- sigaddset(&set, SIGUSR1);
+- sigprocmask(SIG_BLOCK, &set, NULL);
++ sigemptyset(&set1);
++ sigaddset(&set1, SIGUSR1);
++ sigprocmask(SIG_BLOCK, &set1, NULL);
pid = fork();
switch (pid) {
@@ -77,8 +77,8 @@ index a3c9ca3..77b0fc9 100644
char *cp;
int sig;
-- sigwait(&sigset, &sig);
-+ sigwait(&sigset1, &sig);
+- sigwait(&set, &sig);
++ sigwait(&set1, &sig);
chld_pid = getpid();
if ((shmid = shmget(key, SIZE, 0)) < 0) {
@@ -90,8 +90,8 @@ index 20fca52..6fb1d57 100644
int sig_catch = 0; /* variable to blocked/unblocked signals */
struct sigaction sa_new; /* struct to hold signal info */
--sigset_t sigset; /* signal set to hold signal lists */
-+sigset_t sigset1; /* signal set to hold signal lists */
+-sigset_t set; /* signal set to hold signal lists */
++sigset_t set1; /* signal set to hold signal lists */
sigset_t sigset2;
int main(int ac, char **av)
@@ -99,8 +99,8 @@ index 20fca52..6fb1d57 100644
* so that, signal will not be delivered to
* the test process.
*/
-- TEST(sigprocmask(SIG_BLOCK, &sigset, 0));
-+ TEST(sigprocmask(SIG_BLOCK, &sigset1, 0));
+- TEST(sigprocmask(SIG_BLOCK, &set, 0));
++ TEST(sigprocmask(SIG_BLOCK, &set1, 0));
/* Get the process id of test process */
my_pid = getpid();
@@ -108,8 +108,8 @@ index 20fca52..6fb1d57 100644
*/
errno = 0;
if (sigprocmask(SIG_UNBLOCK,
-- &sigset, 0) == -1) {
-+ &sigset1, 0) == -1) {
+- &set, 0) == -1) {
++ &set1, 0) == -1) {
tst_brkm(TFAIL, cleanup,
"sigprocmask() failed "
"to unblock signal, "
@@ -117,8 +117,8 @@ index 20fca52..6fb1d57 100644
* Initialise the signal sets with the list that
* excludes/includes all system-defined signals.
*/
-- if (sigemptyset(&sigset) == -1) {
-+ if (sigemptyset(&sigset1) == -1) {
+- if (sigemptyset(&set) == -1) {
++ if (sigemptyset(&set1) == -1) {
tst_brkm(TFAIL, cleanup,
"sigemptyset() failed, errno=%d : %s",
errno, strerror(errno));
@@ -126,8 +126,8 @@ index 20fca52..6fb1d57 100644
* Add specified signal (SIGINT) to the signal set
* which excludes system-defined signals.
*/
-- if (sigaddset(&sigset, SIGINT) == -1) {
-+ if (sigaddset(&sigset1, SIGINT) == -1) {
+- if (sigaddset(&set, SIGINT) == -1) {
++ if (sigaddset(&set1, SIGINT) == -1) {
tst_brkm(TFAIL, cleanup,
"sigaddset() failed, errno=%d : %s",
errno, strerror(errno));
diff --git a/meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch b/meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
deleted file mode 100644
index e1532c1..0000000
--- a/meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-From 54e098a366a1d773c4d7d4124f2f5aab976681c3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 19:58:08 +0000
-Subject: [PATCH 12/32] fsstress.c: Replace __int64_t with int64_t
-
-int64_t is defined in ISO C99
-include limits.h to get defintions of PATH_MAX
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/fs/fsstress/fsstress.c | 31 +++++++++---------
- testcases/network/nfs/nfs_fsstress/fsstress.c | 47 ++++++++++++++-------------
- 2 files changed, 40 insertions(+), 38 deletions(-)
-
-diff --git a/testcases/kernel/fs/fsstress/fsstress.c b/testcases/kernel/fs/fsstress/fsstress.c
-index 2f89903..89f0b19 100644
---- a/testcases/kernel/fs/fsstress/fsstress.c
-+++ b/testcases/kernel/fs/fsstress/fsstress.c
-@@ -36,6 +36,7 @@
- #ifdef HAVE_SYS_PRCTL_H
- # include <sys/prctl.h>
- #endif
-+#include <limits.h>
-
- #define XFS_ERRTAG_MAX 17
-
-@@ -1572,7 +1573,7 @@ void bulkstat_f(int opno, long r)
- __u64 last;
- __s32 nent;
- xfs_bstat_t *t;
-- __int64_t total;
-+ int64_t total;
- xfs_fsop_bulkreq_t bsr;
-
- last = 0;
-@@ -1764,14 +1765,14 @@ int setdirect(int fd)
-
- void dread_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf = NULL;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1835,8 +1836,8 @@ void dread_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -1865,14 +1866,14 @@ void dread_f(int opno, long r)
-
- void dwrite_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf = NULL;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1925,8 +1926,8 @@ void dwrite_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -2224,7 +2225,7 @@ void read_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2262,7 +2263,7 @@ void read_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- lseek64(fd, off, SEEK_SET);
- len = (random() % (getpagesize() * 32)) + 1;
-@@ -2509,7 +2510,7 @@ void truncate_f(int opno, long r)
- {
- int e;
- pathname_t f;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2530,7 +2531,7 @@ void truncate_f(int opno, long r)
- free_pathname(&f);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE);
- off %= maxfsize;
- e = truncate64_path(&f, off) < 0 ? errno : 0;
-@@ -2626,7 +2627,7 @@ void write_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2656,7 +2657,7 @@ void write_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- lseek64(fd, off, SEEK_SET);
-diff --git a/testcases/network/nfs/nfs_fsstress/fsstress.c b/testcases/network/nfs/nfs_fsstress/fsstress.c
-index ac91262..a34c416 100644
---- a/testcases/network/nfs/nfs_fsstress/fsstress.c
-+++ b/testcases/network/nfs/nfs_fsstress/fsstress.c
-@@ -31,6 +31,7 @@
- */
-
- #include "global.h"
-+#include <limits.h>
-
- #define XFS_ERRTAG_MAX 17
-
-@@ -1368,7 +1369,7 @@ void allocsp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1398,7 +1399,7 @@ void allocsp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -1519,7 +1520,7 @@ void bulkstat_f(int opno, long r)
- __uint64_t last;
- int nent;
- xfs_bstat_t *t;
-- __int64_t total;
-+ int64_t total;
- xfs_fsop_bulkreq_t bsr;
-
- last = 0;
-@@ -1708,14 +1709,14 @@ int setdirect(int fd)
-
- void dread_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1775,8 +1776,8 @@ void dread_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -1798,14 +1799,14 @@ void dread_f(int opno, long r)
-
- void dwrite_f(int opno, long r)
- {
-- __int64_t align;
-+ int64_t align;
- char *buf;
- struct dioattr diob;
- int e;
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1854,8 +1855,8 @@ void dwrite_f(int opno, long r)
- return;
- }
- #endif
-- align = (__int64_t) diob.d_miniosz;
-- lr = ((__int64_t) random() << 32) + random();
-+ align = (int64_t) diob.d_miniosz;
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off -= (off % align);
- lseek64(fd, off, SEEK_SET);
-@@ -1917,7 +1918,7 @@ void freesp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -1947,7 +1948,7 @@ void freesp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -2145,7 +2146,7 @@ void read_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2183,7 +2184,7 @@ void read_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % stb.st_size);
- lseek64(fd, off, SEEK_SET);
- len = (random() % (getpagesize() * 32)) + 1;
-@@ -2281,7 +2282,7 @@ void resvsp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2311,7 +2312,7 @@ void resvsp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -2428,7 +2429,7 @@ void truncate_f(int opno, long r)
- {
- int e;
- pathname_t f;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2449,7 +2450,7 @@ void truncate_f(int opno, long r)
- free_pathname(&f);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- e = truncate64_path(&f, off) < 0 ? errno : 0;
-@@ -2491,7 +2492,7 @@ void unresvsp_f(int opno, long r)
- pathname_t f;
- int fd;
- struct flock64 fl;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2521,7 +2522,7 @@ void unresvsp_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- fl.l_whence = SEEK_SET;
-@@ -2543,7 +2544,7 @@ void write_f(int opno, long r)
- pathname_t f;
- int fd;
- size_t len;
-- __int64_t lr;
-+ int64_t lr;
- off64_t off;
- struct stat64 stb;
- int v;
-@@ -2573,7 +2574,7 @@ void write_f(int opno, long r)
- close(fd);
- return;
- }
-- lr = ((__int64_t) random() << 32) + random();
-+ lr = ((int64_t) random() << 32) + random();
- off = (off64_t) (lr % MIN(stb.st_size + (1024 * 1024), MAXFSIZE));
- off %= maxfsize;
- lseek64(fd, off, SEEK_SET);
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch b/meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch
deleted file mode 100644
index 4266e4f..0000000
--- a/meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 1ef8c32317064438ec3b37a114f5d82957f4e0c6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:05:54 +0000
-Subject: [PATCH 13/32] include fcntl.h for getting O_* definitions
-
-musl exposes this issue, with glibc fcntl.h is included via some other
-header and this problem remained latent
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/ipc/ipc_stress/shmem_test_03.c | 1 +
- testcases/kernel/syscalls/mq_notify/mq_notify01.c | 1 +
- testcases/network/tcp_cmds/sendfile/testsf_c.c | 1 +
- testcases/network/tcp_cmds/sendfile/testsf_s.c | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/testcases/kernel/ipc/ipc_stress/shmem_test_03.c b/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
-index c1b11fd..8be156f 100644
---- a/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
-+++ b/testcases/kernel/ipc/ipc_stress/shmem_test_03.c
-@@ -72,6 +72,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <limits.h>
-+#include <fcntl.h>
- #include <sys/file.h>
- #include <sys/ipc.h>
- #include <sys/mman.h>
-diff --git a/testcases/kernel/syscalls/mq_notify/mq_notify01.c b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
-index 4728c70..5c7846c 100644
---- a/testcases/kernel/syscalls/mq_notify/mq_notify01.c
-+++ b/testcases/kernel/syscalls/mq_notify/mq_notify01.c
-@@ -41,6 +41,7 @@
- #include <mqueue.h>
- #include <signal.h>
- #include <stdlib.h>
-+#include <fcntl.h>
-
- #include "../utils/include_j_h.h"
-
-diff --git a/testcases/network/tcp_cmds/sendfile/testsf_c.c b/testcases/network/tcp_cmds/sendfile/testsf_c.c
-index 449784f..38d3274 100644
---- a/testcases/network/tcp_cmds/sendfile/testsf_c.c
-+++ b/testcases/network/tcp_cmds/sendfile/testsf_c.c
-@@ -9,6 +9,7 @@
- #include <sys/types.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <fcntl.h>
- #include <sys/file.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
-diff --git a/testcases/network/tcp_cmds/sendfile/testsf_s.c b/testcases/network/tcp_cmds/sendfile/testsf_s.c
-index 17e98ad..bce8dd1 100644
---- a/testcases/network/tcp_cmds/sendfile/testsf_s.c
-+++ b/testcases/network/tcp_cmds/sendfile/testsf_s.c
-@@ -6,6 +6,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <fcntl.h>
- #include <sys/file.h>
- #include <errno.h>
- #include <sys/signal.h>
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch b/meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
deleted file mode 100644
index 84d81e9..0000000
--- a/meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d63fefa86dac437c47b9ebbea0a82a1240aaba2c Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:09:56 +0000
-Subject: [PATCH 14/32] hyperthreading: Include sys/types.h for pid_t
- definition
-
-If sys/types.h is not included then it will not define pid_t_needed
-and therefore typedef wont be included and we get errors about pid_t
-being not known
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h | 1 +
- testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h | 1 +
- testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h b/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
-index 1ec9794..9084aa7 100644
---- a/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
-+++ b/testcases/kernel/sched/hyperthreading/ht_affinity/ht_utils.h
-@@ -3,6 +3,7 @@
- #define _HTUTILS_H_
-
- #include <stdlib.h>
-+#include <sys/types.h>
-
- int is_cmdline_para(const char *para);
-
-diff --git a/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h b/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
-index 1ec9794..c03a124 100644
---- a/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
-+++ b/testcases/kernel/sched/hyperthreading/ht_enabled/ht_utils.h
-@@ -2,6 +2,7 @@
- #ifndef _HTUTILS_H_
- #define _HTUTILS_H_
-
-+#include <sys/types.h>
- #include <stdlib.h>
-
- int is_cmdline_para(const char *para);
-diff --git a/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h b/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
-index 2977ad0..6b484e1 100644
---- a/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
-+++ b/testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.h
-@@ -3,6 +3,7 @@
- #define _HTUTILS_H_
-
- #include <stdlib.h>
-+#include <sys/types.h>
-
- int is_cmdline_para(const char *para);
-
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch b/meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
deleted file mode 100644
index 963536f..0000000
--- a/meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From f091839532f3afe0a58e8ba0b45615c899a43a47 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:12:09 +0000
-Subject: [PATCH 15/32] mincore01: Rename PAGESIZE to pagesize
-
-PAGESIZE conflicts with system headers on musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/mincore/mincore01.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/mincore/mincore01.c b/testcases/kernel/syscalls/mincore/mincore01.c
-index 97a3d95..fa426d1 100644
---- a/testcases/kernel/syscalls/mincore/mincore01.c
-+++ b/testcases/kernel/syscalls/mincore/mincore01.c
-@@ -45,7 +45,7 @@
- #include "test.h"
- #include "safe_macros.h"
-
--static int PAGESIZE;
-+static int pagesize;
- static rlim_t STACK_LIMIT = 10485760;
-
- static void cleanup(void);
-@@ -146,7 +146,7 @@ static void setup4(struct test_case_t *tc)
- }
-
- tc->addr = global_pointer;
-- tc->len = as_lim.rlim_cur - (rlim_t)global_pointer + PAGESIZE;
-+ tc->len = as_lim.rlim_cur - (rlim_t)global_pointer + pagesize;
- tc->vector = global_vec;
-
- /*
-@@ -161,7 +161,7 @@ static void setup(void)
- char *buf;
- int fd;
-
-- PAGESIZE = getpagesize();
-+ pagesize = getpagesize();
-
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-@@ -170,7 +170,7 @@ static void setup(void)
- TEST_PAUSE;
-
- /* global_pointer will point to a mmapped area of global_len bytes */
-- global_len = PAGESIZE * 2;
-+ global_len = pagesize * 2;
-
- buf = SAFE_MALLOC(cleanup, global_len);
- memset(buf, 42, global_len);
-@@ -186,7 +186,7 @@ static void setup(void)
- PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-
- global_vec = SAFE_MALLOC(cleanup,
-- (global_len + PAGESIZE - 1) / PAGESIZE);
-+ (global_len + pagesize - 1) / pagesize);
-
- SAFE_CLOSE(cleanup, fd);
- }
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch b/meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
deleted file mode 100644
index 1b5b93a..0000000
--- a/meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2b9be924bbad8a1f84ae553fdd1aa8391aa8d2f4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:15:07 +0000
-Subject: [PATCH 16/32] ustat: Change header from ustat.h to sys/ustat.h
-
-makes it portable for musl, on glibc ustat.h is just including
-sys/ustat.h too
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/ustat/ustat01.c | 2 +-
- testcases/kernel/syscalls/ustat/ustat02.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/ustat/ustat01.c b/testcases/kernel/syscalls/ustat/ustat01.c
-index 01b7688..494647b 100644
---- a/testcases/kernel/syscalls/ustat/ustat01.c
-+++ b/testcases/kernel/syscalls/ustat/ustat01.c
-@@ -20,8 +20,8 @@
- */
-
- #include <unistd.h>
--#include <ustat.h>
- #include <errno.h>
-+#include <sys/ustat.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include "test.h"
-diff --git a/testcases/kernel/syscalls/ustat/ustat02.c b/testcases/kernel/syscalls/ustat/ustat02.c
-index 4e66236..edada31 100644
---- a/testcases/kernel/syscalls/ustat/ustat02.c
-+++ b/testcases/kernel/syscalls/ustat/ustat02.c
-@@ -21,8 +21,8 @@
- */
-
- #include <unistd.h>
--#include <ustat.h>
- #include <errno.h>
-+#include <sys/ustat.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include "test.h"
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch b/meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch
deleted file mode 100644
index ed25802..0000000
--- a/meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From c882bcd18820b44a685f0d5edd7aaff77a88c912 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 7 Jan 2016 20:17:55 +0000
-Subject: [PATCH 17/32] replace sigval_t with union sigval
-
-This makes it compatible across musl and glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c | 2 +-
- testcases/kernel/syscalls/timer_gettime/timer_gettime01.c | 2 +-
- testcases/kernel/timers/timer_create/timer_create02.c | 4 ++--
- testcases/kernel/timers/timer_create/timer_create03.c | 4 ++--
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
-index d186c1f..bc03544 100644
---- a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
-+++ b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c
-@@ -54,7 +54,7 @@ int main(int ac, char **av)
-
- setup();
-
-- ev.sigev_value = (sigval_t) 0;
-+ ev.sigev_value = (union sigval) 0;
- ev.sigev_signo = SIGALRM;
- ev.sigev_notify = SIGEV_SIGNAL;
- TEST(ltp_syscall(__NR_timer_create, CLOCK_REALTIME, &ev, &timer));
-diff --git a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
-index b583aee..9371a6a 100644
---- a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
-+++ b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c
-@@ -55,7 +55,7 @@ int main(int ac, char **av)
-
- setup();
-
-- ev.sigev_value = (sigval_t) 0;
-+ ev.sigev_value = (union sigval) 0;
- ev.sigev_signo = SIGALRM;
- ev.sigev_notify = SIGEV_SIGNAL;
- TEST(ltp_syscall(__NR_timer_create, CLOCK_REALTIME, &ev, &timer));
-diff --git a/testcases/kernel/timers/timer_create/timer_create02.c b/testcases/kernel/timers/timer_create/timer_create02.c
-index 7f528ed..1127400 100644
---- a/testcases/kernel/timers/timer_create/timer_create02.c
-+++ b/testcases/kernel/timers/timer_create/timer_create02.c
-@@ -142,7 +142,7 @@ void setup_test(int option)
- {
- switch (option) {
- case 0:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM;
- evp.sigev_notify = SIGEV_SIGNAL;
- evp_ptr = &evp;
-@@ -151,7 +151,7 @@ void setup_test(int option)
- evp_ptr = NULL;
- break;
- case 2:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM; /* any will do */
- evp.sigev_notify = SIGEV_NONE;
- evp_ptr = &evp;
-diff --git a/testcases/kernel/timers/timer_create/timer_create03.c b/testcases/kernel/timers/timer_create/timer_create03.c
-index 291fcfa..8b01bf7 100644
---- a/testcases/kernel/timers/timer_create/timer_create03.c
-+++ b/testcases/kernel/timers/timer_create/timer_create03.c
-@@ -129,7 +129,7 @@ void setup_test(int option)
- {
- switch (option) {
- case 0:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM;
- evp.sigev_notify = SIGEV_SIGNAL;
- evp_ptr = &evp;
-@@ -138,7 +138,7 @@ void setup_test(int option)
- evp_ptr = NULL;
- break;
- case 2:
-- evp.sigev_value = (sigval_t) 0;
-+ evp.sigev_value = (union sigval) 0;
- evp.sigev_signo = SIGALRM; /* any will do */
- evp.sigev_notify = SIGEV_NONE;
- evp_ptr = &evp;
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch b/meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
deleted file mode 100644
index 0a4c5f0..0000000
--- a/meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 721e94985b9cff3e2724af7ea5be7d005bc12dec Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 06:55:27 +0000
-Subject: [PATCH 19/32] tomoyo: Replace canonicalize_file_name() with
- realpath()
-
-canonicalize_file_name() API is specific to glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c b/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
-index da4af0f..5c1a3ca 100644
---- a/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
-+++ b/testcases/kernel/security/tomoyo/tomoyo_filesystem_test.c
-@@ -274,9 +274,9 @@ int main(int argc, char *argv[])
- /* Test mount(). */
- {
- static char buf[4096];
-- char *dev_ram_path = canonicalize_file_name("/dev/ram0");
-+ char *dev_ram_path = realpath("/dev/ram0", NULL);
- if (!dev_ram_path)
-- dev_ram_path = canonicalize_file_name("/dev/ram");
-+ dev_ram_path = realpath("/dev/ram", NULL);
- if (!dev_ram_path) {
- dev_ram_path = "/dev/ram0";
- mknod(dev_ram_path, S_IFBLK, MKDEV(1, 0));
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch b/meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
deleted file mode 100644
index 413b44a..0000000
--- a/meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7ac6fd51991ac61d1d7594f601d87842060ee284 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:06:11 +0000
-Subject: [PATCH 22/32] include sys/types.h
-
-Fixes
-
-error: unknown type name 'uint'
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/ipc/ipc_stress/shmem_test_04.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/testcases/kernel/ipc/ipc_stress/shmem_test_04.c b/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
-index 72c2e60..e7e5f61 100644
---- a/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
-+++ b/testcases/kernel/ipc/ipc_stress/shmem_test_04.c
-@@ -65,6 +65,7 @@
- #include <signal.h>
- #include <stdint.h>
- #include <sys/mman.h>
-+#include <sys/types.h>
-
- #ifdef _LINUX_
- typedef unsigned long ulong_t;
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch b/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
deleted file mode 100644
index b47d097..0000000
--- a/meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4a74b275acc8158850f2500928a1467c3482c986 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:23:11 +0000
-Subject: [PATCH 27/32] sysconf01: Use _SC_2_C_VERSION conditionally
-
-_SC_2_C_VERSION is not available on musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/syscalls/sysconf/sysconf01.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/sysconf/sysconf01.c b/testcases/kernel/syscalls/sysconf/sysconf01.c
-index 8542e77..e806943 100644
---- a/testcases/kernel/syscalls/sysconf/sysconf01.c
-+++ b/testcases/kernel/syscalls/sysconf/sysconf01.c
-@@ -102,7 +102,9 @@ int main(void)
- test_sysconf(_SC_ATEXIT_MAX);
- test_sysconf(_SC_2_C_BIND);
- test_sysconf(_SC_2_C_DEV);
-+#ifdef __GLIBC__
- test_sysconf(_SC_2_C_VERSION);
-+#endif
- /* 21 - 25 */
- test_sysconf(_SC_2_CHAR_TERM);
- test_sysconf(_SC_2_FORT_DEV);
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch b/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch
deleted file mode 100644
index f7ece9e..0000000
--- a/meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2f8a57f66a94210d34dd0361659a8297cf3d813f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:29:24 +0000
-Subject: [PATCH 29/32] trace_shed: Fix build with musl
-
-Errors on musl are
-
-trace_sched.c:425:16: error: invalid operands to binary & (have
-'thread_sched_t * {aka struct <anonymous> *}' and 'int')
- thrd_ndx, WEXITSTATUS(status));
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/sched/tool/trace_sched.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/sched/tool/trace_sched.c b/testcases/kernel/sched/tool/trace_sched.c
-index 7815686..30dca5f 100644
---- a/testcases/kernel/sched/tool/trace_sched.c
-+++ b/testcases/kernel/sched/tool/trace_sched.c
-@@ -422,7 +422,7 @@ int main(int argc, /* number of input parameters. */
- if (status == (thread_sched_t *) - 1) {
- fprintf(stderr,
- "thread [%d] - process exited with errors %d\n",
-- thrd_ndx, WEXITSTATUS(status));
-+ thrd_ndx, WEXITSTATUS((int)status));
- exit(-1);
- } else {
- exp_prio[thrd_ndx] = status->exp_prio;
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch b/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
deleted file mode 100644
index d2d6d76..0000000
--- a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 77c95dacffe90382a1f131c801ac569120d95949 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:32:24 +0000
-Subject: [PATCH 30/32] lib: Use PTHREAD_MUTEX_RECURSIVE in place of
- PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP for non-glibc
-
-e.g. musl does not implement the _NP mutex types
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/tst_res.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/lib/tst_res.c b/lib/tst_res.c
-index 5c1c58c..3244b5e 100644
---- a/lib/tst_res.c
-+++ b/lib/tst_res.c
-@@ -104,8 +104,11 @@ int TEST_ERRNO;
- assert(strlen(buf) > 0); \
- } while (0)
-
-+#ifdef __GLIBC__
- static pthread_mutex_t tmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
--
-+#else
-+static pthread_mutex_t tmutex = { PTHREAD_MUTEX_RECURSIVE };
-+#endif
- /*
- * Define local function prototypes.
- */
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch b/meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
deleted file mode 100644
index 473ca4c..0000000
--- a/meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 293ff1da06748ed4c69be6ece262d42e562e7298 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 07:36:19 +0000
-Subject: [PATCH 31/32] vma03: fix page size offset as per page size alignment
-
-the offset the param of mmap2() doesn't align the page size, but,
-this param allow must be a multiple of the page size as returned
-by sysconf(_SC_PAGE_SIZE).meanwhile offset * 4096 must be a
-multiple of the system page size, so modify the input param of offset
-pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));
-
-Signed-off-by: Chuang Dong <Chuang.Dong@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/mem/vma/vma03.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testcases/kernel/mem/vma/vma03.c b/testcases/kernel/mem/vma/vma03.c
-index ad8a7b4..a539233 100644
---- a/testcases/kernel/mem/vma/vma03.c
-+++ b/testcases/kernel/mem/vma/vma03.c
-@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
- if (fd == -1)
- tst_brkm(TBROK | TERRNO, NULL, "open %s", TESTFILE);
-
-- pgoff = ULONG_MAX - 1;
-+ pgoff = (ULONG_MAX - 1)&(~((pgsz-1)>>12));
- map = mmap2(NULL, pgsz, PROT_READ | PROT_WRITE, MAP_PRIVATE,
- fd, pgoff);
- if (map == MAP_FAILED)
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch b/meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch
deleted file mode 100644
index 5c6bf91..0000000
--- a/meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4f1905ff09c730091674818bd1b48ee221347101 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 8 Jan 2016 08:30:29 +0000
-Subject: [PATCH 32/32] regen.sh: Include asm/unistd.h explicitly
-
-on musl this is not included indirectly and it results in errors like
-testcases/kernel/include/linux_syscall_numbers.h:1035:25: error:
-'__NR_SYSCALL_BASE' undeclared (first use in this function)
-| # define __NR_readdir (__NR_SYSCALL_BASE+ 89)
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/include/regen.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/testcases/kernel/include/regen.sh b/testcases/kernel/include/regen.sh
-index f93f49b..ee790af 100755
---- a/testcases/kernel/include/regen.sh
-+++ b/testcases/kernel/include/regen.sh
-@@ -32,6 +32,7 @@ cat << EOF > "${output_pid}"
-
- #include <errno.h>
- #include <sys/syscall.h>
-+#include <asm/unistd.h>
- #include "cleanup.c"
-
- #define ltp_syscall(NR, ...) ({ \\
---
-2.7.0
-
diff --git a/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch b/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
index 32ae8aa..5d0a887 100644
--- a/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
+++ b/meta/recipes-extended/ltp/ltp/0035-fix-test_proc_kill-hang.patch
@@ -1,23 +1,30 @@
-Fix test_proc_kill hanging
+From c6eaf473379e0ee56d94e5168a7f4f47e9c0b482 Mon Sep 17 00:00:00 2001
+From: George Nita <george.nita@enea.com>
+Date: Wed, 20 Jul 2016 20:04:59 -0700
+Subject: [PATCH 10/17] Fix test_proc_kill hanging
Sometimes the signal is delivered to memcg_process before the framework took
into consideration its pid entered in the tasks. Fixed by delaying the signal
send command.
Signed-off-by: George Nita <george.nita@enea.com>
-Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ testcases/kernel/controllers/memcg/functional/memcg_lib.sh | 1 +
+ 1 file changed, 1 insertion(+)
diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
-index ffbe006..e81bf74 100755
+index b785fe3..2918cc5 100755
--- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
+++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
-@@ -220,8 +220,8 @@ test_proc_kill()
-
- $TEST_PATH/memcg_process $2 -s $3 &
+@@ -283,6 +283,7 @@ test_proc_kill()
pid=$!
-- sleep 1
+ TST_CHECKPOINT_WAIT 0
echo $pid > tasks
+ sleep 1
- kill -s USR1 $pid 2> /dev/null
- sleep 1
+ signal_memcg_process $pid $3
+
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160920.bb
similarity index 82%
rename from meta/recipes-extended/ltp/ltp_20160126.bb
rename to meta/recipes-extended/ltp/ltp_20160920.bb
index 7ee84e3..e087d87 100644
--- a/meta/recipes-extended/ltp/ltp_20160126.bb
+++ b/meta/recipes-extended/ltp/ltp_20160920.bb
@@ -24,45 +24,32 @@ DEPENDS_append_libc-musl = " fts "
EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "
CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "fce797676b14f50406718e7ef640b50da66c9b36"
+SRCREV = "52f4cf73fc1304e1339136729cfc03960d2d7c85"
SRC_URI = "git://github.com/linux-test-project/ltp.git \
- file://0001-ltp-Don-t-link-against-libfl.patch \
file://0002-Add-knob-to-control-whether-numa-support-should-be-c.patch \
file://0003-Add-knob-to-control-tirpc-support.patch \
file://0004-build-Add-option-to-select-libc-implementation.patch \
file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \
- file://0006-sendfile-Use-off64_t-instead-of-__off64_t.patch \
- file://0007-replace-SIGCLD-with-SIGCHLD.patch \
file://0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch \
- file://0009-Guard-error.h-with-__GLIBC__.patch \
file://0010-replace-__BEGIN_DECLS-and-__END_DECLS.patch \
file://0011-Rename-sigset-variable-to-sigset1.patch \
- file://0012-fsstress.c-Replace-__int64_t-with-int64_t.patch \
- file://0013-include-fcntl.h-for-getting-O_-definitions.patch \
- file://0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch \
- file://0015-mincore01-Rename-PAGESIZE-to-pagesize.patch \
- file://0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch \
- file://0017-replace-sigval_t-with-union-sigval.patch \
file://0018-guard-mallocopt-with-__GLIBC__.patch \
- file://0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch \
file://0020-getdents-define-getdents-getdents64-only-for-glibc.patch \
file://0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch \
- file://0022-include-sys-types.h.patch \
file://0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch \
file://0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch \
file://0025-mc_gethost-include-sys-types.h.patch \
file://0026-crash01-Define-_GNU_SOURCE.patch \
- file://0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch \
file://0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch \
- file://0029-trace_shed-Fix-build-with-musl.patch \
- file://0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch \
- file://0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch \
- file://0032-regen.sh-Include-asm-unistd.h-explicitly.patch \
file://0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch \
file://0034-periodic_output.patch \
file://0035-fix-test_proc_kill-hang.patch \
file://0001-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
+ file://0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch \
+ file://0002-initialize-recursive-mutex-in-a-portable-way.patch \
+ file://0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch \
+ file://0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch \
"
S = "${WORKDIR}/git"
--
2.7.4
^ permalink raw reply related
* Debugfs + nfs-utils-client + ipkg
From: Michael Gloff @ 2016-12-02 3:19 UTC (permalink / raw)
To: OE Core
[-- Attachment #1: Type: text/plain, Size: 3434 bytes --]
I've run into an issue recently when trying to build an image along with
the companion debugfs. This error only occurs if 'nfs-utils-client' is
added to IMAGE_INSTALL and ipkg packages are selected. I don't get the
error with RPM or with removing nfs-utils-client. Also, I can see the
missing files are present at some point during do_rootfs, but then must be
getting wiped out? I noticed this in Krogoth first, but can reproduce in
latest master. Any ideas?
developer@OEBuilder:~/oe/recipes/poky/build$ bitbake core-image-minimal
Loading cache: 100%
|##########################################################################################################################################################|
Time: 0:00:00
Loaded 1304 entries from dependency cache.
NOTE: Resolving any missing task queue dependencies
Build Configuration:
BB_VERSION = "1.32.0"
BUILD_SYS = "x86_64-linux"
NATIVELSBSTRING = "universal"
TARGET_SYS = "i586-poky-linux"
MACHINE = "qemux86"
DISTRO = "poky"
DISTRO_VERSION = "2.2"
TUNE_FEATURES = "m32 i586"
TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp = "master:9e63f81c78e284c9b325fe04a1b59e61c7ad8a1a"
Initialising tasks: 100%
|#####################################################################################################################################################|
Time: 0:00:03
NOTE: Executing SetScene Tasks
NOTE: Executing RunQueue Tasks
ERROR: core-image-minimal-1.0-r0 do_rootfs: Cannot get the installed
packages list. Command
'/home/developer/oe/recipes/poky/build/tmp/sysroots/x86_64-linux/usr/bin/opkg
-f
/home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/opkg.conf
-o
/home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs
--force_postinstall --prefer-arch-to-version status' returned 0 and
stderr:
Collected errors:
* file_md5sum_alloc: Failed to open file
/home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs/var/lib/nfs/etab:
No such file or directory.
* file_md5sum_alloc: Failed to open file
/home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs/var/lib/nfs/rmtab:
No such file or directory.
* file_md5sum_alloc: Failed to open file
/home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs/var/lib/nfs/xtab:
No such file or directory.
* file_md5sum_alloc: Failed to open file
/home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/rootfs/var/lib/nfs/statd/state:
No such file or directory.
ERROR: core-image-minimal-1.0-r0 do_rootfs: Function failed: do_rootfs
ERROR: Logfile of failure stored in:
/home/developer/oe/recipes/poky/build/tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.5361
ERROR: Task
(/home/developer/oe/recipes/poky/meta/recipes-core/images/core-image-minimal.bb:do_rootfs)
failed with exit code '1'
NOTE: Tasks Summary: Attempted 2168 tasks of which 2167 didn't need to be
rerun and 1 failed.
Summary: 1 task failed:
/home/developer/oe/recipes/poky/meta/recipes-core/images/core-image-minimal.bb:
do_rootfs
Summary: There were 2 ERROR messages shown, returning a non-zero exit code.
Thanks,
Michael Gloff
mgloff@emacinc.com
[-- Attachment #2: Type: text/html, Size: 3815 bytes --]
^ permalink raw reply
* [PATCH] diffutils: 3.4 -> 3.5
From: huangqy @ 2016-12-02 11:03 UTC (permalink / raw)
To: openembedded-core
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Upgrade diffutils from 3.4 to 3.5.
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
.../0001-Unset-need_charset_alias-when-building-for-musl.patch | 0
.../diffutils/{diffutils-3.4 => diffutils-3.5}/run-ptest | 0
.../recipes-extended/diffutils/{diffutils_3.4.bb => diffutils_3.5.bb} | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/diffutils/{diffutils-3.4 => diffutils-3.5}/0001-Unset-need_charset_alias-when-building-for-musl.patch (100%)
rename meta/recipes-extended/diffutils/{diffutils-3.4 => diffutils-3.5}/run-ptest (100%)
rename meta/recipes-extended/diffutils/{diffutils_3.4.bb => diffutils_3.5.bb} (87%)
diff --git a/meta/recipes-extended/diffutils/diffutils-3.4/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/diffutils/diffutils-3.5/0001-Unset-need_charset_alias-when-building-for-musl.patch
similarity index 100%
rename from meta/recipes-extended/diffutils/diffutils-3.4/0001-Unset-need_charset_alias-when-building-for-musl.patch
rename to meta/recipes-extended/diffutils/diffutils-3.5/0001-Unset-need_charset_alias-when-building-for-musl.patch
diff --git a/meta/recipes-extended/diffutils/diffutils-3.4/run-ptest b/meta/recipes-extended/diffutils/diffutils-3.5/run-ptest
similarity index 100%
rename from meta/recipes-extended/diffutils/diffutils-3.4/run-ptest
rename to meta/recipes-extended/diffutils/diffutils-3.5/run-ptest
diff --git a/meta/recipes-extended/diffutils/diffutils_3.4.bb b/meta/recipes-extended/diffutils/diffutils_3.5.bb
similarity index 87%
rename from meta/recipes-extended/diffutils/diffutils_3.4.bb
rename to meta/recipes-extended/diffutils/diffutils_3.5.bb
index cb7092b..673f5d4 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.4.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.5.bb
@@ -17,8 +17,8 @@ do_configure_prepend () {
done
}
-SRC_URI[md5sum] = "df9ca465f30307cffd03da176a43a5d4"
-SRC_URI[sha256sum] = "db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2"
+SRC_URI[md5sum] = "569354697ff1cfc9a9de3781361015fa"
+SRC_URI[sha256sum] = "dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533"
inherit ptest
--
2.7.4
^ permalink raw reply related
* Re: [PATCH] perl-native: Remove usage of -fstack-protector=strong
From: Khem Raj @ 2016-12-02 0:19 UTC (permalink / raw)
To: Aníbal Limón; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <5840A839.5070704@linux.intel.com>
On Thu, Dec 1, 2016 at 2:46 PM, Aníbal Limón
<anibal.limon@linux.intel.com> wrote:
>
>
> On 12/01/2016 04:39 PM, Khem Raj wrote:
>> On Thu, Dec 1, 2016 at 8:34 AM, Aníbal Limón
>> <anibal.limon@linux.intel.com> wrote:
>>> Some distributions (like opensuse421) supported by the project
>>> comes with older gcc releases, -fstack-protector=strong is supported
>>> by GCC>=4.9.
>>>
>>> This causes a build failure when install perl-native from a sstate that
>>> comes from a machine supporting -fstack-protector=strong [1].
>>>
>>> So disable usage of this flag in perl-native builds, this patch could
>>> be removed when all supported distros comes with GCC>=4.9.
>>
>>
>> Instead of disabling it. Can it be made detectable during configure.
>
> The issue here is that comes from SSTATE mirror so the configure step
> isn't executed again when a other machine without
> -fstack-protector=strong download the sstate artifact was generate in
> other machine with -fstack-protector=strong support. This is only for
> native builds for target builds in enabled.
>
> We have similar patches for example in rpm,
>
> http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch
>
yeah I see, thanks, I guess we need to bring it down to lowest common
denominator I guess.
maybe we should start thinking about gcc-native
> Cheers,
> alimon
>
>
>>
>>>
>>> [YOCTO #10338]
>>>
>>> [1] http://errors.yoctoproject.org/Errors/Details/109589/
>>>
>>> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
>>> ---
>>> meta/recipes-devtools/perl/perl-native_5.24.0.bb | 1 +
>>> ...emove-fstack-protector-strong-for-native-.patch | 103 +++++++++++++++++++++
>>> 2 files changed, 104 insertions(+)
>>> create mode 100644 meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
>>>
>>> diff --git a/meta/recipes-devtools/perl/perl-native_5.24.0.bb b/meta/recipes-devtools/perl/perl-native_5.24.0.bb
>>> index af2ad7b..b1f0179 100644
>>> --- a/meta/recipes-devtools/perl/perl-native_5.24.0.bb
>>> +++ b/meta/recipes-devtools/perl/perl-native_5.24.0.bb
>>> @@ -11,6 +11,7 @@ SRC_URI += "\
>>> file://debian/errno_ver.diff \
>>> file://dynaloaderhack.patch \
>>> file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
>>> + file://0001-Configure-Remove-fstack-protector-strong-for-native-.patch \
>>> "
>>>
>>> SRC_URI[md5sum] = "59456ae4bd4b06cb6e57cb19a3b2d349"
>>> diff --git a/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch b/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
>>> new file mode 100644
>>> index 0000000..7391ac5
>>> --- /dev/null
>>> +++ b/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
>>> @@ -0,0 +1,103 @@
>>> +Some distributions (like opensuse421) supported by the project
>>> +comes with older gcc releases, -fstack-protector=strong is supported
>>> +by GCC>=4.9.
>>> +
>>> +This causes a build failure when install perl-native from a sstate that
>>> +comes from a machine supporting -fstack-protector=strong [1].
>>> +
>>> +So disable usage of this flag in perl-native builds, this patch could
>>> +be removed when all supported distros comes with GCC>=4.9.
>>> +
>>> +[YOCTO #10338]
>>> +
>>> +Upstream-status: Inappropriate [configuration]
>>> +
>>> +[1] http://errors.yoctoproject.org/Errors/Details/109589/
>>> +
>>> +Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
>>> +---
>>> + Configure | 54 ------------------------------------------------------
>>> + 1 file changed, 54 deletions(-)
>>> +
>>> +diff --git a/Configure b/Configure
>>> +index efbdcfd..d5bd98c 100755
>>> +--- a/Configure
>>> ++++ b/Configure
>>> +@@ -5468,30 +5468,6 @@ default|recommended)
>>> + eval $checkccflag
>>> + ;;
>>> + esac
>>> +-
>>> +- # on x86_64 (at least) we require an extra library (libssp) in the
>>> +- # link command line. This library is not named, so I infer that it is
>>> +- # an implementation detail that may change. Hence the safest approach
>>> +- # is to add the flag to the flags passed to the compiler at link time,
>>> +- # as that way the compiler can do the right implementation dependant
>>> +- # thing. (NWC)
>>> +- case "$osname" in
>>> +- amigaos) ;; # -fstack-protector builds but doesn't work
>>> +- *) case "$gccversion" in
>>> +- ?*) set stack-protector-strong -fstack-protector-strong
>>> +- eval $checkccflag
>>> +- case "$dflt" in
>>> +- *-fstack-protector-strong*) ;; # It got added.
>>> +- *) # Try the plain/older -fstack-protector.
>>> +- set stack-protector -fstack-protector
>>> +- eval $checkccflag
>>> +- ;;
>>> +- esac
>>> +- ;;
>>> +- esac
>>> +- ;;
>>> +- esac
>>> +- ;;
>>> + esac
>>> +
>>> + case "$mips_type" in
>>> +@@ -5634,21 +5610,6 @@ case "$ldflags" in
>>> + ;;
>>> + *) dflt="$ldflags";;
>>> + esac
>>> +-# See note above about -fstack-protector
>>> +-case "$ccflags" in
>>> +-*-fstack-protector-strong*)
>>> +- case "$dflt" in
>>> +- *-fstack-protector-strong*) ;; # Don't add it again
>>> +- *) dflt="$dflt -fstack-protector-strong" ;;
>>> +- esac
>>> +- ;;
>>> +-*-fstack-protector*)
>>> +- case "$dflt" in
>>> +- *-fstack-protector*) ;; # Don't add it again
>>> +- *) dflt="$dflt -fstack-protector" ;;
>>> +- esac
>>> +- ;;
>>> +-esac
>>> +
>>> + : Try to guess additional flags to pick up local libraries.
>>> + for thislibdir in $libpth; do
>>> +@@ -8571,21 +8532,6 @@ EOM
>>> + ''|' ') dflt='none' ;;
>>> + esac
>>> +
>>> +- case "$ldflags" in
>>> +- *-fstack-protector-strong*)
>>> +- case "$dflt" in
>>> +- *-fstack-protector-strong*) ;; # Don't add it again
>>> +- *) dflt="$dflt -fstack-protector-strong" ;;
>>> +- esac
>>> +- ;;
>>> +- *-fstack-protector*)
>>> +- case "$dflt" in
>>> +- *-fstack-protector*) ;; # Don't add it again
>>> +- *) dflt="$dflt -fstack-protector" ;;
>>> +- esac
>>> +- ;;
>>> +- esac
>>> +-
>>> + rp="Any special flags to pass to $ld to create a dynamically loaded library?"
>>> + . ./myread
>>> + case "$ans" in
>>> +--
>>> +2.1.4
>>> +
>>> --
>>> 2.1.4
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Re: [PATCH] perl-native: Remove usage of -fstack-protector=strong
From: Aníbal Limón @ 2016-12-01 22:46 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <CAMKF1srq2VD3En90FNXLB6p4YvLYh=fEz6mzEmC-O4bBHV1Q7A@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 6758 bytes --]
On 12/01/2016 04:39 PM, Khem Raj wrote:
> On Thu, Dec 1, 2016 at 8:34 AM, Aníbal Limón
> <anibal.limon@linux.intel.com> wrote:
>> Some distributions (like opensuse421) supported by the project
>> comes with older gcc releases, -fstack-protector=strong is supported
>> by GCC>=4.9.
>>
>> This causes a build failure when install perl-native from a sstate that
>> comes from a machine supporting -fstack-protector=strong [1].
>>
>> So disable usage of this flag in perl-native builds, this patch could
>> be removed when all supported distros comes with GCC>=4.9.
>
>
> Instead of disabling it. Can it be made detectable during configure.
The issue here is that comes from SSTATE mirror so the configure step
isn't executed again when a other machine without
-fstack-protector=strong download the sstate artifact was generate in
other machine with -fstack-protector=strong support. This is only for
native builds for target builds in enabled.
We have similar patches for example in rpm,
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-devtools/rpm/rpm/popt-disable-auto-stack-protector.patch
Cheers,
alimon
>
>>
>> [YOCTO #10338]
>>
>> [1] http://errors.yoctoproject.org/Errors/Details/109589/
>>
>> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
>> ---
>> meta/recipes-devtools/perl/perl-native_5.24.0.bb | 1 +
>> ...emove-fstack-protector-strong-for-native-.patch | 103 +++++++++++++++++++++
>> 2 files changed, 104 insertions(+)
>> create mode 100644 meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
>>
>> diff --git a/meta/recipes-devtools/perl/perl-native_5.24.0.bb b/meta/recipes-devtools/perl/perl-native_5.24.0.bb
>> index af2ad7b..b1f0179 100644
>> --- a/meta/recipes-devtools/perl/perl-native_5.24.0.bb
>> +++ b/meta/recipes-devtools/perl/perl-native_5.24.0.bb
>> @@ -11,6 +11,7 @@ SRC_URI += "\
>> file://debian/errno_ver.diff \
>> file://dynaloaderhack.patch \
>> file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
>> + file://0001-Configure-Remove-fstack-protector-strong-for-native-.patch \
>> "
>>
>> SRC_URI[md5sum] = "59456ae4bd4b06cb6e57cb19a3b2d349"
>> diff --git a/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch b/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
>> new file mode 100644
>> index 0000000..7391ac5
>> --- /dev/null
>> +++ b/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
>> @@ -0,0 +1,103 @@
>> +Some distributions (like opensuse421) supported by the project
>> +comes with older gcc releases, -fstack-protector=strong is supported
>> +by GCC>=4.9.
>> +
>> +This causes a build failure when install perl-native from a sstate that
>> +comes from a machine supporting -fstack-protector=strong [1].
>> +
>> +So disable usage of this flag in perl-native builds, this patch could
>> +be removed when all supported distros comes with GCC>=4.9.
>> +
>> +[YOCTO #10338]
>> +
>> +Upstream-status: Inappropriate [configuration]
>> +
>> +[1] http://errors.yoctoproject.org/Errors/Details/109589/
>> +
>> +Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
>> +---
>> + Configure | 54 ------------------------------------------------------
>> + 1 file changed, 54 deletions(-)
>> +
>> +diff --git a/Configure b/Configure
>> +index efbdcfd..d5bd98c 100755
>> +--- a/Configure
>> ++++ b/Configure
>> +@@ -5468,30 +5468,6 @@ default|recommended)
>> + eval $checkccflag
>> + ;;
>> + esac
>> +-
>> +- # on x86_64 (at least) we require an extra library (libssp) in the
>> +- # link command line. This library is not named, so I infer that it is
>> +- # an implementation detail that may change. Hence the safest approach
>> +- # is to add the flag to the flags passed to the compiler at link time,
>> +- # as that way the compiler can do the right implementation dependant
>> +- # thing. (NWC)
>> +- case "$osname" in
>> +- amigaos) ;; # -fstack-protector builds but doesn't work
>> +- *) case "$gccversion" in
>> +- ?*) set stack-protector-strong -fstack-protector-strong
>> +- eval $checkccflag
>> +- case "$dflt" in
>> +- *-fstack-protector-strong*) ;; # It got added.
>> +- *) # Try the plain/older -fstack-protector.
>> +- set stack-protector -fstack-protector
>> +- eval $checkccflag
>> +- ;;
>> +- esac
>> +- ;;
>> +- esac
>> +- ;;
>> +- esac
>> +- ;;
>> + esac
>> +
>> + case "$mips_type" in
>> +@@ -5634,21 +5610,6 @@ case "$ldflags" in
>> + ;;
>> + *) dflt="$ldflags";;
>> + esac
>> +-# See note above about -fstack-protector
>> +-case "$ccflags" in
>> +-*-fstack-protector-strong*)
>> +- case "$dflt" in
>> +- *-fstack-protector-strong*) ;; # Don't add it again
>> +- *) dflt="$dflt -fstack-protector-strong" ;;
>> +- esac
>> +- ;;
>> +-*-fstack-protector*)
>> +- case "$dflt" in
>> +- *-fstack-protector*) ;; # Don't add it again
>> +- *) dflt="$dflt -fstack-protector" ;;
>> +- esac
>> +- ;;
>> +-esac
>> +
>> + : Try to guess additional flags to pick up local libraries.
>> + for thislibdir in $libpth; do
>> +@@ -8571,21 +8532,6 @@ EOM
>> + ''|' ') dflt='none' ;;
>> + esac
>> +
>> +- case "$ldflags" in
>> +- *-fstack-protector-strong*)
>> +- case "$dflt" in
>> +- *-fstack-protector-strong*) ;; # Don't add it again
>> +- *) dflt="$dflt -fstack-protector-strong" ;;
>> +- esac
>> +- ;;
>> +- *-fstack-protector*)
>> +- case "$dflt" in
>> +- *-fstack-protector*) ;; # Don't add it again
>> +- *) dflt="$dflt -fstack-protector" ;;
>> +- esac
>> +- ;;
>> +- esac
>> +-
>> + rp="Any special flags to pass to $ld to create a dynamically loaded library?"
>> + . ./myread
>> + case "$ans" in
>> +--
>> +2.1.4
>> +
>> --
>> 2.1.4
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: [PATCHv2 3/3] oe-selftest: Add option to submit test result to a git repository.
From: Benjamin Esquivel @ 2016-12-01 22:44 UTC (permalink / raw)
To: Mariano Lopez; +Cc: openembedded-core
In-Reply-To: <5685041.Q7lPjqZr2f@mlopezva-mobl2>
On Thu, 2016-12-01 at 11:00 -0600, Mariano Lopez wrote:
> > I think this version is okay :) have you tested it in an
> Autobuilder
> > task?
>
> Indeed, that is why it took me a bit longer to submit the patch. I
> know this won't blow up current master. But Ihaven't used the
> option yet, we would need a remote repo and a new autobuilder
> buildset.
So, for enabling it you still need the repo, right? is that repo
already requested? it would help to understand the timing of this
feature coming online.
^ permalink raw reply
* Re: [PATCH] perl-native: Remove usage of -fstack-protector=strong
From: Khem Raj @ 2016-12-01 22:39 UTC (permalink / raw)
To: Aníbal Limón; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <1480610065-25697-1-git-send-email-anibal.limon@linux.intel.com>
On Thu, Dec 1, 2016 at 8:34 AM, Aníbal Limón
<anibal.limon@linux.intel.com> wrote:
> Some distributions (like opensuse421) supported by the project
> comes with older gcc releases, -fstack-protector=strong is supported
> by GCC>=4.9.
>
> This causes a build failure when install perl-native from a sstate that
> comes from a machine supporting -fstack-protector=strong [1].
>
> So disable usage of this flag in perl-native builds, this patch could
> be removed when all supported distros comes with GCC>=4.9.
Instead of disabling it. Can it be made detectable during configure.
>
> [YOCTO #10338]
>
> [1] http://errors.yoctoproject.org/Errors/Details/109589/
>
> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
> ---
> meta/recipes-devtools/perl/perl-native_5.24.0.bb | 1 +
> ...emove-fstack-protector-strong-for-native-.patch | 103 +++++++++++++++++++++
> 2 files changed, 104 insertions(+)
> create mode 100644 meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
>
> diff --git a/meta/recipes-devtools/perl/perl-native_5.24.0.bb b/meta/recipes-devtools/perl/perl-native_5.24.0.bb
> index af2ad7b..b1f0179 100644
> --- a/meta/recipes-devtools/perl/perl-native_5.24.0.bb
> +++ b/meta/recipes-devtools/perl/perl-native_5.24.0.bb
> @@ -11,6 +11,7 @@ SRC_URI += "\
> file://debian/errno_ver.diff \
> file://dynaloaderhack.patch \
> file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
> + file://0001-Configure-Remove-fstack-protector-strong-for-native-.patch \
> "
>
> SRC_URI[md5sum] = "59456ae4bd4b06cb6e57cb19a3b2d349"
> diff --git a/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch b/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
> new file mode 100644
> index 0000000..7391ac5
> --- /dev/null
> +++ b/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
> @@ -0,0 +1,103 @@
> +Some distributions (like opensuse421) supported by the project
> +comes with older gcc releases, -fstack-protector=strong is supported
> +by GCC>=4.9.
> +
> +This causes a build failure when install perl-native from a sstate that
> +comes from a machine supporting -fstack-protector=strong [1].
> +
> +So disable usage of this flag in perl-native builds, this patch could
> +be removed when all supported distros comes with GCC>=4.9.
> +
> +[YOCTO #10338]
> +
> +Upstream-status: Inappropriate [configuration]
> +
> +[1] http://errors.yoctoproject.org/Errors/Details/109589/
> +
> +Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
> +---
> + Configure | 54 ------------------------------------------------------
> + 1 file changed, 54 deletions(-)
> +
> +diff --git a/Configure b/Configure
> +index efbdcfd..d5bd98c 100755
> +--- a/Configure
> ++++ b/Configure
> +@@ -5468,30 +5468,6 @@ default|recommended)
> + eval $checkccflag
> + ;;
> + esac
> +-
> +- # on x86_64 (at least) we require an extra library (libssp) in the
> +- # link command line. This library is not named, so I infer that it is
> +- # an implementation detail that may change. Hence the safest approach
> +- # is to add the flag to the flags passed to the compiler at link time,
> +- # as that way the compiler can do the right implementation dependant
> +- # thing. (NWC)
> +- case "$osname" in
> +- amigaos) ;; # -fstack-protector builds but doesn't work
> +- *) case "$gccversion" in
> +- ?*) set stack-protector-strong -fstack-protector-strong
> +- eval $checkccflag
> +- case "$dflt" in
> +- *-fstack-protector-strong*) ;; # It got added.
> +- *) # Try the plain/older -fstack-protector.
> +- set stack-protector -fstack-protector
> +- eval $checkccflag
> +- ;;
> +- esac
> +- ;;
> +- esac
> +- ;;
> +- esac
> +- ;;
> + esac
> +
> + case "$mips_type" in
> +@@ -5634,21 +5610,6 @@ case "$ldflags" in
> + ;;
> + *) dflt="$ldflags";;
> + esac
> +-# See note above about -fstack-protector
> +-case "$ccflags" in
> +-*-fstack-protector-strong*)
> +- case "$dflt" in
> +- *-fstack-protector-strong*) ;; # Don't add it again
> +- *) dflt="$dflt -fstack-protector-strong" ;;
> +- esac
> +- ;;
> +-*-fstack-protector*)
> +- case "$dflt" in
> +- *-fstack-protector*) ;; # Don't add it again
> +- *) dflt="$dflt -fstack-protector" ;;
> +- esac
> +- ;;
> +-esac
> +
> + : Try to guess additional flags to pick up local libraries.
> + for thislibdir in $libpth; do
> +@@ -8571,21 +8532,6 @@ EOM
> + ''|' ') dflt='none' ;;
> + esac
> +
> +- case "$ldflags" in
> +- *-fstack-protector-strong*)
> +- case "$dflt" in
> +- *-fstack-protector-strong*) ;; # Don't add it again
> +- *) dflt="$dflt -fstack-protector-strong" ;;
> +- esac
> +- ;;
> +- *-fstack-protector*)
> +- case "$dflt" in
> +- *-fstack-protector*) ;; # Don't add it again
> +- *) dflt="$dflt -fstack-protector" ;;
> +- esac
> +- ;;
> +- esac
> +-
> + rp="Any special flags to pass to $ld to create a dynamically loaded library?"
> + . ./myread
> + case "$ans" in
> +--
> +2.1.4
> +
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [PATCH 2/2 V5] systemd: Upgrade to 232
From: Khem Raj @ 2016-12-01 22:28 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
In-Reply-To: <CAJTo0LY4K4mRh6_jCJj1pEGHRvx67kZuQ0DbNtkA_EOkP7GyRw@mail.gmail.com>
sent a v4
On Thu, Dec 1, 2016 at 12:22 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 28 November 2016 at 21:26, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> -PV = "230+git${SRCPV}"
>
>
> packages/corei7-64-intel-common-poky-linux/systemd-boot/systemd-boot-dev:
> PKGV changed from 230+git0+3a74d4fc90 to 1.0 [default]
>
> I'm starting to wonder if systemd and systemd-boot sharing a .inc is a good
> idea!
>
> Ross
^ permalink raw reply
* [PATCH V4 2/2] systemd: Upgrade to 232
From: Khem Raj @ 2016-12-01 22:27 UTC (permalink / raw)
To: openembedded-core
* Drop support for rcS.d SysV init scripts.
These are prone to cause dependency loops, and almost all packages with
rcS scripts now ship a native systemd service.
* Drop mount propagation patch, it only happens with libseccomp, OE doesnt
enable it
* kdbus option has disappeared from configure
* Ignore dev-so for PN now since systemd introduced private .so see
https://github.com/systemd/systemd/issues/3810
* Add libnss* to PACKAGES_DYNAMIC for libnss-resolve to work correctly
* Forward port systemd-boot patches to systemd-232
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...pper-instead-of-looking-for-relative-opti.patch | 55 +++------
.../{systemd-boot.bb => systemd-boot_232.bb} | 0
meta/recipes-core/systemd/systemd.inc | 4 +-
....c-Change-the-default-device-timeout-to-2.patch | 8 +-
...r-getty-to-agetty-in-console-setup-system.patch | 10 +-
.../systemd/0003-define-exp10-if-missing.patch | 12 +-
...nv-when-secure-versions-are-not-available.patch | 21 ++--
...t-install-dependency-links-at-install-tim.patch | 10 +-
...heck-for-additional-features-that-uclibc-.patch | 10 +-
...pper-instead-of-looking-for-relative-opti.patch | 38 ++----
...wn-Use-execvpe-only-when-libc-supports-it.patch | 16 +--
...-unimplemented-_SC_PHYS_PAGES-system-conf.patch | 27 +++--
...0010-implment-systemd-sysv-install-for-OE.patch | 6 +-
...nes-Build-conditionally-when-HAVE_MYHOSTN.patch | 12 +-
.../systemd/0012-rules-whitelist-hd-devices.patch | 21 ++--
...-Make-root-s-home-directory-configurable.patch} | 90 +++++---------
...tor-add-support-for-executing-scripts-und.patch | 133 ---------------------
...vert-rules-remove-firmware-loading-rules.patch} | 6 +-
...remove-userspace-firmware-loading-suppor.patch} | 58 +++++----
...0015-systemd-user-avoid-using-system-auth.patch | 35 ------
...patch => 0016-make-test-dir-configurable.patch} | 21 ++--
...=> 0017-remove-duplicate-include-uchar.h.patch} | 10 +-
...h => 0018-check-for-uchar.h-in-configure.patch} | 16 ++-
...l-don-t-fail-if-libc-doesn-t-support-IDN.patch} | 20 ++--
...sing.h-for-getting-secure_getenv-definiti.patch | 27 -----
.../systemd/systemd/CVE-2016-7795.patch | 69 -----------
...dev-re-enable-mount-propagation-for-udevd.patch | 31 -----
.../systemd/{systemd_230.bb => systemd_232.bb} | 24 ++--
28 files changed, 213 insertions(+), 577 deletions(-)
rename meta/recipes-bsp/systemd-boot/{systemd-boot.bb => systemd-boot_232.bb} (100%)
rename meta/recipes-core/systemd/systemd/{0014-Make-root-s-home-directory-configurable.patch => 0013-Make-root-s-home-directory-configurable.patch} (66%)
delete mode 100644 meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
rename meta/recipes-core/systemd/systemd/{0016-Revert-rules-remove-firmware-loading-rules.patch => 0014-Revert-rules-remove-firmware-loading-rules.patch} (84%)
rename meta/recipes-core/systemd/systemd/{0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch => 0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch} (89%)
delete mode 100644 meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch
rename meta/recipes-core/systemd/systemd/{0018-make-test-dir-configurable.patch => 0016-make-test-dir-configurable.patch} (77%)
rename meta/recipes-core/systemd/systemd/{0019-remove-duplicate-include-uchar.h.patch => 0017-remove-duplicate-include-uchar.h.patch} (81%)
rename meta/recipes-core/systemd/systemd/{0020-check-for-uchar.h-in-configure.patch => 0018-check-for-uchar.h-in-configure.patch} (76%)
rename meta/recipes-core/systemd/systemd/{0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch => 0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch} (69%)
delete mode 100644 meta/recipes-core/systemd/systemd/0021-include-missing.h-for-getting-secure_getenv-definiti.patch
delete mode 100644 meta/recipes-core/systemd/systemd/CVE-2016-7795.patch
delete mode 100644 meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch
rename meta/recipes-core/systemd/{systemd_230.bb => systemd_232.bb} (96%)
diff --git a/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
index 103d286..bc92db7 100644
--- a/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
+++ b/meta/recipes-bsp/systemd-boot/files/0001-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
@@ -1,31 +1,22 @@
-From 9dcd2c80347493f73800d8c1cb539f1daef14394 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Tue, 26 Jul 2016 03:54:42 -0400
-Subject: [PATCH] use lnr wrapper instead of looking for --relative option for ln
+From a3482c91642cf568b3ac27fa6c0cb3c6b30669b7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 9 Nov 2016 19:32:14 -0800
+Subject: [PATCH 07/19] use lnr wrapper instead of looking for --relative
+ option for ln
Upstream-Status: Inappropriate [OE-Specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
- Makefile.am | 6 +++---
+ Makefile.am | 2 +-
configure.ac | 2 --
- 2 files changed, 3 insertions(+), 5 deletions(-)
+ 2 files changed, 1 insertion(+), 3 deletions(-)
-diff --git a/Makefile.am b/Makefile.am
-index 305099a..f08d023 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -247,7 +247,7 @@ define move-to-rootlibdir
- $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
- rm -f $(DESTDIR)$(libdir)/$$libname && \
-- $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
-+ lnr $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
- mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
- fi
- endef
-@@ -321,7 +321,7 @@ define install-relative-aliases
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -320,7 +320,7 @@ define install-relative-aliases
while [ -n "$$1" ]; do \
$(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
rm -f $(DESTDIR)$$dir/$$2 && \
@@ -34,20 +25,11 @@ index 305099a..f08d023 100644
shift 2 || exit $$?; \
done
endef
-@@ -2906,7 +2906,7 @@ systemd_dbus1_generator_LDADD = \
- dbus1-generator-install-hook:
- $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
- $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-- $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-+ $(AM_V_LN)lnr $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-
- dbus1-generator-uninstall-hook:
- rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-diff --git a/configure.ac b/configure.ac
-index 329861a..52c6e3d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr
AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
@@ -56,6 +38,3 @@ index 329861a..52c6e3d 100644
M4_DEFINES=
AC_CHECK_TOOL(OBJCOPY, objcopy)
---
-2.8.1
-
diff --git a/meta/recipes-bsp/systemd-boot/systemd-boot.bb b/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb
similarity index 100%
rename from meta/recipes-bsp/systemd-boot/systemd-boot.bb
rename to meta/recipes-bsp/systemd-boot/systemd-boot_232.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index f800f42..29e0be6 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,12 +14,10 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
-SRCREV = "3a74d4fc90cb322a4784a3515bef7118c8f8c5ba"
+SRCREV = "a1e2ef7ec912902d8142e7cb5830cbfb47dba86c"
SRC_URI = "git://github.com/systemd/systemd.git;protocol=git"
-PV = "230+git${SRCPV}"
-
S = "${WORKDIR}/git"
LDFLAGS_append_libc-uclibc = " -lrt -lssp_nonshared -lssp "
diff --git a/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
index f7ef7a3..ee2cd6c 100644
--- a/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
+++ b/meta/recipes-core/systemd/systemd/0001-core-device.c-Change-the-default-device-timeout-to-2.patch
@@ -1,7 +1,7 @@
-From 3bc4552117879f57522b5972b724729ca993f1ea Mon Sep 17 00:00:00 2001
+From a544d6d15f5c418084f322349aafe341128d5fca Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 14 Dec 2015 04:09:19 +0000
-Subject: [PATCH 01/36] core/device.c: Change the default device timeout to 240
+Subject: [PATCH 01/19] core/device.c: Change the default device timeout to 240
sec.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -16,7 +16,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/device.c b/src/core/device.c
-index d201dc5..340d62a 100644
+index c572a67..f90774e 100644
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -112,7 +112,7 @@ static void device_init(Unit *u) {
@@ -29,5 +29,5 @@ index d201dc5..340d62a 100644
u->ignore_on_isolate = true;
}
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch b/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
index 28939eb..951a28d 100644
--- a/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
+++ b/meta/recipes-core/systemd/systemd/0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch
@@ -1,7 +1,7 @@
-From e5f405aba347d216e7f2b73d7dd681b13be442e3 Mon Sep 17 00:00:00 2001
+From 8736d9b9bb492f60e8f3a1a7fb5a05ba3201d86b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 05:29:15 +0000
-Subject: [PATCH 02/36] units: Prefer getty to agetty in console setup systemd
+Subject: [PATCH 02/19] units: Prefer getty to agetty in console setup systemd
units
Upstream-Status: Inappropriate [configuration specific]
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
-index 46164ab..bdf6ec8 100644
+index 5b82c13..e729469 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
-@@ -27,7 +27,7 @@ ConditionPathExists=/dev/tty0
+@@ -33,7 +33,7 @@ ConditionPathExists=/dev/tty0
[Service]
# the VT is cleared by TTYVTDisallocate
@@ -40,5 +40,5 @@ index 4522d0d..e6d499d 100644
Restart=always
UtmpIdentifier=%I
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch b/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
index e62d580..37c6ac5 100644
--- a/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
+++ b/meta/recipes-core/systemd/systemd/0003-define-exp10-if-missing.patch
@@ -1,4 +1,7 @@
-Subject: [PATCH 03/36] define exp10 if missing
+From b383c286f58184575216b2bf6f185ba2ad648956 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 9 Nov 2016 19:25:45 -0800
+Subject: [PATCH 03/19] define exp10 if missing
Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch
@@ -8,16 +11,15 @@ Upstream-Status: Pending
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---
src/basic/missing.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/basic/missing.h b/src/basic/missing.h
-index 651e414..fafa233 100644
+index 4c013be..4a3fd9c 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
-@@ -1013,4 +1013,9 @@ typedef int32_t key_serial_t;
+@@ -1078,4 +1078,9 @@ typedef int32_t key_serial_t;
#endif
@@ -28,5 +30,5 @@ index 651e414..fafa233 100644
+
#include "missing_syscall.h"
--
-2.8.3
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0004-Use-getenv-when-secure-versions-are-not-available.patch b/meta/recipes-core/systemd/systemd/0004-Use-getenv-when-secure-versions-are-not-available.patch
index 989a1fa..ab2cbe0 100644
--- a/meta/recipes-core/systemd/systemd/0004-Use-getenv-when-secure-versions-are-not-available.patch
+++ b/meta/recipes-core/systemd/systemd/0004-Use-getenv-when-secure-versions-are-not-available.patch
@@ -1,7 +1,7 @@
-From bb8d8148b16572ae17d3c308552cf73915386b05 Mon Sep 17 00:00:00 2001
+From 5765cda4f7243e240b1e8723dc536fb20503d544 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 12 Sep 2015 19:10:04 +0000
-Subject: [PATCH 04/36] Use getenv when secure versions are not available
+Date: Wed, 9 Nov 2016 19:28:32 -0800
+Subject: [PATCH 04/19] Use getenv when secure versions are not available
musl doesnt implement secure version, so we default
to it if configure does not detect a secure imeplementation
@@ -9,19 +9,14 @@ to it if configure does not detect a secure imeplementation
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Denied
---
- src/basic/missing.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ src/basic/missing.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/basic/missing.h b/src/basic/missing.h
-index ee7e7ea..3170429 100644
+index 4a3fd9c..4936873 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
-@@ -585,12 +585,11 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
- return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags);
- }
- #endif
--
- #ifndef HAVE_SECURE_GETENV
+@@ -529,7 +529,7 @@ struct btrfs_ioctl_quota_ctl_args {
# ifdef HAVE___SECURE_GETENV
# define secure_getenv __secure_getenv
# else
@@ -31,5 +26,5 @@ index ee7e7ea..3170429 100644
#endif
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch b/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
index f69e26e..7016e98 100644
--- a/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
+++ b/meta/recipes-core/systemd/systemd/0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch
@@ -1,7 +1,7 @@
-From 3436b12d40bf4f4ab7e3e16600e5f6c35a470da4 Mon Sep 17 00:00:00 2001
+From 74450f0dbad2f8478c26eeaa46d4e4a987858f45 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 05:03:44 +0000
-Subject: [PATCH 05/36] binfmt: Don't install dependency links at install time
+Subject: [PATCH 05/19] binfmt: Don't install dependency links at install time
for the binfmt services
use [Install] blocks so that they get created when the service is enabled
@@ -24,10 +24,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 03341fc..629740f 100644
+index 50da458..29ed1dd 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -4387,10 +4387,6 @@ INSTALL_DIRS += \
+@@ -4635,10 +4635,6 @@ INSTALL_DIRS += \
$(prefix)/lib/binfmt.d \
$(sysconfdir)/binfmt.d
@@ -70,5 +70,5 @@ index d53073e..8c57ee0 100644
+[Install]
+WantedBy=sysinit.target
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
index 0d63755..43a0d3f 100644
--- a/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
+++ b/meta/recipes-core/systemd/systemd/0006-configure-Check-for-additional-features-that-uclibc-.patch
@@ -1,7 +1,7 @@
-From bb6f1d8a000b337280541afde7cccdcfe03cdeb1 Mon Sep 17 00:00:00 2001
+From 82d837b76618a773485b96e38b7b91083a7437e8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Fri, 20 Feb 2015 05:05:45 +0000
-Subject: [PATCH 06/36] configure: Check for additional features that uclibc
+Subject: [PATCH 06/19] configure: Check for additional features that uclibc
doesnt support
This helps in supporting uclibc which does not have all features that
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 18 insertions(+)
diff --git a/configure.ac b/configure.ac
-index f51533c..0239fd0 100644
+index 7f6b3b9..7c4b5a2 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -112,6 +112,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]
+@@ -110,6 +110,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]
AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
@@ -44,5 +44,5 @@ index f51533c..0239fd0 100644
AC_CHECK_TOOL(OBJCOPY, objcopy)
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch b/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
index 12f6ace..fad69a5 100644
--- a/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
+++ b/meta/recipes-core/systemd/systemd/0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch
@@ -1,31 +1,22 @@
-From fa5e137fbd2fb081ae897575377d718ee8cb6349 Mon Sep 17 00:00:00 2001
+From a3482c91642cf568b3ac27fa6c0cb3c6b30669b7 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 20 Dec 2015 04:20:28 +0000
-Subject: [PATCH 07/36] use lnr wrapper instead of looking for --relative
+Date: Wed, 9 Nov 2016 19:32:14 -0800
+Subject: [PATCH 07/19] use lnr wrapper instead of looking for --relative
option for ln
Upstream-Status: Inappropriate [OE-Specific]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- Makefile.am | 6 +++---
+ Makefile.am | 2 +-
configure.ac | 2 --
- 2 files changed, 3 insertions(+), 5 deletions(-)
+ 2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 629740f..82b6553 100644
+index 29ed1dd..02f4017 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -243,7 +243,7 @@ define move-to-rootlibdir
- $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
- rm -f $(DESTDIR)$(libdir)/$$libname && \
-- $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
-+ lnr $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
- mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
- fi
- endef
-@@ -317,7 +317,7 @@ define install-relative-aliases
+@@ -320,7 +320,7 @@ define install-relative-aliases
while [ -n "$$1" ]; do \
$(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
rm -f $(DESTDIR)$$dir/$$2 && \
@@ -34,20 +25,11 @@ index 629740f..82b6553 100644
shift 2 || exit $$?; \
done
endef
-@@ -2781,7 +2781,7 @@ systemd_dbus1_generator_LDADD = \
- dbus1-generator-install-hook:
- $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
- $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-- $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-+ $(AM_V_LN)lnr $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-
- dbus1-generator-uninstall-hook:
- rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
diff --git a/configure.ac b/configure.ac
-index 0239fd0..c5ab9d0 100644
+index 7c4b5a2..b10c952 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
+@@ -108,8 +108,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
@@ -57,5 +39,5 @@ index 0239fd0..c5ab9d0 100644
AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate)
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch b/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch
index 6e6f199..586b5aa 100644
--- a/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch
+++ b/meta/recipes-core/systemd/systemd/0008-nspawn-Use-execvpe-only-when-libc-supports-it.patch
@@ -1,7 +1,7 @@
-From ae999ff50efb9cc82537adef7696c6f732afcfc8 Mon Sep 17 00:00:00 2001
+From 96026a3763264eb41a2c3e374f232f6e543284a8 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 20 Feb 2015 05:10:37 +0000
-Subject: [PATCH 08/36] nspawn: Use execvpe only when libc supports it
+Date: Wed, 9 Nov 2016 19:33:49 -0800
+Subject: [PATCH 08/19] nspawn: Use execvpe only when libc supports it
Upstream-Status: Denied [no desire for uclibc support]
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 7 insertions(+)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 5a68fec..65e65ec 100644
+index 9b9ae90..19b47cd 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
-@@ -111,6 +111,8 @@ typedef enum LinkJournal {
+@@ -123,6 +123,8 @@ typedef enum LinkJournal {
LINK_GUEST
} LinkJournal;
@@ -23,7 +23,7 @@ index 5a68fec..65e65ec 100644
static char *arg_directory = NULL;
static char *arg_template = NULL;
static char *arg_chdir = NULL;
-@@ -2637,7 +2639,12 @@ static int inner_child(
+@@ -2871,7 +2873,12 @@ static int inner_child(
a[0] = (char*) "/sbin/init";
execve(a[0], a, env_use);
} else if (!strv_isempty(arg_parameters))
@@ -35,7 +35,7 @@ index 5a68fec..65e65ec 100644
+#endif /* HAVE_EXECVPE */
else {
if (!arg_chdir)
- chdir(home ?: "/root");
+ /* If we cannot change the directory, we'll end up in /, that is expected. */
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch b/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
index 116f3d4..f150bb0 100644
--- a/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
+++ b/meta/recipes-core/systemd/systemd/0009-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch
@@ -1,7 +1,7 @@
-From 3498f488b27f90398d7c8d1d06aac5ab684370e8 Mon Sep 17 00:00:00 2001
+From 085c8b6f253726ad547e7be84ff3f2b99701488b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 14 Dec 2015 00:47:53 +0000
-Subject: [PATCH 09/36] util: bypass unimplemented _SC_PHYS_PAGES system
+Date: Wed, 9 Nov 2016 19:38:07 -0800
+Subject: [PATCH 09/19] util: bypass unimplemented _SC_PHYS_PAGES system
configuration API on uclibc
Upstream-Status: Inappropriate [uclibc-specific]
@@ -12,12 +12,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 15 insertions(+)
diff --git a/src/basic/util.c b/src/basic/util.c
-index ea1bed7..fdaf340 100644
+index c1b5ca1..4c62d43 100644
--- a/src/basic/util.c
+++ b/src/basic/util.c
-@@ -767,10 +767,25 @@ uint64_t physical_memory(void) {
- /* We return this as uint64_t in case we are running as 32bit
- * process on a 64bit kernel with huge amounts of memory */
+@@ -742,6 +742,20 @@ uint64_t physical_memory(void) {
+ * In order to support containers nicely that have a configured memory limit we'll take the minimum of the
+ * physically reported amount of memory and the limit configured for the root cgroup, if there is any. */
+#ifdef __UCLIBC__
+ char line[128];
@@ -33,14 +33,17 @@ index ea1bed7..fdaf340 100644
+ fclose(f);
+ return (uint64_t) mem;
+#else
- mem = sysconf(_SC_PHYS_PAGES);
- assert(mem > 0);
+ sc = sysconf(_SC_PHYS_PAGES);
+ assert(sc > 0);
- return (uint64_t) mem * (uint64_t) page_size();
+@@ -762,6 +776,7 @@ uint64_t physical_memory(void) {
+ lim *= ps;
+
+ return MIN(mem, lim);
+#endif
}
- int update_reboot_param_file(const char *param) {
+ uint64_t physical_memory_scale(uint64_t v, uint64_t max) {
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0010-implment-systemd-sysv-install-for-OE.patch b/meta/recipes-core/systemd/systemd/0010-implment-systemd-sysv-install-for-OE.patch
index 75fa3a5..8828d6e 100644
--- a/meta/recipes-core/systemd/systemd/0010-implment-systemd-sysv-install-for-OE.patch
+++ b/meta/recipes-core/systemd/systemd/0010-implment-systemd-sysv-install-for-OE.patch
@@ -1,7 +1,7 @@
-From 5f94f5ad46c1ded54c3797979d384e4c1eb77bb0 Mon Sep 17 00:00:00 2001
+From 52726be92e2b841f744a96c378cc872ae0033a2b Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 5 Sep 2015 06:31:47 +0000
-Subject: [PATCH 10/36] implment systemd-sysv-install for OE
+Subject: [PATCH 10/19] implment systemd-sysv-install for OE
Use update-rc.d for enabling/disabling and status command
to check the status of the sysv service
@@ -39,5 +39,5 @@ index a53a3e6..5d877b0 100755
*)
usage ;;
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch b/meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
index 34ae645..b01ae97 100644
--- a/meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
+++ b/meta/recipes-core/systemd/systemd/0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch
@@ -1,7 +1,7 @@
-From 2b2450f6b7197bff4637c0283e8784500471d083 Mon Sep 17 00:00:00 2001
+From 3f6f45578b828e414f50c6822375073e7174236a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 14 Dec 2015 00:50:01 +0000
-Subject: [PATCH 11/36] nss-mymachines: Build conditionally when
+Subject: [PATCH 11/19] nss-mymachines: Build conditionally when
HAVE_MYHOSTNAME is set
Fixes build failures when building with --disable-myhostname
@@ -14,10 +14,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 2 insertions(+)
diff --git a/Makefile.am b/Makefile.am
-index 82b6553..b3f3343 100644
+index 02f4017..420e0e0 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -4876,6 +4876,7 @@ SYSTEM_UNIT_ALIASES += \
+@@ -5146,6 +5146,7 @@ SYSTEM_UNIT_ALIASES += \
BUSNAMES_TARGET_WANTS += \
org.freedesktop.machine1.busname
@@ -25,7 +25,7 @@ index 82b6553..b3f3343 100644
libnss_mymachines_la_SOURCES = \
src/nss-mymachines/nss-mymachines.sym \
src/nss-mymachines/nss-mymachines.c
-@@ -4896,6 +4897,7 @@ lib_LTLIBRARIES += \
+@@ -5167,6 +5168,7 @@ rootlib_LTLIBRARIES += \
libnss_mymachines.la
endif
@@ -34,5 +34,5 @@ index 82b6553..b3f3343 100644
polkitpolicy_in_files += \
src/machine/org.freedesktop.machine1.policy.in
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch b/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch
index 6143088..8666bdc 100644
--- a/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch
+++ b/meta/recipes-core/systemd/systemd/0012-rules-whitelist-hd-devices.patch
@@ -1,7 +1,7 @@
-From 5ebc0d87565a73710dea602c00b1586d5a1364e5 Mon Sep 17 00:00:00 2001
-From: Patrick Ohly <patrick.ohly@intel.com>
-Date: Wed, 16 Sep 2015 13:55:58 +0200
-Subject: [PATCH 12/36] rules: whitelist hd* devices
+From 8cc1ae11f54dcc38ee2168b0f99703b835dd3942 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 9 Nov 2016 19:41:13 -0800
+Subject: [PATCH 12/19] rules: whitelist hd* devices
qemu by default emulates IDE and the linux-yocto kernel(s) use
CONFIG_IDE instead of the more modern libsata, so disks appear as
@@ -10,23 +10,24 @@ CONFIG_IDE instead of the more modern libsata, so disks appear as
Upstream-Status: Denied [https://github.com/systemd/systemd/pull/1276]
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
rules/60-persistent-storage.rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules
-index 0b14bb4..1c4d97a 100644
+index c13d05c..b14fbed 100644
--- a/rules/60-persistent-storage.rules
+++ b/rules/60-persistent-storage.rules
-@@ -6,7 +6,7 @@
- ACTION=="remove", GOTO="persistent_storage_end"
+@@ -7,7 +7,7 @@ ACTION=="remove", GOTO="persistent_storage_end"
+ ENV{UDEV_DISABLE_PERSISTENT_STORAGE_RULES_FLAG}=="1", GOTO="persistent_storage_end"
SUBSYSTEM!="block", GOTO="persistent_storage_end"
--KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*", GOTO="persistent_storage_end"
-+KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|hd*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*", GOTO="persistent_storage_end"
+-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*", GOTO="persistent_storage_end"
++KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|hd*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|scm*|pmem*", GOTO="persistent_storage_end"
# ignore partitions that span the entire disk
TEST=="whole_disk", GOTO="persistent_storage_end"
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
similarity index 66%
rename from meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch
rename to meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
index 2eea0ff..2b33337 100644
--- a/meta/recipes-core/systemd/systemd/0014-Make-root-s-home-directory-configurable.patch
+++ b/meta/recipes-core/systemd/systemd/0013-Make-root-s-home-directory-configurable.patch
@@ -1,4 +1,7 @@
-Subject: [PATCH 14/36] Make root's home directory configurable
+From 79e64a07840e0d97d66e46111f1c086bf83981b7 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 9 Nov 2016 20:35:30 -0800
+Subject: [PATCH 13/19] Make root's home directory configurable
OpenEmbedded has a configurable home directory for root. Allow
systemd to be built using its idea of what root's home directory
@@ -11,23 +14,20 @@ https://github.com/systemd/systemd/issues/541
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
---
- Makefile.am | 2 ++
- configure.ac | 7 +++++++
- src/basic/user-util.c | 4 ++--
- src/core/namespace.c | 2 +-
- src/nspawn/nspawn.c | 4 ++--
- units/console-shell.service.m4.in | 4 ++--
- units/emergency.service.in | 4 ++--
- units/rescue.service.in | 4 ++--
- 8 files changed, 20 insertions(+), 11 deletions(-)
+ Makefile.am | 2 ++
+ configure.ac | 7 +++++++
+ src/basic/user-util.c | 4 ++--
+ src/nspawn/nspawn.c | 4 ++--
+ units/emergency.service.in | 4 ++--
+ units/rescue.service.in | 4 ++--
+ 6 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 305099a..88c1250 100644
+index 420e0e0..3010b01 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -206,6 +206,7 @@ AM_CPPFLAGS = \
+@@ -213,6 +213,7 @@ AM_CPPFLAGS = \
-DLIBDIR=\"$(libdir)\" \
-DROOTLIBDIR=\"$(rootlibdir)\" \
-DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
@@ -35,8 +35,8 @@ index 305099a..88c1250 100644
-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/basic \
-@@ -5863,6 +5864,7 @@ EXTRA_DIST += \
- substitutions = \
+@@ -6057,6 +6058,7 @@ substitutions = \
+ '|rootlibdir=$(rootlibdir)|' \
'|rootlibexecdir=$(rootlibexecdir)|' \
'|rootbindir=$(rootbindir)|' \
+ '|roothomedir=$(roothomedir)|' \
@@ -44,10 +44,10 @@ index 305099a..88c1250 100644
'|SYSTEMCTL=$(rootbindir)/systemctl|' \
'|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
diff --git a/configure.ac b/configure.ac
-index 329861a..01764f5 100644
+index b10c952..dfc0bd3 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1478,6 +1478,11 @@ AC_ARG_WITH([rootlibdir],
+@@ -1513,6 +1513,11 @@ AC_ARG_WITH([rootlibdir],
[with_rootlibdir=${libdir}])
AX_NORMALIZE_PATH([with_rootlibdir])
@@ -59,7 +59,7 @@ index 329861a..01764f5 100644
AC_ARG_WITH([pamlibdir],
AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
[],
-@@ -1562,6 +1567,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
+@@ -1598,6 +1603,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
AC_SUBST([pamconfdir], [$with_pamconfdir])
AC_SUBST([rootprefix], [$with_rootprefix])
AC_SUBST([rootlibdir], [$with_rootlibdir])
@@ -67,7 +67,7 @@ index 329861a..01764f5 100644
AC_CONFIG_FILES([
Makefile
-@@ -1653,6 +1659,7 @@ AC_MSG_RESULT([
+@@ -1688,6 +1694,7 @@ AC_MSG_RESULT([
includedir: ${includedir}
lib dir: ${libdir}
rootlib dir: ${with_rootlibdir}
@@ -76,10 +76,10 @@ index 329861a..01764f5 100644
SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
Build Python: ${PYTHON}
diff --git a/src/basic/user-util.c b/src/basic/user-util.c
-index f65ca3e..da1101a 100644
+index 938533d..3f9fdc4 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
-@@ -123,7 +123,7 @@ int get_user_creds(
+@@ -127,7 +127,7 @@ int get_user_creds(
*gid = 0;
if (home)
@@ -88,7 +88,7 @@ index f65ca3e..da1101a 100644
if (shell)
*shell = "/bin/sh";
-@@ -354,7 +354,7 @@ int get_home_dir(char **_h) {
+@@ -387,7 +387,7 @@ int get_home_dir(char **_h) {
/* Hardcode home directory for root to avoid NSS */
u = getuid();
if (u == 0) {
@@ -97,24 +97,11 @@ index f65ca3e..da1101a 100644
if (!h)
return -ENOMEM;
-diff --git a/src/core/namespace.c b/src/core/namespace.c
-index 203d122..45c0d11 100644
---- a/src/core/namespace.c
-+++ b/src/core/namespace.c
-@@ -415,7 +415,7 @@ int setup_namespace(
- home_dir = strjoina("-", home_dir);
- run_user_dir = prefix_roota(root_directory, "/run/user");
- run_user_dir = strjoina("-", run_user_dir);
-- root_dir = prefix_roota(root_directory, "/root");
-+ root_dir = prefix_roota(root_directory, ROOTHOMEDIR);
- root_dir = strjoina("-", root_dir);
-
- r = append_mounts(&m, STRV_MAKE(home_dir, run_user_dir, root_dir),
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 8ec0584..51df00b 100644
+index 19b47cd..e42bf19 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
-@@ -2739,7 +2739,7 @@ static int inner_child(
+@@ -2798,7 +2798,7 @@ static int inner_child(
if (envp[n_env])
n_env++;
@@ -123,7 +110,7 @@ index 8ec0584..51df00b 100644
(asprintf((char**)(envp + n_env++), "USER=%s", arg_user ? arg_user : "root") < 0) ||
(asprintf((char**)(envp + n_env++), "LOGNAME=%s", arg_user ? arg_user : "root") < 0))
return log_oom();
-@@ -2816,7 +2816,7 @@ static int inner_child(
+@@ -2882,7 +2882,7 @@ static int inner_child(
else {
if (!arg_chdir)
/* If we cannot change the directory, we'll end up in /, that is expected. */
@@ -132,23 +119,8 @@ index 8ec0584..51df00b 100644
execle("/bin/bash", "-bash", NULL, env_use);
execle("/bin/sh", "-sh", NULL, env_use);
-diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
-index a345ec2..3caae7d 100644
---- a/units/console-shell.service.m4.in
-+++ b/units/console-shell.service.m4.in
-@@ -15,8 +15,8 @@ After=rc-local.service
- Before=getty.target
-
- [Service]
--Environment=HOME=/root
--WorkingDirectory=-/root
-+Environment=HOME=@roothomedir@
-+WorkingDirectory=-@roothomedir@
- ExecStart=-@SULOGIN@
- ExecStopPost=-@SYSTEMCTL@ poweroff
- Type=idle
diff --git a/units/emergency.service.in b/units/emergency.service.in
-index 0de16f2..4826062 100644
+index da68eb8..e25f879 100644
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -15,8 +15,8 @@ Conflicts=syslog.socket
@@ -160,10 +132,10 @@ index 0de16f2..4826062 100644
+Environment=HOME=@roothomedir@
+WorkingDirectory=-@roothomedir@
ExecStartPre=-/bin/plymouth --wait quit
- ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.'
+ ExecStartPre=-/bin/echo -e 'You are in emergency mode. After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.'
ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
diff --git a/units/rescue.service.in b/units/rescue.service.in
-index 92553f6..590ae17 100644
+index 5feff69..a83439e 100644
--- a/units/rescue.service.in
+++ b/units/rescue.service.in
@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.service
@@ -174,9 +146,9 @@ index 92553f6..590ae17 100644
-WorkingDirectory=-/root
+Environment=HOME=@roothomedir@
+WorkingDirectory=-@roothomedir@
- ExecStartPre=-/bin/plymouth quit
- ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.'
+ ExecStartPre=-/bin/plymouth --wait quit
+ ExecStartPre=-/bin/echo -e 'You are in rescue mode. After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.'
ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
--
-2.8.3
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
deleted file mode 100644
index ac67f65..0000000
--- a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From 6736de4a3caf9a0b3c888c6cc05103ab1b86907d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 14 Dec 2015 05:09:53 +0000
-Subject: [PATCH 13/36] sysv-generator: add support for executing scripts under
- /etc/rcS.d/
-
-To be compatible, all services translated from scripts under /etc/rcS.d would
-run before services translated from scripts under /etc/rcN.d.
-
-Upstream-Status: Inappropriate [OE specific]
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/sysv-generator/sysv-generator.c | 47 ++++++++++++++++++++++++++++---------
- 1 file changed, 36 insertions(+), 11 deletions(-)
-
-diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
-index b5925a4..ea06d6a 100644
---- a/src/sysv-generator/sysv-generator.c
-+++ b/src/sysv-generator/sysv-generator.c
-@@ -44,7 +44,8 @@
-
- typedef enum RunlevelType {
- RUNLEVEL_UP,
-- RUNLEVEL_DOWN
-+ RUNLEVEL_DOWN,
-+ RUNLEVEL_SYSINIT
- } RunlevelType;
-
- static const struct {
-@@ -59,6 +60,9 @@ static const struct {
- { "rc4.d", SPECIAL_MULTI_USER_TARGET, RUNLEVEL_UP },
- { "rc5.d", SPECIAL_GRAPHICAL_TARGET, RUNLEVEL_UP },
-
-+ /* Debian style rcS.d, also adopted by OE */
-+ { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT},
-+
- /* Standard SysV runlevels for shutdown */
- { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN },
- { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN }
-@@ -67,7 +71,7 @@ static const struct {
- directories in this order, and we want to make sure that
- sysv_start_priority is known when we first load the
- unit. And that value we only know from S links. Hence
-- UP must be read before DOWN */
-+ UP/SYSINIT must be read before DOWN */
- };
-
- static const char *arg_dest = "/tmp";
-@@ -86,6 +90,8 @@ typedef struct SysvStub {
- bool has_lsb;
- bool reload;
- bool loaded;
-+ bool default_dependencies;
-+ bool from_rcsd;
- } SysvStub;
-
- static void free_sysvstub(SysvStub *s) {
-@@ -711,17 +717,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) {
- if (s->has_lsb && other->has_lsb)
- continue;
-
-- if (other->sysv_start_priority < s->sysv_start_priority) {
-- r = strv_extend(&s->after, other->name);
-+ /* All scripts under /etc/rcS.d should execute before scripts under
-+ * /etc/rcN.d */
-+ if (!other->from_rcsd && s->from_rcsd) {
-+ r = strv_extend(&s->before, other->name);
- if (r < 0)
- return log_oom();
-
-- } else if (other->sysv_start_priority > s->sysv_start_priority) {
-- r = strv_extend(&s->before, other->name);
-+ } else if (other->from_rcsd && !s->from_rcsd) {
-+ r = strv_extend(&s->after, other->name);
- if (r < 0)
- return log_oom();
-- } else
-- continue;
-+ } else {
-+ if (other->sysv_start_priority < s->sysv_start_priority) {
-+ r = strv_extend(&s->after, other->name);
-+ if (r < 0)
-+ return log_oom();
-+ }
-+ else if (other->sysv_start_priority > s->sysv_start_priority) {
-+ r = strv_extend(&s->before, other->name);
-+ if (r < 0)
-+ return log_oom();
-+ }
-+ else
-+ continue;
-+ }
-
- /* FIXME: Maybe we should compare the name here lexicographically? */
- }
-@@ -788,6 +808,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) {
- return log_oom();
-
- service->sysv_start_priority = -1;
-+ service->default_dependencies = true;
-+ service->from_rcsd = false;
- service->name = name;
- service->path = fpath;
- name = fpath = NULL;
-@@ -871,9 +893,11 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic
-
- if (de->d_name[0] == 'S') {
-
-- if (rcnd_table[i].type == RUNLEVEL_UP)
-+ if (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT) {
- service->sysv_start_priority = MAX(a*10 + b, service->sysv_start_priority);
--
-+ service->default_dependencies = (rcnd_table[i].type == RUNLEVEL_SYSINIT)?false:true;
-+ service->from_rcsd = (rcnd_table[i].type == RUNLEVEL_SYSINIT)?true:false;
-+ }
- r = set_ensure_allocated(&runlevel_services[i], NULL);
- if (r < 0) {
- log_oom();
-@@ -887,7 +911,8 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic
- }
-
- } else if (de->d_name[0] == 'K' &&
-- (rcnd_table[i].type == RUNLEVEL_DOWN)) {
-+ (rcnd_table[i].type == RUNLEVEL_DOWN ||
-+ rcnd_table[i].type == RUNLEVEL_SYSINIT)) {
-
- r = set_ensure_allocated(&shutdown_services, NULL);
- if (r < 0) {
---
-1.8.3.1
-
diff --git a/meta/recipes-core/systemd/systemd/0016-Revert-rules-remove-firmware-loading-rules.patch b/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
similarity index 84%
rename from meta/recipes-core/systemd/systemd/0016-Revert-rules-remove-firmware-loading-rules.patch
rename to meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
index 66905b5..ed7c68f 100644
--- a/meta/recipes-core/systemd/systemd/0016-Revert-rules-remove-firmware-loading-rules.patch
+++ b/meta/recipes-core/systemd/systemd/0014-Revert-rules-remove-firmware-loading-rules.patch
@@ -1,7 +1,7 @@
-From 7311ecc745c17d6ed9fd9cf43039648483a87605 Mon Sep 17 00:00:00 2001
+From 0f47cfcb16e8e40a90a9221f9995f8cd8a915c22 Mon Sep 17 00:00:00 2001
From: Jonathan Liu <net147@gmail.com>
Date: Thu, 19 Mar 2015 15:01:29 +1100
-Subject: [PATCH 16/36] Revert "rules: remove firmware loading rules"
+Subject: [PATCH 14/19] Revert "rules: remove firmware loading rules"
This reverts commit 70e7d754ddb356fb1a2942b262f8cee9650e2a19.
Userspace firmware loading support is needed for Linux < 3.7.
@@ -24,5 +24,5 @@ index 0000000..f0ae684
+
+SUBSYSTEM=="firmware", ACTION=="add", RUN{builtin}="firmware"
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
similarity index 89%
rename from meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch
rename to meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
index 642625f..f31d211 100644
--- a/meta/recipes-core/systemd/systemd/0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch
+++ b/meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch
@@ -1,4 +1,7 @@
-Subject: [PATCH 17/36] Revert "udev: remove userspace firmware loading
+From 4d28d9a7d8d69fb429955d770e53e7a81640da24 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 9 Nov 2016 20:45:23 -0800
+Subject: [PATCH 15/19] Revert "udev: remove userspace firmware loading
support"
This reverts commit be2ea723b1d023b3d385d3b791ee4607cbfb20ca.
@@ -10,21 +13,21 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile.am | 12 +++
- README | 4 +-
+ README | 6 +-
TODO | 1 +
- configure.ac | 22 ++++++
+ configure.ac | 18 +++++
src/udev/udev-builtin-firmware.c | 154 +++++++++++++++++++++++++++++++++++++++
src/udev/udev-builtin.c | 3 +
src/udev/udev.h | 6 ++
src/udev/udevd.c | 13 ++++
- 8 files changed, 213 insertions(+), 2 deletions(-)
+ 8 files changed, 210 insertions(+), 3 deletions(-)
create mode 100644 src/udev/udev-builtin-firmware.c
diff --git a/Makefile.am b/Makefile.am
-index 305099a..e774976 100644
+index 3010b01..229492a 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -3706,6 +3706,18 @@ libudev_core_la_LIBADD = \
+@@ -3791,6 +3791,18 @@ libudev_core_la_LIBADD = \
$(BLKID_LIBS) \
$(KMOD_LIBS)
@@ -44,10 +47,17 @@ index 305099a..e774976 100644
libudev_core_la_SOURCES += \
src/udev/udev-builtin-kmod.c
diff --git a/README b/README
-index ca8993c..87f3297 100644
+index 9f5bc93..f60ae11 100644
--- a/README
+++ b/README
-@@ -56,8 +56,8 @@ REQUIREMENTS:
+@@ -50,14 +50,14 @@ REQUIREMENTS:
+ CONFIG_PROC_FS
+ CONFIG_FHANDLE (libudev, mount and bind mount handling)
+
+- udev will fail to work with the legacy sysfs layout:
++ Udev will fail to work with the legacy sysfs layout:
+ CONFIG_SYSFS_DEPRECATED=n
+
Legacy hotplug slows down the system and confuses udev:
CONFIG_UEVENT_HELPER_PATH=""
@@ -59,10 +69,10 @@ index ca8993c..87f3297 100644
Some udev rules and virtualization detection relies on it:
diff --git a/TODO b/TODO
-index fac9ccf..2645582 100644
+index baaac94..1ab1691 100644
--- a/TODO
+++ b/TODO
-@@ -642,6 +642,7 @@ Features:
+@@ -658,6 +658,7 @@ Features:
* initialize the hostname from the fs label of /, if /etc/hostname does not exist?
* udev:
@@ -71,13 +81,13 @@ index fac9ccf..2645582 100644
- kill scsi_id
- add trigger --subsystem-match=usb/usb_device device
diff --git a/configure.ac b/configure.ac
-index 329861a..af85405 100644
+index dfc0bd3..1de0066 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1361,6 +1361,25 @@ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database
+@@ -1394,6 +1394,23 @@ AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
+ AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database support])],
+ enable_hwdb=$enableval, enable_hwdb=yes)
AM_CONDITIONAL(ENABLE_HWDB, [test x$enable_hwdb = xyes])
-
- # ------------------------------------------------------------------------------
+AC_ARG_WITH(firmware-path,
+ AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
+ [Firmware search path (default="")]),
@@ -93,19 +103,15 @@ index 329861a..af85405 100644
+done
+IFS=$OLD_IFS
+AC_SUBST(FIRMWARE_PATH)
-+AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is availabe]) ])
++AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])
+AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
-+
-+# ------------------------------------------------------------------------------
+
+ # ------------------------------------------------------------------------------
have_manpages=no
- AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
- AC_PATH_PROG([XSLTPROC], [xsltproc])
-@@ -1656,6 +1675,9 @@ AC_MSG_RESULT([
+@@ -1698,6 +1715,7 @@ AC_MSG_RESULT([
SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
Build Python: ${PYTHON}
-+ Installation Python: ${PYTHON_BINARY}
-+ sphinx binary: ${SPHINX_BUILD}
+ firmware path: ${FIRMWARE_PATH}
PAM modules dir: ${with_pamlibdir}
PAM configuration dir: ${with_pamconfdir}
@@ -309,7 +315,7 @@ index 8433e8d..d32366d 100644
extern const struct udev_builtin udev_builtin_input_id;
extern const struct udev_builtin udev_builtin_keyboard;
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index e9dd2f4..0abc28e 100644
+index d336ee0..81e5dc5 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -125,6 +125,9 @@ struct event {
@@ -322,7 +328,7 @@ index e9dd2f4..0abc28e 100644
};
static inline struct event *node_to_event(struct udev_list_node *node) {
-@@ -614,6 +617,10 @@ static int event_queue_insert(Manager *manager, struct udev_device *dev) {
+@@ -613,6 +616,10 @@ static int event_queue_insert(Manager *manager, struct udev_device *dev) {
event->devnum = udev_device_get_devnum(dev);
event->is_block = streq("block", udev_device_get_subsystem(dev));
event->ifindex = udev_device_get_ifindex(dev);
@@ -333,7 +339,7 @@ index e9dd2f4..0abc28e 100644
log_debug("seq %llu queued, '%s' '%s'", udev_device_get_seqnum(dev),
udev_device_get_action(dev), udev_device_get_subsystem(dev));
-@@ -699,6 +706,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) {
+@@ -698,6 +705,12 @@ static bool is_devpath_busy(Manager *manager, struct event *event) {
return true;
}
@@ -347,5 +353,5 @@ index e9dd2f4..0abc28e 100644
if (event->devpath[common] == '/') {
event->delaying_seqnum = loop_event->seqnum;
--
-2.8.3
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch b/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch
deleted file mode 100644
index 6e6f344..0000000
--- a/meta/recipes-core/systemd/systemd/0015-systemd-user-avoid-using-system-auth.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Subject: [PATCH 15/36] systemd-user: avoid using system-auth
-
-In OE, we don't provide system-auth, instead, we use common-* files.
-So modify systemd-user file to use common-* files.
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- src/login/systemd-user.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
-index f188a8e..862d8d7 100644
---- a/src/login/systemd-user.m4
-+++ b/src/login/systemd-user.m4
-@@ -2,11 +2,11 @@
- #
- # Used by systemd --user instances.
-
--account include system-auth
-+account include common-account
-
- m4_ifdef(`HAVE_SELINUX',
- session required pam_selinux.so close
- session required pam_selinux.so nottys open
- )m4_dnl
- session required pam_loginuid.so
--session include system-auth
-+session include common-session
---
-2.8.3
-
diff --git a/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch b/meta/recipes-core/systemd/systemd/0016-make-test-dir-configurable.patch
similarity index 77%
rename from meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch
rename to meta/recipes-core/systemd/systemd/0016-make-test-dir-configurable.patch
index 5d13e4a..10d1df5 100644
--- a/meta/recipes-core/systemd/systemd/0018-make-test-dir-configurable.patch
+++ b/meta/recipes-core/systemd/systemd/0016-make-test-dir-configurable.patch
@@ -1,4 +1,7 @@
-Subject: [PATCH 18/36] make test dir configurable
+From 218bbc555a37f9373fbb7f03c744eb65109d3470 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 9 Nov 2016 20:47:37 -0800
+Subject: [PATCH 16/19] make test dir configurable
Upstream-Status: Pending
@@ -6,17 +9,17 @@ test maybe be run on target in cross-compile environment, and test dir
is not the compilation dir, so make it configurable
Signed-off-by: Roy Li <rongqing.li@windriver.com>
-
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile.am | 2 +-
configure.ac | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index a94636a..dbd3386 100644
+index 229492a..e997d82 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -207,7 +207,7 @@ AM_CPPFLAGS = \
+@@ -214,7 +214,7 @@ AM_CPPFLAGS = \
-DROOTLIBDIR=\"$(rootlibdir)\" \
-DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
-DROOTHOMEDIR=\"$(roothomedir)\" \
@@ -26,10 +29,10 @@ index a94636a..dbd3386 100644
-I $(top_builddir)/src/basic \
-I $(top_srcdir)/src/basic \
diff --git a/configure.ac b/configure.ac
-index 45aae8a..c53fae2 100644
+index 1de0066..b12e320 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1518,6 +1518,11 @@ AC_ARG_WITH([roothomedir],
+@@ -1535,6 +1535,11 @@ AC_ARG_WITH([roothomedir],
[],
[with_roothomedir=/root])
@@ -41,7 +44,7 @@ index 45aae8a..c53fae2 100644
AC_ARG_WITH([pamlibdir],
AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
[],
-@@ -1603,6 +1608,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir])
+@@ -1621,6 +1626,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir])
AC_SUBST([rootprefix], [$with_rootprefix])
AC_SUBST([rootlibdir], [$with_rootlibdir])
AC_SUBST([roothomedir], [$with_roothomedir])
@@ -49,7 +52,7 @@ index 45aae8a..c53fae2 100644
AC_CONFIG_FILES([
Makefile
-@@ -1695,6 +1701,7 @@ AC_MSG_RESULT([
+@@ -1712,6 +1718,7 @@ AC_MSG_RESULT([
lib dir: ${libdir}
rootlib dir: ${with_rootlibdir}
root home dir: ${with_roothomedir}
@@ -58,5 +61,5 @@ index 45aae8a..c53fae2 100644
SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
Build Python: ${PYTHON}
--
-2.8.3
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0019-remove-duplicate-include-uchar.h.patch b/meta/recipes-core/systemd/systemd/0017-remove-duplicate-include-uchar.h.patch
similarity index 81%
rename from meta/recipes-core/systemd/systemd/0019-remove-duplicate-include-uchar.h.patch
rename to meta/recipes-core/systemd/systemd/0017-remove-duplicate-include-uchar.h.patch
index 17592f8..77dbd6e 100644
--- a/meta/recipes-core/systemd/systemd/0019-remove-duplicate-include-uchar.h.patch
+++ b/meta/recipes-core/systemd/systemd/0017-remove-duplicate-include-uchar.h.patch
@@ -1,14 +1,12 @@
-From 3ca534935460647fed66e31aaa90b364e29eab5c Mon Sep 17 00:00:00 2001
+From e78af874fc9f3d3af49498b8207109993d93a596 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 22 Feb 2016 05:59:01 +0000
-Subject: [PATCH 1/2] remove duplicate include uchar.h
+Subject: [PATCH 17/19] remove duplicate include uchar.h
missing.h already includes it
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
-
src/basic/escape.h | 1 -
src/basic/utf8.h | 1 -
2 files changed, 2 deletions(-)
@@ -26,7 +24,7 @@ index deaa4de..36d437c 100644
#include "string-util.h"
#include "missing.h"
diff --git a/src/basic/utf8.h b/src/basic/utf8.h
-index 12c272d..bea93a6 100644
+index f9b9c94..6ac9a3c 100644
--- a/src/basic/utf8.h
+++ b/src/basic/utf8.h
@@ -22,7 +22,6 @@
@@ -38,5 +36,5 @@ index 12c272d..bea93a6 100644
#include "macro.h"
#include "missing.h"
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0020-check-for-uchar.h-in-configure.patch b/meta/recipes-core/systemd/systemd/0018-check-for-uchar.h-in-configure.patch
similarity index 76%
rename from meta/recipes-core/systemd/systemd/0020-check-for-uchar.h-in-configure.patch
rename to meta/recipes-core/systemd/systemd/0018-check-for-uchar.h-in-configure.patch
index a027fad..5824033 100644
--- a/meta/recipes-core/systemd/systemd/0020-check-for-uchar.h-in-configure.patch
+++ b/meta/recipes-core/systemd/systemd/0018-check-for-uchar.h-in-configure.patch
@@ -1,23 +1,21 @@
-From e06eec89a22719c38e257fe07afff18e359114cb Mon Sep 17 00:00:00 2001
+From 7cc0b19d244023c7b3e557765b03b7971e047f29 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 22 Feb 2016 06:02:38 +0000
-Subject: [PATCH 2/2] check for uchar.h in configure
+Subject: [PATCH 18/19] check for uchar.h in configure
Use ifdef to include uchar.h
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
-
configure.ac | 1 +
src/basic/missing.h | 2 ++
2 files changed, 3 insertions(+)
diff --git a/configure.ac b/configure.ac
-index ecc3e6b..62f934e 100644
+index b12e320..4e6dfdf 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -297,6 +297,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
+@@ -298,6 +298,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
# ------------------------------------------------------------------------------
@@ -26,10 +24,10 @@ index ecc3e6b..62f934e 100644
AC_CHECK_HEADERS([linux/btrfs.h], [], [])
AC_CHECK_HEADERS([linux/memfd.h], [], [])
diff --git a/src/basic/missing.h b/src/basic/missing.h
-index f704422..a1baa95 100644
+index 4936873..ce79404 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
-@@ -34,7 +34,9 @@
+@@ -35,7 +35,9 @@
#include <stdlib.h>
#include <sys/resource.h>
#include <sys/syscall.h>
@@ -40,5 +38,5 @@ index f704422..a1baa95 100644
#ifdef HAVE_AUDIT
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch b/meta/recipes-core/systemd/systemd/0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
similarity index 69%
rename from meta/recipes-core/systemd/systemd/0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
rename to meta/recipes-core/systemd/systemd/0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
index 96fc3d8..66aa4ca 100644
--- a/meta/recipes-core/systemd/systemd/0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
+++ b/meta/recipes-core/systemd/systemd/0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch
@@ -1,23 +1,23 @@
-From 71e710a6c8a3879af7d50c4cb995e0615deba5c3 Mon Sep 17 00:00:00 2001
-From: Emil Renner Berthing <systemd@esmil.dk>
-Date: Sat, 12 Sep 2015 19:56:52 +0000
-Subject: [PATCH 29/38] socket-util: don't fail if libc doesn't support IDN
+From 289554d87e4fd96cae08c0fb449bf41d5641cd24 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 9 Nov 2016 20:49:53 -0800
+Subject: [PATCH 19/19] socket-util: don't fail if libc doesn't support IDN
+
+Upstream-Status: Pending
Signed-off-by: Emil Renner Berthing <systemd@esmil.dk>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
-Upstream-Status: Pending
-
src/basic/socket-util.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
-index 5851268..aefaca5 100644
+index 4ebf106..53b9a12 100644
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
-@@ -44,6 +44,15 @@
- #include "string-util.h"
+@@ -47,6 +47,15 @@
#include "user-util.h"
+ #include "utf8.h"
#include "util.h"
+/* Don't fail if the standard library
+ * doesn't support IDN */
@@ -32,5 +32,5 @@ index 5851268..aefaca5 100644
int socket_address_parse(SocketAddress *a, const char *s) {
char *e, *n;
--
-1.8.3.1
+2.10.2
diff --git a/meta/recipes-core/systemd/systemd/0021-include-missing.h-for-getting-secure_getenv-definiti.patch b/meta/recipes-core/systemd/systemd/0021-include-missing.h-for-getting-secure_getenv-definiti.patch
deleted file mode 100644
index 5797a29..0000000
--- a/meta/recipes-core/systemd/systemd/0021-include-missing.h-for-getting-secure_getenv-definiti.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6cedbaee7964f6a6c61b9f2c8f0b87cef9370424 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 15 Dec 2015 22:51:55 +0000
-Subject: [PATCH 26/38] include missing.h for getting secure_getenv definition
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- src/basic/user-util.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/basic/user-util.c b/src/basic/user-util.c
-index 55672b3..22c4a23 100644
---- a/src/basic/user-util.c
-+++ b/src/basic/user-util.c
-@@ -38,6 +38,7 @@
- #include "path-util.h"
- #include "string-util.h"
- #include "user-util.h"
-+#include "missing.h"
-
- bool uid_is_valid(uid_t uid) {
-
---
-1.8.3.1
-
diff --git a/meta/recipes-core/systemd/systemd/CVE-2016-7795.patch b/meta/recipes-core/systemd/systemd/CVE-2016-7795.patch
deleted file mode 100644
index 5ecb9c3..0000000
--- a/meta/recipes-core/systemd/systemd/CVE-2016-7795.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Subject: Fix CVE-2016-7795
-
-This undoes 531ac2b. I acked that patch without looking at the code
-carefully enough. There are two problems:
-- we want to process the fds anyway
-- in principle empty notification messages are valid, and we should
- process them as usual, including logging using log_unit_debug().
-
-Upstream-Status: Backport
-CVE: CVE-2016-7795
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- src/core/manager.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/core/manager.c b/src/core/manager.c
-index 7838f56..f165d08e 100644
---- a/src/core/manager.c
-+++ b/src/core/manager.c
-@@ -1589,13 +1589,12 @@ static int manager_dispatch_cgroups_agent_fd(sd_event_source *source, int fd, ui
- return 0;
- }
-
--static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const char *buf, size_t n, FDSet *fds) {
-+static void manager_invoke_notify_message(Manager *m, Unit *u, pid_t pid, const char *buf, FDSet *fds) {
- _cleanup_strv_free_ char **tags = NULL;
-
- assert(m);
- assert(u);
- assert(buf);
-- assert(n > 0);
-
- tags = strv_split(buf, "\n\r");
- if (!tags) {
-@@ -1688,25 +1687,27 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
- return 0;
- }
-
-+ /* The message should be a string. Here we make sure it's NUL-terminated,
-+ * but only the part until first NUL will be used anyway. */
- buf[n] = 0;
-
- /* Notify every unit that might be interested, but try
- * to avoid notifying the same one multiple times. */
- u1 = manager_get_unit_by_pid_cgroup(m, ucred->pid);
- if (u1) {
-- manager_invoke_notify_message(m, u1, ucred->pid, buf, n, fds);
-+ manager_invoke_notify_message(m, u1, ucred->pid, buf, fds);
- found = true;
- }
-
- u2 = hashmap_get(m->watch_pids1, PID_TO_PTR(ucred->pid));
- if (u2 && u2 != u1) {
-- manager_invoke_notify_message(m, u2, ucred->pid, buf, n, fds);
-+ manager_invoke_notify_message(m, u2, ucred->pid, buf, fds);
- found = true;
- }
-
- u3 = hashmap_get(m->watch_pids2, PID_TO_PTR(ucred->pid));
- if (u3 && u3 != u2 && u3 != u1) {
-- manager_invoke_notify_message(m, u3, ucred->pid, buf, n, fds);
-+ manager_invoke_notify_message(m, u3, ucred->pid, buf, fds);
- found = true;
- }
-
---
-2.8.3
-
diff --git a/meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch b/meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch
deleted file mode 100644
index 23e22d4..0000000
--- a/meta/recipes-core/systemd/systemd/udev-re-enable-mount-propagation-for-udevd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Sat, 27 Sep 2014 04:19:24 +0200
-Subject: udev: re-enable mount propagation for udevd
-
-Upstream-Status: Backport [http://http.debian.net/debian/pool/main/s/systemd/systemd_215-17+deb8u4.debian.tar.xz]
-
-laptop-mode-tools remounts file systems from within a udev rule to apply
-certain mount options. With MountFlags=slave, those mounts then become private
-to the systemd-udevd namespace and are no longer accessible from outside the
-namespace.
-While the root cause is the broken behaviour of laptop-mode-tools, with mount
-propagation turned off, this can result in a read-only root file system.
-Therefore revert the relevant parts from commit
-c2c13f2df42e0691aecabe3979ea81cd7faa35c7 to re-enable mount propagation for
-udevd.
-
-Once affected packages have been fixed, this patch should be dropped
-again.
-
-Closes: #762018
-diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
-index e7216d6..1e9a600 100644
---- a/units/systemd-udevd.service.in
-+++ b/units/systemd-udevd.service.in
-@@ -21,6 +21,5 @@ Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
- Restart=always
- RestartSec=0
- ExecStart=@rootlibexecdir@/systemd-udevd
--MountFlags=slave
- KillMode=mixed
- WatchdogSec=1min
diff --git a/meta/recipes-core/systemd/systemd_230.bb b/meta/recipes-core/systemd/systemd_232.bb
similarity index 96%
rename from meta/recipes-core/systemd/systemd_230.bb
rename to meta/recipes-core/systemd/systemd_232.bb
index 77b7130..baee02e 100644
--- a/meta/recipes-core/systemd/systemd_230.bb
+++ b/meta/recipes-core/systemd/systemd_232.bb
@@ -25,18 +25,13 @@ SRC_URI += " \
file://0010-implment-systemd-sysv-install-for-OE.patch \
file://0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch \
file://0012-rules-whitelist-hd-devices.patch \
- file://0013-sysv-generator-add-support-for-executing-scripts-und.patch \
- file://0014-Make-root-s-home-directory-configurable.patch \
- file://0015-systemd-user-avoid-using-system-auth.patch \
- file://0016-Revert-rules-remove-firmware-loading-rules.patch \
- file://0017-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
- file://0018-make-test-dir-configurable.patch \
- file://0019-remove-duplicate-include-uchar.h.patch \
- file://0020-check-for-uchar.h-in-configure.patch \
- file://0021-include-missing.h-for-getting-secure_getenv-definiti.patch \
- file://0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \
- file://udev-re-enable-mount-propagation-for-udevd.patch \
- file://CVE-2016-7795.patch \
+ file://0013-Make-root-s-home-directory-configurable.patch \
+ file://0014-Revert-rules-remove-firmware-loading-rules.patch \
+ file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \
+ file://0016-make-test-dir-configurable.patch \
+ file://0017-remove-duplicate-include-uchar.h.patch \
+ file://0018-check-for-uchar.h-in-configure.patch \
+ file://0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \
"
SRC_URI_append_libc-uclibc = "\
file://0002-units-Prefer-getty-to-agetty-in-console-setup-system.patch \
@@ -61,7 +56,6 @@ PACKAGECONFIG ??= "xz \
timedated \
timesyncd \
localed \
- kdbus \
ima \
smack \
logind \
@@ -96,7 +90,6 @@ PACKAGECONFIG[timedated] = "--enable-timedated,--disable-timedated"
PACKAGECONFIG[timesyncd] = "--enable-timesyncd,--disable-timesyncd"
PACKAGECONFIG[localed] = "--enable-localed,--disable-localed"
PACKAGECONFIG[efi] = "--enable-efi,--disable-efi"
-PACKAGECONFIG[kdbus] = "--enable-kdbus,--disable-kdbus"
PACKAGECONFIG[ima] = "--enable-ima,--disable-ima"
PACKAGECONFIG[smack] = "--enable-smack,--disable-smack"
# libseccomp is found in meta-security
@@ -282,7 +275,7 @@ python populate_packages_prepend (){
systemdlibdir = d.getVar("rootlibdir", True)
do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
}
-PACKAGES_DYNAMIC += "^lib(udev|systemd).*"
+PACKAGES_DYNAMIC += "^lib(udev|systemd|nss).*"
PACKAGES =+ "\
${PN}-gui \
@@ -492,6 +485,7 @@ RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-genera
os-release \
"
+INSANE_SKIP_${PN} += "dev-so"
INSANE_SKIP_${PN}-doc += " libdir"
PACKAGES =+ "udev udev-hwdb"
--
2.10.2
^ permalink raw reply related
* Re: [PATCH 2/2 V5] systemd: Upgrade to 232
From: Khem Raj @ 2016-12-01 22:21 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
In-Reply-To: <CAJTo0LY4K4mRh6_jCJj1pEGHRvx67kZuQ0DbNtkA_EOkP7GyRw@mail.gmail.com>
On Thu, Dec 1, 2016 at 12:22 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 28 November 2016 at 21:26, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> -PV = "230+git${SRCPV}"
>
>
> packages/corei7-64-intel-common-poky-linux/systemd-boot/systemd-boot-dev:
> PKGV changed from 230+git0+3a74d4fc90 to 1.0 [default]
>
> I'm starting to wonder if systemd and systemd-boot sharing a .inc is a good
> idea!
I think its fine. We should consolidate all systemd related recipes in
one place may
be under
recipes-systemd/
or recipes-core/systemd
currently we have
./recipes-devtools/systemd-bootchart/systemd-bootchart_230.bb
./recipes-bsp/systemd-boot/systemd-boot.bb
./recipes-core/systemd/systemd_232.bb
./recipes-core/systemd/systemd-serialgetty.bb
./recipes-core/systemd/systemd.inc
./recipes-core/systemd/systemd-compat-units.bb
./recipes-core/systemd/systemd-systemctl-native.bb
>
> Ross
^ permalink raw reply
* Re: [PATCH 2/2 V5] systemd: Upgrade to 232
From: Burton, Ross @ 2016-12-01 20:22 UTC (permalink / raw)
To: Khem Raj; +Cc: OE-core
In-Reply-To: <20161128212606.26139-1-raj.khem@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
On 28 November 2016 at 21:26, Khem Raj <raj.khem@gmail.com> wrote:
> -PV = "230+git${SRCPV}"
>
packages/corei7-64-intel-common-poky-linux/systemd-boot/systemd-boot-dev:
PKGV changed from 230+git0+3a74d4fc90 to 1.0 [default]
I'm starting to wonder if systemd and systemd-boot sharing a .inc is a good
idea!
Ross
[-- Attachment #2: Type: text/html, Size: 840 bytes --]
^ permalink raw reply
* Re: [oe] [meta-oe][PATCH] libva: Import from meta-intel and update to 1.7.3
From: Khem Raj @ 2016-12-01 19:58 UTC (permalink / raw)
To: openembeded-devel,
Patches and discussions about the oe-core layer
In-Reply-To: <CAJTo0LYTYa4A42+FA9Ou=bVA6ddH8gzVBpJZJvNfa9Jyb9QQfA@mail.gmail.com>
On Thu, Dec 1, 2016 at 9:19 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 1 December 2016 at 03:42, Khem Raj <raj.khem@gmail.com> wrote:
>
>> >> If libva goes in, can we get libva-intel-driver in as well? Those go
>> >> hand-in-glove currently.
>> >>
>> >
>> > Khem, does the AMD BSP use that? I'd have thought that bit was actually
>> > meta-intel specific.
>>
>> its intel BSPs specific
>
>
> So I'd endorse libva for oe-core, and the intel-driver remains in
> meta-intel.
I am fine with proposal. This is time for someone to raise objections.
>
> Ross
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply
* Re: [PATCH 1/2] bash: use update-alternatives for the bash binary
From: Andreas Oberritter @ 2016-12-01 19:42 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
In-Reply-To: <CAJTo0Lbt2APOm5ZfMQqF3Rg16W-AyBPJTYZCdd_OsXPOH-9pDA@mail.gmail.com>
On 01.12.2016 18:41, Burton, Ross wrote:
>
> On 30 November 2016 at 18:50, Andreas Oberritter <obi@opendreambox.org
> <mailto:obi@opendreambox.org>> wrote:
>
> Busybox may offer a bash applet. If enabled, the alternatives mechanism
>
>
> Wait, what? busybox can ship a /bin/bash that isn't bash? That's
> *hideous*!
That's what busybox is all about, isn't it? Shipping things that aren't
the real thing with varying levels of compatibility (think sed, awk,
grep for other tools in busybox that use some kind of interpreted
language). Busybox' ash even supports some bash extensions.
FWIW, using /bin/bash as a login shell with busybox was the easiest way
to get bash-completions working with bash installed in a normal rootfs
(it doesn't work fully in POSIX mode) and get working logins in an
initramfs image at the same time, where bash isn't installed.
/etc/passwd is shared between both images.
Regards,
Andreas
^ permalink raw reply
* Re: [PATCH] libc-package.bbclass: split binary localedata even more if asked to
From: Andreas Oberritter @ 2016-12-01 19:25 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <CAMKF1spwRmH3KfQ3ZS1WvWiqDhhXqFK=Bw40zfgGUzP32ubdVw@mail.gmail.com>
On 01.12.2016 17:51, Khem Raj wrote:
> On Thu, Dec 1, 2016 at 4:33 AM, Andreas Oberritter <obi@opendreambox.org> wrote:
>> On 01.12.2016 05:02, Khem Raj wrote:
>>>
>>>> On Nov 30, 2016, at 3:50 PM, Andreas Oberritter <obi@opendreambox.org> wrote:
>>>>
>>>> If GLIBC_SPLIT_LC_PACKAGES is set to a non-zero value, convert
>>>> glibc-binary-localedata-XX-YY to be a meta package depending on
>>>> glibc-binary-localedata-XX-YY-lc-address and so on. This enables
>>>> saving quite some space if someone doesn't need LC_COLLATE for
>>>> example.
>>>>
>>>> Some regex code was removed from output_locale_binary_rdepends,
>>>> because legitimize_package_name already converts to lowercase.
>>>>
>>>
>>> This looks ok. May be add some documentation around
>>> GLIBC_SPLIT_LC_PACKAGES in extended local.conf sample.
>>
>> OK, will send a v2.
>>
>>> I am worried about dependency changes, may be comparing old and new
>>> would help.
>>
>> The generated meta packages make sure that dependencies stay intact. I
>> didn't observe any deviation in my test builds, with or without setting
>> GLIBC_SPLIT_LC_PACKAGES to 1.
>
> Thats comforting. did you also try a online package upgrade ?
Yes, but you can't switch existing package feeds from one setting to
another with deb, because of file conflicts (unless you run apt-get -f
install after upgrading). This would need additional RREPLACES,
RCONFLICTS (and RBREAKS?) statements, which IMHO are impossible to
automate. I'm not sure about other package managers. But it's a very
common problem when moving files from one package to another.
Regards,
Andreas
^ permalink raw reply
* Re: [PATCH 1/2] bash: use update-alternatives for the bash binary
From: Burton, Ross @ 2016-12-01 17:41 UTC (permalink / raw)
To: Andreas Oberritter; +Cc: OE-core
In-Reply-To: <1480531827-11799-1-git-send-email-obi@opendreambox.org>
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
On 30 November 2016 at 18:50, Andreas Oberritter <obi@opendreambox.org>
wrote:
> Busybox may offer a bash applet. If enabled, the alternatives mechanism
>
Wait, what? busybox can ship a /bin/bash that isn't bash? That's
*hideous*!
Ross
[-- Attachment #2: Type: text/html, Size: 666 bytes --]
^ permalink raw reply
* Re: [PATCHv2 3/3] oe-selftest: Add option to submit test result to a git repository.
From: Mariano Lopez @ 2016-12-01 17:00 UTC (permalink / raw)
To: benjamin.esquivel; +Cc: openembedded-core
In-Reply-To: <1480611160.13546.2.camel@linux.intel.com>
On Thursday, December 01, 2016 10:52:40 AM Benjamin Esquivel wrote:
> Hi Mariano
>
> On Thu, 2016-12-01 at 09:37 -0600, mariano.lopez@linux.intel.com wrote:
> > From: Mariano Lopez <mariano.lopez@linux.intel.com>
> >
> > This new option allows to commit the result to a git repository,
> > along with the results it will add a metadata file for information
> > of the current selftest run, such as: hostname, machine, distro,
> > distro version, host version, and layers.
> >
> > This implementation will have a branch per different hostname,
> > testing branch, and machine.
> >
> > To use this feature use:
> >
> > oe-selftest <options> --repository <repository_link>
> >
> > [YOCTO #9954]
> I think this version is okay :) have you tested it in an Autobuilder
> task?
Indeed, that is why it took me a bit longer to submit the patch. I
know this won't blow up current master. But Ihaven't used the
option yet, we would need a remote repo and a new autobuilder
buildset.
^ permalink raw reply
* Re: [PATCHv2 3/3] oe-selftest: Add option to submit test result to a git repository.
From: Benjamin Esquivel @ 2016-12-01 16:52 UTC (permalink / raw)
To: mariano.lopez, openembedded-core
In-Reply-To: <53d2af537516d9f542729f80a1ec12c3484a4b3f.1480525452.git.mariano.lopez@linux.intel.com>
Hi Mariano
On Thu, 2016-12-01 at 09:37 -0600, mariano.lopez@linux.intel.com wrote:
> From: Mariano Lopez <mariano.lopez@linux.intel.com>
>
> This new option allows to commit the result to a git repository,
> along with the results it will add a metadata file for information
> of the current selftest run, such as: hostname, machine, distro,
> distro version, host version, and layers.
>
> This implementation will have a branch per different hostname,
> testing branch, and machine.
>
> To use this feature use:
>
> oe-selftest <options> --repository <repository_link>
>
> [YOCTO #9954]
I think this version is okay :) have you tested it in an Autobuilder
task?
>
> Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
> ---
> scripts/oe-selftest | 102
> ++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 102 insertions(+)
>
> diff --git a/scripts/oe-selftest b/scripts/oe-selftest
> index deaa432..f4b861f 100755
> --- a/scripts/oe-selftest
> +++ b/scripts/oe-selftest
> @@ -36,6 +36,7 @@ import re
> import fnmatch
> import collections
> import imp
> +import git
>
> sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)) +
> '/lib')
> import scriptpath
> @@ -46,6 +47,7 @@ import argparse_oe
> import oeqa.selftest
> import oeqa.utils.ftools as ftools
> from oeqa.utils.commands import runCmd, get_bb_var, get_test_layer
> +from oeqa.utils.metadata import metadata_from_bb,
> write_metadata_file
> from oeqa.selftest.base import oeSelfTest, get_available_machines
>
> try:
> @@ -106,6 +108,8 @@ def get_args_parser():
> help='List all tags that have been set to
> test cases.')
> parser.add_argument('--machine', required=False, dest='machine',
> choices=['random', 'all'], default=None,
> help='Run tests on different machines
> (random/all).')
> + parser.add_argument('--repository', required=False,
> dest='repository', default='', action='store',
> + help='Submit test results to a repository')
> return parser
>
>
> @@ -572,6 +576,75 @@ def main():
>
> log.info("Finished")
>
> + if args.repository:
> + # Commit tests results to repository
> + metadata = metadata_from_bb()
> + git_dir = os.path.join(os.getcwd(), 'selftest')
> + if not os.path.isdir(git_dir):
> + os.mkdir(git_dir)
> +
> + log.debug('Checking for git repository in %s' % git_dir)
> + try:
> + repo = git.Repo(git_dir)
> + except git.exc.InvalidGitRepositoryError:
> + log.debug("Couldn't find git repository %s; "
> + "cloning from %s" % (git_dir,
> args.repository))
> + repo = git.Repo.clone_from(args.repository, git_dir)
> +
> + r_branches = repo.git.branch(r=True)
> + r_branches = set(r_branches.replace('origin/',
> '').split())
> + l_branches = {str(branch) for branch in repo.branches}
> + branch = '%s/%s/%s' % (metadata['hostname'],
> + metadata['layers']['meta']['branc
> h'],
> + metadata['machine'])
> +
> + if branch in l_branches:
> + log.debug('Found branch in local repository,
> checking out')
> + repo.git.checkout(branch)
> + elif branch in r_branches:
> + log.debug('Found branch in remote repository,
> checking'
> + ' out and pulling')
> + repo.git.checkout(branch)
> + repo.git.pull()
> + else:
> + log.debug('New branch %s' % branch)
> + repo.git.checkout('master')
> + repo.git.checkout(b=branch)
> +
> + cleanResultsDir(repo)
> + xml_dir = os.path.join(os.getcwd(), log_prefix)
> + copyResultFiles(xml_dir, git_dir, repo)
> + metadata_file = os.path.join(git_dir, 'metadata.xml')
> + write_metadata_file(metadata_file, metadata)
> + repo.index.add([metadata_file])
> + repo.index.write()
> +
> + # Get information for commit message
> + layer_info = ''
> + for layer, values in metadata['layers'].items():
> + layer_info = '%s%-17s = %s:%s\n' % (layer_info,
> layer,
> + values['branch'], values['revision'])
> + msg = 'Selftest for build %s of %s %s for machine %s on
> %s\n\n%s' % (
> + log_prefix[12:], metadata['distro'],
> metadata['distro_version'],
> + metadata['machine'], metadata['hostname'],
> layer_info)
> +
> + log.debug('Commiting results to local repository')
> + repo.index.commit(msg)
> + if not repo.is_dirty():
> + try:
> + if branch in r_branches:
> + log.debug('Pushing changes to remote
> repository')
> + repo.git.push()
> + else:
> + log.debug('Pushing changes to remote
> repository '
> + 'creating new branch')
> + repo.git.push('-u', 'origin', branch)
> + except GitCommandError:
> + log.error('Falied to push to remote repository')
> + return 1
> + else:
> + log.error('Local repository is dirty, not pushing
> commits')
> +
> if result.wasSuccessful():
> return 0
> else:
> @@ -655,6 +728,35 @@ def buildResultClass(args):
>
> return StampedResult
>
> +def cleanResultsDir(repo):
> + """ Remove result files from directory """
> +
> + xml_files = []
> + directory = repo.working_tree_dir
> + for f in os.listdir(directory):
> + path = os.path.join(directory, f)
> + if os.path.isfile(path) and path.endswith('.xml'):
> + xml_files.append(f)
> + repo.index.remove(xml_files, working_tree=True)
> +
> +def copyResultFiles(src, dst, repo):
> + """ Copy result files from src to dst removing the time stamp.
> """
> +
> + import shutil
> +
> + re_time = re.compile("-[0-9]+")
> + file_list = []
> +
> + for root, subdirs, files in os.walk(src):
> + tmp_dir = root.replace(src, '').lstrip('/')
> + for s in subdirs:
> + os.mkdir(os.path.join(dst, tmp_dir, s))
> + for f in files:
> + file_name = os.path.join(dst, tmp_dir, re_time.sub("",
> f))
> + shutil.copy2(os.path.join(root, f), file_name)
> + file_list.append(file_name)
> + repo.index.add(file_list)
> +
> class TestRunner(_TestRunner):
> """Test runner class aware of exporting tests."""
> def __init__(self, *args, **kwargs):
^ permalink raw reply
* Re: [PATCH] libc-package.bbclass: split binary localedata even more if asked to
From: Khem Raj @ 2016-12-01 16:51 UTC (permalink / raw)
To: Andreas Oberritter; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <2b3dfd87-29e5-f50a-a0a1-bedd604b2bd3@opendreambox.org>
On Thu, Dec 1, 2016 at 4:33 AM, Andreas Oberritter <obi@opendreambox.org> wrote:
> On 01.12.2016 05:02, Khem Raj wrote:
>>
>>> On Nov 30, 2016, at 3:50 PM, Andreas Oberritter <obi@opendreambox.org> wrote:
>>>
>>> If GLIBC_SPLIT_LC_PACKAGES is set to a non-zero value, convert
>>> glibc-binary-localedata-XX-YY to be a meta package depending on
>>> glibc-binary-localedata-XX-YY-lc-address and so on. This enables
>>> saving quite some space if someone doesn't need LC_COLLATE for
>>> example.
>>>
>>> Some regex code was removed from output_locale_binary_rdepends,
>>> because legitimize_package_name already converts to lowercase.
>>>
>>
>> This looks ok. May be add some documentation around
>> GLIBC_SPLIT_LC_PACKAGES in extended local.conf sample.
>
> OK, will send a v2.
>
>> I am worried about dependency changes, may be comparing old and new
>> would help.
>
> The generated meta packages make sure that dependencies stay intact. I
> didn't observe any deviation in my test builds, with or without setting
> GLIBC_SPLIT_LC_PACKAGES to 1.
Thats comforting. did you also try a online package upgrade ?
>
> Regards,
> Andreas
>
^ permalink raw reply
* Re: [PATCH 2/2 V5] systemd: Upgrade to 232
From: Khem Raj @ 2016-12-01 16:50 UTC (permalink / raw)
To: Peter Kjellerstedt; +Cc: openembedded-core@lists.openembedded.org
In-Reply-To: <6bd14a6cb6904f409632cae7f29ae287@XBOX02.axis.com>
On Thu, Dec 1, 2016 at 1:28 AM, Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>> -----Original Message-----
>> From: openembedded-core-bounces@lists.openembedded.org
>> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
>> Khem Raj
>> Sent: den 28 november 2016 22:26
>> To: openembedded-core@lists.openembedded.org
>> Subject: [OE-core] [PATCH 2/2 V5] systemd: Upgrade to 232
>>
>> * Drop support for rcS.d SysV init scripts.
>> These are prone to cause dependency loops, and almost all packages
>> with
>> rcS scripts now ship a native systemd service.
>>
>> * Drop mount propagation patch, it only happens with libseccomp, OE
>> doesnt
>> enable it
>>
>> * kdbus option has disappeared from configure
>>
>> * Ignore dev-so for PN now since systemd introduced private .so see
>> https://github.com/systemd/systemd/issues/3810
>
> Rather than adding:
>
> INSANE_SKIP_${PN} += "dev-so"
>
> would it not be more appropriate to add
> ${systemd_unitdir}/libsystemd-shared.so to FILES_${PN}-dev, i.e.:
>
> -FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
> +FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd ${systemd_unitdir}/libsystemd-shared.so"
>
> The binaries are linked with libsystemd-shared-232.so which ends up in
> ${PN} as usual.
As mentioned this is not a typical .so which is a symlink and can be
shoved into -dev package
if we do that, then we have to include -dev package into every image
containing systemd.
>
>> * Add libnss* to PACKAGES_DYNAMIC for libnss-resolve to work correctly
>>
>> * Forward port systemd-boot patches to systemd-232
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>
> //Peter
>
^ permalink raw reply
* [PATCH 00/27] Morty-next pull request cover letter only
From: akuster808 @ 2016-12-01 16:36 UTC (permalink / raw)
To: OE-core
In-Reply-To: <cover.1480439158.git.akuster@mvista.com>
resending. looks like this did not hit the list. I think its do to my
corporate email not registered.
- armin
-------- Forwarded Message --------
Subject: [PATCH 00/27] Morty-next pull request cover letter only
Date: Tue, 29 Nov 2016 09:08:18 -0800
From: Armin Kuster <akuster@mvista.com>
To: akuster808@gmail.com, openembedded-core@lists.openembedded.org
Please consider these changes for Morty. Built clean in AB.
The following changes since commit 73454473d7c286c41ee697f74052fed03c79f9f5:
bitbake: toaster: settings set ALLOWED_HOSTS to * in debug mode
(2016-11-16 11:38:51 +0000)
are available in the git repository at:
http://git.yoctoproject.org/git/poky-contrib akuster/morty-next
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akuster/morty-next
André Draszik (2):
cve-check.bbclass: CVE-2014-2524 / readline v5.2
openssl: fix bashism in c_rehash shell script
Armin Kuster (2):
tzcode: update to 2016i
tzdata: update to 2016i
Daniel Díaz (1):
weston: Add no-input-device patch to 1.11.0.
Ed Bartosh (1):
systemd-bootdisk.wks: use PARTUUID
Kai Kang (3):
openssh: fix CVE-2016-8858
qemu: fix CVE-2016-7909
qemu: update run-ptest script
Khem Raj (2):
libbsd: Fix build with musl
cmake.bbclass: Set CXXFLAGS and CFLAGS
Koen Kooi (1):
libbsd 0.8.3: BBCLASSEXTEND to native and nativesdk
Li Zhou (1):
db: disable the ARM assembler mutex code
Maciej Borzecki (3):
wic: make sure that partition size is always an integer in internal
processing
wic: check that filesystem is specified for a rootfs partition
wic: fix function comment typos
Robert Yang (1):
qemuarm64.conf: make runqemu's graphics work
Ross Burton (5):
Revert "libwnck3: remove the recipe"
Revert "epiphany: remove unnecessary libwnck3 dependency"
lib/oe/qa: handle binaries with segments outside the first 4kb
systemtap: remove explicit msgfmt check
systemtap: fix native linking on recent Ubuntu
T.O. Radzy Radzykewycz (1):
OpenSSL: CVE-2004-2761 replace MD5 hash algorithm
Yi Zhao (3):
openssl: Security fix CVE-2016-7055
nfs-utils: fix protocol minor version fall-back
tiff: Security fix CVE-2016-3632
Zhixiong Chi (1):
tiff: Security fix CVE-2016-3658
meta/classes/cmake.bbclass | 2 +
meta/classes/cve-check.bbclass | 2 +-
meta/conf/machine/qemuarm64.conf | 2 +-
meta/lib/oe/qa.py | 82 ++---
.../fix-protocol-minor-version-fall-back.patch | 55 ++++
.../nfs-utils/nfs-utils_1.3.3.bb | 1 +
.../openssh/openssh/fix-CVE-2016-8858.patch | 39 +++
meta/recipes-connectivity/openssh/openssh_7.3p1.bb | 1 +
.../openssl/openssl/CVE-2016-7055.patch | 43 +++
.../Use-SHA256-not-MD5-as-default-digest.patch | 69 ++++
.../openssl/openssl/openssl-c_rehash.sh | 2 +-
.../recipes-connectivity/openssl/openssl_1.0.2j.bb | 1 +
.../qemu/qemu/0004-fix-CVE-2016-7909.patch | 42 +++
meta/recipes-devtools/qemu/qemu/run-ptest | 8 +-
meta/recipes-devtools/qemu/qemu_2.7.0.bb | 1 +
...code-native_2016h.bb => tzcode-native_2016i.bb} | 8 +-
.../tzdata/{tzdata_2016h.bb => tzdata_2016i.bb} | 4 +-
meta/recipes-gnome/epiphany/epiphany_3.20.3.bb | 4 +-
meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb | 19 ++
...on-1.11-config-option-for-no-input-device.patch | 123 +++++++
meta/recipes-graphics/wayland/weston_1.11.0.bb | 1 +
.../systemtap/systemtap/fix-monitor-linking.patch | 41 +++
.../systemtap/systemtap/no-msgfmt-check.patch | 15 +
meta/recipes-kernel/systemtap/systemtap_git.inc | 2 +
.../libtiff/files/CVE-2016-3632.patch | 34 ++
.../libtiff/files/CVE-2016-3658.patch | 111 +++++++
meta/recipes-multimedia/libtiff/tiff_4.0.6.bb | 2 +
meta/recipes-support/db/db_6.0.35.bb | 9 -
...001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch | 363
+++++++++++++++++++++
.../libbsd/libbsd/0002-Remove-funopen.patch | 55 ++++
...3-Fix-build-breaks-due-to-missing-a.out.h.patch | 130 ++++++++
meta/recipes-support/libbsd/libbsd_0.8.3.bb | 7 +
scripts/lib/wic/canned-wks/systemd-bootdisk.wks | 2 +-
scripts/lib/wic/partition.py | 16 +-
scripts/lib/wic/plugins/source/bootimg-efi.py | 2 +-
scripts/lib/wic/plugins/source/rawcopy.py | 4 +-
scripts/lib/wic/utils/partitionedfs.py | 4 +-
37 files changed, 1234 insertions(+), 72 deletions(-)
create mode 100644
meta/recipes-connectivity/nfs-utils/nfs-utils/fix-protocol-minor-version-fall-back.patch
create mode 100644
meta/recipes-connectivity/openssh/openssh/fix-CVE-2016-8858.patch
create mode 100644
meta/recipes-connectivity/openssl/openssl/CVE-2016-7055.patch
create mode 100644
meta/recipes-connectivity/openssl/openssl/Use-SHA256-not-MD5-as-default-digest.patch
create mode 100644
meta/recipes-devtools/qemu/qemu/0004-fix-CVE-2016-7909.patch
rename meta/recipes-extended/tzcode/{tzcode-native_2016h.bb =>
tzcode-native_2016i.bb} (69%)
rename meta/recipes-extended/tzdata/{tzdata_2016h.bb =>
tzdata_2016i.bb} (98%)
create mode 100644 meta/recipes-gnome/libwnck/libwnck3_3.20.1.bb
create mode 100644
meta/recipes-graphics/wayland/weston/weston-1.11-config-option-for-no-input-device.patch
create mode 100644
meta/recipes-kernel/systemtap/systemtap/fix-monitor-linking.patch
create mode 100644
meta/recipes-kernel/systemtap/systemtap/no-msgfmt-check.patch
create mode 100644
meta/recipes-multimedia/libtiff/files/CVE-2016-3632.patch
create mode 100644
meta/recipes-multimedia/libtiff/files/CVE-2016-3658.patch
create mode 100644
meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
create mode 100644
meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch
create mode 100644
meta/recipes-support/libbsd/libbsd/0003-Fix-build-breaks-due-to-missing-a.out.h.patch
--
2.7.4
^ permalink raw reply
* [PATCH] perl-native: Remove usage of -fstack-protector=strong
From: Aníbal Limón @ 2016-12-01 16:34 UTC (permalink / raw)
To: openembedded-core
Some distributions (like opensuse421) supported by the project
comes with older gcc releases, -fstack-protector=strong is supported
by GCC>=4.9.
This causes a build failure when install perl-native from a sstate that
comes from a machine supporting -fstack-protector=strong [1].
So disable usage of this flag in perl-native builds, this patch could
be removed when all supported distros comes with GCC>=4.9.
[YOCTO #10338]
[1] http://errors.yoctoproject.org/Errors/Details/109589/
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/recipes-devtools/perl/perl-native_5.24.0.bb | 1 +
...emove-fstack-protector-strong-for-native-.patch | 103 +++++++++++++++++++++
2 files changed, 104 insertions(+)
create mode 100644 meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
diff --git a/meta/recipes-devtools/perl/perl-native_5.24.0.bb b/meta/recipes-devtools/perl/perl-native_5.24.0.bb
index af2ad7b..b1f0179 100644
--- a/meta/recipes-devtools/perl/perl-native_5.24.0.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.24.0.bb
@@ -11,6 +11,7 @@ SRC_URI += "\
file://debian/errno_ver.diff \
file://dynaloaderhack.patch \
file://perl-PathTools-don-t-filter-out-blib-from-INC.patch \
+ file://0001-Configure-Remove-fstack-protector-strong-for-native-.patch \
"
SRC_URI[md5sum] = "59456ae4bd4b06cb6e57cb19a3b2d349"
diff --git a/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch b/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
new file mode 100644
index 0000000..7391ac5
--- /dev/null
+++ b/meta/recipes-devtools/perl/perl/0001-Configure-Remove-fstack-protector-strong-for-native-.patch
@@ -0,0 +1,103 @@
+Some distributions (like opensuse421) supported by the project
+comes with older gcc releases, -fstack-protector=strong is supported
+by GCC>=4.9.
+
+This causes a build failure when install perl-native from a sstate that
+comes from a machine supporting -fstack-protector=strong [1].
+
+So disable usage of this flag in perl-native builds, this patch could
+be removed when all supported distros comes with GCC>=4.9.
+
+[YOCTO #10338]
+
+Upstream-status: Inappropriate [configuration]
+
+[1] http://errors.yoctoproject.org/Errors/Details/109589/
+
+Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
+---
+ Configure | 54 ------------------------------------------------------
+ 1 file changed, 54 deletions(-)
+
+diff --git a/Configure b/Configure
+index efbdcfd..d5bd98c 100755
+--- a/Configure
++++ b/Configure
+@@ -5468,30 +5468,6 @@ default|recommended)
+ eval $checkccflag
+ ;;
+ esac
+-
+- # on x86_64 (at least) we require an extra library (libssp) in the
+- # link command line. This library is not named, so I infer that it is
+- # an implementation detail that may change. Hence the safest approach
+- # is to add the flag to the flags passed to the compiler at link time,
+- # as that way the compiler can do the right implementation dependant
+- # thing. (NWC)
+- case "$osname" in
+- amigaos) ;; # -fstack-protector builds but doesn't work
+- *) case "$gccversion" in
+- ?*) set stack-protector-strong -fstack-protector-strong
+- eval $checkccflag
+- case "$dflt" in
+- *-fstack-protector-strong*) ;; # It got added.
+- *) # Try the plain/older -fstack-protector.
+- set stack-protector -fstack-protector
+- eval $checkccflag
+- ;;
+- esac
+- ;;
+- esac
+- ;;
+- esac
+- ;;
+ esac
+
+ case "$mips_type" in
+@@ -5634,21 +5610,6 @@ case "$ldflags" in
+ ;;
+ *) dflt="$ldflags";;
+ esac
+-# See note above about -fstack-protector
+-case "$ccflags" in
+-*-fstack-protector-strong*)
+- case "$dflt" in
+- *-fstack-protector-strong*) ;; # Don't add it again
+- *) dflt="$dflt -fstack-protector-strong" ;;
+- esac
+- ;;
+-*-fstack-protector*)
+- case "$dflt" in
+- *-fstack-protector*) ;; # Don't add it again
+- *) dflt="$dflt -fstack-protector" ;;
+- esac
+- ;;
+-esac
+
+ : Try to guess additional flags to pick up local libraries.
+ for thislibdir in $libpth; do
+@@ -8571,21 +8532,6 @@ EOM
+ ''|' ') dflt='none' ;;
+ esac
+
+- case "$ldflags" in
+- *-fstack-protector-strong*)
+- case "$dflt" in
+- *-fstack-protector-strong*) ;; # Don't add it again
+- *) dflt="$dflt -fstack-protector-strong" ;;
+- esac
+- ;;
+- *-fstack-protector*)
+- case "$dflt" in
+- *-fstack-protector*) ;; # Don't add it again
+- *) dflt="$dflt -fstack-protector" ;;
+- esac
+- ;;
+- esac
+-
+ rp="Any special flags to pass to $ld to create a dynamically loaded library?"
+ . ./myread
+ case "$ans" in
+--
+2.1.4
+
--
2.1.4
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox