Re: [OE-core] [PATCH v2] bitbake.conf: add coreutils to the HOSTTOOLS list
On Thu, 13 Dec 2018 at 11:58, Burton, Ross wrote: > > Did you test this? Yes, but _not_ I was in the wrong build. I'm sorry. =/ Cheers, Anders > HOSTTOOLS is a list of commands, not packages. > > Ross > On Thu, 13 Dec 2018 at 10:50, Anders Roxell wrote: > > > > In newer kernels fold gets used, see output from a build: > > > > .../kernel-source/scripts/atomic/atomic-tbl.sh: > >line 183: fold: command not found > > > > Rework so that coreutils is in the HOSTTOOLS list. > > > > Signed-off-by: Anders Roxell > > --- > > meta/conf/bitbake.conf | 16 > > 1 file changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf > > index 64800623545e..a825be4628b0 100644 > > --- a/meta/conf/bitbake.conf > > +++ b/meta/conf/bitbake.conf > > @@ -478,14 +478,14 @@ HOSTTOOLS_DIR = "${TMPDIR}/hosttools" > > # Tools needed to run builds with OE-Core > > # python is special cased to point at python2 > > HOSTTOOLS += " \ > > -[ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm > > cp cpio \ > > -cpp cut date dd diff diffstat dirname du echo egrep env expand expr > > false \ > > -fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip > > \ > > -head hostname id install ld ldd ln ls make makeinfo md5sum mkdir mknod > > \ > > -mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd > > python2 \ > > -python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed sh > > sha256sum \ > > -sleep sort split stat strings strip tail tar tee test touch tr true > > uname \ > > -uniq wc wget which xargs \ > > +[ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm > > +coreutils cp cpio cpp cut date dd diff diffstat dirname du echo egrep > > env > > +expand expr false fgrep file find flock g++ gawk gcc getconf getopt git > > +grep gunzip gzip head hostname id install ld ldd ln ls make makeinfo > > md5sum > > +mkdir mknod mktemp mv nm objcopy objdump od patch perl pod2man pr > > printf > > +pwd python2 python2.7 python3 ranlib readelf readlink rm rmdir rpcgen > > sed > > +sh sha256sum sleep sort split stat strings strip tail tar tee test > > touch tr > > +true uname uniq wc wget which xargs \ > > " > > > > # Tools needed to run testimage runtime image testing > > -- > > 2.19.2 > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] bitbake.conf: add coreutils to the HOSTTOOLS list
In newer kernels fold gets used, see output from a build: .../kernel-source/scripts/atomic/atomic-tbl.sh: line 183: fold: command not found Rework so that coreutils is in the HOSTTOOLS list. Signed-off-by: Anders Roxell --- meta/conf/bitbake.conf | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 64800623545e..a825be4628b0 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -478,14 +478,14 @@ HOSTTOOLS_DIR = "${TMPDIR}/hosttools" # Tools needed to run builds with OE-Core # python is special cased to point at python2 HOSTTOOLS += " \ -[ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ -cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ -fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ -head hostname id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ -mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python2 \ -python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed sh sha256sum \ -sleep sort split stat strings strip tail tar tee test touch tr true uname \ -uniq wc wget which xargs \ +[ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm +coreutils cp cpio cpp cut date dd diff diffstat dirname du echo egrep env +expand expr false fgrep file find flock g++ gawk gcc getconf getopt git +grep gunzip gzip head hostname id install ld ldd ln ls make makeinfo md5sum +mkdir mknod mktemp mv nm objcopy objdump od patch perl pod2man pr printf +pwd python2 python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed +sh sha256sum sleep sort split stat strings strip tail tar tee test touch tr +true uname uniq wc wget which xargs \ " # Tools needed to run testimage runtime image testing -- 2.19.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bitbake.conf: add coreutils to the HOSTTOOLS list
In newer kernels fold gets used, see output from a build: .../kernel-source/scripts/atomic/atomic-tbl.sh: line 183: fold: command not found Rework so that coreutils-native is in the DEPENDS list. Signed-off-by: Anders Roxell --- meta/conf/bitbake.conf | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 64800623545e..a825be4628b0 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -478,14 +478,14 @@ HOSTTOOLS_DIR = "${TMPDIR}/hosttools" # Tools needed to run builds with OE-Core # python is special cased to point at python2 HOSTTOOLS += " \ -[ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm cp cpio \ -cpp cut date dd diff diffstat dirname du echo egrep env expand expr false \ -fgrep file find flock g++ gawk gcc getconf getopt git grep gunzip gzip \ -head hostname id install ld ldd ln ls make makeinfo md5sum mkdir mknod \ -mktemp mv nm objcopy objdump od patch perl pod2man pr printf pwd python2 \ -python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed sh sha256sum \ -sleep sort split stat strings strip tail tar tee test touch tr true uname \ -uniq wc wget which xargs \ +[ ar as awk basename bash bzip2 cat chgrp chmod chown chrpath cmp comm +coreutils cp cpio cpp cut date dd diff diffstat dirname du echo egrep env +expand expr false fgrep file find flock g++ gawk gcc getconf getopt git +grep gunzip gzip head hostname id install ld ldd ln ls make makeinfo md5sum +mkdir mknod mktemp mv nm objcopy objdump od patch perl pod2man pr printf +pwd python2 python2.7 python3 ranlib readelf readlink rm rmdir rpcgen sed +sh sha256sum sleep sort split stat strings strip tail tar tee test touch tr +true uname uniq wc wget which xargs \ " # Tools needed to run testimage runtime image testing -- 2.19.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] kernel.bbclass: add coreutils-native to the DEPENDS list
On Tue, 4 Dec 2018 at 15:24, Burton, Ross wrote: > > Can't we just add this to HOSTTOOLS instead? That makes sense, I'll send out a patch shortly. Cheers, Anders > On Tue, 4 Dec 2018 at 13:43, Anders Roxell wrote: > > > > In newer kernels fold gets used, see output from a build: > > > > .../kernel-source/scripts/atomic/atomic-tbl.sh: > >line 183: fold: command not found > > > > Rework so that coreutils-native is in the DEPENDS list. > > > > Signed-off-by: Anders Roxell > > --- > > meta/classes/kernel.bbclass | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass > > index 880c5ef17283..8d83ca4843e3 100644 > > --- a/meta/classes/kernel.bbclass > > +++ b/meta/classes/kernel.bbclass > > @@ -4,7 +4,7 @@ KERNEL_PACKAGE_NAME ??= "kernel" > > KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == > > "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }" > > > > PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == > > "kernel") else "" }" > > -DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc > > kmod-native bc-native lzop-native bison-native" > > +DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc > > kmod-native bc-native lzop-native bison-native coreutils-native" > > PACKAGE_WRITE_DEPS += "depmodwrapper-cross" > > > > do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot" > > -- > > 2.19.2 > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel.bbclass: add coreutils-native to the DEPENDS list
In newer kernels fold gets used, see output from a build: .../kernel-source/scripts/atomic/atomic-tbl.sh: line 183: fold: command not found Rework so that coreutils-native is in the DEPENDS list. Signed-off-by: Anders Roxell --- meta/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 880c5ef17283..8d83ca4843e3 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -4,7 +4,7 @@ KERNEL_PACKAGE_NAME ??= "kernel" KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }" PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }" -DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native bison-native" +DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native bison-native coreutils-native" PACKAGE_WRITE_DEPS += "depmodwrapper-cross" do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot" -- 2.19.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Add aarch64 SDK machine
Signed-off-by: Anders Roxell --- meta/conf/machine-sdk/aarch64.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 meta/conf/machine-sdk/aarch64.conf diff --git a/meta/conf/machine-sdk/aarch64.conf b/meta/conf/machine-sdk/aarch64.conf new file mode 100644 index 00..98d8380ecb --- /dev/null +++ b/meta/conf/machine-sdk/aarch64.conf @@ -0,0 +1,2 @@ +SDK_ARCH = "aarch64" +ABIEXTENSION_class-nativesdk = "" -- 2.18.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] iproute2: upgrade to release 4.17
Signed-off-by: Anders Roxell --- meta/recipes-connectivity/iproute2/iproute2.inc | 2 +- .../iproute2/{iproute2_4.16.0.bb => iproute2_4.17.0.bb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-connectivity/iproute2/{iproute2_4.16.0.bb => iproute2_4.17.0.bb} (72%) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index 4fbfec6f08a9..b283589063f9 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -9,7 +9,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817" -DEPENDS = "flex-native bison-native iptables elfutils" +DEPENDS = "flex-native bison-native iptables elfutils libcap" inherit update-alternatives bash-completion pkgconfig diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.16.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.17.0.bb similarity index 72% rename from meta/recipes-connectivity/iproute2/iproute2_4.16.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_4.17.0.bb index 4b0e893744b1..12812b036bb1 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_4.16.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_4.17.0.bb @@ -6,8 +6,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-ip-Remove-unneed-header.patch \ " -SRC_URI[md5sum] = "1f12a70d767ef77ffa2d1a0c4ce48f1a" -SRC_URI[sha256sum] = "0c5c24020fd7349fe25728c5edee9fb6a1bc8a38f08e23be5c57a6301e55ee0a" +SRC_URI[md5sum] = "6f3a87fe2d97c28214fc2faab2c257d6" +SRC_URI[sha256sum] = "6fa991b092315887775b9e47dc6a89af7ae09dd3ad4ccff754d055c566b4be6e" # CFLAGS are computed in Makefile and reference CCOPTS # -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] ltp: fix fanotify06 test
Signed-off-by: Anders Roxell <anders.rox...@linaro.org> --- ...-make-is_fuse-return-zero-if-fs_type-is-N.patch | 40 ++ meta/recipes-extended/ltp/ltp_20180118.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch diff --git a/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch b/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch new file mode 100644 index 00..5096a85c1e --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch @@ -0,0 +1,40 @@ +From 67af7dbe8bdf29f9ed980d8d29feeae32a0a7a1d Mon Sep 17 00:00:00 2001 +From: Li Wang <liw...@redhat.com> +Date: Tue, 23 Jan 2018 17:46:35 +0800 +Subject: [PATCH] safe_macros: make is_fuse() return zero if fs_type is NULL + +This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs) +involves FUSE fs check in safe_mount(), but we'd better guarantee the "fs_type" +is legal to check in is_fuse() function otherwise system will kill the program. + + cmdline="fanotify06" + contacts="" + analysis=exit + <<>> + tst_test.c:980: INFO: Timeout per run is 0h 10m 00s + tst_test.c:1025: BROK: Test killed by SIGSEGV! + +Signed-off-by: Li Wang <liw...@redhat.com> +Acked-by: Jan Stancek <jstan...@redhat.com> +Upstream-Status: Accepted [https://github.com/linux-test-project/ltp/commit/67af7dbe8bdf29f9ed980d8d29feeae32a0a7a1d] +--- + lib/safe_macros.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/safe_macros.c b/lib/safe_macros.c +index c48e436dc..abdeca013 100644 +--- a/lib/safe_macros.c b/lib/safe_macros.c +@@ -708,6 +708,9 @@ static int is_fuse(const char *fs_type) + { + unsigned int i; + ++ if (!fs_type) ++ return 0; ++ + for (i = 0; i < ARRAY_SIZE(fuse_fs_types); i++) { + if (!strcmp(fuse_fs_types[i], fs_type)) + return 1; +-- +2.11.0 + diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb b/meta/recipes-extended/ltp/ltp_20180118.bb index 369b98df9b..b7cac8592a 100644 --- a/meta/recipes-extended/ltp/ltp_20180118.bb +++ b/meta/recipes-extended/ltp/ltp_20180118.bb @@ -43,6 +43,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0035-fix-test_proc_kill-hang.patch \ file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ + file://0040-safe_macros-make-is_fuse-return-zero-if-fs_type-is-N.patch \ " S = "${WORKDIR}/git" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] ltp: fix fanotify06 test
please ignore this patch. Cheers, Anders On 12 February 2018 at 23:38, Anders Roxell <anders.rox...@linaro.org> wrote: > This patch fixes the fanotify06 test. > > http://lists.linux.it/pipermail/ltp/2018-January/006915.html > > Signed-off-by: Anders Roxell <anders.rox...@linaro.org> > --- > ...anotify-the-mount-fs_type-should-be-given.patch | 38 > ++ > meta/recipes-extended/ltp/ltp_20180118.bb | 1 + > 2 files changed, 39 insertions(+) > create mode 100644 > meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch > > diff --git > a/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch > > b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch > new file mode 100644 > index 00..e57b6cd91e > --- /dev/null > +++ > b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch > @@ -0,0 +1,38 @@ > +From c1b440c04d86adf77308fcd173d41dbfc6e66299 Mon Sep 17 00:00:00 2001 > +From: Li Wang <liw...@redhat.com> > +Date: Tue, 23 Jan 2018 16:23:14 +0800 > +Subject: [PATCH 40/40] fanotify: the mount fs_type should be given > + > +This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs) > +involves FUSE fs check in safe_mount(), so we should give the "fs_type" when > +calling that in case the system kill our program. > + > + cmdline="fanotify06" > + contacts="" > + analysis=exit > + <<>> > + tst_test.c:980: INFO: Timeout per run is 0h 10m 00s > + tst_test.c:1025: BROK: Test killed by SIGSEGV! > + > +Signed-off-by: Li Wang <liw...@redhat.com> > +Upstream-Status: Submitted > [http://lists.linux.it/pipermail/ltp/2018-January/006915.html] > +--- > + testcases/kernel/syscalls/fanotify/fanotify06.c | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c > b/testcases/kernel/syscalls/fanotify/fanotify06.c > +index e63e457a1..8cbe1adc6 100644 > +--- a/testcases/kernel/syscalls/fanotify/fanotify06.c > b/testcases/kernel/syscalls/fanotify/fanotify06.c > +@@ -221,7 +221,7 @@ void test01(void) > + static void setup(void) > + { > + SAFE_MKDIR(MOUNT_NAME, 0755); > +- SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL); > ++ SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, "none", MS_BIND, NULL); > + mount_created = 1; > + SAFE_CHDIR(MOUNT_NAME); > + > +-- > +2.11.0 > + > diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb > b/meta/recipes-extended/ltp/ltp_20180118.bb > index 369b98df9b..88f3bb4879 100644 > --- a/meta/recipes-extended/ltp/ltp_20180118.bb > +++ b/meta/recipes-extended/ltp/ltp_20180118.bb > @@ -43,6 +43,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ > file://0035-fix-test_proc_kill-hang.patch \ > > file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ > > file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ > + file://0040-fanotify-the-mount-fs_type-should-be-given.patch \ > " > > S = "${WORKDIR}/git" > -- > 2.11.0 > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] ltp: fix fanotify06 test
This patch fixes the fanotify06 test. http://lists.linux.it/pipermail/ltp/2018-January/006915.html Signed-off-by: Anders Roxell <anders.rox...@linaro.org> --- ...anotify-the-mount-fs_type-should-be-given.patch | 38 ++ meta/recipes-extended/ltp/ltp_20180118.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch diff --git a/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch new file mode 100644 index 00..e57b6cd91e --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch @@ -0,0 +1,38 @@ +From c1b440c04d86adf77308fcd173d41dbfc6e66299 Mon Sep 17 00:00:00 2001 +From: Li Wang <liw...@redhat.com> +Date: Tue, 23 Jan 2018 16:23:14 +0800 +Subject: [PATCH 40/40] fanotify: the mount fs_type should be given + +This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs) +involves FUSE fs check in safe_mount(), so we should give the "fs_type" when +calling that in case the system kill our program. + + cmdline="fanotify06" + contacts="" + analysis=exit + <<>> + tst_test.c:980: INFO: Timeout per run is 0h 10m 00s + tst_test.c:1025: BROK: Test killed by SIGSEGV! + +Signed-off-by: Li Wang <liw...@redhat.com> +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2018-January/006915.html] +--- + testcases/kernel/syscalls/fanotify/fanotify06.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c +index e63e457a1..8cbe1adc6 100644 +--- a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c +@@ -221,7 +221,7 @@ void test01(void) + static void setup(void) + { + SAFE_MKDIR(MOUNT_NAME, 0755); +- SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL); ++ SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, "none", MS_BIND, NULL); + mount_created = 1; + SAFE_CHDIR(MOUNT_NAME); + +-- +2.11.0 + diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb b/meta/recipes-extended/ltp/ltp_20180118.bb index 369b98df9b..88f3bb4879 100644 --- a/meta/recipes-extended/ltp/ltp_20180118.bb +++ b/meta/recipes-extended/ltp/ltp_20180118.bb @@ -43,6 +43,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0035-fix-test_proc_kill-hang.patch \ file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ + file://0040-fanotify-the-mount-fs_type-should-be-given.patch \ " S = "${WORKDIR}/git" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ltp: fix fanotify06 test
This patch fixes the fanotify06 test. http://lists.linux.it/pipermail/ltp/2018-January/006915.html Signed-off-by: Anders Roxell <anders.rox...@linaro.org> --- ...anotify-the-mount-fs_type-should-be-given.patch | 38 ++ meta/recipes-extended/ltp/ltp_20180118.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch diff --git a/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch new file mode 100644 index 00..6b4dc30712 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch @@ -0,0 +1,38 @@ +From c1b440c04d86adf77308fcd173d41dbfc6e66299 Mon Sep 17 00:00:00 2001 +From: Li Wang <liw...@redhat.com> +Date: Tue, 23 Jan 2018 16:23:14 +0800 +Subject: [PATCH 40/40] fanotify: the mount fs_type should be given + +This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs) +involves FUSE fs check in safe_mount(), so we should give the "fs_type" when +calling that in case the system kill our program. + + cmdline="fanotify06" + contacts="" + analysis=exit + <<>> + tst_test.c:980: INFO: Timeout per run is 0h 10m 00s + tst_test.c:1025: BROK: Test killed by SIGSEGV! + +Signed-off-by: Li Wang <liw...@redhat.com> +Upstream-Status: Submitted +--- + testcases/kernel/syscalls/fanotify/fanotify06.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c +index e63e457a1..8cbe1adc6 100644 +--- a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c +@@ -221,7 +221,7 @@ void test01(void) + static void setup(void) + { + SAFE_MKDIR(MOUNT_NAME, 0755); +- SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL); ++ SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, "none", MS_BIND, NULL); + mount_created = 1; + SAFE_CHDIR(MOUNT_NAME); + +-- +2.11.0 + diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb b/meta/recipes-extended/ltp/ltp_20180118.bb index a0dd9aa19b..4c6be16e30 100644 --- a/meta/recipes-extended/ltp/ltp_20180118.bb +++ b/meta/recipes-extended/ltp/ltp_20180118.bb @@ -44,6 +44,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0035-fix-test_proc_kill-hang.patch \ file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \ + file://0040-fanotify-the-mount-fs_type-should-be-given.patch \ " S = "${WORKDIR}/git" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ltp: fix knob to control numa support
Reported-by: Yi Zhao <yi.z...@windriver.com> Signed-off-by: Anders Roxell <anders.rox...@linaro.org> --- ...ix-default-value-of-without-numa-switch-i.patch | 31 ++ ...onfigure-add-knob-to-control-numa-support.patch | 50 ++ ...-control-whether-numa-support-should-be-c.patch | 45 --- meta/recipes-extended/ltp/ltp_20180118.bb | 3 +- 4 files changed, 83 insertions(+), 46 deletions(-) create mode 100644 meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch create mode 100644 meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch b/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch new file mode 100644 index 000..da62687 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-configure-Fix-default-value-of-without-numa-switch-i.patch @@ -0,0 +1,31 @@ +From 4ace68a6ba501907a0741dba5f5f155e06a74c35 Mon Sep 17 00:00:00 2001 +From: Petr Vorel <pvo...@suse.cz> +Date: Wed, 7 Feb 2018 11:09:49 +0100 +Subject: [PATCH] configure: Fix default value of --without-numa switch in help + +The default value is no. + +Fixes: 39a85a1f1 ("configure: add knob to control numa support") + +Signed-off-by: Petr Vorel <pvo...@suse.cz> +Upstream-Status: Accepted +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b39a31d..d66ea00 100644 +--- a/configure.ac b/configure.ac +@@ -86,7 +86,7 @@ fi + # Numa + AC_ARG_WITH([numa], + AC_HELP_STRING([--without-numa], +-[without numa support (default=yes)]), ++[without numa support (default=no)]), + [with_numa=no], + [with_numa=yes] + ) +-- +2.7.4 + diff --git a/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch b/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch new file mode 100644 index 000..8aaa287 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-configure-add-knob-to-control-numa-support.patch @@ -0,0 +1,50 @@ +From 39a85a1f1e6624f554215ba4b6843d3689a8415e Mon Sep 17 00:00:00 2001 +From: Anders Roxell <anders.rox...@linaro.org> +Date: Mon, 5 Feb 2018 11:56:04 +0100 +Subject: [PATCH] configure: add knob to control numa support + +Allow to disable numa from the top level. + +Based on patch: +http://cgit.openembedded.org/openembedded-core/commit/meta/recipes-extended/ltp?id=4c7873552e13dfdba96afca7562c398d2966ca71 + +Reported-by: Roy Li <rongqing...@windriver.com> +Signed-off-by: Anders Roxell <anders.rox...@linaro.org> +Signed-off-by: Petr Vorel <pvo...@suse.cz> +Upstream-Status: Accepted +--- + configure.ac | 10 ++ + 1 file changed, 10 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 5c8d4ea..b39a31d 100644 +--- a/configure.ac b/configure.ac +@@ -83,6 +83,14 @@ else + AC_SUBST([WITH_EXPECT],["no"]) + fi + ++# Numa ++AC_ARG_WITH([numa], ++ AC_HELP_STRING([--without-numa], ++[without numa support (default=yes)]), ++ [with_numa=no], ++ [with_numa=yes] ++) ++ + # Perl + AC_ARG_WITH([perl], + [AC_HELP_STRING([--with-perl], +@@ -157,7 +165,9 @@ LTP_CHECK_SELINUX + LTP_CHECK_SIGNAL + LTP_CHECK_SYSCALL_EVENTFD + LTP_CHECK_SYSCALL_MODIFY_LDT ++if test "x$with_numa" = xyes; then + LTP_CHECK_SYSCALL_NUMA ++fi + LTP_CHECK_SYSCALL_QUOTACTL + LTP_CHECK_SYSCALL_SIGNALFD + LTP_CHECK_SYSCALL_UNSHARE +-- +2.7.4 + diff --git a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch b/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch deleted file mode 100644 index 31460b9..000 --- a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 867ad5d5d64b9b27ee32148027532db0a00f6433 Mon Sep 17 00:00:00 2001 -From: "Roy.Li" <rongqing...@windriver.com> -Date: Thu, 7 Jan 2016 17:33:26 + -Subject: [PATCH 02/32] Add knob to control whether numa support should be - checked - -otherwise undeterministic dependency will be generated -during build depending upong numa being staged or not - -Signed-off-by: Roy.Li <rongqing...@windriver.com> -Signed-off-by: Khem Raj <raj.k...@gmail.com> -Signed-off-by: Anders Roxell <anders.rox...@linaro.org> -Upstream-Status: Pending - m4/ltp-numa.m4 | 10 +- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4 -index fc3383e..44cb559 100644 a/m4/ltp-numa.m4 -+++ b/m4/ltp-numa.m4 -@@ -24,7 +24,13 @@ dnl LTP_CHECK_SYSCALL_NUMA - dnl ---
[OE-core] [PATCH] ltp: remove patches that already have fixes upstream
The following patches has already fixes for the issues they are solving in upstream. - 0001-add-_GNU_SOURCE-to-pec_listener.c.patch - 0011-Rename-sigset-variable-to-sigset1.patch - 0025-mc_gethost-include-sys-types.h.patch - 0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch - 0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch Suggested-by: Yi Zhao <yi.z...@windriver.com> Signed-off-by: Anders Roxell <anders.rox...@linaro.org> --- .../0001-add-_GNU_SOURCE-to-pec_listener.c.patch | 39 -- .../0011-Rename-sigset-variable-to-sigset1.patch | 139 - .../ltp/0025-mc_gethost-include-sys-types.h.patch | 30 - ...sconf01-Use-_SC_2_C_VERSION-conditionally.patch | 32 - ...1-Cover-GNU-specific-code-under-__USE_GNU.patch | 41 -- meta/recipes-extended/ltp/ltp_20180118.bb | 5 - 6 files changed, 286 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0025-mc_gethost-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/0033-shmat1-Cover-GNU-specific-code-under-__USE_GNU.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch b/meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch deleted file mode 100644 index 7ec66f8..000 --- a/meta/recipes-extended/ltp/ltp/0001-add-_GNU_SOURCE-to-pec_listener.c.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ae10245c15a617bd57337981bb42eb36629f9b59 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke...@windriver.com> -Date: Wed, 8 Feb 2017 15:53:31 +0800 -Subject: [PATCH 01/26] add _GNU_SOURCE to pec_listener.c - -In previous patch 0007-replace-SIGCLD-with-SIGCHLD.patch made by Khem Raj -contains two aspects: - - 1. replace SIGCLD with SIGCHLD - 2. add _GNU_SOURCE to pec_listener.c - -The replace SIGCLD with SIGCHLD have been integrated upstream, so make a -another patch to add _GNU_SOURCE to pec_listener.c comply with Khem Raj's -previous patch. - -Signed-off-by: Khem Raj <raj.k...@gmail.com> -Signed-off-by: Dengke Du <dengke...@windriver.com> -Upstream-Status: Pending - -%% original patch: 0001-add-_GNU_SOURCE-to-pec_listener.c.patch - testcases/kernel/connectors/pec/pec_listener.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testcases/kernel/connectors/pec/pec_listener.c b/testcases/kernel/connectors/pec/pec_listener.c -index d11e4dc..b8b5e0d 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 - #include - #include --- -2.8.1 - 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 deleted file mode 100644 index 25f6ba7..000 --- a/meta/recipes-extended/ltp/ltp/0011-Rename-sigset-variable-to-sigset1.patch +++ /dev/null @@ -1,139 +0,0 @@ -From dc1905b6d972f9176b40da270c83d8fb4d1751b5 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke...@windriver.com> -Date: Wed, 8 Feb 2017 16:12:34 +0800 -Subject: [PATCH 2/5] Rename sigset variable to sigset1 - -sigset API from signal.h is shadowed by this name conflict - -Signed-off-by: Khem Raj <raj.k...@gmail.com> -Signed-off-by: Dengke Du <dengke...@windriver.com> - -Upstream-Status: Pending - testcases/kernel/mem/shmt/shmt04.c| 10 +- - testcases/kernel/mem/shmt/shmt06.c| 10 +- - testcases/kernel/syscalls/sigprocmask/sigprocmask01.c | 10 +- - 3 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/testcases/kernel/mem/shmt/shmt04.c b/testcases/kernel/mem/shmt/shmt04.c -index b2682da..3f35fad 100644 a/testcases/kernel/mem/shmt/shmt04.c -+++ b/testcases/kernel/mem/shmt/shmt04.c -@@ -56,7 +56,7 @@ int TST_TOTAL = 2; /* Total number of test cases. */ - /**/ - - key_t key; --sigset_t set; -+sigset_t set1; - - #define SIZE 16*1024 - -@@ -71,9 +71,9 @@ int main(void) - - key = (key_t) getpid(); - -- sigemptyset(); -- sigaddset(, SIGUSR1); -- sigprocmask(SIG_BLOCK, , NULL); -+ sigemptyset(); -+ sigaddset(, SIGUSR1); -+ sigprocmask(SIG_BLOCK, , NULL); - - pid = fork(); - switch (pid) { -@@ -148,7 +148,7 @@ int child(void) - char *cp; - int sig; - -- sigwait(, ); -+ sigwait(, ); - chld_pid = getpid(); - /*-
Re: [OE-core] [PATCH] ltp: bump to release 20180118
On 30 January 2018 at 02:17, akuster808 <akuster...@gmail.com> wrote: > > > On 01/29/2018 12:04 PM, Khem Raj wrote: >> On Mon, Jan 29, 2018 at 6:19 AM, Anders Roxell <anders.rox...@linaro.org> >> wrote: >>> Removed 3 patches that have been upstreamed: >>> - 0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch >>> - 0037-ltp-fix-format-security-error.patch >>> - 0038-generate-reproducible-gzip.patch >>> >>> Reworked path >>> 0002-Add-knob-to-control-whether-numa-support-should-be-c.patch. >>> >> I would be interested to know if you tried it on a musl target. > Do we run the "CVE' tests.. this version include meltdown? How could we run those tests? Cheers, Anders > is this > include in the the QA test process? > > - armin >> >>> Signed-off-by: Anders Roxell <anders.rox...@linaro.org> >>> --- >>> ...-control-whether-numa-support-should-be-c.patch | 39 >>> +++--- >>> ...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 35 --- >>> .../ltp/0037-ltp-fix-format-security-error.patch | 36 >>> >>> .../ltp/ltp/0038-generate-reproducible-gzip.patch | 20 --- >>> .../ltp/{ltp_20170929.bb => ltp_20180118.bb} | 5 +-- >>> 5 files changed, 21 insertions(+), 114 deletions(-) >>> 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/0037-ltp-fix-format-security-error.patch >>> delete mode 100644 >>> meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch >>> rename meta/recipes-extended/ltp/{ltp_20170929.bb => ltp_20180118.bb} (95%) >>> >>> diff --git >>> a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch >>> >>> b/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch >>> index 9865020..31460b9 100644 >>> --- >>> a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch >>> +++ >>> b/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch >>> @@ -9,34 +9,35 @@ during build depending upong numa being staged or not >>> >>> Signed-off-by: Roy.Li <rongqing...@windriver.com> >>> Signed-off-by: Khem Raj <raj.k...@gmail.com> >>> +Signed-off-by: Anders Roxell <anders.rox...@linaro.org> >>> Upstream-Status: Pending >>> --- >>> m4/ltp-numa.m4 | 10 +- >>> 1 file changed, 9 insertions(+), 1 deletion(-) >>> >>> diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4 >>> -index 60ae07b..ed7078d 100644 >>> +index fc3383e..44cb559 100644 >>> --- a/m4/ltp-numa.m4 >>> +++ b/m4/ltp-numa.m4 >>> -@@ -24,7 +24,13 @@ dnl >>> +@@ -24,7 +24,13 @@ dnl LTP_CHECK_SYSCALL_NUMA >>> + dnl >>> dnl >>> - AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], >>> - [dnl >>> --AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ >>> -+AC_MSG_CHECKING([for numa]) >>> -+AC_ARG_WITH( >>> -+ [numa], >>> -+ AC_HELP_STRING([--without-numa], >>> -+ [without numa support]), >>> -+ [], >>> -+ [AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ >>> - LTP_SYSCALL_NUMA_HEADERS=yes >>> - AC_CHECK_LIB(numa,numa_alloc_onnode,[have_numa_alloc_onnode="yes"]) >>> - if test "x$have_numa_alloc_onnode" = "xyes"; then >>> -@@ -48,3 +54,5 @@ if test "x$have_mpol_constants" = "xyes"; then >>> - AC_DEFINE(HAVE_MPOL_CONSTANTS,1,[define to 1 if you have all >>> constants required to use mbind tests]) >>> - fi >>> - )]) >>> + AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], [ >>> +- AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes]) >>> ++ AC_MSG_CHECKING([for numa]) >>> ++ AC_ARG_WITH( >>> ++ [numa], >>> ++ AC_HELP_STRING([--without-numa], >>> ++ [without numa support]), >>> ++ [], >>> ++ [AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes]) >>> + AC_CHECK_HEADERS([numa.h numaif.h], [], [have_numa_headers=no]) >>> + >>> +
Re: [OE-core] [PATCH] ltp: bump to release 20180118
On 29 January 2018 at 21:04, Khem Raj <raj.k...@gmail.com> wrote: > On Mon, Jan 29, 2018 at 6:19 AM, Anders Roxell <anders.rox...@linaro.org> > wrote: >> Removed 3 patches that have been upstreamed: >> - 0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch >> - 0037-ltp-fix-format-security-error.patch >> - 0038-generate-reproducible-gzip.patch >> >> Reworked path >> 0002-Add-knob-to-control-whether-numa-support-should-be-c.patch. >> > > I would be interested to know if you tried it on a musl target. yes, that worked. Cheers, Anders > >> Signed-off-by: Anders Roxell <anders.rox...@linaro.org> >> --- >> ...-control-whether-numa-support-should-be-c.patch | 39 >> +++--- >> ...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 35 --- >> .../ltp/0037-ltp-fix-format-security-error.patch | 36 >> .../ltp/ltp/0038-generate-reproducible-gzip.patch | 20 --- >> .../ltp/{ltp_20170929.bb => ltp_20180118.bb} | 5 +-- >> 5 files changed, 21 insertions(+), 114 deletions(-) >> 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/0037-ltp-fix-format-security-error.patch >> delete mode 100644 >> meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch >> rename meta/recipes-extended/ltp/{ltp_20170929.bb => ltp_20180118.bb} (95%) >> >> diff --git >> a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch >> >> b/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch >> index 9865020..31460b9 100644 >> --- >> a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch >> +++ >> b/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch >> @@ -9,34 +9,35 @@ during build depending upong numa being staged or not >> >> Signed-off-by: Roy.Li <rongqing...@windriver.com> >> Signed-off-by: Khem Raj <raj.k...@gmail.com> >> +Signed-off-by: Anders Roxell <anders.rox...@linaro.org> >> Upstream-Status: Pending >> --- >> m4/ltp-numa.m4 | 10 +- >> 1 file changed, 9 insertions(+), 1 deletion(-) >> >> diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4 >> -index 60ae07b..ed7078d 100644 >> +index fc3383e..44cb559 100644 >> --- a/m4/ltp-numa.m4 >> +++ b/m4/ltp-numa.m4 >> -@@ -24,7 +24,13 @@ dnl >> +@@ -24,7 +24,13 @@ dnl LTP_CHECK_SYSCALL_NUMA >> + dnl >> dnl >> - AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], >> - [dnl >> --AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ >> -+AC_MSG_CHECKING([for numa]) >> -+AC_ARG_WITH( >> -+ [numa], >> -+ AC_HELP_STRING([--without-numa], >> -+ [without numa support]), >> -+ [], >> -+ [AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ >> - LTP_SYSCALL_NUMA_HEADERS=yes >> - AC_CHECK_LIB(numa,numa_alloc_onnode,[have_numa_alloc_onnode="yes"]) >> - if test "x$have_numa_alloc_onnode" = "xyes"; then >> -@@ -48,3 +54,5 @@ if test "x$have_mpol_constants" = "xyes"; then >> - AC_DEFINE(HAVE_MPOL_CONSTANTS,1,[define to 1 if you have all >> constants required to use mbind tests]) >> - fi >> - )]) >> + AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], [ >> +- AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes]) >> ++ AC_MSG_CHECKING([for numa]) >> ++ AC_ARG_WITH( >> ++ [numa], >> ++ AC_HELP_STRING([--without-numa], >> ++ [without numa support]), >> ++ [], >> ++ [AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes]) >> + AC_CHECK_HEADERS([numa.h numaif.h], [], [have_numa_headers=no]) >> + >> + if test "x$have_numa_headers" != "xno"; then >> +@@ -42,3 +48,5 @@ exit(1); >> + AC_DEFINE(HAVE_NUMA_V2, 1, [Define to 1 if you have libnuma >> and it's headers version >= 2 installed.]) >> + fi >> + ]) >> +AC_MSG_RESULT([$with_numa]) >> +]) >> -- >> 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
[OE-core] [PATCH] ltp: bump to release 20180118
Removed 3 patches that have been upstreamed: - 0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch - 0037-ltp-fix-format-security-error.patch - 0038-generate-reproducible-gzip.patch Reworked path 0002-Add-knob-to-control-whether-numa-support-should-be-c.patch. Signed-off-by: Anders Roxell <anders.rox...@linaro.org> --- ...-control-whether-numa-support-should-be-c.patch | 39 +++--- ...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch | 35 --- .../ltp/0037-ltp-fix-format-security-error.patch | 36 .../ltp/ltp/0038-generate-reproducible-gzip.patch | 20 --- .../ltp/{ltp_20170929.bb => ltp_20180118.bb} | 5 +-- 5 files changed, 21 insertions(+), 114 deletions(-) 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/0037-ltp-fix-format-security-error.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-generate-reproducible-gzip.patch rename meta/recipes-extended/ltp/{ltp_20170929.bb => ltp_20180118.bb} (95%) diff --git a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch b/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch index 9865020..31460b9 100644 --- a/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch +++ b/meta/recipes-extended/ltp/ltp/0002-Add-knob-to-control-whether-numa-support-should-be-c.patch @@ -9,34 +9,35 @@ during build depending upong numa being staged or not Signed-off-by: Roy.Li <rongqing...@windriver.com> Signed-off-by: Khem Raj <raj.k...@gmail.com> +Signed-off-by: Anders Roxell <anders.rox...@linaro.org> Upstream-Status: Pending --- m4/ltp-numa.m4 | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4 -index 60ae07b..ed7078d 100644 +index fc3383e..44cb559 100644 --- a/m4/ltp-numa.m4 +++ b/m4/ltp-numa.m4 -@@ -24,7 +24,13 @@ dnl +@@ -24,7 +24,13 @@ dnl LTP_CHECK_SYSCALL_NUMA + dnl dnl - AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], - [dnl --AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ -+AC_MSG_CHECKING([for numa]) -+AC_ARG_WITH( -+ [numa], -+ AC_HELP_STRING([--without-numa], -+ [without numa support]), -+ [], -+ [AC_CHECK_HEADERS([linux/mempolicy.h numa.h numaif.h],[ - LTP_SYSCALL_NUMA_HEADERS=yes - AC_CHECK_LIB(numa,numa_alloc_onnode,[have_numa_alloc_onnode="yes"]) - if test "x$have_numa_alloc_onnode" = "xyes"; then -@@ -48,3 +54,5 @@ if test "x$have_mpol_constants" = "xyes"; then - AC_DEFINE(HAVE_MPOL_CONSTANTS,1,[define to 1 if you have all constants required to use mbind tests]) - fi - )]) + AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], [ +- AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes]) ++ AC_MSG_CHECKING([for numa]) ++ AC_ARG_WITH( ++ [numa], ++ AC_HELP_STRING([--without-numa], ++ [without numa support]), ++ [], ++ [AC_CHECK_LIB(numa, numa_available, [have_libnuma=yes]) + AC_CHECK_HEADERS([numa.h numaif.h], [], [have_numa_headers=no]) + + if test "x$have_numa_headers" != "xno"; then +@@ -42,3 +48,5 @@ exit(1); + AC_DEFINE(HAVE_NUMA_V2, 1, [Define to 1 if you have libnuma and it's headers version >= 2 installed.]) + fi + ]) +AC_MSG_RESULT([$with_numa]) +]) -- 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 efa6d06..000 --- a/meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 00ba7cdd0608b1507027428f9f87b1cb9747372b Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke...@windriver.com> -Date: Thu, 9 Feb 2017 15:54:53 +0800 -Subject: [PATCH] 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.k...@gmail.com> -Signed-off-by: Dengke Du <dengke...@windriver.com> - -Upstream-Status: Pending - lib/tst_res.c | 4 - 1 file changed, 4 insertions(+) - -diff --git a/lib/tst_res.c b/lib/tst_res.c -index 61daaeb..435224f 100644 a/lib/tst_res.c -+++ b/lib/tst_res.c -@@ -79,7 +79,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 - - stati
Re: [OE-core] [PATCHv3] ltp: update to new release 20130904
On 2013-10-29 09:58, Richard Purdie wrote: On Mon, 2013-09-09 at 12:17 +0200, Anders Roxell wrote: Signed-off-by: Anders Roxell anders.rox...@linaro.org --- meta/recipes-extended/ltp/{ltp_20130503.bb = ltp_20130904.bb} | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-extended/ltp/{ltp_20130503.bb = ltp_20130904.bb} (94%) diff --git a/meta/recipes-extended/ltp/ltp_20130503.bb b/meta/recipes-extended/ltp/ltp_20130904.bb similarity index 94% rename from meta/recipes-extended/ltp/ltp_20130503.bb rename to meta/recipes-extended/ltp/ltp_20130904.bb index 387826d..5e10448 100644 It seems this patch is causing problems on the autobuilder, e.g.: https://bugzilla.yoctoproject.org/show_bug.cgi?id=5379 but this is occurring on multiple architectures. Looks like some kind of parallel make race :( Hi and sorry for the late response. I have tried to reproduce the error without success so far... =( Cheers, Anders ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ltp: update to new release 20130904
Signed-off-by: Anders Roxell anders.rox...@linaro.org --- .../ltp/{ltp_20130503.bb = ltp_20130904.bb}| 13 - 1 file changed, 8 insertions(+), 5 deletions(-) rename meta/recipes-extended/ltp/{ltp_20130503.bb = ltp_20130904.bb} (93%) diff --git a/meta/recipes-extended/ltp/ltp_20130503.bb b/meta/recipes-extended/ltp/ltp_20130904.bb similarity index 93% rename from meta/recipes-extended/ltp/ltp_20130503.bb rename to meta/recipes-extended/ltp/ltp_20130904.bb index 387826d..4f2b9e7 100644 --- a/meta/recipes-extended/ltp/ltp_20130503.bb +++ b/meta/recipes-extended/ltp/ltp_20130904.bb @@ -21,17 +21,20 @@ LIC_FILES_CHKSUM = file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ DEPENDS = attr libaio libcap acl openssl -SRC_URI = ${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 +SRC_URI = git://github.com/linux-test-project/ltp.git -SRC_URI[md5sum] = d448d9e9731d7ef45352fc74633cc97f -SRC_URI[sha256sum] = afdb1479e73d4da7f0d4d5d3fe1570bc5fc96e3317d4a5c10c59c046d3dfa4a0 +SRC_URI[md5sum] = c8a5f6f397d2c021a0d21ad28992aa7d +SRC_URI[sha256sum] = 4c13e00c1bed8f1b85daf934cd7b54a08b7b7e31874085ab9277ee563af87139 + +SRCREV = ${PV} +S = ${WORKDIR}/git export prefix = /opt/ltp export exec_prefix = /opt/ltp inherit autotools -RDEPENDS_${PN} = perl +RDEPENDS_${PN} = perl e2fsprogs-mke2fs FILES_${PN}-dbg += /opt/ltp/runtest/.debug FILES_${PN}-dbg += /opt/ltp/testcases/bin/.debug @@ -62,7 +65,7 @@ do_extract_tarball() { do_install(){ install -d ${D}/opt/ltp/ oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install - + # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ltp: update to new release 20130904
Signed-off-by: Anders Roxell anders.rox...@linaro.org --- meta/recipes-extended/ltp/ltp_20130503.bb | 75 - meta/recipes-extended/ltp/ltp_20130904.bb | 78 +++ 2 files changed, 78 insertions(+), 75 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp_20130503.bb create mode 100644 meta/recipes-extended/ltp/ltp_20130904.bb diff --git a/meta/recipes-extended/ltp/ltp_20130503.bb b/meta/recipes-extended/ltp/ltp_20130503.bb deleted file mode 100644 index 387826d..000 --- a/meta/recipes-extended/ltp/ltp_20130503.bb +++ /dev/null @@ -1,75 +0,0 @@ -SUMMARY = Linux Test Project -DESCRIPTION = The Linux Test Project is a joint project with SGI, IBM, OSDL, and Bull with a goal to deliver test suites to the open source community that validate the reliability, robustness, and stability of Linux. The Linux Test Project is a collection of tools for testing the Linux kernel and related features. -HOMEPAGE = http://ltp.sourceforge.net; -SECTION = console/utils - -LICENSE = GPLv2 GPLv2+ LGPLv2+ LGPLv2.1+ BSD-2-Clause -LIC_FILES_CHKSUM = file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \ - file://testcases/kernel/fs/ext4-new-features/ffsb-6.0-rc2/COPYING;md5=c46082167a314d785d012a244748d803 \ - file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ - file://testcases/kernel/hotplug/cpu_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \ - file://testcases/open_posix_testsuite/COPYING;md5=216e43b72efbe4ed9017cc19c4c68b01 \ - file://testcases/realtime/COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://tools/netpipe-2.4/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \ - file://tools/netpipe-2.4-ipv6/COPYING;md5=9e3781bb5fe787aa80e1f51f5006b6fa \ - file://tools/top-LTP/proc/COPYING;md5=aefc88eb8a41672fbfcfe6b69ab8c49c \ - file://tools/pounder21/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://utils/benchmark/kernbench-0.42/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - - -DEPENDS = attr libaio libcap acl openssl - -SRC_URI = ${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.bz2 - -SRC_URI[md5sum] = d448d9e9731d7ef45352fc74633cc97f -SRC_URI[sha256sum] = afdb1479e73d4da7f0d4d5d3fe1570bc5fc96e3317d4a5c10c59c046d3dfa4a0 - -export prefix = /opt/ltp -export exec_prefix = /opt/ltp - -inherit autotools - -RDEPENDS_${PN} = perl - -FILES_${PN}-dbg += /opt/ltp/runtest/.debug -FILES_${PN}-dbg += /opt/ltp/testcases/bin/.debug -FILES_${PN}-dbg += /opt/ltp/testcases/bin/*/bin/.debug -FILES_${PN}-dbg += /opt/ltp/testcases/bin/*/test/.debug -FILES_${PN}-dbg += /opt/ltp/scenario_groups/.debug -FILES_${PN}-dbg += /opt/ltp/testscripts/.debug -FILES_${PN}-dbg += /opt/ltp/testscripts/open_posix_testsuite/.debug - -FILES_${PN}-staticdev += /opt/ltp/lib/libmem.a - -FILES_${PN} += /opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/* - -TARGET_CC_ARCH += ${LDFLAGS} - -do_unpack_append() { -bb.build.exec_func('do_extract_tarball', d) -} - -do_extract_tarball() { - if test -f ${WORKDIR}/ltp-full-${PV} ; then - tar x --no-same-owner -f ${WORKDIR}/ltp-full-${PV} -C ${WORKDIR} - rm -rf ${WORKDIR}/ltp-${PV} - mv ${WORKDIR}/ltp-full-${PV} ${WORKDIR}/ltp-${PV} - fi -} - -do_install(){ - install -d ${D}/opt/ltp/ - oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install - - # Copy POSIX test suite into ${D}/opt/ltp/testcases by manual - cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases - - # We need to remove all scripts which depend on /usr/bin/expect, since expect is not supported in poky - # We will add expect for enhancement in future - find ${D} -type f -print | xargs grep \!.*\/usr\/bin\/expect | awk -F: '{print $1}' | xargs rm -f -} - -# Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 nm01 fails -INHIBIT_PACKAGE_STRIP = 1 diff --git a/meta/recipes-extended/ltp/ltp_20130904.bb b/meta/recipes-extended/ltp/ltp_20130904.bb new file mode 100644 index 000
Re: [OE-core] [PATCH] linux-kernel-base: linux/version.h path update for 3.7-rc1
On Wed, Mar 20, 2013 at 4:30 PM, Bruce Ashfield bruce.ashfi...@gmail.comwrote: On Wed, Mar 20, 2013 at 10:55 AM, Anders Roxell anders.rox...@gmail.com wrote: On Wed, Mar 20, 2013 at 2:42 PM, Bruce Ashfield bruce.ashfi...@gmail.com wrote: On Wed, Mar 20, 2013 at 9:22 AM, anders.rox...@gmail.com wrote: From: Anders Roxell anders.rox...@enea.com In mainline kernel 3.7-rc1 (hash:abbf1590de22a6d22) The path include/linux/version.h was updated to include/generated/uapi/linux/version.h It's true that uapi now holds the generated version.h, but what build error were you seeing without this change in place ? We were trying to build linx (http://linx.sourceforge.net/linxdoc/doc/index.html) Please let me know if it is better to rewrite linx or include this patch? My concern is that as a list of alternatives builds up over time, that don't necessarily use the same format of the linux version, you'll end up with applications that are making the wrong decisions if a fallback is used. Having a clear public / exported file, and throwing errors if it doesn't exist would ensure consistent behaviour (granted annoying if you get the error when you think you shouldn't). If you look at the code in get_kernelversion() it shouldn't even work if version.h is used versus utsrelease.h. I'd be inclined to suggest the removal of the existing version.h fallback, versus adding another. You might not even need to modify the application code to fix this. What are the dependencies of your recipe that would allow for utsrelease.h to not be generated when the build calls get_kernelversion ? Sorry for the late response! I agree with you that its better to use utsrelease.h rather than depending on version.h. We have added a patch for the linx source to solve this. Thank you very much for the help and support! With kind regards, Anders Cheers, Bruce Regards, Anders utsrelease.h is still created where it has been for some time, and should be what is typically used for any version checks. Cheers, Bruce Signed-off-by: Anders Roxell anders.rox...@enea.com --- meta/classes/linux-kernel-base.bbclass |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass index 4f2b0a4..b7d0ffa 100644 --- a/meta/classes/linux-kernel-base.bbclass +++ b/meta/classes/linux-kernel-base.bbclass @@ -8,6 +8,9 @@ def get_kernelversion(p): fn = p + '/include/generated/utsrelease.h' if not os.path.isfile(fn): fn = p + '/include/linux/version.h' +if not os.path.isfile(fn): +# after 3.7-rc1 +fn = p + '/include/generated/uapi/linux/version.h' import re try: -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end -- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] initscripts: RDEPENDS sed to remove sed: command not found.
On Tue, Mar 26, 2013 at 10:17 AM, ChenQi qi.c...@windriver.com wrote: On 03/26/2013 04:20 PM, anders.rox...@gmail.com wrote: From: Anders Roxell anders.rox...@enea.com Log: /etc/rcS.d/S37populate-**volatile.sh: line 13: sed: command not found /etc/rcS.d/S37populate-**volatile.sh: line 152: sed: command not found /etc/rcS.d/S37populate-**volatile.sh: line 152: sed: command not found Signed-off-by: Anders Roxell anders.rox...@enea.com --- meta/recipes-core/initscripts/**initscripts_1.0.bbhttp://initscripts_1.0.bb| 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-core/**initscripts/initscripts_1.0.bbb/meta/recipes-core/ **initscripts/initscripts_1.0.bb index 649e182..bfd3d28 100644 --- a/meta/recipes-core/**initscripts/initscripts_1.0.bb +++ b/meta/recipes-core/**initscripts/initscripts_1.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = Initscripts provide the basic system startup initialization scrip SECTION = base LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=**751419260aa954499f7abaabaa882b **be -PR = r140 +PR = r141 INHIBIT_DEFAULT_DEPS = 1 @@ -39,6 +39,7 @@ KERNEL_VERSION = inherit update-alternatives DEPENDS_append = update-rc.d-native +RDEPENDS_${PN} = sed ALTERNATIVE_PRIORITY = 90 ALTERNATIVE_${PN} = functions busybox also provides sed if CONFIG_SED is enabled. I'm wondering whether it's necessary to insert dependency here. If so, then I think other packages which provide init scripts may also rdepend on 'busybox' or 'coreutils' which provide basic commands like 'chown' or 'sed'. aha... I missed that busybox could provide sed... I would like to do some sort of rdepends on busybox or sed (because coreutils does not provide the sed command). However, I only want sed if busybox isn't present and vice versa is there a way to do this? With kind regards, Anders Best Regards, Chen Qi __**_ Openembedded-core mailing list Openembedded-core@lists.**openembedded.orgOpenembedded-core@lists.openembedded.org http://lists.linuxtogo.org/**cgi-bin/mailman/listinfo/**openembedded-corehttp://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] linux-kernel-base: linux/version.h path update for 3.7-rc1
On Wed, Mar 20, 2013 at 2:42 PM, Bruce Ashfield bruce.ashfi...@gmail.comwrote: On Wed, Mar 20, 2013 at 9:22 AM, anders.rox...@gmail.com wrote: From: Anders Roxell anders.rox...@enea.com In mainline kernel 3.7-rc1 (hash:abbf1590de22a6d22) The path include/linux/version.h was updated to include/generated/uapi/linux/version.h It's true that uapi now holds the generated version.h, but what build error were you seeing without this change in place ? We were trying to build linx ( http://linx.sourceforge.net/linxdoc/doc/index.html) Please let me know if it is better to rewrite linx or include this patch? Regards, Anders utsrelease.h is still created where it has been for some time, and should be what is typically used for any version checks. Cheers, Bruce Signed-off-by: Anders Roxell anders.rox...@enea.com --- meta/classes/linux-kernel-base.bbclass |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass index 4f2b0a4..b7d0ffa 100644 --- a/meta/classes/linux-kernel-base.bbclass +++ b/meta/classes/linux-kernel-base.bbclass @@ -8,6 +8,9 @@ def get_kernelversion(p): fn = p + '/include/generated/utsrelease.h' if not os.path.isfile(fn): fn = p + '/include/linux/version.h' +if not os.path.isfile(fn): +# after 3.7-rc1 +fn = p + '/include/generated/uapi/linux/version.h' import re try: -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemtap: sources.redhat.com is deprecated.
Hi, I forgot to mention this is for the danny branch. Regards, Anders On Thu, Jan 17, 2013 at 11:03 AM, anders.rox...@gmail.com wrote: From: Anders Roxell anders.rox...@enea.com Signed-off-by: Anders Roxell anders.rox...@enea.com --- meta/recipes-kernel/systemtap/systemtap_git.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index 093e62d..3e7bc7b 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 SRCREV = 48fa6b5e1d3e636c34cbd5650370e6f634efc294 PV = 1.8+git${SRCPV} -SRC_URI = git://sources.redhat.com/git/systemtap.git;protocol=git \ +SRC_URI = git://sourceware.org/git/systemtap.git;protocol=git \ file://docproc-build-fix.patch \ -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemtap: sources.redhat.com is deprecated.
out of curiosity, is sources.redhat.com deprecated just for systemtap, or deprecated in its entirety as a download source? the 'sources.redhat.com' which redirects to 'sourceware.org' /Anders On Thu, Jan 17, 2013 at 12:06 PM, Robert P. J. Day rpj...@crashcourse.cawrote: On Thu, 17 Jan 2013, anders.rox...@gmail.com wrote: From: Anders Roxell anders.rox...@enea.com Signed-off-by: Anders Roxell anders.rox...@enea.com out of curiosity, is sources.redhat.com deprecated just for systemtap, or deprecated in its entirety as a download source? rday -- Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core