[OE-core] [PATCH] mdadm: Upgrade to 4.1
From: Mingli Yu * Remove 5 backported patches * Refresh patches to remove fuzz warnings Signed-off-by: Mingli Yu --- .../files/0001-Disable-gcc8-warnings.patch| 74 +- ...-corosync-and-dlm-header-files-check.patch | 21 +- ...for-implicit-fallthrough-warning-sup.patch | 11 +-- ...smacros.h-for-major-minor-defintions.patch | 10 +-- ...-Wimplicit-fallthrough-0-in-Makefile.patch | 37 - ...h-Undefine-dprintf-before-redefining.patch | 12 +-- ...tead-of-memcpy-on-overlapping-region.patch | 31 ...y-enough-length-when-write-to-buffer.patch | 75 --- ...-with-strncpy-at-some-places-to-avoi.patch | 59 --- ...-type-conversion-to-avoid-truncation.patch | 33 ...omment-to-indicate-valid-fallthrough.patch | 36 - .../mdadm/files/gcc-4.9.patch | 19 +++-- .../files/mdadm-3.3.2_x32_abi_time_t.patch| 22 -- .../files/mdadm-fix-ptest-build-errors.patch | 10 +-- .../mdadm/{mdadm_4.0.bb => mdadm_4.1.bb} | 9 +-- 15 files changed, 105 insertions(+), 354 deletions(-) delete mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch delete mode 100644 meta/recipes-extended/mdadm/files/0001-use-memmove-instead-of-memcpy-on-overlapping-region.patch delete mode 100644 meta/recipes-extended/mdadm/files/0002-mdadm-Specify-enough-length-when-write-to-buffer.patch delete mode 100644 meta/recipes-extended/mdadm/files/0003-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch delete mode 100644 meta/recipes-extended/mdadm/files/0004-mdadm-Forced-type-conversion-to-avoid-truncation.patch rename meta/recipes-extended/mdadm/{mdadm_4.0.bb => mdadm_4.1.bb} (83%) diff --git a/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch b/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch index 739652cd55..361d53ca6c 100644 --- a/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch +++ b/meta/recipes-extended/mdadm/files/0001-Disable-gcc8-warnings.patch @@ -1,4 +1,4 @@ -From b83218de2623c0bbe9af355a81ae8385d7f30cfc Mon Sep 17 00:00:00 2001 +From a6c991750ae6ebd87a0b9b243bec7fd8e5a064c5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 9 May 2018 12:56:41 -0700 Subject: [PATCH] Disable gcc8 warnings @@ -23,28 +23,15 @@ Signed-off-by: Khem Raj mdopen.c | 4 super-ddf.c | 4 super-intel.c | 6 ++ - super1.c | 5 + super0.c | 2 +- - 6 files changed, 22 insertions(+), 1 deletion(-) + super1.c | 5 + + 6 files changed, 23 insertions(+), 2 deletions(-) -diff --git a/super0.c b/super0.c -index f5b4507..264b598 100644 a/super0.c -+++ b/super0.c -@@ -231,7 +231,7 @@ -d++) { - mdp_disk_t *dp; - char *dv; -- char nb[11]; -+ char nb[12]; - int wonly, failfast; - if (d>=0) dp = >disks[d]; - else dp = >this_disk; diff --git a/Monitor.c b/Monitor.c -index 802a9d9..23b246b 100644 +index 036103f..08cbd0a 100644 --- a/Monitor.c +++ b/Monitor.c -@@ -441,7 +441,8 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info) +@@ -445,7 +445,8 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info) event, dev); } } @@ -54,16 +41,16 @@ index 802a9d9..23b246b 100644 static int check_array(struct state *st, struct mdstat_ent *mdstat, int test, struct alert_info *ainfo, int increments, char *prefer) -@@ -683,6 +684,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, - return 1; - return 0; +@@ -673,6 +674,7 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, + st->err++; + goto out; } +#pragma GCC diagnostic pop static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist, int test, struct alert_info *info) diff --git a/mdopen.c b/mdopen.c -index 685ca32..406aba4 100644 +index 98c54e4..4f72b69 100644 --- a/mdopen.c +++ b/mdopen.c @@ -26,6 +26,9 @@ @@ -76,19 +63,19 @@ index 685ca32..406aba4 100644 void make_parts(char *dev, int cnt) { /* make 'cnt' partition devices for 'dev' -@@ -99,6 +102,7 @@ void make_parts(char *dev, int cnt) +@@ -101,6 +104,7 @@ void make_parts(char *dev, int cnt) } free(name); } +#pragma GCC diagnostic pop - /* - * We need a new md device to assemble/build/create an array. + int create_named_array(char *devnm) + { diff --git a/super-ddf.c b/super-ddf.c -index 1707ad1..e08d289 100644 +index 618542c..6ed4e7e 100644 --- a/super-ddf.c +++ b/super-ddf.c -@@ -2846,6 +2846,9 @@ static void _set_config_size(struct phys_disk_entry *pde, const struct dl *dl) +@@ -2828,6 +2828,9 @@ static void _set_config_size(struct phys_disk_entry *pde, const struct dl *dl)
Re: [OE-core] [PATCH] python-native: fix one do_populate_sysroot warning
Ping On 11/8/18 9:49 AM, Changqing Li wrote: Ping On 10/25/18 4:59 PM, changqing...@windriver.com wrote: From: Changqing Li Fix below warning: WARNING: Skipping RPATH /usr/lib64 as is a standard search path for work/x86_64-linux/python-native/2.7.15-r1.1/recipe-sysroot-native/ usr/lib/python2.7/lib-dynload/_bsddb.so setup.py will check db.h under include_dirs, for native build, /usr/lib64 will be insert to postion 0 of include_dirs, so it's priority is higher then our sysroot, cause db.h sysroot is ignored, and rpath set to /usr/lib64. and this cause warning when do_populate_sysroot. use append to fix it. Signed-off-by: Changqing Li --- ...ative-fix-one-do_populate_sysroot-warning.patch | 39 ++ .../python/python-native_2.7.15.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch diff --git a/meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch b/meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch new file mode 100644 index 000..9898189 --- /dev/null +++ b/meta/recipes-devtools/python/python-native/0001-python-native-fix-one-do_populate_sysroot-warning.patch @@ -0,0 +1,39 @@ +From 12292444e1b3662b994bc223d92b8338fb0895ff Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Thu, 25 Oct 2018 07:32:14 + +Subject: [PATCH] python-native: fix one do_populate_sysroot warning + +Fix below warning: +WARNING: Skipping RPATH /usr/lib64 as is a standard search path for +work/x86_64-linux/python-native/2.7.15-r1.1/recipe-sysroot-native/ +usr/lib/python2.7/lib-dynload/_bsddb.so + +setup.py will check db.h under include_dirs, for native build, +/usr/lib64 will be insert to postion 0 of include_dirs, so +it's priority is higher then our sysroot, cause db.h sysroot +is ignored, and rpath set to /usr/lib64. and this cause warning +when do_populate_sysroot. use append to fix it. + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 7bf13ed..6c0f29b 100644 +--- a/setup.py b/setup.py +@@ -40,7 +40,7 @@ def add_dir_to_list(dirlist, dir): + 1) 'dir' is not already in 'dirlist' + 2) 'dir' actually exists, and is a directory.""" + if dir is not None and os.path.isdir(dir) and dir not in dirlist: +- dirlist.insert(0, dir) ++ dirlist.append(dir) + + def macosx_sdk_root(): + """ +-- +2.18.0 + diff --git a/meta/recipes-devtools/python/python-native_2.7.15.bb b/meta/recipes-devtools/python/python-native_2.7.15.bb index 7c491fa..f9a9a5d 100644 --- a/meta/recipes-devtools/python/python-native_2.7.15.bb +++ b/meta/recipes-devtools/python/python-native_2.7.15.bb @@ -16,6 +16,7 @@ SRC_URI += "\ file://builddir.patch \ file://parallel-makeinst-create-bindir.patch \ file://revert_use_of_sysconfigdata.patch \ + file://0001-python-native-fix-one-do_populate_sysroot-warning.patch \ " S = "${WORKDIR}/Python-${PV}" -- BRs Sandy(Li Changqing) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python/python3: use cc_basename to replace CC for checking compiler
Ping On 11/8/18 9:49 AM, Changqing Li wrote: Ping On 10/23/18 1:22 PM, changqing...@windriver.com wrote: From: Changqing Li When working path contains "clang"/"gcc"/"icc", it might be part of $CC because of the "--sysroot" parameter. That could cause judgement error about clang/gcc/icc compilers. eg: if build under /yocto/builds/xicc/, bitbake python, $CC will contains xicc, will make $CC match *icc, but actuall xicc just folder name. When "*icc" is matched, below errors are reported when compiling python/python3: x86_64-wrs-linux-gcc: error: strict: No such file or directory x86_64-wrs-linux-gcc: error: unrecognized command line option '-fp-model' Here use cc_basename to replace CC for checking compiler to avoid such kind of issue. Signed-off-by: Li Zhou Signed-off-by: Changqing Li --- ...-cc_basename-to-replace-CC-for-checking-c.patch | 114 + ...-cc_basename-to-replace-CC-for-checking-c.patch | 140 + meta/recipes-devtools/python/python3_3.5.6.bb | 1 + meta/recipes-devtools/python/python_2.7.15.bb | 1 + 4 files changed, 256 insertions(+) create mode 100644 meta/recipes-devtools/python/python/0001-python2-use-cc_basename-to-replace-CC-for-checking-c.patch create mode 100644 meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch diff --git a/meta/recipes-devtools/python/python/0001-python2-use-cc_basename-to-replace-CC-for-checking-c.patch b/meta/recipes-devtools/python/python/0001-python2-use-cc_basename-to-replace-CC-for-checking-c.patch new file mode 100644 index 000..6e4f820 --- /dev/null +++ b/meta/recipes-devtools/python/python/0001-python2-use-cc_basename-to-replace-CC-for-checking-c.patch @@ -0,0 +1,114 @@ +From 3f49be81e31c164654aeb10b65ebade982ca2ed8 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Mon, 22 Oct 2018 15:24:48 +0800 +Subject: [PATCH] python2: use cc_basename to replace CC for checking compiler + +When working path contains "clang"/"gcc"/"icc", it might be part of $CC +because of the "--sysroot" parameter. That could cause judgement error +about clang/gcc/icc compilers. e.g. +When "icc" is containded in working path, below errors are reported when +compiling python: +x86_64-wrs-linux-gcc: error: strict: No such file or directory +x86_64-wrs-linux-gcc: error: unrecognized command line option '-fp-model' + +Here use cc_basename to replace CC for checking compiler to avoid such +kind of issue. + +Upstream-Status: Pending + +Signed-off-by: Li Zhou + +Patch orignally from Li Zhou, I just rework it to new version + +Signed-off-by: Changqing Li +--- + configure.ac | 18 +- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index db1c940..dfcd89a 100644 +--- a/configure.ac b/configure.ac +@@ -684,7 +684,7 @@ AC_MSG_RESULT($with_cxx_main) + preset_cxx="$CXX" + if test -z "$CXX" + then +- case "$CC" in ++ case "$cc_basename" in + gcc) AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;; + cc) AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;; + esac +@@ -757,14 +757,14 @@ rmdir CaseSensitiveTestDir + + case $MACHDEP in + bsdos*) +- case $CC in ++ case $cc_basename in + gcc) CC="$CC -D_HAVE_BSDI";; + esac;; + esac + + case $ac_sys_system in + hp*|HP*) +- case $CC in ++ case $cc_basename in + cc|*/cc) CC="$CC -Ae";; + esac;; + SunOS*) +@@ -1084,7 +1084,7 @@ then + fi + + # Clang also needs -fwrapv +- case $CC in ++ case $cc_basename in + *clang*) WRAP="-fwrapv" + ;; + esac +@@ -1304,7 +1304,7 @@ yes) + esac + + # ICC needs -fp-model strict or floats behave badly +-case "$CC" in ++case "$cc_basename" in + *icc*) + BASECFLAGS="$BASECFLAGS -fp-model strict" + ;; +@@ -1443,7 +1443,7 @@ else + fi], + [AC_MSG_RESULT(no)]) + if test "$Py_LTO" = 'true' ; then +- case $CC in ++ case $cc_basename in + *clang*) + # Any changes made here should be reflected in the GCC+Darwin case below + LTOFLAGS="-flto" +@@ -1508,7 +1508,7 @@ then + fi + fi + LLVM_PROF_ERR=no +-case $CC in ++case $cc_basename in + *clang*) + # Any changes made here should be reflected in the GCC+Darwin case below + PGO_PROF_GEN_FLAG="-fprofile-instr-generate" +@@ -2322,7 +2322,7 @@ then + then CCSHARED="-fPIC" + else CCSHARED="-Kpic -belf" + fi;; +- IRIX*/6*) case $CC in ++ IRIX*/6*) case $cc_basename in + *gcc*) CCSHARED="-shared";; + *) CCSHARED="";; + esac;; +@@ -2366,7 +2366,7 @@ then + then + LINKFORSHARED="-Wl,--export-dynamic" + fi;; +- SunOS/5*) case $CC in ++ SunOS/5*) case $cc_basename in + *gcc*) + if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null + then +-- +2.7.4 + diff --git
Re: [OE-core] [PATCH V3] dbus: fix ptest failure
Ping On 11/5/18 11:28 AM, changqing...@windriver.com wrote: From: Changqing Li 1. since one bug in run-ptest, testcase test-bus have never been actually run (althrough it's result is PASS). After commit 0828850, test-bus can actually run but it did not install: test-service, test-shell-service, test-segfault, and dbus-daemon-launch-helper-test Add the configure flag: --enable-embedded-tests to generate binary dbus-daemon-launch-helper-test, then install them so that test-bus will now pass. 2. fix testcase test-dbus-daemon failed we enable --enable-verbose-mode in recipe dbus-test, and don't enable it in recipe dbus. This will make below test code get unexpect result of have_verbose and assert. disable --enable-verbose-mode for recipe dbus-test to fix it. #ifdef DBUS_ENABLE_STATS g_assert_true (have_stats); #else g_assert_false (have_stats); #endif Signed-off-by: Changqing Li --- meta/recipes-core/dbus/dbus-test_1.12.10.bb | 12 +--- meta/recipes-core/dbus/dbus/run-ptest | 16 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/meta/recipes-core/dbus/dbus-test_1.12.10.bb b/meta/recipes-core/dbus/dbus-test_1.12.10.bb index 25b9395..ec9b9e2 100644 --- a/meta/recipes-core/dbus/dbus-test_1.12.10.bb +++ b/meta/recipes-core/dbus/dbus-test_1.12.10.bb @@ -33,13 +33,13 @@ EXTRA_OECONF = "--enable-tests \ --enable-installed-tests \ --enable-checks \ --enable-asserts \ ---enable-verbose-mode \ --enable-largefile \ --disable-xml-docs \ --disable-doxygen-docs \ --disable-libaudit \ --with-dbus-test-dir=${PTEST_PATH} \ -${EXTRA_OECONF_X}" +${EXTRA_OECONF_X} \ +--enable-embedded-tests" EXTRA_OECONF_append_class-target = " SYSTEMCTL=${base_bindir}/systemctl" @@ -50,6 +50,7 @@ PACKAGECONFIG_class-nativesdk = "" PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_system_unitdir},--disable-systemd --without-systemdsystemunitdir,systemd" PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11-autolaunch, virtual/libx11 libsm" PACKAGECONFIG[user-session] = "--enable-user-session --with-systemduserunitdir=${systemd_user_unitdir},--disable-user-session" +PACKAGECONFIG[verbose-mode] = "--enable-verbose-mode,,," do_install() { : @@ -58,9 +59,14 @@ do_install() { do_install_ptest() { install -d ${D}${PTEST_PATH}/test l="shell printf refs syslog marshal syntax corrupt dbus-daemon dbus-daemon-eavesdrop loopback relay \ - variant uid-permissions syntax spawn sd-activation names monitor message fdpass " + variant uid-permissions syntax spawn sd-activation names monitor message fdpass service shell-service" for i in $l; do install ${B}/test/.libs/test-$i ${D}${PTEST_PATH}/test; done + install -d ${D}${PTEST_PATH}/bus + install ${B}/bus/.libs/dbus-daemon-launch-helper-test ${D}${PTEST_PATH}/bus + + install ${B}/test/test-segfault ${D}${PTEST_PATH}/test + l="bus bus-system bus-launch-helper" for i in $l; do install ${B}/bus/.libs/test-$i ${D}${PTEST_PATH}/test; done diff --git a/meta/recipes-core/dbus/dbus/run-ptest b/meta/recipes-core/dbus/dbus/run-ptest index 353ba1e..e7e1c1e 100755 --- a/meta/recipes-core/dbus/dbus/run-ptest +++ b/meta/recipes-core/dbus/dbus/run-ptest @@ -17,8 +17,16 @@ export LD_LIBRARY_PATH=@PTEST_PATH@/test/.libs files=`ls test/test-*` for i in $files - do - ./$i ./test/data >/dev/null - output - done +do + #these programs are used by testcase test-bus, don't run here + if [ $i = "test/test-service" ] \ +|| [ $i = "test/test-shell-service" ] \ +|| [ $i = "test/test-segfault" ] + then + continue + fi + + ./$i ./test/data >/dev/null 2>&1 + output +done -- BRs Sandy(Li Changqing) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ptest: Reproducibility: Take control of umask
The build host umask was leaking into the thing-ptest packages at do_install_ptest() time. Signed-off-by: Douglas Royds --- meta/classes/ptest.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass index c19f65b9bb..9d8a79854a 100644 --- a/meta/classes/ptest.bbclass +++ b/meta/classes/ptest.bbclass @@ -59,6 +59,7 @@ addtask install_ptest_base after do_install before do_package do_populate_sy python () { if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): d.setVarFlag('do_install_ptest_base', 'fakeroot', '1') +d.setVarFlag('do_install_ptest_base', 'umask', '022') # Remove all '*ptest_base' tasks when ptest is not enabled if not(d.getVar('PTEST_ENABLED') == "1"): -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/8] busybox: remove three hostname test cases
On 11/21/2018 08:16 PM, Burton, Ross wrote: On Wed, 21 Nov 2018 at 05:35, Chen Qi wrote: These three test case are removed because of two reasons. 1) net-tools' hostname have different behaviour regarding some options So when net-tools is installed, test cases may fail. e.g. test x$(hostname -i) = x$(busybox hostname -i) This is just a specific instance of the problem where alternatives may not be what you want. The busybox test suite should be sure it's running busybox tools. Having spoken to a few people about this already, maybe busybox-ptest should contain a symlink farm for all the applets to the busybox binary that run-ptest can put at the front of $PATH. Very good idea! I'll try this out. 2) hostname may set to some value, e.g. qemux86-64, which is not an entry in /etc/hosts This results in lookup failure when using `hostname -f' as there's no entry in /etc/hosts. Let's fix the hostname setup so hosts is correct too. OK. Currently, we set hostname to ${MACHINE}. To ensure it's also an entry in /etc/hosts, it seems that we have to default it to 'localhost'. I'm going to test with this change. If you have other candidates, please let me know. Best Regards, Chen Qi Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] iptables: 1.6.2 -> 1.8.2
Signed-off-by: Changhyeok Bae --- .../iptables/{iptables_1.6.2.bb => iptables_1.8.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/iptables/{iptables_1.6.2.bb => iptables_1.8.2.bb} (94%) diff --git a/meta/recipes-extended/iptables/iptables_1.6.2.bb b/meta/recipes-extended/iptables/iptables_1.8.2.bb similarity index 94% rename from meta/recipes-extended/iptables/iptables_1.6.2.bb rename to meta/recipes-extended/iptables/iptables_1.8.2.bb index e00824f763..a704245151 100644 --- a/meta/recipes-extended/iptables/iptables_1.6.2.bb +++ b/meta/recipes-extended/iptables/iptables_1.8.2.bb @@ -12,8 +12,8 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ file://0002-configure.ac-only-check-conntrack-when-libnfnetlink-enabled.patch \ " -SRC_URI[md5sum] = "7d2b7847e4aa8832a18437b8a4c1873d" -SRC_URI[sha256sum] = "55d02dfa46263343a401f297d44190f2a3e5113c8933946f094ed40237053733" +SRC_URI[md5sum] = "944558e88ddcc3b9b0d9550070fa3599" +SRC_URI[sha256sum] = "a3778b50ed1a3256f9ca975de82c2204e508001fc2471238c8c97f3d1c4c12af" inherit autotools pkgconfig -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] ethtool: 4.17 -> 4.19
Signed-off-by: Changhyeok Bae --- .../ethtool/ethtool/avoid_parallel_tests.patch| 2 +- .../ethtool/{ethtool_4.17.bb => ethtool_4.19.bb} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-extended/ethtool/{ethtool_4.17.bb => ethtool_4.19.bb} (88%) diff --git a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch index d81320a94d..beae5f98c3 100644 --- a/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch +++ b/meta/recipes-extended/ethtool/ethtool/avoid_parallel_tests.patch @@ -19,7 +19,7 @@ index e891d91..600f8a8 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. - AC_INIT(ethtool, 4.17, net...@vger.kernel.org) + AC_INIT(ethtool, 4.19, net...@vger.kernel.org) AC_PREREQ(2.52) AC_CONFIG_SRCDIR([ethtool.c]) -AM_INIT_AUTOMAKE([gnu]) diff --git a/meta/recipes-extended/ethtool/ethtool_4.17.bb b/meta/recipes-extended/ethtool/ethtool_4.19.bb similarity index 88% rename from meta/recipes-extended/ethtool/ethtool_4.17.bb rename to meta/recipes-extended/ethtool/ethtool_4.19.bb index 844a958ed9..74e255c24b 100644 --- a/meta/recipes-extended/ethtool/ethtool_4.17.bb +++ b/meta/recipes-extended/ethtool/ethtool_4.19.bb @@ -11,8 +11,8 @@ SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz \ file://avoid_parallel_tests.patch \ " -SRC_URI[md5sum] = "4dba0345a4ab9f51b4a4a9739284238d" -SRC_URI[sha256sum] = "4130142a15f7409d18de3667998f3c99fba52fd7c8d94be7ecdabf8dcab3d6c1" +SRC_URI[md5sum] = "a533db1d202724822c4ef297643fac12" +SRC_URI[sha256sum] = "e8e88f5a79c78e542cd84fee60b67dbf29cee63e4760e8d61544fea74c761ad1" inherit autotools ptest RDEPENDS_${PN}-ptest += "make" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] iproute2: 4.18.0 -> 4.19.0
Signed-off-by: Changhyeok Bae --- .../iproute2/{iproute2_4.18.0.bb => iproute2_4.19.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/iproute2/{iproute2_4.18.0.bb => iproute2_4.19.0.bb} (72%) diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.18.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.19.0.bb similarity index 72% rename from meta/recipes-connectivity/iproute2/iproute2_4.18.0.bb rename to meta/recipes-connectivity/iproute2/iproute2_4.19.0.bb index 8eed377618..6db4062d68 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_4.18.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_4.19.0.bb @@ -6,8 +6,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-ip-Remove-unneed-header.patch \ " -SRC_URI[md5sum] = "8b8680e91390c57cab788fbf8e929479" -SRC_URI[sha256sum] = "a9e6c70c95f513871c5e1f4e452c04fcb3c4d8a05be651bd794cd994a52daa45" +SRC_URI[md5sum] = "67eeebacaac4515cab73dfd2fc796af3" +SRC_URI[sha256sum] = "d9ec5ca1f47d8a85416fa26e7dc1cbf5d067640eb60e90bdc1c7e5bdc6a29984" # CFLAGS are computed in Makefile and reference CCOPTS # -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] uboot-sign.bbclass: fix signature and deployment
On 11/22/18 1:20 AM, Otavio Salvador wrote: Hello, On Wed, Nov 21, 2018 at 4:08 AM Robert Yang wrote: Fixed: MACHINE = "beaglebone-yocto" KERNEL_CLASSES += "kernel-fitimage" KERNEL_IMAGETYPE_beaglebone-yocto = "fitImage" UBOOT_MACHINE_beaglebone-yocto = "am335x_boneblack_vboot_config" UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb -p 2000" UBOOT_SIGN_KEYDIR = "${TOPDIR}/conf" UBOOT_SIGN_KEYNAME = "dev" UBOOT_SIGN_ENABLE = "1" IMAGE_INSTALL_remove = "kernel-image-zimage" $ cd conf $ openssl genrsa -F4 -out dev.key 2048 $ openssl req -batch -new -x509 -key dev.key -out dev.crt $ cd ../ $ bitbake u-boot linux-yocto $ grep signature tmp/deploy/images/beaglebone-yocto/*.dtb Binary file tmp/deploy/images/beaglebone-yocto/u-boot-beaglebone-yocto-2018.07-r0.dtb matches Binary file tmp/deploy/images/beaglebone-yocto/u-boot-beaglebone-yocto.dtb matches Binary file tmp/deploy/images/beaglebone-yocto/u-boot.dtb matches And there would be no signature info when rebuild from sstate: $ bitbake u-boot linux-yocto -cclean $ bitbake u-boot linux-yocto $ grep signature tmp/deploy/images/beaglebone-yocto/*.dtb No result This s because kernel directly edit ${DEPLOY_DIR_IMAGE}/u-boot.dtb, (Note, it is global ${DEPLOY_DIR_IMAGE}, not recipe's DEPLOYDIR), so that the modified info is not in sstate, and would be lost when rebuild from sstate. There are other problems in previouse code: - The u-boot.dtb is provided by u-boot, but edited by kernel during signing, so it should be deployed by kernel rather than u-boot. - The u-boot.do_concat_dtb directly install files to global ${DEPLOY_DIR_IMAGE}, this is incorrect, the ${DEPLOY_DIR_IMAGE} should be installed by do_deploy. - It seems that it assumes do_deploy depends on do_install according the comments, but they have no relationships: # do_concat_dtb is scheduled _before_ do_install as it overwrite the # u-boot.bin in both DEPLOYDIR and DEPLOY_IMAGE_DIR. - The do_concat_dtb should be run after do_compile, but it doesn't have this dependency. Make u-boot install u-boot.dtb to ${datadir}, kernel copies u-boot.dtb from ${STAGING_DATADIR} to ${B} and deploy it can fix the problem. [YOCTO #12112] Reported-by: Christian Andersen Signed-off-by: Robert Yang The change itself looks good, I noticed that the script part is not using 4 spaces for indenting and as this is being changed, it might make sense to address this as well. Thanks, sounds good to me, I will make another patch for it after this is merged. // Robert Acked-by: Otavio Salvador -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] ✗ patchtest: failure for boost-context: Reproducibility: Set .file section for all *_elf_gas.S files (rev2)
On 22/11/18 1:33 PM, Patchwork wrote: ... * Issue Upstream-Status is Submitted, but it is not mentioned where [test_upstream_status_presence_format] Suggested fixInclude where reproducibility-add-file-directive-to-assembler.patch was submitted Yes it is ... Current Upstream-Status: Submitted https://github.com/boostorg/context/issues/91 Standard format Upstream-Status: Submitted [where] Huh? -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for boost-context: Reproducibility: Set .file section for all *_elf_gas.S files (rev2)
== Series Details == Series: boost-context: Reproducibility: Set .file section for all *_elf_gas.S files (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/15028/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Upstream-Status is Submitted, but it is not mentioned where [test_upstream_status_presence_format] Suggested fixInclude where reproducibility-add-file-directive-to-assembler.patch was submitted Current Upstream-Status: Submitted https://github.com/boostorg/context/issues/91 Standard format Upstream-Status: Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] boost-context: Reproducibility: Set .file section for all *_elf_gas.S files
Add a .file directive explicitly for all *_elf_gas.S files to prevent the linker adding a host build-system path as a FILE symbol to the object file. This replaces the existing patch that added the .file directive to a small subset of these files. Upstream-Status: Submitted https://github.com/boostorg/context/issues/91 Signed-off-by: Douglas Royds --- ..._64_sysv_elf_gas.S-set-.file-section.patch | 48 ...lity-add-file-directive-to-assembler.patch | 243 ++ meta/recipes-support/boost/boost_1.68.0.bb| 2 +- 3 files changed, 244 insertions(+), 49 deletions(-) delete mode 100644 meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch create mode 100644 meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch diff --git a/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch b/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch deleted file mode 100644 index c2ac49e58f..00 --- a/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c99f798407e44c86e9f64f5b1adf3b4d0549eef2 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 15 Jun 2018 16:21:56 +0800 -Subject: [PATCH] make_x86_64_sysv_elf_gas.S: set .file section - -Set .file section explicitly for .S files to avoid -the linker introduces the host path in symbols for -object files whose source file is .S -Otherwise, there is a host path in the symbols as below: -$ readelf --wide --symbols /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/libboost_context.so.1.67.0 - -42: 0 FILE LOCAL DEFAULT ABS /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/asm/make_x86_64_sysv_elf_gas.o - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu - libs/context/src/asm/make_i386_sysv_elf_gas.S | 1 + - libs/context/src/asm/make_x86_64_sysv_elf_gas.S | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libs/context/src/asm/make_i386_sysv_elf_gas.S b/libs/context/src/asm/make_i386_sysv_elf_gas.S -index de77e88..b76de26 100644 a/libs/context/src/asm/make_i386_sysv_elf_gas.S -+++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S -@@ -24,6 +24,7 @@ - * * - / - -+.file "make_i386_sysv_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff --git a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -index 25a0c00..0ef3756 100644 a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -+++ b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -@@ -24,6 +24,7 @@ - * * - / - -+.file "make_x86_64_sysv_elf_gas.S" - .text - .globl make_fcontext - .type make_fcontext,@function --- -2.7.4 - diff --git a/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch b/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch new file mode 100644 index 00..6684c228cd --- /dev/null +++ b/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch @@ -0,0 +1,243 @@ +Author: Douglas Royds +Date: Thu Nov 22 09:34:22 2018 +1300 + +Add a .file directive explicitly for all *_elf_gas.S files to prevent the linker +adding a host build-system path as a FILE symbol to the object file. + +This replaces the existing patch that added the .file directive to a small +subset of these files. + +Upstream-Status: Submitted https://github.com/boostorg/context/issues/91 +Signed-off-by: Douglas Royds + +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-22 09:04:27.900876941 +1300 +@@ -51,6 +51,7 @@ + * * + ***/ + ++.file "jump_arm64_aapcs_elf_gas.S" + .text + .align 2 + .global jump_fcontext +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S
Re: [OE-core] [PATCH] musl: Update to latest trunk
my tests were on real h/w (rpi) and there I did not see this issue obviously. I will try to reproduce this on qemu, I wonder if this is specific to x86 On Wed, Nov 21, 2018 at 2:35 AM Richard Purdie wrote: > > On Wed, 2018-11-21 at 09:32 +, Richard Purdie wrote: > > On Mon, 2018-11-19 at 09:27 -0800, Khem Raj wrote: > > > Complete changelogs are here > > > > > > > > https://git.musl-libc.org/cgit/musl/log/?qt=range=c50985d5c8e316c5c464f352e79eeebfed1121a9..79f653c6bc2881dd6855299c908a442f56cb7c2b > > > > > > Signed-off-by: Khem Raj > > > --- > > > meta/recipes-core/musl/musl_git.bb | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > This seemed to have a segfault in exportfs: > > > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/27/builds/231/steps/7/logs/step1c > > > > Will rerun and see if it reproduces... > > It reproduces: > > > https://autobuilder.yoctoproject.org/typhoon/#/builders/27/builds/232/steps/7/logs/step1c > > (which is good and bad!) > > Cheers, > > Richard > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for boost-context: Reproducibility: Set .file section for all *_elf_gas.S files
== Series Details == Series: boost-context: Reproducibility: Set .file section for all *_elf_gas.S files Revision: 1 URL : https://patchwork.openembedded.org/series/15028/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] Suggested fixSign off the added patch file (meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch) * Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] Suggested fixAdd Upstream-Status: to the header of meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch Standard format Upstream-Status: Valid status Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where] If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] boost-context: Reproducibility: Set .file section for all *_elf_gas.S files
Add a .file directive explicitly for all *_elf_gas.S files to prevent the linker adding a host build-system path as a FILE symbol to the object file. This replaces the existing patch that added the .file directive to a small subset of these files. Upstream-status: Submitted https://github.com/boostorg/context/issues/91 Signed-off-by: Douglas Royds --- ..._64_sysv_elf_gas.S-set-.file-section.patch | 48 ...lity-add-file-directive-to-assembler.patch | 234 ++ meta/recipes-support/boost/boost_1.68.0.bb| 2 +- 3 files changed, 235 insertions(+), 49 deletions(-) delete mode 100644 meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch create mode 100644 meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch diff --git a/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch b/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch deleted file mode 100644 index c2ac49e58f..00 --- a/meta/recipes-support/boost/boost/0001-make_x86_64_sysv_elf_gas.S-set-.file-section.patch +++ /dev/null @@ -1,48 +0,0 @@ -From c99f798407e44c86e9f64f5b1adf3b4d0549eef2 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Fri, 15 Jun 2018 16:21:56 +0800 -Subject: [PATCH] make_x86_64_sysv_elf_gas.S: set .file section - -Set .file section explicitly for .S files to avoid -the linker introduces the host path in symbols for -object files whose source file is .S -Otherwise, there is a host path in the symbols as below: -$ readelf --wide --symbols /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/libboost_context.so.1.67.0 - -42: 0 FILE LOCAL DEFAULT ABS /my-build/boost/1.67.0-r0/boost_1_67_0/x86_64-poky-linux/boost/bin.v2/libs/context/build/aca09349fdb84d131321425f6c3a38ed/asm/make_x86_64_sysv_elf_gas.o - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu - libs/context/src/asm/make_i386_sysv_elf_gas.S | 1 + - libs/context/src/asm/make_x86_64_sysv_elf_gas.S | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libs/context/src/asm/make_i386_sysv_elf_gas.S b/libs/context/src/asm/make_i386_sysv_elf_gas.S -index de77e88..b76de26 100644 a/libs/context/src/asm/make_i386_sysv_elf_gas.S -+++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S -@@ -24,6 +24,7 @@ - * * - / - -+.file "make_i386_sysv_elf_gas.S" - .text - .globl make_fcontext - .align 2 -diff --git a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -index 25a0c00..0ef3756 100644 a/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -+++ b/libs/context/src/asm/make_x86_64_sysv_elf_gas.S -@@ -24,6 +24,7 @@ - * * - / - -+.file "make_x86_64_sysv_elf_gas.S" - .text - .globl make_fcontext - .type make_fcontext,@function --- -2.7.4 - diff --git a/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch b/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch new file mode 100644 index 00..f47256886c --- /dev/null +++ b/meta/recipes-support/boost/boost/reproducibility-add-file-directive-to-assembler.patch @@ -0,0 +1,234 @@ +Add a .file directive explicitly for all *_elf_gas.S files to prevent the linker +adding a host build-system path as a FILE symbol to the object file. + +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 boost_1_68_0/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S 2018-11-22 09:04:27.900876941 +1300 +@@ -51,6 +51,7 @@ + * * + ***/ + ++.file "jump_arm64_aapcs_elf_gas.S" + .text + .align 2 + .global jump_fcontext +diff -ur boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S +--- boost_1_68_0.original/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-21 16:31:18.601760893 +1300 boost_1_68_0/libs/context/src/asm/jump_arm_aapcs_elf_gas.S 2018-11-22 09:04:28.876898240 +1300 +@@ -38,6 +38,7 @@ + * * + ***/ + ++.file "jump_arm_aapcs_elf_gas.S" + .text + .globl jump_fcontext + .align 2 +diff -ur
Re: [OE-core] [PATCH v5] u-boot: Add mkenvimage tool
You'll need to add: ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" FILES_${PN}-mkimage = "${bindir}/mkimage" FILES_${PN}-mkenvimage = "${bindir}/mkenvimage" RDEPENDS_${PN}-mkimage += "dtc" RDEPENDS_${PN} += "${PN}-mkimage ${PN}-mkenvimage" And remove the current RDEPENDS_${PN} += "dtc". To package this correctly, right now everything ends in ${PN}, so the PACKAGES and RREPLACES/RPROVIDES/RCONFLICTS aren't really used. On Wed, Nov 21, 2018 at 11:07 PM Alexey Brodkin wrote: > This utility is used for creation of images containing > usable in run-time U-Boot environment. > > As of today this utility is added per-board like here [1] > for Intel Edison board. > > [1] > http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb > > Given there're quite some U-Boot tools that we may want to add later > this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools" > still for compatibility we provide "u-boot-mkimage" with help > of PROVIDES as well as proposed "u-boot-mkenvimage". > > Signed-off-by: Alexey Brodkin > Cc: Richard Purdie > Cc: Otavio Salvador > Cc: Martin Jansa > Cc: Ross Burton > Cc: Marek Vasut > --- > > Changes v4 -> v5: > * Added backward compatibility with "u-boot-mkimage" recipe > * Improved handling of nativesdk > * Update all references from "u-boot-mkimage" to "u-boot-tools" > > Changes v3 -> v4: > * Updated maintainer info to make Yocto autobuilder happy again > > Changes v2 -> v3: > * Recipe renamed to "u-boot-tools" to better match its contents >(especially in the future as we add more tools there) > * Existing "u-boot-mkimage" and newly introduced "u-boot-mkenvimage" >made avaialble via PROVIDES > > Changes v1 -> v2: > * Got rid of a separate recipe and instead added mkenvimage >to u-boot mkimage recipe > > meta/classes/image_types.bbclass | 2 +- > meta/classes/kernel-fitimage.bbclass | 2 +- > meta/classes/kernel-uimage.bbclass | 2 +- > meta/conf/distro/include/distro_alias.inc | 2 +- > meta/conf/distro/include/maintainers.inc | 2 +- > ...boot-mkimage_2018.07.bb => u-boot-tools_2018.07.bb} | 18 > +- > 6 files changed, 22 insertions(+), 6 deletions(-) > rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2018.07.bb => > u-boot-tools_2018.07.bb} (66%) > > diff --git a/meta/classes/image_types.bbclass > b/meta/classes/image_types.bbclass > index 05e5b0a2e0..5c406481ef 100644 > --- a/meta/classes/image_types.bbclass > +++ b/meta/classes/image_types.bbclass > @@ -308,7 +308,7 @@ CONVERSION_DEPENDS_lzo = "lzop-native" > CONVERSION_DEPENDS_zip = "zip-native" > CONVERSION_DEPENDS_sum = "mtd-utils-native" > CONVERSION_DEPENDS_bmap = "bmap-tools-native" > -CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native" > +CONVERSION_DEPENDS_u-boot = "u-boot-tools-native" > CONVERSION_DEPENDS_vmdk = "qemu-native" > CONVERSION_DEPENDS_vdi = "qemu-native" > CONVERSION_DEPENDS_qcow2 = "qemu-native" > diff --git a/meta/classes/kernel-fitimage.bbclass > b/meta/classes/kernel-fitimage.bbclass > index 4c4fd99ff4..328bef4069 100644 > --- a/meta/classes/kernel-fitimage.bbclass > +++ b/meta/classes/kernel-fitimage.bbclass > @@ -4,7 +4,7 @@ python __anonymous () { > kerneltypes = d.getVar('KERNEL_IMAGETYPES') or "" > if 'fitImage' in kerneltypes.split(): > depends = d.getVar("DEPENDS") > -depends = "%s u-boot-mkimage-native dtc-native" % depends > +depends = "%s u-boot-tools-native dtc-native" % depends > d.setVar("DEPENDS", depends) > > uarch = d.getVar("UBOOT_ARCH") > diff --git a/meta/classes/kernel-uimage.bbclass > b/meta/classes/kernel-uimage.bbclass > index c2de6bb40d..cedb4fa070 100644 > --- a/meta/classes/kernel-uimage.bbclass > +++ b/meta/classes/kernel-uimage.bbclass > @@ -3,7 +3,7 @@ inherit kernel-uboot > python __anonymous () { > if "uImage" in d.getVar('KERNEL_IMAGETYPES'): > depends = d.getVar("DEPENDS") > -depends = "%s u-boot-mkimage-native" % depends > +depends = "%s u-boot-tools-native" % depends > d.setVar("DEPENDS", depends) > > # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal > diff --git a/meta/conf/distro/include/distro_alias.inc > b/meta/conf/distro/include/distro_alias.inc > index 7502542e89..f23db1e8a4 100644 > --- a/meta/conf/distro/include/distro_alias.inc > +++ b/meta/conf/distro/include/distro_alias.inc > @@ -354,7 +354,7 @@ DISTRO_PN_ALIAS_pn-tremor = "OSPDT upstream= > http://www.xiph.org/vorbis/; > DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera > Ubuntu=ttf-bitstream-vera" > DISTRO_PN_ALIAS_pn-tzcode = "OSPDT" > DISTRO_PN_ALIAS_pn-u-boot-fw-utils = "Ubuntu=u-boot-tools > Debian=u-boot-tools" > -DISTRO_PN_ALIAS_pn-u-boot-mkimage = "Ubuntu=uboot-mkimage > Debian=uboot-mkimage" > +DISTRO_PN_ALIAS_pn-u-boot-tools =
[OE-core] [PATCH v5] u-boot: Add mkenvimage tool
This utility is used for creation of images containing usable in run-time U-Boot environment. As of today this utility is added per-board like here [1] for Intel Edison board. [1] http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb Given there're quite some U-Boot tools that we may want to add later this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools" still for compatibility we provide "u-boot-mkimage" with help of PROVIDES as well as proposed "u-boot-mkenvimage". Signed-off-by: Alexey Brodkin Cc: Richard Purdie Cc: Otavio Salvador Cc: Martin Jansa Cc: Ross Burton Cc: Marek Vasut --- Changes v4 -> v5: * Added backward compatibility with "u-boot-mkimage" recipe * Improved handling of nativesdk * Update all references from "u-boot-mkimage" to "u-boot-tools" Changes v3 -> v4: * Updated maintainer info to make Yocto autobuilder happy again Changes v2 -> v3: * Recipe renamed to "u-boot-tools" to better match its contents (especially in the future as we add more tools there) * Existing "u-boot-mkimage" and newly introduced "u-boot-mkenvimage" made avaialble via PROVIDES Changes v1 -> v2: * Got rid of a separate recipe and instead added mkenvimage to u-boot mkimage recipe meta/classes/image_types.bbclass | 2 +- meta/classes/kernel-fitimage.bbclass | 2 +- meta/classes/kernel-uimage.bbclass | 2 +- meta/conf/distro/include/distro_alias.inc | 2 +- meta/conf/distro/include/maintainers.inc | 2 +- ...boot-mkimage_2018.07.bb => u-boot-tools_2018.07.bb} | 18 +- 6 files changed, 22 insertions(+), 6 deletions(-) rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2018.07.bb => u-boot-tools_2018.07.bb} (66%) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 05e5b0a2e0..5c406481ef 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -308,7 +308,7 @@ CONVERSION_DEPENDS_lzo = "lzop-native" CONVERSION_DEPENDS_zip = "zip-native" CONVERSION_DEPENDS_sum = "mtd-utils-native" CONVERSION_DEPENDS_bmap = "bmap-tools-native" -CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native" +CONVERSION_DEPENDS_u-boot = "u-boot-tools-native" CONVERSION_DEPENDS_vmdk = "qemu-native" CONVERSION_DEPENDS_vdi = "qemu-native" CONVERSION_DEPENDS_qcow2 = "qemu-native" diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index 4c4fd99ff4..328bef4069 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -4,7 +4,7 @@ python __anonymous () { kerneltypes = d.getVar('KERNEL_IMAGETYPES') or "" if 'fitImage' in kerneltypes.split(): depends = d.getVar("DEPENDS") -depends = "%s u-boot-mkimage-native dtc-native" % depends +depends = "%s u-boot-tools-native dtc-native" % depends d.setVar("DEPENDS", depends) uarch = d.getVar("UBOOT_ARCH") diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass index c2de6bb40d..cedb4fa070 100644 --- a/meta/classes/kernel-uimage.bbclass +++ b/meta/classes/kernel-uimage.bbclass @@ -3,7 +3,7 @@ inherit kernel-uboot python __anonymous () { if "uImage" in d.getVar('KERNEL_IMAGETYPES'): depends = d.getVar("DEPENDS") -depends = "%s u-boot-mkimage-native" % depends +depends = "%s u-boot-tools-native" % depends d.setVar("DEPENDS", depends) # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 7502542e89..f23db1e8a4 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -354,7 +354,7 @@ DISTRO_PN_ALIAS_pn-tremor = "OSPDT upstream=http://www.xiph.org/vorbis/; DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera Ubuntu=ttf-bitstream-vera" DISTRO_PN_ALIAS_pn-tzcode = "OSPDT" DISTRO_PN_ALIAS_pn-u-boot-fw-utils = "Ubuntu=u-boot-tools Debian=u-boot-tools" -DISTRO_PN_ALIAS_pn-u-boot-mkimage = "Ubuntu=uboot-mkimage Debian=uboot-mkimage" +DISTRO_PN_ALIAS_pn-u-boot-tools = "Ubuntu=u-boot-tools Debian=uboot-tools" DISTRO_PN_ALIAS_pn-udev = "Mandriva=udev Fedora=udev" DISTRO_PN_ALIAS_pn-udev-extraconf = "OE-Core" DISTRO_PN_ALIAS_pn-unfs3 = "Debian=unfs3 Fedora=unfs3" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 0889c1c429..825c24a3f8 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -654,7 +654,7 @@ RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster " RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster " RECIPE_MAINTAINER_pn-u-boot = "Marek Vasut " RECIPE_MAINTAINER_pn-u-boot-fw-utils = "Marek Vasut " -RECIPE_MAINTAINER_pn-u-boot-mkimage =
Re: [OE-core] [oe-commits] [openembedded-core] 10/35: tzcode: update to 2018f
On 11/20/18 12:56 PM, Martin Jansa wrote: > On Fri, Nov 16, 2018 at 04:33:46PM +, g...@git.openembedded.org wrote: >> This is an automated email from the git hooks/post-receive script. >> >> rpurdie pushed a commit to branch sumo >> in repository openembedded-core. >> >> commit 9702041a732ca062a9899543d05e585c930407f3 >> Author: Armin Kuster >> AuthorDate: Mon Oct 22 15:05:11 2018 +0100 >> >> tzcode: update to 2018f > This breaks postgresql build in sumo: After review, updating postgresql to 9.4.20 ( bug fixes only) is the preferred path in this case. - armin > > | postgresql/9.4.17-r0/recipe-sysroot-native/usr/bin/zic -d > 'postgresql/9.4.17-r0/image/usr/share/postgresql/timezone' -p 'US/Eastern' > postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi > | > "postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi", > line 1595: Invalid rule name "+" > | > "postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi", > line 1596: Invalid rule name "+" > | > "postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi", > line 1597: Invalid rule name "+" > | > "postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi", > line 1598: Invalid rule name "+" > | > "postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi", > line 1599: Invalid rule name "+" > | Makefile:52: recipe for target 'install' failed > | make[2]: *** [install] Error 1 > | make[2]: Leaving directory 'postgresql/9.4.17-r0/build/src/timezone' > | Makefile:35: recipe for target 'install-timezone-recurse' failed > | make[1]: *** [install-timezone-recurse] Error 2 > > > Are you going to backport: > > commit 805e74d00cff3a7566335150f7e3b41972265cc1 > Author: Armin Kuster > Date: Mon Oct 22 16:47:55 2018 +0100 > > postgresql: Fix build issue with timezone 2018f update > > Sync our copy of the timezone library with IANA release tzcode2018f. > > to meta-oe/sumo? > > Thanks > >> >> Changes to code >> >> zic now always generates TZif files where time type 0 is used for >> timestamps before the first transition. This simplifies the >> reading of TZif files and should not affect behavior of existing >> TZif readers because the same set of time types is used; only >> their internal indexes may have changed. This affects only the >> legacy zones EST5EDT, CST6CDT, MST7MDT, PST8PDT, CET, MET, and >> EET, which previously used nonzero types for these timestamps. >> >> Because of the type 0 change, zic no longer outputs a dummy >> transition at time -2**59 (before the Big Bang), as clients should >> no longer need this to handle historical timestamps correctly. >> This reverts a change introduced in 2013d and shrinks most TZif >> files by a few bytes. >> >> zic now supports negative time-of-day in Rule and Leap lines, e.g., >> "Rule X min max - Apr lastSun -6:00 1:00 -" means the transition >> occurs at 18:00 on the Saturday before the last Sunday in April. >> This behavior was documented in 2018a but the code did not >> entirely match the documentation. >> >> localtime.c no longer requires at least one time type in TZif >> files that lack transitions or have a POSIX-style TZ string. This >> future-proofs the code against possible future extensions to the >> format that would allow TZif files with POSIX-style TZ strings and >> without transitions or time types. >> >> A read-access subscript error in localtime.c has been fixed. >> It could occur only in TZif files with timecnt == 0, something that >> does not happen in practice now but could happen in future versions. >> >> localtime.c no longer ignores TZif POSIX-style TZ strings that >> specify only standard time. Instead, these TZ strings now >> override the default time type for timestamps after the last >> transition (or for all time stamps if there are no transitions), >> just as DST strings specifying DST have always done. >> >> leapseconds.awk now outputs "#updated" and "#expires" comments, >> and supports leap seconds at the ends of months other than June >> and December. (Inspired by suggestions from Chris Woodbury.) >> (From OE-Core rev: 4670dcdb6e2504469c30ebed828d4702d8c0003c) >> >> Signed-off-by: Armin Kuster >> Signed-off-by: Richard Purdie >> Signed-off-by: Armin Kuster >> --- >> .../tzcode/{tzcode-native_2018e.bb => tzcode-native_2018f.bb} | 8 >> >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/meta/recipes-extended/tzcode/tzcode-native_2018e.bb >> b/meta/recipes-extended/tzcode/tzcode-native_2018f.bb >> similarity index 70% >> rename from
Re: [OE-core] [oe-commits] [openembedded-core] 10/35: tzcode: update to 2018f
On 11/20/18 12:56 PM, Martin Jansa wrote: > On Fri, Nov 16, 2018 at 04:33:46PM +, g...@git.openembedded.org wrote: >> This is an automated email from the git hooks/post-receive script. >> >> rpurdie pushed a commit to branch sumo >> in repository openembedded-core. >> >> commit 9702041a732ca062a9899543d05e585c930407f3 >> Author: Armin Kuster >> AuthorDate: Mon Oct 22 15:05:11 2018 +0100 >> >> tzcode: update to 2018f > This breaks postgresql build in sumo: > > | postgresql/9.4.17-r0/recipe-sysroot-native/usr/bin/zic -d > 'postgresql/9.4.17-r0/image/usr/share/postgresql/timezone' -p 'US/Eastern' > postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi > | > "postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi", > line 1595: Invalid rule name "+" > | > "postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi", > line 1596: Invalid rule name "+" > | > "postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi", > line 1597: Invalid rule name "+" > | > "postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi", > line 1598: Invalid rule name "+" > | > "postgresql/9.4.17-r0/build/../postgresql-9.4.17/src/timezone/data/tzdata.zi", > line 1599: Invalid rule name "+" > | Makefile:52: recipe for target 'install' failed > | make[2]: *** [install] Error 1 > | make[2]: Leaving directory 'postgresql/9.4.17-r0/build/src/timezone' > | Makefile:35: recipe for target 'install-timezone-recurse' failed > | make[1]: *** [install-timezone-recurse] Error 2 > > > Are you going to backport: > > commit 805e74d00cff3a7566335150f7e3b41972265cc1 > Author: Armin Kuster > Date: Mon Oct 22 16:47:55 2018 +0100 > > postgresql: Fix build issue with timezone 2018f update > > Sync our copy of the timezone library with IANA release tzcode2018f. > > to meta-oe/sumo? I should. - armin > > Thanks > >> >> Changes to code >> >> zic now always generates TZif files where time type 0 is used for >> timestamps before the first transition. This simplifies the >> reading of TZif files and should not affect behavior of existing >> TZif readers because the same set of time types is used; only >> their internal indexes may have changed. This affects only the >> legacy zones EST5EDT, CST6CDT, MST7MDT, PST8PDT, CET, MET, and >> EET, which previously used nonzero types for these timestamps. >> >> Because of the type 0 change, zic no longer outputs a dummy >> transition at time -2**59 (before the Big Bang), as clients should >> no longer need this to handle historical timestamps correctly. >> This reverts a change introduced in 2013d and shrinks most TZif >> files by a few bytes. >> >> zic now supports negative time-of-day in Rule and Leap lines, e.g., >> "Rule X min max - Apr lastSun -6:00 1:00 -" means the transition >> occurs at 18:00 on the Saturday before the last Sunday in April. >> This behavior was documented in 2018a but the code did not >> entirely match the documentation. >> >> localtime.c no longer requires at least one time type in TZif >> files that lack transitions or have a POSIX-style TZ string. This >> future-proofs the code against possible future extensions to the >> format that would allow TZif files with POSIX-style TZ strings and >> without transitions or time types. >> >> A read-access subscript error in localtime.c has been fixed. >> It could occur only in TZif files with timecnt == 0, something that >> does not happen in practice now but could happen in future versions. >> >> localtime.c no longer ignores TZif POSIX-style TZ strings that >> specify only standard time. Instead, these TZ strings now >> override the default time type for timestamps after the last >> transition (or for all time stamps if there are no transitions), >> just as DST strings specifying DST have always done. >> >> leapseconds.awk now outputs "#updated" and "#expires" comments, >> and supports leap seconds at the ends of months other than June >> and December. (Inspired by suggestions from Chris Woodbury.) >> (From OE-Core rev: 4670dcdb6e2504469c30ebed828d4702d8c0003c) >> >> Signed-off-by: Armin Kuster >> Signed-off-by: Richard Purdie >> Signed-off-by: Armin Kuster >> --- >> .../tzcode/{tzcode-native_2018e.bb => tzcode-native_2018f.bb} | 8 >> >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/meta/recipes-extended/tzcode/tzcode-native_2018e.bb >> b/meta/recipes-extended/tzcode/tzcode-native_2018f.bb >> similarity index 70% >> rename from meta/recipes-extended/tzcode/tzcode-native_2018e.bb >> rename to meta/recipes-extended/tzcode/tzcode-native_2018f.bb >>
Re: [OE-core] devshell problems after distro upgrade openSUSE Leap 42.3 -> 15.0 (tmux only)
On Tuesday 06 November 2018 at 19:06:45 +, Mike Crowe wrote: > On Monday 16 July 2018 at 08:19:11 +0200, Steffen Sledz wrote: > > On 04.07.2018 13:37, Steffen Sledz wrote: > > > On 03.07.2018 08:04, Steffen Sledz wrote: > > >> On 02.07.2018 20:25, Khem Raj wrote: > > >>> On Sun, Jul 1, 2018 at 11:39 PM Steffen Sledz > > >>> wrote: > > > > After upgrading my build system from openSUSE Leap 42.3 to openSUSE > > Leap 15.0 a > > > > bitbake foo -c devshell > > > > no longer switches to the related work directory. The devshell is > > opened in the original directory without any error or warning instead. > > > > Any hints what's wrong here or how I can debug this behaviour? > > > > >>> > > >>> which terminal are you using, probably some default behavior changes > > >>> there ? > > >> > > >> Main terminal is xterm. No special settings for the devshell terminal, > > >> so tmux is started like before. > > > > > > > > > After some more tests I can limit the problem to OE_TERMINAL="tmux". > > > Other terminals like screen or xterm work well. > > > ... > > > > > > Ping! > > The same problem happens with Debian Buster (currently "testing".) I was > unable to reproduce the problem when running > > (cd subdirectory && tmux split-window) > > from a shell prompt. > > However, I managed to fix it with the following patch. I'm not sure whether > this means there's a bug in tmux though. Since I can't reproduce the > problem outside OE, it's rather difficult to report it. It looks like tmux now honours the PWD environment variable. If I run: cd / PWD=/etc tmux split-window on Debian 9 then I end up with the split window shell in / whereas in Debian 10 I end up with the split window shell in /etc. It seems that terminal.py changes the current directory but does not set PWD. I've entered https://github.com/tmux/tmux/issues/1549 , but I don't really expect them to do anything about it. So, how should I best fix this in oe-core? My previous patch to pass the current directory to tmux explicitly on the command line works. I tried changing PWD too, but that is problematic when the environment parameter is None. (Whatever solution is found will be required for TmuxNewWindow too.) Mike. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] uboot-sign.bbclass: fix signature and deployment
Hello, On Wed, Nov 21, 2018 at 4:08 AM Robert Yang wrote: > > Fixed: > MACHINE = "beaglebone-yocto" > KERNEL_CLASSES += "kernel-fitimage" > KERNEL_IMAGETYPE_beaglebone-yocto = "fitImage" > UBOOT_MACHINE_beaglebone-yocto = "am335x_boneblack_vboot_config" > UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb -p 2000" > UBOOT_SIGN_KEYDIR = "${TOPDIR}/conf" > UBOOT_SIGN_KEYNAME = "dev" > UBOOT_SIGN_ENABLE = "1" > IMAGE_INSTALL_remove = "kernel-image-zimage" > > $ cd conf > $ openssl genrsa -F4 -out dev.key 2048 > $ openssl req -batch -new -x509 -key dev.key -out dev.crt > $ cd ../ > $ bitbake u-boot linux-yocto > $ grep signature tmp/deploy/images/beaglebone-yocto/*.dtb > Binary file > tmp/deploy/images/beaglebone-yocto/u-boot-beaglebone-yocto-2018.07-r0.dtb > matches > Binary file tmp/deploy/images/beaglebone-yocto/u-boot-beaglebone-yocto.dtb > matches > Binary file tmp/deploy/images/beaglebone-yocto/u-boot.dtb matches > > And there would be no signature info when rebuild from sstate: > $ bitbake u-boot linux-yocto -cclean > $ bitbake u-boot linux-yocto > $ grep signature tmp/deploy/images/beaglebone-yocto/*.dtb > No result > > This s because kernel directly edit ${DEPLOY_DIR_IMAGE}/u-boot.dtb, (Note, it > is global ${DEPLOY_DIR_IMAGE}, not recipe's DEPLOYDIR), so that the modified > info is not in sstate, and would be lost when rebuild from sstate. > > There are other problems in previouse code: > - The u-boot.dtb is provided by u-boot, but edited by kernel during signing, > so > it should be deployed by kernel rather than u-boot. > > - The u-boot.do_concat_dtb directly install files to global > ${DEPLOY_DIR_IMAGE}, > this is incorrect, the ${DEPLOY_DIR_IMAGE} should be installed by do_deploy. > > - It seems that it assumes do_deploy depends on do_install according the > comments, > but they have no relationships: > # do_concat_dtb is scheduled _before_ do_install as it overwrite the > # u-boot.bin in both DEPLOYDIR and DEPLOY_IMAGE_DIR. > > - The do_concat_dtb should be run after do_compile, but it doesn't have this > dependency. > > Make u-boot install u-boot.dtb to ${datadir}, kernel copies u-boot.dtb from > ${STAGING_DATADIR} to ${B} and deploy it can fix the problem. > > [YOCTO #12112] > > Reported-by: Christian Andersen > Signed-off-by: Robert Yang The change itself looks good, I noticed that the script part is not using 4 spaces for indenting and as this is being changed, it might make sense to address this as well. Acked-by: Otavio Salvador -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] libdazzle: add recipe
This is a new requirement of epiphany web browser. Signed-off-by: Alexander Kanavin --- .../recipes-gnome/libdazzle/libdazzle_3.30.2.bb | 17 + 1 file changed, 17 insertions(+) create mode 100644 meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb diff --git a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb new file mode 100644 index 000..029adddb9ee --- /dev/null +++ b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "The libdazzle library is a companion library to GObject and Gtk+." +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase upstream-version-is-even vala gobject-introspection + +DEPENDS = "glib-2.0-native glib-2.0 gtk+3" + +SRC_URI[archive.md5sum] = "24e2e1b914a34f5b8868a9507d1f3c4c" +SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5" + +GI_ENABLE_FLAG = "-Dwith_introspection=true" +GI_DISABLE_FLAG = "-Dwith_introspection=false" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] epiphany: update to 3.30.2
libdazzle is a new requirement Signed-off-by: Alexander Kanavin --- .../epiphany/{epiphany_3.28.3.1.bb => epiphany_3.30.2.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-gnome/epiphany/{epiphany_3.28.3.1.bb => epiphany_3.30.2.bb} (80%) diff --git a/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb b/meta/recipes-gnome/epiphany/epiphany_3.30.2.bb similarity index 80% rename from meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb rename to meta/recipes-gnome/epiphany/epiphany_3.30.2.bb index b46c9d3b468..3dd699d4fe4 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.28.3.1.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.30.2.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ gsettings-desktop-schemas libxml2-native \ - glib-2.0 glib-2.0-native json-glib" + glib-2.0 glib-2.0-native json-glib libdazzle" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings distro_features_check upstream-version-is-even gettext @@ -13,8 +13,8 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ file://0002-help-meson.build-disable-the-use-of-yelp.patch \ " -SRC_URI[archive.md5sum] = "31a4a443e8e22f085a10f80b7e41d5f3" -SRC_URI[archive.sha256sum] = "690546a701f046c5c2b3a092659589ea6e17cb0f9a81ec3fdb3046b00cede6f7" +SRC_URI[archive.md5sum] = "1b7c072880562c33f52a3347a94bfe6c" +SRC_URI[archive.sha256sum] = "8c7ef1e51b9fa825a43a603265ce8b06cacc42229e9337c8611c357bc65a8104" EXTRA_OEMESON += " -Ddistributor_name=${DISTRO}" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] gtk+3: update to 3.24.1
Signed-off-by: Alexander Kanavin --- ...-Add-disable-opengl-configure-option.patch | 103 +- .../{gtk+3_3.22.30.bb => gtk+3_3.24.1.bb} | 4 +- 2 files changed, 52 insertions(+), 55 deletions(-) rename meta/recipes-gnome/gtk+/{gtk+3_3.22.30.bb => gtk+3_3.24.1.bb} (83%) diff --git a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch index d2f12dc7ff4..e5a67d098e7 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/0003-Add-disable-opengl-configure-option.patch @@ -1,7 +1,7 @@ -From de36df70d87ba3453ed4f2b92e990021c67238f5 Mon Sep 17 00:00:00 2001 +From 9e243474eea4330b593e0f6dd418b61b79699d8b Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 21 Jun 2016 15:11:39 +0300 -Subject: [PATCH 3/4] Add --disable-opengl configure option +Subject: [PATCH] Add --disable-opengl configure option --disable-opengl will remove the dependency on libepoxy and on the OpenGL APIs. This is useful for those who want to keep using gtk+3 @@ -21,32 +21,32 @@ Upstream-Status: Inappropriate [Evil eye expected from upstream] Signed-off-by: Jussi Kukkonen --- - configure.ac | 13 +-- - demos/gtk-demo/glarea.c| 14 - docs/tools/Makefile.am | 9 +++-- - docs/tools/widgets.c | 4 ++- - gdk/gdkdisplay.c | 4 ++- - gdk/gdkgl.c| 10 ++ - gdk/gdkglcontext.c | 6 - gdk/gdkwindow.c| 13 +++ - gdk/x11/Makefile.am| 30 +--- - gdk/x11/gdkdisplay-x11.c | 6 +++- - gdk/x11/gdkscreen-x11.c| 5 +++ - gdk/x11/gdkwindow-x11.c| 4 +++ - gdk/x11/gdkx-autocleanups.h| 2 ++ + configure.ac | 13 - + demos/gtk-demo/glarea.c| 14 ++ + docs/tools/Makefile.am | 9 +++- + docs/tools/widgets.c | 4 +- + gdk/gdkdisplay.c | 4 +- + gdk/gdkgl.c| 10 + gdk/gdkglcontext.c | 6 +++ + gdk/gdkwindow.c| 13 + + gdk/x11/Makefile.am| 30 +-- + gdk/x11/gdkdisplay-x11.c | 6 ++- + gdk/x11/gdkscreen-x11.c| 5 ++ + gdk/x11/gdkwindow-x11.c| 4 ++ + gdk/x11/gdkx-autocleanups.h| 2 + gdk/x11/{gdkx.h => gdkx-with-gl-context.h} | 1 - - gdk/x11/gdkx-without-gl-context.h | 58 ++ + gdk/x11/gdkx-without-gl-context.h | 58 ++ gtk/Makefile.am| 3 +- - gtk/gtkglarea.c| 20 ++- - gtk/inspector/general.c| 6 - tests/Makefile.am | 10 -- - testsuite/gtk/objects-finalize.c | 2 ++ + gtk/gtkglarea.c| 20 +++- + gtk/inspector/general.c| 6 +++ + tests/Makefile.am | 10 ++-- + testsuite/gtk/objects-finalize.c | 2 + 20 files changed, 202 insertions(+), 18 deletions(-) rename gdk/x11/{gdkx.h => gdkx-with-gl-context.h} (98%) create mode 100644 gdk/x11/gdkx-without-gl-context.h diff --git a/configure.ac b/configure.ac -index 0a48875..6f0a3a6 100644 +index a91b29c..561d3b5 100644 --- a/configure.ac +++ b/configure.ac @@ -351,6 +351,15 @@ AC_ARG_ENABLE(cloudproviders, @@ -65,7 +65,7 @@ index 0a48875..6f0a3a6 100644 AC_ARG_ENABLE(glx, [AS_HELP_STRING([--enable-glx], [When enabled Gdk will try to initialize GLX])]) -@@ -1372,7 +1381,7 @@ CFLAGS="$saved_cflags" +@@ -1381,7 +1390,7 @@ CFLAGS="$saved_cflags" LDFLAGS="$saved_ldflags" GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version" @@ -74,7 +74,7 @@ index 0a48875..6f0a3a6 100644 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES) GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB" -@@ -1406,7 +1415,7 @@ fi +@@ -1415,7 +1424,7 @@ fi PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version" @@ -224,12 +224,12 @@ index 40225e9..c55e1de 100644 GdkRenderingMode diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c -index 8e7b8c2..b579b22 100644 +index 933e204..1767508 100644 --- a/gdk/gdkgl.c +++ b/gdk/gdkgl.c -@@ -22,7 +22,9 @@ - - #include "gdkinternals.h" +@@
[OE-core] [PATCH 1/4] webkitgtk: update to 2.22.3
Remove upstreamed patches. Add a tweak to 0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch for Javascriptcore gir file (previously it was pre-compiled in tarballs). Rebase 0001-Fix-build-with-musl.patch Signed-off-by: Alexander Kanavin --- ...-has-no-member-named-lightVector-on-.patch | 37 .../webkitgtk/0001-Fix-build-with-musl.patch | 36 +++ ...trospection-files-add-CMAKE_C_FLAGS-.patch | 26 --- .../0001-webkitgtk-fix-CVE-2017-17821.patch | 44 --- .../0012-soup-Forward-declare-URL-class.patch | 31 - ...ebkitgtk_2.20.5.bb => webkitgtk_2.22.3.bb} | 7 +-- 6 files changed, 40 insertions(+), 141 deletions(-) delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-webkitgtk-fix-CVE-2017-17821.patch delete mode 100644 meta/recipes-sato/webkit/webkitgtk/0012-soup-Forward-declare-URL-class.patch rename meta/recipes-sato/webkit/{webkitgtk_2.20.5.bb => webkitgtk_2.22.3.bb} (94%) diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch deleted file mode 100644 index 25f4846592a..000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-PaintingData-has-no-member-named-lightVector-on-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a5d4e038268ae23486fecc1966fd2e16a7f40ce8 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Wed, 25 Jul 2018 00:23:48 -0700 -Subject: [PATCH] Fix PaintingData' has no member named 'lightVector' on - ARM_NEON - -* platform/graphics/cpu/arm/filters/FELightingNEON.h: -(WebCore::FELighting::platformApplyNeon): - -Upstream-Status: Submitted -https://bugs.webkit.org/show_bug.cgi?id=187991 - -Signed-off-by: Hongxu Jia - Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index 42af922..b542a4c 100644 a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -+++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -@@ -144,9 +144,9 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS - neonData.flags |= FLAG_CONE_EXPONENT_IS_1; - } else { - ASSERT(m_lightSource->type() == LS_DISTANT); --floatArguments.lightX = paintingData.lightVector.x(); --floatArguments.lightY = paintingData.lightVector.y(); --floatArguments.lightZ = paintingData.lightVector.z(); -+floatArguments.lightX = paintingData.initialLightingData.lightVector.x(); -+floatArguments.lightY = paintingData.initialLightingData.lightVector.y(); -+floatArguments.lightZ = paintingData.initialLightingData.lightVector.z(); - floatArguments.padding2 = 1; - } - --- -2.10.2 - diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch index 041ec4675f1..d9a18e0ce93 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-build-with-musl.patch @@ -1,4 +1,4 @@ -From 4f9d736e0458ed33cd161cd164ad0acdac939f44 Mon Sep 17 00:00:00 2001 +From 322966273a8e085829261a397af37de0fbf51aad Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 6 Oct 2017 17:00:08 +0300 Subject: [PATCH] Fix build with musl @@ -7,69 +7,69 @@ Upstream-Status: Pending Signed-off-by: Alexander Kanavin --- - Source/JavaScriptCore/runtime/MachineContext.h | 18 +- + Source/JavaScriptCore/runtime/MachineContext.h | 10 +- Source/WTF/wtf/Platform.h | 2 +- - 2 files changed, 18 insertions(+), 2 deletions(-) + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/JavaScriptCore/runtime/MachineContext.h b/Source/JavaScriptCore/runtime/MachineContext.h -index bf0bdc7..84b8a8a 100644 +index 836d755..7665d25 100644 --- a/Source/JavaScriptCore/runtime/MachineContext.h +++ b/Source/JavaScriptCore/runtime/MachineContext.h -@@ -146,7 +146,7 @@ inline void*& stackPointer(mcontext_t& machineContext) +@@ -188,7 +188,7 @@ static inline void*& stackPointerImpl(mcontext_t& machineContext) #error Unknown Architecture #endif --#elif defined(__GLIBC__) || defined(__BIONIC__) +-#elif OS(FUCHSIA) || defined(__GLIBC__) || defined(__BIONIC__) +#elif defined(__linux__) #if CPU(X86) return reinterpret_cast((uintptr_t&) machineContext.gregs[REG_ESP]); -@@ -251,7 +251,7 @@ inline void*& framePointer(mcontext_t& machineContext) +@@ -335,7 +335,7 @@ static inline void*& framePointerImpl(mcontext_t&
Re: [OE-core] [PATCH v4] u-boot: Add mkenvimage tool
On 11/21/2018 04:45 PM, Otavio Salvador wrote: > On Tue, Nov 20, 2018 at 6:22 PM Marek Vasut wrote: >> On 11/20/2018 09:21 PM, Alexey Brodkin wrote: >>> This utility is used for creation of images containing >>> usable in run-time U-Boot environment. >>> >>> As of today this utility is added per-board like here [1] >>> for Intel Edison board. >>> >>> [1] >>> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb >>> >>> Given there're quite some U-Boot tools that we may want to add later >>> this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools" >>> still for compatibility we provide "u-boot-mkimage" with help >>> of PROVIDES as well as proposed "u-boot-mkenvimage". >>> >>> Signed-off-by: Alexey Brodkin >>> Cc: Richard Purdie >>> Cc: Otavio Salvador >>> Cc: Martin Jansa >>> Cc: Ross Burton >>> Cc: Marek Vasut >>> --- >>> >>> I may "git grep u-boot-mkimage" in more places: >>> 1. meta/classes/image_types.bbclass:311:CONVERSION_DEPENDS_u-boot = >>> "u-boot-mkimage-native" >>> 2. meta/classes/kernel-fitimage.bbclass:7:depends = "%s >>> u-boot-mkimage-native dtc-native" % depends >>> 3. meta/classes/kernel-uimage.bbclass:6:depends = "%s >>> u-boot-mkimage-native" % depends >>> 4. >>> meta/conf/distro/include/distro_alias.inc:357:DISTRO_PN_ALIAS_pn-u-boot-mkimage >>> = "Ubuntu=uboot-mkimage Debian=uboot-mkimage" >>> >>> But that's not clear for me if it's required to swap "u-boot-mkimage" >>> to "u-boot-tools" see: >>> 1. "u-boot-mkimage" is still a valid recipe as we export ot via PROVIDES >>> (or I'm mixing package name with recipe name which very well might be >>> the case) >>> 2. I don't fully understand a mening of "DISTRO_PN_ALIAS". >>> If that's a name of a package from some big Linux distro or how target >>> utility is named in that distro. For example in Debian Sid there's >>> a package named "u-boot-tools" which includes "mkimage", "mkenvimage", >>> "fw_printenv", "fw_setenv" and many more while in "distro_alias.inc" >>> we still have: >>> >8 >>> DISTRO_PN_ALIAS_pn-u-boot-mkimage = "Ubuntu=uboot-mkimage >>> Debian=uboot-mkimage" >>> >8 >> >> Just make u-boot-tools RPROVIDE the u-boot-mkimage, and make it generate >> a u-boot-mkimage package , no ? > > In fact, it should: > > PROVIDE += "u-boot-mkimage" > > So dependencies are going to keep working; as Richard said, it should > use the new name for the sake of correctness though. > > The package split will define how it will need to be handled for the > runtime counterpart. > > If we adopt: > > PACKAGES += "${PN}-mkimage ${PN}-mkenvimage" > > Then we need to add: > > RPROVIDES_${PN}-mkimage = "u-boot-mkimage" > RREPLACES_${PN}-mkimage = "u-boot-mkimage" > RCONFLICTS_${PN}-mkimage = "u-boot-mkimage" > > So it provides the upgrade path to the original package. > > (this is my vote, btw) Cool, all right. -- Best regards, Marek Vasut -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4] u-boot: Add mkenvimage tool
On Tue, Nov 20, 2018 at 6:22 PM Marek Vasut wrote: > On 11/20/2018 09:21 PM, Alexey Brodkin wrote: > > This utility is used for creation of images containing > > usable in run-time U-Boot environment. > > > > As of today this utility is added per-board like here [1] > > for Intel Edison board. > > > > [1] > > http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb > > > > Given there're quite some U-Boot tools that we may want to add later > > this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools" > > still for compatibility we provide "u-boot-mkimage" with help > > of PROVIDES as well as proposed "u-boot-mkenvimage". > > > > Signed-off-by: Alexey Brodkin > > Cc: Richard Purdie > > Cc: Otavio Salvador > > Cc: Martin Jansa > > Cc: Ross Burton > > Cc: Marek Vasut > > --- > > > > I may "git grep u-boot-mkimage" in more places: > > 1. meta/classes/image_types.bbclass:311:CONVERSION_DEPENDS_u-boot = > > "u-boot-mkimage-native" > > 2. meta/classes/kernel-fitimage.bbclass:7:depends = "%s > > u-boot-mkimage-native dtc-native" % depends > > 3. meta/classes/kernel-uimage.bbclass:6:depends = "%s > > u-boot-mkimage-native" % depends > > 4. > > meta/conf/distro/include/distro_alias.inc:357:DISTRO_PN_ALIAS_pn-u-boot-mkimage > > = "Ubuntu=uboot-mkimage Debian=uboot-mkimage" > > > > But that's not clear for me if it's required to swap "u-boot-mkimage" > > to "u-boot-tools" see: > > 1. "u-boot-mkimage" is still a valid recipe as we export ot via PROVIDES > > (or I'm mixing package name with recipe name which very well might be > > the case) > > 2. I don't fully understand a mening of "DISTRO_PN_ALIAS". > > If that's a name of a package from some big Linux distro or how target > > utility is named in that distro. For example in Debian Sid there's > > a package named "u-boot-tools" which includes "mkimage", "mkenvimage", > > "fw_printenv", "fw_setenv" and many more while in "distro_alias.inc" > > we still have: > > >8 > > DISTRO_PN_ALIAS_pn-u-boot-mkimage = "Ubuntu=uboot-mkimage > > Debian=uboot-mkimage" > > >8 > > Just make u-boot-tools RPROVIDE the u-boot-mkimage, and make it generate > a u-boot-mkimage package , no ? In fact, it should: PROVIDE += "u-boot-mkimage" So dependencies are going to keep working; as Richard said, it should use the new name for the sake of correctness though. The package split will define how it will need to be handled for the runtime counterpart. If we adopt: PACKAGES += "${PN}-mkimage ${PN}-mkenvimage" Then we need to add: RPROVIDES_${PN}-mkimage = "u-boot-mkimage" RREPLACES_${PN}-mkimage = "u-boot-mkimage" RCONFLICTS_${PN}-mkimage = "u-boot-mkimage" So it provides the upgrade path to the original package. (this is my vote, btw) -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4] linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe
From: He Zhe This is a workaround for the following possible build failure. *** Compiler lacks asm-goto support.. Stop. When building linux-libc-headers we need to use binutils on build machine. binutils v2.31 introduces a bug that could cause scripts/gcc-goto.sh to fail when running in an environment where /tmp is rarely used, e.g. in docker. Signed-off-by: He Zhe --- v2: Improve commit log v3: Shorten long lines as patchwork suggested v4: Shorten subject line... ...-fixed-temporary-file-instead-of-pipe-for.patch | 70 ++ .../linux-libc-headers/linux-libc-headers_4.18.bb | 4 ++ 2 files changed, 74 insertions(+) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch new file mode 100644 index 000..0d8fa80 --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch @@ -0,0 +1,70 @@ +From 3bbea65e11918f8753e8006a2198b999cdb0af58 Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Wed, 21 Nov 2018 15:12:43 +0800 +Subject: [PATCH] scripts: Use fixed temporary file instead of pipe for + here-doc + +There was a bug of "as" in binutils that when it checks if the input file and +output file are the same one, it would not check if they are on the same block +device. The check is introduced by the following commit in v2.31. + +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h= +67f846b59b32f3d704c601669409c2584383fea9 + +The here-doc usage in this script creates temporary file in /tmp. When we run in +an environment where /tmp has rarely been used, the newly created temporary file +may have a very low inode number. If the inode number was 6 which is the same as +/dev/null, the as would wrongly think the input file and the output file are the +same and report the following error. + +*** Compiler lacks asm-goto support.. Stop. + +One observed case happened in docker where the /tmp could be so rarely used that +very low number inode may be allocated and triggers the error. + +The fix below for the bug only exists on the master branch of binutils so far +and has not been released from upstream. As the convict is introduced since +v2.31, only v2.31 is affected. + +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h= +2a50366ded329bfb39d387253450c9d5302c3503 + +When building linux-libc-headers we need to use "as" in binutils which does not +contain the fix for the moment. To work around the error, we create a fixed +temporary file to contain the program being tested. + +This patch also removes ">/dev/null 2>&1" so we will have more direct error +information in case something else wrong happened. + +Upstream-Status: Inappropriate [A work around for binutils v2.31] + +Signed-off-by: He Zhe +--- + scripts/gcc-goto.sh | 7 ++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh +index 083c526..0aaf1b4 100755 +--- a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh +@@ -3,7 +3,9 @@ + # Test for gcc 'asm goto' support + # Copyright (C) 2010, Jason Baron + +-cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y" ++TMPFILE=`mktemp -p .` ++ ++cat << "END" > ${TMPFILE} + int main(void) + { + #if defined(__arm__) || defined(__aarch64__) +@@ -20,3 +22,6 @@ entry: + return 0; + } + END ++ ++$@ -x c ${TMPFILE} -c -o /dev/null && echo "y" ++rm ${TMPFILE} +-- +2.7.4 + diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb index eb7bee7..00420aa 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb @@ -9,5 +9,9 @@ SRC_URI_append_libc-musl = "\ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " +SRC_URI_append = "\ +file://0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch \ +" + SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9" SRC_URI[sha256sum] = "19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] libsolv: update to 0.7.1
Signed-off-by: Alexander Kanavin --- .../libsolv/{libsolv_0.6.35.bb => libsolv_0.7.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-extended/libsolv/{libsolv_0.6.35.bb => libsolv_0.7.1.bb} (95%) diff --git a/meta/recipes-extended/libsolv/libsolv_0.6.35.bb b/meta/recipes-extended/libsolv/libsolv_0.7.1.bb similarity index 95% rename from meta/recipes-extended/libsolv/libsolv_0.6.35.bb rename to meta/recipes-extended/libsolv/libsolv_0.7.1.bb index 12dfc5d3a2b..9e0952128e8 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.6.35.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.7.1.bb @@ -12,7 +12,7 @@ SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation file://0002-Fixes-to-internal-fopencookie-implementation.patch \ " -SRCREV = "38c5374d4712667b0b6ada4bf78ddbb343095d0c" +SRCREV = "aae08b819742abba7c44510797077c5f25f3ed00" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] package_manager.py: fix the message used to catch failing postinsts from dnf
Latest dnf versions have tweaked it. Signed-off-by: Alexander Kanavin --- meta/lib/oe/package_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 02cf2b76218..392fe7e3724 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -864,7 +864,7 @@ class RpmPM(PackageManager): failed_scriptlets_pkgnames = collections.OrderedDict() for line in output.splitlines(): -if line.startswith("Non-fatal POSTIN scriptlet failure in rpm package"): +if line.startswith("Error in POSTIN scriptlet in rpm package"): failed_scriptlets_pkgnames[line.split()[-1]] = True if len(failed_scriptlets_pkgnames) > 0: -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] libcomps: add a patch to fix the missing crc32 symbol error under musl
Signed-off-by: Alexander Kanavin --- .../0001-Add-crc32.c-to-sources-list.patch| 47 +++ .../recipes-devtools/libcomps/libcomps_git.bb | 1 + 2 files changed, 48 insertions(+) create mode 100644 meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch diff --git a/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch b/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch new file mode 100644 index 000..ff90269a230 --- /dev/null +++ b/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch @@ -0,0 +1,47 @@ +From 83407aa50e06d967d0a1095a140bd7b0e5d51d27 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Wed, 21 Nov 2018 13:09:05 +0100 +Subject: [PATCH] Add crc32.c to sources list + +Otherwise, there is a missing symbol runtime error under musl C library. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + libcomps/src/python/src/CMakeLists.txt | 4 ++-- + libcomps/src/python/src/crc32.c| 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt +index 6ed25bb..c15c8b2 100644 +--- a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt +@@ -9,13 +9,13 @@ set (pycomps_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}) + set (pycomps_SRC pycomps.c pycomps_sequence.c + pycomps_envs.c pycomps_categories.c pycomps_groups.c + pycomps_gids.c pycomps_utils.c pycomps_dict.c pycomps_mdict.c +- pycomps_hash.c pycomps_exc.c pycomps_lbw.c) ++ pycomps_hash.c pycomps_exc.c pycomps_lbw.c crc32.c) + + set (pycomps_HEADERS pycomps_23macros.h pycomps_sequence.h + pycomps_envs.h pycomps_categories.h pycomps_groups.h + pycomps_gids.h pycomps_utils.h pycomps_dict.h pycomps_mdict.h + pycomps_hash.h pycomps_exc.h pycomps_lbw.h +- pycomps_types.h) ++ pycomps_types.h crc32.h) + + #set(TEST_FILES ../__init__.py __test.py test_merge_comps.py test_libcomps.py + # utest.py) +diff --git a/libcomps/src/python/src/crc32.c b/libcomps/src/python/src/crc32.c +index d8f5e34..f266067 100644 +--- a/libcomps/src/python/src/crc32.c b/libcomps/src/python/src/crc32.c +@@ -41,7 +41,7 @@ + */ + + #include +-#include ++#include + + static uint32_t crc32_tab[] = { + 0x, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, diff --git a/meta/recipes-devtools/libcomps/libcomps_git.bb b/meta/recipes-devtools/libcomps/libcomps_git.bb index e69bf67729d..a0b6767b3df 100644 --- a/meta/recipes-devtools/libcomps/libcomps_git.bb +++ b/meta/recipes-devtools/libcomps/libcomps_git.bb @@ -6,6 +6,7 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0002-Set-library-installation-path-correctly.patch \ file://0001-Make-__comps_objmrtree_all-static-inline.patch \ + file://0001-Add-crc32.c-to-sources-list.patch \ " PV = "0.1.8+git${SRCPV}" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] dnf: update to 4.0.4
License-Update: spelling fixes Signed-off-by: Alexander Kanavin --- ...ode-etc-and-systemd-unit-directories.patch | 19 --- ...PYTHON_INSTALL_DIR-by-running-python.patch | 17 +++-- .../dnf/{dnf_2.7.5.bb => dnf_4.0.4.bb}| 6 +++--- 3 files changed, 18 insertions(+), 24 deletions(-) rename meta/recipes-devtools/dnf/{dnf_2.7.5.bb => dnf_4.0.4.bb} (94%) diff --git a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch index 15a7bfc7329..cb09f17a563 100644 --- a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch +++ b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch @@ -1,7 +1,7 @@ -From a8ef81c115a45f05dad145c98e10f3c4940e4e29 Mon Sep 17 00:00:00 2001 +From ffb7942cc73c3d2c6aa7c689cdaf9bc0bcbc144b Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 26 Jan 2017 16:25:47 +0200 -Subject: [PATCH 3/5] Do not hardcode /etc and systemd unit directories +Subject: [PATCH] Do not hardcode /etc and systemd unit directories Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin @@ -11,20 +11,17 @@ Signed-off-by: Alexander Kanavin 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 650b624a..10199618 100644 +index 73552967..38cf4fbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -7,8 +7,8 @@ if (NOT PYTHON_DESIRED) - set (PYTHON_DESIRED "2") - endif() +@@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4) + + INCLUDE (${CMAKE_SOURCE_DIR}/VERSION.cmake) -SET( SYSCONFDIR /etc) -SET( SYSTEMD_DIR /usr/lib/systemd/system) +SET( SYSCONFDIR ${CMAKE_INSTALL_SYSCONFDIR}) +SET( SYSTEMD_DIR $ENV{systemd_system_unitdir}) - if (${PYTHON_DESIRED} STREQUAL "2") - FIND_PACKAGE (PythonInterp REQUIRED) --- -2.14.2 - + IF (NOT PYTHON_DESIRED) + FIND_PACKAGE (PythonInterp REQUIRED) diff --git a/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index 6e011915df0..0ed9afc58d2 100644 --- a/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -1,7 +1,7 @@ -From 7205033e44d8fba1d3b18b490e7eaab82da1ffa3 Mon Sep 17 00:00:00 2001 +From 6be13143a54c79085d400d5bd4c7a6e1cb6ffaf5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:29:07 +0200 -Subject: [PATCH 1/5] Do not set PYTHON_INSTALL_DIR by running python +Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin @@ -11,18 +11,15 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 23e5f889..650b624a 100644 +index 38cf4fbf..6c5debd8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -18,7 +18,7 @@ else() - FIND_PACKAGE(PythonInterp 3.0 REQUIRED) - endif() +@@ -19,7 +19,7 @@ ELSE () + MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED}) + ENDIF() -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write('%s.%s' % (sys.version_info.major, sys.version_info.minor))" OUTPUT_VARIABLE PYTHON_MAJOR_DOT_MINOR_VERSION) MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") --- -2.14.2 - + ADD_SUBDIRECTORY (dnf) diff --git a/meta/recipes-devtools/dnf/dnf_2.7.5.bb b/meta/recipes-devtools/dnf/dnf_4.0.4.bb similarity index 94% rename from meta/recipes-devtools/dnf/dnf_2.7.5.bb rename to meta/recipes-devtools/dnf/dnf_4.0.4.bb index df60d731b69..931e9eff07f 100644 --- a/meta/recipes-devtools/dnf/dnf_2.7.5.bb +++ b/meta/recipes-devtools/dnf/dnf_4.0.4.bb @@ -1,8 +1,8 @@ SUMMARY = "Package manager forked from Yum, using libsolv as a dependency resolver" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://PACKAGE-LICENSING;md5=bfc29916e11321be06924c4fb096fdcc \ - " + file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \ +" SRC_URI = "git://github.com/rpm-software-management/dnf.git \ file://0001-Corretly-install-tmpfiles.d-configuration.patch \ @@ -12,7 +12,7 @@ SRC_URI =
[OE-core] [PATCH 3/7] librepo: update to 1.9.2
expat dependency has been replaced by libxml Signed-off-by: Alexander Kanavin --- ...tain-PYTHON_INSTALL_DIR-by-running-p.patch | 21 ++- ...les-with-pkg-config-not-with-cmake-m.patch | 18 +++- .../{librepo_1.8.1.bb => librepo_1.9.2.bb}| 4 ++-- 3 files changed, 16 insertions(+), 27 deletions(-) rename meta/recipes-devtools/librepo/{librepo_1.8.1.bb => librepo_1.9.2.bb} (86%) diff --git a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch index d69deb5110d..b61f0c93246 100644 --- a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch +++ b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch @@ -1,8 +1,7 @@ -From 5b6849d9d7e030c3a521b5245d86f853b0271a61 Mon Sep 17 00:00:00 2001 +From b08a3b71e716dd0485ef51036d32e4c304fb4e67 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:05:36 +0200 -Subject: [PATCH 1/2] Do not try to obtain PYTHON_INSTALL_DIR by running - python. +Subject: [PATCH] Do not try to obtain PYTHON_INSTALL_DIR by running python. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin @@ -13,12 +12,10 @@ Signed-off-by: Alexander Kanavin 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt -index 5ffbd62..90d3c22 100644 +index a0f1f9a..1665079 100644 --- a/librepo/python/python2/CMakeLists.txt +++ b/librepo/python/python2/CMakeLists.txt -@@ -1,11 +1,11 @@ - FIND_PACKAGE (PythonLibs 2 ) - FIND_PACKAGE (PythonInterp 2 REQUIRED) +@@ -1,9 +1,9 @@ -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " -from sys import stdout -from distutils import sysconfig @@ -35,13 +32,10 @@ index 5ffbd62..90d3c22 100644 MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt -index 47559f7..b39adc2 100644 +index 52ba44e..da51e10 100644 --- a/librepo/python/python3/CMakeLists.txt +++ b/librepo/python/python3/CMakeLists.txt -@@ -10,12 +10,12 @@ message("--- ${PYTHON_INCLUDE_DIR}") - - FIND_PACKAGE(PythonLibs 3.0) - FIND_PACKAGE(PythonInterp 3.0 REQUIRED) +@@ -1,9 +1,9 @@ -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " -from sys import stdout -from distutils import sysconfig @@ -57,6 +51,3 @@ index 47559f7..b39adc2 100644 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}") --- -2.14.1 - diff --git a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch index f7d7ab3a2a1..488657154a9 100644 --- a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch +++ b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch @@ -1,29 +1,27 @@ -From a36be8192615e2a1fb5a5856d44565277f15583b Mon Sep 17 00:00:00 2001 +From 9f44d2f4aaf706027fe5a02f6d83547ff343f09c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 30 Dec 2016 18:23:27 +0200 -Subject: [PATCH 4/4] Set gpgme variables with pkg-config, not with cmake - module (which doesn't work properly) +Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module + (which doesn't work properly) Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it] Signed-off-by: Alexander Kanavin + --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ef07d2d..f1fa09b 100644 +index 0f7271f..d71373f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) +@@ -30,7 +30,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) - FIND_PACKAGE(EXPAT REQUIRED) + PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) FIND_PACKAGE(CURL REQUIRED) -FIND_PACKAGE(Gpgme REQUIRED) +PKG_CHECK_MODULES(GPGME gpgme REQUIRED) +set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) - FIND_PACKAGE(Xattr REQUIRED) INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS}) --- -2.11.0 - + diff --git a/meta/recipes-devtools/librepo/librepo_1.8.1.bb b/meta/recipes-devtools/librepo/librepo_1.9.2.bb similarity index 86% rename from meta/recipes-devtools/librepo/librepo_1.8.1.bb rename to meta/recipes-devtools/librepo/librepo_1.9.2.bb index 456988558b5..69c2411f7d4 100644 --- a/meta/recipes-devtools/librepo/librepo_1.8.1.bb +++ b/meta/recipes-devtools/librepo/librepo_1.9.2.bb @@ -7,11 +7,11 @@ SRC_URI =
[OE-core] [PATCH 2/7] rpm: update to 4.14.2.1
Signed-off-by: Alexander Kanavin --- meta/recipes-devtools/rpm/{rpm_4.14.2.bb => rpm_4.14.2.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/rpm/{rpm_4.14.2.bb => rpm_4.14.2.1.bb} (99%) diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.bb b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb similarity index 99% rename from meta/recipes-devtools/rpm/rpm_4.14.2.bb rename to meta/recipes-devtools/rpm/rpm_4.14.2.1.bb index 200fe4da26a..ef5d631917c 100644 --- a/meta/recipes-devtools/rpm/rpm_4.14.2.bb +++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb @@ -43,7 +43,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \ " PE = "1" -SRCREV = "753f6941dc32e94047b7cfe713ddd604a810b4db" +SRCREV = "4a9440006398646583f0d9ae1837dad2875013aa" S = "${WORKDIR}/git" -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] libdnf: update to 0.22.0
Signed-off-by: Alexander Kanavin --- .../libdnf/0001-Add-WITH_TESTS-option.patch | 49 +++ ...or-both-libsolv-and-libsolvext-libdn.patch | 15 +++--- ...oot-path-to-introspection-tools-path.patch | 36 -- ...ary-installation-directory-correctly.patch | 29 --- ...ables-with-pkg-config-cmake-s-own-mo.patch | 17 +++ .../{libdnf_0.11.1.bb => libdnf_0.22.0.bb}| 8 +-- 6 files changed, 66 insertions(+), 88 deletions(-) create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0002-Prefix-sysroot-path-to-introspection-tools-path.patch delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0003-Set-the-library-installation-directory-correctly.patch rename meta/recipes-devtools/libdnf/{libdnf_0.11.1.bb => libdnf_0.22.0.bb} (78%) diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch new file mode 100644 index 000..7c8131b4be8 --- /dev/null +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch @@ -0,0 +1,49 @@ +From 0d0155c4dd6c0b3305ea2ab0e10b0f84d024a6e1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 6 Nov 2018 13:54:43 +0100 +Subject: [PATCH] Add WITH_TESTS option + +This makes a dependency on cppunit optional. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin + +--- + CMakeLists.txt | 3 +++ + python/hawkey/CMakeLists.txt | 2 ++ + 2 files changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b73a03d7..a9e0200f 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -36,6 +36,7 @@ OPTION(WITH_MAN "Enables hawkey man page generation" ON) + OPTION(WITH_HTML "Enables hawkey HTML generation" ON) + + OPTION(WITH_BINDINGS "Enables python/SWIG bindings" ON) ++OPTION(WITH_TESTS "Enables unit tests" ON) + + OPTION (ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF) + option (ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF) +@@ -122,8 +123,10 @@ IF (WITH_BINDINGS) + # ADD_SUBDIRECTORY (bindings/perl) + ADD_SUBDIRECTORY (bindings/python) + ENDIF() ++IF (WITH_TESTS) + ENABLE_TESTING() + ADD_SUBDIRECTORY (tests) ++ENDIF() + IF (WITH_BINDINGS) + ADD_SUBDIRECTORY (python/hawkey) + ADD_SUBDIRECTORY (docs/hawkey) +diff --git a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt +index 3c0b3c0c..31466ed9 100644 +--- a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt +@@ -49,4 +49,6 @@ TARGET_LINK_LIBRARIES(_hawkeymodule ${PYTHON_LIBRARY}) + INSTALL(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey) + INSTALL(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey) + ++IF (WITH_TESTS) + ADD_SUBDIRECTORY(tests) ++ENDIF() diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch index cbd0362c8b0..246db34154a 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch @@ -1,7 +1,7 @@ -From 2bf0666544293dcfac2f67b678e24353acdcd4e7 Mon Sep 17 00:00:00 2001 +From c139a6c929cff93dbb9b8279e97263fc9e055727 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 7 Feb 2017 12:16:03 +0200 -Subject: [PATCH 2/2] Get parameters for both libsolv and libsolvext (libdnf is +Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is using both) @@ -13,18 +13,15 @@ Signed-off-by: Alexander Kanavin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ca280f3..6ab9827 100644 +index cd91f08..6422534 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -29,7 +29,7 @@ find_package (PkgConfig REQUIRED) - SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) +@@ -46,7 +46,7 @@ endif(APPLE) PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED) + pkg_check_modules(SMARTCOLS REQUIRED smartcols) FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) -PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) if (ENABLE_RHSM_SUPPORT) - pkg_check_modules (RHSM REQUIRED librhsm) --- -2.14.2 - + pkg_check_modules (RHSM REQUIRED librhsm>=0.0.3) diff --git a/meta/recipes-devtools/libdnf/libdnf/0002-Prefix-sysroot-path-to-introspection-tools-path.patch b/meta/recipes-devtools/libdnf/libdnf/0002-Prefix-sysroot-path-to-introspection-tools-path.patch deleted file mode 100644 index 7eecc3d0516..000 --- a/meta/recipes-devtools/libdnf/libdnf/0002-Prefix-sysroot-path-to-introspection-tools-path.patch +++ /dev/null @@ -1,36
[OE-core] [PATCH] u-boot: Upgrade 2018.07 -> 2018.11
This upgrades U-Boot to 2018.11 release and drop the backported security fixes which are now included upstream. Signed-off-by: Otavio Salvador --- .../u-boot/files/CVE-2018-1000205-1.patch | 59 .../u-boot/files/CVE-2018-1000205-2.patch | 143 -- ..._2018.07.inc => u-boot-common_2018.11.inc} | 7 +- ..._2018.07.bb => u-boot-fw-utils_2018.11.bb} | 0 ...e_2018.07.bb => u-boot-mkimage_2018.11.bb} | 0 .../{u-boot_2018.07.bb => u-boot_2018.11.bb} | 0 6 files changed, 2 insertions(+), 207 deletions(-) delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch delete mode 100644 meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch rename meta/recipes-bsp/u-boot/{u-boot-common_2018.07.inc => u-boot-common_2018.11.inc} (64%) rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2018.07.bb => u-boot-fw-utils_2018.11.bb} (100%) rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2018.07.bb => u-boot-mkimage_2018.11.bb} (100%) rename meta/recipes-bsp/u-boot/{u-boot_2018.07.bb => u-boot_2018.11.bb} (100%) diff --git a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch b/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch deleted file mode 100644 index fed3c3dcb9..00 --- a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-1.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7346c1e192d63cd35f99c7e845e53c5d4d0bdc24 Mon Sep 17 00:00:00 2001 -From: Teddy Reed -Date: Sat, 9 Jun 2018 11:45:20 -0400 -Subject: [PATCH] vboot: Do not use hashed-strings offset - -The hashed-strings signature property includes two uint32_t values. -The first is unneeded as there should never be a start offset into the -strings region. The second, the size, is needed because the added -signature node appends to this region. - -See tools/image-host.c, where a static 0 value is used for the offset. - -Signed-off-by: Teddy Reed -Reviewed-by: Simon Glass - -Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit; - h=7346c1e192d63cd35f99c7e845e53c5d4d0bdc24] - -CVE: CVE-2018-1000205 - -Signed-off-by: Changqing Li - common/image-sig.c | 7 +-- - tools/image-host.c | 1 + - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/common/image-sig.c b/common/image-sig.c -index 8d2fd10..5a269d3 100644 a/common/image-sig.c -+++ b/common/image-sig.c -@@ -377,8 +377,11 @@ int fit_config_check_sig(const void *fit, int noffset, int required_keynode, - /* Add the strings */ - strings = fdt_getprop(fit, noffset, "hashed-strings", NULL); - if (strings) { -- fdt_regions[count].offset = fdt_off_dt_strings(fit) + -- fdt32_to_cpu(strings[0]); -+ /* -+ * The strings region offset must be a static 0x0. -+ * This is set in tool/image-host.c -+ */ -+ fdt_regions[count].offset = fdt_off_dt_strings(fit); - fdt_regions[count].size = fdt32_to_cpu(strings[1]); - count++; - } -diff --git a/tools/image-host.c b/tools/image-host.c -index 8e43671..be2d59b 100644 a/tools/image-host.c -+++ b/tools/image-host.c -@@ -135,6 +135,7 @@ static int fit_image_write_sig(void *fit, int noffset, uint8_t *value, - - ret = fdt_setprop(fit, noffset, "hashed-nodes", - region_prop, region_proplen); -+ /* This is a legacy offset, it is unused, and must remain 0. */ - strdata[0] = 0; - strdata[1] = cpu_to_fdt32(string_size); - if (!ret) { --- -2.7.4 - diff --git a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch b/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch deleted file mode 100644 index bb79af1c7b..00 --- a/meta/recipes-bsp/u-boot/files/CVE-2018-1000205-2.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 72239fc85f3eda078547956608c063ab965e90e9 Mon Sep 17 00:00:00 2001 -From: Teddy Reed -Date: Sat, 9 Jun 2018 11:38:05 -0400 -Subject: [PATCH] vboot: Add FIT_SIGNATURE_MAX_SIZE protection - -This adds a new config value FIT_SIGNATURE_MAX_SIZE, which controls the -max size of a FIT header's totalsize field. The field is checked before -signature checks are applied to protect from reading past the intended -FIT regions. - -This field is not part of the vboot signature so it should be sanity -checked. If the field is corrupted then the structure or string region -reads may have unintended behavior, such as reading from device memory. -A default value of 256MB is set and intended to support most max storage -sizes. - -Suggested-by: Simon Glass -Signed-off-by: Teddy Reed -Reviewed-by: Simon Glass - -Upstream-Status: Backport[http://git.denx.de/?p=u-boot.git;a=commit; - h=72239fc85f3eda078547956608c063ab965e90e9] - -CVE: CVE-2018-1000205 - -Signed-off-by: Changqing Li - Kconfig | 10 ++ - common/image-sig.c | 5 + -
[OE-core] ✗ patchtest: failure for linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe for here-doc (rev2)
== Series Details == Series: linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe for here-doc (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/15016/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch[v3] linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe for here-doc Issue Commit shortlog is too long [test_shortlog_length] Suggested fixEdit shortlog so that it is 90 characters or less (currently 96 characters) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe for here-doc
From: He Zhe This is a workaround for the following possible build failure. *** Compiler lacks asm-goto support.. Stop. When building linux-libc-headers we need to use binutils on build machine. binutils v2.31 introduces a bug that could cause scripts/gcc-goto.sh to fail when running in an environment where /tmp is rarely used, e.g. in docker. Signed-off-by: He Zhe --- v2: Improve commit log v3: Shorten long lines as patchwork suggested ...-fixed-temporary-file-instead-of-pipe-for.patch | 70 ++ .../linux-libc-headers/linux-libc-headers_4.18.bb | 4 ++ 2 files changed, 74 insertions(+) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch new file mode 100644 index 000..0d8fa80 --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch @@ -0,0 +1,70 @@ +From 3bbea65e11918f8753e8006a2198b999cdb0af58 Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Wed, 21 Nov 2018 15:12:43 +0800 +Subject: [PATCH] scripts: Use fixed temporary file instead of pipe for + here-doc + +There was a bug of "as" in binutils that when it checks if the input file and +output file are the same one, it would not check if they are on the same block +device. The check is introduced by the following commit in v2.31. + +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h= +67f846b59b32f3d704c601669409c2584383fea9 + +The here-doc usage in this script creates temporary file in /tmp. When we run in +an environment where /tmp has rarely been used, the newly created temporary file +may have a very low inode number. If the inode number was 6 which is the same as +/dev/null, the as would wrongly think the input file and the output file are the +same and report the following error. + +*** Compiler lacks asm-goto support.. Stop. + +One observed case happened in docker where the /tmp could be so rarely used that +very low number inode may be allocated and triggers the error. + +The fix below for the bug only exists on the master branch of binutils so far +and has not been released from upstream. As the convict is introduced since +v2.31, only v2.31 is affected. + +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h= +2a50366ded329bfb39d387253450c9d5302c3503 + +When building linux-libc-headers we need to use "as" in binutils which does not +contain the fix for the moment. To work around the error, we create a fixed +temporary file to contain the program being tested. + +This patch also removes ">/dev/null 2>&1" so we will have more direct error +information in case something else wrong happened. + +Upstream-Status: Inappropriate [A work around for binutils v2.31] + +Signed-off-by: He Zhe +--- + scripts/gcc-goto.sh | 7 ++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh +index 083c526..0aaf1b4 100755 +--- a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh +@@ -3,7 +3,9 @@ + # Test for gcc 'asm goto' support + # Copyright (C) 2010, Jason Baron + +-cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y" ++TMPFILE=`mktemp -p .` ++ ++cat << "END" > ${TMPFILE} + int main(void) + { + #if defined(__arm__) || defined(__aarch64__) +@@ -20,3 +22,6 @@ entry: + return 0; + } + END ++ ++$@ -x c ${TMPFILE} -c -o /dev/null && echo "y" ++rm ${TMPFILE} +-- +2.7.4 + diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb index eb7bee7..00420aa 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb @@ -9,5 +9,9 @@ SRC_URI_append_libc-musl = "\ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " +SRC_URI_append = "\ +file://0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch \ +" + SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9" SRC_URI[sha256sum] = "19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/8] busybox: remove three hostname test cases
On Wed, 21 Nov 2018 at 12:16, Burton, Ross wrote: > On Wed, 21 Nov 2018 at 05:35, Chen Qi wrote: > > These three test case are removed because of two reasons. > > 1) net-tools' hostname have different behaviour regarding some options > >So when net-tools is installed, test cases may fail. > >e.g. > >test x$(hostname -i) = x$(busybox hostname -i) > > This is just a specific instance of the problem where alternatives may > not be what you want. The busybox test suite should be sure it's > running busybox tools. Having spoken to a few people about this > already, maybe busybox-ptest should contain a symlink farm for all the > applets to the busybox binary that run-ptest can put at the front of > $PATH. Something like this: https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/commit/?h=ross/mut=42ec5eaf3a6c512bffe03d20e7e512e8d87343ca Example package contents at https://pastebin.com/5FpY9xyE If run-ptest just puts that directory at the front of $PATH then you'll be sure to be run the busybox tool. Bonus points for making that a function in update-alternatives.bbclass so every recipe with this problem can use it, but that would have to happen at do_package time because of how that class works so I'm happy enough with this for now. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/8] busybox: remove three hostname test cases
On Wed, 21 Nov 2018 at 05:35, Chen Qi wrote: > These three test case are removed because of two reasons. > 1) net-tools' hostname have different behaviour regarding some options >So when net-tools is installed, test cases may fail. >e.g. >test x$(hostname -i) = x$(busybox hostname -i) This is just a specific instance of the problem where alternatives may not be what you want. The busybox test suite should be sure it's running busybox tools. Having spoken to a few people about this already, maybe busybox-ptest should contain a symlink farm for all the applets to the busybox binary that run-ptest can put at the front of $PATH. > 2) hostname may set to some value, e.g. qemux86-64, which is not an entry in > /etc/hosts >This results in lookup failure when using `hostname -f' as there's no > entry in /etc/hosts. Let's fix the hostname setup so hosts is correct too. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe for here-doc
== Series Details == Series: linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe for here-doc Revision: 1 URL : https://patchwork.openembedded.org/series/15016/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Patch[v2] linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe for here-doc Issue Commit shortlog is too long [test_shortlog_length] Suggested fixEdit shortlog so that it is 90 characters or less (currently 96 characters) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] linux-libc-headers: Fix build failure by using fixed temporary file instead of pipe for here-doc
From: He Zhe This is a workaround for the following possible build failure. *** Compiler lacks asm-goto support.. Stop. When building linux-libc-headers we need to use binutils on build machine. binutils v2.31 introduces a bug that could cause scripts/gcc-goto.sh to fail when running in an environment where /tmp is rarely used, e.g. in docker. Signed-off-by: He Zhe --- v2: Improve commit log ...-fixed-temporary-file-instead-of-pipe-for.patch | 68 ++ .../linux-libc-headers/linux-libc-headers_4.18.bb | 4 ++ 2 files changed, 72 insertions(+) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch new file mode 100644 index 000..345c788 --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch @@ -0,0 +1,68 @@ +From 3bbea65e11918f8753e8006a2198b999cdb0af58 Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Wed, 21 Nov 2018 15:12:43 +0800 +Subject: [PATCH] scripts: Use fixed temporary file instead of pipe for + here-doc + +There was a bug of "as" in binutils that when it checks if the input file and +output file are the same one, it would not check if they are on the same block +device. The check is introduced by the following commit in v2.31. + +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=67f846b59b32f3d704c601669409c2584383fea9 + +The here-doc usage in this script creates temporary file in /tmp. When we run in +an environment where /tmp has rarely been used, the newly created temporary file +may have a very low inode number. If the inode number was 6 which is the same as +/dev/null, the as would wrongly think the input file and the output file are the +same and report the following error. + +*** Compiler lacks asm-goto support.. Stop. + +One observed case happened in docker where the /tmp could be so rarely used that +very low number inode may be allocated and triggers the error. + +The fix below for the bug only exists on the master branch of binutils so far +and has not been released from upstream. As the convict is introduced since +v2.31, only v2.31 is affected. + +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=2a50366ded329bfb39d387253450c9d5302c3503 + +When building linux-libc-headers we need to use "as" in binutils which does not +contain the fix for the moment. To work around the error, we create a fixed +temporary file to contain the program being tested. + +This patch also removes ">/dev/null 2>&1" so we will have more direct error +information in case something else wrong happened. + +Upstream-Status: Inappropriate [A work around for binutils v2.31] + +Signed-off-by: He Zhe +--- + scripts/gcc-goto.sh | 7 ++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh +index 083c526..0aaf1b4 100755 +--- a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh +@@ -3,7 +3,9 @@ + # Test for gcc 'asm goto' support + # Copyright (C) 2010, Jason Baron + +-cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y" ++TMPFILE=`mktemp -p .` ++ ++cat << "END" > ${TMPFILE} + int main(void) + { + #if defined(__arm__) || defined(__aarch64__) +@@ -20,3 +22,6 @@ entry: + return 0; + } + END ++ ++$@ -x c ${TMPFILE} -c -o /dev/null && echo "y" ++rm ${TMPFILE} +-- +2.7.4 + diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb index eb7bee7..00420aa 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb @@ -9,5 +9,9 @@ SRC_URI_append_libc-musl = "\ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " +SRC_URI_append = "\ +file://0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch \ +" + SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9" SRC_URI[sha256sum] = "19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] musl: Update to latest trunk
On Wed, 2018-11-21 at 09:32 +, Richard Purdie wrote: > On Mon, 2018-11-19 at 09:27 -0800, Khem Raj wrote: > > Complete changelogs are here > > > > https://git.musl-libc.org/cgit/musl/log/?qt=range=c50985d5c8e316c5c464f352e79eeebfed1121a9..79f653c6bc2881dd6855299c908a442f56cb7c2b > > > > Signed-off-by: Khem Raj > > --- > > meta/recipes-core/musl/musl_git.bb | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > This seemed to have a segfault in exportfs: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/27/builds/231/steps/7/logs/step1c > > Will rerun and see if it reproduces... It reproduces: https://autobuilder.yoctoproject.org/typhoon/#/builders/27/builds/232/steps/7/logs/step1c (which is good and bad!) Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] scripts: Use fixed temporary file instead of pipe for here-doc
On Wed, 2018-11-21 at 18:21 +0800, He Zhe wrote: > > On 2018/11/21 18:07, Richard Purdie wrote: > > On Wed, 2018-11-21 at 17:39 +0800, zhe...@windriver.com wrote: > > > From: He Zhe > > > > > > A workaround for possible "*** Compiler lacks asm-goto support.. > > > Stop." > > > linux-libc-headers is built by gcc on build machine, which could > > > not > > > contain the > > > fix. > > > > > > Signed-off-by: He Zhe > > > --- > > > ...-fixed-temporary-file-instead-of-pipe-for.patch | 60 > > > ++ > > > .../linux-libc-headers/linux-libc-headers_4.18.bb | 4 ++ > > > 2 files changed, 64 insertions(+) > > > create mode 100644 meta/recipes-kernel/linux-libc-headers/linux- > > > libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of- > > > pipe- > > > for.patch > > > > How old is an "old gcc"? > > I put the full explanation in the commit log of the patch inside. No, you did not. I went and looked at the link (which I had to un-line wrap) to understand this and the problem is in binutils in the assembler (as), *not* gcc. Its also not just some "old gcc" but any current released version of binutils which is quite different. Please improve the commit message to reference binutils, not gcc, mention the current version of bintuils (2.31) and that it and all previous versions have the bug. Also please set the Upstream-Status correctly. > The fix below for the bug has not been released from upstream. Since > there has > not been gcc-cross when building linux-libc-headers, we have to use > build > machine gcc which could not contain the fix for the moment. To work > around the > error, we create a fixed temporary file to contain the program being > tested. > > https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h= > 2a50366ded329bfb39d387253450c9d5302c3503 > > > > > If this isn't going upstream, I'm not sure we want to take and > > carry > > this either. Unless this is a gcc people would commonly run into > > I'm > > tempted not to take this. > > This is a gcc issue, but the fix would not quickly goto versions > being used > by users. So this patch is used as a workaround to prevent the > failure. > > To be specific, we encountered this in docker where the /tmp could be > rarely used that very low number inode may be allocated and triggers > the error. That should also be mentioned in the commit message as that does put it in a different light. > > > > Also, your patch subject is wrong as this does not change our > > scripts > > directory. > > If this is OK, I'll send v2 to change the subject. Along with the other changes please. Thanks, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] scripts: Use fixed temporary file instead of pipe for here-doc
On 2018/11/21 18:07, Richard Purdie wrote: > On Wed, 2018-11-21 at 17:39 +0800, zhe...@windriver.com wrote: >> From: He Zhe >> >> A workaround for possible "*** Compiler lacks asm-goto support.. >> Stop." >> linux-libc-headers is built by gcc on build machine, which could not >> contain the >> fix. >> >> Signed-off-by: He Zhe >> --- >> ...-fixed-temporary-file-instead-of-pipe-for.patch | 60 >> ++ >> .../linux-libc-headers/linux-libc-headers_4.18.bb | 4 ++ >> 2 files changed, 64 insertions(+) >> create mode 100644 meta/recipes-kernel/linux-libc-headers/linux- >> libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe- >> for.patch > How old is an "old gcc"? I put the full explanation in the commit log of the patch inside. The fix below for the bug has not been released from upstream. Since there has not been gcc-cross when building linux-libc-headers, we have to use build machine gcc which could not contain the fix for the moment. To work around the error, we create a fixed temporary file to contain the program being tested. https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h= 2a50366ded329bfb39d387253450c9d5302c3503 > > If this isn't going upstream, I'm not sure we want to take and carry > this either. Unless this is a gcc people would commonly run into I'm > tempted not to take this. This is a gcc issue, but the fix would not quickly goto versions being used by users. So this patch is used as a workaround to prevent the failure. To be specific, we encountered this in docker where the /tmp could be rarely used that very low number inode may be allocated and triggers the error. > > Also, your patch subject is wrong as this does not change our scripts > directory. If this is OK, I'll send v2 to change the subject. Thanks, Zhe > > Cheers, > > Richard > > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] scripts: Use fixed temporary file instead of pipe for here-doc
On Wed, 2018-11-21 at 17:39 +0800, zhe...@windriver.com wrote: > From: He Zhe > > A workaround for possible "*** Compiler lacks asm-goto support.. > Stop." > linux-libc-headers is built by gcc on build machine, which could not > contain the > fix. > > Signed-off-by: He Zhe > --- > ...-fixed-temporary-file-instead-of-pipe-for.patch | 60 > ++ > .../linux-libc-headers/linux-libc-headers_4.18.bb | 4 ++ > 2 files changed, 64 insertions(+) > create mode 100644 meta/recipes-kernel/linux-libc-headers/linux- > libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe- > for.patch How old is an "old gcc"? If this isn't going upstream, I'm not sure we want to take and carry this either. Unless this is a gcc people would commonly run into I'm tempted not to take this. Also, your patch subject is wrong as this does not change our scripts directory. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] scripts: Use fixed temporary file instead of pipe for here-doc
From: He Zhe A workaround for possible "*** Compiler lacks asm-goto support.. Stop." linux-libc-headers is built by gcc on build machine, which could not contain the fix. Signed-off-by: He Zhe --- ...-fixed-temporary-file-instead-of-pipe-for.patch | 60 ++ .../linux-libc-headers/linux-libc-headers_4.18.bb | 4 ++ 2 files changed, 64 insertions(+) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch new file mode 100644 index 000..eca3330 --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch @@ -0,0 +1,60 @@ +From 3bbea65e11918f8753e8006a2198b999cdb0af58 Mon Sep 17 00:00:00 2001 +From: He Zhe +Date: Wed, 21 Nov 2018 15:12:43 +0800 +Subject: [PATCH] scripts: Use fixed temporary file instead of pipe for + here-doc + +There was a bug of gcc that when it checks if the input file and output file are +the same one, it would not check if they are on the same block device. + +The here-doc usage in this script creates temporary file in /tmp. When we run in +an environment where /tmp has rarely been used, the newly created temporary file +may have a very low inode number. If the inode number was 6 which is the same as +/dev/null, gcc would wrongly think the input file and the output file are the +same and report the following error. + +*** Compiler lacks asm-goto support.. Stop. + +The fix below for the bug has not been released from upstream. Since there has +not been gcc-cross when building linux-libc-headers, we have to use build +machine gcc which could not contain the fix for the moment. To work around the +error, we create a fixed temporary file to contain the program being tested. + +https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h= +2a50366ded329bfb39d387253450c9d5302c3503 + +This patch also removes ">/dev/null 2>&1" so we will have more direct error +information in case something else wrong happened. + +Upstream-Status: Inappropriate [Just a work around for old gcc] + +Signed-off-by: He Zhe +--- + scripts/gcc-goto.sh | 7 ++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh +index 083c526..0aaf1b4 100755 +--- a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh +@@ -3,7 +3,9 @@ + # Test for gcc 'asm goto' support + # Copyright (C) 2010, Jason Baron + +-cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y" ++TMPFILE=`mktemp -p .` ++ ++cat << "END" > ${TMPFILE} + int main(void) + { + #if defined(__arm__) || defined(__aarch64__) +@@ -20,3 +22,6 @@ entry: + return 0; + } + END ++ ++$@ -x c ${TMPFILE} -c -o /dev/null && echo "y" ++rm ${TMPFILE} +-- +2.7.4 + diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb index eb7bee7..00420aa 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.18.bb @@ -9,5 +9,9 @@ SRC_URI_append_libc-musl = "\ file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ " +SRC_URI_append = "\ +file://0001-scripts-Use-fixed-temporary-file-instead-of-pipe-for.patch \ +" + SRC_URI[md5sum] = "bee5fe53ee1c3142b8f0c12c0d3348f9" SRC_URI[sha256sum] = "19d8bcf49ef530cd4e364a45b4a22fa70714b70349c8100e7308488e26f1eaf1" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] musl: Update to latest trunk
On Mon, 2018-11-19 at 09:27 -0800, Khem Raj wrote: > Complete changelogs are here > https://git.musl-libc.org/cgit/musl/log/?qt=range=c50985d5c8e316c5c464f352e79eeebfed1121a9..79f653c6bc2881dd6855299c908a442f56cb7c2b > > Signed-off-by: Khem Raj > --- > meta/recipes-core/musl/musl_git.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This seemed to have a segfault in exportfs: https://autobuilder.yoctoproject.org/typhoon/#/builders/27/builds/231/steps/7/logs/step1c Will rerun and see if it reproduces... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core