[OE-core] [PATCH] linux-yocto_5.0: set devicetree for armv5
Signed-off-by: Dengke Du --- meta/recipes-kernel/linux/linux-yocto_5.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb index fe773be..005dd8c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb @@ -39,6 +39,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" +KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] perf: workaround the error cased by maybe-uninitialized warning
When enable DEBUG_BUILD, the perf build failed by the following error: libbpf.c:727:36: error: 'data' may be used uninitialized in this function [-Werror=maybe-uninitialized] This is ok until Khem commit a patch in oe-core: 16643b03227466e2c80a24c2d079fe36e89553c1 This commit import "-Og" option to "DEBUG_OPTIMIZATION", result in this error. Actually, the warning was misinformation. We explore the code in libbpf.c: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/lib/bpf/libbpf.c#n640 -- if (scn) data = elf_getdata(scn, NULL); if (!scn || !data) { pr_warning("failed to get Elf_Data from map section %d\n", obj->efile.maps_shndx); return -EINVAL; } .. using data... .. -- If the 'scn' was not null, the data will be initialized. if the data was null, the function will return -EINVAL, so the data must be not null, but compiler can't see it in 'if' code block, so treat it as 'maybe-uninitialized'. Signed-off-by: Dengke Du --- meta/recipes-kernel/perf/perf.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 5acdcfb..546076f 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -271,3 +271,4 @@ FILES_${PN}-perl = "${libexecdir}/perf-core/scripts/perl" INHIBIT_PACKAGE_DEBUG_SPLIT="1" +DEBUG_OPTIMIZATION_append = " -Wno-error=maybe-uninitialized" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ltp: fix mmap15 failed on qemumips64
Actually, this is not a bug, mmap15 only run on 64bit system. On qemumips64, mmap15 return EINVAL, x86-64 and arm64 return ENOMEM. This is because mips system check the addr that passed to the syscall mmap15: https://github.com/torvalds/linux/blob/master/arch/mips/mm/mmap.c#L71 If the addr larger than (TASK_SIZE - page_size), mips think it is invalid. Signed-off-by: Dengke Du --- .../ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch | 41 ++ meta/recipes-extended/ltp/ltp_20180515.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch b/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch new file mode 100644 index 000..18eba27 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-mmap15-mips64-return-EINVAL.patch @@ -0,0 +1,41 @@ +From b909805b4fc1b72e0ce299afb4abc02720ee81da Mon Sep 17 00:00:00 2001 +From: Dengke Du +Date: Wed, 12 Sep 2018 14:24:35 +0800 +Subject: [PATCH] mmap15: mips64 return EINVAL + +In mips64 kernel, system check the addr that passed to mmap: + +if (TASK_SIZE - len < addr) +return -EINVAL; + +Link: https://github.com/torvalds/linux/blob/master/arch/mips/mm/mmap.c#L71 + +Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/394] + +Signed-off-by: Dengke Du +--- + testcases/kernel/syscalls/mmap/mmap15.c | 5 + + 1 file changed, 5 insertions(+) + +diff --git a/testcases/kernel/syscalls/mmap/mmap15.c b/testcases/kernel/syscalls/mmap/mmap15.c +index eff27d6..a10b5c7 100644 +--- a/testcases/kernel/syscalls/mmap/mmap15.c b/testcases/kernel/syscalls/mmap/mmap15.c +@@ -81,9 +81,14 @@ int main(int ac, char **av) + } + + if (errno != ENOMEM) { ++#ifdef __mips__ ++ tst_resm(TPASS | TERRNO, "mmap into high region " ++ "failed as expected"); ++#else + tst_resm(TFAIL | TERRNO, "mmap into high region " +"failed unexpectedly - expect " +"errno=ENOMEM, got"); ++#endif + } else { + tst_resm(TPASS | TERRNO, "mmap into high region " +"failed as expected"); +-- +2.7.4 + diff --git a/meta/recipes-extended/ltp/ltp_20180515.bb b/meta/recipes-extended/ltp/ltp_20180515.bb index 7c364a6..9cd3489 100644 --- a/meta/recipes-extended/ltp/ltp_20180515.bb +++ b/meta/recipes-extended/ltp/ltp_20180515.bb @@ -31,6 +31,7 @@ CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__" SRCREV = "96cbf48313afa65ef4d693d3441cbfd60a8d9b27" SRC_URI = "git://github.com/linux-test-project/ltp.git \ + file://0001-mmap15-mips64-return-EINVAL.patch \ file://0004-build-Add-option-to-select-libc-implementation.patch \ file://0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch \ file://0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] nfs-export-root: add it to nfs-server FEATURE_PACKAGES
Ping. On 2018年08月13日 17:06, Dengke Du wrote: When we enable nfs-server feature, we should add the required file /etc/exports installed by nfs-export-root. Signed-off-by: Dengke Du --- meta/classes/core-image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index a9a2cec..9ea6d89 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -42,7 +42,7 @@ FEATURE_PACKAGES_eclipse-debug = "packagegroup-core-eclipse-debug" FEATURE_PACKAGES_tools-profile = "packagegroup-core-tools-profile" FEATURE_PACKAGES_tools-testapps = "packagegroup-core-tools-testapps" FEATURE_PACKAGES_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target" -FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server" +FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server nfs-export-root" FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client" FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] nfs-export-root: add it to nfs-server FEATURE_PACKAGES
When we enable nfs-server feature, we should add the required file /etc/exports installed by nfs-export-root. Signed-off-by: Dengke Du --- meta/classes/core-image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index a9a2cec..9ea6d89 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -42,7 +42,7 @@ FEATURE_PACKAGES_eclipse-debug = "packagegroup-core-eclipse-debug" FEATURE_PACKAGES_tools-profile = "packagegroup-core-tools-profile" FEATURE_PACKAGES_tools-testapps = "packagegroup-core-tools-testapps" FEATURE_PACKAGES_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target" -FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server" +FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server nfs-export-root" FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client" FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear" FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] nfs-utils: add runtime depends for nfs-export-root
On 2018年08月11日 17:33, Richard Purdie wrote: On Fri, 2018-08-10 at 17:38 +0800, Dengke Du wrote: When DISTRO_FEATURE enable "systemd", the nfs-server.service in nfs- utils depends on /etc/exports, but the file "/etc/exports" installed by package nfs-export-root. Otherwise the service would failed. So we should add the runtime depends for nfs-export-root. Signed-off-by: Dengke Du --- meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb | 1 + 1 file changed, 1 insertion(+) I suspect that this may in fact be a feature, you enable the nfs server by adding nfs-export-root to the image. The behaviour may therefore be intended as not everyone installing nfs-utils wants a server. We should perhaps better document that. Yes, when enable IMAGE_FEATURE nfs-server, we install the nfs-server.service, when not enable nfs-server, we don't install the nfs-server.service, otherwise we install the nfs-utils, install the nfs-server. Also, when using sysvinit does this recipe generate an init script which starts an nfs-server? Yes, this bb would generate an init script for sysvinit, I should let the nfs-export-root working for sysvinit else. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] nfs-utils: add runtime depends for nfs-export-root
When DISTRO_FEATURE enable "systemd", the nfs-server.service in nfs-utils depends on /etc/exports, but the file "/etc/exports" installed by package nfs-export-root. Otherwise the service would failed. So we should add the runtime depends for nfs-export-root. Signed-off-by: Dengke Du --- meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb index 6d450c7..581f334 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.3.1.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84" # util-linux for libblkid DEPENDS = "libcap libevent util-linux sqlite3 libtirpc" RDEPENDS_${PN} = "${PN}-client bash" +RDEPENDS_${PN}_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'nfs-export-root', '' ,d)}" RRECOMMENDS_${PN} = "kernel-module-nfsd" inherit useradd -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] kernel-selftest: Add a recipe on kernel selftest
On 2018年07月07日 20:14, Richard Purdie wrote: On Fri, 2018-07-06 at 05:51 -0400, Hongzhi.Song wrote: The recipe builds the framework for kernel-selftest. Now, it just contains two sets of testcase, bpf and vm. We are appending others to the recipe. It needs some features which will be written into relevant recipe. But now, you should add them to conf/local.conf manually. KERNEL_FEATURES_append += "features/bpf/bpf.scc" Signed-off-by: Dengke Du Signed-off-by: Hongzhi.Song --- .../kernel-selftest/kernel-selftest.bb | 94 ++ 1 file changed, 94 insertions(+) create mode 100644 meta/recipes-kernel/kernel-selftest/kernel- selftest.bb diff --git a/meta/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta/recipes-kernel/kernel-selftest/kernel-selftest.bb new file mode 100644 index 000..28fd178 --- /dev/null +++ b/meta/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -0,0 +1,94 @@ +SUMMARY = "Kernel selftest for Linux" +DESCRIPTION = "Kernel selftest for Linux" +LICENSE = "GPLv2" + +# for bpf and vm +DEPENDS = " \ +elfutils \ +libcap \ +libcap-ng \ +fuse \ +util-linux \ +rsync-native \ +" This adds a DEPENDS on fuse but fuse is not in OE-Core therefore this recipe can never build there. +do_configure[prefuncs] += "copy_perf_source_from_kernel remove_clang_related" +python copy_perf_source_from_kernel() { We're copying to perf source here? The function name needs tweaking. This recipe was similar to perf, using the kernel source, so based on perf recipe, we will change it in next patches set. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] kernel-selftest: add it
Please ignore this, thanks! On 2018年07月06日 15:51, Dengke Du wrote: The framework for kernel-selftest, this framework contains many aspect, such as bpf, we should enable bpf kernel feature, this enable bpf syscall. How to test? On target, enter directory: /opt/kselftest/bpf/, run "./test_align 0 11" this command test all the bpf align testcases. Results: Test 0: mov ... PASS Test 1: shift ... PASS Test 2: addsub ... PASS Test 3: mul ... PASS Test 4: unknown shift ... PASS Test 5: unknown mul ... PASS Test 6: packet const offset ... PASS Test 7: packet variable offset ... PASS Test 8: packet variable offset 2 ... PASS Test 9: dubious pointer arithmetic ... PASS Test 10: variable subtraction ... PASS Test 11: pointer variable subtraction ... PASS Results: 12 pass 0 fail Signed-off-by: Dengke Du --- .../kernel-selftest/kernel-selftest.bb | 94 ++ meta/recipes-kernel/linux/linux-yocto.inc | 1 + 2 files changed, 95 insertions(+) create mode 100644 meta/recipes-kernel/kernel-selftest/kernel-selftest.bb diff --git a/meta/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta/recipes-kernel/kernel-selftest/kernel-selftest.bb new file mode 100644 index 000..c976e7b --- /dev/null +++ b/meta/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -0,0 +1,94 @@ +SUMMARY = "Kernel selftest for Linux" +DESCRIPTION = "Kernel selftest for Linux" +LICENSE = "GPLv2" + +DEPENDS = " \ +elfutils \ +libcap \ +libcap-ng \ +fuse \ +util-linux \ +rsync-native \ +" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +inherit linux-kernel-base kernel-arch + +do_populate_lic[depends] += "virtual/kernel:do_patch" + +inherit kernelsrc + +S = "${WORKDIR}/${BP}" + +# The LDFLAGS is required or some old kernels fails due missing +# symbols and this is preferred than requiring patches to every old +# supported kernel. +LDFLAGS="-ldl -lutil" + +EXTRA_OEMAKE = '\ +CROSS_COMPILE=${TARGET_PREFIX} \ +ARCH=${ARCH} \ +CC="${CC}" \ +AR="${AR}" \ +LD="${LD}" \ +EXTRA_CFLAGS="-ldw" \ +${PACKAGECONFIG_CONFARGS} \ +' + +EXTRA_OEMAKE += "\ +'DESTDIR=${D}' \ +'prefix=${prefix}' \ +'bindir=${bindir}' \ +'sharedir=${datadir}' \ +'sysconfdir=${sysconfdir}' \ +'sharedir=${@os.path.relpath(datadir, prefix)}' \ +'mandir=${@os.path.relpath(mandir, prefix)}' \ +'infodir=${@os.path.relpath(infodir, prefix)}' \ +" + +KERNEL_SELFTEST_SRC ?= "Makefile \ + include \ + tools \ +" + +# Add bpf selftest now, other can be added later. +do_compile () { + # Linux kernel build system is expected to do the right thing + unset CFLAGS + oe_runmake -C ${S}/tools/testing/selftests/bpf +} + +# On target, enter /opt/kselftest/bpf directory, run "./test_align 0 11" +# The test_align testcase test the bpf instruction set, the testcase defined here: +# https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/tree/tools/testing/selftests/bpf/test_align.c#n47 +do_install () { + # Linux kernel build system is expected to do the right thing + unset CFLAGS + mkdir -p ${D}/opt/kselftest/bpf + install -m 0755 ${B}/tools/testing/selftests/bpf/test_align ${D}/opt/kselftest/bpf/ +} + +do_configure[prefuncs] += "copy_perf_source_from_kernel remove_clang_related" +python copy_perf_source_from_kernel() { +sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split() +src_dir = d.getVar("STAGING_KERNEL_DIR") +dest_dir = d.getVar("S") +bb.utils.mkdirhier(dest_dir) +for s in sources: +src = oe.path.join(src_dir, s) +dest = oe.path.join(dest_dir, s) +if os.path.isdir(src): +oe.path.copytree(src, dest) +else: +bb.utils.copyfile(src, dest) +} + +remove_clang_related() { + sed -i -e '/test_pkt_access/d' -e '/test_pkt_md_access/d' ${S}/tools/testing/selftests/bpf/Makefile +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +INHIBIT_PACKAGE_DEBUG_SPLIT="1" +FILES_${PN} += "/opt/kselftest/bpf/*" diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 1ebfb60..362d6d8 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -72,3 +72,4 @@ addtask kernel_configcheck after do_configure before do_compile # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" +KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'features/bpf/bpf.scc', '', d)}" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] kernel-selftest: add it
The following changes since commit 611013a23a0082faa4fda2cd2529668965586a76: mesa: add lost Upstream-Status tag (2018-07-05 00:22:08 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/kselftest https://github.com//tree/dengke/kselftest Dengke Du (1): kernel-selftest: add it .../kernel-selftest/kernel-selftest.bb | 94 ++ meta/recipes-kernel/linux/linux-yocto.inc | 1 + 2 files changed, 95 insertions(+) create mode 100644 meta/recipes-kernel/kernel-selftest/kernel-selftest.bb -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] kernel-selftest: add it
The framework for kernel-selftest, this framework contains many aspect, such as bpf, we should enable bpf kernel feature, this enable bpf syscall. How to test? On target, enter directory: /opt/kselftest/bpf/, run "./test_align 0 11" this command test all the bpf align testcases. Results: Test 0: mov ... PASS Test 1: shift ... PASS Test 2: addsub ... PASS Test 3: mul ... PASS Test 4: unknown shift ... PASS Test 5: unknown mul ... PASS Test 6: packet const offset ... PASS Test 7: packet variable offset ... PASS Test 8: packet variable offset 2 ... PASS Test 9: dubious pointer arithmetic ... PASS Test 10: variable subtraction ... PASS Test 11: pointer variable subtraction ... PASS Results: 12 pass 0 fail Signed-off-by: Dengke Du --- .../kernel-selftest/kernel-selftest.bb | 94 ++ meta/recipes-kernel/linux/linux-yocto.inc | 1 + 2 files changed, 95 insertions(+) create mode 100644 meta/recipes-kernel/kernel-selftest/kernel-selftest.bb diff --git a/meta/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta/recipes-kernel/kernel-selftest/kernel-selftest.bb new file mode 100644 index 000..c976e7b --- /dev/null +++ b/meta/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -0,0 +1,94 @@ +SUMMARY = "Kernel selftest for Linux" +DESCRIPTION = "Kernel selftest for Linux" +LICENSE = "GPLv2" + +DEPENDS = " \ +elfutils \ +libcap \ +libcap-ng \ +fuse \ +util-linux \ +rsync-native \ +" + +do_configure[depends] += "virtual/kernel:do_shared_workdir" + +inherit linux-kernel-base kernel-arch + +do_populate_lic[depends] += "virtual/kernel:do_patch" + +inherit kernelsrc + +S = "${WORKDIR}/${BP}" + +# The LDFLAGS is required or some old kernels fails due missing +# symbols and this is preferred than requiring patches to every old +# supported kernel. +LDFLAGS="-ldl -lutil" + +EXTRA_OEMAKE = '\ +CROSS_COMPILE=${TARGET_PREFIX} \ +ARCH=${ARCH} \ +CC="${CC}" \ +AR="${AR}" \ +LD="${LD}" \ +EXTRA_CFLAGS="-ldw" \ +${PACKAGECONFIG_CONFARGS} \ +' + +EXTRA_OEMAKE += "\ +'DESTDIR=${D}' \ +'prefix=${prefix}' \ +'bindir=${bindir}' \ +'sharedir=${datadir}' \ +'sysconfdir=${sysconfdir}' \ +'sharedir=${@os.path.relpath(datadir, prefix)}' \ +'mandir=${@os.path.relpath(mandir, prefix)}' \ +'infodir=${@os.path.relpath(infodir, prefix)}' \ +" + +KERNEL_SELFTEST_SRC ?= "Makefile \ + include \ + tools \ +" + +# Add bpf selftest now, other can be added later. +do_compile () { + # Linux kernel build system is expected to do the right thing + unset CFLAGS + oe_runmake -C ${S}/tools/testing/selftests/bpf +} + +# On target, enter /opt/kselftest/bpf directory, run "./test_align 0 11" +# The test_align testcase test the bpf instruction set, the testcase defined here: +# https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/tree/tools/testing/selftests/bpf/test_align.c#n47 +do_install () { + # Linux kernel build system is expected to do the right thing + unset CFLAGS + mkdir -p ${D}/opt/kselftest/bpf + install -m 0755 ${B}/tools/testing/selftests/bpf/test_align ${D}/opt/kselftest/bpf/ +} + +do_configure[prefuncs] += "copy_perf_source_from_kernel remove_clang_related" +python copy_perf_source_from_kernel() { +sources = (d.getVar("KERNEL_SELFTEST_SRC") or "").split() +src_dir = d.getVar("STAGING_KERNEL_DIR") +dest_dir = d.getVar("S") +bb.utils.mkdirhier(dest_dir) +for s in sources: +src = oe.path.join(src_dir, s) +dest = oe.path.join(dest_dir, s) +if os.path.isdir(src): +oe.path.copytree(src, dest) +else: +bb.utils.copyfile(src, dest) +} + +remove_clang_related() { + sed -i -e '/test_pkt_access/d' -e '/test_pkt_md_access/d' ${S}/tools/testing/selftests/bpf/Makefile +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +INHIBIT_PACKAGE_DEBUG_SPLIT="1" +FILES_${PN} += "/opt/kselftest/bpf/*" diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 1ebfb60..362d6d8 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -72,3 +72,4 @@ addtask kernel_configcheck after do_configure before do_compile # enable kernel-sample for oeqa/runtime/cases's ksample.py test KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" +KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'features/bpf/bpf.scc', '', d)}" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V4 0/1] linux-yocto: add ptest support
Changed in V3: 1. Add comments and documentation for the tests 2. Changed the results of the kernel ptest output in this format: "[PASS|SKIP|FAIL]" : testname, according to Lei yang's comments. The tests output: #result# PASS: dma-example PASS: bytestream-example PASS: inttype-example PASS: record-example PASS: kobject-example PASS: kset-example PASS: trace-events-sample PASS: trace-printk PASS: kprobe_example PASS: kretprobe_example Changed in V4: Remove useless info The following changes since commit 611013a23a0082faa4fda2cd2529668965586a76: mesa: add lost Upstream-Status tag (2018-07-05 00:22:08 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/kernel-ptest2 https://github.com//tree/dengke/kernel-ptest2 Dengke Du (1): linux-yocto: add ptest support meta/recipes-kernel/linux/linux-yocto/run-ptest | 144 meta/recipes-kernel/linux/linux-yocto_4.14.bb | 10 ++ 2 files changed, 154 insertions(+) create mode 100644 meta/recipes-kernel/linux/linux-yocto/run-ptest -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V4 1/1] linux-yocto: add ptest support
Signed-off-by: Dengke Du --- meta/recipes-kernel/linux/linux-yocto/run-ptest | 144 meta/recipes-kernel/linux/linux-yocto_4.14.bb | 10 ++ 2 files changed, 154 insertions(+) create mode 100644 meta/recipes-kernel/linux/linux-yocto/run-ptest diff --git a/meta/recipes-kernel/linux/linux-yocto/run-ptest b/meta/recipes-kernel/linux/linux-yocto/run-ptest new file mode 100644 index 000..d8391b4 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto/run-ptest @@ -0,0 +1,144 @@ +#!/bin/bash +depmod +touch kernel.log + +# dma-example: This module shows how to handle fifo dma operations. +# bytestream-example: This module shows how to create a byte stream fifo. +# inttype-example: This module shows how to create a int type fifo. +# record-example: This module shows how to create a variable sized record fifo. +list1=("dma-example" "bytestream-example" "inttype-example" "record-example") +for i in "${list1[@]}" +do + dmesg -c + modprobe "$i" + mod=${i//-/_} + lsmod | grep -q "$mod" + if [ $? -eq 0 ];then +dmesg | grep "test passed" +if [ $? -eq 0 ];then + echo "PASS: $i" >> kernel.log +fi + else +echo "FAIL: $i" >> kernel.log + fi + rmmod "$i" +done + +# kobject-example: +/* + * This module shows how to create a simple subdirectory in sysfs called + * /sys/kernel/kobject-example In that directory, 3 files are created: + * "foo", "baz", and "bar". If an integer is written to these files, it can be + * later read out of it. + */ + +# kset-example: +/* + * This module shows how to create a kset in sysfs called + * /sys/kernel/kset-example + * Then tree kobjects are created and assigned to this kset, "foo", "baz", + * and "bar". In those kobjects, attributes of the same name are also + * created and if an integer is written to these files, it can be later + * read out of it. + */ + +list2=("kobject-example" "kset-example") +for i in "${list2[@]}" +do + dmesg -c + modprobe "$i" + mod=${i//-/_} + basedir="/sys/kernel/${mod}" + echo "$basedir" + if [ -e ${basedir}/bar -a -e ${basedir}/baz -a -e ${basedir}/foo ];then +echo "PASS: $i" >> kernel.log + else +echo "FAIL: $i" >> kernel.log + fi + rmmod "$i" +done + +# trace-events-sample +# This modules test trace-events for a thread "foo_bar", return string "foo_bar" when everything goes well. +list3="trace-events-sample" +mod=${list3//-/_} +modprobe "$list3" +lsmod | grep "$mod" +if [ $? -eq 0 ];then + if [ -e "/sys/kernel/debug/tracing/events/sample-trace" ];then +echo 1 > /sys/kernel/debug/tracing/events/sample-trace/enable +sleep 5 +ret=`cat /sys/kernel/debug/tracing/trace | grep hello | head -n1 | cut -d':' -f2` +if [ "$ret" = " foo_bar" ];then + echo "PASS: $list3" >> kernel.log +else + echo "FAIL: $list3" >> kernel.log +fi + else +echo "FAIL: $list3" >> kernel.log + fi +else + echo "FAILED: $list3" >> kernel.log +fi +rmmod "$list3" + +# trace-printk +# This modules just a simple test for trace-printk, return string "trace_printk_irq_work" when everything goes well. +list4="trace-printk" +modprobe "$list4" +lsmod | grep "trace_printk" +if [ $? -eq 0 ];then + ret=`cat /sys/kernel/debug/tracing/trace | grep trace_printk | head -n1 | cut -d':' -f2` + if [ "$ret" = " trace_printk_irq_work" ];then +echo "PASS: $list4" >> kernel.log + else +echo "FAIL: $list4" >> kernel.log + fi +else + echo "FAIL: $list4" >> kernel.log +fi +rmmod "$list4" + +# kprobe_example +# Here's a sample kernel module showing the use of kprobes to dump a +# stack trace and selected registers when _do_fork() is called. +list5="kprobe_example" +dmesg -c +modprobe "$list5" +lsmod | grep "$list5" +if [ $? -eq 0 ];then + dmesg | grep "_do_fork" + if [ $? -eq 0 ];then +echo "PASS: $list5" >> kernel.log + else +echo "FAIL: $list5" >> kernel.log + fi +else + echo "FAIL: $list5" >> kernel.log +fi +rmmod "$list5" + +# kretprobe_example +# Here's a sample kernel module showing the use of return probes to +# report the return value and total time taken for probed function +# to run. +# When everything goes well, the result contain "_do_fork" +list6="kretprobe_example" +dmesg -c +modprobe "$list6" +lsmod | grep "$list6" +if [ $? -eq 0 ];then + dmesg | grep "_do_f
Re: [OE-core] [PATCH V3 1/1] linux-yocto: add ptest support
Please ignore this. On 2018年07月05日 12:09, Dengke Du wrote: Signed-off-by: Dengke Du --- meta/recipes-kernel/linux/linux-yocto/run-ptest | 144 meta/recipes-kernel/linux/linux-yocto_4.14.bb | 15 +++ 2 files changed, 159 insertions(+) create mode 100644 meta/recipes-kernel/linux/linux-yocto/run-ptest diff --git a/meta/recipes-kernel/linux/linux-yocto/run-ptest b/meta/recipes-kernel/linux/linux-yocto/run-ptest new file mode 100644 index 000..d8391b4 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto/run-ptest @@ -0,0 +1,144 @@ +#!/bin/bash +depmod +touch kernel.log + +# dma-example: This module shows how to handle fifo dma operations. +# bytestream-example: This module shows how to create a byte stream fifo. +# inttype-example: This module shows how to create a int type fifo. +# record-example: This module shows how to create a variable sized record fifo. +list1=("dma-example" "bytestream-example" "inttype-example" "record-example") +for i in "${list1[@]}" +do + dmesg -c + modprobe "$i" + mod=${i//-/_} + lsmod | grep -q "$mod" + if [ $? -eq 0 ];then +dmesg | grep "test passed" +if [ $? -eq 0 ];then + echo "PASS: $i" >> kernel.log +fi + else +echo "FAIL: $i" >> kernel.log + fi + rmmod "$i" +done + +# kobject-example: +/* + * This module shows how to create a simple subdirectory in sysfs called + * /sys/kernel/kobject-example In that directory, 3 files are created: + * "foo", "baz", and "bar". If an integer is written to these files, it can be + * later read out of it. + */ + +# kset-example: +/* + * This module shows how to create a kset in sysfs called + * /sys/kernel/kset-example + * Then tree kobjects are created and assigned to this kset, "foo", "baz", + * and "bar". In those kobjects, attributes of the same name are also + * created and if an integer is written to these files, it can be later + * read out of it. + */ + +list2=("kobject-example" "kset-example") +for i in "${list2[@]}" +do + dmesg -c + modprobe "$i" + mod=${i//-/_} + basedir="/sys/kernel/${mod}" + echo "$basedir" + if [ -e ${basedir}/bar -a -e ${basedir}/baz -a -e ${basedir}/foo ];then +echo "PASS: $i" >> kernel.log + else +echo "FAIL: $i" >> kernel.log + fi + rmmod "$i" +done + +# trace-events-sample +# This modules test trace-events for a thread "foo_bar", return string "foo_bar" when everything goes well. +list3="trace-events-sample" +mod=${list3//-/_} +modprobe "$list3" +lsmod | grep "$mod" +if [ $? -eq 0 ];then + if [ -e "/sys/kernel/debug/tracing/events/sample-trace" ];then +echo 1 > /sys/kernel/debug/tracing/events/sample-trace/enable +sleep 5 +ret=`cat /sys/kernel/debug/tracing/trace | grep hello | head -n1 | cut -d':' -f2` +if [ "$ret" = " foo_bar" ];then + echo "PASS: $list3" >> kernel.log +else + echo "FAIL: $list3" >> kernel.log +fi + else +echo "FAIL: $list3" >> kernel.log + fi +else + echo "FAILED: $list3" >> kernel.log +fi +rmmod "$list3" + +# trace-printk +# This modules just a simple test for trace-printk, return string "trace_printk_irq_work" when everything goes well. +list4="trace-printk" +modprobe "$list4" +lsmod | grep "trace_printk" +if [ $? -eq 0 ];then + ret=`cat /sys/kernel/debug/tracing/trace | grep trace_printk | head -n1 | cut -d':' -f2` + if [ "$ret" = " trace_printk_irq_work" ];then +echo "PASS: $list4" >> kernel.log + else +echo "FAIL: $list4" >> kernel.log + fi +else + echo "FAIL: $list4" >> kernel.log +fi +rmmod "$list4" + +# kprobe_example +# Here's a sample kernel module showing the use of kprobes to dump a +# stack trace and selected registers when _do_fork() is called. +list5="kprobe_example" +dmesg -c +modprobe "$list5" +lsmod | grep "$list5" +if [ $? -eq 0 ];then + dmesg | grep "_do_fork" + if [ $? -eq 0 ];then +echo "PASS: $list5" >> kernel.log + else +echo "FAIL: $list5" >> kernel.log + fi +else + echo "FAIL: $list5" >> kernel.log +fi +rmmod "$list5" + +# kretprobe_example +# Here's a sample kernel module showing the use of return probes to +# report the return value and total time taken for probed function +# to run. +# When everything goes well, the result contain "_do_fork" +list6="kretprobe_example" +dmesg -c +modprobe "$list6" +lsmod | g
[OE-core] [PATCH V3 0/1] linux-yocto: add ptest support
Changed in V3: 1. Add comments and documentation for the tests 2. Changed the results of the kernel ptest output in this format: "[PASS|SKIP|FAIL]" : testname, according to Lei yang's comments. The tests output: #result# PASS: dma-example PASS: bytestream-example PASS: inttype-example PASS: record-example PASS: kobject-example PASS: kset-example PASS: trace-events-sample PASS: trace-printk PASS: kprobe_example PASS: kretprobe_example The following changes since commit 611013a23a0082faa4fda2cd2529668965586a76: mesa: add lost Upstream-Status tag (2018-07-05 00:22:08 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/kernel-ptest https://github.com//tree/dengke/kernel-ptest Dengke Du (1): linux-yocto: add ptest support meta/recipes-kernel/linux/linux-yocto/run-ptest | 144 meta/recipes-kernel/linux/linux-yocto_4.14.bb | 15 +++ 2 files changed, 159 insertions(+) create mode 100644 meta/recipes-kernel/linux/linux-yocto/run-ptest -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 1/1] linux-yocto: add ptest support
Signed-off-by: Dengke Du --- meta/recipes-kernel/linux/linux-yocto/run-ptest | 144 meta/recipes-kernel/linux/linux-yocto_4.14.bb | 15 +++ 2 files changed, 159 insertions(+) create mode 100644 meta/recipes-kernel/linux/linux-yocto/run-ptest diff --git a/meta/recipes-kernel/linux/linux-yocto/run-ptest b/meta/recipes-kernel/linux/linux-yocto/run-ptest new file mode 100644 index 000..d8391b4 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto/run-ptest @@ -0,0 +1,144 @@ +#!/bin/bash +depmod +touch kernel.log + +# dma-example: This module shows how to handle fifo dma operations. +# bytestream-example: This module shows how to create a byte stream fifo. +# inttype-example: This module shows how to create a int type fifo. +# record-example: This module shows how to create a variable sized record fifo. +list1=("dma-example" "bytestream-example" "inttype-example" "record-example") +for i in "${list1[@]}" +do + dmesg -c + modprobe "$i" + mod=${i//-/_} + lsmod | grep -q "$mod" + if [ $? -eq 0 ];then +dmesg | grep "test passed" +if [ $? -eq 0 ];then + echo "PASS: $i" >> kernel.log +fi + else +echo "FAIL: $i" >> kernel.log + fi + rmmod "$i" +done + +# kobject-example: +/* + * This module shows how to create a simple subdirectory in sysfs called + * /sys/kernel/kobject-example In that directory, 3 files are created: + * "foo", "baz", and "bar". If an integer is written to these files, it can be + * later read out of it. + */ + +# kset-example: +/* + * This module shows how to create a kset in sysfs called + * /sys/kernel/kset-example + * Then tree kobjects are created and assigned to this kset, "foo", "baz", + * and "bar". In those kobjects, attributes of the same name are also + * created and if an integer is written to these files, it can be later + * read out of it. + */ + +list2=("kobject-example" "kset-example") +for i in "${list2[@]}" +do + dmesg -c + modprobe "$i" + mod=${i//-/_} + basedir="/sys/kernel/${mod}" + echo "$basedir" + if [ -e ${basedir}/bar -a -e ${basedir}/baz -a -e ${basedir}/foo ];then +echo "PASS: $i" >> kernel.log + else +echo "FAIL: $i" >> kernel.log + fi + rmmod "$i" +done + +# trace-events-sample +# This modules test trace-events for a thread "foo_bar", return string "foo_bar" when everything goes well. +list3="trace-events-sample" +mod=${list3//-/_} +modprobe "$list3" +lsmod | grep "$mod" +if [ $? -eq 0 ];then + if [ -e "/sys/kernel/debug/tracing/events/sample-trace" ];then +echo 1 > /sys/kernel/debug/tracing/events/sample-trace/enable +sleep 5 +ret=`cat /sys/kernel/debug/tracing/trace | grep hello | head -n1 | cut -d':' -f2` +if [ "$ret" = " foo_bar" ];then + echo "PASS: $list3" >> kernel.log +else + echo "FAIL: $list3" >> kernel.log +fi + else +echo "FAIL: $list3" >> kernel.log + fi +else + echo "FAILED: $list3" >> kernel.log +fi +rmmod "$list3" + +# trace-printk +# This modules just a simple test for trace-printk, return string "trace_printk_irq_work" when everything goes well. +list4="trace-printk" +modprobe "$list4" +lsmod | grep "trace_printk" +if [ $? -eq 0 ];then + ret=`cat /sys/kernel/debug/tracing/trace | grep trace_printk | head -n1 | cut -d':' -f2` + if [ "$ret" = " trace_printk_irq_work" ];then +echo "PASS: $list4" >> kernel.log + else +echo "FAIL: $list4" >> kernel.log + fi +else + echo "FAIL: $list4" >> kernel.log +fi +rmmod "$list4" + +# kprobe_example +# Here's a sample kernel module showing the use of kprobes to dump a +# stack trace and selected registers when _do_fork() is called. +list5="kprobe_example" +dmesg -c +modprobe "$list5" +lsmod | grep "$list5" +if [ $? -eq 0 ];then + dmesg | grep "_do_fork" + if [ $? -eq 0 ];then +echo "PASS: $list5" >> kernel.log + else +echo "FAIL: $list5" >> kernel.log + fi +else + echo "FAIL: $list5" >> kernel.log +fi +rmmod "$list5" + +# kretprobe_example +# Here's a sample kernel module showing the use of return probes to +# report the return value and total time taken for probed function +# to run. +# When everything goes well, the result contain "_do_fork" +list6="kretprobe_example" +dmesg -c +modprobe "$list6" +lsmod | grep "$list6" +if [ $? -eq 0 ];then + dmesg | grep "_do_f
Re: [OE-core] [PATCH V2 1/1] linux-yocto: add ptest support
On 2018年06月21日 20:57, Bruce Ashfield wrote: My general comment still stands from v1, That I don't see a lot of value in creating a whole set of custom tests and wrappers just for ptest use. i.e. ltp already has a lot of these covered. kprobes, as do the built-in self tests. The ltp doesn't contain kernel selftests, the kprobes in kernel samples directory just contain some easy test for kprobes. I want to be sure that we aren't creating custom wrappers that will need to be maintained for a long time. The maintaining work very little, because the kernel samples and kernel selftest's change were not constantly changing very much. Comments/documentation in the script don't exist, so it is difficult to look at this and understand what it is actually trying to test. A header block and comments before each test are required. Ok, I have complete it and will send V3. On Wed, Jun 13, 2018 at 10:49 PM, Dengke Du wrote: Signed-off-by: Dengke Du --- meta/recipes-kernel/linux/linux-yocto/run-ptest | 138 meta/recipes-kernel/linux/linux-yocto_4.14.bb | 9 ++ 2 files changed, 147 insertions(+) create mode 100644 meta/recipes-kernel/linux/linux-yocto/run-ptest diff --git a/meta/recipes-kernel/linux/linux-yocto/run-ptest b/meta/recipes-kernel/linux/linux-yocto/run-ptest new file mode 100644 index 000..6db4d93 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto/run-ptest @@ -0,0 +1,138 @@ +#!/bin/bash +depmod +touch kernel.log + +#dma-example bytestream-example inttype-example record-example +list1=("dma-example" "bytestream-example" "inttype-example" "record-example") +for i in "${list1[@]}" +do + dmesg -c + modprobe "$i" All of the modprobes really should be checking for failure, I realize you are doing some lsmod calls and checking those, but that isn't always the case in this script. Cheers, Bruce + result="" + IFS="-" read -ra array <<< "$i" + len=${#array[@]} + if [ $len -eq 2 ];then +result="${array[0]}_${array[1]}" + elif [ $len -eq 3 ];then +result="${array[0]}_${array[1]}_${array[2]}" + fi + lsmod | grep -q "$result" + if [ $? -eq 0 ];then +dmesg | grep "test passed" +if [ $? -eq 0 ];then + echo "$i: PASS" >> kernel.log +fi + else +echo "$i: FAILED" >> kernel.log + fi + rmmod "$i" +done + +#kobject-example kset-example +list2=("kobject-example" "kset-example") +for i in "${list2[@]}" +do + dmesg -c + modprobe "$i" + result="" + IFS="-" read -ra array <<< "$i" + len=${#array[@]} + if [ $len -eq 2 ];then +result="${array[0]}_${array[1]}" + elif [ $len -eq 3 ];then +result="${array[0]}_${array[1]}_${array[2]}" + fi + basedir="/sys/kernel/${result}" + echo "$basedir" + if [ -e ${basedir}/bar -a -e ${basedir}/baz -a -e ${basedir}/foo ];then +echo "$i: PASS" >> kernel.log + else +echo "$i: FAILED" >> kernel.log + fi + rmmod "$i" +done + +#trace-events-sample +list3="trace-events-sample" +result="" +IFS="-" read -ra array <<< "$list3" +len=${#array[@]} +if [ $len -eq 2 ];then + result="${array[0]}_${array[1]}" +elif [ $len -eq 3 ];then + result="${array[0]}_${array[1]}_${array[2]}" +fi +modprobe "$list3" +lsmod | grep "$result" +if [ $? -eq 0 ];then + if [ -e "/sys/kernel/debug/tracing/events/sample-trace" ];then +echo 1 > /sys/kernel/debug/tracing/events/sample-trace/enable +sleep 5 +ret=`cat /sys/kernel/debug/tracing/trace | grep hello | head -n1 | cut -d':' -f2` +if [ "$ret" = " foo_bar" ];then + echo "$list3: PASS" >> kernel.log +else + echo "$list3: FAILED-" >> kernel.log +fi + else +echo "$list3: FAILED--" >> kernel.log + fi +else + echo "$list3: FAILED---" >> kernel.log +fi +rmmod "$list3" + +#trace-printk +list4="trace-printk" +modprobe "$list4" +lsmod | grep "trace_printk" +if [ $? -eq 0 ];then + ret=`cat /sys/kernel/debug/tracing/trace | grep trace_printk | head -n1 | cut -d':' -f2` + if [ "$ret" = " trace_printk_irq_work" ];then +echo "$list4: PASS" >> kernel.log +rmmod "$list4" + else +echo "$list4: FAILED" >> kernel.log + fi +else + echo "$list4: FAILED" >> kernel.log +fi +rmmod "$list4" + +#kprobe_example +list5="kprobe_example" +dmesg -c +modprobe "$list5" +lsmod | grep "$list5" +if [ $? -eq 0 ];then + dmesg | grep &
[OE-core] [PATCH V2 0/1] linux-yocto: add ptest support
Changed in V2: Put the run-ptest script in linux-yocto directory. The following changes since commit ddbd7b0cd6580ee26e11aa87e426fb294b372d64: meta-yocto-bsp: bump to the latest linux stable kernel for edgerouter/beaglebone (2018-06-12 23:34:40 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git kernel-ptest https://github.com//tree/kernel-ptest Dengke Du (1): linux-yocto: add ptest support meta/recipes-kernel/linux/linux-yocto/run-ptest | 138 meta/recipes-kernel/linux/linux-yocto_4.14.bb | 9 ++ 2 files changed, 147 insertions(+) create mode 100644 meta/recipes-kernel/linux/linux-yocto/run-ptest -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/1] linux-yocto: add ptest support
Signed-off-by: Dengke Du --- meta/recipes-kernel/linux/linux-yocto/run-ptest | 138 meta/recipes-kernel/linux/linux-yocto_4.14.bb | 9 ++ 2 files changed, 147 insertions(+) create mode 100644 meta/recipes-kernel/linux/linux-yocto/run-ptest diff --git a/meta/recipes-kernel/linux/linux-yocto/run-ptest b/meta/recipes-kernel/linux/linux-yocto/run-ptest new file mode 100644 index 000..6db4d93 --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto/run-ptest @@ -0,0 +1,138 @@ +#!/bin/bash +depmod +touch kernel.log + +#dma-example bytestream-example inttype-example record-example +list1=("dma-example" "bytestream-example" "inttype-example" "record-example") +for i in "${list1[@]}" +do + dmesg -c + modprobe "$i" + result="" + IFS="-" read -ra array <<< "$i" + len=${#array[@]} + if [ $len -eq 2 ];then +result="${array[0]}_${array[1]}" + elif [ $len -eq 3 ];then +result="${array[0]}_${array[1]}_${array[2]}" + fi + lsmod | grep -q "$result" + if [ $? -eq 0 ];then +dmesg | grep "test passed" +if [ $? -eq 0 ];then + echo "$i: PASS" >> kernel.log +fi + else +echo "$i: FAILED" >> kernel.log + fi + rmmod "$i" +done + +#kobject-example kset-example +list2=("kobject-example" "kset-example") +for i in "${list2[@]}" +do + dmesg -c + modprobe "$i" + result="" + IFS="-" read -ra array <<< "$i" + len=${#array[@]} + if [ $len -eq 2 ];then +result="${array[0]}_${array[1]}" + elif [ $len -eq 3 ];then +result="${array[0]}_${array[1]}_${array[2]}" + fi + basedir="/sys/kernel/${result}" + echo "$basedir" + if [ -e ${basedir}/bar -a -e ${basedir}/baz -a -e ${basedir}/foo ];then +echo "$i: PASS" >> kernel.log + else +echo "$i: FAILED" >> kernel.log + fi + rmmod "$i" +done + +#trace-events-sample +list3="trace-events-sample" +result="" +IFS="-" read -ra array <<< "$list3" +len=${#array[@]} +if [ $len -eq 2 ];then + result="${array[0]}_${array[1]}" +elif [ $len -eq 3 ];then + result="${array[0]}_${array[1]}_${array[2]}" +fi +modprobe "$list3" +lsmod | grep "$result" +if [ $? -eq 0 ];then + if [ -e "/sys/kernel/debug/tracing/events/sample-trace" ];then +echo 1 > /sys/kernel/debug/tracing/events/sample-trace/enable +sleep 5 +ret=`cat /sys/kernel/debug/tracing/trace | grep hello | head -n1 | cut -d':' -f2` +if [ "$ret" = " foo_bar" ];then + echo "$list3: PASS" >> kernel.log +else + echo "$list3: FAILED-" >> kernel.log +fi + else +echo "$list3: FAILED--" >> kernel.log + fi +else + echo "$list3: FAILED---" >> kernel.log +fi +rmmod "$list3" + +#trace-printk +list4="trace-printk" +modprobe "$list4" +lsmod | grep "trace_printk" +if [ $? -eq 0 ];then + ret=`cat /sys/kernel/debug/tracing/trace | grep trace_printk | head -n1 | cut -d':' -f2` + if [ "$ret" = " trace_printk_irq_work" ];then +echo "$list4: PASS" >> kernel.log +rmmod "$list4" + else +echo "$list4: FAILED" >> kernel.log + fi +else + echo "$list4: FAILED" >> kernel.log +fi +rmmod "$list4" + +#kprobe_example +list5="kprobe_example" +dmesg -c +modprobe "$list5" +lsmod | grep "$list5" +if [ $? -eq 0 ];then + dmesg | grep "_do_fork" + if [ $? -eq 0 ];then +echo "$list5: PASS" >> kernel.log + else +echo "$list5: FAILED" >> kernel.log + fi +else + echo "$list5: FAILED" >> kernel.log +fi +rmmod "$list5" + +#kretprobe_example +list6="kretprobe_example" +dmesg -c +modprobe "$list6" +lsmod | grep "$list6" +if [ $? -eq 0 ];then + dmesg | grep "_do_fork returned" + if [ $? -eq 0 ];then +echo "$list6: PASS" >> kernel.log + else +echo "$list6: FAILED" >> kernel.log + fi +else + echo "$list6: FAILED" >> kernel.log +fi +rmmod "$list6" + +echo "#result#" +cat kernel.log +rm kernel.log diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb index 0449213..9650ee2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb @@ -45,3 +45,12 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +inherit ptest +SRC_URI_append = " file://run-ptest \ +" +do_install_ptest_append() { +install -D ${WORKDIR}/run-ptest ${D}${PTEST_PATH}/run-ptest +} +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", "features/kernel-sample/kernel-sample.scc", "", d)}" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/1] trace-cmd: add PACKAGECONFIG for audit
The following changes since commit 90a29096f47981e21e86594ca2310b659844c9c1: oe-pkgdata-util: package-info: Re-add support for the --extra option (2018-06-04 15:15:00 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/trace-cmd https://github.com//tree/dengke/trace-cmd Dengke Du (1): trace-cmd: add PACKAGECONFIG for audit meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/1] trace-cmd: add PACKAGECONFIG for audit
Signed-off-by: Dengke Du --- meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb index 27c7c19..d9cc9a7 100644 --- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb +++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb @@ -10,6 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \ " +PACKAGECONFIG ??= "" +PACKAGECONFIG[audit] = ',NO_AUDIT=1,audit' EXTRA_OEMAKE = "\ 'prefix=${prefix}' \ 'bindir=${bindir}' \ @@ -21,6 +23,7 @@ EXTRA_OEMAKE = "\ 'libdir=${libdir}' \ \ NO_PYTHON=1 \ +${PACKAGECONFIG_CONFARGS} \ " do_compile_prepend() { -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] linux-yocto: add ptest support
On 2018年05月31日 22:08, lei yang wrote: hi dengke, some of the kernel modules were rmmod-ed twice, some of them forget to be rmmod-ed when it fails, please take a look. Thanks, after bruce update the SRCREV for kernel meta, I will send v2. Lei On 2018年05月31日 12:19, Bruce Ashfield wrote: On Wed, May 30, 2018 at 11:08 PM, Dengke Du <mailto:dengke...@windriver.com>> wrote: Signed-off-by: Dengke Du mailto:dengke...@windriver.com>> --- meta/recipes-kernel/linux/files/run-ptest | 138 ++ Nothing else in linux-yocto uses "files", and this shouldn't either. We can't guarantee that these are version independent, so they need to be in a versioned kernel subdirectory. meta/recipes-kernel/linux/linux-yocto.inc | 8 ++ meta/recipes-kernel/linux/linux-yocto_4.14.bb <http://linux-yocto_4.14.bb> | 2 +- 3 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/linux/files/run-ptest diff --git a/meta/recipes-kernel/linux/files/run-ptest b/meta/recipes-kernel/linux/files/run-ptest new file mode 100644 index 000..a3d9e14 --- /dev/null +++ b/meta/recipes-kernel/linux/files/run-ptest @@ -0,0 +1,138 @@ +#!/bin/bash This script should have a license and proper header file. Also, if the ptests are mainly trace/sample related, name the script to indicate that. The kernel already has a significant number of selftests, which are likely better than these ptests. Is there any reason why they aren't being used instead ? +depmod +touch kernel.log + +#dma-example bytestream-example inttype-example record-example +list1=("dma-example" "bytestream-example" "inttype-example" "record-example") +for i in "${list1[@]}" +do + dmesg -c + modprobe "$i" + result="" + IFS="-" read -ra array <<< "$i" + len=${#array[@]} + if [ $len -eq 2 ];then + result="${array[0]}_${array[1]}" + elif [ $len -eq 3 ];then + result="${array[0]}_${array[1]}_${array[2]}" + fi + lsmod | grep -q "$result" + if [ $? -eq 0 ];then + dmesg | grep "test passed" + if [ $? -eq 0 ];then + echo "$i: PASS" >> kernel.log + fi + rmmod "$i" + else + echo "$i: FAILED" >> kernel.log + fi +done + +#kobject-example kset-example +list2=("kobject-example" "kset-example") +for i in "${list2[@]}" +do + dmesg -c + modprobe "$i" + result="" + IFS="-" read -ra array <<< "$i" + len=${#array[@]} + if [ $len -eq 2 ];then + result="${array[0]}_${array[1]}" + elif [ $len -eq 3 ];then + result="${array[0]}_${array[1]}_${array[2]}" + fi + basedir="/sys/kernel/${result}" + echo "$basedir" + if [ -e ${basedir}/bar -a -e ${basedir}/baz -a -e ${basedir}/foo ];then + echo "$i: PASS" >> kernel.log + rmmod "$i" + else + echo "$i: FAILED" >> kernel.log + fi +done + +#trace-events-sample +list3="trace-events-sample" +result="" +IFS="-" read -ra array <<< "$list3" +len=${#array[@]} +if [ $len -eq 2 ];then + result="${array[0]}_${array[1]}" +elif [ $len -eq 3 ];then + result="${array[0]}_${array[1]}_${array[2]}" +fi +modprobe "$list3" +lsmod | grep "$result" +if [ $? -eq 0 ];then + if [ -e "/sys/kernel/debug/tracing/events/sample-trace" ];then + echo 1 > /sys/kernel/debug/tracing/events/sample-trace/enable + sleep 5 + ret=`cat /sys/kernel/debug/tracing/trace | grep hello | head -n1 | cut -d':' -f2` + if [ "$ret" = " foo_bar" ];then + echo "$list3: PASS" >> kernel.log + else + echo "$list3: FAILED-" >> kernel.log + fi + else + echo "$list3: FAILED--" >> kernel.log + fi +else + echo "$list3: FAILED---" >> kernel.log +fi +rmmod "$list3" + +#trace-printk +list4="trace-printk" +modprobe "$list4" +lsmod | grep "trace_printk" +if [ $? -eq 0 ];then + ret=`cat /sys/kernel/debug/tracing/trace | grep trace_printk | head -n1 | cut -d':' -f2` + if [ "$ret" = " trace_printk_irq_work" ];then + echo "$list4: PASS" >> kernel.log + rmmod "
Re: [OE-core] [PATCH 1/1] linux-yocto: add ptest support
On 2018年05月31日 12:19, Bruce Ashfield wrote: On Wed, May 30, 2018 at 11:08 PM, Dengke Du <mailto:dengke...@windriver.com>> wrote: Signed-off-by: Dengke Du mailto:dengke...@windriver.com>> --- meta/recipes-kernel/linux/files/run-ptest | 138 ++ Nothing else in linux-yocto uses "files", and this shouldn't either. We can't guarantee that these are version independent, so they need to be in a versioned kernel subdirectory. Ok, I will put it in versioned kernel subdirectory. meta/recipes-kernel/linux/linux-yocto.inc | 8 ++ meta/recipes-kernel/linux/linux-yocto_4.14.bb <http://linux-yocto_4.14.bb> | 2 +- 3 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/linux/files/run-ptest diff --git a/meta/recipes-kernel/linux/files/run-ptest b/meta/recipes-kernel/linux/files/run-ptest new file mode 100644 index 000..a3d9e14 --- /dev/null +++ b/meta/recipes-kernel/linux/files/run-ptest @@ -0,0 +1,138 @@ +#!/bin/bash This script should have a license and proper header file. Also, if the ptests are mainly trace/sample related, name the script to indicate that. Ok. The kernel already has a significant number of selftests, which are likely better than these ptests. Is there any reason why they aren't being used instead ? This is different to selftests, this ptest was based on kernel samples in sample directory, those samples were some tutorial modules, the modules that we can modify it and learn it(some basic kernel theory), in the end build it into our image to test and verification our thought easily. +depmod +touch kernel.log + +#dma-example bytestream-example inttype-example record-example +list1=("dma-example" "bytestream-example" "inttype-example" "record-example") +for i in "${list1[@]}" +do + dmesg -c + modprobe "$i" + result="" + IFS="-" read -ra array <<< "$i" + len=${#array[@]} + if [ $len -eq 2 ];then + result="${array[0]}_${array[1]}" + elif [ $len -eq 3 ];then + result="${array[0]}_${array[1]}_${array[2]}" + fi + lsmod | grep -q "$result" + if [ $? -eq 0 ];then + dmesg | grep "test passed" + if [ $? -eq 0 ];then + echo "$i: PASS" >> kernel.log + fi + rmmod "$i" + else + echo "$i: FAILED" >> kernel.log + fi +done + +#kobject-example kset-example +list2=("kobject-example" "kset-example") +for i in "${list2[@]}" +do + dmesg -c + modprobe "$i" + result="" + IFS="-" read -ra array <<< "$i" + len=${#array[@]} + if [ $len -eq 2 ];then + result="${array[0]}_${array[1]}" + elif [ $len -eq 3 ];then + result="${array[0]}_${array[1]}_${array[2]}" + fi + basedir="/sys/kernel/${result}" + echo "$basedir" + if [ -e ${basedir}/bar -a -e ${basedir}/baz -a -e ${basedir}/foo ];then + echo "$i: PASS" >> kernel.log + rmmod "$i" + else + echo "$i: FAILED" >> kernel.log + fi +done + +#trace-events-sample +list3="trace-events-sample" +result="" +IFS="-" read -ra array <<< "$list3" +len=${#array[@]} +if [ $len -eq 2 ];then + result="${array[0]}_${array[1]}" +elif [ $len -eq 3 ];then + result="${array[0]}_${array[1]}_${array[2]}" +fi +modprobe "$list3" +lsmod | grep "$result" +if [ $? -eq 0 ];then + if [ -e "/sys/kernel/debug/tracing/events/sample-trace" ];then + echo 1 > /sys/kernel/debug/tracing/events/sample-trace/enable + sleep 5 + ret=`cat /sys/kernel/debug/tracing/trace | grep hello | head -n1 | cut -d':' -f2` + if [ "$ret" = " foo_bar" ];then + echo "$list3: PASS" >> kernel.log + else + echo "$list3: FAILED-" >> kernel.log + fi + else + echo "$list3: FAILED--" >> kernel.log + fi +else + echo "$list3: FAILED---" >> kernel.log +fi +rmmod "$list3" + +#trace-printk +list4="trace-printk" +modprobe "$list4" +lsmod | grep "trace_printk" +if [ $? -eq 0 ];then + ret=`cat /sys/kernel/debug/tracing/trace | grep trace_printk | head -n1 | cut -d':' -f2` + if [ "$ret" = " trace_printk_irq
[OE-core] [PATCH 0/1] linux-yocto: add ptest support
Add ptest for kernel samples. Prerequisite: 1. Install package kernel-modules 2. enable ptest distro feature Runtime testing(x86): 1. cd /usr/lib/linux-yocto/ptest 2. ./run-ptest Testing result: #result# dma-example: PASS bytestream-example: PASS inttype-example: PASS record-example: PASS kobject-example: PASS kset-example: PASS trace-events-sample: PASS trace-printk: PASS kprobe_example: PASS kretprobe_example: PASS The following changes since commit 719d068bde55ef29a3468bc0779d4cb0c11e8c1d: bitbake: fetch2: fix import error for Python 3.6.5 (2018-05-29 21:07:46 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/dev https://github.com//tree/dengke/dev Dengke Du (1): linux-yocto: add ptest support meta/recipes-kernel/linux/files/run-ptest | 138 ++ meta/recipes-kernel/linux/linux-yocto.inc | 8 ++ meta/recipes-kernel/linux/linux-yocto_4.14.bb | 2 +- 3 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/linux/files/run-ptest -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] linux-yocto: add ptest support
Signed-off-by: Dengke Du --- meta/recipes-kernel/linux/files/run-ptest | 138 ++ meta/recipes-kernel/linux/linux-yocto.inc | 8 ++ meta/recipes-kernel/linux/linux-yocto_4.14.bb | 2 +- 3 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/linux/files/run-ptest diff --git a/meta/recipes-kernel/linux/files/run-ptest b/meta/recipes-kernel/linux/files/run-ptest new file mode 100644 index 000..a3d9e14 --- /dev/null +++ b/meta/recipes-kernel/linux/files/run-ptest @@ -0,0 +1,138 @@ +#!/bin/bash +depmod +touch kernel.log + +#dma-example bytestream-example inttype-example record-example +list1=("dma-example" "bytestream-example" "inttype-example" "record-example") +for i in "${list1[@]}" +do + dmesg -c + modprobe "$i" + result="" + IFS="-" read -ra array <<< "$i" + len=${#array[@]} + if [ $len -eq 2 ];then +result="${array[0]}_${array[1]}" + elif [ $len -eq 3 ];then +result="${array[0]}_${array[1]}_${array[2]}" + fi + lsmod | grep -q "$result" + if [ $? -eq 0 ];then +dmesg | grep "test passed" +if [ $? -eq 0 ];then + echo "$i: PASS" >> kernel.log +fi +rmmod "$i" + else +echo "$i: FAILED" >> kernel.log + fi +done + +#kobject-example kset-example +list2=("kobject-example" "kset-example") +for i in "${list2[@]}" +do + dmesg -c + modprobe "$i" + result="" + IFS="-" read -ra array <<< "$i" + len=${#array[@]} + if [ $len -eq 2 ];then +result="${array[0]}_${array[1]}" + elif [ $len -eq 3 ];then +result="${array[0]}_${array[1]}_${array[2]}" + fi + basedir="/sys/kernel/${result}" + echo "$basedir" + if [ -e ${basedir}/bar -a -e ${basedir}/baz -a -e ${basedir}/foo ];then +echo "$i: PASS" >> kernel.log +rmmod "$i" + else +echo "$i: FAILED" >> kernel.log + fi +done + +#trace-events-sample +list3="trace-events-sample" +result="" +IFS="-" read -ra array <<< "$list3" +len=${#array[@]} +if [ $len -eq 2 ];then + result="${array[0]}_${array[1]}" +elif [ $len -eq 3 ];then + result="${array[0]}_${array[1]}_${array[2]}" +fi +modprobe "$list3" +lsmod | grep "$result" +if [ $? -eq 0 ];then + if [ -e "/sys/kernel/debug/tracing/events/sample-trace" ];then +echo 1 > /sys/kernel/debug/tracing/events/sample-trace/enable +sleep 5 +ret=`cat /sys/kernel/debug/tracing/trace | grep hello | head -n1 | cut -d':' -f2` +if [ "$ret" = " foo_bar" ];then + echo "$list3: PASS" >> kernel.log +else + echo "$list3: FAILED-" >> kernel.log +fi + else +echo "$list3: FAILED--" >> kernel.log + fi +else + echo "$list3: FAILED---" >> kernel.log +fi +rmmod "$list3" + +#trace-printk +list4="trace-printk" +modprobe "$list4" +lsmod | grep "trace_printk" +if [ $? -eq 0 ];then + ret=`cat /sys/kernel/debug/tracing/trace | grep trace_printk | head -n1 | cut -d':' -f2` + if [ "$ret" = " trace_printk_irq_work" ];then +echo "$list4: PASS" >> kernel.log +rmmod "$list4" + else +echo "$list4: FAILED" >> kernel.log + fi +else + echo "$list4: FAILED" >> kernel.log +fi +rmmod "$list4" + +#kprobe_example +list5="kprobe_example" +dmesg -c +modprobe "$list5" +lsmod | grep "$list5" +if [ $? -eq 0 ];then + dmesg | grep "_do_fork" + if [ $? -eq 0 ];then +echo "$list5: PASS" >> kernel.log + else +echo "$list5: FAILED" >> kernel.log + fi +else + echo "$list5: FAILED" >> kernel.log +fi +rmmod "$list5" + +#kretprobe_example +list6="kretprobe_example" +dmesg -c +modprobe "$list6" +lsmod | grep "$list6" +if [ $? -eq 0 ];then + dmesg | grep "_do_fork returned" + if [ $? -eq 0 ];then +echo "$list6: PASS" >> kernel.log + else +echo "$list6: FAILED" >> kernel.log + fi +else + echo "$list6: FAILED" >> kernel.log +fi +rmmod "$list6" + +echo "#result#" +cat kernel.log +rm kernel.log diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 95ec2a2..7e1773e 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -67,3 +67,11 @@ do_install_append(){ addtask kernel_v
[OE-core] [PATCH 1/1] python2-dev: improve reproducibility
oe-core has fixed it for python3, we can apply it to python2, the origin commit id: e21723bb9b6035714268eeab5f43e2d1cb798a0d We can check it here: http://git.openembedded.org/openembedded-core/commit/?id=e21723bb9b6035714268eeab5f43e2d1cb798a0d Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-devtools/python/python_2.7.13.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/python/python_2.7.13.bb b/meta/recipes-devtools/python/python_2.7.13.bb index 754c029..8075204 100644 --- a/meta/recipes-devtools/python/python_2.7.13.bb +++ b/meta/recipes-devtools/python/python_2.7.13.bb @@ -140,6 +140,10 @@ py_package_preprocess () { # Remove references to buildmachine paths in target Makefile and _sysconfigdata sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + -e 's:${RECIPE_SYSROOT}::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile \ ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py python -m py_compile ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] python2-dev: improve reproducibility
The following changes since commit b9dcab772fd37ed8376a87d3194195e13ff52d10: qemu: CVE-2017-17381 (2018-01-14 09:11:58 +) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/python2-dev https://github.com//tree/dengke/python2-dev Dengke Du (1): python2-dev: improve reproducibility meta/recipes-devtools/python/python_2.7.13.bb | 4 1 file changed, 4 insertions(+) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [rocko][PATCH] ltp: remove ltp-staticdev package
The nm01 testcase runtime depends on a static library, and ltp-staticdev package is entirely pointless, so remove it and add the static libraries to ltp main package and skip the "staticdev" checks. (From OE-Core rev: 002f7b9f038b86b793b8e0558bcd17ad58372767) Signed-off-by: Dengke Du <dengke...@windriver.com> Signed-off-by: Ross Burton <ross.bur...@intel.com> Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> --- meta/recipes-extended/ltp/ltp_20170516.bb | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb b/meta/recipes-extended/ltp/ltp_20170516.bb index 653cbfd..3cf42e9 100644 --- a/meta/recipes-extended/ltp/ltp_20170516.bb +++ b/meta/recipes-extended/ltp/ltp_20170516.bb @@ -106,15 +106,13 @@ RDEPENDS_${PN} = "\ which \ " -FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a /opt/ltp/testcases/data/nm01/lib.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/*" +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/* /opt/ltp/testcases/data/nm01/lib.a /opt/ltp/lib/libmem.a" # Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" # However, test_arch_stripped is already stripped, so... -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP_${PN} += "already-stripped staticdev" # Avoid file dependency scans, as LTP checks for things that may or may not # exist on the running system. For instance it has specific checks for -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/1] ltp: remove ltp-staticdev package
The nm01 testcase runtime depends on a static library, and ltp-staticdev package is entirely pointless, so remove it and add the static libraries to ltp main package and skip the "staticdev" checks. Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-extended/ltp/ltp_20170929.bb | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp_20170929.bb b/meta/recipes-extended/ltp/ltp_20170929.bb index 8a870b3..aaa7c93 100644 --- a/meta/recipes-extended/ltp/ltp_20170929.bb +++ b/meta/recipes-extended/ltp/ltp_20170929.bb @@ -106,15 +106,13 @@ RDEPENDS_${PN} = "\ which \ " -FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a /opt/ltp/testcases/data/nm01/lib.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/*" +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/* /opt/ltp/testcases/data/nm01/lib.a /opt/ltp/lib/libmem.a" # Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" # However, test_arch_stripped is already stripped, so... -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP_${PN} += "already-stripped staticdev" # Avoid file dependency scans, as LTP checks for things that may or may not # exist on the running system. For instance it has specific checks for -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/1] ltp: remove ltp-staticdev package
Changed in V2: Remove the pointless package: ltp-staticdev. The following changes since commit 4469acdf1d0338220f3fe2ecb5e079eea6fda375: lib/oe/utils: remove param_bool() (2017-12-02 11:25:34 +) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git fix-nm01-failed https://github.com//tree/fix-nm01-failed Dengke Du (1): ltp: remove ltp-staticdev package meta/recipes-extended/ltp/ltp_20170929.bb | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] ltp: add runtime depends ltp-staticdev
The test case nm01 depends on /opt/ltp/testcases/data/nm01/lib.a in ltp-staticdev package. Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-extended/ltp/ltp_20170929.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/ltp/ltp_20170929.bb b/meta/recipes-extended/ltp/ltp_20170929.bb index 93a59b3..6fd280c 100644 --- a/meta/recipes-extended/ltp/ltp_20170929.bb +++ b/meta/recipes-extended/ltp/ltp_20170929.bb @@ -108,6 +108,7 @@ RDEPENDS_${PN} = "\ FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a /opt/ltp/testcases/data/nm01/lib.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/*" +RDEPENDES_${PN} += "${PN}-staticdev" # Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails INHIBIT_PACKAGE_STRIP = "1" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] ltp: add runtime depends ltp-staticdev
The following changes since commit ed48e7b4f0d11bf20e0be44d8403fc16dd6d4411: usbutils: remove uclibc-specific patch (2017-11-30 10:49:22 +) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git fix-nm01-failed https://github.com//tree/fix-nm01-failed Dengke Du (1): ltp: add runtime depends ltp-staticdev meta/recipes-extended/ltp/ltp_20170929.bb | 1 + 1 file changed, 1 insertion(+) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] expat: upgrade to 2.2.5
The following changes since commit 514a808f21c37b6ad704ce397bb2740ecc9a93bc: ref-manual: Updates to "Image Generation" section. (2017-10-30 15:55:08 +) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/expat-2.2.5 https://github.com//tree/dengke/expat-2.2.5 Dengke Du (1): expat: upgrade to 2.2.5 meta/recipes-core/expat/expat/libtool-tag.patch | 34 + meta/recipes-core/expat/expat_2.2.3.bb | 4 --- meta/recipes-core/expat/expat_2.2.5.bb | 4 +++ 3 files changed, 27 insertions(+), 15 deletions(-) delete mode 100644 meta/recipes-core/expat/expat_2.2.3.bb create mode 100644 meta/recipes-core/expat/expat_2.2.5.bb -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] expat: upgrade to 2.2.5
Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-core/expat/expat/libtool-tag.patch | 34 + meta/recipes-core/expat/expat_2.2.3.bb | 4 --- meta/recipes-core/expat/expat_2.2.5.bb | 4 +++ 3 files changed, 27 insertions(+), 15 deletions(-) delete mode 100644 meta/recipes-core/expat/expat_2.2.3.bb create mode 100644 meta/recipes-core/expat/expat_2.2.5.bb diff --git a/meta/recipes-core/expat/expat/libtool-tag.patch b/meta/recipes-core/expat/expat/libtool-tag.patch index 3ef4197..0a0aed2 100644 --- a/meta/recipes-core/expat/expat/libtool-tag.patch +++ b/meta/recipes-core/expat/expat/libtool-tag.patch @@ -1,18 +1,30 @@ +From 10342e6b600858b091bc7771e454d9e06af06410 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.k...@gmail.com> +Date: Thu, 2 Nov 2017 18:20:57 +0800 +Subject: [PATCH] Add CC tag to build + Add CC tag to build Upstream-Status: Pending Signed-off-by: Khem Raj <raj.k...@gmail.com> +Signed-off-by: Dengke Du <dengke...@windriver.com> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: expat-2.2.2/Makefile.in -=== expat-2.2.2.orig/Makefile.in -+++ expat-2.2.2/Makefile.in -@@ -109,7 +109,7 @@ mkdir-init: - - CC = @CC@ - CXX = @CXX@ +diff --git a/Makefile.in b/Makefile.in +index 9560a95..d444bd6 100644 +--- a/Makefile.in b/Makefile.in +@@ -319,7 +319,7 @@ LIBCURRENT = @LIBCURRENT@ + LIBOBJS = @LIBOBJS@ + LIBREVISION = @LIBREVISION@ + LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ +LIBTOOL = @LIBTOOL@ --tag CC - - INCLUDES = -I$(srcdir)/lib -I. - LDFLAGS = @LDFLAGS@ + LIPO = @LIPO@ + LN_S = @LN_S@ + LTLIBOBJS = @LTLIBOBJS@ +-- +2.7.4 + diff --git a/meta/recipes-core/expat/expat_2.2.3.bb b/meta/recipes-core/expat/expat_2.2.3.bb deleted file mode 100644 index abf8450..000 --- a/meta/recipes-core/expat/expat_2.2.3.bb +++ /dev/null @@ -1,4 +0,0 @@ -require expat.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" -SRC_URI[md5sum] = "f053af63ef5f39bd9b78d01fbc203334" -SRC_URI[sha256sum] = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f" diff --git a/meta/recipes-core/expat/expat_2.2.5.bb b/meta/recipes-core/expat/expat_2.2.5.bb new file mode 100644 index 000..337287b --- /dev/null +++ b/meta/recipes-core/expat/expat_2.2.5.bb @@ -0,0 +1,4 @@ +require expat.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" +SRC_URI[md5sum] = "789e297f547980fc9ecc036f9a070d49" +SRC_URI[sha256sum] = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] avahi: upgrade to 0.7
On 2017年11月01日 03:20, Khem Raj wrote: On Mon, Oct 30, 2017 at 11:44 PM, Dengke Du <dengke...@windriver.com> wrote: Delete the unneeded patch, because the upstream contains the needed changes. The new version of avahi 0.7 use "/run" directory to place some run-time variable data, not /var/run, so in avahi.inc, we should remove the "/run" not "/var/run". if var/run is not empty then the content should be deleted as well. Hi Khem, Yes, but the installation would not create the /var/run directory. Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb} | 6 ++--- meta/recipes-connectivity/avahi/avahi.inc | 11 +++- .../avahi/{avahi_0.6.32.bb => avahi_0.7.bb}| 6 ++--- ...c-install-GtkBuilder-interface-files-for-.patch | 29 - .../files/avahi-fix-resource-unavaiable.patch | 30 -- 5 files changed, 7 insertions(+), 75 deletions(-) rename meta/recipes-connectivity/avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb} (89%) rename meta/recipes-connectivity/avahi/{avahi_0.6.32.bb => avahi_0.7.bb} (78%) delete mode 100644 meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch delete mode 100644 meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb similarity index 89% rename from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb rename to meta/recipes-connectivity/avahi/avahi-ui_0.7.bb index ac36461..5648e38 100644 --- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb +++ b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb @@ -9,9 +9,8 @@ require avahi.inc inherit distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI += "file://0001-configure.ac-install-GtkBuilder-interface-files-for-.patch" -SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013" -SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454" +SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6" +SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804" DEPENDS += "avahi" @@ -52,7 +51,6 @@ do_install_append () { rm ${D}${libdir}/pkgconfig/avahi-g* rm ${D}${sbindir} -rf rm ${D}${datadir}/avahi/a* - rm ${D}${datadir}/avahi/s* rm ${D}${datadir}/locale/ -rf rm ${D}${datadir}/dbus* -rf rm ${D}${mandir}/man1/a* diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 7814464..e9819bf 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -33,11 +33,11 @@ PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" PACKAGECONFIG[pygtk] = "--enable-pygtk,--disable-pygtk," USERADD_PACKAGES = "avahi-daemon avahi-autoipd" -USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ +USERADD_PARAM_avahi-daemon = "--system --home /run/avahi-daemon \ --no-create-home --shell /bin/false \ --user-group avahi" -USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \ +USERADD_PARAM_avahi-autoipd = "--system --home /run/avahi-autoipd \ --no-create-home --shell /bin/false \ --user-group \ -c \"Avahi autoip daemon\" \ @@ -125,12 +125,7 @@ INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" do_install() { autotools_do_install - - # don't install /var/run when populating rootfs. Do it through volatile - # /var/run of current version is empty, so just remove it. - # if /var/run become non-empty in the future, need to install it via volatile - rm -rf ${D}${localstatedir}/run - rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + rm -rf ${D}/run rm -rf ${D}${datadir}/dbus-1/interfaces test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 rm -rf ${D}${libdir}/avahi diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi_0.7.bb similarity index 78% rename from meta/recipes-connectivity/avahi/avahi_0.6.32.bb rename to meta/recipes-connectivity/avahi/avahi_0.7.bb index bfa6304..7c91f10 100644 --- a/meta/recipes-connectivity/avahi/avahi_0.6.32.bb +++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb @@ -12,10 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://avahi-daemon/main.c;endline=21;md5
[OE-core] [PATCH 0/1] avahi: upgrade to 0.7
The following changes since commit 65d23bd7986615fdfb0f1717b615534a2a14ab80: README.qemu: qemuppc64 is not supported (2017-10-16 23:54:31 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/avahi-0.7 https://github.com//tree/dengke/avahi-0.7 Dengke Du (1): avahi: upgrade to 0.7 .../avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb} | 6 ++--- meta/recipes-connectivity/avahi/avahi.inc | 11 +++- .../avahi/{avahi_0.6.32.bb => avahi_0.7.bb}| 6 ++--- ...c-install-GtkBuilder-interface-files-for-.patch | 29 - .../files/avahi-fix-resource-unavaiable.patch | 30 -- 5 files changed, 7 insertions(+), 75 deletions(-) rename meta/recipes-connectivity/avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb} (89%) rename meta/recipes-connectivity/avahi/{avahi_0.6.32.bb => avahi_0.7.bb} (78%) delete mode 100644 meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch delete mode 100644 meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] avahi: upgrade to 0.7
Delete the unneeded patch, because the upstream contains the needed changes. The new version of avahi 0.7 use "/run" directory to place some run-time variable data, not /var/run, so in avahi.inc, we should remove the "/run" not "/var/run". Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb} | 6 ++--- meta/recipes-connectivity/avahi/avahi.inc | 11 +++- .../avahi/{avahi_0.6.32.bb => avahi_0.7.bb}| 6 ++--- ...c-install-GtkBuilder-interface-files-for-.patch | 29 - .../files/avahi-fix-resource-unavaiable.patch | 30 -- 5 files changed, 7 insertions(+), 75 deletions(-) rename meta/recipes-connectivity/avahi/{avahi-ui_0.6.32.bb => avahi-ui_0.7.bb} (89%) rename meta/recipes-connectivity/avahi/{avahi_0.6.32.bb => avahi_0.7.bb} (78%) delete mode 100644 meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch delete mode 100644 meta/recipes-connectivity/avahi/files/avahi-fix-resource-unavaiable.patch diff --git a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb similarity index 89% rename from meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb rename to meta/recipes-connectivity/avahi/avahi-ui_0.7.bb index ac36461..5648e38 100644 --- a/meta/recipes-connectivity/avahi/avahi-ui_0.6.32.bb +++ b/meta/recipes-connectivity/avahi/avahi-ui_0.7.bb @@ -9,9 +9,8 @@ require avahi.inc inherit distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI += "file://0001-configure.ac-install-GtkBuilder-interface-files-for-.patch" -SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013" -SRC_URI[sha256sum] = "d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454" +SRC_URI[md5sum] = "d76c59d0882ac6c256d70a2a585362a6" +SRC_URI[sha256sum] = "57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804" DEPENDS += "avahi" @@ -52,7 +51,6 @@ do_install_append () { rm ${D}${libdir}/pkgconfig/avahi-g* rm ${D}${sbindir} -rf rm ${D}${datadir}/avahi/a* - rm ${D}${datadir}/avahi/s* rm ${D}${datadir}/locale/ -rf rm ${D}${datadir}/dbus* -rf rm ${D}${mandir}/man1/a* diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc index 7814464..e9819bf 100644 --- a/meta/recipes-connectivity/avahi/avahi.inc +++ b/meta/recipes-connectivity/avahi/avahi.inc @@ -33,11 +33,11 @@ PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" PACKAGECONFIG[pygtk] = "--enable-pygtk,--disable-pygtk," USERADD_PACKAGES = "avahi-daemon avahi-autoipd" -USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \ +USERADD_PARAM_avahi-daemon = "--system --home /run/avahi-daemon \ --no-create-home --shell /bin/false \ --user-group avahi" -USERADD_PARAM_avahi-autoipd = "--system --home /var/run/avahi-autoipd \ +USERADD_PARAM_avahi-autoipd = "--system --home /run/avahi-autoipd \ --no-create-home --shell /bin/false \ --user-group \ -c \"Avahi autoip daemon\" \ @@ -125,12 +125,7 @@ INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" do_install() { autotools_do_install - - # don't install /var/run when populating rootfs. Do it through volatile - # /var/run of current version is empty, so just remove it. - # if /var/run become non-empty in the future, need to install it via volatile - rm -rf ${D}${localstatedir}/run - rmdir --ignore-fail-on-non-empty ${D}${localstatedir} + rm -rf ${D}/run rm -rf ${D}${datadir}/dbus-1/interfaces test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1 rm -rf ${D}${libdir}/avahi diff --git a/meta/recipes-connectivity/avahi/avahi_0.6.32.bb b/meta/recipes-connectivity/avahi/avahi_0.7.bb similarity index 78% rename from meta/recipes-connectivity/avahi/avahi_0.6.32.bb rename to meta/recipes-connectivity/avahi/avahi_0.7.bb index bfa6304..7c91f10 100644 --- a/meta/recipes-connectivity/avahi/avahi_0.6.32.bb +++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb @@ -12,10 +12,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://avahi-daemon/main.c;endline=21;md5=9ee77368c5407af77caaef1b07285969 \ file://avahi-client/client.h;endline=23;md5=f4ac741a25c4f434039ba3e18c8674cf" -SRC_URI += "file://avahi-fix-resource-unavaiable.patch" - -SRC_URI[md5sum] = "22b5e705d3eabb31d26f2e1e7b074013" -SRC_URI[sha256sum] = "d549
Re: [OE-core] avahi 0.7 : should we need to package /run directory or delete it?
Hi Alex Sorry, nothing placed in /run in 0.7 version now, but it replace the directory /var/run, there are some difference between /run and /var/run, we can reference: https://lists.archlinux.org/pipermail/arch-projects/2011-March/000517.html I just doubt can we remove /run directly like we remove /var/run in 0.6.32 version bbfile. In 0.6.32 Makefile of avahi: avahi_runtime_dir = /var/run avahi_socket = /var/run/avahi-daemon/socket In 0.7 Makefile of avahi: avahi_runtime_dir = /run avahi_socket = /run/avahi-daemon/socket On 2017年10月30日 17:02, Alexander Kanavin wrote: On 10/30/2017 09:21 AM, Dengke Du wrote: The new version of avahi 0.7 use /run directory to place some run-time variable data, not /var/run, should we need to package it or delete it? Can you provide details please? What is being placed there and at which point? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] avahi 0.7 : should we need to package /run directory or delete it?
Hi Ross The new version of avahi 0.7 use /run directory to place some run-time variable data, not /var/run, should we need to package it or delete it? Thanks! Dengke -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] ltp: upgrade to 20170929
delete two patches, because upstream already contain those: 0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch 0038-commands-gdb01-replace-stdin-with-dev-null.patch add one patch, fix build when set the DISTRO to poky-lsb: 0037-ltp-fix-format-security-error.patch Signed-off-by: Dengke Du <dengke...@windriver.com> --- ...E_SIZE-redefinition-and-O_CREAT-undeclear.patch | 113 - .../ltp/0037-ltp-fix-format-security-error.patch | 36 +++ ...ommands-gdb01-replace-stdin-with-dev-null.patch | 34 --- .../ltp/{ltp_20170516.bb => ltp_20170929.bb} | 5 +- 4 files changed, 38 insertions(+), 150 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch create mode 100644 meta/recipes-extended/ltp/ltp/0037-ltp-fix-format-security-error.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch rename meta/recipes-extended/ltp/{ltp_20170516.bb => ltp_20170929.bb} (96%) diff --git a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch b/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch deleted file mode 100644 index c8738ae..000 --- a/meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch +++ /dev/null @@ -1,113 +0,0 @@ -From a9d5595d2fa2ab252f1cabf63f4b65c3efbafeb9 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke...@windriver.com> -Date: Thu, 10 Aug 2017 15:27:03 +0800 -Subject: [PATCH] ltp: fix PAGE_SIZE redefinition and O_CREAT undeclear when - build with musl - -error 1: - -|stack_clash.c:50:22: error: expected identifier or '(' before numeric constant -| static unsigned long PAGE_SIZE; - -This is because the musl libc already contain PAGE_SIZE definition in limits.c, -we can check it here: - -https://git.musl-libc.org/cgit/musl/tree/include/limits.h#n43 - -error 2: - -|ck01.c:157:22: error: 'O_CREAT' undeclared (first use in this function); did you mean 'S_IREAD'? -| fd = open(filename, O_CREAT | O_TRUNC | O_RDWR, 0644); -| ^~~ -| S_IREAD - -This is because the musl libc put those in fcntl.h, so we should include that -file. - -Upstream-Status: Submitted [ https://github.com/linux-test-project/ltp/pull/194 ] - -Signed-off-by: Dengke Du <dengke...@windriver.com> - testcases/cve/stack_clash.c | 12 ++-- - testcases/kernel/syscalls/flock/flock01.c | 1 + - testcases/kernel/syscalls/flock/flock02.c | 1 + - 3 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/testcases/cve/stack_clash.c b/testcases/cve/stack_clash.c -index 2ef1a82..7c45991 100644 a/testcases/cve/stack_clash.c -+++ b/testcases/cve/stack_clash.c -@@ -47,7 +47,7 @@ - #include "tst_test.h" - #include "tst_safe_stdio.h" - --static unsigned long PAGE_SIZE; -+static unsigned long PAGE_SIZE_tst; - static unsigned long PAGE_MASK; - static unsigned long GAP_PAGES = 256; - static unsigned long THRESHOLD; -@@ -66,7 +66,7 @@ void exhaust_stack_into_sigsegv(void) - exhaust_stack_into_sigsegv(); - } - --#define MAPPED_LEN PAGE_SIZE -+#define MAPPED_LEN PAGE_SIZE_tst - static unsigned long mapped_addr; - - void segv_handler(int sig, siginfo_t *info, void *data LTP_ATTRIBUTE_UNUSED) -@@ -150,7 +150,7 @@ void do_child(void) - stack_t signal_stack; - struct sigaction segv_sig = {.sa_sigaction = segv_handler, .sa_flags = SA_ONSTACK|SA_SIGINFO}; - void *map; -- unsigned long gap = GAP_PAGES * PAGE_SIZE; -+ unsigned long gap = GAP_PAGES * PAGE_SIZE_tst; - struct rlimit rlimit; - - rlimit.rlim_cur = rlimit.rlim_max = RLIM_INFINITY; -@@ -200,8 +200,8 @@ void setup(void) - { - char buf[4096], *p; - -- PAGE_SIZE = sysconf(_SC_PAGESIZE); -- PAGE_MASK = ~(PAGE_SIZE - 1); -+ PAGE_SIZE_tst = sysconf(_SC_PAGESIZE); -+ PAGE_MASK = ~(PAGE_SIZE_tst - 1); - - buf[4095] = '\0'; - SAFE_FILE_SCANF("/proc/cmdline", "%4095[^\n]", buf); -@@ -214,7 +214,7 @@ void setup(void) - tst_res(TINFO, "stack_guard_gap = %ld", GAP_PAGES); - } - -- THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE; -+ THRESHOLD = (GAP_PAGES - 1) * PAGE_SIZE_tst; - - { - volatile int *a = alloca(128); -diff --git a/testcases/kernel/syscalls/flock/flock01.c b/testcases/kernel/syscalls/flock/flock01.c -index 3e17be4..06d89e3 100644 a/testcases/kernel/syscalls/flock/flock01.c -+++ b/testcases/kernel/syscalls/flock/flock01.c -@@ -69,6 +69,7 @@ - #include - #include - #include -+#include - #include "test.h" - - void setup(void); -diff --git a/testcases/kernel/syscalls/flock/flock02.c b/testcases/kernel/syscalls/flock/flock02.c -index 414df68..9ddf729 100644 a/testcases/kernel
[OE-core] [PATCH 0/1] ltp: upgrade to 20170929
1. delete two patches, because the upstream already contain those. 2. add a patch to fix build error when set the DISTRO to 'poky-lsb', suggested by Khem Raj. The following changes since commit 65d23bd7986615fdfb0f1717b615534a2a14ab80: README.qemu: qemuppc64 is not supported (2017-10-16 23:54:31 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git ltp-20170929 https://github.com//tree/ltp-20170929 Dengke Du (1): ltp: upgrade to 20170929 ...E_SIZE-redefinition-and-O_CREAT-undeclear.patch | 113 - .../ltp/0037-ltp-fix-format-security-error.patch | 36 +++ ...ommands-gdb01-replace-stdin-with-dev-null.patch | 34 --- .../ltp/{ltp_20170516.bb => ltp_20170929.bb} | 5 +- 4 files changed, 38 insertions(+), 150 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch create mode 100644 meta/recipes-extended/ltp/ltp/0037-ltp-fix-format-security-error.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-commands-gdb01-replace-stdin-with-dev-null.patch rename meta/recipes-extended/ltp/{ltp_20170516.bb => ltp_20170929.bb} (96%) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] python2/3: Remove building host path from packages
The libxml2 ,python3-dbus and gpgme used host include and/or library paths, if we remove those host paths in the end of do_install task, those host paths would not populate in sysroot, so it's better to put the removing action in PACKAGE_PREPROCESS_FUNCS. On 2017年06月08日 21:36, Burton, Ross wrote: I think the seds need to be moved earlier in the build, or that py file recompiled. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 1/1] ovmf: fix do_compile error when len(tmp)=410
[YOCTO #11354] Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../ovmf/0004-ovmf-enable-long-path-file.patch | 28 ++ meta/recipes-core/ovmf/ovmf_git.bb | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch diff --git a/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch b/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch new file mode 100644 index 000..35fc3ac --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch @@ -0,0 +1,28 @@ +From 49d0923dce509127828b0867c2af31ec84a5c2a9 Mon Sep 17 00:00:00 2001 +From: Dengke Du <dengke...@windriver.com> +Date: Mon, 11 Sep 2017 02:21:55 -0400 +Subject: [PATCH] ovmf: enable long path file + +Upstream-Status: Inappropriate + +Signed-off-by: Dengke Du <dengke...@windriver.com> +--- + BaseTools/Source/C/Common/CommonLib.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h +index 2041b89..8116aa2 100644 +--- a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h +@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + #include + #define PRINTED_GUID_BUFFER_SIZE 37 // including null-termination + +-#define MAX_LONG_FILE_PATH 500 ++#define MAX_LONG_FILE_PATH 1023 + + #ifdef __cplusplus + extern "C" { +-- +2.8.1 + diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 1872c95..50c01aa 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -11,10 +11,11 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[secureboot] = ",,," SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \ + file://0001-ia32-Dont-use-pie.patch \ file://0002-ovmf-update-path-to-native-BaseTools.patch \ file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ + file://0004-ovmf-enable-long-path-file.patch \ file://VfrCompile-increase-path-length-limit.patch \ - file://0001-ia32-Dont-use-pie.patch \ file://no-stack-protector-all-archs.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 0/1] ovmf: fix do_compile error when len(tmp)=410
Changed in V2: Add the MAX_LONG_FILE_PATH to 1023 suggested by ross. Changed in V3: Let the patch Upstream-Status be Inappropriate suggested by patrick. The following changes since commit e3a69364eb1fdbf1dcb98a04b3ddfc8f9841a7fa: staging: gracefully abort if two recipes conflict in the sysroot (2017-09-11 17:30:30 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/fix-ovmf-do-compile-error-when-enable-long-file-path https://github.com//tree/dengke/fix-ovmf-do-compile-error-when-enable-long-file-path Dengke Du (1): ovmf: fix do_compile error when len(tmp)=410 .../ovmf/0004-ovmf-enable-long-path-file.patch | 28 ++ meta/recipes-core/ovmf/ovmf_git.bb | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 1/1] ovmf: fix do_compile error when len(tmp)=410
On 2017年09月12日 15:46, Patrick Ohly wrote: On Mon, 2017-09-11 at 21:20 -0400, Dengke Du wrote: diff --git a/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path- file.patch b/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path- file.patch new file mode 100644 index 000..9cc85ad --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path- file.patch @@ -0,0 +1,28 @@ +From 032fc6b1f7691bd537fd2a6bd13821fcf3c45e64 Mon Sep 17 00:00:00 2001 +From: Dengke Du <dengke...@windriver.com> +Date: Mon, 11 Sep 2017 02:21:55 -0400 +Subject: [PATCH] ovmf: enable long path file + +Upstream-Status: Pending Pending which action? I.e. what's the next step? To me this patch looks more like local customization to fit into path lengths used by the OE build system, so "Inappropriate" might be more reasonable. Yes, you are right, it just fit for OE build system. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/1] ovmf: fix do_compile error when len(tmp)=410
Changed in V2: Add the MAX_LONG_FILE_PATH to 1023. The following changes since commit 8b4f16a9cbbaf521461f699b7264fac2ac872581: mesa-gl: Fix build after recent mesa PACKAGECONFIG changes (2017-09-05 15:01:02 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/fix-ovmf-do-compile-error-when-enable-long-file-path https://github.com//tree/dengke/fix-ovmf-do-compile-error-when-enable-long-file-path Dengke Du (1): ovmf: fix do_compile error when len(tmp)=410 .../ovmf/0004-ovmf-enable-long-path-file.patch | 28 ++ meta/recipes-core/ovmf/ovmf_git.bb | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/1] ovmf: fix do_compile error when len(tmp)=410
[YOCTO #11354] Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../ovmf/0004-ovmf-enable-long-path-file.patch | 28 ++ meta/recipes-core/ovmf/ovmf_git.bb | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch diff --git a/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch b/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch new file mode 100644 index 000..9cc85ad --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch @@ -0,0 +1,28 @@ +From 032fc6b1f7691bd537fd2a6bd13821fcf3c45e64 Mon Sep 17 00:00:00 2001 +From: Dengke Du <dengke...@windriver.com> +Date: Mon, 11 Sep 2017 02:21:55 -0400 +Subject: [PATCH] ovmf: enable long path file + +Upstream-Status: Pending + +Signed-off-by: Dengke Du <dengke...@windriver.com> +--- + BaseTools/Source/C/Common/CommonLib.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h +index 2041b89..8116aa2 100644 +--- a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h +@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + #include + #define PRINTED_GUID_BUFFER_SIZE 37 // including null-termination + +-#define MAX_LONG_FILE_PATH 500 ++#define MAX_LONG_FILE_PATH 1023 + + #ifdef __cplusplus + extern "C" { +-- +2.8.1 + diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 1872c95..50c01aa 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -11,10 +11,11 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[secureboot] = ",,," SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \ + file://0001-ia32-Dont-use-pie.patch \ file://0002-ovmf-update-path-to-native-BaseTools.patch \ file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ + file://0004-ovmf-enable-long-path-file.patch \ file://VfrCompile-increase-path-length-limit.patch \ - file://0001-ia32-Dont-use-pie.patch \ file://no-stack-protector-all-archs.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] ovmf: fix do_compile error when len(tmp)=410
Ok, I will resend it with 1023. On 2017年09月11日 18:51, Burton, Ross wrote: On 11 September 2017 at 08:29, Dengke Du <dengke...@windriver.com <mailto:dengke...@windriver.com>> wrote: +-#define MAX_LONG_FILE_PATH 500 ++#define MAX_LONG_FILE_PATH 800 Making this limit a little bigger seems like a great way to hit it with a slightly longer path. The other patch (VfrCompile-increase-path-length-limit.patch) increases it to 1023 which seems to be a more future-proof solution (and consistent). Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] ovmf: fix do_compile error when len(tmp)=410
[YOCTO #11354] Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../ovmf/0004-ovmf-enable-long-path-file.patch | 28 ++ meta/recipes-core/ovmf/ovmf_git.bb | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch diff --git a/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch b/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch new file mode 100644 index 000..fbb95ed --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch @@ -0,0 +1,28 @@ +From a07eef024089de6bc1cfe4effa4f04cc765d00eb Mon Sep 17 00:00:00 2001 +From: Dengke Du <dengke...@windriver.com> +Date: Mon, 11 Sep 2017 02:21:55 -0400 +Subject: [PATCH] ovmf: enable long path file + +Upstream-Status: Pending + +Signed-off-by: Dengke Du <dengke...@windriver.com> +--- + BaseTools/Source/C/Common/CommonLib.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h +index 2041b89..279cf59 100644 +--- a/BaseTools/Source/C/Common/CommonLib.h b/BaseTools/Source/C/Common/CommonLib.h +@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + #include + #define PRINTED_GUID_BUFFER_SIZE 37 // including null-termination + +-#define MAX_LONG_FILE_PATH 500 ++#define MAX_LONG_FILE_PATH 800 + + #ifdef __cplusplus + extern "C" { +-- +2.8.1 + diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 1872c95..50c01aa 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -11,10 +11,11 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[secureboot] = ",,," SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \ + file://0001-ia32-Dont-use-pie.patch \ file://0002-ovmf-update-path-to-native-BaseTools.patch \ file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ + file://0004-ovmf-enable-long-path-file.patch \ file://VfrCompile-increase-path-length-limit.patch \ - file://0001-ia32-Dont-use-pie.patch \ file://no-stack-protector-all-archs.patch \ " UPSTREAM_VERSION_UNKNOWN = "1" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] ovmf: fix do_compile error when len(tmp)=410
The following changes since commit 8b4f16a9cbbaf521461f699b7264fac2ac872581: mesa-gl: Fix build after recent mesa PACKAGECONFIG changes (2017-09-05 15:01:02 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/fix-ovmf-do-compile-error-when-enable-long-file-path https://github.com//tree/dengke/fix-ovmf-do-compile-error-when-enable-long-file-path Dengke Du (1): ovmf: fix do_compile error when len(tmp)=410 .../ovmf/0004-ovmf-enable-long-path-file.patch | 28 ++ meta/recipes-core/ovmf/ovmf_git.bb | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/ovmf/ovmf/0004-ovmf-enable-long-path-file.patch -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python-numpy, python3-numpy: Fix CVE-2017-12852
Backport upstream patch to fix CVE-2017-12852 Signed-off-by: Dengke Du <dengke...@windriver.com> --- ...inite-loop-when-creating-np.pad-on-an-emp.patch | 45 ++ .../python-numpy/python-numpy_1.13.1.bb| 1 + .../python-numpy/python3-numpy_1.13.1.bb | 1 + 3 files changed, 47 insertions(+) create mode 100644 meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch diff --git a/meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch b/meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch new file mode 100644 index 000..b9e5856 --- /dev/null +++ b/meta/recipes-devtools/python-numpy/files/0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch @@ -0,0 +1,45 @@ +From 4170b98e0d5864ef4db1c5704a6e9428c3be9fb8 Mon Sep 17 00:00:00 2001 +From: Iryna Shcherbina <ishch...@redhat.com> +Date: Thu, 24 Aug 2017 18:01:43 +0200 +Subject: [PATCH] BUG: fix infinite loop when creating np.pad on an empty array + +Upstream-Status: Backport [https://github.com/numpy/numpy/pull/9599/commits/6f9ea0abbd305d53f9017debab3a3a591fe0e249] +CVE: CVE-2017-12852 +Signed-off-by: Dengke Du <dengke...@windriver.com> +--- + numpy/lib/arraypad.py| 3 +++ + numpy/lib/tests/test_arraypad.py | 4 + 2 files changed, 7 insertions(+) + +diff --git a/numpy/lib/arraypad.py b/numpy/lib/arraypad.py +index 2dad99c..294a689 100644 +--- a/numpy/lib/arraypad.py b/numpy/lib/arraypad.py +@@ -1406,6 +1406,9 @@ def pad(array, pad_width, mode, **kwargs): + newmat = _append_min(newmat, pad_after, chunk_after, axis) + + elif mode == 'reflect': ++if narray.size == 0: ++raise ValueError("There aren't any elements to reflect in `array`") ++ + for axis, (pad_before, pad_after) in enumerate(pad_width): + # Recursive padding along any axis where `pad_amt` is too large + # for indexing tricks. We can only safely pad the original axis +diff --git a/numpy/lib/tests/test_arraypad.py b/numpy/lib/tests/test_arraypad.py +index 056aa45..0f71d32 100644 +--- a/numpy/lib/tests/test_arraypad.py b/numpy/lib/tests/test_arraypad.py +@@ -1014,6 +1014,10 @@ class ValueError1(TestCase): + assert_raises(ValueError, pad, arr, ((-2, 3), (3, 2)), + **kwargs) + ++def test_check_empty_array(self): ++assert_raises(ValueError, pad, [], 4, mode='reflect') ++assert_raises(ValueError, pad, np.ndarray(0), 4, mode='reflect') ++ + + class ValueError2(TestCase): + def test_check_negative_pad_amount(self): +-- +2.8.1 + diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.13.1.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.13.1.bb index 63821d3..13e8f4f 100644 --- a/meta/recipes-devtools/python-numpy/python-numpy_1.13.1.bb +++ b/meta/recipes-devtools/python-numpy/python-numpy_1.13.1.bb @@ -9,6 +9,7 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ file://remove-build-path-in-comments.patch \ file://fix_shebang_f2py.patch \ + file://0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch \ ${CONFIGFILESURI} " SRC_URI[md5sum] = "6d459e4a24f5035f720dda3c57716a92" diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.13.1.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.13.1.bb index 0bf9e91..29874b8 100644 --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.13.1.bb +++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.13.1.bb @@ -9,6 +9,7 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ file://remove-build-path-in-comments.patch \ file://fix_shebang_f2py.patch \ + file://0001-BUG-fix-infinite-loop-when-creating-np.pad-on-an-emp.patch \ ${CONFIGFILESURI} " SRC_URI[md5sum] = "6d459e4a24f5035f720dda3c57716a92" SRC_URI[sha256sum] = "de020ec06f1e9ce1115a50161a38bf8d4c2525379900f9cb478cc613a1e7cd93" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] rng-tools: add systemd service file
The following changes since commit a087e0bc765ade6386720f22d842e2fc0bd5f128: maintainers.inc: assign newly added recipes (2017-08-24 16:49:57 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/rng-tools-add-systemd-service-file https://github.com//tree/dengke/rng-tools-add-systemd-service-file Dengke Du (1): rng-tools: add systemd service file meta/recipes-support/rng-tools/rng-tools/rngd.service | 9 + meta/recipes-support/rng-tools/rng-tools_5.bb | 14 -- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/rng-tools/rng-tools/rngd.service -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] rng-tools: add systemd service file
Add systemd service file for rng-tools. Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-support/rng-tools/rng-tools/rngd.service | 9 + meta/recipes-support/rng-tools/rng-tools_5.bb | 14 -- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/rng-tools/rng-tools/rngd.service diff --git a/meta/recipes-support/rng-tools/rng-tools/rngd.service b/meta/recipes-support/rng-tools/rng-tools/rngd.service new file mode 100644 index 000..b94ad50 --- /dev/null +++ b/meta/recipes-support/rng-tools/rng-tools/rngd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Hardware RNG Entropy Gatherer Daemon + +[Service] +ExecStart=@SBINDIR@/rngd -f -r /dev/urandom +SuccessExitStatus=66 + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-support/rng-tools/rng-tools_5.bb b/meta/recipes-support/rng-tools/rng-tools_5.bb index de6e5f9..4a66bed 100644 --- a/meta/recipes-support/rng-tools/rng-tools_5.bb +++ b/meta/recipes-support/rng-tools/rng-tools_5.bb @@ -8,7 +8,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/gkernel/${BP}.tar.gz \ file://underquote.patch \ file://rng-tools-5-fix-textrels-on-PIC-x86.patch \ file://init \ - file://default" + file://default \ + file://rngd.service \ +" SRC_URI[md5sum] = "6726cdc6fae1f5122463f24ae980dd68" SRC_URI[sha256sum] = "60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e" @@ -20,7 +22,7 @@ python () { d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1") } -inherit autotools update-rc.d +inherit autotools update-rc.d systemd PACKAGECONFIG = "libgcrypt" PACKAGECONFIG_libc-musl = "libargp" @@ -38,7 +40,15 @@ do_install_append() { install -d "${D}${sysconfdir}/default" install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools fi + +if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then +install -d ${D}${systemd_unitdir}/system +install -m 644 ${WORKDIR}/rngd.service ${D}${systemd_unitdir}/system +sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/rngd.service +fi } INITSCRIPT_NAME = "rng-tools" INITSCRIPT_PARAMS = "start 30 2 3 4 5 . stop 30 0 6 1 ." + +SYSTEMD_SERVICE_${PN} = "rngd.service" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] mpg123: upgrade to 1.25.6
Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-multimedia/mpg123/{mpg123_1.25.4.bb => mpg123_1.25.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/mpg123/{mpg123_1.25.4.bb => mpg123_1.25.6.bb} (94%) diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.25.4.bb b/meta/recipes-multimedia/mpg123/mpg123_1.25.6.bb similarity index 94% rename from meta/recipes-multimedia/mpg123/mpg123_1.25.4.bb rename to meta/recipes-multimedia/mpg123/mpg123_1.25.6.bb index 96e8f21..cb86199 100644 --- a/meta/recipes-multimedia/mpg123/mpg123_1.25.4.bb +++ b/meta/recipes-multimedia/mpg123/mpg123_1.25.6.bb @@ -11,8 +11,8 @@ LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3" SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2; -SRC_URI[md5sum] = "810e9d00fd75c92c4afafa20245317b5" -SRC_URI[sha256sum] = "cdb5620e8aab83f75a27dab3394a44b9cc4017fc77b2954b8425ca416db6b3e7" +SRC_URI[md5sum] = "43336bef78f67c2e66c4f6c288ca1eb3" +SRC_URI[sha256sum] = "0f0458c9b87799bc2c9bf9455279cc4d305e245db43b51a39ef27afe025c5a8e" inherit autotools pkgconfig -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] mpg123: upgrade to 1.25.6
The following changes since commit 55bf88603927469de9aa9f6fd4d449230d2e61e3: poky: Add nios2 to list of qemu targets (2017-08-17 00:21:35 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/mpg123-1.25.6 https://github.com//tree/dengke/mpg123-1.25.6 Dengke Du (1): mpg123: upgrade to 1.25.6 meta/recipes-multimedia/mpg123/{mpg123_1.25.4.bb => mpg123_1.25.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-multimedia/mpg123/{mpg123_1.25.4.bb => mpg123_1.25.6.bb} (94%) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] cairo: Fix CVE-2017-9814
Backport patch from the following link to fix CVE-2017-9814: https://bugs.freedesktop.org/show_bug.cgi?id=101547 Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch | 45 ++ meta/recipes-graphics/cairo/cairo_1.14.10.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch diff --git a/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch b/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch new file mode 100644 index 000..7d02ab9 --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch @@ -0,0 +1,45 @@ +From 042421e9e3d266ad0bb7805132041ef51ad3234d Mon Sep 17 00:00:00 2001 +From: Adrian Johnson <ajohn...@redneon.com> +Date: Wed, 16 Aug 2017 22:52:35 -0400 +Subject: [PATCH] cairo: Fix CVE-2017-9814 + +The bug happens because in some scenarios the variable size can +have a value of 0 at line 1288. And malloc(0) is not returning +NULL as some people could expect: + +https://stackoverflow.com/questions/1073157/zero-size-malloc + +malloc(0) returns the smallest chunk possible. So the line 1290 +with the return is not execute. And the execution continues with +an invalid map. + +Since the size is 0 the variable map is not initialized correctly +at load_trutype_table. So, later when the variable map is accessed +previous values from a freed chunk are used. This could allows an +attacker to control the variable map. + +This patch have not merge in upstream now. + +Upstream-Status: Backport [https://bugs.freedesktop.org/show_bug.cgi?id=101547] +CVE: CVE-2017-9814 +Signed-off-by: Dengke Du <dengke...@windriver.com> +--- + src/cairo-truetype-subset.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cairo-truetype-subset.c b/src/cairo-truetype-subset.c +index e3449a0..f77d11c 100644 +--- a/src/cairo-truetype-subset.c b/src/cairo-truetype-subset.c +@@ -1285,7 +1285,7 @@ _cairo_truetype_reverse_cmap (cairo_scaled_font_t *scaled_font, + return CAIRO_INT_STATUS_UNSUPPORTED; + + size = be16_to_cpu (map->length); +-map = malloc (size); ++map = _cairo_malloc (size); + if (unlikely (map == NULL)) + return _cairo_error (CAIRO_STATUS_NO_MEMORY); + +-- +2.8.1 + diff --git a/meta/recipes-graphics/cairo/cairo_1.14.10.bb b/meta/recipes-graphics/cairo/cairo_1.14.10.bb index ba38c34..fcdddc6 100644 --- a/meta/recipes-graphics/cairo/cairo_1.14.10.bb +++ b/meta/recipes-graphics/cairo/cairo_1.14.10.bb @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ + file://0001-cairo-Fix-CVE-2017-9814.patch \ " SRC_URI[md5sum] = "146f5f4d0b4439fc3792fd3452b7b12a" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] cairo: Fix CVE-2017-9814
The following changes since commit 55bf88603927469de9aa9f6fd4d449230d2e61e3: poky: Add nios2 to list of qemu targets (2017-08-17 00:21:35 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/fix-CVE-2017-9814 https://github.com//tree/dengke/fix-CVE-2017-9814 Dengke Du (1): cairo: Fix CVE-2017-9814 .../cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch | 45 ++ meta/recipes-graphics/cairo/cairo_1.14.10.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 1/1] ltp: upgrade to upstream latest commit on 20170804
1. Drop 4 patches because the upstream already contains them: 0001-dirtyc0w-Include-stdint.h.patch 0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch 0037-faccessat-and-fchmodat-Fix-build-warnings.patch 0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch 2. Drop the do_compile_prepend function, because the upstream already fix the parallel make race, we can check it here: https://github.com/linux-test-project/ltp/commit/3f385652efe811fe7491474f8513baf44cf0a12d 3. Fix PAGE_SIZE redefinition and O_CREAT undeclear build failures when using musl 4. Fix runtime failed case file01 Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch | 34 -- ...TH_MAX-undeclared-when-building-with-musl.patch | 31 - ...faccessat-and-fchmodat-Fix-build-warnings.patch | 68 --- ...E_SIZE-redefinition-and-O_CREAT-undeclear.patch | 113 + ...d_key02-update-to-test-fix-for-nonempty-N.patch | 136 - meta/recipes-extended/ltp/ltp_20170516.bb | 18 +-- 6 files changed, 115 insertions(+), 285 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch create mode 100644 meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch b/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch deleted file mode 100644 index 5c73be4..000 --- a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b30d8dac1a37dc0abbb3b545db2824d6489e23f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Fri, 9 Jun 2017 09:32:13 -0700 -Subject: [PATCH] dirtyc0w: Include stdint.h - -uintptr_t is defined in stdint.h - -Fixes -| dirtyc0w_child.c:76:15: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? -|lseek(mfd, (uintptr_t) map, SEEK_SET); -|^ - -Signed-off-by: Khem Raj <raj.k...@gmail.com> -Upstream-Status: Submitted - - testcases/kernel/security/dirtyc0w/dirtyc0w_child.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -index 5328a9bc4..49abdd6ba 100644 a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -+++ b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #include "tst_safe_pthread.h" --- -2.13.1 - diff --git a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch b/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch deleted file mode 100644 index 020ddfe..000 --- a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b906ec2fe4711a727e198cd9259287c042eef8e2 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke...@windriver.com> -Date: Thu, 9 Feb 2017 16:41:12 +0800 -Subject: [PATCH] fix PATH_MAX undeclared when building with musl - -fix PATH_MAX undeclared when building with musl. - -Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/176] - -Signed-off-by: Dengke Du <dengke...@windriver.com> - include/tst_test.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/tst_test.h b/include/tst_test.h -index 335c82684..4dfa1511b 100644 a/include/tst_test.h -+++ b/include/tst_test.h -@@ -23,6 +23,9 @@ - #endif /* __TEST_H__ */ - - #include -+#ifndef __GLIBC__ -+#include -+#endif - - #include "tst_common.h" - #include "tst_res_flags.h" --- -2.11.0 - diff --git a/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch b/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch deleted file mode 100644 index 99497d6..000 --- a/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4141bdb441f7576a2e73abeb2a0fb1c7b8bd8647 Mon Sep 17 00:00:00 2001 -From: Naresh Kamboju <naresh.kamb...@linaro.org> -Date: Mon, 19 Jun 2017 19:01:21 +0530 -Subject: [PATCH 1/7] faccessat and fchmodat: Fix build warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixing below build warnings. - -ltp-full-20170516/testcases/kernel/syscalls/faccessa
[OE-core] [PATCH V3 0/1] ltp: upgrade to upstream latest commit on 20170804
The following changes since commit 5e4bd86130866d4a92fa7b0fa6d3628126dfdf91: libinput: Upgrade 1.7.3 -> 1.8.1 (2017-08-09 09:38:25 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/ltp-fix-PAGE_SIZE https://github.com//tree/dengke/ltp-fix-PAGE_SIZE Dengke Du (1): ltp: upgrade to upstream latest commit on 20170804 .../ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch | 34 -- ...TH_MAX-undeclared-when-building-with-musl.patch | 31 - ...faccessat-and-fchmodat-Fix-build-warnings.patch | 68 --- ...E_SIZE-redefinition-and-O_CREAT-undeclear.patch | 113 + ...d_key02-update-to-test-fix-for-nonempty-N.patch | 136 - meta/recipes-extended/ltp/ltp_20170516.bb | 18 +-- 6 files changed, 115 insertions(+), 285 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch create mode 100644 meta/recipes-extended/ltp/ltp/0037-ltp-fix-PAGE_SIZE-redefinition-and-O_CREAT-undeclear.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/1] expat: Upgrade to 2.2.3
The following changes since commit 5e4bd86130866d4a92fa7b0fa6d3628126dfdf91: libinput: Upgrade 1.7.3 -> 1.8.1 (2017-08-09 09:38:25 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/expat-upgrade-to-2.2.3 https://github.com//tree/dengke/expat-upgrade-to-2.2.3 Khem Raj (1): expat: Upgrade to 2.2.3 meta/recipes-core/expat/expat.inc | 1 + meta/recipes-core/expat/expat/libtool-tag.patch | 18 ++ meta/recipes-core/expat/expat_2.2.1.bb | 5 - meta/recipes-core/expat/expat_2.2.3.bb | 4 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-core/expat/expat/libtool-tag.patch delete mode 100644 meta/recipes-core/expat/expat_2.2.1.bb create mode 100644 meta/recipes-core/expat/expat_2.2.3.bb -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/1] expat: Upgrade to 2.2.3
From: Khem Raj <raj.k...@gmail.com> Signed-off-by: Khem Raj <raj.k...@gmail.com> Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-core/expat/expat.inc | 1 + meta/recipes-core/expat/expat/libtool-tag.patch | 18 ++ meta/recipes-core/expat/expat_2.2.1.bb | 5 - meta/recipes-core/expat/expat_2.2.3.bb | 4 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-core/expat/expat/libtool-tag.patch delete mode 100644 meta/recipes-core/expat/expat_2.2.1.bb create mode 100644 meta/recipes-core/expat/expat_2.2.3.bb diff --git a/meta/recipes-core/expat/expat.inc b/meta/recipes-core/expat/expat.inc index 9fa0ca2..067687e 100644 --- a/meta/recipes-core/expat/expat.inc +++ b/meta/recipes-core/expat/expat.inc @@ -6,6 +6,7 @@ LICENSE = "MIT" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.bz2 \ file://autotools.patch \ + file://libtool-tag.patch \ " inherit autotools lib_package diff --git a/meta/recipes-core/expat/expat/libtool-tag.patch b/meta/recipes-core/expat/expat/libtool-tag.patch new file mode 100644 index 000..3ef4197 --- /dev/null +++ b/meta/recipes-core/expat/expat/libtool-tag.patch @@ -0,0 +1,18 @@ +Add CC tag to build + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.k...@gmail.com> + +Index: expat-2.2.2/Makefile.in +=== +--- expat-2.2.2.orig/Makefile.in expat-2.2.2/Makefile.in +@@ -109,7 +109,7 @@ mkdir-init: + + CC = @CC@ + CXX = @CXX@ +-LIBTOOL = @LIBTOOL@ ++LIBTOOL = @LIBTOOL@ --tag CC + + INCLUDES = -I$(srcdir)/lib -I. + LDFLAGS = @LDFLAGS@ diff --git a/meta/recipes-core/expat/expat_2.2.1.bb b/meta/recipes-core/expat/expat_2.2.1.bb deleted file mode 100644 index 47827c5..000 --- a/meta/recipes-core/expat/expat_2.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require expat.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" - -SRC_URI[md5sum] = "d9c3baeab58774cefc2f04faf29f2cf8" -SRC_URI[sha256sum] = "1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885" diff --git a/meta/recipes-core/expat/expat_2.2.3.bb b/meta/recipes-core/expat/expat_2.2.3.bb new file mode 100644 index 000..abf8450 --- /dev/null +++ b/meta/recipes-core/expat/expat_2.2.3.bb @@ -0,0 +1,4 @@ +require expat.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" +SRC_URI[md5sum] = "f053af63ef5f39bd9b78d01fbc203334" +SRC_URI[sha256sum] = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 1/1] ltp: upgrade to upstream latest commit on 20170804
OK, I have send the fix when building with musl for the upstream: https://github.com/linux-test-project/ltp/pull/194 still waitting. On 2017年08月10日 04:47, Burton, Ross wrote: Breaks with musl: http://errors.yoctoproject.org/Errors/Details/150199/ Ross On 4 August 2017 at 11:00, Dengke Du <dengke...@windriver.com <mailto:dengke...@windriver.com>> wrote: drop 4 patches because the upstream already contains them: 0001-dirtyc0w-Include-stdint.h.patch 0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch 0037-faccessat-and-fchmodat-Fix-build-warnings.patch 0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch drop the do_compile_prepend function, because the upstream already fix the parallel make race, we can check it here: https://github.com/linux-test-project/ltp/commit/3f385652efe811fe7491474f8513baf44cf0a12d <https://github.com/linux-test-project/ltp/commit/3f385652efe811fe7491474f8513baf44cf0a12d> Signed-off-by: Dengke Du <dengke...@windriver.com <mailto:dengke...@windriver.com>> --- .../ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch | 34 -- ...TH_MAX-undeclared-when-building-with-musl.patch | 31 - ...faccessat-and-fchmodat-Fix-build-warnings.patch | 68 --- ...d_key02-update-to-test-fix-for-nonempty-N.patch | 136 - meta/recipes-extended/ltp/ltp_20170516.bb <http://ltp_20170516.bb> | 14 +-- 5 files changed, 1 insertion(+), 282 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch b/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch deleted file mode 100644 index 5c73be4..000 --- a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b30d8dac1a37dc0abbb3b545db2824d6489e23f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com <mailto:raj.k...@gmail.com>> -Date: Fri, 9 Jun 2017 09:32:13 -0700 -Subject: [PATCH] dirtyc0w: Include stdint.h - -uintptr_t is defined in stdint.h - -Fixes -| dirtyc0w_child.c:76:15: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? -|lseek(mfd, (uintptr_t) map, SEEK_SET); -|^ - -Signed-off-by: Khem Raj <raj.k...@gmail.com <mailto:raj.k...@gmail.com>> -Upstream-Status: Submitted - - testcases/kernel/security/dirtyc0w/dirtyc0w_child.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -index 5328a9bc4..49abdd6ba 100644 a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -+++ b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #include "tst_safe_pthread.h" --- -2.13.1 - diff --git a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch b/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch deleted file mode 100644 index 020ddfe..000 --- a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b906ec2fe4711a727e198cd9259287c042eef8e2 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke...@windriver.com <mailto:dengke...@windriver.com>> -Date: Thu, 9 Feb 2017 16:41:12 +0800 -Subject: [PATCH] fix PATH_MAX undeclared when building with musl - -fix PATH_MAX undeclared when building with musl. - -Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/176 <https://github.com/linux-test-project/ltp/pull/176>] - -Signed-off-by: Dengke Du <dengke...@windriver.com <mailto:dengke...@windriver.com>> - include/tst_test.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/tst_test.h b/include/tst_test.h -index 335c82684..4dfa1511b 100644 a/include/tst_test.h -+++ b/include/tst_test.h -@@ -23,6 +23,9 @@ - #endif /* __TEST_H__ */ - - #include -+#ifndef __GLIBC__ -+#include
[OE-core] [PATCH V2 0/1] ltp: upgrade to upstream latest commit on 20170804
The following changes since commit 9ed748a542b520c1cb763d981969233c0f5efd4e: bitbake: daemonize: Always print any remaning UI events at exit (2017-08-03 11:14:13 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/ltp-upgrade-to-20170804 https://github.com//tree/dengke/ltp-upgrade-to-20170804 Dengke Du (1): ltp: upgrade to upstream latest commit on 20170804 .../ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch | 34 -- ...TH_MAX-undeclared-when-building-with-musl.patch | 31 - ...faccessat-and-fchmodat-Fix-build-warnings.patch | 68 --- ...d_key02-update-to-test-fix-for-nonempty-N.patch | 136 - meta/recipes-extended/ltp/ltp_20170516.bb | 14 +-- 5 files changed, 1 insertion(+), 282 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/1] ltp: upgrade to upstream latest commit on 20170804
drop 4 patches because the upstream already contains them: 0001-dirtyc0w-Include-stdint.h.patch 0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch 0037-faccessat-and-fchmodat-Fix-build-warnings.patch 0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch drop the do_compile_prepend function, because the upstream already fix the parallel make race, we can check it here: https://github.com/linux-test-project/ltp/commit/3f385652efe811fe7491474f8513baf44cf0a12d Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch | 34 -- ...TH_MAX-undeclared-when-building-with-musl.patch | 31 - ...faccessat-and-fchmodat-Fix-build-warnings.patch | 68 --- ...d_key02-update-to-test-fix-for-nonempty-N.patch | 136 - meta/recipes-extended/ltp/ltp_20170516.bb | 14 +-- 5 files changed, 1 insertion(+), 282 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch b/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch deleted file mode 100644 index 5c73be4..000 --- a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b30d8dac1a37dc0abbb3b545db2824d6489e23f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Fri, 9 Jun 2017 09:32:13 -0700 -Subject: [PATCH] dirtyc0w: Include stdint.h - -uintptr_t is defined in stdint.h - -Fixes -| dirtyc0w_child.c:76:15: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? -|lseek(mfd, (uintptr_t) map, SEEK_SET); -|^ - -Signed-off-by: Khem Raj <raj.k...@gmail.com> -Upstream-Status: Submitted - - testcases/kernel/security/dirtyc0w/dirtyc0w_child.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -index 5328a9bc4..49abdd6ba 100644 a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -+++ b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #include "tst_safe_pthread.h" --- -2.13.1 - diff --git a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch b/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch deleted file mode 100644 index 020ddfe..000 --- a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b906ec2fe4711a727e198cd9259287c042eef8e2 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke...@windriver.com> -Date: Thu, 9 Feb 2017 16:41:12 +0800 -Subject: [PATCH] fix PATH_MAX undeclared when building with musl - -fix PATH_MAX undeclared when building with musl. - -Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/176] - -Signed-off-by: Dengke Du <dengke...@windriver.com> - include/tst_test.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/tst_test.h b/include/tst_test.h -index 335c82684..4dfa1511b 100644 a/include/tst_test.h -+++ b/include/tst_test.h -@@ -23,6 +23,9 @@ - #endif /* __TEST_H__ */ - - #include -+#ifndef __GLIBC__ -+#include -+#endif - - #include "tst_common.h" - #include "tst_res_flags.h" --- -2.11.0 - diff --git a/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch b/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch deleted file mode 100644 index 99497d6..000 --- a/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4141bdb441f7576a2e73abeb2a0fb1c7b8bd8647 Mon Sep 17 00:00:00 2001 -From: Naresh Kamboju <naresh.kamb...@linaro.org> -Date: Mon, 19 Jun 2017 19:01:21 +0530 -Subject: [PATCH 1/7] faccessat and fchmodat: Fix build warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixing below build warnings. - -ltp-full-20170516/testcases/kernel/syscalls/faccessat$ make -In file included from ../../../../include/old/test.h:51:0, - from faccessat01.c:44: -faccessat01.c: In function ‘setup’: -../../../../include/old/old_safe_file_ops.h:55:27: -warning: format not a string literal and no format arguments [-Wformat-security] - (path), (fmt), ## __V
Re: [OE-core] [PATCH 1/1] ltp: upgrade to upstream latest commit on 20170804
Please ignore this! On 2017年08月04日 17:54, Dengke Du wrote: drop 4 patches because the upstream already contains them: 0001-dirtyc0w-Include-stdint.h.patch 0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch 0037-faccessat-and-fchmodat-Fix-build-warnings.patch file://0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch drop the do_compile_prepend function, because the upstream already fix the parallel make race, we can check it here: https://github.com/linux-test-project/ltp/commit/3f385652efe811fe7491474f8513baf44cf0a12d Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch | 34 -- ...TH_MAX-undeclared-when-building-with-musl.patch | 31 - ...faccessat-and-fchmodat-Fix-build-warnings.patch | 68 --- ...d_key02-update-to-test-fix-for-nonempty-N.patch | 136 - meta/recipes-extended/ltp/ltp_20170516.bb | 14 +-- 5 files changed, 1 insertion(+), 282 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch b/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch deleted file mode 100644 index 5c73be4..000 --- a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b30d8dac1a37dc0abbb3b545db2824d6489e23f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Fri, 9 Jun 2017 09:32:13 -0700 -Subject: [PATCH] dirtyc0w: Include stdint.h - -uintptr_t is defined in stdint.h - -Fixes -| dirtyc0w_child.c:76:15: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? -|lseek(mfd, (uintptr_t) map, SEEK_SET); -|^ - -Signed-off-by: Khem Raj <raj.k...@gmail.com> -Upstream-Status: Submitted - - testcases/kernel/security/dirtyc0w/dirtyc0w_child.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -index 5328a9bc4..49abdd6ba 100644 a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -+++ b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #include "tst_safe_pthread.h" --- -2.13.1 - diff --git a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch b/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch deleted file mode 100644 index 020ddfe..000 --- a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b906ec2fe4711a727e198cd9259287c042eef8e2 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke...@windriver.com> -Date: Thu, 9 Feb 2017 16:41:12 +0800 -Subject: [PATCH] fix PATH_MAX undeclared when building with musl - -fix PATH_MAX undeclared when building with musl. - -Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/176] - -Signed-off-by: Dengke Du <dengke...@windriver.com> - include/tst_test.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/tst_test.h b/include/tst_test.h -index 335c82684..4dfa1511b 100644 a/include/tst_test.h -+++ b/include/tst_test.h -@@ -23,6 +23,9 @@ - #endif /* __TEST_H__ */ - - #include -+#ifndef __GLIBC__ -+#include -+#endif - - #include "tst_common.h" - #include "tst_res_flags.h" --- -2.11.0 - diff --git a/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch b/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch deleted file mode 100644 index 99497d6..000 --- a/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4141bdb441f7576a2e73abeb2a0fb1c7b8bd8647 Mon Sep 17 00:00:00 2001 -From: Naresh Kamboju <naresh.kamb...@linaro.org> -Date: Mon, 19 Jun 2017 19:01:21 +0530 -Subject: [PATCH 1/7] faccessat and fchmodat: Fix build warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixing below build warnings. - -ltp-full-20170516/testcases/kernel/syscalls/faccessat$ make -In file included from ../../../../include/old/test.h:51:0, - from faccessat01.c:44: -faccessat01.c: In function ‘setup’: -../../../../include/old/old_safe_file_ops.h:55:27: -warning: format not a string literal and no form
[OE-core] [PATCH 0/1] ltp: upgrade to upstream latest commit on 20170804
The following changes since commit 9ed748a542b520c1cb763d981969233c0f5efd4e: bitbake: daemonize: Always print any remaning UI events at exit (2017-08-03 11:14:13 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/ltp-upgrade-to-20170804 https://github.com//tree/dengke/ltp-upgrade-to-20170804 Dengke Du (1): ltp: upgrade to upstream latest commit on 20170804 .../ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch | 34 -- ...TH_MAX-undeclared-when-building-with-musl.patch | 31 - ...faccessat-and-fchmodat-Fix-build-warnings.patch | 68 --- ...d_key02-update-to-test-fix-for-nonempty-N.patch | 136 - meta/recipes-extended/ltp/ltp_20170516.bb | 14 +-- 5 files changed, 1 insertion(+), 282 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] ltp: upgrade to upstream latest commit on 20170804
drop 4 patches because the upstream already contains them: 0001-dirtyc0w-Include-stdint.h.patch 0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch 0037-faccessat-and-fchmodat-Fix-build-warnings.patch file://0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch drop the do_compile_prepend function, because the upstream already fix the parallel make race, we can check it here: https://github.com/linux-test-project/ltp/commit/3f385652efe811fe7491474f8513baf44cf0a12d Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch | 34 -- ...TH_MAX-undeclared-when-building-with-musl.patch | 31 - ...faccessat-and-fchmodat-Fix-build-warnings.patch | 68 --- ...d_key02-update-to-test-fix-for-nonempty-N.patch | 136 - meta/recipes-extended/ltp/ltp_20170516.bb | 14 +-- 5 files changed, 1 insertion(+), 282 deletions(-) delete mode 100644 meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch delete mode 100644 meta/recipes-extended/ltp/ltp/0038-syscalls-add_key02-update-to-test-fix-for-nonempty-N.patch diff --git a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch b/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch deleted file mode 100644 index 5c73be4..000 --- a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1b30d8dac1a37dc0abbb3b545db2824d6489e23f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Fri, 9 Jun 2017 09:32:13 -0700 -Subject: [PATCH] dirtyc0w: Include stdint.h - -uintptr_t is defined in stdint.h - -Fixes -| dirtyc0w_child.c:76:15: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? -|lseek(mfd, (uintptr_t) map, SEEK_SET); -|^ - -Signed-off-by: Khem Raj <raj.k...@gmail.com> -Upstream-Status: Submitted - - testcases/kernel/security/dirtyc0w/dirtyc0w_child.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -index 5328a9bc4..49abdd6ba 100644 a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -+++ b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #include "tst_safe_pthread.h" --- -2.13.1 - diff --git a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch b/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch deleted file mode 100644 index 020ddfe..000 --- a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b906ec2fe4711a727e198cd9259287c042eef8e2 Mon Sep 17 00:00:00 2001 -From: Dengke Du <dengke...@windriver.com> -Date: Thu, 9 Feb 2017 16:41:12 +0800 -Subject: [PATCH] fix PATH_MAX undeclared when building with musl - -fix PATH_MAX undeclared when building with musl. - -Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/176] - -Signed-off-by: Dengke Du <dengke...@windriver.com> - include/tst_test.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/tst_test.h b/include/tst_test.h -index 335c82684..4dfa1511b 100644 a/include/tst_test.h -+++ b/include/tst_test.h -@@ -23,6 +23,9 @@ - #endif /* __TEST_H__ */ - - #include -+#ifndef __GLIBC__ -+#include -+#endif - - #include "tst_common.h" - #include "tst_res_flags.h" --- -2.11.0 - diff --git a/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch b/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch deleted file mode 100644 index 99497d6..000 --- a/meta/recipes-extended/ltp/ltp/0037-faccessat-and-fchmodat-Fix-build-warnings.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 4141bdb441f7576a2e73abeb2a0fb1c7b8bd8647 Mon Sep 17 00:00:00 2001 -From: Naresh Kamboju <naresh.kamb...@linaro.org> -Date: Mon, 19 Jun 2017 19:01:21 +0530 -Subject: [PATCH 1/7] faccessat and fchmodat: Fix build warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixing below build warnings. - -ltp-full-20170516/testcases/kernel/syscalls/faccessat$ make -In file included from ../../../../include/old/test.h:51:0, - from faccessat01.c:44: -faccessat01.c: In function ???setup???: -../../../../include/old/old_safe_file_ops.h:55:27: -warning: format not a string literal and no format arguments [-Wformat-security] - (path), (fmt), ## __V
Re: [OE-core] [PATCH 1/1] expat: upgrade to 2.2.2
OK! On 2017年08月04日 00:48, Khem Raj wrote: On Thu, Aug 3, 2017 at 9:42 AM, Burton, Rosswrote: On 24 July 2017 at 11:23, Burton, Ross wrote: I've filed a bug upstream about the failure on Debian 8: https://github.com/libexpat/libexpat/issues/97 And this bug is now resolved. expat in git can read /dev/urandom directly if it doesn't find the syscalls it wants. Sounds good. Denke, when you refresh patch please include this patch along http://git.openembedded.org/openembedded-core-contrib/tree/meta/recipes-core/expat/expat/libtool-tag.patch?h=kraj/master=01929853a8346ba0fc27090150ebc506d1c5cd1e which was not there in your v1. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] bison: reduce local pending patches
Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../bison/bison/0001-src-local.mk-fix-parallel-issue.patch | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch b/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch index 9543a56..1e86f55 100644 --- a/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch +++ b/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch @@ -1,4 +1,4 @@ -From 3a15f7c9ace6c0294edc313a1848cafcc31b2a92 Mon Sep 17 00:00:00 2001 +From 5b9204eee4b06b48d54ecc3ef3a0b56fc5cc84f8 Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.y...@windriver.com> Date: Fri, 24 Apr 2015 00:38:32 -0700 Subject: [PATCH] src/local.mk: fix parallel issue @@ -9,11 +9,12 @@ echo '#! /bin/sh' >src/yacc.tmp /bin/bash: src/yacc.tmp: No such file or directory Makefile:6670: recipe for target 'src/yacc' failed -Upstream-Status: Pending +Upstream-Status: Submitted [ http://lists.gnu.org/archive/html/bison-patches/2017-07/msg0.html ] Signed-off-by: Robert Yang <liezhi.y...@windriver.com> +Signed-off-by: Dengke Du <dengke...@windriver.com> --- - src/local.mk |1 + + src/local.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/local.mk b/src/local.mk @@ -29,5 +30,5 @@ index 573ad00..28bfae4 100644 $(AM_V_at)echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@.tmp $(AM_V_at)chmod a+x $@.tmp -- -1.7.9.5 +2.8.1 -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] bison: reduce local pending patches
The following changes since commit 57f606b12b339c82e6981d7ac32450c00d787085: libgcrypt: upgrade to 1.7.8 (2017-07-19 15:13:40 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/bison-reduce-local-pending-patches https://github.com//tree/dengke/bison-reduce-local-pending-patches Dengke Du (1): bison: reduce local pending patches .../bison/bison/0001-src-local.mk-fix-parallel-issue.patch | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] acl,at: reduce local pending patches
The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628: yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/acl-at-reduce-local-pending-patches https://github.com//tree/dengke/acl-at-reduce-local-pending-patches Dengke Du (2): at: reduce local pending patches acl: reduce local pending patches .../at/at/0001-remove-glibc-assumption.patch| 12 +++- .../attr/acl/test-fix-directory-permissions.patch | 17 ++--- 2 files changed, 21 insertions(+), 8 deletions(-) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] acl: reduce local pending patches
Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../attr/acl/test-fix-directory-permissions.patch | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch b/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch index a76cbbe..e64990a 100644 --- a/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch +++ b/meta/recipes-support/attr/acl/test-fix-directory-permissions.patch @@ -1,6 +1,9 @@ +From 311589fedf196168382d8f0db303ab328bcf9d83 Mon Sep 17 00:00:00 2001 +From: Peter Seebach <peter.seeb...@windriver.com> +Date: Wed, 11 May 2016 15:16:06 -0500 +Subject: [PATCH] acl.inc, run-ptest: improve ptest functionality on limited + commit c45bae84817a70fef6c2b661a07a492a0d23ae85 -Author: Peter Seebach <peter.seeb...@windriver.com> -Date: Wed May 11 15:16:06 2016 -0500 Fix permissions on temporary directory @@ -10,7 +13,12 @@ Date: Wed May 11 15:16:06 2016 -0500 Signed-off-by: Peter Seebach <peter.seeb...@windriver.com> -Upstream-Status: Pending +Upstream-Status: Backport [ http://git.savannah.gnu.org/cgit/acl.git/commit/?id=c6772a958800de064482634f77c20a0faafc5af6 ] + +Signed-off-by: Dengke Du <dengke...@windriver.com> +--- + test/root/permissions.test | 1 + + 1 file changed, 1 insertion(+) diff --git a/test/root/permissions.test b/test/root/permissions.test index 42615f5..098b52a 100644 @@ -24,3 +32,6 @@ index 42615f5..098b52a 100644 $ mkdir d $ cd d $ umask 027 +-- +2.8.1 + -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] at: reduce local pending patches
Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../at/at/0001-remove-glibc-assumption.patch | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch b/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch index 53ae28b..7fdecc7 100644 --- a/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch +++ b/meta/recipes-extended/at/at/0001-remove-glibc-assumption.patch @@ -1,6 +1,6 @@ -From 7f811d9c4ebc9444e613e251c31d6bf537a24dc1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.k...@gmail.com> -Date: Mon, 13 Apr 2015 16:35:30 -0700 +From f446686916e503dfb9fb928252d1b72a07573b29 Mon Sep 17 00:00:00 2001 +From: Dengke Du <dengke...@windriver.com> +Date: Tue, 18 Jul 2017 03:42:56 -0400 Subject: [PATCH] remove glibc assumption glibc time.h header has an undocumented __isleap macro @@ -9,9 +9,11 @@ Since it is undocumented & does not appear on any other libc, stop using it and just define the macro in locally instead. -Upstream-Status: Pending +Upstream-Status: Submitted [ https://lists.debian.org/debian-accessibility/2017/07/msg00044.html ] Signed-off-by: Khem Raj <raj.k...@gmail.com> + +Signed-off-by: Dengke Du <dengke...@windriver.com> --- parsetime.y | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) @@ -53,5 +55,5 @@ index 7005e88..324e6d3 100644 { yyerror("Error in day of month"); -- -2.1.4 +2.8.1 -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] expat: upgrade to 2.2.2
Hi Ross Do we need to add a patch to glibc to support the ubuntu 14.04 (or kernel version older than 3.17)? On 2017年07月18日 14:01, Dengke Du wrote: The expat 2.2.2: using getrandom syscall on linux 3.17+, so when we compiling expat-native on the kernel older than 3.17, that would be failed. Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-core/expat/expat_2.2.1.bb | 5 - meta/recipes-core/expat/expat_2.2.2.bb | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-core/expat/expat_2.2.1.bb create mode 100644 meta/recipes-core/expat/expat_2.2.2.bb diff --git a/meta/recipes-core/expat/expat_2.2.1.bb b/meta/recipes-core/expat/expat_2.2.1.bb deleted file mode 100644 index 47827c5..000 --- a/meta/recipes-core/expat/expat_2.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require expat.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" - -SRC_URI[md5sum] = "d9c3baeab58774cefc2f04faf29f2cf8" -SRC_URI[sha256sum] = "1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885" diff --git a/meta/recipes-core/expat/expat_2.2.2.bb b/meta/recipes-core/expat/expat_2.2.2.bb new file mode 100644 index 000..dfa014b --- /dev/null +++ b/meta/recipes-core/expat/expat_2.2.2.bb @@ -0,0 +1,5 @@ +require expat.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" + +SRC_URI[md5sum] = "1ede9a41223c78528b8c5d23e69a2667" +SRC_URI[sha256sum] = "4376911fcf81a23ebd821bbabc26fd933f3ac74833f74924342c29aad2c86046" -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] expat: upgrade to 2.2.2
The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628: yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/expat-upgrade-2.2.2 https://github.com//tree/dengke/expat-upgrade-2.2.2 Dengke Du (1): expat: upgrade to 2.2.2 meta/recipes-core/expat/expat_2.2.1.bb | 5 - meta/recipes-core/expat/expat_2.2.2.bb | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-core/expat/expat_2.2.1.bb create mode 100644 meta/recipes-core/expat/expat_2.2.2.bb -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] expat: upgrade to 2.2.2
The expat 2.2.2: using getrandom syscall on linux 3.17+, so when we compiling expat-native on the kernel older than 3.17, that would be failed. Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-core/expat/expat_2.2.1.bb | 5 - meta/recipes-core/expat/expat_2.2.2.bb | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-core/expat/expat_2.2.1.bb create mode 100644 meta/recipes-core/expat/expat_2.2.2.bb diff --git a/meta/recipes-core/expat/expat_2.2.1.bb b/meta/recipes-core/expat/expat_2.2.1.bb deleted file mode 100644 index 47827c5..000 --- a/meta/recipes-core/expat/expat_2.2.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require expat.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" - -SRC_URI[md5sum] = "d9c3baeab58774cefc2f04faf29f2cf8" -SRC_URI[sha256sum] = "1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885" diff --git a/meta/recipes-core/expat/expat_2.2.2.bb b/meta/recipes-core/expat/expat_2.2.2.bb new file mode 100644 index 000..dfa014b --- /dev/null +++ b/meta/recipes-core/expat/expat_2.2.2.bb @@ -0,0 +1,5 @@ +require expat.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" + +SRC_URI[md5sum] = "1ede9a41223c78528b8c5d23e69a2667" +SRC_URI[sha256sum] = "4376911fcf81a23ebd821bbabc26fd933f3ac74833f74924342c29aad2c86046" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/2] dropbear: reduce local pending patches
Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-core/dropbear/dropbear/0003-configure.patch| 13 +++-- .../dropbear/fix-libtomcrypt-libtommath-ordering.patch | 11 ++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/meta/recipes-core/dropbear/dropbear/0003-configure.patch b/meta/recipes-core/dropbear/dropbear/0003-configure.patch index c53ab01..8469a50 100644 --- a/meta/recipes-core/dropbear/dropbear/0003-configure.patch +++ b/meta/recipes-core/dropbear/dropbear/0003-configure.patch @@ -1,19 +1,20 @@ -From c5f5c5054c1b15539dccf866e2c3faba7ed68456 Mon Sep 17 00:00:00 2001 +From 58dd24a80ca0f400d0761afd9ce2b7f684fc9125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <e...@eukrea.com> Date: Thu, 25 Apr 2013 00:27:25 +0200 -Subject: [PATCH 3/6] configure: add a variable to allow openpty check to be cached +Subject: [PATCH] configure: add a variable to allow openpty check to be cached -Upstream-Status: Pending +Upstream-Status: Submitted [ https://github.com/mkj/dropbear/pull/48 ] +Signed-off-by: Dengke Du <dengke...@windriver.com> --- configure.ac | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 05461f3..9c16d90 100644 +index 893b904..245408d 100644 --- a/configure.ac +++ b/configure.ac -@@ -166,15 +166,20 @@ AC_ARG_ENABLE(openpty, +@@ -177,15 +177,20 @@ AC_ARG_ENABLE(openpty, AC_MSG_NOTICE(Not using openpty) else AC_MSG_NOTICE(Using openpty if available) @@ -38,5 +39,5 @@ index 05461f3..9c16d90 100644 AC_ARG_ENABLE(syslog, [ --disable-syslogDon't include syslog support], -- -1.7.11.7 +2.8.1 diff --git a/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch b/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch index de930f2..2b05e18 100644 --- a/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch +++ b/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch @@ -1,4 +1,4 @@ -From 2fd8d2aedad0c50cdf1e43edd2387874b720ad4c Mon Sep 17 00:00:00 2001 +From f37fa9a41f248fa41dd74a41c66cb41a291c03d2 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <armccu...@gmail.com> Date: Fri, 16 Sep 2016 12:18:23 -0700 Subject: [PATCH] fix libtomcrypt/libtommath ordering @@ -11,18 +11,19 @@ prepended to LIBTOM_LIBS as they are found, not appended. Note that LIBTOM_LIBS is not used when linking with the bundled libtom libs. -Upstream-Status: Pending +Upstream-Status: Backport [ https://github.com/mkj/dropbear/commit/f9e6bc2aecab0f4b5b529e07a92cc63c8a66cd4b ] Signed-off-by: Andre McCurdy <armccu...@gmail.com> +Signed-off-by: Dengke Du <dengke...@windriver.com> --- configure.ac | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index b6abe4c..85bb8bc 100644 +index 245408d..d624853 100644 --- a/configure.ac +++ b/configure.ac -@@ -390,16 +390,16 @@ AC_ARG_ENABLE(bundled-libtom, +@@ -393,16 +393,16 @@ AC_ARG_ENABLE(bundled-libtom, AC_MSG_NOTICE(Forcing bundled libtom*) else BUNDLED_LIBTOM=0 @@ -44,5 +45,5 @@ index b6abe4c..85bb8bc 100644 ) -- -1.9.1 +2.8.1 -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/2] dropbear, chrpath: reduce local pending patches
The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628: yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/dropbear-chrpath-reduce-local-pending-patch https://github.com//tree/dengke/dropbear-chrpath-reduce-local-pending-patch Dengke Du (2): dropbear: reduce local pending patches chrpath: reduce local pending patches .../dropbear/dropbear/0003-configure.patch | 13 +-- .../fix-libtomcrypt-libtommath-ordering.patch | 11 +- .../chrpath/chrpath/standarddoc.patch | 25 -- 3 files changed, 32 insertions(+), 17 deletions(-) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 2/2] chrpath: reduce local pending patches
Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../chrpath/chrpath/standarddoc.patch | 25 -- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch index f96f104..3d303fb 100644 --- a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch +++ b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch @@ -1,14 +1,24 @@ -Upstream-Status: Pending +From 285b5fbf1d6b25ff55d305c17edf4d327bf19dd3 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.pur...@linuxfoundation.org> +Date: Tue, 5 Jul 2011 23:42:29 +0100 +Subject: [PATCH] chrpath: Ensure the package respects the docdir variable -autoconf/automake set docdir automatically, use their value ensuring +autoconf/automake set docdir automatically, use their value ensuring doc files are placed into $datadir/doc, not $prefix/doc. RP 5/7/2011 -Index: chrpath-0.13/Makefile.am -=== chrpath-0.13.orig/Makefile.am 2011-07-05 23:40:14.769920254 +0100 -+++ chrpath-0.13/Makefile.am 2011-07-05 23:40:19.819920635 +0100 +Upstream-Status: Submitted [ http://lists.alioth.debian.org/pipermail/chrpath-devel/Week-of-Mon-20170710/13.html ] + +Signed-off-by: Dengke Du <dengke...@windriver.com> +--- + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index b50ad21..5f7e861 100644 +--- a/Makefile.am b/Makefile.am @@ -1,7 +1,5 @@ SUBDIRS = testsuite deb @@ -17,3 +27,6 @@ Index: chrpath-0.13/Makefile.am doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README bin_PROGRAMS = chrpath +-- +2.8.1 + -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] dropbear: reduce local pending patches
Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-core/dropbear/dropbear/0003-configure.patch| 13 +++-- .../dropbear/fix-libtomcrypt-libtommath-ordering.patch | 12 +++- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/meta/recipes-core/dropbear/dropbear/0003-configure.patch b/meta/recipes-core/dropbear/dropbear/0003-configure.patch index c53ab01..8469a50 100644 --- a/meta/recipes-core/dropbear/dropbear/0003-configure.patch +++ b/meta/recipes-core/dropbear/dropbear/0003-configure.patch @@ -1,19 +1,20 @@ -From c5f5c5054c1b15539dccf866e2c3faba7ed68456 Mon Sep 17 00:00:00 2001 +From 58dd24a80ca0f400d0761afd9ce2b7f684fc9125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9nard?= <e...@eukrea.com> Date: Thu, 25 Apr 2013 00:27:25 +0200 -Subject: [PATCH 3/6] configure: add a variable to allow openpty check to be cached +Subject: [PATCH] configure: add a variable to allow openpty check to be cached -Upstream-Status: Pending +Upstream-Status: Submitted [ https://github.com/mkj/dropbear/pull/48 ] +Signed-off-by: Dengke Du <dengke...@windriver.com> --- configure.ac | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac -index 05461f3..9c16d90 100644 +index 893b904..245408d 100644 --- a/configure.ac +++ b/configure.ac -@@ -166,15 +166,20 @@ AC_ARG_ENABLE(openpty, +@@ -177,15 +177,20 @@ AC_ARG_ENABLE(openpty, AC_MSG_NOTICE(Not using openpty) else AC_MSG_NOTICE(Using openpty if available) @@ -38,5 +39,5 @@ index 05461f3..9c16d90 100644 AC_ARG_ENABLE(syslog, [ --disable-syslogDon't include syslog support], -- -1.7.11.7 +2.8.1 diff --git a/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch b/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch index de930f2..d27d1eb 100644 --- a/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch +++ b/meta/recipes-core/dropbear/dropbear/fix-libtomcrypt-libtommath-ordering.patch @@ -1,4 +1,4 @@ -From 2fd8d2aedad0c50cdf1e43edd2387874b720ad4c Mon Sep 17 00:00:00 2001 +From 0999f907ec73db33309c2e4a771125649aaad466 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <armccu...@gmail.com> Date: Fri, 16 Sep 2016 12:18:23 -0700 Subject: [PATCH] fix libtomcrypt/libtommath ordering @@ -11,18 +11,20 @@ prepended to LIBTOM_LIBS as they are found, not appended. Note that LIBTOM_LIBS is not used when linking with the bundled libtom libs. -Upstream-Status: Pending +Upstream-Status: Pending [ The dropbear upstream master branch already +contains this, this patch will be droped when meet next release ] Signed-off-by: Andre McCurdy <armccu...@gmail.com> +Signed-off-by: Dengke Du <dengke...@windriver.com> --- configure.ac | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index b6abe4c..85bb8bc 100644 +index 245408d..d624853 100644 --- a/configure.ac +++ b/configure.ac -@@ -390,16 +390,16 @@ AC_ARG_ENABLE(bundled-libtom, +@@ -393,16 +393,16 @@ AC_ARG_ENABLE(bundled-libtom, AC_MSG_NOTICE(Forcing bundled libtom*) else BUNDLED_LIBTOM=0 @@ -44,5 +46,5 @@ index b6abe4c..85bb8bc 100644 ) -- -1.9.1 +2.8.1 -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] dropbear, chrpath: reduce local pending patches
The following changes since commit 81498aac9560fbeaeb58eaada32ce80e0ea51628: yocto-project-qs: Updated Next Steps list (2017-07-12 00:28:16 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/dropbear-chrpath-reduce-local-pending-patch https://github.com//tree/dengke/dropbear-chrpath-reduce-local-pending-patch Dengke Du (2): dropbear: reduce local pending patches chrpath: reduce local pending patches .../dropbear/dropbear/0003-configure.patch | 13 +-- .../fix-libtomcrypt-libtommath-ordering.patch | 12 ++- .../chrpath/chrpath/standarddoc.patch | 25 -- 3 files changed, 33 insertions(+), 17 deletions(-) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] chrpath: reduce local pending patches
Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../chrpath/chrpath/standarddoc.patch | 25 -- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch index f96f104..3d303fb 100644 --- a/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch +++ b/meta/recipes-devtools/chrpath/chrpath/standarddoc.patch @@ -1,14 +1,24 @@ -Upstream-Status: Pending +From 285b5fbf1d6b25ff55d305c17edf4d327bf19dd3 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <richard.pur...@linuxfoundation.org> +Date: Tue, 5 Jul 2011 23:42:29 +0100 +Subject: [PATCH] chrpath: Ensure the package respects the docdir variable -autoconf/automake set docdir automatically, use their value ensuring +autoconf/automake set docdir automatically, use their value ensuring doc files are placed into $datadir/doc, not $prefix/doc. RP 5/7/2011 -Index: chrpath-0.13/Makefile.am -=== chrpath-0.13.orig/Makefile.am 2011-07-05 23:40:14.769920254 +0100 -+++ chrpath-0.13/Makefile.am 2011-07-05 23:40:19.819920635 +0100 +Upstream-Status: Submitted [ http://lists.alioth.debian.org/pipermail/chrpath-devel/Week-of-Mon-20170710/13.html ] + +Signed-off-by: Dengke Du <dengke...@windriver.com> +--- + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index b50ad21..5f7e861 100644 +--- a/Makefile.am b/Makefile.am @@ -1,7 +1,5 @@ SUBDIRS = testsuite deb @@ -17,3 +27,6 @@ Index: chrpath-0.13/Makefile.am doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README bin_PROGRAMS = chrpath +-- +2.8.1 + -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] avahi-ui: reduce local pending patches
The following changes since commit 98099349e358a9caaec8ec81f0d4abe588909cfe: bitbake: npm fetcher: fix unknown variable name. (2017-06-29 14:33:42 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/avahi_ui-reduce-local-pending-patch Dengke Du (1): avahi-ui: reduce local pending patches ...01-configure.ac-install-GtkBuilder-interface-files-for-.patch | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] avahi-ui: reduce local pending patches
[Yocto #11548] Signed-off-by: Dengke Du <dengke...@windriver.com> --- ...01-configure.ac-install-GtkBuilder-interface-files-for-.patch | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch b/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch index 8ccef08..942607a 100644 --- a/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch +++ b/meta/recipes-connectivity/avahi/files/0001-configure.ac-install-GtkBuilder-interface-files-for-.patch @@ -1,17 +1,18 @@ -From a59f13fab31a6e25bb03b2c2bc3aea576f857b6c Mon Sep 17 00:00:00 2001 +From 6ff255eff4fea6350b5e0462fee176fadc26fc1c Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukko...@intel.com> Date: Sun, 12 Jun 2016 18:32:49 +0300 Subject: [PATCH] configure.ac: install GtkBuilder interface files for GTK+3 too -Upstream-Status: Pending +Upstream-Status: Submitted [https://github.com/lathiat/avahi/pull/130] Signed-off-by: Jussi Kukkonen <jussi.kukko...@intel.com> +Signed-off-by: Dengke Du <dengke...@windriver.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index aebb716..48bdf63 100644 +index 87a9a17..9860dcc 100644 --- a/configure.ac +++ b/configure.ac @@ -965,7 +965,7 @@ AC_SUBST(avahi_socket) @@ -24,5 +25,5 @@ index aebb716..48bdf63 100644 AC_SUBST(interfacesdir) fi -- -2.1.4 +2.8.1 -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] ltp: Reduce local Pending patches
Rebase the patch on latest ltp upstream: 0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch [Yocto #11548] Signed-off-by: Dengke Du <dengke...@windriver.com> --- ...TH_MAX-undeclared-when-building-with-musl.patch | 15 +++--- ...RDSIZE-undeclared-when-building-with-musl.patch | 23 +++--- ...ition-of-struct-msgbuf-error-building-wit.patch | 9 + 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch b/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch index 8874b95..020ddfe 100644 --- a/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch +++ b/meta/recipes-extended/ltp/ltp/0006-fix-PATH_MAX-undeclared-when-building-with-musl.patch @@ -1,22 +1,23 @@ -From 32644bde4d33b677614534ec37030e57883b8e15 Mon Sep 17 00:00:00 2001 +From b906ec2fe4711a727e198cd9259287c042eef8e2 Mon Sep 17 00:00:00 2001 From: Dengke Du <dengke...@windriver.com> Date: Thu, 9 Feb 2017 16:41:12 +0800 -Subject: [PATCH 1/3] fix PATH_MAX undeclared when building with musl +Subject: [PATCH] fix PATH_MAX undeclared when building with musl fix PATH_MAX undeclared when building with musl. +Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/176] + Signed-off-by: Dengke Du <dengke...@windriver.com> -Upstream-Status: Pending --- include/tst_test.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/tst_test.h b/include/tst_test.h -index 7ff33b2..9779c0e 100644 +index 335c82684..4dfa1511b 100644 --- a/include/tst_test.h +++ b/include/tst_test.h -@@ -19,6 +19,9 @@ - #define TST_TEST_H__ +@@ -23,6 +23,9 @@ + #endif /* __TEST_H__ */ #include +#ifndef __GLIBC__ @@ -26,5 +27,5 @@ index 7ff33b2..9779c0e 100644 #include "tst_common.h" #include "tst_res_flags.h" -- -2.7.4 +2.11.0 diff --git a/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch b/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch index 8d0e739..2f4ca63 100644 --- a/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch +++ b/meta/recipes-extended/ltp/ltp/0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch @@ -1,30 +1,31 @@ -From a2639bd0f0d3f9f3049ee33e6710fed06225f54f Mon Sep 17 00:00:00 2001 +From d1a27570457fb6e1d6bafe81bfa0f3507b137e32 Mon Sep 17 00:00:00 2001 From: Dengke Du <dengke...@windriver.com> Date: Thu, 9 Feb 2017 18:20:58 +0800 -Subject: [PATCH 1/2] fix __WORDSIZE undeclared when building with musl +Subject: [PATCH] fix __WORDSIZE undeclared when building with musl fix __WORDSIZE undeclared when building with musl. +Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/177] + Signed-off-by: Dengke Du <dengke...@windriver.com> -Upstream-Status: Pending --- include/old/test.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/old/test.h b/include/old/test.h -index d492560..263e92e 100644 +index b36764d83..cc6f1b551 100644 --- a/include/old/test.h +++ b/include/old/test.h -@@ -58,6 +58,9 @@ - #include "tst_clone.h" - #include "old_device.h" - #include "old_tmpdir.h" +@@ -44,6 +44,9 @@ + #include + #include + #include +#ifndef __GLIBC__ +#include +#endif - /* - * Ensure that NUMSIGS is defined. + #include "usctest.h" + -- -2.7.4 +2.11.0 diff --git a/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch b/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch index 6886c55..dd7d283 100644 --- a/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch +++ b/meta/recipes-extended/ltp/ltp/0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch @@ -1,18 +1,19 @@ -From 2d7ea67e8eaa41cbd6816f7ab654254b40b530a1 Mon Sep 17 00:00:00 2001 +From bf5dd2932200e0199a38f3028d3bef2253f32e38 Mon Sep 17 00:00:00 2001 From: Dengke Du <dengke...@windriver.com> Date: Thu, 9 Feb 2017 17:17:37 +0800 Subject: [PATCH] fix redefinition of 'struct msgbuf' error building with musl When building with musl the file "sys/msg.h" already contain 'struct msgbuf' +Upstream-Status: Submitted [https://github.com/linux-test-project/ltp/pull/177] + Signed-off-by: Dengke Du <dengke...@windriver.com> -Upstream-Status: Pending --- testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c -index a757c0d..e023114 100644 +index a757c0d18..e023114d2 100644 --- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv08.c +++ b/testcases/kernel/sy
[OE-core] [PATCH 0/1] ltp: Reduce local Pending patches
The following changes since commit 98099349e358a9caaec8ec81f0d4abe588909cfe: bitbake: npm fetcher: fix unknown variable name. (2017-06-29 14:33:42 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/ltp-reduce-local-pending-patches Dengke Du (1): ltp: Reduce local Pending patches ...TH_MAX-undeclared-when-building-with-musl.patch | 15 +++--- ...RDSIZE-undeclared-when-building-with-musl.patch | 23 +++--- ...ition-of-struct-msgbuf-error-building-wit.patch | 9 + 3 files changed, 25 insertions(+), 22 deletions(-) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/1] expat: upgrade to 2.2.1
The following changes since commit 98099349e358a9caaec8ec81f0d4abe588909cfe: bitbake: npm fetcher: fix unknown variable name. (2017-06-29 14:33:42 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/expat-upgrade-to-2.2.1 https://github.com//tree/dengke/expat-upgrade-to-2.2.1 Dengke Du (1): expat: upgrade to 2.2.1 meta/recipes-core/expat/expat_2.2.0.bb | 5 - meta/recipes-core/expat/expat_2.2.1.bb | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-core/expat/expat_2.2.0.bb create mode 100644 meta/recipes-core/expat/expat_2.2.1.bb -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 1/1] expat: upgrade to 2.2.1
The COPYING file in expat has the following changes: 2001-20016 to 2001-2017 Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-core/expat/expat_2.2.0.bb | 5 - meta/recipes-core/expat/expat_2.2.1.bb | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-core/expat/expat_2.2.0.bb create mode 100644 meta/recipes-core/expat/expat_2.2.1.bb diff --git a/meta/recipes-core/expat/expat_2.2.0.bb b/meta/recipes-core/expat/expat_2.2.0.bb deleted file mode 100644 index ef21a11..000 --- a/meta/recipes-core/expat/expat_2.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require expat.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=9c3ee559c6f9dcee1043ead112139f4f" - -SRC_URI[md5sum] = "2f47841c829facb346eb6e3fab5212e2" -SRC_URI[sha256sum] = "d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff" diff --git a/meta/recipes-core/expat/expat_2.2.1.bb b/meta/recipes-core/expat/expat_2.2.1.bb new file mode 100644 index 000..47827c5 --- /dev/null +++ b/meta/recipes-core/expat/expat_2.2.1.bb @@ -0,0 +1,5 @@ +require expat.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" + +SRC_URI[md5sum] = "d9c3baeab58774cefc2f04faf29f2cf8" +SRC_URI[sha256sum] = "1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ltp: add acl, attr, curl and util-linux runtime dependencies
On 2017年07月03日 16:59, Maxin B. John wrote: Hi, On Mon, Jul 03, 2017 at 11:03:31AM +0300, Fathi Boudra wrote: * Use a list and re-order alphabetically to make it easier to read and update. * Add missing runtime dependencies: - acl (getfacl/setfacl commands are required) - attr (getfattr/setfattr commands are required) - curl (curl command is required) - util-linux (ipcs command is required) Reported-by: Naresh KambojuSigned-off-by: Fathi Boudra --- meta/recipes-extended/ltp/ltp_20170516.bb | 23 +-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb b/meta/recipes-extended/ltp/ltp_20170516.bb index f537d60c15..564fdcf8c2 100644 --- a/meta/recipes-extended/ltp/ltp_20170516.bb +++ b/meta/recipes-extended/ltp/ltp_20170516.bb @@ -95,7 +95,27 @@ do_install(){ cp -r testcases/open_posix_testsuite ${D}/opt/ltp/testcases } -RDEPENDS_${PN} = "perl e2fsprogs-mke2fs python-core libaio bash gawk expect ldd unzip gzip cpio cronie logrotate which at" +RDEPENDS_${PN} = " should be: RDEPENDS_${PN} = " \ +acl \ +at \ +attr \ +bash \ +cpio \ +cronie \ +curl \ +e2fsprogs-mke2fs \ +expect \ +gawk \ +gzip \ +ldd \ +libaio \ +logrotate \ +perl \ +python-core \ +unzip \ +util-linux \ +which \ +" These changes look good. However, this patch is causing a parser error: ERROR: ParseError at /home/maxin/poky/meta/recipes-extended/ltp/ltp_20170516.bb:98: unparsed line: 'RDEPENDS_${PN} = " Please fix it. FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a /opt/ltp/testcases/data/nm01/lib.a" @@ -106,4 +126,3 @@ INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" # However, test_arch_stripped is already stripped, so... INSANE_SKIP_${PN} += "already-stripped" Best Regards, Maxin -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] grep: upgrade to 3.1
Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-extended/grep/{grep_3.0.bb => grep_3.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/grep/{grep_3.0.bb => grep_3.1.bb} (89%) diff --git a/meta/recipes-extended/grep/grep_3.0.bb b/meta/recipes-extended/grep/grep_3.1.bb similarity index 89% rename from meta/recipes-extended/grep/grep_3.0.bb rename to meta/recipes-extended/grep/grep_3.1.bb index b2940d5429..05b6b93949 100644 --- a/meta/recipes-extended/grep/grep_3.0.bb +++ b/meta/recipes-extended/grep/grep_3.1.bb @@ -9,8 +9,8 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ " -SRC_URI[md5sum] = "fa07c1616adeb9c3262be5177d10ad4a" -SRC_URI[sha256sum] = "e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5" +SRC_URI[md5sum] = "feca7b3e7c7f4aab2b42ecbfc513b070" +SRC_URI[sha256sum] = "db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e" inherit autotools gettext texinfo pkgconfig -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] grep: upgrade to 3.1
The following changes since commit 98099349e358a9caaec8ec81f0d4abe588909cfe: bitbake: npm fetcher: fix unknown variable name. (2017-06-29 14:33:42 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/grep-upgrade-to-3.1 Dengke Du (1): grep: upgrade to 3.1 meta/recipes-extended/grep/{grep_3.0.bb => grep_3.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/grep/{grep_3.0.bb => grep_3.1.bb} (89%) -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] openssh: Restore TCP wrappers support
From: Wenzong Fan <wenzong@windriver.com> The /etc/hosts.deny doesn't work for sshd without tcp-wrappers support, apply below patch from Debian to fix it: From 1850a2c93f3dcfa3d682eaa85d1593c01d170429 Mon Sep 17 00:00:00 2001 From: Colin Watson <cjwat...@debian.org> Date: Tue, 7 Oct 2014 13:22:41 +0100 Subject: Restore TCP wrappers support Support for TCP wrappers was dropped in OpenSSH 6.7. See this message and thread: https://lists.mindrot.org/pipermail/openssh-unix-dev/2014-April/032497.html It is true that this reduces preauth attack surface in sshd. On the other hand, this support seems to be quite widely used, and abruptly dropping it (from the perspective of users who don't read openssh-unix-dev) could easily cause more serious problems in practice. Link to patch file: http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/tree/debian/ \ patches/restore-tcp-wrappers.patch Signed-off-by: Wenzong Fan <wenzong@windriver.com> Signed-off-by: Robert Yang <liezhi.y...@windriver.com> Signed-off-by: Dengke Du <dengke...@windriver.com> --- .../openssh/openssh/restore-tcp-wrappers.patch | 183 + meta/recipes-connectivity/openssh/openssh_7.5p1.bb | 4 + 2 files changed, 187 insertions(+) create mode 100644 meta/recipes-connectivity/openssh/openssh/restore-tcp-wrappers.patch diff --git a/meta/recipes-connectivity/openssh/openssh/restore-tcp-wrappers.patch b/meta/recipes-connectivity/openssh/openssh/restore-tcp-wrappers.patch new file mode 100644 index 000..81d9b62 --- /dev/null +++ b/meta/recipes-connectivity/openssh/openssh/restore-tcp-wrappers.patch @@ -0,0 +1,183 @@ +From 8a81eb8a57dda76b825556e6992073bd705d572e Mon Sep 17 00:00:00 2001 +From: Colin Watson <cjwat...@debian.org> +Date: Tue, 7 Oct 2014 13:22:41 +0100 +Subject: [PATCH] Restore TCP wrappers support + +Support for TCP wrappers was dropped in OpenSSH 6.7. See this message +and thread: + + https://lists.mindrot.org/pipermail/openssh-unix-dev/2014-April/032497.html + +It is true that this reduces preauth attack surface in sshd. On the +other hand, this support seems to be quite widely used, and abruptly +dropping it (from the perspective of users who don't read +openssh-unix-dev) could easily cause more serious problems in practice. + +It's not entirely clear what the right long-term answer for Debian is, +but it at least probably doesn't involve dropping this feature shortly +before a freeze. + +Forwarded: not-needed +Last-Update: 2014-10-07 + +Upstream-Status: Inappropriate + +Patch-Name: restore-tcp-wrappers.patch + +This patch was imported by wenzong firstly, the following sign is not +the origin author, just adjust it to fit for new version of openssh. + +Signed-off-by: Dengke Du <dengke...@windriver.com> +--- + configure.ac | 57 + + sshd.8 | 7 +++ + sshd.c | 26 ++ + 3 files changed, 90 insertions(+) + +diff --git a/configure.ac b/configure.ac +index c2878e3..8dc0701 100644 +--- a/configure.ac b/configure.ac +@@ -1470,6 +1470,62 @@ AC_ARG_WITH([skey], + ] + ) + ++# Check whether user wants TCP wrappers support ++TCPW_MSG="no" ++AC_ARG_WITH([tcp-wrappers], ++ [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)], ++ [ ++ if test "x$withval" != "xno" ; then ++ saved_LIBS="$LIBS" ++ saved_LDFLAGS="$LDFLAGS" ++ saved_CPPFLAGS="$CPPFLAGS" ++ if test -n "${withval}" && \ ++ test "x${withval}" != "xyes"; then ++ if test -d "${withval}/lib"; then ++ if test -n "${need_dash_r}"; then ++ LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" ++ else ++ LDFLAGS="-L${withval}/lib ${LDFLAGS}" ++ fi ++ else ++ if test -n "${need_dash_r}"; then ++ LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" ++ else ++ LDFLAGS="-L${withval} ${LDFLAGS}" ++ fi ++ fi ++ if test -d "${withval}/include"; then ++ CPPFLAGS="-I${withval}/include ${CPPFLAGS}" ++ else ++
[OE-core] [PATCH 0/1] openssh: Restore TCP wrappers support
The following changes since commit 98099349e358a9caaec8ec81f0d4abe588909cfe: bitbake: npm fetcher: fix unknown variable name. (2017-06-29 14:33:42 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/openssh-restore-tcp-wrappers-support https://github.com//tree/dengke/openssh-restore-tcp-wrappers-support Wenzong Fan (1): openssh: Restore TCP wrappers support .../openssh/openssh/restore-tcp-wrappers.patch | 183 + meta/recipes-connectivity/openssh/openssh_7.5p1.bb | 4 + 2 files changed, 187 insertions(+) create mode 100644 meta/recipes-connectivity/openssh/openssh/restore-tcp-wrappers.patch -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] expat: upgrade to 2.2.1
OK, I will, thanks! On 2017年06月29日 19:32, Burton, Ross wrote: On 29 June 2017 at 08:57, Dengke Du <dengke...@windriver.com <mailto:dengke...@windriver.com>> wrote: -LIC_FILES_CHKSUM = "file://COPYING;md5=9c3ee559c6f9dcee1043ead112139f4f" +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" Checksums changed, remember to always explain why in the commit log. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] expat: upgrade to 2.2.1
Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/recipes-core/expat/expat_2.2.0.bb | 5 - meta/recipes-core/expat/expat_2.2.1.bb | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-core/expat/expat_2.2.0.bb create mode 100644 meta/recipes-core/expat/expat_2.2.1.bb diff --git a/meta/recipes-core/expat/expat_2.2.0.bb b/meta/recipes-core/expat/expat_2.2.0.bb deleted file mode 100644 index ef21a111a4..00 --- a/meta/recipes-core/expat/expat_2.2.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require expat.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=9c3ee559c6f9dcee1043ead112139f4f" - -SRC_URI[md5sum] = "2f47841c829facb346eb6e3fab5212e2" -SRC_URI[sha256sum] = "d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff" diff --git a/meta/recipes-core/expat/expat_2.2.1.bb b/meta/recipes-core/expat/expat_2.2.1.bb new file mode 100644 index 00..47827c5576 --- /dev/null +++ b/meta/recipes-core/expat/expat_2.2.1.bb @@ -0,0 +1,5 @@ +require expat.inc +LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" + +SRC_URI[md5sum] = "d9c3baeab58774cefc2f04faf29f2cf8" +SRC_URI[sha256sum] = "1868cadae4c82a018e361e2b2091de103cd820aaacb0d6cfa49bd2cd83978885" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] expat: upgrade to 2.2.1
The following changes since commit abc7131777e8ea8e6aacc5118bbb5c24883c0ead: lz4: Add patch to fix re-builds (2017-06-28 20:55:09 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/expat-upgrade-to-2.2.1 Dengke Du (1): expat: upgrade to 2.2.1 meta/recipes-core/expat/expat_2.2.0.bb | 5 - meta/recipes-core/expat/expat_2.2.1.bb | 5 + 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 meta/recipes-core/expat/expat_2.2.0.bb create mode 100644 meta/recipes-core/expat/expat_2.2.1.bb -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] archiver.bbclass: add task do_prepare_recipe_sysroot before do_configure
Thanks, that commit works, please ignore this patch. On 2017年06月10日 00:38, Burton, Ross wrote: On 9 June 2017 at 10:45, Dengke Du <dengke...@windriver.com <mailto:dengke...@windriver.com>> wrote: When recipe inherit archiver.bbclass and enable: ARCHIVER_MODE[src] = "configured" output errors: automake: command not found I think oe-core aa2240657b015d46e9ba4bcb6264709a82313d83 fixes this already, can you verify? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] archiver.bbclass: add task do_prepare_recipe_sysroot before do_configure
When recipe inherit archiver.bbclass and enable: ARCHIVER_MODE[src] = "configured" output errors: automake: command not found This is because no recipe-sysroot-native directory, so there is no native environment before executing do_configure, we can check it at the line 254 in archiver.bbclass: prefuncs = d.getVarFlag('do_configure', 'prefuncs') for func in (prefuncs or '').split(): if func != "sysroot_cleansstate": bb.build.exec_func(func, d) bb.build.exec_func('do_configure', d) So it is necessary to add the task do_prepare_recipe_sysroot before executing the do_configure task. Signed-off-by: Dengke Du <dengke...@windriver.com> --- meta/classes/archiver.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 18c5b96..4775786 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -247,6 +247,7 @@ python do_ar_configured() { bb.build.exec_func('do_kernel_configme', d) if bb.data.inherits_class('cmake', d): bb.build.exec_func('do_generate_toolchain_file', d) +bb.build.exec_func('do_prepare_recipe_sysroot',d) prefuncs = d.getVarFlag('do_configure', 'prefuncs') for func in (prefuncs or '').split(): if func != "sysroot_cleansstate": -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] archiver.bbclass: add task do_prepare_recipe_sysroot before do_configure
The following changes since commit 4a7612c7a12b9a381fb8343ba9586272b889fc15: buildhistory: skip tests if GitPython module is missing (2017-06-07 16:00:49 +0100) are available in the git repository at: https://github.com/DengkeDu/openembedded-core.git dengke/fix-archiver-configure-failed Dengke Du (1): archiver.bbclass: add task do_prepare_recipe_sysroot before do_configure meta/classes/archiver.bbclass | 1 + 1 file changed, 1 insertion(+) -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] sed: Upgrade 4.2.2 -> 4.4
On 2017年06月02日 16:15, Fan Xin wrote: 1. Upgrade sed from 4.2.2 to 4.4 2. Update the SRC_URI The format of archive file is changed from .tar.gz to .tar.xz 3. Rename the folder from sed-4.2.2 to sed No need to update the folder name when version upgrade 4. Delete unncessary patch file due to the applied file is not exist. sed-add-ptest.patch So you should add another patch to add the tests. 5. Update licence checksum due to date change, not license change Signed-off-by: Fan Xin--- .../sed/sed-4.2.2/sed-add-ptest.patch | 66 -- ...need_charset_alias-when-building-for-musl.patch | 0 .../sed/{sed-4.2.2 => sed}/run-ptest | 0 .../sed/{sed_4.2.2.bb => sed_4.4.bb} | 11 ++-- 4 files changed, 5 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch rename meta/recipes-extended/sed/{sed-4.2.2 => sed}/0001-Unset-need_charset_alias-when-building-for-musl.patch (100%) rename meta/recipes-extended/sed/{sed-4.2.2 => sed}/run-ptest (100%) rename meta/recipes-extended/sed/{sed_4.2.2.bb => sed_4.4.bb} (76%) diff --git a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch b/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch deleted file mode 100644 index 0293900..000 --- a/meta/recipes-extended/sed/sed-4.2.2/sed-add-ptest.patch +++ /dev/null @@ -1,66 +0,0 @@ -sed: add ptest - -ptest needs buildtest-TESTS and runtest-TESTS targets. -serial-tests is required to generate those targets. - -And fix following error after add serial-tests. - -[snip] -help2man: can't get `--help' info from ../sed/sed -make[2]: *** [sed.1] Error 2 -[snip] - -Upstream-Status: Inappropriate - -Signed-off-by: Chong Lu - configure.ac |2 +- - doc/Makefile.am |2 +- - testsuite/Makefile.am |6 ++ - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9d33ec9..4f0c532 100644 a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ AC_CONFIG_AUX_DIR(build-aux) - AC_CONFIG_SRCDIR([sed/sed.c]) - AM_CONFIG_HEADER(config.h:config_h.in) - AC_PREREQ(2.60) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([serial-tests]) - - SED_FEATURE_VERSION=4.2.2 - AC_DEFINE_UNQUOTED(SED_FEATURE_VERSION, "$SED_FEATURE_VERSION", -diff --git a/doc/Makefile.am b/doc/Makefile.am -index af6975c..6fd8c9a 100644 a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -25,7 +25,7 @@ $(srcdir)/s-texi: sed-in.texi $(srcdir)/groupify.sed - fi - echo stamp > $(srcdir)/s-texi - --sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac $(srcdir)/sed.x -+_sed.1: $(top_srcdir)/sed/sed.c $(top_srcdir)/configure.ac $(srcdir)/sed.x - $(HELP2MAN) --name "stream editor for filtering and transforming text" \ - -p sed --include $(srcdir)/sed.x -o $(srcdir)/sed.1 $(SED) - -diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am -index d80e72c..b05f01e 100644 a/testsuite/Makefile.am -+++ b/testsuite/Makefile.am -@@ -99,5 +99,11 @@ EXTRA_DIST = \ - # automake makes `check' depend on $(TESTS). Declare - # dummy targets for $(TESTS) so that make does not complain. - -+install-ptest: -+ cd $(BUILDDIR); tar -c --exclude=*.o $(TESTDIR) | ( cd $(DESTDIR) && tar -xf - ) -+ for i in $(EXTRA_DIST) tst-regex2.c; do install $(srcdir)/$$i $(DESTDIR)/$(TESTDIR); done -+ sed -e 's/^Makefile:/_Makefile:/' -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/bash/sh/' -i $(DESTDIR)/$(TESTDIR)/Makefile -+ for i in `grep -rl "../sed/sed" $(DESTDIR)/$(TESTDIR)`; do sed -e 's/..\/sed\/sed/sed/' -i $$i; done -+ - .PHONY: $(SEDTESTS) - $(SEDTESTS): --- -1.7.9.5 - diff --git a/meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-extended/sed/sed/0001-Unset-need_charset_alias-when-building-for-musl.patch similarity index 100% rename from meta/recipes-extended/sed/sed-4.2.2/0001-Unset-need_charset_alias-when-building-for-musl.patch rename to meta/recipes-extended/sed/sed/0001-Unset-need_charset_alias-when-building-for-musl.patch diff --git a/meta/recipes-extended/sed/sed-4.2.2/run-ptest b/meta/recipes-extended/sed/sed/run-ptest similarity index 100% rename from meta/recipes-extended/sed/sed-4.2.2/run-ptest rename to meta/recipes-extended/sed/sed/run-ptest diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.4.bb similarity index 76% rename from meta/recipes-extended/sed/sed_4.2.2.bb rename to meta/recipes-extended/sed/sed_4.4.bb index 5aa7d8a..cb559e0 100644 --- a/meta/recipes-extended/sed/sed_4.2.2.bb +++ b/meta/recipes-extended/sed/sed_4.4.bb @@ -1,18 +1,17 @@ SUMMARY = "Stream EDitor (text filtering utility)" HOMEPAGE = "http://www.gnu.org/software/sed/; LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ -