Message ID | 20220606120126.3381438-17-alex@linutronix.de |
---|---|
State | Accepted, archived |
Commit | f231bc2c28226776f0990ec65aa5f95e89021218 |
Headers | show |
Series | [01/21] sato: work around missing icons in adwaita 42.0 | expand |
This seems to be causing: http://errors.yoctoproject.org/Errors/Details/657959/ when ld-is-gold is used. Added in upstream commit: commit 3fce2064b54843218d085aae326c8f7ecf3a8c41 Author: Martin Doucha <mdoucha@suse.cz> Date: Thu Apr 21 14:33:50 2022 +0200 KVM test infrastructure https://github.com/linux-test-project/ltp/commit/3fce2064b54843218d085aae326c8f7ecf3a8c41#diff-39268f0855c634ca48c8993fcd2c95b12a65b79e8d9fa5ccd6b0f5a8785c0dd6R36 On Mon, Jun 6, 2022 at 2:02 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > Disable stack protection as newly added kvm tests won't build with it. > > Signed-off-by: Alexander Kanavin <alex@linutronix.de> > --- > meta/conf/distro/include/security_flags.inc | 1 + > ...sh-sort-filelist-for-reproducibility.patch | 28 ------------------- > .../ltp/{ltp_20220121.bb => ltp_20220527.bb} | 3 +- > 3 files changed, 2 insertions(+), 30 deletions(-) > delete mode 100644 > meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch > rename meta/recipes-extended/ltp/{ltp_20220121.bb => ltp_20220527.bb} > (97%) > > diff --git a/meta/conf/distro/include/security_flags.inc > b/meta/conf/distro/include/security_flags.inc > index 8374cb8544..2972f05b4e 100644 > --- a/meta/conf/distro/include/security_flags.inc > +++ b/meta/conf/distro/include/security_flags.inc > @@ -61,6 +61,7 @@ TARGET_LDFLAGS:append:class-cross-canadian = " > ${SECURITY_LDFLAGS}" > SECURITY_STACK_PROTECTOR:pn-gcc-runtime = "" > SECURITY_STACK_PROTECTOR:pn-glibc = "" > SECURITY_STACK_PROTECTOR:pn-glibc-testsuite = "" > +SECURITY_STACK_PROTECTOR:pn-ltp = "" > # All xorg module drivers need to be linked this way as well and are > # handled in recipes-graphics/xorg-driver/xorg-driver-common.inc > SECURITY_LDFLAGS:pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" > diff --git > a/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch > b/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch > deleted file mode 100644 > index e8d9f212a9..0000000000 > --- > a/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch > +++ /dev/null > @@ -1,28 +0,0 @@ > -From 4aad23f208cc7725cd61bbe5aaadb9994c794cd0 Mon Sep 17 00:00:00 2001 > -From: Alexander Kanavin <alex@linutronix.de> > -Date: Wed, 26 Jan 2022 20:58:46 +0100 > -Subject: [PATCH] metadata/parse.sh: sort filelist for reproducibility > - > -find does not guarantee the order of the files. > - > -Upstream-Status: Submitted [ > https://github.com/linux-test-project/ltp/pull/907] > -Signed-off-by: Alexander Kanavin <alex@linutronix.de> > ---- > - metadata/parse.sh | 2 +- > - > -diff --git a/metadata/parse.sh b/metadata/parse.sh > -index b43d024c68..1811665bfe 100755 > ---- a/metadata/parse.sh > -+++ b/metadata/parse.sh > -@@ -29,7 +29,7 @@ echo ' "tests": {' > - > - first=1 > - > --for test in `find testcases/ -name '*.c'`; do > -+for test in `find testcases/ -name '*.c'|sort`; do > - a=$($top_builddir/metadata/metaparse -Iinclude > -Itestcases/kernel/syscalls/utils/ "$test") > - if [ -n "$a" ]; then > - if [ -z "$first" ]; then > --- > -2.20.1 > - > diff --git a/meta/recipes-extended/ltp/ltp_20220121.bb > b/meta/recipes-extended/ltp/ltp_20220527.bb > similarity index 97% > rename from meta/recipes-extended/ltp/ltp_20220121.bb > rename to meta/recipes-extended/ltp/ltp_20220527.bb > index 8a13dcf9d0..b136c83860 100644 > --- a/meta/recipes-extended/ltp/ltp_20220121.bb > +++ b/meta/recipes-extended/ltp/ltp_20220527.bb > @@ -22,11 +22,10 @@ CFLAGS:append:x86-64 = " -fomit-frame-pointer" > > CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" > CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" > -SRCREV = "b0561ad8d9ee9fe1244b5385e941eb65a21e91a1" > +SRCREV = "6f88e0f6f1d6eb12c48c902f50f47ecbd3b0f18a" > > SRC_URI = "git:// > github.com/linux-test-project/ltp.git;branch=master;protocol=https \ > file://0001-Remove-OOM-tests-from-runtest-mm.patch \ > - > file://0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch \ > file://disable_hanging_tests.patch \ > " > > -- > 2.30.2 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#166610): > https://lists.openembedded.org/g/openembedded-core/message/166610 > Mute This Topic: https://lists.openembedded.org/mt/91575165/3617156 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > Martin.Jansa@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 8374cb8544..2972f05b4e 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -61,6 +61,7 @@ TARGET_LDFLAGS:append:class-cross-canadian = " ${SECURITY_LDFLAGS}" SECURITY_STACK_PROTECTOR:pn-gcc-runtime = "" SECURITY_STACK_PROTECTOR:pn-glibc = "" SECURITY_STACK_PROTECTOR:pn-glibc-testsuite = "" +SECURITY_STACK_PROTECTOR:pn-ltp = "" # All xorg module drivers need to be linked this way as well and are # handled in recipes-graphics/xorg-driver/xorg-driver-common.inc SECURITY_LDFLAGS:pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" diff --git a/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch b/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch deleted file mode 100644 index e8d9f212a9..0000000000 --- a/meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4aad23f208cc7725cd61bbe5aaadb9994c794cd0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Wed, 26 Jan 2022 20:58:46 +0100 -Subject: [PATCH] metadata/parse.sh: sort filelist for reproducibility - -find does not guarantee the order of the files. - -Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/907] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - metadata/parse.sh | 2 +- - -diff --git a/metadata/parse.sh b/metadata/parse.sh -index b43d024c68..1811665bfe 100755 ---- a/metadata/parse.sh -+++ b/metadata/parse.sh -@@ -29,7 +29,7 @@ echo ' "tests": {' - - first=1 - --for test in `find testcases/ -name '*.c'`; do -+for test in `find testcases/ -name '*.c'|sort`; do - a=$($top_builddir/metadata/metaparse -Iinclude -Itestcases/kernel/syscalls/utils/ "$test") - if [ -n "$a" ]; then - if [ -z "$first" ]; then --- -2.20.1 - diff --git a/meta/recipes-extended/ltp/ltp_20220121.bb b/meta/recipes-extended/ltp/ltp_20220527.bb similarity index 97% rename from meta/recipes-extended/ltp/ltp_20220121.bb rename to meta/recipes-extended/ltp/ltp_20220527.bb index 8a13dcf9d0..b136c83860 100644 --- a/meta/recipes-extended/ltp/ltp_20220121.bb +++ b/meta/recipes-extended/ltp/ltp_20220527.bb @@ -22,11 +22,10 @@ CFLAGS:append:x86-64 = " -fomit-frame-pointer" CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" -SRCREV = "b0561ad8d9ee9fe1244b5385e941eb65a21e91a1" +SRCREV = "6f88e0f6f1d6eb12c48c902f50f47ecbd3b0f18a" SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \ file://0001-Remove-OOM-tests-from-runtest-mm.patch \ - file://0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch \ file://disable_hanging_tests.patch \ "
Disable stack protection as newly added kvm tests won't build with it. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/conf/distro/include/security_flags.inc | 1 + ...sh-sort-filelist-for-reproducibility.patch | 28 ------------------- .../ltp/{ltp_20220121.bb => ltp_20220527.bb} | 3 +- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-metadata-parse.sh-sort-filelist-for-reproducibility.patch rename meta/recipes-extended/ltp/{ltp_20220121.bb => ltp_20220527.bb} (97%)