[oe] [meta-filesystems][PATCH 2/2] xfsprogs: upgrade 4.14.0 -> 4.17.0
Add a patch to disable xfs_scrub build since it is experimental. Signed-off-by: Yi Zhao --- .../xfsprogs/files/disable-xfs_scrub-build.patch | 30 ++ .../{xfsprogs_4.14.0.bb => xfsprogs_4.17.0.bb} | 5 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch rename meta-filesystems/recipes-utils/xfsprogs/{xfsprogs_4.14.0.bb => xfsprogs_4.17.0.bb} (91%) diff --git a/meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch b/meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch new file mode 100644 index 000..c07b4b5 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsprogs/files/disable-xfs_scrub-build.patch @@ -0,0 +1,30 @@ +From 2bd40e5ed4df0b0a42beff8806b1ec5daa372c48 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Thu, 19 Jul 2018 16:49:41 +0800 +Subject: [PATCH] Disable xfs_scrub build + +Disable xfs_scrub build since it is experimental. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 7ddfa31..cd60319 100644 +--- a/Makefile b/Makefile +@@ -48,7 +48,7 @@ LIBFROG_SUBDIR = libfrog + DLIB_SUBDIRS = libxlog libxcmd libhandle + LIB_SUBDIRS = libxfs $(DLIB_SUBDIRS) + TOOL_SUBDIRS = copy db estimate fsck growfs io logprint mkfs quota \ +- mdrestore repair rtcp m4 man doc debian spaceman scrub ++ mdrestore repair rtcp m4 man doc debian spaceman + + ifneq ("$(PKG_PLATFORM)","darwin") + TOOL_SUBDIRS += fsr +-- +2.7.4 + diff --git a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.17.0.bb similarity index 91% rename from meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb rename to meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.17.0.bb index 5d76afe..06f774d 100644 --- a/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.14.0.bb +++ b/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.17.0.bb @@ -8,9 +8,10 @@ DEPENDS = "util-linux util-linux-native" SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/${BP}.tar.xz \ file://remove_flags_from_build_flags.patch \ file://0001-build-Check-for-sync_file_range-libc-function.patch \ + file://disable-xfs_scrub-build.patch \ " -SRC_URI[md5sum] = "2d50e3751cc98e6c9364bc3d2297b9fd" -SRC_URI[sha256sum] = "b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec" +SRC_URI[md5sum] = "b935b693dfac0264e232c3c4e52d5569" +SRC_URI[sha256sum] = "f53f5169cb98cfca471ddea30092738c427ba284c5356e01b45dd1ae3b297e0d" inherit autotools-brokensep -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-filesystems][PATCH 1/2] aufs-util: upgrade to latest release 20180709
Signed-off-by: Yi Zhao --- meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index cdee11e..6d71fc0 100644 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" DEPENDS = "coreutils-native aufs-util-native" DEPENDS_class-native = "" -SRCREV = "568636e5c45006b1e6e0c4b704401610a02c0089" +SRCREV = "8f35db59ef83078f87879ec2828e0bb45719e0ef" SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.9 \ https://raw.githubusercontent.com/sfjro/aufs4-linux/aufs4.9/include/uapi/linux/aufs_type.h;name=aufs_type \ file://aufs-util-don-t-strip-executables.patch \ -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-initramfs][PATCH] dracut: upgrade 047 -> 048
Signed-off-by: Yi Zhao --- meta-initramfs/recipes-devtools/dracut/dracut_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index 25c338c..059e40a 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -6,10 +6,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PE = "1" -PV = "047" +PV = "048" -# v047 tag -SRCREV = "8ae8652edd64a2eb7ab11b39cbc8b5da2928" +# v048 tag +SRCREV = "bc01f822de732d85d4bfc77bae44c6bd4abe43d7" SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http \ file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \ " -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCH] apache2: upgrade 2.4.33 -> 2.3.34
Security fixes: CVE-2018-8011 mod_md: DoS via Coredumps on specially crafted requests CVE-2018-1333 mod_http2: DoS for HTTP/2 connections by specially crafted requests Signed-off-by: Yi Zhao --- .../apache2/{apache2-native_2.4.33.bb => apache2-native_2.4.34.bb}| 4 ++-- .../recipes-httpd/apache2/{apache2_2.4.33.bb => apache2_2.4.34.bb}| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta-webserver/recipes-httpd/apache2/{apache2-native_2.4.33.bb => apache2-native_2.4.34.bb} (91%) rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.33.bb => apache2_2.4.34.bb} (98%) diff --git a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.33.bb b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.34.bb similarity index 91% rename from meta-webserver/recipes-httpd/apache2/apache2-native_2.4.33.bb rename to meta-webserver/recipes-httpd/apache2/apache2-native_2.4.34.bb index a471036..a3a6804 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.33.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2-native_2.4.34.bb @@ -15,8 +15,8 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ S = "${WORKDIR}/httpd-${PV}" LIC_FILES_CHKSUM = "file://LICENSE;md5=d52d0fd0bc788f068e647116c01ddfcd" -SRC_URI[md5sum] = "6ef469d3f16fffeb688bc6e0346823e5" -SRC_URI[sha256sum] = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05" +SRC_URI[md5sum] = "818adca52f3be187fe45d6822755be95" +SRC_URI[sha256sum] = "fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \ diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.33.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb similarity index 98% rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.33.bb rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb index 696378e..6642f2b 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.33.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.34.bb @@ -23,8 +23,8 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=d52d0fd0bc788f068e647116c01ddfcd" -SRC_URI[md5sum] = "6ef469d3f16fffeb688bc6e0346823e5" -SRC_URI[sha256sum] = "de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05" +SRC_URI[md5sum] = "818adca52f3be187fe45d6822755be95" +SRC_URI[sha256sum] = "fa53c95631febb08a9de41fd2864cfff815cf62d9306723ab0d4b8d7aa1638f0" S = "${WORKDIR}/httpd-${PV}" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] vim/vim-tiny: fix multiple .bb files provide xxd
Since the following commit applied: ... commit 34988c5319b08a14a145d82ed1057468f22632f9 Author: Rasmus Villemoes Date: Wed Jul 18 10:14:51 2018 +0200 vim: provide xxd ... And vim-tiny recipe contains vim reicpe, it caused both of them provides xxd. Add `${PN}' prefix to it. Signed-off-by: Hongxu Jia --- meta-oe/recipes-support/vim/vim_8.1.0172.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/vim/vim_8.1.0172.bb b/meta-oe/recipes-support/vim/vim_8.1.0172.bb index b188c15..fd2afbc 100644 --- a/meta-oe/recipes-support/vim/vim_8.1.0172.bb +++ b/meta-oe/recipes-support/vim/vim_8.1.0172.bb @@ -112,4 +112,4 @@ ALTERNATIVE_PRIORITY = "100" BBCLASSEXTEND = "native" -PROVIDES += "xxd" +PROVIDES += "${PN}-xxd" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] kselftest: Add a recipe on kernel selftest
It fails for rpi3 for both musl and glibc glibc | Auto-detecting system features: | ...libelf: [ ^[[31mOFF^[[m ] | ... bpf: [ ^[[31mOFF^[[m ] | | No libelf found | make[1]: *** [Makefile:216: elfdep] Error 255 | make[1]: *** Waiting for unfinished jobs | BPF API too old | make[1]: *** [Makefile:219: bpfdep] Error 255 musl | from test_progs.c:19: | /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/kernel-selftest/1.0-r0/recipe-sysroot/usr/include/linux/swab.h:161:8: error: unknown type name '__always_inline' | static __always_inline __u16 __swab16p(const __u16 *p) | ^~~ | /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/kernel-selftest/1.0-r0/recipe-sysroot/usr/include/linux/swab.h:161:30: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__swab16p' | static __always_inline __u16 __swab16p(const __u16 *p) | ^ | /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/kernel-selftest/1.0-r0/recipe-sysroot/usr/include/linux/swab.h:174:8: error: unknown type name '__always_inline' | static __always_inline __u32 __swab32p(const __u32 *p) | ^~~ | /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/kernel-selftest/1.0-r0/recipe-sysroot/usr/include/linux/swab.h:174:30: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__swab32p' | static __always_inline __u32 __swab32p(const __u32 *p) | ^ | /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/kernel-selftest/1.0-r0/recipe-sysroot/usr/include/linux/swab.h:187:8: error: unknown type name '__always_inline' | static __always_inline __u64 __swab64p(const __u64 *p) | ^~~ | /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/kernel-selftest/1.0-r0/recipe-sysroot/usr/include/linux/swab.h:187:30: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__swab64p' | static __always_inline __u64 __swab64p(const __u64 *p) | ^ | /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/kernel-selftest/1.0-r0/recipe-sysroot/usr/include/linux/swab.h:242:23: error: expected ';' before 'void' | static __always_inline void __swab32s(__u32 *p) |^ |; | /mnt/a/oe/build/tmp/work/raspberrypi3-bec-linux-musleabi/kernel-selftest/1.0-r0/recipe-sysroot/usr/include/linux/swab.h:255:23: error: expected ';' before 'void' | static __always_inline void __swab64s(__u64 *p) |^ |; On Thu, Jul 19, 2018 at 11:04 PM Hongzhi, Song wrote: > > Hi Raj, > > Even if enable ptest, the error can't be reproduced. In fact, the recipe > > doesn't inherit ptest, it just compiles programs and output them, which > > will be used by other oe modules(oe-selftest or ptest), to a custom > directory. > > > I know that you are busy with your job. And my request will add your > workload > > , which is not my intention. But it is really hard for me to reproduce > your error.~_~ > > > So I sincerely hope that could I get your whole environment, including > your metadata > > and other files? I think docker would be an easy way. > > > Could you help me again? If I get your image, I think I will be > confident to fix the error. > > > --Hongzhi > > > On 2018年07月20日 00:21, Khem Raj wrote: > > can you try with ptest enabled in DISTRO_FEATURES > > On Wed, Jul 18, 2018 at 12:57 AM Hongzhi, Song > > wrote: > >> Hi Raj, > >> > >> I have try my best to reproduce your error, but I failed. > >> > >> Could you help me to do the build in docker and share the dock image > >> with us. Or maybe you have a better method. > >> > >> > >> Thanks, > >> > >> Hongzhi > >> > >> > >> On 2018年07月10日 12:11, Khem Raj wrote: > >>> This is failing to build here > >>> > >>> | DEBUG: Executing shell function do_compile > >>> | NOTE: make -j 16 CROSS_COMPILE=x86_64-bec-linux- ARCH=x86 > >>> CC=x86_64-bec-linux-gcc -m64 -march=core2 -mtune=core2 -msse3 > >>> -mfpmath=sse -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat > >>> -Wformat-security -Werror=format-security > >>> --sysroot=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/recipe-sysroot > >>> AR=x86_64-bec-linux-ar LD=x86_64-bec-linux-ld > >>> --sysroot=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/recipe-sysroot > >>> > >>> DESTDIR=/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/image > >>> -C > >>> /mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf > >>> | make: Entering directory > >>> '/mnt/a/oe/build/tmp/work/qemux86_64-bec-linux/kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf' > >>> | Makefile:19: *** recipe commences before first target. Stop. > >>> | make: Leaving directory > >>> '/mnt/a/oe/build/tmp/wor