Re: [OE-core] [PATCH] [PATCH] icu:61.1 -> 62.1
On Mon, Jul 9, 2018 at 7:43 PM Hong Liu wrote: > > Upgrade icu from 61.1 to 62.1. > > Signed-off-by: Hong Liu > --- > meta/recipes-support/icu/{icu_61.1.bb => icu_62.1.bb} | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > rename meta/recipes-support/icu/{icu_61.1.bb => icu_62.1.bb} (80%) > > diff --git a/meta/recipes-support/icu/icu_61.1.bb > b/meta/recipes-support/icu/icu_62.1.bb > similarity index 80% > rename from meta/recipes-support/icu/icu_61.1.bb > rename to meta/recipes-support/icu/icu_62.1.bb > index ffaf350..ec9db7d 100644 > --- a/meta/recipes-support/icu/icu_61.1.bb > +++ b/meta/recipes-support/icu/icu_62.1.bb > @@ -16,14 +16,13 @@ BASE_SRC_URI = > "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV > SRC_URI = "${BASE_SRC_URI} \ > file://icu-pkgdata-large-cmd.patch \ > file://fix-install-manx.patch \ > - file://0001-i18n-Drop-include-xlocale.h.patch \ It seems you forgot to delete the patch file along. > " > > SRC_URI_append_class-target = "\ > file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ >" > -SRC_URI[md5sum] = "68fe38999fef94d622bd6843d43c0615" > -SRC_URI[sha256sum] = > "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef" > +SRC_URI[md5sum] = "490ad9d920158e0314e10ba74ae9a150" > +SRC_URI[sha256sum] = > "3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3" > > UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" > UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/; > -- > 2.7.4 > > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [PATCH] nss:3.37.1 -> 3.37.3
Upgrade nss from 3.37.1 to 3.37.3 Signed-off-by: Hong Liu --- meta/recipes-support/nss/{nss_3.37.1.bb => nss_3.37.3.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-support/nss/{nss_3.37.1.bb => nss_3.37.3.bb} (97%) diff --git a/meta/recipes-support/nss/nss_3.37.1.bb b/meta/recipes-support/nss/nss_3.37.3.bb similarity index 97% rename from meta/recipes-support/nss/nss_3.37.1.bb rename to meta/recipes-support/nss/nss_3.37.3.bb index 0e8b5be..a053659 100644 --- a/meta/recipes-support/nss/nss_3.37.1.bb +++ b/meta/recipes-support/nss/nss_3.37.3.bb @@ -25,11 +25,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://nss-fix-nsinstall-build.patch \ file://disable-Wvarargs-with-clang.patch \ file://pqg.c-ULL_addend.patch \ - file://0001-Bug-1432455-Build-FStar.c-when-not-building-with-int.patch \ " -SRC_URI[md5sum] = "e9526d7217d02afa96b90b89924c38df" -SRC_URI[sha256sum] = "097b30e436479ad737b3703b25b6198b6513e202731085c6f097d8853dd20405" +SRC_URI[md5sum] = "22e8ce40f80ce1e7d9d92ebd07124840" +SRC_URI[sha256sum] = "9af2bbb615d010bd866bb83f8c0bb22b0fa086171e93030ffb03da3da15cc5be" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases; UPSTREAM_CHECK_REGEX = "NSS_(?P.+)_release_notes" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [PATCH] icu:61.1 -> 62.1
Upgrade icu from 61.1 to 62.1. Signed-off-by: Hong Liu --- meta/recipes-support/icu/{icu_61.1.bb => icu_62.1.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-support/icu/{icu_61.1.bb => icu_62.1.bb} (80%) diff --git a/meta/recipes-support/icu/icu_61.1.bb b/meta/recipes-support/icu/icu_62.1.bb similarity index 80% rename from meta/recipes-support/icu/icu_61.1.bb rename to meta/recipes-support/icu/icu_62.1.bb index ffaf350..ec9db7d 100644 --- a/meta/recipes-support/icu/icu_61.1.bb +++ b/meta/recipes-support/icu/icu_62.1.bb @@ -16,14 +16,13 @@ BASE_SRC_URI = "http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV SRC_URI = "${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ file://fix-install-manx.patch \ - file://0001-i18n-Drop-include-xlocale.h.patch \ " SRC_URI_append_class-target = "\ file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ " -SRC_URI[md5sum] = "68fe38999fef94d622bd6843d43c0615" -SRC_URI[sha256sum] = "d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef" +SRC_URI[md5sum] = "490ad9d920158e0314e10ba74ae9a150" +SRC_URI[sha256sum] = "3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)/" UPSTREAM_CHECK_URI = "http://download.icu-project.org/files/icu4c/; -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [PATCH] harfbuzz:1.7.5 -> 1.7.6
Upgrade harfbuzz from 1.7.5 to 1.7.6. Signed-off-by: Hong Liu --- .../harfbuzz/{harfbuzz_1.7.5.bb => harfbuzz_1.7.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.7.5.bb => harfbuzz_1.7.6.bb} (88%) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.6.bb similarity index 88% rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.7.6.bb index 0a9b029..80d413a 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.6.bb @@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype" SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2; -SRC_URI[md5sum] = "1466ab51fc5aaa6af4065936939cec62" -SRC_URI[sha256sum] = "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563" +SRC_URI[md5sum] = "ffb94cf2942327344ac31330d07036ba" +SRC_URI[sha256sum] = "da7bed39134826cd51e57c29f1dfbe342ccedb4f4773b1c951ff05ff383e2e9b" inherit autotools pkgconfig lib_package gtk-doc -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [PATCH] ethtool:4.16 -> 4.17
Upgrade ethtool from 4.16 to 4.17 Signed-off-by: Hong Liu --- meta/recipes-extended/ethtool/{ethtool_4.16.bb => ethtool_4.17.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/ethtool/{ethtool_4.16.bb => ethtool_4.17.bb} (88%) diff --git a/meta/recipes-extended/ethtool/ethtool_4.16.bb b/meta/recipes-extended/ethtool/ethtool_4.17.bb similarity index 88% rename from meta/recipes-extended/ethtool/ethtool_4.16.bb rename to meta/recipes-extended/ethtool/ethtool_4.17.bb index 5ccb162..844a958 100644 --- a/meta/recipes-extended/ethtool/ethtool_4.16.bb +++ b/meta/recipes-extended/ethtool/ethtool_4.17.bb @@ -11,8 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[md5sum] = "2b50adf06fc1b033951edef5987c32f3" -SRC_URI[sha256sum] = "25f8fc3a4b2cb2cbfe8741148d8e743127dd7c951df96d8d6dccb88741f8a27d" +SRC_URI[md5sum] = "4dba0345a4ab9f51b4a4a9739284238d" +SRC_URI[sha256sum] = "4130142a15f7409d18de3667998f3c99fba52fd7c8d94be7ecdabf8dcab3d6c1" inherit autotools ptest RDEPENDS_${PN}-ptest += "make" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [PATCH] file:5.32 -> 5.33
Upgrade file from 5.32 to 5.33 Signed-off-by: Hong Liu --- .../file/file/0001-Add-P-prompt-into-Usage-info.patch | 14 -- meta/recipes-devtools/file/{file_5.32.bb => file_5.33.bb} | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) rename meta/recipes-devtools/file/{file_5.32.bb => file_5.33.bb} (96%) diff --git a/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch b/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch index 8a16b2c..0d12d86 100644 --- a/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch +++ b/meta/recipes-devtools/file/file/0001-Add-P-prompt-into-Usage-info.patch @@ -23,16 +23,18 @@ diff --git a/src/file.c b/src/file.c index 2b15e21..e5a957b 100644 --- a/src/file.c +++ b/src/file.c -@@ -76,8 +76,8 @@ int getopt_long(int argc, char * const *argv, const char *optstring, const struc +@@ -87,9 +87,8 @@ int getopt_long(int, char * const *, const char *, + # define USAGE \ - "Usage: %s [" FILE_FLAGS \ - "] [--apple] [--extension] [--mime-encoding] [--mime-type]\n" \ --"[-e testname] [-F separator] [-f namefile] [-m magicfiles] " \ --"file ...\n" \ + "Usage: %s [-" FILE_FLAGS "] [--apple] [--extension] [--mime-encoding]\n" \ +-"[--mime-type] [-e ] [-F ] " \ +-" [-f ]\n" \ +-"[-m ] [-P ] ...\n" \ +"[-e testname] [-F separator] [-f namefile] [-m magicfiles]\n " \ +"[-P parameter=limits] file ...\n" \ - " %s -C [-m magicfiles]\n" \ + " %s -C [-m ]\n" \ " %s [--help]\n" + -- 1.8.3.4 diff --git a/meta/recipes-devtools/file/file_5.32.bb b/meta/recipes-devtools/file/file_5.33.bb similarity index 96% rename from meta/recipes-devtools/file/file_5.32.bb rename to meta/recipes-devtools/file/file_5.33.bb index 5e15925..c1688ff 100644 --- a/meta/recipes-devtools/file/file_5.32.bb +++ b/meta/recipes-devtools/file/file_5.33.bb @@ -19,7 +19,7 @@ SRC_URI = "git://github.com/file/file.git \ file://0001-Add-P-prompt-into-Usage-info.patch \ " -SRCREV = "d474e35513940dbca039b510b4de705b44f5bd9c" +SRCREV = "d14511987263ae3c6f5ad28ed7b81c26afdb422c" S = "${WORKDIR}/git" inherit autotools -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [PATCH] psmisc:23.0 -> 23.1
Upgrade psmisc from 23.0 to 23.1 Signed-off-by: Hong Liu --- meta/recipes-extended/psmisc/{psmisc_23.0.bb => psmisc_23.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/psmisc/{psmisc_23.0.bb => psmisc_23.1.bb} (87%) diff --git a/meta/recipes-extended/psmisc/psmisc_23.0.bb b/meta/recipes-extended/psmisc/psmisc_23.1.bb similarity index 87% rename from meta/recipes-extended/psmisc/psmisc_23.0.bb rename to meta/recipes-extended/psmisc/psmisc_23.1.bb index 2b07f49..f07c9db 100644 --- a/meta/recipes-extended/psmisc/psmisc_23.0.bb +++ b/meta/recipes-extended/psmisc/psmisc_23.1.bb @@ -6,5 +6,5 @@ SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https \ file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \ file://0001-Makefile.am-create-src-directory-before-attempting-t.patch \ " -SRCREV = "67b1da268f4c0ce6859980e3dfcfaec5b2448e80" +SRCREV = "bd952b3063f2466ecab4ec093026cf0c4ce373c7" S = "${WORKDIR}/git" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [PATCH] procps:3.3.14 -> 3.3.15
Upgrade procps from 3.3.14 to 3.3.15. Signed-off-by: Hong Liu --- meta/recipes-extended/procps/{procps_3.3.14.bb => procps_3.3.15.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/procps/{procps_3.3.14.bb => procps_3.3.15.bb} (94%) diff --git a/meta/recipes-extended/procps/procps_3.3.14.bb b/meta/recipes-extended/procps/procps_3.3.15.bb similarity index 94% rename from meta/recipes-extended/procps/procps_3.3.14.bb rename to meta/recipes-extended/procps/procps_3.3.15.bb index 1aba511..9756db0 100644 --- a/meta/recipes-extended/procps/procps_3.3.14.bb +++ b/meta/recipes-extended/procps/procps_3.3.15.bb @@ -17,8 +17,8 @@ SRC_URI = "http://downloads.sourceforge.net/project/procps-ng/Production/procps- file://0001-Fix-out-of-tree-builds.patch \ " -SRC_URI[md5sum] = "fce371ccc1c15a67af9d85e4057e559d" -SRC_URI[sha256sum] = "5eda0253999b7d786e690edfa73301b3113c7a67058478866e98e9ff6736726c" +SRC_URI[md5sum] = "2b0717a7cb474b3d6dfdeedfbad2eccc" +SRC_URI[sha256sum] = "10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465" S = "${WORKDIR}/procps-ng-${PV}" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] [meta] xorg-xserver: Enalbe systemd-logind is using systemd
On Mon, Jul 9, 2018 at 5:06 PM, Alistair Francis wrote: > Signed-off-by: Alistair Francis This has been disable by default for some time, so a few comments to justify why it should now be enabled would be helpful. There are also two typos in the subject line (and a [meta] prefix isn't required for patches submitted to oe-core). > --- > meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > index 882897bd25..89318e53c5 100644 > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > @@ -123,7 +123,7 @@ OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" > PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', > '${OPENGL_PKGCONFIGS}', '', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', > 'xwayland', '', d)} \ > - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ > + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', > 'systemd systemd-logind', '', d)} \ > " > > PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" > -- > 2.17.1 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [meta] xorg-xserver: Enalbe systemd-logind is using systemd
Signed-off-by: Alistair Francis --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 882897bd25..89318e53c5 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -123,7 +123,7 @@ OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'xwayland', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \ " PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [meta] liburcu: Add RISC-V support
Signed-off-by: Alistair Francis --- ...-support-for-the-RISC-V-architecture.patch | 157 ++ .../recipes-support/liburcu/liburcu_0.10.1.bb | 1 + 2 files changed, 158 insertions(+) create mode 100644 meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch diff --git a/meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch b/meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch new file mode 100644 index 00..b026782bd5 --- /dev/null +++ b/meta/recipes-support/liburcu/files/Add-support-for-the-RISC-V-architecture.patch @@ -0,0 +1,157 @@ +From fdfad81006c2c964781b616f0a75578507be809c Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Wed, 21 Mar 2018 17:38:41 -0400 +Subject: [PATCH] Add support for the RISC-V architecture + +Tested in QEMU 2.12.0-rc0, requires --disable-compiler-tls to go +through the benchmarks reliably. + +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +Upstream-Status: Backport +--- + configure.ac | 1 + + include/Makefile.am | 2 ++ + include/urcu/arch/riscv.h| 49 + include/urcu/uatomic/riscv.h | 44 +++ + 4 files changed, 96 insertions(+) + create mode 100644 include/urcu/arch/riscv.h + create mode 100644 include/urcu/uatomic/riscv.h + +diff --git a/configure.ac b/configure.ac +index d0b4a9ac..9145081a 100644 +--- a/configure.ac b/configure.ac +@@ -151,6 +151,7 @@ AS_CASE([$host_cpu], + [tile*], [ARCHTYPE="tile"], + [hppa*], [ARCHTYPE="hppa"], + [m68k], [ARCHTYPE="m68k"], ++ [riscv*], [ARCHTYPE="riscv"], + [ARCHTYPE="unknown"] + ) + +diff --git a/include/Makefile.am b/include/Makefile.am +index dcdf304b..36667b43 100644 +--- a/include/Makefile.am b/include/Makefile.am +@@ -27,6 +27,7 @@ EXTRA_DIST = urcu/arch/aarch64.h \ + urcu/arch/mips.h \ + urcu/arch/nios2.h \ + urcu/arch/ppc.h \ ++ urcu/arch/riscv.h \ + urcu/arch/s390.h \ + urcu/arch/sparc64.h \ + urcu/arch/tile.h \ +@@ -43,6 +44,7 @@ EXTRA_DIST = urcu/arch/aarch64.h \ + urcu/uatomic/mips.h \ + urcu/uatomic/nios2.h \ + urcu/uatomic/ppc.h \ ++ urcu/uatomic/riscv.h \ + urcu/uatomic/s390.h \ + urcu/uatomic/sparc64.h \ + urcu/uatomic/tile.h \ +diff --git a/include/urcu/arch/riscv.h b/include/urcu/arch/riscv.h +new file mode 100644 +index ..1fd7d62b +--- /dev/null b/include/urcu/arch/riscv.h +@@ -0,0 +1,49 @@ ++#ifndef _URCU_ARCH_RISCV_H ++#define _URCU_ARCH_RISCV_H ++ ++/* ++ * arch/riscv.h: definitions for the RISC-V architecture ++ * ++ * Copyright (c) 2018 Michael Jeanson ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#include ++#include ++#include ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#include ++#include ++ ++/* ++ * On Linux, define the membarrier system call number if not yet available in ++ * the system headers. ++ */ ++#if (defined(__linux__) && !defined(__NR_membarrier)) ++#define __NR_membarrier 283 ++#endif ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#include ++ ++#endif /* _URCU_ARCH_RISCV_H */ +diff --git a/include/urcu/uatomic/riscv.h b/include/urcu/uatomic/riscv.h +new file mode 100644 +index ..a6700e17 +--- /dev/null b/include/urcu/uatomic/riscv.h +@@ -0,0 +1,44 @@ ++/* ++ * Atomic exchange operations for the RISC-V architecture. Let GCC do it. ++ * ++ * Copyright (c) 2018 Michael Jeanson ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to ++ * deal in the Software without restriction, including without limitation the ++ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++ * sell copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ *
Re: [OE-core] [PATCH resend 1/3] openssl-1.1: fix c_rehash perl errors
On Mon, 2018-07-09 at 14:56 +0200, Andrej Valek wrote: > Patch original c_rehash script with Debian patch instead > of overriding it with own version. > > Error output from c_reshah without patching: > Unknown regexp modifier "/b" at ./c_rehash line 15, at end of line > Unknown regexp modifier "/W" at ./c_rehash line 28, at end of line > Unknown regexp modifier "/3" at ./c_rehash line 28, at end of line > Unknown regexp modifier "/2" at ./c_rehash line 28, at end of line > No such class installdir at ./c_rehash line 63, near "Prefix our > installdir" > (Might be a runaway multi-line // string starting on line 28) > syntax error at ./c_rehash line 63, near "Prefix our installdir" > Can't redeclare "my" in "my" at ./c_rehash line 68, near "" > Execution of ./c_rehash aborted due to compilation errors. > > Signed-off-by: Andrej Valek > Signed-off-by: Marko Peter > --- > ...le.pl-only-quote-stuff-that-actually-need.patch | 29 > ++ > .../recipes-connectivity/openssl/openssl_1.1.0h.bb | 1 + > 2 files changed, 30 insertions(+) > create mode 100644 meta/recipes- > connectivity/openssl/openssl/debian/Revert-util-dofile.pl-only-quote- > stuff-that-actually-need.patch > > diff --git a/meta/recipes-connectivity/openssl/openssl/debian/Revert- > util-dofile.pl-only-quote-stuff-that-actually-need.patch > b/meta/recipes-connectivity/openssl/openssl/debian/Revert-util- > dofile.pl-only-quote-stuff-that-actually-need.patch > new file mode 100644 > index 00..25d3093e40 > --- /dev/null > +++ b/meta/recipes-connectivity/openssl/openssl/debian/Revert-util- > dofile.pl-only-quote-stuff-that-actually-need.patch > @@ -0,0 +1,29 @@ > +From: Sebastian Andrzej Siewior > +Date: Wed, 28 Mar 2018 14:05:53 +0200 > +Subject: Revert "util/dofile.pl: only quote stuff that actually > needs > + quoting" > + > +This reverts commit 77ba00bc. We ended up without the quotes. > + > +BTS: #894282 > +Signed-off-by: Sebastian Andrzej Siewior > +--- > + util/dofile.pl | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + This patch appears to be missing an Upstream-Status line? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] perl: native modules will not trigger build perl for target.
On Wed, May 9, 2018 at 7:16 AM, taborskikrzysztof wrote: > Can I request review? > Oryginalna wiadomość > Od: Krzysztof Taborski > Data: 08.05.2018 18:46 (GMT+01:00) > Do: openembedded-core@lists.openembedded.org > DW: Krzysztof Taborski > Temat: [meta-oe][PATCH] perl: native modules will not trigger build perl for > target. > > Currently building perl-native modules triggers > build perl for target due to PACKAGES_DYNAMIC regex. > > This commit will cause, that perl native modules will > trigger perl-native build. Can you give an example of how to reproduce the problem? > Signed-off-by: Krzysztof Taborski > --- > meta/recipes-devtools/perl/perl-native_5.24.1.bb | 2 ++ > meta/recipes-devtools/perl/perl_5.24.1.bb| 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-devtools/perl/perl-native_5.24.1.bb > b/meta/recipes-devtools/perl/perl-native_5.24.1.bb > index a9ab17d16c..71f45890b0 100644 > --- a/meta/recipes-devtools/perl/perl-native_5.24.1.bb > +++ b/meta/recipes-devtools/perl/perl-native_5.24.1.bb > @@ -135,3 +135,5 @@ EOF > > # Fix the path in sstate > SSTATE_SCAN_FILES += "*.pm *.pod *.h *.pl *.sh" > +PACKAGES_DYNAMIC_class-native += "^perl-module-.*native$" This usage of += with an over-ride is not correct. However, regardless of that, was this change actually needed? If you know of a -native recipe which depends on a perl-module-XXX-native package then it's probably a bug in the -native recipe. Having perl-native pretend to provide perl-module packages probably isn't the right solution. > diff --git a/meta/recipes-devtools/perl/perl_5.24.1.bb > b/meta/recipes-devtools/perl/perl_5.24.1.bb > index 53a426289a..4c6a71082f 100644 > --- a/meta/recipes-devtools/perl/perl_5.24.1.bb > +++ b/meta/recipes-devtools/perl/perl_5.24.1.bb > @@ -339,7 +339,7 @@ python split_perl_packages () { > d.setVar(d.expand("RRECOMMENDS_${PN}-modules"), ' '.join(packages)) > } > > -PACKAGES_DYNAMIC += "^perl-module-.*" > +PACKAGES_DYNAMIC += "^perl-module-.*(? PACKAGES_DYNAMIC_class-nativesdk += "^nativesdk-perl-module-.*" This usage of += with an over-ride is not correct. > RPROVIDES_perl-lib = "perl-lib" > -- > 2.13.6 > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] openssl_1.1: minor recipe formatting tweaks etc
Drop redundant setting of S to its default value and re-order variables to align more closely to the OE style-guide. Signed-off-by: Andre McCurdy --- v2: rebase to latest master-next .../recipes-connectivity/openssl/openssl_1.1.0h.bb | 50 ++ 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb index 64b8a99..8d445e4 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb @@ -8,11 +8,6 @@ SECTION = "libs/network" LICENSE = "openssl" LIC_FILES_CHKSUM = "file://LICENSE;md5=d57d511030c9d66ef5f5966bee5a7eff" -BBCLASSEXTEND = "native nativesdk" - -SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24" -SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517" - SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://run-ptest \ file://openssl-c_rehash.sh \ @@ -21,12 +16,24 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ SRC_URI_append_class-nativesdk = " \ file://environment.d-openssl.sh \ - " + " -S = "${WORKDIR}/openssl-${PV}" +SRC_URI[md5sum] = "5271477e4d93f4ea032b665ef095ff24" +SRC_URI[sha256sum] = "5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802a517" inherit lib_package multilib_header ptest +#| engines/afalg/e_afalg.c: In function 'eventfd': +#| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function) +#| return syscall(__NR_eventfd, n); +#| ^~~~ +EXTRA_OECONF_append_aarch64 = " no-afalgeng" + +#| ./libcrypto.so: undefined reference to `getcontext' +#| ./libcrypto.so: undefined reference to `setcontext' +#| ./libcrypto.so: undefined reference to `makecontext' +EXTRA_OECONF_append_libc-musl = " -DOPENSSL_NO_ASYNC" + do_configure () { os=${HOST_OS} case $os in @@ -122,17 +129,6 @@ do_configure () { perl ./Configure ${EXTRA_OECONF} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdirleaf} $target } -#| engines/afalg/e_afalg.c: In function 'eventfd': -#| engines/afalg/e_afalg.c:110:20: error: '__NR_eventfd' undeclared (first use in this function) -#| return syscall(__NR_eventfd, n); -#| ^~~~ -EXTRA_OECONF_append_aarch64 = " no-afalgeng" - -#| ./libcrypto.so: undefined reference to `getcontext' -#| ./libcrypto.so: undefined reference to `setcontext' -#| ./libcrypto.so: undefined reference to `makecontext' -EXTRA_OECONF_append_libc-musl = " -DOPENSSL_NO_ASYNC" - do_install () { oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install oe_multilib_header openssl/opensslconf.h @@ -146,13 +142,11 @@ do_install_append_class-native () { sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash } -do_install_append_class-nativesdk() { -mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d -install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh +do_install_append_class-nativesdk () { +mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d +install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh } -FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" - do_install_ptest() { cp -r * ${D}${PTEST_PATH} @@ -163,10 +157,12 @@ do_install_ptest() { sed -i 's/$target{shared_extension_simple}/".so.ptest"/' ${D}${PTEST_PATH}/test/recipes/90-test_shlibload.t } -RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python" - -FILES_${PN} =+ " ${libdir}/ssl-1.1/*" - PACKAGES =+ "${PN}-engines" + +FILES_${PN} =+ "${libdir}/ssl-1.1/*" +FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/openssl.sh" FILES_${PN}-engines = "${libdir}/engines-1.1" +RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python" + +BBCLASSEXTEND = "native nativesdk" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel-devicetree.bbclass: DTB make targets may contain path components
normalize_dtb() turns DTS and DTB paths into values that can be used as make targets. These make targets sometimes contain some directory components so 'basename' is not suitable for turning the paths into make targets - we should only strip off leading directory components of the path up to and including the 'dts' directory (if it exists). For example: * 'overlays/at86rf233.dtbo' should not be changed. * 'some/directory/path/dts/overlays/at86rf233.dtbo' should be changed to 'overlays/at86rf233.dtbo' rather than just 'at86rf233.dtbo' Signed-off-by: Jonathan Haigh --- meta/classes/kernel-devicetree.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass index 4f80cc6..e42b664 100644 --- a/meta/classes/kernel-devicetree.bbclass +++ b/meta/classes/kernel-devicetree.bbclass @@ -12,10 +12,10 @@ KERNEL_DEVICETREE_BUNDLE ?= "0" normalize_dtb () { DTB="$1" if echo ${DTB} | grep -q '/dts/'; then -bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." -DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` +bbwarn "${DTB} contains the full path to the the dts file, but the path should be relative to the dts directory." +DTB=`echo "${DTB}" | sed 's,^.*/dts/,,'` fi -echo "${DTB}" +echo "${DTB}" | sed 's,\.dts$,.dtb,g' } get_real_dtb_path_in_kernel () { -- 2.7.4 IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] meson: improve code style
Use elif for consistency. Signed-off-by: Ross Burton --- meta/classes/meson.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 4a54e9ee9dd..66c44e8bb23 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -52,7 +52,7 @@ def meson_cpu_family(var, d): arch = d.getVar(var) if arch == 'powerpc': return 'ppc' -if arch == 'mipsel': +elif arch == 'mipsel': return 'mips' elif re.match(r"i[3-6]86", arch): return "x86" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] kernel-devsrc: restructure for out of tree (and on target) module builds
The existing kernel-devsrc package starts with a full copy of the kernel source and then starts to strip out elements that are not required. This results in extra time (I/O) and extra space being taken up in the final package. The main purpose of the kernel-devsrc package has been to build modules against the running kernel, not to include a full copy of the source code for re-building the kernel. The end result was a 600M kernel-devsrc package. This restructuring of the package uses an approach similar to other distros, where the kernel-devsrc package is for building against the running kernel and uses a curated set of copied infrastructure, versus a mass copy of the entire kernel. The differences in this approach versus other is largely due to the architecture support and the split build/source directory of the kernel. The result is a kernel-devsrc package of about 10M, which is capable of running "make scripts" and compiling kernel modules against the running kernel. Along with the changes to the copying of the infrascture, we also have the following changes: - a better/more explicit listing of dependencies for on-target builds of "make scripts" or "make modules_prepare" - The kernel source is installed into /lib/modules//build and a symlink created from /usr/src/kernel to the new location. This aligns with the standard location for module support code - There is also a symlink from /lib/modules//source -> build to reserve a spot for a new package that is simply the kernel source. That package is not part of this update. Signed-off-by: Bruce Ashfield --- v2: drop DEPENDS on perf. We no longer need to depend on perf since the source is copied before modification. meta/recipes-kernel/linux/kernel-devsrc.bb | 199 ++--- 1 file changed, 152 insertions(+), 47 deletions(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 8bbfa23e4b86..1bfc011a906d 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -30,57 +30,162 @@ do_populate_sysroot[noexec] = "1" S = "${STAGING_KERNEL_DIR}" B = "${STAGING_KERNEL_BUILDDIR}" -KERNEL_VERSION = "${@get_kernelversion_headers('${S}')}" - PACKAGE_ARCH = "${MACHINE_ARCH}" +KERNEL_BUILD_ROOT="/lib/modules/" + do_install() { -kerneldir=${D}${KERNEL_SRC_PATH} -install -d $kerneldir - -# -# Copy the staging dir source (and module build support) into the devsrc structure. -# We can keep this copy simple and take everything, since a we'll clean up any build -# artifacts afterwards, and the extra i/o is not significant -# -cd ${B} -find . -type d -name '.git*' -prune -o -path '.debug' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir -cd ${S} - find . -type d -name '.git*' -prune -o -type d -name '.kernel-meta' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir - -# Explicitly set KBUILD_OUTPUT to ensure that the image directory is cleaned and not -# The main build artifacts. We clean the directory to avoid QA errors on mismatched -# architecture (since scripts and helpers are native format). -KBUILD_OUTPUT="$kerneldir" -oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts -# make clean generates an absolute path symlink called "source" -# in $kerneldir points to $kerneldir, which doesn't make any -# sense, so remove it. -if [ -L $kerneldir/source ]; then -bbnote "Removing $kerneldir/source symlink" -rm -f $kerneldir/source -fi - -# As of Linux kernel version 3.0.1, the clean target removes -# arch/powerpc/lib/crtsavres.o which is present in -# KBUILD_LDFLAGS_MODULE, making it required to build external modules. -if [ ${ARCH} = "powerpc" ]; then -mkdir -p $kerneldir/arch/powerpc/lib/ -cp ${B}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o -fi - -# Remove fixdep/objtool as they won't be target binaries -for i in fixdep objtool; do -if [ -e $kerneldir/tools/objtool/$i ]; then -rm -rf $kerneldir/tools/objtool/$i -fi -done - -chown -R root:root ${D} +kerneldir=${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION} +install -d $kerneldir + +# create the directory structure +rm -f $kerneldir/build +rm -f $kerneldir/source +mkdir -p $kerneldir/build + +# for compatibility with some older variants of this package, we +# create a /usr/src/kernel symlink to /lib/modules//source +mkdir -p ${D}/usr/src +( + cd ${D}/usr/src + ln -s ${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel +) + +# for on target purposes, we unify build and source +( +
[OE-core] [PATCH 7/7] kernel-devsrc: restructure for out of tree (and on target) module builds
The existing kernel-devsrc package starts with a full copy of the kernel source and then starts to strip out elements that are not required. This results in extra time (I/O) and extra space being taken up in the final package. The main purpose of the kernel-devsrc package has been to build modules against the running kernel, not to include a full copy of the source code for re-building the kernel. The end result was a 600M kernel-devsrc package. This restructuring of the package uses an approach similar to other distros, where the kernel-devsrc package is for building against the running kernel and uses a curated set of copied infrastructure, versus a mass copy of the entire kernel. The differences in this approach versus other is largely due to the architecture support and the split build/source directory of the kernel. The result is a kernel-devsrc package of about 10M, which is capable of running "make scripts" and compiling kernel modules against the running kernel. Along with the changes to the copying of the infrascture, we also have the following changes: - a better/more explicit listing of dependencies for on-target builds of "make scripts" or "make modules_prepare" - The kernel source is installed into /lib/modules//build and a symlink created from /usr/src/kernel to the new location. This aligns with the standard location for module support code - There is also a symlink from /lib/modules//source -> build to reserve a spot for a new package that is simply the kernel source. That package is not part of this update. Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/kernel-devsrc.bb | 201 ++--- 1 file changed, 154 insertions(+), 47 deletions(-) diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb index 8bbfa23e4b86..d983b921920d 100644 --- a/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -30,57 +30,164 @@ do_populate_sysroot[noexec] = "1" S = "${STAGING_KERNEL_DIR}" B = "${STAGING_KERNEL_BUILDDIR}" -KERNEL_VERSION = "${@get_kernelversion_headers('${S}')}" - PACKAGE_ARCH = "${MACHINE_ARCH}" +KERNEL_BUILD_ROOT="/lib/modules/" + do_install() { -kerneldir=${D}${KERNEL_SRC_PATH} -install -d $kerneldir - -# -# Copy the staging dir source (and module build support) into the devsrc structure. -# We can keep this copy simple and take everything, since a we'll clean up any build -# artifacts afterwards, and the extra i/o is not significant -# -cd ${B} -find . -type d -name '.git*' -prune -o -path '.debug' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir -cd ${S} - find . -type d -name '.git*' -prune -o -type d -name '.kernel-meta' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir - -# Explicitly set KBUILD_OUTPUT to ensure that the image directory is cleaned and not -# The main build artifacts. We clean the directory to avoid QA errors on mismatched -# architecture (since scripts and helpers are native format). -KBUILD_OUTPUT="$kerneldir" -oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts -# make clean generates an absolute path symlink called "source" -# in $kerneldir points to $kerneldir, which doesn't make any -# sense, so remove it. -if [ -L $kerneldir/source ]; then -bbnote "Removing $kerneldir/source symlink" -rm -f $kerneldir/source -fi - -# As of Linux kernel version 3.0.1, the clean target removes -# arch/powerpc/lib/crtsavres.o which is present in -# KBUILD_LDFLAGS_MODULE, making it required to build external modules. -if [ ${ARCH} = "powerpc" ]; then -mkdir -p $kerneldir/arch/powerpc/lib/ -cp ${B}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o -fi - -# Remove fixdep/objtool as they won't be target binaries -for i in fixdep objtool; do -if [ -e $kerneldir/tools/objtool/$i ]; then -rm -rf $kerneldir/tools/objtool/$i -fi -done - -chown -R root:root ${D} +kerneldir=${D}${KERNEL_BUILD_ROOT}${KERNEL_VERSION} +install -d $kerneldir + +# create the directory structure +rm -f $kerneldir/build +rm -f $kerneldir/source +mkdir -p $kerneldir/build + +# for compatibility with some older variants of this package, we +# create a /usr/src/kernel symlink to /lib/modules//source +mkdir -p ${D}/usr/src +( + cd ${D}/usr/src + ln -s ${KERNEL_BUILD_ROOT}${KERNEL_VERSION}/source kernel +) + +# for on target purposes, we unify build and source +( + cd $kerneldir + ln -s build source +) + +# first copy everything +( + cd ${S} + cp
[OE-core] [PATCH 3/7] linux-yocto: igb.cfg: change igb config from m to y
Yocto Project reference board such as Minnowboard need IGB module to enable ethernet networking. It need to bundle together with kernel when use NFS boot without initramfs. Signed-off-by: Mohamad Noor Alim Hussin Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.15.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb index 9e46576fb8df..c5cb7b419ac6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "7e0d6d525a8deb7329c0d8f844880c5ec6c0b84a" -SRCREV_meta ?= "34d4dc9c1d160ab3c514aa20cc82a7abdf2c29b4" +SRCREV_meta ?= "d64aec9793d558ff49993ff6076be6d4daf101c2" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb index 29a2c19b52d0..e2b45fa3e140 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "3373c0cf71f2812eeb9694839456df6f67fd32ac" -SRCREV_meta ?= "ff65711e13fa39d7fe2947a1ba196dad82eed327" +SRCREV_meta ?= "d35642f0b65f7772a45e1457fd60de6d1bff8e58" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb index db356bcd1343..da1ba6193f6c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb @@ -13,7 +13,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "dd893e600276f4e05e416cf5be73a5fd5752e0cb" -SRCREV_meta ?= "34d4dc9c1d160ab3c514aa20cc82a7abdf2c29b4" +SRCREV_meta ?= "d64aec9793d558ff49993ff6076be6d4daf101c2" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb index 8bad903eff2b..3738e623c74b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb @@ -11,7 +11,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "3373c0cf71f2812eeb9694839456df6f67fd32ac" -SRCREV_meta ?= "ff65711e13fa39d7fe2947a1ba196dad82eed327" +SRCREV_meta ?= "d35642f0b65f7772a45e1457fd60de6d1bff8e58" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb index fd8562e955c9..9ea313515171 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "97c8063d2df381b828b37608f88efa9b4dd9e379" SRCREV_machine_qemux86-64 ?= "97c8063d2df381b828b37608f88efa9b4dd9e379" SRCREV_machine_qemumips64 ?= "346488cf46ac4045fe257eb63836eb93c7c09859" SRCREV_machine ?= "97c8063d2df381b828b37608f88efa9b4dd9e379" -SRCREV_meta ?= "34d4dc9c1d160ab3c514aa20cc82a7abdf2c29b4" +SRCREV_meta ?= "d64aec9793d558ff49993ff6076be6d4daf101c2" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.15.bb b/meta/recipes-kernel/linux/linux-yocto_4.15.bb index 72b15060621e..84d46c418dd3 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.15.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "3373c0cf71f2812eeb9694839456df6f67fd32ac" SRCREV_machine_qemux86-64 ?= "3373c0cf71f2812eeb9694839456df6f67fd32ac" SRCREV_machine_qemumips64 ?= "b98c113571c72a0d34832dd6fe5585529b32988b" SRCREV_machine ?= "3373c0cf71f2812eeb9694839456df6f67fd32ac" -SRCREV_meta ?= "ff65711e13fa39d7fe2947a1ba196dad82eed327" +SRCREV_meta ?= "d35642f0b65f7772a45e1457fd60de6d1bff8e58" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" -- 2.5.0 -- ___ Openembedded-core
[OE-core] [PATCH 6/7] linux-yocto/4.12: update to v4.12.26
Integrating Paul Gortmaker's -stable 4.12 release, which comprises the following commits: b0f63e84c132 Linux 4.12.26 61be5424616e usbnet: fix alignment for frames with no ethernet header 6d0519e75609 tipc: fix memory leak in tipc_accept_from_sock() 8560506d5b7a tipc: call tipc_rcv() only if bearer is up in tipc_udp_recv() 5ceba73f1c24 tcp: remove buggy call to tcp_v6_restore_cb() 450a839e54a6 tcp/dccp: block bh before arming time_wait timer 872d246eaed9 stmmac: reset last TSO segment size after device open 74386d6ee7bf sit: update frag_off info 3df033244a42 s390/qeth: fix GSO throughput regression b7bd0107008f s390/qeth: fix early exit from error path 7f02573318ba s390/qeth: build max size GSO skbs on L2 devices 3c8a527e0496 rds: Fix NULL pointer dereference in __rds_rdma_map 00c0600c0a35 net: remove hlist_nulls_add_tail_rcu() 193d9a02e802 net: realtek: r8169: implement set_link_ksettings() 8fb1c5e220ee net: qmi_wwan: add Quectel BG96 2c7c:0296 0c2ba29a13d9 net/packet: fix a race in packet_bind() and packet_notifier() bb06331e9156 net: openvswitch: datapath: fix data type in queue_gso_packets ea15a664c5b8 usb: gadget: ffs: Forbid usb_ep_alloc_request from sleeping 7f11deffc177 ipmi: Stop timers before cleaning up the module fb006a18929e fix kcm_clone() ee82eaf439cc RDMA/cxgb4: Annotate r2 and stag as __be32 b71be191d4ed md: free unused memory after bitmap resize 6d24efc56915 dm raid: fix panic when attempting to force a raid to sync 490fc05683b4 blk-mq: Avoid that request queue removal can trigger list corruption d9e8cb49aaf1 ide: ide-atapi: fix compile error with defining macro DEBUG 115978628b54 ipvlan: fix ipv6 outbound device ee2ce344ee06 powerpc/powernv/idle: Round up latency and residency values 0fe4d3f9fb5b afs: Connect up the CB.ProbeUuid 94bdd552d7b1 IB/mlx5: Assign send CQ and recv CQ of UMR QP aa02d85e4d08 IB/mlx4: Increase maximal message size under UD QP dd955bcce383 bnxt_re: changing the ip address shouldn't affect new connections a4b3e59bcb04 f2fs: fix to clear FI_NO_PREALLOC 78f9d39a2735 xfrm: Copy policy family in clone_policy 4577662b6010 atm: horizon: Fix irq release error d7241b40fe6d kbuild: rpm-pkg: fix jobserver unavailable warning bffb011d5446 mailbox: mailbox-test: don't rely on rx_buffer content to signal data ready 849ef7edfa4c clk: hi3660: fix incorrect uart3 clock freqency d561354fe15d clk: uniphier: fix DAPLL2 clock rate of Pro5 eada5db0be6e clk: qcom: common: fix legacy board-clock registration 11ea07285eb4 geneve: fix fill_info when link down 4e0b53bd177a sctp: return error if the asoc has been peeled off in sctp_wait_for_sndbuf be7cba326d33 sctp: use the right sk after waking up from wait_buf sleep 2c485f6fa3be sctp: do not free asoc when it is already dead in sctp_sendmsg 6e2b427a32da slub: fix sysfs duplicate filename creation when slub_debug=O e66ebbc23607 zsmalloc: calling zs_map_object() from irq is a bug dc423eda615d sparc64/mm: set fields in deferred pages 956c73ca6664 block: wake up all tasks blocked in get_request() 1f35bda74d1a dt-bindings: usb: fix reg-property port-number range 412c76f0f9b8 sunrpc: Fix rpc_task_begin trace point 09f79313b317 NFS: Fix a typo in nfs_rename() a550f7b43f63 dynamic-debug-howto: fix optional/omitted ending line number to be LARGE instead of 0 80f443550f8f lib/genalloc.c: make the avail variable an atomic_long_t 1dfea0e03917 drivers/rapidio/devices/rio_mport_cdev.c: fix resource leak in error handling path in 'rio_dma_transfer()' 4add25bf3dff route: update fnhe_expires for redirect when the fnhe exists c53ad6cb2f86 route: also update fnhe_genid when updating a route cache d09b814cd2aa gre6: use log_ecn_error module parameter in ip6_tnl_rcv() f9ef4cd05462 mac80211_hwsim: Fix memory leak in hwsim_new_radio_nl() a95269b0e4e5 x86/mpx/selftests: Fix up weird arrays 76e5bd0ae30a coccinelle: fix parallel build with CHECK=scripts/coccicheck 59f2aa43a314 kbuild: pkg: use --transform option to prefix paths in tar 50ce05457e39 irqchip/qcom: Fix u32 comparison with value less than zero e3fec500f619 ARM: avoid faulting on qemu 602f85aeefb7 crypto: talitos - fix ctr-aes-talitos 73e76cb0ca1f crypto: talitos - fix use of sg_link_tbl_len f17fe30404de crypto: talitos - fix AEAD for sha224 on non sha224 capable chips f5fa317606b7 crypto: talitos - fix setkey to check key weakness 519619ec114a crypto: talitos - fix memory corruption on SEC2 e7984cca5abc crypto: talitos - fix AEAD test failures 64d05b5d1d86 bus: arm-ccn: fix module unloading Error: Removing state 147 which has instances left. e14e213dfd51 bus: arm-ccn: Fix use of smp_processor_id() in preemptible context 63efd55a2c6b bus: arm-ccn: Check memory allocation failure fd30c25b5596 bus: arm-cci: Fix use of smp_processor_id() in preemptible context d358187f050b media: dvb: i2c transfers over usb cannot be done from stack 2ae277ebe31f drm/exynos: gem: Drop NONCONTIG flag for buffers allocated without IOMMU 0792a5a27074 drm/bridge: analogix dp: Fix runtime PM state in get_modes() callback
[OE-core] [PATCH 2/7] linux-yocto: add qemuarm -tiny support
Adding a BSP definition to the kernel-cache, creating a tiny branch for board specific patches and finally setting the machine compatibility in the linux-yocto-tiny recipe. This is only the BSP definition and kernel configuration side of things, more changes are necessary for full tiny distro support on qemumarm. Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb | 7 --- meta/recipes-kernel/linux/linux-yocto_4.14.bb | 18 +- meta/recipes-kernel/linux/linux-yocto_4.15.bb | 18 +- 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb index 00671182d1ee..9e46576fb8df 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "aeeb2d73f2a828a9c0b121b2aa3bb345009f5698" -SRCREV_meta ?= "94457657b8d621868672917d1c2631df4a4fadd8" +SRCREV_machine ?= "7e0d6d525a8deb7329c0d8f844880c5ec6c0b84a" +SRCREV_meta ?= "34d4dc9c1d160ab3c514aa20cc82a7abdf2c29b4" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb index d166a4098b89..29a2c19b52d0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" -SRCREV_meta ?= "45c256a5ca6f9478bce212fec19e2bc273472631" +SRCREV_machine ?= "3373c0cf71f2812eeb9694839456df6f67fd32ac" +SRCREV_meta ?= "ff65711e13fa39d7fe2947a1ba196dad82eed327" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb index 58945f25d081..db356bcd1343 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb @@ -12,8 +12,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "9e246607d5c23f8bb3b8800734b1707766e0b2b9" -SRCREV_meta ?= "94457657b8d621868672917d1c2631df4a4fadd8" +SRCREV_machine ?= "dd893e600276f4e05e416cf5be73a5fd5752e0cb" +SRCREV_meta ?= "34d4dc9c1d160ab3c514aa20cc82a7abdf2c29b4" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb index 5f9b3c7fb35f..8bad903eff2b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb @@ -1,4 +1,5 @@ KBRANCH ?= "v4.15/standard/tiny/common-pc" +KBRANCH_qemuarm ?= "v4.15/standard/tiny/arm-versatile-926ejs" LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" @@ -9,15 +10,15 @@ LINUX_VERSION ?= "4.15.18" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "e25dbfe95302eeaa1a03a828d05c09479574488a" -SRCREV_meta ?= "45c256a5ca6f9478bce212fec19e2bc273472631" +SRCREV_machine ?= "3373c0cf71f2812eeb9694839456df6f67fd32ac" +SRCREV_meta ?= "ff65711e13fa39d7fe2947a1ba196dad82eed327" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.15;destsuffix=${KMETA}" -COMPATIBLE_MACHINE = "qemux86|qemux86-64" +COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm" # Functionality flags KERNEL_FEATURES = "" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb index 0449213d424b..fd8562e955c9 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb @@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v4.14/standard/base" KBRANCH_qemux86-64 ?= "v4.14/standard/base" KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "363723ef50c06df54e146c8fe78faa962e96a8c8" -SRCREV_machine_qemuarm64 ?= "798d15552a4d5d9355a300290ed6bf72106b7e96" -SRCREV_machine_qemumips ?=
[OE-core] [PATCH 1/7] linux-libc-headers: To fix build error when enable mutilib on aarch64 Big endian.
From: Lei Maohui Signed-off-by: Lei Maohui Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc index 9903c06c20c6..b5cf96dd49e4 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -77,6 +77,10 @@ do_install_append_arm () { do_install_armmultilib } +do_install_append_armeb () { + do_install_armmultilib +} + do_install_armmultilib () { oe_multilib_header asm/auxvec.h asm/bitsperlong.h asm/byteorder.h asm/fcntl.h asm/hwcap.h asm/ioctls.h asm/kvm.h asm/kvm_para.h asm/mman.h asm/param.h asm/perf_regs.h asm/bpf_perf_event.h oe_multilib_header asm/posix_types.h asm/ptrace.h asm/setup.h asm/sigcontext.h asm/siginfo.h asm/signal.h asm/stat.h asm/statfs.h asm/swab.h asm/types.h asm/unistd.h -- 2.5.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/7] kernel/kernel-yocto: conslidated pull request
Hi all, Here's the next consolidated kernel pull request. It has a mixture of some legwork, version bumps, package re-works and a libc-headers patch I grabbed from the mailing list. [PATCH 4/7] linux-yocto/4.12: bump to v4.12.25 [PATCH 6/7] linux-yocto/4.12: update to v4.12.26 The version bumps are for the 4.12 kernel and are routine CVE/bug fix updates. We'll continue doing these for a little while longer, but 4.12 will cease getting SRCREV bumps in the next 6 months or so. [PATCH 5/7] linux-yocto-dev: bump to 4.18+ This series also bumps linux-yocto-dev to the 4.18 kernel. This is legwork for the next "versioned" release kernel, which very well could be 4.18 or 4.19 if we stretch (it depends on timing and if 4.19 is tagged as LTS, etc). Also note that I'll drop the 4.15 kernel in the next few weeks, and keep 4.14, 4.18+ for the fall release. [PATCH 1/7] linux-libc-headers: To fix build error when enable mutilib on aarch64 Big endian. This multlib bug fix was cherry picked from the mailing list and didn't cause any issues in my testing. [PATCH 2/7] linux-yocto: add qemuarm -tiny support This is a legwork patch as there was some interest in extendy -tiny support to qemuarm. This kernel still needs configuration work (and won't boot), but without this patch, working on the configuration is more of a pain. [PATCH 3/7] linux-yocto: igb.cfg: change igb config from m to y This is a configuration change sent by the Intel folks, and it hasn't caused any issued here. [PATCH 7/7] kernel-devsrc: restructure for out of tree (and on target) module builds This is the re-submission of the devsrc work that just missed the previous release window. There are no (large) structural changes to the patch, and it still meets the requirements of the bug, and also solves many of the issues reported on the mailing list since it was first submitted. There was one oustanding multlib issue with the original series, but I have done that build: require conf/multilib.conf MULTILIBS = "multilib:lib64" DEFAULTTUNE_virtclass-multilib-lib64 = "x86-64" For qemux86, and I can build kerneldevsrc without issues. If mulitlib blows up again, send me the config and I'll look further. Cheers, Bruce The following changes since commit 9b034e9a83a58077519ba57ced482662f973a467: bitbake: runqueue: Stop on first unsatisfied dependency (2018-07-09 11:26:56 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (6): linux-yocto: add qemuarm -tiny support linux-yocto: igb.cfg: change igb config from m to y linux-yocto/4.12: bump to v4.12.25 linux-yocto-dev: bump to 4.18+ linux-yocto/4.12: update to v4.12.26 kernel-devsrc: restructure for out of tree (and on target) module builds Lei Maohui (1): linux-libc-headers: To fix build error when enable mutilib on aarch64 Big endian. .../linux-libc-headers/linux-libc-headers.inc | 4 + meta/recipes-kernel/linux/kernel-devsrc.bb | 201 - meta/recipes-kernel/linux/linux-yocto-dev.bb | 4 +- meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | 6 +- meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | 4 +- meta/recipes-kernel/linux/linux-yocto-rt_4.15.bb | 4 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | 6 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | 4 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.15.bb | 7 +- meta/recipes-kernel/linux/linux-yocto_4.12.bb | 20 +- meta/recipes-kernel/linux/linux-yocto_4.14.bb | 18 +- meta/recipes-kernel/linux/linux-yocto_4.15.bb | 18 +- 12 files changed, 205 insertions(+), 91 deletions(-) -- 2.5.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] linux-yocto/4.12: bump to v4.12.25
Integrating Paul Gortmaker's v4.12.25 -stable queue, which comprises the following commits: e61748ef5db0 Linux 4.12.25 c34553e3e8af x86/bugs: Rename SSBD_NO to SSB_NO 4aa9e65a91b9 x86/bugs: Remove x86_spec_ctrl_set() 7283d22a40c4 x86/bugs: Expose x86_spec_ctrl_base directly 60fb8f1bbd46 x86/speculation: Rework speculative_store_bypass_update() cc8a65725832 x86/cpufeatures: Disentangle SSBD enumeration 4cadf648f802 x86/cpufeatures: Disentangle MSR_SPEC_CTRL enumeration from IBRS 14476a34b4d0 x86/speculation: Use synthetic bits for IBRS/IBPB/STIBP e66dd0595eac x86/cpu: Make alternative_msr_write work for 32-bit code 32e38eda9958 x86/bugs: Fix the parameters alignment and missing void 5593194735ea x86/bugs: Make cpu_show_common() static 86e7eb10 x86/bugs: Fix __ssb_select_mitigation() return type 4efd9170a722 Documentation/spec_ctrl: Do some minor cleanups e074092d9d0a proc: Use underscores for SSBD in 'status' f57b4be9a391 x86/bugs: Rename _RDS to _SSBD f395cafed558 x86/speculation: Make "seccomp" the default mode for Speculative Store Bypass 9599751872de seccomp: Move speculation migitation control to arch code 647fb2d84f05 seccomp: Add filter flag to opt-out of SSB mitigation 44d5a1d9fe07 seccomp: Use PR_SPEC_FORCE_DISABLE 9490e71c3074 prctl: Add force disable speculation ad5b97fe1ab6 x86/bugs: Make boot modes __ro_after_init cfc00a7877b6 seccomp: Enable speculation flaw mitigations bc4bf81c64b0 proc: Provide details on speculation flaw mitigations a41d2136a447 nospec: Allow getting/setting on non-current task 7e17279e72b9 x86/speculation: Add prctl for Speculative Store Bypass mitigation eea6b1abc91e x86/process: Allow runtime control of Speculative Store Bypass c8630c28cd28 prctl: Add speculation control prctls ecefae5ca101 x86/speculation: Create spec-ctrl.h to avoid include hell 4bcdf54612aa x86/bugs/AMD: Add support to disable RDS on Fam[15,16,17]h if requested 6ce1317929a3 x86/bugs: Whitelist allowed SPEC_CTRL MSR values cd5e5e6f2e39 x86/bugs/intel: Set proper CPU features and setup RDS d97584229d85 x86/bugs: Provide boot parameters for the spec_store_bypass_disable mitigation 793b7453cfc5 x86/cpufeatures: Add X86_FEATURE_RDS c6c3cd47ccbb x86/bugs: Expose /sys/../spec_store_bypass 2d92a521bda7 x86/bugs: Read SPEC_CTRL MSR during boot and re-use reserved bits 81865e325abe x86/bugs: Concentrate bug reporting into a separate function 45245a5b9dc4 x86/bugs: Concentrate bug detection into a separate function 05e82d536970 x86/nospec: Simplify alternative_msr_write() effb0dfecfa2 x86/cpu_entry_area: Sync cpu_entry_area to initial_page_table 89fffee9d555 x86/xen: Zero MSR_IA32_SPEC_CTRL before suspend 76199d7beb0b x86/speculation: Move firmware_restrict_branch_speculation_*() from C to CPP 426210b00b02 x86/speculation: Use IBRS if available before calling into firmware 63904f8a6d41 x86/entry/64: Fix CR3 restore in paranoid_exit() 35cf6a9daf5f x86/cpu: Change type of x86_cache_size variable to unsigned int 7fded60b2cb7 x86/spectre: Fix an error message 343945a16727 x86/speculation: Add dependency eb0f059ee2de nospec: Move array_index_nospec() parameter checking into separate macro 31951a39de73 x86/speculation: Fix up array_index_nospec_mask() asm constraint 344711f16fec x86/entry/64: Remove the unused 'icebp' macro d4324affaf05 x86/entry/64: Fix paranoid_entry() frame pointer warning 3cadbc9228b4 x86/entry/64: Indent PUSH_AND_CLEAR_REGS and POP_REGS properly 0d561147160c x86/entry/64: Get rid of the ALLOC_PT_GPREGS_ON_STACK and SAVE_AND_CLEAR_REGS macros 22c1269eefa9 x86/entry/64: Use PUSH_AND_CLEAN_REGS in more cases ac897d25b1d3 x86/entry/64: Introduce the PUSH_AND_CLEAN_REGS macro 226eea037fa6 x86/entry/64: Interleave XOR register clearing with PUSH instructions 120d889cac9f x86/entry/64: Merge the POP_C_REGS and POP_EXTRA_REGS macros into a single POP_REGS macro 2d5eb3888f24 x86/entry/64: Merge SAVE_C_REGS and SAVE_EXTRA_REGS, remove unused extensions 797a6ff1 x86/speculation: Clean up various Spectre related details ff032faca431 KVM/nVMX: Set the CPU_BASED_USE_MSR_BITMAPS if we have a valid L02 MSR bitmap 1aaab2d1a1fd KVM/x86: Reduce retpoline performance impact in slot_handle_level_range(), by always inlining iterator helper methods dd17c0f5a114 Revert "x86/speculation: Simplify indirect_branch_prediction_barrier()" add7dd4f1f81 x86/speculation: Correct Speculation Control microcode blacklist again 358f03a9395f x86/speculation: Update Speculation Control microcode blacklist 0307861327c7 x86/mm/pti: Fix PTI comment in entry_SYSCALL_64() a612b987b028 x86/entry/64/compat: Clear registers for compat syscalls, to reduce speculation attack surface 1b8b432f6dee x86/entry/64: Clear registers for exceptions/interrupts, to reduce speculation attack surface 513e4bbfc32c x86/entry/64: Clear extra registers beyond syscall arguments, to reduce speculation
[OE-core] [PATCH 5/7] linux-yocto-dev: bump to 4.18+
Bumping the -dev kernel to 4.18 in preparation for the next release kernel. Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto-dev.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb index 1f2d0e9d7c5e..8c9e4198d97c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -10,6 +10,8 @@ inherit kernel require recipes-kernel/linux/linux-yocto.inc +# for ncurses tests +inherit pkgconfig # provide this .inc to set specific revisions include recipes-kernel/linux/linux-yocto-dev-revisions.inc @@ -28,7 +30,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' -LINUX_VERSION ?= "4.17-rc+" +LINUX_VERSION ?= "4.18-rc+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" -- 2.5.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 4/4] kernel.bbclass: move variables for kernel artifacts names to separate bbclass
* this makes it easier to access these variables from some other bbclass e.g. sdcard_image-rpi.bbclass in meta-raspberry where we need to know how some files in deploy are named, but we cannot inherit kernel.bbclass as it's used in image recipe not kernel recipe * alternatively we can move these to bitbake.conf like similar image variables are: meta/conf/bitbake.conf:IMAGE_BASENAME = "${PN}" meta/conf/bitbake.conf:IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}" meta/conf/bitbake.conf:IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" Signed-off-by: Martin Jansa --- meta/classes/kernel-artifact-names.bbclass | 19 +++ meta/classes/kernel.bbclass| 18 +- 2 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 meta/classes/kernel-artifact-names.bbclass diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass new file mode 100644 index 00..d696888322 --- /dev/null +++ b/meta/classes/kernel-artifact-names.bbclass @@ -0,0 +1,19 @@ +KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" +# Don't include the DATETIME variable in the sstate package signatures +KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" +KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}" + +KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" +KERNEL_DTB_BASE_NAME[vardepsexclude] = "DATETIME" +KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}" + +MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" +MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" + +MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" +MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz" +MODULE_TARBALL_DEPLOY ?= "1" + +INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" +INITRAMFS_BASE_NAME[vardepsexclude] = "DATETIME" +INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 0045cec819..42efa382ad 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -657,23 +657,7 @@ do_sizecheck[dirs] = "${B}" addtask sizecheck before do_install after do_strip -KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" -# Don't include the DATETIME variable in the sstate package signatures -KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" -KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}" -KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" -KERNEL_DTB_BASE_NAME[vardepsexclude] = "DATETIME" -KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}" -MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" -MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" -MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" -# Don't include the DATETIME variable in the sstate package signatures -MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz" -MODULE_TARBALL_DEPLOY ?= "1" - -INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" -INITRAMFS_BASE_NAME[vardepsexclude] = "DATETIME" -INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" +inherit kernel-artifact-names kernel_do_deploy() { deployDir="${DEPLOYDIR}" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv3 1/4] kernel-devicetree.bbclass: Use lowercase names for shell variables
On Thu, Jul 05, 2018 at 09:21:49AM +0100, Richard Purdie wrote: > On Wed, 2018-07-04 at 07:59 +, Martin Jansa wrote: > > * just to make it more clear what is local shell variable and what is > > replaced by bitbake from the metadata and also to prevent the > > variable > > to be incorrectly expanded by bitbake if someone happens to define > > e.g. DTB_BASE_NAME > > > > Signed-off-by: Martin Jansa > > --- > > meta/classes/kernel-devicetree.bbclass | 80 +--- > > -- > > 1 file changed, 40 insertions(+), 40 deletions(-) > > I think something in this series is breaking qemuppc automated testing: > > https://autobuilder.yocto.io/builders/nightly-ppc/builds/1129 > https://autobuilder.yocto.io/builders/nightly-ppc-lsb/builds/1114 I've sent fix for meta-yocto-bsp here: https://lists.yoctoproject.org/pipermail/poky/2018-July/011436.html I don't have the device to test it in runtime, but the fix seems simple enough that it should work. Will sent v4 of all 4 oe-core patches, with just link to above added in one commit message (otherwise it's the same as v2, rebased after the revert of the other kernel-devicetree.bbclass change from last week). Cheers, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 3/4] kernel.bbclass: use the consistent naming schema for initramfs
* use INITRAMFS_BASE_NAME and INITRAMFS_SYMLINK_NAME variables, like other kernel artifacts are using * use "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" instead of "${PV}-${PR}-${MACHINE}-${DATETIME}" to be consistent with other files * allow to modify default symlink name with INITRAMFS_SYMLINK_NAME instead of currently used: initramfs_symlink_name=${type}-initramfs-${MACHINE} Signed-off-by: Martin Jansa --- meta/classes/kernel.bbclass | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 7ce64fd19f..0045cec819 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -229,8 +229,6 @@ copy_initramfs() { echo "Finished copy of initramfs into ./usr" } -INITRAMFS_BASE_NAME ?= "initramfs-${PV}-${PR}-${MACHINE}-${DATETIME}" -INITRAMFS_BASE_NAME[vardepsexclude] = "DATETIME" do_bundle_initramfs () { if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then echo "Creating a kernel image with a bundled initramfs..." @@ -673,6 +671,10 @@ MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz" MODULE_TARBALL_DEPLOY ?= "1" +INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" +INITRAMFS_BASE_NAME[vardepsexclude] = "DATETIME" +INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" + kernel_do_deploy() { deployDir="${DEPLOYDIR}" if [ -n "${KERNEL_DEPLOYSUBDIR}" ]; then @@ -697,17 +699,14 @@ kernel_do_deploy() { ln -sf ${base_name}.bin $deployDir/${type} done - cd ${B} - # Update deploy directory - for type in ${KERNEL_IMAGETYPES} ; do - if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then - echo "Copying deploy ${type} kernel-initramfs image and setting up links..." + if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then + for type in ${KERNEL_IMAGETYPES} ; do initramfs_base_name=${type}-${INITRAMFS_BASE_NAME} - initramfs_symlink_name=${type}-initramfs-${MACHINE} + initramfs_symlink_name=${type}-${INITRAMFS_SYMLINK_NAME} install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs $deployDir/${initramfs_base_name}.bin ln -sf ${initramfs_base_name}.bin $deployDir/${initramfs_symlink_name}.bin - fi - done + done + fi } do_deploy[cleandirs] = "${DEPLOYDIR}" do_deploy[dirs] = "${DEPLOYDIR} ${B}" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv4 2/4] kernel-devicetree.bbclass: Fix and simplify instalation of DTB files
* add 2 new variables: KERNEL_DTB_BASE_NAME KERNEL_DTB_SYMLINK_NAME instead of reusing KERNEL_IMAGE_SYMLINK_NAME and than expecting that default value ${MACHINE} was being used in e.g.: DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` * install normal DTB files only once even if there is multiple entries in KERNEL_IMAGETYPE_FOR_MAKE and don't prefix them with the type of the kernel image, use the KERNEL_IMAGETYPE_FOR_MAKE as a prefix only when installing them bundled with kernel or initramfs image. * deploy the files from ${D}/${KERNEL_IMAGEDEST}/ instead of kernel build directory, so that we don't need to call DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"` again in do_deploy * create all links in do_deploy task, because default KERNEL_DTB_BASE_NAME like KERNEL_IMAGE_BASE_NAME contains PKGR and PKGR is different in do_install and do_deploy, because kernel.bbclass calls meta/classes/kernel.bbclass:do_install[prefuncs] += "package_get_auto_pr" meta/classes/kernel.bbclass:do_deploy[prefuncs] += "package_get_auto_pr" * the filenames are a bit different, but with separate variable it should be easier for other bbclasses which use these DTB files to find them correctly, just use either the cannonical name $dtb_base_name.$dtb_ext or $dtb_base_name-${KERNEL_DTB_SYMLINK_NAME}.$dtb_ext because PKGR (and other PKG* variables) might be different in your task and kernel.do_deploy task. * fix DTB files being deployed with incorrect filenames when KERNEL_IMAGE_SYMLINK_NAME isn't set to ${MACHINE}, e.g. instead of the default: -rw-r--r-- 2 bitbake bitbake 1.4K Nov 20 07:41 deploy/images/raspberrypi3-64/Image-1-4.9.59+git0+e7976b2aff-r0.2-lirc-rpi-20171120043031.dtbo lrwxrwxrwx 2 bitbake bitbake 64 Nov 20 07:41 deploy/images/raspberrypi3-64/Image-lirc-rpi.dtbo -> Image-1-4.9.59+git0+e7976b2aff-r0.2-lirc-rpi-20171120043031.dtbo lrwxrwxrwx 2 bitbake bitbake 64 Nov 20 07:41 deploy/images/raspberrypi3-64/lirc-rpi.dtbo -> Image-1-4.9.59+git0+e7976b2aff-r0.2-lirc-rpi-20171120043031.dtbo I was getting: -rw-r--r-- 2 bitbake bitbake 1348 Nov 20 10:28 deploy/images/raspberrypi3-64/Image-linux-raspberrypi-lirc-rpi.dtbo lrwxrwxrwx 2 bitbake bitbake 37 Nov 20 10:28 deploy/images/raspberrypi3-64/Image-linux-raspberrypi-lirc-rpi-master-20171120102653.dtbo -> Image-linux-raspberrypi-lirc-rpi.dtbo lrwxrwxrwx 2 bitbake bitbake 37 Nov 20 10:28 deploy/images/raspberrypi3-64/lirc-rpi.dtbo -> Image-linux-raspberrypi-lirc-rpi.dtbo and e.g. sdcard_image-rpi.bbclass from meta-raspberrypi: https://github.com/agherzan/meta-raspberrypi/blob/37e4e18f4a745ce8dc11f7e40a29da0859ff13c6/classes/sdcard_image-rpi.bbclass was failing in: mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::${DTB_BASE_NAME}.dtb because ${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb doesn't exist in my build, due to DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` not replacing whole "${KERNEL_IMAGE_SYMLINK_NAME}" (read ${MACHINE}) with just ${DTB_BASE_NAME} * with this change applied the deploy dir looks like this: -rw-r--r-- 2 bitbake bitbake 1.4K Nov 20 15:49 deploy/images/raspberrypi3-64/lirc-rpi-1-4.9.59+git0+e7976b2aff-r0.8-raspberrypi3-64-20171120154716.dtbo lrwxrwxrwx 2 bitbake bitbake 74 Nov 20 15:49 deploy/images/raspberrypi3-64/lirc-rpi.dtbo -> lirc-rpi-1-4.9.59+git0+e7976b2aff-r0.8-raspberrypi3-64-20171120154716.dtbo lrwxrwxrwx 2 bitbake bitbake 74 Nov 20 15:49 deploy/images/raspberrypi3-64/lirc-rpi-raspberrypi3-64.dtbo -> lirc-rpi-1-4.9.59+git0+e7976b2aff-r0.8-raspberrypi3-64-20171120154716.dtbo and works correctly even with DISTRO using different naming scheme * the sdcard_image-rpi.bbclass still needs to be modified, I've provided updated version here: https://github.com/agherzan/meta-raspberrypi/pull/159 * mpc8315e-rdb.conf MACHINE in meta-yocto-bsp also needs small fix: https://lists.yoctoproject.org/pipermail/poky/2018-July/011436.html Signed-off-by: Martin Jansa --- meta/classes/kernel-devicetree.bbclass | 47 -- meta/classes/kernel.bbclass| 3 ++ 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass index 10441475e8..9c5e125981 100644 --- a/meta/classes/kernel-devicetree.bbclass +++ b/meta/classes/kernel-devicetree.bbclass @@ -60,20 +60,9 @@ do_install_append() { for dtbf in ${KERNEL_DEVICETREE}; do dtb=`normalize_dtb "$dtbf"` dtb_ext=${dtb##*.} + dtb_base_name=`basename $dtb .$dtb_ext` dtb_path=`get_real_dtb_path_in_kernel "$dtb"` - dtb_base_name=`basename $dtb ."$dtb_ext"` install -m 0644 $dtb_path ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext - for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do -
[OE-core] [PATCHv4 1/4] kernel-devicetree.bbclass: Use lowercase names for shell variables
* just to make it more clear what is local shell variable and what is replaced by bitbake from the metadata and also to prevent the variable to be incorrectly expanded by bitbake if someone happens to define e.g. DTB_BASE_NAME Signed-off-by: Martin Jansa --- meta/classes/kernel-devicetree.bbclass | 80 +- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass index 4f80cc62eb..10441475e8 100644 --- a/meta/classes/kernel-devicetree.bbclass +++ b/meta/classes/kernel-devicetree.bbclass @@ -10,21 +10,21 @@ FILES_${KERNEL_PACKAGE_NAME}-image-zimage-bundle = "/${KERNEL_IMAGEDEST}/zImage- KERNEL_DEVICETREE_BUNDLE ?= "0" normalize_dtb () { - DTB="$1" - if echo ${DTB} | grep -q '/dts/'; then - bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." - DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` + dtb="$1" + if echo $dtb | grep -q '/dts/'; then + bbwarn "$dtb contains the full path to the the dts file, but only the dtb name should be used." + dtb=`basename $dtb | sed 's,\.dts$,.dtb,g'` fi - echo "${DTB}" + echo "$dtb" } get_real_dtb_path_in_kernel () { - DTB="$1" - DTB_PATH="${B}/arch/${ARCH}/boot/dts/${DTB}" - if [ ! -e "${DTB_PATH}" ]; then - DTB_PATH="${B}/arch/${ARCH}/boot/${DTB}" + dtb="$1" + dtb_path="${B}/arch/${ARCH}/boot/dts/$dtb" + if [ ! -e "$dtb_path" ]; then + dtb_path="${B}/arch/${ARCH}/boot/$dtb" fi - echo "${DTB_PATH}" + echo "$dtb_path" } do_configure_append() { @@ -50,61 +50,61 @@ do_configure_append() { } do_compile_append() { - for DTB in ${KERNEL_DEVICETREE}; do - DTB=`normalize_dtb "${DTB}"` - oe_runmake ${DTB} + for dtbf in ${KERNEL_DEVICETREE}; do + dtb=`normalize_dtb "$dtbf"` + oe_runmake $dtb done } do_install_append() { - for DTB in ${KERNEL_DEVICETREE}; do - DTB=`normalize_dtb "${DTB}"` - DTB_EXT=${DTB##*.} - DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"` - DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` - install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} + for dtbf in ${KERNEL_DEVICETREE}; do + dtb=`normalize_dtb "$dtbf"` + dtb_ext=${dtb##*.} + dtb_path=`get_real_dtb_path_in_kernel "$dtb"` + dtb_base_name=`basename $dtb ."$dtb_ext"` + install -m 0644 $dtb_path ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} - DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - ln -sf ${DTB_BASE_NAME}.${DTB_EXT} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} + dtb_symlink_name=`echo ${symlink_name} | sed "s/${MACHINE}/$dtb_base_name/g"` + ln -sf $dtb_base_name.$dtb_ext ${D}/${KERNEL_IMAGEDEST}/devicetree-$dtb_symlink_name.$dtb_ext if [ "$type" = "zImage" ] && [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then cat ${D}/${KERNEL_IMAGEDEST}/$type \ - ${D}/${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} \ - > ${D}/${KERNEL_IMAGEDEST}/$type-${DTB_BASE_NAME}.${DTB_EXT}.bin + ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext \ + > ${D}/${KERNEL_IMAGEDEST}/$type-$dtb_base_name.$dtb_ext.bin fi done done } do_deploy_append() { - for DTB in ${KERNEL_DEVICETREE}; do - DTB=`normalize_dtb "${DTB}"` - DTB_EXT=${DTB##*.} - DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` + for dtbf in ${KERNEL_DEVICETREE}; do + dtb=`normalize_dtb "$dtbf"` + dtb_ext=${dtb##*.} + dtb_base_name=`basename $dtb ."$dtb_ext"` for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do base_name=${type}"-"${KERNEL_IMAGE_BASE_NAME} symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} - DTB_NAME=`echo ${base_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"` + dtb_name=`echo ${base_name} | sed "s/${MACHINE}/$dtb_base_name/g"` +
[OE-core] Yocto Project Status WW28’18
Current Dev Position: YP 2.6 M2. Next Deadline: YP 2.6 M2 Build Target is July 16, 2018 SWAT Team Rotation: · SWAT lead is currently: Ross · SWAT team rotation: Ross -> Paul on July 13, 2018 · SWAT team rotation: Paul -> Tracy on July 20, 2018 · https://wiki.yoctoproject.org/wiki/Yocto_Build_Failure_Swat_Team Key Status/Updates: · 2.6 M1 is out of QA and due for release this week, See: https://wiki.yoctoproject.org/wiki/WW27_-_2018-07-02_-_Full_Test_Cycle_2.6_M1_rc1. · QA reports for 2.3.4 and 2.2.4 should be due this week. · 2.6 M2’s deadline is a week today. · Master took ~100 patches over the past week with patch review remaining roughly stable. · Tweaks the new autobuilder codebase mean we should have more reliable buildhistory data for master and for test branches such as -next and mut. Analysis of that data may become the problematic issue now. · Delays in oe-selftest execution mean we’ve started looking into solutions for increasing its parallelism once again. · The triage team decided to start sending out a list of the unassigned bugs once a week in the hope more people may be able to help with bugs that aren’t being actively worked on. Planned Releases for YP 2.6: · YP 2.6 M1 Release Target was June 22, 2018 · YP 2.6 M2 Build Target is July 16, 2018 · YP 2.6 M2 Release Target is July 27, 2018 · YP 2.6 M3 Build Target is Aug. 27, 2018 · YP 2.6 M3 Release Target is Sept. 7, 2018 · YP 2.6 M4 Build Target is Oct. 1, 2018 · YP 2.6 M4 Release Target is Oct. 26, 2018 Planned upcoming dot releases: · YP 2.3.4 (Pyro) rc1 is built and in QA see https://wiki.yoctoproject.org/wiki/2.3_QA_Status it is at 97% complete. · YP 2.2.4 (Morty) rc1 is built and in QA see https://wiki.yoctoproject.org/wiki/2.2_QA_Status it is at 98% complete. · YP 2.5.1 (Sumo) will be targeted after YP 2.6 M2 is done. · YP 2.4.4 (Rocko) will be targeted after YP 2.6 M4 is done. Tracking Metrics: · WDD 2646 (last week 2654) (https://wiki.yoctoproject.org/charts/combo.html) · Poky Patch Metrics oTotal patches found: 1628 (last week 1640) oPercentage of patches in the Pending State: 761 (47%) [last week 754 (46%)] Key Status Links for YP: https://wiki.yoctoproject.org/wiki/Yocto_Project_v2.6_Status https://wiki.yoctoproject.org/wiki/Yocto_2.6_Schedule https://wiki.yoctoproject.org/wiki/Yocto_2.6_Features The Status reports are now stored on the wiki at: https://wiki.yoctoproject.org/wiki/Weekly_Status [If anyone has suggestions for other information you’d like to see on this weekly status update, let us know!] Thanks, Stephen K. Jolley Yocto Project Program Manager INTEL, MS JF1-255, 2111 N.E. 25th Avenue, Hillsboro, OR 97124 •Cell:(208) 244-4460 • Email: stephen.k.jol...@intel.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Yocto Project Unassigned Bugs - Help Needed
All, The triage team meets weekly and does its best to handle the bugs reported into the bugzilla. The numbers of people attending that meeting have fallen, as have the number of people available to help fix bugs. One of the things we hear users report is they don't know how to help. We (the triage team) are therefore going to start reporting out the currently 327 unassigned bugs. We're hoping people may be able to spare some time now and again to help out with these. Bugs are split into two types, "true bugs" where things don't work as they should and "enhancements" which are features we'd want to add to the system. There are also roughly three different "priority" classes right now, "2.6", "2.99" and "Future", the more pressing/urgent issues being in "2.6". Please review this link and if a bug is something you would be able to help with either take ownership of the bug, or send me (stephen.k.jol...@intel.com) an e-mail with the bug number you would like and I will assign it to you (please make sure you have a bugzilla account). The list is at: https://wiki.yoctoproject.org/wiki/Bug_Triage#Unassigned_Bugs Thanks, Stephen K. Jolley Yocto Project Program Manager INTEL, MS JF1-255, 2111 N.E. 25th Avenue, Hillsboro, OR 97124 *Cell:(208) 244-4460 * Email: stephen.k.jol...@intel.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH resend 1/3] openssl-1.1: fix c_rehash perl errors
Patch original c_rehash script with Debian patch instead of overriding it with own version. Error output from c_reshah without patching: Unknown regexp modifier "/b" at ./c_rehash line 15, at end of line Unknown regexp modifier "/W" at ./c_rehash line 28, at end of line Unknown regexp modifier "/3" at ./c_rehash line 28, at end of line Unknown regexp modifier "/2" at ./c_rehash line 28, at end of line No such class installdir at ./c_rehash line 63, near "Prefix our installdir" (Might be a runaway multi-line // string starting on line 28) syntax error at ./c_rehash line 63, near "Prefix our installdir" Can't redeclare "my" in "my" at ./c_rehash line 68, near "" Execution of ./c_rehash aborted due to compilation errors. Signed-off-by: Andrej Valek Signed-off-by: Marko Peter --- ...le.pl-only-quote-stuff-that-actually-need.patch | 29 ++ .../recipes-connectivity/openssl/openssl_1.1.0h.bb | 1 + 2 files changed, 30 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/debian/Revert-util-dofile.pl-only-quote-stuff-that-actually-need.patch diff --git a/meta/recipes-connectivity/openssl/openssl/debian/Revert-util-dofile.pl-only-quote-stuff-that-actually-need.patch b/meta/recipes-connectivity/openssl/openssl/debian/Revert-util-dofile.pl-only-quote-stuff-that-actually-need.patch new file mode 100644 index 00..25d3093e40 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/debian/Revert-util-dofile.pl-only-quote-stuff-that-actually-need.patch @@ -0,0 +1,29 @@ +From: Sebastian Andrzej Siewior +Date: Wed, 28 Mar 2018 14:05:53 +0200 +Subject: Revert "util/dofile.pl: only quote stuff that actually needs + quoting" + +This reverts commit 77ba00bc. We ended up without the quotes. + +BTS: #894282 +Signed-off-by: Sebastian Andrzej Siewior +--- + util/dofile.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/util/dofile.pl b/util/dofile.pl +index fc72989b0fd9..a932941cd5ad 100644 +--- a/util/dofile.pl b/util/dofile.pl +@@ -99,9 +99,9 @@ package main; + # This adds quotes (") around the given string, and escapes any $, @, \, + # " and ' by prepending a \ to them. + sub quotify1 { +-my $s = my $orig = shift @_; ++my $s = shift @_; + $s =~ s/([\$\@\\"'])/\\$1/g; +-$s ne $orig || $s =~ /\s/ ? '"'.$s.'"' : $s; ++'"'.$s.'"'; + } + + # quotify_l LIST diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb index 94b75eb92a..eddf53c992 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://run-ptest \ file://openssl-c_rehash.sh \ file://0001-Take-linking-flags-from-LDFLAGS-env-var.patch \ + file://debian/Revert-util-dofile.pl-only-quote-stuff-that-actually-need.patch \ " S = "${WORKDIR}/openssl-${PV}" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH resend 3/3] openssl-1.1: /etc/ssl location compatibility
Some packages have hard-coded path to /etc/ssl location. Create a symlinks to correct location. Signed-off-by: Andrej Valek Signed-off-by: Marko Peter --- meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb index df05f3a2b7..487219b600 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb @@ -22,7 +22,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ S = "${WORKDIR}/openssl-${PV}" -inherit lib_package multilib_header ptest +inherit lib_package multilib_header ptest relative_symlinks do_configure () { os=${HOST_OS} @@ -133,6 +133,18 @@ EXTRA_OECONF_libc-musl += "-DOPENSSL_NO_ASYNC" do_install () { oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install oe_multilib_header openssl/opensslconf.h + +# Create SSL structure for PATH hard-coded packages like ca-certificates +# Debian is also using this technique +install -d ${D}${sysconfdir}/ssl/ +mv ${D}${libdir}/ssl-1.1/openssl.cnf \ + ${D}${libdir}/ssl-1.1/certs \ + ${D}${libdir}/ssl-1.1/private \ + \ + ${D}${sysconfdir}/ssl/ +ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl-1.1/certs +ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl-1.1/private +ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl-1.1/openssl.cnf } do_install_append_class-native () { @@ -163,6 +175,6 @@ FILES_${PN} =+ " ${libdir}/ssl-1.1/*" FILES_${PN}-misc = "${libdir}/ssl-1.1/misc" RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" FILES_${PN}-engines = "${libdir}/engines-1.1" -FILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" -CONFFILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" +FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf ${libdir}/ssl-1.1/openssl.cnf" +CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" RRECOMMENDS_libcrypto += "openssl-conf" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH resend 2/3] openssl-1.1: rework packaging
The main idea is to have libssl and libcrypto in separate packages. This saves space if only single library is needed and also some recipes (in other layers) depend on these library packages. Together with this other packages like in 1.0.x were created. The only difference is that openssl 1.1 has additional package openssl-bin. Add missing dependency to perl for openssl-bin pkg, c_rehash requires it. Signed-off-by: Andrej Valek Signed-off-by: Marko Peter --- meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb index eddf53c992..df05f3a2b7 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb @@ -155,8 +155,14 @@ do_install_ptest() { RDEPENDS_${PN}-ptest += "perl-module-file-spec-functions bash python" +PACKAGES =+ "libcrypto libssl ${PN}-misc ${PN}-engines openssl-conf" +RDEPENDS_${PN}-bin = "perl" +FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" +FILES_libssl = "${libdir}/libssl${SOLIBS}" FILES_${PN} =+ " ${libdir}/ssl-1.1/*" - -PACKAGES =+ "${PN}-engines" +FILES_${PN}-misc = "${libdir}/ssl-1.1/misc" +RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" FILES_${PN}-engines = "${libdir}/engines-1.1" - +FILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" +CONFFILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" +RRECOMMENDS_libcrypto += "openssl-conf" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH resend 0/3] Openssl 1.1 upgrading
Resend patches from http://lists.openembedded.org/pipermail/openembedded-core/2018-June/151699.html thread. Andrej Valek (3): openssl-1.1: fix c_rehash perl errors openssl-1.1: rework packaging openssl-1.1: /etc/ssl location compatibility ...le.pl-only-quote-stuff-that-actually-need.patch | 29 ++ .../recipes-connectivity/openssl/openssl_1.1.0h.bb | 27 +--- 2 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-connectivity/openssl/openssl/debian/Revert-util-dofile.pl-only-quote-stuff-that-actually-need.patch -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 3/3] openssl-1.1: /etc/ssl location compatibility
No open issues from my side, please resend as Ross probably forgot to pull it into his staging branch. Alex 2018-07-09 14:06 GMT+02:00 Andrej Valek : > Hi Alex, > > What is the current status of this upgrade? Are there still some open > points? > > Cheers, > Andrej > > On 06/11/18 15:30, Andrej Valek wrote: >> Some packages have hard-coded path to /etc/ssl location. >> Create a symlinks to correct location. >> >> Signed-off-by: Andrej Valek >> Signed-off-by: Marko Peter >> --- >> meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 18 +++--- >> 1 file changed, 15 insertions(+), 3 deletions(-) >> >> diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb >> b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb >> index df05f3a2b7..487219b600 100644 >> --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb >> +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb >> @@ -22,7 +22,7 @@ SRC_URI = >> "http://www.openssl.org/source/openssl-${PV}.tar.gz \ >> >> S = "${WORKDIR}/openssl-${PV}" >> >> -inherit lib_package multilib_header ptest >> +inherit lib_package multilib_header ptest relative_symlinks >> >> do_configure () { >> os=${HOST_OS} >> @@ -133,6 +133,18 @@ EXTRA_OECONF_libc-musl += "-DOPENSSL_NO_ASYNC" >> do_install () { >> oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install >> oe_multilib_header openssl/opensslconf.h >> + >> +# Create SSL structure for PATH hard-coded packages like >> ca-certificates >> +# Debian is also using this technique >> +install -d ${D}${sysconfdir}/ssl/ >> +mv ${D}${libdir}/ssl-1.1/openssl.cnf \ >> + ${D}${libdir}/ssl-1.1/certs \ >> + ${D}${libdir}/ssl-1.1/private \ >> + \ >> + ${D}${sysconfdir}/ssl/ >> +ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl-1.1/certs >> +ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl-1.1/private >> +ln -sf ${sysconfdir}/ssl/openssl.cnf >> ${D}${libdir}/ssl-1.1/openssl.cnf >> } >> >> do_install_append_class-native () { >> @@ -163,6 +175,6 @@ FILES_${PN} =+ " ${libdir}/ssl-1.1/*" >> FILES_${PN}-misc = "${libdir}/ssl-1.1/misc" >> RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" >> FILES_${PN}-engines = "${libdir}/engines-1.1" >> -FILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" >> -CONFFILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" >> +FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf >> ${libdir}/ssl-1.1/openssl.cnf" >> +CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" >> RRECOMMENDS_libcrypto += "openssl-conf" >> > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 3/3] openssl-1.1: /etc/ssl location compatibility
Hi Alex, What is the current status of this upgrade? Are there still some open points? Cheers, Andrej On 06/11/18 15:30, Andrej Valek wrote: > Some packages have hard-coded path to /etc/ssl location. > Create a symlinks to correct location. > > Signed-off-by: Andrej Valek > Signed-off-by: Marko Peter > --- > meta/recipes-connectivity/openssl/openssl_1.1.0h.bb | 18 +++--- > 1 file changed, 15 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb > b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb > index df05f3a2b7..487219b600 100644 > --- a/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb > +++ b/meta/recipes-connectivity/openssl/openssl_1.1.0h.bb > @@ -22,7 +22,7 @@ SRC_URI = > "http://www.openssl.org/source/openssl-${PV}.tar.gz \ > > S = "${WORKDIR}/openssl-${PV}" > > -inherit lib_package multilib_header ptest > +inherit lib_package multilib_header ptest relative_symlinks > > do_configure () { > os=${HOST_OS} > @@ -133,6 +133,18 @@ EXTRA_OECONF_libc-musl += "-DOPENSSL_NO_ASYNC" > do_install () { > oe_runmake DESTDIR="${D}" MANDIR="${mandir}" MANSUFFIX=ssl install > oe_multilib_header openssl/opensslconf.h > + > +# Create SSL structure for PATH hard-coded packages like > ca-certificates > +# Debian is also using this technique > +install -d ${D}${sysconfdir}/ssl/ > +mv ${D}${libdir}/ssl-1.1/openssl.cnf \ > + ${D}${libdir}/ssl-1.1/certs \ > + ${D}${libdir}/ssl-1.1/private \ > + \ > + ${D}${sysconfdir}/ssl/ > +ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl-1.1/certs > +ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl-1.1/private > +ln -sf ${sysconfdir}/ssl/openssl.cnf > ${D}${libdir}/ssl-1.1/openssl.cnf > } > > do_install_append_class-native () { > @@ -163,6 +175,6 @@ FILES_${PN} =+ " ${libdir}/ssl-1.1/*" > FILES_${PN}-misc = "${libdir}/ssl-1.1/misc" > RDEPENDS_${PN}-misc = "${@bb.utils.filter('PACKAGECONFIG', 'perl', d)}" > FILES_${PN}-engines = "${libdir}/engines-1.1" > -FILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" > -CONFFILES_openssl-conf = "${libdir}/ssl-1.1/openssl.cnf" > +FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf > ${libdir}/ssl-1.1/openssl.cnf" > +CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" > RRECOMMENDS_libcrypto += "openssl-conf" > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [v5][PATCH] busybox: update to 1.28.4
Hi Armin, What is the current status of busybox upgrading? It would be great, if you can take a look on it. Otherwise, I can try to update it to last upstream version 1.29. Regards, Andrej On 06/11/18 06:18, Armin Kuster wrote: > refactored busybox-udhcpc-no_deconfig.patch for this update > updated 1.28.3 > > [v1] > removed patches included in update: > busybox/CVE-2011-5325.patch > busybox/CVE-2017-15873.patch > busybox/busybox-CVE-2017-16544.patch > > [v2] > Add back busybox-udhcpc-no_deconfig.patch ti SRC_URI, missed earlier > > [v3] > Update defconfig based on feedback > > [v4] > Decided to update again. > 1.28.4 > > [v5] > rebased change do to changes in master > squashed .cfg into defconfig and remove files > Delete busybox-fix-lzma-segfaults.patch which is included in updated. > > Signed-off-by: Armin Kuster > --- > .../busybox/busybox/CVE-2011-5325.patch| 481 > - > .../busybox/busybox/CVE-2017-15873.patch | 95 > .../busybox/busybox/busybox-CVE-2017-16544.patch | 43 -- > .../busybox/busybox-fix-lzma-segfaults.patch | 106 - > .../busybox/busybox-udhcpc-no_deconfig.patch | 36 +- > meta/recipes-core/busybox/busybox/defconfig| 278 ++-- > meta/recipes-core/busybox/busybox/getopts.cfg | 3 - > .../busybox/busybox/login-utilities.cfg| 13 - > meta/recipes-core/busybox/busybox/mdev.cfg | 2 - > .../busybox/busybox/mount-via-label.cfg| 9 - > meta/recipes-core/busybox/busybox/resize.cfg | 2 - > meta/recipes-core/busybox/busybox/sha1sum.cfg | 1 - > meta/recipes-core/busybox/busybox/sha256sum.cfg| 1 - > meta/recipes-core/busybox/busybox/syslog.cfg | 11 - > .../{busybox_1.27.2.bb => busybox_1.28.4.bb} | 15 +- > 15 files changed, 162 insertions(+), 934 deletions(-) > delete mode 100755 meta/recipes-core/busybox/busybox/CVE-2011-5325.patch > delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2017-15873.patch > delete mode 100644 > meta/recipes-core/busybox/busybox/busybox-CVE-2017-16544.patch > delete mode 100644 > meta/recipes-core/busybox/busybox/busybox-fix-lzma-segfaults.patch > delete mode 100644 meta/recipes-core/busybox/busybox/getopts.cfg > delete mode 100644 meta/recipes-core/busybox/busybox/login-utilities.cfg > delete mode 100644 meta/recipes-core/busybox/busybox/mount-via-label.cfg > delete mode 100644 meta/recipes-core/busybox/busybox/resize.cfg > delete mode 100644 meta/recipes-core/busybox/busybox/sha1sum.cfg > delete mode 100644 meta/recipes-core/busybox/busybox/sha256sum.cfg > delete mode 100644 meta/recipes-core/busybox/busybox/syslog.cfg > rename meta/recipes-core/busybox/{busybox_1.27.2.bb => busybox_1.28.4.bb} > (72%) > > diff --git a/meta/recipes-core/busybox/busybox/CVE-2011-5325.patch > b/meta/recipes-core/busybox/busybox/CVE-2011-5325.patch > deleted file mode 100755 > index 0926107..000 > --- a/meta/recipes-core/busybox/busybox/CVE-2011-5325.patch > +++ /dev/null > @@ -1,481 +0,0 @@ > -busybox-1.27.2: Fix CVE-2011-5325 > - > -[No upstream tracking] -- https://bugs.busybox.net/show_bug.cgi?id=8411 > - > -libarchive: do not extract unsafe symlinks > - > -Prevent unsafe links extracting unless env variable > $EXTRACT_UNSAFE_SYMLINKS=1 > -is not set. Untarring file with -C DESTDIR parameter could be extracted with > -unwanted symlinks. This doesn't feel right, and IIRC GNU tar doesn't do that. > -Include necessary changes from previous commits. > - > -Upstream-Status: Backport > [https://git.busybox.net/busybox/commit/?id=bc9bbeb2b81001e8731cd2ae501c8fccc8d87cc7] > -CVE: CVE-2011-5325 > -bug: 8411 > -Signed-off-by: Radovan Scasny > -Signed-off-by: Andrej Valek > - > -diff --git a/archival/libarchive/Kbuild.src b/archival/libarchive/Kbuild.src > -index 942e755..e1a8a75 100644 > a/archival/libarchive/Kbuild.src > -+++ b/archival/libarchive/Kbuild.src > -@@ -12,6 +12,8 @@ COMMON_FILES:= \ > - data_extract_all.o \ > - data_extract_to_stdout.o \ > - \ > -+unsafe_symlink_target.o \ > -+\ > - filter_accept_all.o \ > - filter_accept_list.o \ > - filter_accept_reject_list.o \ > -diff --git a/archival/libarchive/data_extract_all.c > b/archival/libarchive/data_extract_all.c > -index 1830ffb..b828b65 100644 > a/archival/libarchive/data_extract_all.c > -+++ b/archival/libarchive/data_extract_all.c > -@@ -128,10 +128,9 @@ void FAST_FUNC data_extract_all(archive_handle_t > *archive_handle) > - res = link(hard_link, dst_name); > - if (res != 0 && !(archive_handle->ah_flags & > ARCHIVE_EXTRACT_QUIET)) { > - /* shared message */ > --bb_perror_msg("can't create %slink " > --"%s to %s", "hard", > --dst_name, > --hard_link); > -+bb_perror_msg("can't create %slink '%s' to
[OE-core] [PATCH] distutils3: pass build arguments when doing a clean
We should pass the build arguments to setup.py when doing a clean, because sometimes the arguments are required for setup.py get started. Signed-off-by: Ross Burton --- meta/classes/distutils3.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass index 99ad64d287d..d4b92a3bb26 100644 --- a/meta/classes/distutils3.bbclass +++ b/meta/classes/distutils3.bbclass @@ -10,7 +10,7 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \ distutils3_do_configure() { if [ "${CLEANBROKEN}" != "1" ] ; then - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py clean + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py clean ${DISTUTILS_BUILD_ARGS} fi } -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] distutils: clean the build tree in do_configure
Sorry about that, I'll run a build against all of meta-python now. Ross On 8 July 2018 at 01:57, Khem Raj wrote: > For the record this breaks few recipes in meta-python > > meta-python/recipes-devtools/python/python3-lxml_4.2.3.bb > meta-python/recipes-devtools/python/python3-pandas_0.23.1.bb > meta-python/recipes-devtools/python/python3-protobuf_3.6.0.bb > > It would be better if meta-python was exercised as testing for such > changes in oe-core for better coverage. > On Thu, Jul 5, 2018 at 8:58 AM Ross Burton wrote: >> >> base_do_configure() tries to do "make clean" if there is a Makefile present. >> For most recipes using distutils there is not a Makefile, but we do know that >> "setup.py clean" will work so call that instead. >> >> Signed-off-by: Ross Burton >> --- >> meta/classes/distutils3.bbclass | 8 +++- >> 1 file changed, 7 insertions(+), 1 deletion(-) >> >> diff --git a/meta/classes/distutils3.bbclass >> b/meta/classes/distutils3.bbclass >> index 6c303068820..99ad64d287d 100644 >> --- a/meta/classes/distutils3.bbclass >> +++ b/meta/classes/distutils3.bbclass >> @@ -8,6 +8,12 @@ DISTUTILS_STAGE_ALL_ARGS ?= >> "--prefix=${STAGING_DIR_HOST}${prefix} \ >> DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \ >> --install-data=${D}/${datadir}" >> >> +distutils3_do_configure() { >> + if [ "${CLEANBROKEN}" != "1" ] ; then >> + ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} >> setup.py clean >> + fi >> +} >> + >> distutils3_do_compile() { >> STAGING_INCDIR=${STAGING_INCDIR} \ >> STAGING_LIBDIR=${STAGING_LIBDIR} \ >> @@ -71,6 +77,6 @@ distutils3_do_install() { >> } >> distutils3_do_install[vardepsexclude] = "MACHINE" >> >> -EXPORT_FUNCTIONS do_compile do_install >> +EXPORT_FUNCTIONS do_configure do_compile do_install >> >> export LDSHARED="${CCLD} -shared" >> -- >> 2.11.0 >> >> -- >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] coreutils: fix compile error since use wrong libnss_nis.so
On Mon, 2018-07-09 at 15:49 +0800, changqing...@windriver.com wrote: > From: Changqing Li > > id: relocation error: /lib/x86_64-linux-gnu/libnss_nis.so.2: > symbol _nsl_default_nss version GLIBC_PRIVATE not defined in > file libnsl.so.1 with link time reference > > Recent glibc change removed libnss-nis module from glibc and > a new recipe libnss-nis.bb was added. After this change, > we need to include native libnss_nis in coreutils. otherwise, > with "nis" in host /etc/nssswitch.conf, id will use host > libnss_nis.so, which will cause above error > > Signed-off-by: Changqing Li > --- > meta/recipes-core/coreutils/coreutils_8.29.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I think this would be fixed by a new version of uninative-tarball after the recent change to include libnss-nis in it. We should probably have a new release of uninative rather than starting to add these DEPENDS everywhere... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] coreutils: fix compile error since use wrong libnss_nis.so
From: Changqing Li id: relocation error: /lib/x86_64-linux-gnu/libnss_nis.so.2: symbol _nsl_default_nss version GLIBC_PRIVATE not defined in file libnsl.so.1 with link time reference Recent glibc change removed libnss-nis module from glibc and a new recipe libnss-nis.bb was added. After this change, we need to include native libnss_nis in coreutils. otherwise, with "nis" in host /etc/nssswitch.conf, id will use host libnss_nis.so, which will cause above error Signed-off-by: Changqing Li --- meta/recipes-core/coreutils/coreutils_8.29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/coreutils/coreutils_8.29.bb b/meta/recipes-core/coreutils/coreutils_8.29.bb index 4704f32..eb9686b 100644 --- a/meta/recipes-core/coreutils/coreutils_8.29.bb +++ b/meta/recipes-core/coreutils/coreutils_8.29.bb @@ -8,7 +8,7 @@ LICENSE = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ file://src/ls.c;beginline=1;endline=15;md5=1c3f9411e1842a062ce5ce9210beee0e" DEPENDS = "gmp libcap" -DEPENDS_class-native = "" +DEPENDS_class-native = "libnss-nis-native" inherit autotools gettext texinfo -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: fix missing path separator in firmware-path
Hi Chen, Am Mo., 9. Juli 2018 um 05:13 Uhr schrieb ChenQi : > > Hi Andreas, > > I'm OK with this patch. > > I'm interested in your environment. Could you please give me some more > details about why you need this userspace firmware loading mechanism? > > I'm upgrading systemd to 239, and I'm going to remove this option in 239. > The reason is that systemd's minimal kernel requirement is 3.13, and > userspace firmware loading is needed before kernel 3.7. I just checked > 237, its minimal requirement is also 3.13. > > The userspace firmware loading support has been removed from udev for > several years. It's said that using userspace firmware loading is slow, > and kernel has been able to do this for a long time. > > So could you please give me some details about your environment? Is > there some compelling reason to use userspace firmware loading > mechanism? This would help me to check if we should keep local patches > with more details updated in them. > > Best Regards, > Chen Qi > > > > On 07/07/2018 08:28 PM, andreas.kl...@gmail.com wrote: > > From: Andy Kling > > > > udev fails to load firmware for CONFIG_FW_LOADER_USER_HELPER > > systemd-udevd[158]: did not find firmware file 'xxx' > > > > function builtin_firmware currently assumes FIRMWARE_PATH ends with "/" > > fixing the path passed to meson allows the firmware loader to succeed. > > systemd-udevd[145]: writing '/lib/firmware/xxx' > > > > Signed-off-by: Andy Kling > > --- > > meta/recipes-core/systemd/systemd_237.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/meta/recipes-core/systemd/systemd_237.bb > > b/meta/recipes-core/systemd/systemd_237.bb > > index 3efca33e73..8ff049160b 100644 > > --- a/meta/recipes-core/systemd/systemd_237.bb > > +++ b/meta/recipes-core/systemd/systemd_237.bb > > @@ -185,7 +185,7 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \ > > -Drootlibdir=${rootlibdir} \ > > -Drootprefix=${rootprefix} \ > > -Dsysvrcnd-path=${sysconfdir} \ > > - -Dfirmware-path=${nonarch_base_libdir}/firmware \ > > + -Dfirmware-path=${nonarch_base_libdir}/firmware/ \ > > " > > > > # Hardcode target binary paths to avoid using paths from sysroot > > yes I would wish not to use the user helper, but it is what I get currently. What are the alternatives? I'm investigating those, unfortunately with low priority. - Move everything to modules so it gets loaded after rootfs is mounted - Builtin firmware into the kernel - Provide an initramfs with the required bits I found https://www.kernel.org/doc/html/v4.17/driver-api/firmware/index.html quite helpful. User helper is not the common case anymore, udev removed the support for quite some time now. So I do not get firmware loaded for builtin modules in an image "out of the box" without further invest. What is the common way in yocto today if one has concerns about size, speed or something? Kind regards -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] dwarfsrcfiles: fix typo: debig -> debug
The following changes since commit f57363d307d573554a84443dd774df9549587b94: minicom: remove dead URL from UPSTREAM_CHECK_URI (2018-07-06 22:59:28 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/debug http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/debug Robert Yang (1): dwarfsrcfiles: fix typo: debig -> debug meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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] dwarfsrcfiles: fix typo: debig -> debug
Signed-off-by: Robert Yang --- meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb b/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb index c59a006..2c843a9 100644 --- a/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb +++ b/meta/recipes-devtools/dwarfsrcfiles/dwarfsrcfiles.bb @@ -1,4 +1,4 @@ -SUMMARY = "A small utility for printing debig source file locations embedded in binaries" +SUMMARY = "A small utility for printing debug source file locations embedded in binaries" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://../dwarfsrcfiles.c;md5=31483894e453a77acbb67847565f1b5c;beginline=1;endline=8" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core