[OE-core] [OE-Core][PATCH] iw: upgrade to 5.3
Separated build dir doesn't work because Makefile points out source dir.
Signed-off-by: Changhyeok Bae
---
meta/recipes-connectivity/iw/{iw_5.0.1.bb => iw_5.3.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-connectivity/iw/{iw_5.0.1.bb => iw_5.3.bb} (83%)
diff --git a/meta/recipes-connectivity/iw/iw_5.0.1.bb
b/meta/recipes-connectivity/iw/iw_5.3.bb
similarity index 83%
rename from meta/recipes-connectivity/iw/iw_5.0.1.bb
rename to meta/recipes-connectivity/iw/iw_5.3.bb
index 87b21e668d..f7f13f5a30 100644
--- a/meta/recipes-connectivity/iw/iw_5.0.1.bb
+++ b/meta/recipes-connectivity/iw/iw_5.3.bb
@@ -14,8 +14,8 @@ SRC_URI =
"http://www.kernel.org/pub/software/network/iw/${BP}.tar.gz \
file://separate-objdir.patch \
"
-SRC_URI[md5sum] = "a0a17ab1b20132c716bba9a4f9974ba6"
-SRC_URI[sha256sum] =
"36fc7592dde7bec934df83cd53ef1f2c08ceec5cd58d07eb8f71cc6e8464013c"
+SRC_URI[md5sum] = "6d4d1c0ee34f3a7bda0e6aafcd7aaf31"
+SRC_URI[sha256sum] =
"175abbfce86348c0b70e778c13a94c0bfc9abc7a506d2bd608261583aeedf64a"
inherit pkgconfig
@@ -26,7 +26,6 @@ EXTRA_OEMAKE = "\
'SBINDIR=${sbindir}' \
'MANDIR=${mandir}' \
"
-B = "${WORKDIR}/build"
do_install() {
oe_runmake 'DESTDIR=${D}' install
--
2.23.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/13] bitbake.conf: drop FETCHCMD, GITDIR, etc fetcher over-rides
This completes cleanup originally proposed in 2012:
http://lists.openembedded.org/pipermail/openembedded-core/2012-July/064224.html
Current versions of bitbake have "sane" default fetcher commands
so it's no longer necessary for bitbake.conf to over-ride them.
Signed-off-by: Andre McCurdy
---
meta/conf/bitbake.conf | 12
1 file changed, 12 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1311e6b..a0a7f49 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -360,12 +360,6 @@ CACHE = "${TMPDIR}/cache${@['', '/' +
str(d.getVar('MACHINE'))][bool(d.getVar('M
# The persistent cache should be shared by all builds
PERSISTENT_DIR = "${TOPDIR}/cache"
LOG_DIR = "${TMPDIR}/log"
-CO_DIR = "${DL_DIR}"
-CVSDIR = "${CO_DIR}/cvs"
-SVNDIR = "${CO_DIR}/svn"
-GITDIR = "${CO_DIR}/git2"
-BZRDIR = "${CO_DIR}/bzr"
-HGDIR = "${CO_DIR}/hg"
STAMPS_DIR ?= "${TMPDIR}/stamps"
STAMP = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
@@ -676,12 +670,6 @@ SRC_URI[vardepsexclude] += "\
# export DEBIAN_MIRROR = "http://ftp.de.debian.org/debian/pool;
# into your local.conf
-FETCHCMD_svn = "/usr/bin/env svn --non-interactive --trust-server-cert"
-FETCHCMD_cvs = "/usr/bin/env cvs"
-FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 --passive-ftp
--no-check-certificate"
-FETCHCMD_bzr = "/usr/bin/env bzr"
-FETCHCMD_hg = "/usr/bin/env hg"
-
SRCDATE = "${DATE}"
SRCREV ??= "INVALID"
AUTOREV = "${@bb.fetch2.get_autorev(d)}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/13] tune-arm1136jf-s.inc: add hardfloat support
Signed-off-by: Andre McCurdy
---
meta/conf/machine/include/tune-arm1136jf-s.inc | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc
b/meta/conf/machine/include/tune-arm1136jf-s.inc
index d883eba..b25995d 100644
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/meta/conf/machine/include/tune-arm1136jf-s.inc
@@ -6,8 +6,11 @@ TUNEVALID[arm1136jfs] = "Enable arm1136jfs specific processor
optimizations"
TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1136jfs', '
-mcpu=arm1136jf-s', '', d)}"
MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1136jfs',
'armv6:', '' ,d)}"
-AVAILTUNES += "arm1136jfs"
+AVAILTUNES += "arm1136jfs arm1136jfshf"
ARMPKGARCH_tune-arm1136jfs = "arm1136jfs"
+ARMPKGARCH_tune-arm1136jfshf = "arm1136jfs"
# mcpu is used so don't use armv6 as we don't want march
TUNE_FEATURES_tune-arm1136jfs = "arm arm1136jfs"
+TUNE_FEATURES_tune-arm1136jfshf = "${TUNE_FEATURES_tune-arm1136jfs}
callconvention-hard"
PACKAGE_EXTRA_ARCHS_tune-arm1136jfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6}
arm1136jfs-vfp"
+PACKAGE_EXTRA_ARCHS_tune-arm1136jfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf}
arm1136jfshf-vfp"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/13] tune-ep9312.inc: fix TUNEVALID description
Signed-off-by: Andre McCurdy
---
meta/conf/machine/include/tune-ep9312.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/machine/include/tune-ep9312.inc
b/meta/conf/machine/include/tune-ep9312.inc
index 4d92821..be20eb3 100644
--- a/meta/conf/machine/include/tune-ep9312.inc
+++ b/meta/conf/machine/include/tune-ep9312.inc
@@ -2,7 +2,7 @@ DEFAULTTUNE ?= "ep9312"
require conf/machine/include/arm/arch-armv4.inc
-TUNEVALID[ep9312] = "Enable Intel PXA27x specific processor optimizations"
+TUNEVALID[ep9312] = "Enable Cirrus Logic EP9312 specific processor
optimizations"
TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', '
-march=ep9312 -mcpu=ep9312', '', d)}"
MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', 'armv4:',
'' ,d)}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/13] tune-arm1176jz-s.inc: add support for arm1176jz-s CPU specific tuning
Signed-off-by: Andre McCurdy
---
meta/conf/machine/include/tune-arm1176jz-s.inc | 17 +
1 file changed, 17 insertions(+)
create mode 100644 meta/conf/machine/include/tune-arm1176jz-s.inc
diff --git a/meta/conf/machine/include/tune-arm1176jz-s.inc
b/meta/conf/machine/include/tune-arm1176jz-s.inc
new file mode 100644
index 000..c741e80
--- /dev/null
+++ b/meta/conf/machine/include/tune-arm1176jz-s.inc
@@ -0,0 +1,17 @@
+DEFAULTTUNE ?= "arm1176jzs"
+
+require conf/machine/include/arm/arch-armv6.inc
+
+TUNEVALID[arm1176jzs] = "Enable arm1176jzs specific processor optimizations"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzs', '
-mcpu=arm1176jz-s', '', d)}"
+MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzs',
'armv6:', '' ,d)}"
+
+AVAILTUNES += "arm1176jzs"
+ARMPKGARCH_tune-arm1176jzs = "arm1176jzs"
+TUNE_FEATURES_tune-arm1176jzs = "arm thumb arm1176jzs"
+PACKAGE_EXTRA_ARCHS_tune-arm1176jzs =
"${PACKAGE_EXTRA_ARCHS_tune-armv6tb-novfp} arm1176jzs arm1176jzst"
+
+AVAILTUNES += "arm1176jzs-be"
+ARMPKGARCH_tune-arm1176jzs-be = "${ARMPKGARCH_tune-arm1176jzs}"
+TUNE_FEATURES_tune-arm1176jzs-be = "${TUNE_FEATURES_tune-arm1176jzs} bigendian"
+PACKAGE_EXTRA_ARCHS_tune-arm1176jzs-be =
"${PACKAGE_EXTRA_ARCHS_tune-armv6tb-novfp} arm1176jzsb arm1176jzstb"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/13] rootfs-postcommands.bbclass: add inittab tweak to read_only_rootfs_hook()
It's not clear that we actually need to call mount -o remount,XX from
the busybox-inittab inittab at all, but as we currently do, let's
respect read-only-rootfs in IMAGE_FEATURES and not remount / as rw.
Signed-off-by: Andre McCurdy
---
meta/classes/rootfs-postcommands.bbclass | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/classes/rootfs-postcommands.bbclass
b/meta/classes/rootfs-postcommands.bbclass
index 6cec23e..fc33816 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -95,6 +95,11 @@ read_only_rootfs_hook () {
sed -i -e
'/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}'
${IMAGE_ROOTFS}/etc/fstab
fi
+ # Tweak the "mount -o remount,rw /" command in busybox-inittab inittab
+ if [ -f ${IMAGE_ROOTFS}/etc/inittab ]; then
+ sed -i 's|/bin/mount -o remount,rw /|/bin/mount -o remount,ro
/|' ${IMAGE_ROOTFS}/etc/inittab
+ fi
+
# If we're using openssh and the /etc/ssh directory has no
pre-generated keys,
# we should configure openssh to use the configuration file
/etc/ssh/sshd_config_readonly
# and the keys under /var/run/ssh.
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/13] feature-arm-thumb.inc: fix ARM_THUMB_SUFFIX
Since TUNE_FEATURES now either contains a CPU or an architecture (but
not both) we can't rely on finding the architecture in TUNE_FEATURES.
Use architecture specific over-rides instead.
Signed-off-by: Andre McCurdy
---
meta/conf/machine/include/arm/feature-arm-thumb.inc | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc
b/meta/conf/machine/include/arm/feature-arm-thumb.inc
index 0b47cca..bae169d 100644
--- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
+++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
@@ -1,8 +1,6 @@
TUNEVALID[thumb] = "Support Thumb instructions"
-ARM_THUMB_SUFFIX = "${@bb.utils.contains_any('TUNE_FEATURES', 'armv4 armv5
armv6', 't', 't2', d)}"
-
# If the device supports ARM, then respect ARM_THUMB_OPT (which can be "arm"
or "thumb")
# If the device doesn't support ARM, then always set "thumb" even when
# some recipe explicitly sets ARM_INSTRUCTION_SET to "arm"
@@ -23,6 +21,11 @@ python () {
TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '
-m${ARM_M_OPT}', '', d)}"
+ARM_THUMB_SUFFIX = "t2"
+ARM_THUMB_SUFFIX_armv4 = "t"
+ARM_THUMB_SUFFIX_armv5 = "t"
+ARM_THUMB_SUFFIX_armv6 = "t"
+
# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set
ARM_M_OPT to thumb
ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb',
'${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT') == 'thumb' else ''}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/13] packagegroup-core-boot: drop duplicate MACHINE_ESSENTIAL_EXTRA_RDEPENDS, etc
Default values for MACHINE_ESSENTIAL_EXTRA_RDEPENDS and
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS are set from bitbake.conf and so
don't need to be duplicated in the packagegroup-core-boot recipe.
Signed-off-by: Andre McCurdy
---
meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 6 --
1 file changed, 6 deletions(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 3a2f50f..abbee14 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -10,12 +10,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
-#
-# Set by the machine configuration with packages essential for device bootup
-#
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
-
# Distro can override the following VIRTUAL-RUNTIME providers:
VIRTUAL-RUNTIME_dev_manager ?= "udev"
VIRTUAL-RUNTIME_keymaps ?= "keymaps"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/13] glibc: drop obsolete packaging of glibc libnsl libs
Packaging rules were left behind when libnsl was removed:
https://git.openembedded.org/openembedded-core/commit/?id=9dc9983901cec364ea57a72b9da1a0396b60663a
Signed-off-by: Andre McCurdy
---
meta/recipes-core/glibc/glibc-package.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/glibc/glibc-package.inc
b/meta/recipes-core/glibc/glibc-package.inc
index f796876..a0df267 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -14,7 +14,7 @@ RPROVIDES_glibc-extra-nss = "eglibc-extra-nss"
RPROVIDES_glibc-thread-db = "eglibc-thread-db"
RPROVIDES_${PN}-pcprofile = "eglibc-pcprofile"
RPROVIDES_${PN}-dbg = "eglibc-dbg"
-libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so
${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so
${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.*
${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.*
${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.*
${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.*
${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.*
${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.*
${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.*
${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.*
${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.*
${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.*
${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.*
${base_libdir}/libBrokenLocale-*.so"
+libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so
${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/libmvec-*.so
${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.*
${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.*
${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.*
${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.*
${base_libdir}/libutil-*.so ${base_libdir}/libnss_files*.so.*
${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.*
${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.*
${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.*
${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.*
${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.*
${base_libdir}/libBrokenLocale-*.so"
ARCH_DYNAMIC_LOADER = ""
# The aarch64 ABI says the dynamic linker -must- be
# /lib/ld-linux-aarch64{,_be}.so.1. With usrmerge, that may mean that
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [warrior][PATCH v2] patch: fix CVE-2019-13638
On 8/8/19 4:16 PM, Randy MacLeod wrote:
On 8/8/19 10:26 AM, Trevor Gamblin wrote:
From: Trevor Gamblin
Signed-off-by: Trevor Gamblin
---
...ke-ed-directly-instead-of-using-the-shell.patch | 44
++
meta/recipes-devtools/patch/patch_2.7.6.bb | 2 +
2 files changed, 46 insertions(+)
create mode 100644
meta/recipes-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch
diff --git
a/meta/recipes-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch
b/meta/recipes-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch
new file mode 100644
index 000..f60dfe8
--- /dev/null
+++
b/meta/recipes-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch
@@ -0,0 +1,44 @@
+From 3fcd042d26d70856e826a42b5f93dc4854d80bf0 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher
+Date: Fri, 6 Apr 2018 19:36:15 +0200
+Subject: [PATCH] Invoke ed directly instead of using the shell
+
+* src/pch.c (do_ed_script): Invoke ed directly instead of using a shell
+command to avoid quoting vulnerabilities.
+
+CVE: CVE-2019-13638
+Upstream-Status:
Backport[https://git.savannah.gnu.org/cgit/patch.git/patch/?id=3fcd042d26d70856e826a42b5f93dc4854d80bf0]
+Signed-off-by: Trevor Gamblin
+
+---
+ src/pch.c | 6 ++
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+
+diff --git a/src/pch.c b/src/pch.c
+index 4fd5a05..16e001a 100644
+--- a/src/pch.c
b/src/pch.c
+@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char const
*outname,
+ *outname_needs_removal = true;
+ copy_file (inname, outname, 0, exclusive, instat.st_mode,
true);
+ }
+- sprintf (buf, "%s %s%s", editor_program,
+- verbosity == VERBOSE ? "" : "- ",
+- outname);
+ fflush (stdout);
+
+ pid = fork();
+@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char const
*outname,
+ else if (pid == 0)
+ {
+ dup2 (tmpfd, 0);
+- execl ("/bin/sh", "sh", "-c", buf, (char *) 0);
++ assert (outname[0] != '!' && outname[0] != '-');
++ execlp (editor_program, editor_program, "-", outname,
(char *) NULL);
+ _exit (2);
+ }
+ else
+--
+2.7.4
+
diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb
b/meta/recipes-devtools/patch/patch_2.7.6.bb
index 85b0db7..8908910 100644
--- a/meta/recipes-devtools/patch/patch_2.7.6.bb
+++ b/meta/recipes-devtools/patch/patch_2.7.6.bb
@@ -6,6 +6,8 @@ SRC_URI +=
"file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
file://0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch \
file://0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch \
file://0001-Fix-swapping-fake-lines-in-pch_swap.patch \
+ file://CVE-2019-13636.patch \
+ file://0001-Invoke-ed-directly-instead-of-using-the-shell.patch \
"
Odd, you only added one patch but you changed two lines above.
I assume this is due to a merge conflict that you incorrectly resolved.
If you apply this commit on warrior, you see:
WARNING: patch-2.7.6-r0 do_fetch: Failed to fetch URL
file://CVE-2019-13636.patch, attempting MIRRORS if available
ERROR: patch-2.7.6-r0 do_fetch: Fetcher failure: Unable to find file
file://CVE-2019-13636.patch anywhere. The paths that were searched were:
Fix and v3 please.
Patches are currently under review for both warrior
[OE-core] [PATCH 12/13] sqlite3: make CFLAGS consistent across native, nativesdk and target cases
The previous simplification:
https://git.openembedded.org/openembedded-core/commit/?id=604777acfc54d285f315b622bd147ed02d55d6fd
looked OK but didn't actually work as expected. The native and
nativesdk classes re-set CFLAGS after the += has been applied and
so any modifications made via += are lost. Use _append instead.
Signed-off-by: Andre McCurdy
---
meta/recipes-support/sqlite/sqlite3.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/sqlite/sqlite3.inc
b/meta/recipes-support/sqlite/sqlite3.inc
index 7cf23d0..044af5e 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -47,10 +47,10 @@ EXTRA_OECONF = " \
CFLAGS_append = " -fPIC"
# pread() is in POSIX.1-2001 so any reasonable system must surely support it
-CFLAGS += "-DUSE_PREAD"
+CFLAGS_append = " -DUSE_PREAD"
# Provide column meta-data API
-CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA"
+CFLAGS_append = " -DSQLITE_ENABLE_COLUMN_METADATA"
PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg
lib${BPN}-staticdev ${PN}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/13] sqlite3: explicitly set target endian-ness
Unless SQLITE_BYTEORDER is predefined, the code falls back to build
time huristics - which are not always correct (e.g. in sqlite 3.28.0
big-endian ARM is mis-detected).
Signed-off-by: Andre McCurdy
---
meta/recipes-support/sqlite/sqlite3.inc | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-support/sqlite/sqlite3.inc
b/meta/recipes-support/sqlite/sqlite3.inc
index 044af5e..4af1e09 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -19,7 +19,7 @@ UPSTREAM_CHECK_REGEX =
"releaselog/(?P(\d+[\.\-_]*)+)\.html"
CVE_PRODUCT = "sqlite"
-inherit autotools pkgconfig
+inherit autotools pkgconfig siteinfo
# enable those which are enabled by default in configure
PACKAGECONFIG ?= "fts4 fts5 json1 rtree dyn_ext"
@@ -52,6 +52,10 @@ CFLAGS_append = " -DUSE_PREAD"
# Provide column meta-data API
CFLAGS_append = " -DSQLITE_ENABLE_COLUMN_METADATA"
+# Unless SQLITE_BYTEORDER is predefined, the code falls back to build time
+# huristics, which are not always correct
+CFLAGS_append = " ${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le',
'-DSQLITE_BYTEORDER=1234', '-DSQLITE_BYTEORDER=4321', d)}"
+
PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg
lib${BPN}-staticdev ${PN}"
FILES_${PN} = "${bindir}/*"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/13] base-files: nsswitch.conf is glibc specific
Signed-off-by: Andre McCurdy
---
meta/recipes-core/base-files/base-files_3.0.14.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb
b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 4b4027f..2b1f217 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -129,7 +129,6 @@ do_install () {
install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells
install -m 0755 ${WORKDIR}/share/dot.profile
${D}${sysconfdir}/skel/.profile
install -m 0755 ${WORKDIR}/share/dot.bashrc
${D}${sysconfdir}/skel/.bashrc
- install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf
install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd
@@ -142,6 +141,10 @@ do_install () {
fi
}
+do_install_append_libc-glibc () {
+ install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
+}
+
DISTRO_VERSION[vardepsexclude] += "DATE"
do_install_basefilesissue () {
install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/13] dropbear: don't create invalid symlinks if ssh, scp, etc are disabled
Signed-off-by: Andre McCurdy
---
meta/recipes-core/dropbear/dropbear.inc | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/dropbear/dropbear.inc
b/meta/recipes-core/dropbear/dropbear.inc
index dcbda74..7269888 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -70,8 +70,13 @@ do_install() {
install -m 0644 ${WORKDIR}/dropbear.default
${D}${sysconfdir}/default/dropbear
install -m 0755 dropbearmulti ${D}${sbindir}/
- ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
+ for i in ${BINCOMMANDS}
+ do
+ # ssh and scp symlinks are created by update-alternatives
+ if [ $i = ssh ] || [ $i = scp ]; then continue; fi
+ ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
+ done
for i in ${SBINCOMMANDS}
do
ln -s ./dropbearmulti ${D}${sbindir}/$i
@@ -101,7 +106,7 @@ do_install() {
inherit update-alternatives
ALTERNATIVE_PRIORITY = "20"
-ALTERNATIVE_${PN} = "scp ssh"
+ALTERNATIVE_${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}"
ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti"
@@ -113,3 +118,5 @@ pkg_postrm_append_${PN} () {
rm ${sysconfdir}/dropbear/dropbear_dss_host_key
fi
}
+
+FILES_${PN} += "${bindir}"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/13] update-rc.d.bbclass: support VIRTUAL-RUNTIME_init_manager == busybox
Signed-off-by: Andre McCurdy
---
meta/classes/update-rc.d.bbclass | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 1366fee..bf86bfa 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -1,6 +1,13 @@
UPDATERCPN ?= "${PN}"
-DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES',
'sysvinit', ' update-rc.d initscripts', '', d)}"
+def get_target_depends(d):
+if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
+return 'update-rc.d initscripts'
+if d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox':
+return 'update-rc.d'
+return ''
+
+DEPENDS_append_class-target = " ${@get_target_depends(d)}"
UPDATERCD = "update-rc.d"
UPDATERCD_class-cross = ""
@@ -50,7 +57,6 @@ if ${@use_updatercd(d)} && type update-rc.d >/dev/null
2>/dev/null; then
fi
}
-
def update_rc_after_parse(d):
if d.getVar('INITSCRIPT_PACKAGES', False) == None:
if d.getVar('INITSCRIPT_NAME', False) == None:
@@ -62,7 +68,12 @@ python __anonymous() {
update_rc_after_parse(d)
}
-PACKAGESPLITFUNCS_prepend = "${@bb.utils.contains('DISTRO_FEATURES',
'sysvinit', 'populate_packages_updatercd ', '', d)}"
+def get_packagesplit_funcs(d):
+if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) or
d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox':
+return 'populate_packages_updatercd'
+return ''
+
+PACKAGESPLITFUNCS_prepend = "${@get_packagesplit_funcs(d)} "
PACKAGESPLITFUNCS_remove_class-nativesdk = "populate_packages_updatercd "
populate_packages_updatercd[vardeps] += "updatercd_prerm updatercd_postrm
updatercd_postinst"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [OE-Core][PATCH] iputils: upgrade to s20190709
build system is changed to meson.
Signed-off-by: Changhyeok Bae
---
.../iputils/iputils/ai_canonidn.patch | 58 --
.../iputils/iputils/install.patch | 26
.../iputils/iputils_s20180629.bb | 61 ---
.../iputils/iputils_s20190709.bb | 55 +
4 files changed, 55 insertions(+), 145 deletions(-)
delete mode 100644 meta/recipes-extended/iputils/iputils/ai_canonidn.patch
delete mode 100644 meta/recipes-extended/iputils/iputils/install.patch
delete mode 100644 meta/recipes-extended/iputils/iputils_s20180629.bb
create mode 100644 meta/recipes-extended/iputils/iputils_s20190709.bb
diff --git a/meta/recipes-extended/iputils/iputils/ai_canonidn.patch
b/meta/recipes-extended/iputils/iputils/ai_canonidn.patch
deleted file mode 100644
index cd91267b78..00
--- a/meta/recipes-extended/iputils/iputils/ai_canonidn.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 714e2b458c151c5bdfe93647445cd00dd8e36fff Mon Sep 17 00:00:00 2001
-From: Petr Vorel
-Date: Sat, 21 Jul 2018 17:46:14 +0200
-Subject: [PATCH] ping: Fix AI_CANONIDN usage on some systems
-
-Upstream-Status: Backport
-Signed-off-by: Ross Burton
-
-Commit 99f67db used AI_CANONIDN in a way, which broke compilation on
-systems where AI_CANONIDN is not defined in netdb.h (e.g. glibc < 2.3.4,
-alternative libcs that don't support IDN: e.g. current musl 1.1.19 and
-uClibc-ng 1.0.30) when not using the system libidn2.
-
-Fixes: 99f67db ping: Fix ping name encoded using ACE on C locale
-
-Reported-by: Nicholas Fish
-Signed-off-by: Petr Vorel
-
- ping.c | 2 +-
- ping.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ping.c b/ping.c
-index 733477f..b241815 100644
a/ping.c
-+++ b/ping.c
-@@ -207,9 +207,9 @@ main(int argc, char **argv)
-
- #ifdef USE_IDN
- setlocale(LC_ALL, "");
--#endif
- if (!strcmp(setlocale(LC_ALL, NULL), "C"))
- hints.ai_flags &= ~ AI_CANONIDN;
-+#endif
-
- /* Support being called using `ping4` or `ping6` symlinks */
- if (argv[0][strlen(argv[0])-1] == '4')
-diff --git a/ping.h b/ping.h
-index 3e09685..8a0c4ef 100644
a/ping.h
-+++ b/ping.h
-@@ -28,7 +28,6 @@
- #include
- #include
- #include
--#include
-
- #ifdef CAPABILITIES
- #include
-@@ -36,6 +35,7 @@
- #endif
-
- #ifdef USE_IDN
-+#include
- #include
- #define getaddrinfo_flags (AI_CANONNAME | AI_IDN | AI_CANONIDN)
- #define getnameinfo_flags NI_IDN
diff --git a/meta/recipes-extended/iputils/iputils/install.patch
b/meta/recipes-extended/iputils/iputils/install.patch
deleted file mode 100644
index abfefd7a58..00
--- a/meta/recipes-extended/iputils/iputils/install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5c8c3b04d73304679340f893636e87691992053b Mon Sep 17 00:00:00 2001
-From: Ross Burton
-Date: Mon, 23 Jul 2018 14:21:03 +0100
-Subject: [PATCH] Add install
-
-Add a simple install rule so that we always install the binaries that were
built.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton
-
- Makefile | 4
- 1 file changed, 4 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 17fc5c9..e0c2784 100644
a/Makefile
-+++ b/Makefile
-@@ -231,3 +231,7 @@ rpm:
- @$(RPMBUILD) -ta --define 'current yes' $(RPMTMP)/iputils.tar.bz2
- @rm -f $(RPMTMP)/iputils.tar.bz2
-
-+install:
-+ for t in $(TARGETS); do \
-+ install -D $$t $(DESTDIR)$(bindir)/$$t; \
-+ done
diff --git a/meta/recipes-extended/iputils/iputils_s20180629.bb
b/meta/recipes-extended/iputils/iputils_s20180629.bb
deleted file mode 100644
index eff44be1bd..00
--- a/meta/recipes-extended/iputils/iputils_s20180629.bb
+++ /dev/null
@@ -1,61 +0,0 @@
-SUMMARY = "Network monitoring tools"
-DESCRIPTION = "Utilities for the IP protocol, including traceroute6, \
-tracepath, tracepath6, ping, ping6 and arping."
-HOMEPAGE = "https://github.com/iputils/iputils;
-SECTION = "console/network"
-
-LICENSE = "BSD & GPLv2+"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=b792e38abdc59f766a3153908f23e766 \
-file://LICENSE.BSD3;md5=0f00d99239d922ffd13cabef83b33444 \
-file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-DEPENDS = "gnutls libcap libgcrypt"
-
-SRC_URI = "git://github.com/iputils/iputils \
- file://ai_canonidn.patch \
- file://install.patch"
-SRCREV = "f6aac8dbe3f8c45c53424854a3312bdd8cdd58d3"
-
-S = "${WORKDIR}/git"
-
-UPSTREAM_CHECK_GITTAGREGEX = "(?Ps\d+)"
-
-EXTRA_OEMAKE = "-e MAKEFLAGS="
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[libidn] = "USE_IDN=yes,USE_IDN=no,libidn2"
-
-do_compile () {
- oe_runmake 'CC=${CC} -D_GNU_SOURCE'
VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}"
${PACKAGECONFIG_CONFARGS} all
-}
-
-do_install() {
- oe_runmake DESTDIR=${D} bindir=${base_bindir} install
- for b in ping traceroute6 clockdiff; do
- chmod u+s ${D}${base_bindir}/$b
- done
-}
-
[OE-core] [PATCH] subversion:upgrade 1.12.0 -> 1.12.2
-subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch
Removed since this is included in 1.12.2.
Signed-off-by: Zang Ruochen
---
.../subversion-1.12.0-apr_1.7.0_fix-1.patch| 107 -
.../{subversion_1.12.0.bb => subversion_1.12.2.bb} | 5 +-
2 files changed, 2 insertions(+), 110 deletions(-)
delete mode 100644
meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch
rename meta/recipes-devtools/subversion/{subversion_1.12.0.bb =>
subversion_1.12.2.bb} (94%)
diff --git
a/meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch
b/meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch
deleted file mode 100644
index f0edd5f..000
---
a/meta/recipes-devtools/subversion/subversion/subversion-1.12.0-apr_1.7.0_fix-1.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From b147803553237654f8268e831dee8fed4989ad3b Mon Sep 17 00:00:00 2001
-From: Hongxu Jia
-Date: Sat, 11 May 2019 14:46:39 +0800
-Subject: [PATCH] Submitted By: Pierre Labastie (pierre dot labastie at neuf
- dot fr) Date: 2019-04-17 Initial Package Version: 1.11.1 Origin: Upstream
- revision 1857391 Upstream Status: Committed Description: Get rid of
- apr_int64_t format string check in swig py configure.
-
-This check relied on APR implementation details and broke with APR 1.7.0.
-Rather than trying to guess a perfect format string to use, just use the
-largest possible format and cast the argument accordingly.
-
-Should fix build against APR 1.7.0 and later.
-
-Suggested by: brane
-
-* build/ac-macros/swig.m4: Remove code related to SVN_APR_INT64_T_PYCFMT.
-
-* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
- (svn_swig_py_client_blame_receiver_func): Stop relying on the
- SVN_APR_INT64_T_PYCFMT constant from configure. Use "L" and
- acast to PY_LONG_LONG instead.
-
-Upstream-Status: Backport
[www.linuxfromscratch.org/patches/blfs/svn/subversion-1.12.0-apr_1.7.0_fix-1.patch]
-
-Signed-off-by: Hongxu Jia
- build/ac-macros/swig.m4| 35 --
- .../swig/python/libsvn_swig_py/swigutil_py.c | 9 +++---
- 2 files changed, 4 insertions(+), 40 deletions(-)
-
-diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4
-index 55501fb..2963872 100644
a/build/ac-macros/swig.m4
-+++ b/build/ac-macros/swig.m4
-@@ -128,41 +128,6 @@ AC_DEFUN(SVN_FIND_SWIG,
- ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
- ])
- SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`"
--
--dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT
--dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT
--dnl thus the egrep patterns have a + in them.
--SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
--AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
-- [svn_cv_pycfmt_apr_int64_t], [
-- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
--AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
-- [#include
-- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
-- [svn_cv_pycfmt_apr_int64_t="L"])
-- fi
-- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
--AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
-- [#include
-- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
-- [svn_cv_pycfmt_apr_int64_t="l"])
-- fi
-- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
--AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd],
-- [#include
-- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
-- [svn_cv_pycfmt_apr_int64_t="i"])
-- fi
--])
--CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
--if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
-- AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform])
--fi
--AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT],
-- ["$svn_cv_pycfmt_apr_int64_t"],
-- [Define to the Python/C API format character suitable]
-- [ for apr_int64_t])
- fi
-
- if test "$PERL" != "none"; then
-diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
-index 2c90a6a..abe5a2a 100644
a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
-+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
-@@ -46,7 +46,7 @@
- #include "svn_mergeinfo.h"
- #include "svn_types.h"
-
--#include "svn_private_config.h" /* for SVN_APR_INT64_T_PYCFMT */
-+#include "svn_private_config.h"
-
- #include "swig_python_external_runtime.swg"
- #include "swigutil_py.h"
-@@ -3394,10 +3394,9 @@ svn_error_t
*svn_swig_py_client_blame_receiver_func(void *baton,
- svn_swig_py_acquire_py_lock();
-
- if ((result =
[OE-core] [PATCH 0/6] YOCTO #12937 - Consistent naming scheme for deployed artifacts
Let me explain a bit what these changes do for us in LGE. We have jenkins jobs for CI as well for official releases. All built artifacts are moved from jenkins builder to fileserver after the build. Each jobs have some identifier which is then included in the filenames of all relevant build artifacts, e.g. CI jobs will add e.g. lgsvl-verf-12 to show where it was created and what build created it (12 is BUILD_NUMBER from jenkins, verf is type of build, lgsvl is location). To do this you can already use IMAGE_VERSION_SUFFIX variable and add this as a suffix to current artifact names. But that has some bad limitations. A) If you keep IMAGE_VERSION_SUFFIX in do_deploy signatures, then the artifacts will be rebuilt even when the deploy sstate archive in cache is identical except tha filename. We had this for a while, but all CI jobs were slow, because of rebuilding kernel every single time. B) If you vardepexclude IMAGE_VERSION_SUFFIX from the tasks which use it, you get faster CI builds, but with inconsistent artifact names when kernel deploy sstate is reused, e.g. image will have lgsvl-verf-12 but all kernel artifacts will end with lgsvl-verf-11, when the kernel do_deploy was reused from previously built sstate-cache It gets even worse with B) when you have some other tooling (like runtime testing farm) which is tasked to flash image and kernel from lgsvl-verf-12 and it fails to find kernel image to flash, because it's named differently. C) Using version-less artifacts and just storing them in different directories might work better, but then it would make sense to include IMAGE_VERSION_SUFFIX in DEPLOY_DIR_IMAGE and remove it from the actual files inside (with version-less symlinks pointing to them). But this is a bit problematic when the individual images are usually downloaded by BFUs over http (and they end with various identically named files for which they don't remember from where they came). So this was the motivation why we have this in webOS. The difference for you (most people shouldn't even notice): 1) hard links instead of symlinks in DEPLOY_DIR_IMAGE, because now the version is in the *_LINK_* variables and you don't want symlink with version release-1 pointing to file created with release-2 build. 2) do_deploy, do_rootfs can still be reused from sstate, it will restore the version-less artifact and then just quicky add another hardlink with new filename (do_deploy_links task). 3) we're using this for couple years (badly hacked into OE, because we didn't want to overlay all relevant .bbclasses, but still needed to inject do_deploy_links task dependency in multiple places) and the only issue I've noticed was with one our proprietary IMAGE_FSTYPE format which was appending to image file in DEPLOY_DIR_IMAGE if it existed before, instead of overwritting it from scratch - to fix that I've just changed fstype function to remove the file before creating it again. 4) Examples: All show "ls -laih DEPLOY_DIR_IMAGE | sort" to show the symlinks and hardlinks TMPDIR is removed between each example, except the e) and f), but sstate-cache is kept in all cases and reused where possible MODULE_TARBALL_DEPLOY = "1" is added to local.conf to have more than just 1 kernel image as artifact from kernel (e.g. rpi MACHINEs have a lot of them with all the dtds). a) Current master with default values: $ ls -laih qemux86-64-master-default/ | sort 47054849 drwxr-xr-x 13 bitbake bitbake 4.0K Aug 16 16:37 .. 50735788 -rw-r--r-- 1 bitbake bitbake 612K Aug 15 17:16 grub-efi-bootx64.efi 50735796 drwxr-xr-x 2 bitbake bitbake 4.0K Aug 16 14:23 . 50741892 -rwxr-xr-x 1 bitbake bitbake 95K Aug 15 17:16 systemd-bootx64.efi 52067796 -rw-r--r-- 1 bitbake bitbake 7.6M Aug 16 14:22 bzImage--5.0.19+git2+c2e34d9ab2_00638cdd8f-r0.17-qemux86-64-20190816141126.bin 52067797 lrwxrwxrwx 1 bitbake bitbake 78 Aug 16 14:22 bzImage-qemux86-64.bin -> bzImage--5.0.19+git2+c2e34d9ab2_00638cdd8f-r0.17-qemux86-64-20190816141126.bin 52067798 lrwxrwxrwx 1 bitbake bitbake 78 Aug 16 14:22 bzImage -> bzImage--5.0.19+git2+c2e34d9ab2_00638cdd8f-r0.17-qemux86-64-20190816141126.bin 52067799 -rw-r--r-- 1 bitbake bitbake 7.0M Aug 16 14:22 modules--5.0.19+git2+c2e34d9ab2_00638cdd8f-r0.17-qemux86-64-20190816141126.tgz 52068116 lrwxrwxrwx 1 bitbake bitbake 78 Aug 16 14:22 modules-qemux86-64.tgz -> modules--5.0.19+git2+c2e34d9ab2_00638cdd8f-r0.17-qemux86-64-20190816141126.tgz 52068127 -rw-r--r-- 1 bitbake bitbake 1.3K Aug 16 14:23 core-image-minimal-qemux86-64-20190816141126.qemuboot.conf 52068128 lrwxrwxrwx 1 bitbake bitbake 58 Aug 16 14:23 core-image-minimal-qemux86-64.qemuboot.conf -> core-image-minimal-qemux86-64-20190816141126.qemuboot.conf 52068136 -rw-r--r-- 1 bitbake bitbake 162K Aug 16 14:23 core-image-minimal-qemux86-64-20190816141126.testdata.json 52068137 lrwxrwxrwx 1 bitbake bitbake 58 Aug 16 14:23 core-image-minimal-qemux86-64.testdata.json ->
[OE-core] [PATCH 2/6] bitbake.conf, kernel*.bbclass: include IMAGE_VERSION_SUFFIX only in the _LINK_NAME variables and change it to hard link
* just RFC, the part for images isn't finished yet and there is
still some issue with DATETIME when kernel artifacts are used
from sstate, this is just to validate the idea behind
[YOCTO #12937] before finishing the implementation (it's already
finished and used by various LGE builds, but having simpler
way of doing it directly in oe-core mighe be useful for others).
* move IMAGE_VERSION_SUFFIX from _NAME variables to _LINK_NAME
that way e.g. kernel.do_deploy can be reused from sstate to
provide "version-less" artifacts and then very fast
do_deploy_links task just adds links with consistent suffixes
(by default the version from the recipe but could be easily set
to e.g. some release name when building some products).
* create hard links instead of symlinks, so that whatever version
the filename says is really there
* some IMAGE_FSTYPES might need the "version-less" IMAGE_NAME file
to be removed first or they might either append or update the
content of the image instead of creating new image file from
scratch - I have seen this only with one proprietary format we
generate with our own tool, so hopefully this isn't very common
* this is basically the mechanism are using in webOS with
WEBOS_IMAGE_NAME_SUFFIX which is for official builds set from
jenkins job and then all artifacts (images as well as corresponding
kernel files) have the same version string)
* without this, you can still easily set the variables to contain
the version from jenkins job (excluded from sstate signature like
DATETIME currently is to prevent rebuilding it everytime even when
the content didn't change) but then when kernel is reused from sstate
you can have version 1.0 used on kernel artifacts and 2.0 on image
artifacts.
* if you don't exclude the version string with vardepsexclude, then
you get the right version in the filenames but for cost of
re-executing do_deploy every single time, which with rm_work will
cause all kernel tasks to be re-executed (together with everything
which depends on it like external modules etc).
* the implementation "from outside" is a bit tricky as shown in webOS
OSE, because first you need to reverse the meaning of IMAGE_NAME
and IMAGE_LINK_NAME like here, but also replace all symlinks with
hardlinks and then adjust all recipes/bbclasses to depend on our
do_deploy_fixup task instead of the original do_deploy
see the variable modifications:
https://github.com/webosose/meta-webosose/blob/a35e81622aae1066591e44a132d01297ff478248/meta-webos/conf/distro/include/webos.inc#L65
and then various bbclasses to hook do_webos_deploy_fixup task creating
the hardlinks for possible artifacts:
https://github.com/webosose/meta-webosose/blob/a35e81622aae1066591e44a132d01297ff478248/meta-webos/classes/webos_deploy.bbclass
https://github.com/webosose/meta-webosose/blob/a35e81622aae1066591e44a132d01297ff478248/meta-webos/classes/kernel.bbclass
https://github.com/webosose/meta-webosose/blob/a35e81622aae1066591e44a132d01297ff478248/meta-webos/classes/image.bbclass
so hopefully with all these changes in oe-core other project can
achieve the same just by setting one variable IMAGE_VERSION_SUFFIX
[YOCTO #12937]
Signed-off-by: Martin Jansa
kernel
---
meta/classes/cve-check.bbclass | 4 +-
meta/classes/image-artifact-names.bbclass | 4 +-
meta/classes/image.bbclass | 10 ++---
meta/classes/kernel-artifact-names.bbclass | 4 +-
meta/classes/kernel-devicetree.bbclass | 21 +--
meta/classes/kernel.bbclass| 43 --
meta/classes/qemuboot.bbclass | 2 +-
meta/classes/rootfs-postcommands.bbclass | 4 +-
8 files changed, 63 insertions(+), 29 deletions(-)
diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass
index c00d2910be..19ef51eb05 100644
--- a/meta/classes/cve-check.bbclass
+++ b/meta/classes/cve-check.bbclass
@@ -100,10 +100,10 @@ python cve_check_write_rootfs_manifest () {
if manifest_name and os.path.exists(manifest_name):
manifest_link = os.path.join(deploy_dir, "%s.cve" % link_name)
-# If we already have another manifest, update symlinks
+# If we already have another manifest, update hardlinks
if os.path.exists(os.path.realpath(manifest_link)):
os.remove(manifest_link)
-os.symlink(os.path.basename(manifest_name), manifest_link)
+os.link(manifest_name, manifest_link)
bb.plain("Image CVE report stored in: %s" % manifest_name)
}
diff --git a/meta/classes/image-artifact-names.bbclass
b/meta/classes/image-artifact-names.bbclass
index 5ab8f1b7aa..d5ba035f5a 100644
--- a/meta/classes/image-artifact-names.bbclass
+++ b/meta/classes/image-artifact-names.bbclass
@@ -5,8 +5,8 @@
IMAGE_BASENAME = "${PN}"
IMAGE_VERSION_SUFFIX = "-${DATETIME}"
IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME"
-IMAGE_NAME =
[OE-core] [PATCH 5/6] kernel.bbclass: drop unnecessary package_get_auto_pr for do_install
* do_install doesn't use whole "version" as do_deploy does, e.g.
${PKGE}-${PKGV}-${PKGR}-${MACHINE}
it installs only the files with only ${KERNEL_VERSION} in filename or
path, so it doesn't need expanded AUTOINC value in PKGV nor
EXPANDPRAUTO in PKGR like do_deploy does
* it was introduced in
http://git.openembedded.org/openembedded-core/commit/?id=1392f959cb8cd50b5a4492899e54f3ed68ef56d7
but it's not clear why it was needed back then, but doesn't seem to be
useful at all currently, only causes multiple EXTENDPRAUTO bumps every
time different linux-yocto is being built.
* There are currently 4 EXTENDPRAUTO bumps during each build as shown in
prserv:
$ sqlite3 cache/prserv.sqlite3
SQLite version 3.27.2 2019-02-25 16:06:06
Enter ".help" for usage hints.
sqlite> select * from PRMAIN_nohist where version like 'linux-yocto-dev%';
linux-yocto-dev-4.19+gitAUTOINC+57b791cb9f_122d468967-r0|qemux86|20601304a6e4fa0b7ac13fa1262040c976c862d177077799dc15492215fa51df|0
linux-yocto-dev-4.19+gitAUTOINC+57b791cb9f_122d468967-r0|qemux86|2820d331b7eba5165943bc016a1c274d42e7605e24244873b15cc1c9c6f657e2|1
linux-yocto-dev-4.19+gitAUTOINC+57b791cb9f_122d468967-r0|qemux86|4f29da98c268aa5bf1c4767bb2bb157fc6077b1d76dfd434028b18bf3252e0c0|2
linux-yocto-dev-4.19+gitAUTOINC+57b791cb9f_122d468967-r0|qemux86|23d8d17b23bc6db1dd7f0f30086f0ec6ade2b2180e787a78d89b6e43b8c4fad6|3
linux-yocto-dev-5.0~rc6+gitAUTOINC+e721b5d6ab_8b7d7ef74a-r0|qemux86|2a23d8783f794b3e79b438889ec60661ca635f9ec09d0519176a31d832377f1c|0
linux-yocto-dev-5.0~rc6+gitAUTOINC+e721b5d6ab_8b7d7ef74a-r0|qemux86|dafc2a636e7e18357b7efbf99981af45234105c3f46b056edfd2142d5a5d4993|1
linux-yocto-dev-5.0~rc6+gitAUTOINC+e721b5d6ab_8b7d7ef74a-r0|qemux86|09798369f303700fb8d42550d959e310a05fb4573b71646df51acc00d3a6fe89|2
linux-yocto-dev-5.0~rc6+gitAUTOINC+e721b5d6ab_8b7d7ef74a-r0|qemux86|dab07eb869034df28be59ae13914989ab88bdca5a9a9362ca96b4eb38180afd7|3
the TASKHASHes correspond to do_install, do_package, do_deploy,
do_deploy_links tasks:
$ ls
tmp-glibc/stamps/qemux86-webos-linux/linux-yocto-dev/5.0~rc6+gitAUTOINC+e721b5d6ab_8b7d7ef74a-r0.do_*sigdata*{2a23d8783f794b3e79b438889ec60661ca635f9ec09d0519176a31d832377f1c,dafc2a636e7e18357b7efbf99981af45234105c3f46b056edfd2142d5a5d4993,09798369f303700fb8d42550d959e310a05fb4573b71646df51acc00d3a6fe89,dab07eb869034df28be59ae13914989ab88bdca5a9a9362ca96b4eb38180afd7}*
tmp-glibc/stamps/qemux86-webos-linux/linux-yocto-dev/5.0~rc6+gitAUTOINC+e721b5d6ab_8b7d7ef74a-r0.do_install.sigdata.2a23d8783f794b3e79b438889ec60661ca635f9ec09d0519176a31d832377f1c
tmp-glibc/stamps/qemux86-webos-linux/linux-yocto-dev/5.0~rc6+gitAUTOINC+e721b5d6ab_8b7d7ef74a-r0.do_package.sigdata.dafc2a636e7e18357b7efbf99981af45234105c3f46b056edfd2142d5a5d4993
tmp-glibc/stamps/qemux86-webos-linux/linux-yocto-dev/5.0~rc6+gitAUTOINC+e721b5d6ab_8b7d7ef74a-r0.do_deploy.sigdata.09798369f303700fb8d42550d959e310a05fb4573b71646df51acc00d3a6fe89
tmp-glibc/stamps/qemux86-webos-linux/linux-yocto-dev/5.0~rc6+gitAUTOINC+e721b5d6ab_8b7d7ef74a-r0.do_deploy_links.sigdata.dab07eb869034df28be59ae13914989ab88bdca5a9a9362ca96b4eb38180afd7
[YOCTO #12937]
Signed-off-by: Martin Jansa
---
meta/classes/kernel.bbclass | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 8046a69d83..df203d2b4f 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -383,7 +383,6 @@ kernel_do_install() {
install -d ${D}${sysconfdir}/modules-load.d
install -d ${D}${sysconfdir}/modprobe.d
}
-do_install[prefuncs] += "package_get_auto_pr"
# Must be ran no earlier than after do_kernel_checkout or else Makefile won't
be in ${S}/Makefile
do_kernel_version_sanity_check() {
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] kernel-artifact-names.bbclass: use PR instead of PKGR in KERNEL_ARTIFACT_NAME
* otherwise PKGR seen in do_install, do_deploy and do_deploy_links will
have different value in each of them (PRSERV will return different
value of EXTENDPRAUTO because TASKHASH is different for each of these
tasks and also cause unnecessary multiple EXTENDPRAUTO increments for
each build).
[YOCTO #12937]
Signed-off-by: Martin Jansa
---
meta/classes/kernel-artifact-names.bbclass | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/classes/kernel-artifact-names.bbclass
b/meta/classes/kernel-artifact-names.bbclass
index 529e0c565e..41ef6e884d 100644
--- a/meta/classes/kernel-artifact-names.bbclass
+++ b/meta/classes/kernel-artifact-names.bbclass
@@ -6,7 +6,12 @@
inherit image-artifact-names
-KERNEL_ARTIFACT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}"
+# Intentionally use PR instead of PKGR, because EXTENDPRAUTO included
+# in PKGR will have different value for do_install/do_deploy/do_deploy_links
+# tasks with different TASKHASH, causing multiple EXTENDPRAUTO increments for
+# each kernel build and more importantly preventing do_deploy_links to
+# reference artifacts created do_deploy task
+KERNEL_ARTIFACT_NAME ?= "${PKGE}-${PKGV}-${PR}-${MACHINE}"
KERNEL_ARTIFACT_LINK_NAME ?= "${KERNEL_ARTIFACT_NAME}${IMAGE_VERSION_SUFFIX}"
KERNEL_IMAGE_NAME ?= "${KERNEL_ARTIFACT_NAME}"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] image-artifact-names: introduce new bbclass and move some variables into it
* similar to kernel-artifact-names for other recipes/bbclasses which
need to use some deployed artifacts
* bitbake.conf: move IMAGE_BASENAME, IMAGE_VERSION_SUFFIX, IMAGE_NAME,
IMAGE_LINK_NAME variables
* image_types.bbclass: move IMAGE_NAME_SUFFIX variable
* currently IMAGE_NAME_SUFFIX is used only by image.bbclass,
image_types.bbclass and
meta/recipes-core/images/build-appliance-image_15.0.0.bb
but if it's needed by some recipe which isn't itself an image, then
it's useful in bitbake.conf, e.g. we have a recipe for creating
VirtualBox appliances which combines .wic.vmdk with .ovf file to
create .zip with appliance, but for that we need the filename of
.wic.vmdk which now contains IMAGE_NAME_SUFFIX
https://github.com/webOS-ports/meta-webos-ports/blob/4980ce52a43ac6897657602810313af359f0b839/meta-luneos/recipes-core/images/luneos-emulator-appliance.inc#L24
* we were hardcoding .rootfs suffix where needed, but for quite long
time it's configurable with IMAGE_NAME_SUFFIX since:
commit 380ee36811939d947024bf78de907e3c071b834f
Author: Patrick Ohly
Date: Mon Mar 7 18:07:52 2016 +0100
image creation: allow overriding .rootfs suffix
and might not match with hardcoded .rootfs, so make it easier to
use IMAGE_NAME_SUFFIX where needed even without inheritting whole
image_types.bbclass
[YOCTO #12937]
Signed-off-by: Martin Jansa
---
meta/classes/buildhistory.bbclass | 2 ++
meta/classes/image-artifact-names.bbclass | 15 +++
meta/classes/image-live.bbclass| 2 +-
meta/classes/image_types.bbclass | 9 ++---
meta/classes/kernel-artifact-names.bbclass | 8
meta/classes/qemuboot.bbclass | 2 ++
meta/classes/rootfs-postcommands.bbclass | 2 ++
meta/classes/testimage.bbclass | 2 ++
meta/conf/bitbake.conf | 5 -
9 files changed, 34 insertions(+), 13 deletions(-)
create mode 100644 meta/classes/image-artifact-names.bbclass
diff --git a/meta/classes/buildhistory.bbclass
b/meta/classes/buildhistory.bbclass
index f986f7c794..fb244bc04e 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -7,6 +7,8 @@
# Copyright (C) 2007-2011 Koen Kooi
#
+inherit image-artifact-names
+
BUILDHISTORY_FEATURES ?= "image package sdk"
BUILDHISTORY_DIR ?= "${TOPDIR}/buildhistory"
BUILDHISTORY_DIR_IMAGE =
"${BUILDHISTORY_DIR}/images/${MACHINE_ARCH}/${TCLIBC}/${IMAGE_BASENAME}"
diff --git a/meta/classes/image-artifact-names.bbclass
b/meta/classes/image-artifact-names.bbclass
new file mode 100644
index 00..5ab8f1b7aa
--- /dev/null
+++ b/meta/classes/image-artifact-names.bbclass
@@ -0,0 +1,15 @@
+##
+# Specific image creation and rootfs population info.
+##
+
+IMAGE_BASENAME = "${PN}"
+IMAGE_VERSION_SUFFIX = "-${DATETIME}"
+IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME"
+IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
+IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
+
+# IMAGE_NAME is the base name for everything produced when building images.
+# The actual image that contains the rootfs has an additional suffix (.rootfs
+# by default) followed by additional suffices which describe the format (.ext4,
+# .ext4.xz, etc.).
+IMAGE_NAME_SUFFIX ??= ".rootfs"
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index af71be5093..d44573efe8 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -22,7 +22,7 @@
# ${HDDIMG_ID} - FAT image volume-id
# ${ROOTFS} - indicates a filesystem image to include as the root filesystem
(optional)
-inherit live-vm-common
+inherit live-vm-common image-artifact-names
do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
mtools-native:do_populate_sysroot \
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 2eeffbb366..a6d42c03e4 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -1,9 +1,3 @@
-# IMAGE_NAME is the base name for everything produced when building images.
-# The actual image that contains the rootfs has an additional suffix (.rootfs
-# by default) followed by additional suffices which describe the format (.ext4,
-# .ext4.xz, etc.).
-IMAGE_NAME_SUFFIX ??= ".rootfs"
-
# The default aligment of the size of the rootfs is set to 1KiB. In case
# you're using the SD card emulation of a QEMU system simulator you may
# set this value to 2048 (2MiB alignment).
@@ -229,7 +223,8 @@ IMAGE_CMD_f2fs () {
EXTRA_IMAGECMD = ""
-inherit siteinfo kernel-arch
+inherit siteinfo kernel-arch image-artifact-names
+
JFFS2_ENDIANNESS ?= "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le',
'-l', '-b', d)}"
JFFS2_ERASEBLOCK ?= "0x4"
EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS}
[OE-core] [PATCH 4/6] kernel.bbclass: imageType without {}
* just to make sure it looks like bash variable not bitbake variable in
run.do_* scripts
[YOCTO #12937]
Signed-off-by: Martin Jansa
---
meta/classes/kernel.bbclass | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index bd7f7131a4..8046a69d83 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -371,9 +371,9 @@ kernel_do_install() {
install -d ${D}/${KERNEL_IMAGEDEST}
install -d ${D}/boot
for imageType in ${KERNEL_IMAGETYPES} ; do
- install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}
${D}/${KERNEL_IMAGEDEST}/${imageType}-${KERNEL_VERSION}
+ install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType
${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION}
if [ "${KERNEL_PACKAGE_NAME}" = "kernel" ]; then
- ln -sf ${imageType}-${KERNEL_VERSION}
${D}/${KERNEL_IMAGEDEST}/${imageType}
+ ln -sf $imageType-${KERNEL_VERSION}
${D}/${KERNEL_IMAGEDEST}/$imageType
fi
done
install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION}
@@ -681,8 +681,8 @@ kernel_do_deploy() {
fi
for imageType in ${KERNEL_IMAGETYPES} ; do
- install -m 0644 ${KERNEL_OUTPUT_DIR}/${imageType}
$deployDir/${imageType}-${KERNEL_IMAGE_NAME}.bin
- ln -sf ${imageType}-${KERNEL_IMAGE_NAME}.bin
$deployDir/${imageType}
+ install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType
$deployDir/$imageType-${KERNEL_IMAGE_NAME}.bin
+ ln -sf $imageType-${KERNEL_IMAGE_NAME}.bin $deployDir/$imageType
done
if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e
'^CONFIG_MODULES=y$' .config); then
@@ -695,7 +695,7 @@ kernel_do_deploy() {
if [ "$imageType" = "fitImage" ] ; then
continue
fi
- install -m 0644
${KERNEL_OUTPUT_DIR}/${imageType}.initramfs
$deployDir/${imageType}-${INITRAMFS_NAME}.bin
+ install -m 0644
${KERNEL_OUTPUT_DIR}/$imageType.initramfs
$deployDir/$imageType-${INITRAMFS_NAME}.bin
done
fi
}
@@ -713,7 +713,7 @@ kernel_do_deploy_links() {
fi
for imageType in ${KERNEL_IMAGETYPES} ; do
- ln -vf $deployDir/${imageType}-${KERNEL_IMAGE_NAME}.bin
$deployDir/${imageType}-${KERNEL_IMAGE_LINK_NAME}.bin
+ ln -vf $deployDir/$imageType-${KERNEL_IMAGE_NAME}.bin
$deployDir/$imageType-${KERNEL_IMAGE_LINK_NAME}.bin
done
if [ ${MODULE_TARBALL_DEPLOY} = "1" -a -f
$deployDir/modules-${MODULE_TARBALL_NAME}.tgz ] ; then
@@ -725,7 +725,7 @@ kernel_do_deploy_links() {
if [ "$imageType" = "fitImage" ] ; then
continue
fi
- ln -vf $deployDir/${imageType}-${INITRAMFS_NAME}.bin
$deployDir/${imageType}-${INITRAMFS_LINK_NAME}.bin
+ ln -vf $deployDir/$imageType-${INITRAMFS_NAME}.bin
$deployDir/$imageType-${INITRAMFS_LINK_NAME}.bin
done
fi
}
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] *-artifact-names: include version only in the artifact links
* drop ${PKGE}-${PKGV}-${PR} from kernel artifacts names (this is the
latest build) and add it only in hardlinks created in do_deploy_links
so that we can use PKGR there again (because these links are generally
used only by human operators and they don't have their own TASKHASH or
the IMAGE_VERSION_SUFFIX might be set to some release name which they
do understand
* this allows to drop package_get_auto_pr from kernel do_deploy as well,
leaving only 2 EXTENDPRAUTO bumps for each kernel build (do_package
and do_deploy_links, unfortunatelly these will still have different
value, so if you're looking for the exact kernel image in deploy
directory based on kernel image package version seen on the device the
EXTENDPRAUTO part of PR will be different).
[YOCTO #12937]
Signed-off-by: Martin Jansa
---
meta/classes/image-artifact-names.bbclass | 2 +-
meta/classes/kernel-artifact-names.bbclass | 7 +--
meta/classes/kernel.bbclass| 1 -
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/meta/classes/image-artifact-names.bbclass
b/meta/classes/image-artifact-names.bbclass
index d5ba035f5a..b23cef22ca 100644
--- a/meta/classes/image-artifact-names.bbclass
+++ b/meta/classes/image-artifact-names.bbclass
@@ -3,7 +3,7 @@
##
IMAGE_BASENAME = "${PN}"
-IMAGE_VERSION_SUFFIX = "-${DATETIME}"
+IMAGE_VERSION_SUFFIX = "${PKGE}-${PKGV}-${PKGR}-${DATETIME}"
IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME"
IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}"
IMAGE_LINK_NAME = "${IMAGE_NAME}${IMAGE_VERSION_SUFFIX}"
diff --git a/meta/classes/kernel-artifact-names.bbclass
b/meta/classes/kernel-artifact-names.bbclass
index 41ef6e884d..92e08297cc 100644
--- a/meta/classes/kernel-artifact-names.bbclass
+++ b/meta/classes/kernel-artifact-names.bbclass
@@ -6,12 +6,7 @@
inherit image-artifact-names
-# Intentionally use PR instead of PKGR, because EXTENDPRAUTO included
-# in PKGR will have different value for do_install/do_deploy/do_deploy_links
-# tasks with different TASKHASH, causing multiple EXTENDPRAUTO increments for
-# each kernel build and more importantly preventing do_deploy_links to
-# reference artifacts created do_deploy task
-KERNEL_ARTIFACT_NAME ?= "${PKGE}-${PKGV}-${PR}-${MACHINE}"
+KERNEL_ARTIFACT_NAME ?= "${MACHINE}"
KERNEL_ARTIFACT_LINK_NAME ?= "${KERNEL_ARTIFACT_NAME}${IMAGE_VERSION_SUFFIX}"
KERNEL_IMAGE_NAME ?= "${KERNEL_ARTIFACT_NAME}"
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index df203d2b4f..3a3400da87 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -700,7 +700,6 @@ kernel_do_deploy() {
}
do_deploy[cleandirs] = "${DEPLOYDIR}"
do_deploy[dirs] = "${DEPLOYDIR} ${B}"
-do_deploy[prefuncs] += "package_get_auto_pr"
addtask deploy after do_populate_sysroot do_packagedata
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for YOCTO #12937 - Consistent naming scheme for deployed artifacts (rev2)
== Series Details == Series: YOCTO #12937 - Consistent naming scheme for deployed artifacts (rev2) Revision: 2 URL : https://patchwork.openembedded.org/series/19321/ 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[2/6] bitbake.conf, kernel*.bbclass: include IMAGE_VERSION_SUFFIX only in the _LINK_NAME variables and change it to hard link Issue Commit shortlog is too long [test_shortlog_length] Suggested fixEdit shortlog so that it is 90 characters or less (currently 119 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] [oe-core] [PATCH] ltp: syscalls: rt_sigwaitinfo01: Fix failure for MIPS arches
From: He Zhe
Add a patch to fix the following failure.
rt_sigtimedwait011 TFAIL : .../sigwaitinfo01.c:58: test_empty_set
(.../sigwaitinfo01.c: 148): Unexpected failure:
TEST_ERRNO=EINVAL(22): Invalid argument
Signed-off-by: He Zhe
---
..._sigwaitinfo01-Fix-failure-for-MIPS-arche.patch | 49 ++
meta/recipes-extended/ltp/ltp_20190517.bb | 1 +
2 files changed, 50 insertions(+)
create mode 100644
meta/recipes-extended/ltp/ltp/0001-syscalls-rt_sigwaitinfo01-Fix-failure-for-MIPS-arche.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0001-syscalls-rt_sigwaitinfo01-Fix-failure-for-MIPS-arche.patch
b/meta/recipes-extended/ltp/ltp/0001-syscalls-rt_sigwaitinfo01-Fix-failure-for-MIPS-arche.patch
new file mode 100644
index 000..9a0df74
--- /dev/null
+++
b/meta/recipes-extended/ltp/ltp/0001-syscalls-rt_sigwaitinfo01-Fix-failure-for-MIPS-arche.patch
@@ -0,0 +1,49 @@
+From b4193bc3fdeb278abc54944b4773ffa45ee432af Mon Sep 17 00:00:00 2001
+From: He Zhe
+Date: Fri, 23 Aug 2019 14:34:43 +0800
+Subject: [LTP] [PATCH] syscalls: rt_sigwaitinfo01: Fix failure for MIPS arches
+
+rt_sigtimedwait01 fails as follow on MIPS arches
+rt_sigtimedwait011 TFAIL : .../sigwaitinfo01.c:58: test_empty_set
+(.../sigwaitinfo01.c: 148): Unexpected failure:
+TEST_ERRNO=EINVAL(22): Invalid argument
+
+As this case purposely bypasses glibc, it should align with the size of kernel
+definition of sigset_t which is different from other arches.
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/mips/include/uapi/asm/signal.h#n15
+
+This patch adds specific case for MIPS.
+
+Upstream-Status: Submitted
[http://lists.linux.it/pipermail/ltp/2019-August/013313.html]
+Signed-off-by: He Zhe
+---
+ testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 13 ++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
+index 5a32ce1..5c2fa99 100644
+--- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c
+@@ -128,9 +128,16 @@ static int my_sigtimedwait(const sigset_t * set,
siginfo_t * info,
+ static int my_rt_sigtimedwait(const sigset_t * set, siginfo_t * info,
+ struct timespec *timeout)
+ {
+-
+- /* The last argument is (number_of_signals)/(bits_per_byte), which are
64 and 8, resp. */
+- return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout, 8);
++ /* The last argument is (number_of_signals)/(bits_per_byte), which are
64 and 8, resp,
++ * except for MIPS which are 128 and 8, resp.
++ */
++ return ltp_syscall(__NR_rt_sigtimedwait, set, info, timeout,
++#ifdef __mips__
++ 16
++#else
++ 8
++#endif
++ );
+ }
+ #endif
+
+--
+2.7.4
+
diff --git a/meta/recipes-extended/ltp/ltp_20190517.bb
b/meta/recipes-extended/ltp/ltp_20190517.bb
index b0e2f96..14c1219 100644
--- a/meta/recipes-extended/ltp/ltp_20190517.bb
+++ b/meta/recipes-extended/ltp/ltp_20190517.bb
@@ -45,6 +45,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0002-check-for-RES_USE_INET6-during-configure.patch \
file://0001-syscalls-tgkill03-wait-for-defunct-tid-to-get-detach.patch \
file://0001-ustat02-Fix-EFAULT-in-32bit-compatibility-mode.patch \
+
file://0001-syscalls-rt_sigwaitinfo01-Fix-failure-for-MIPS-arche.patch \
"
S = "${WORKDIR}/git"
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] oeqa/kerneldevelopment: Able to apply a single patch to the Linux kernel source
From: Mazliana
Purpose of kernel development is basically to customize our
own recipes kernel by reused existing recipes.
This is an initiative of automating manual kernel development
test cases. Applying a single patch to the Linux kernel source
is one of the manual test cases of kernel development.
Objective of this test is as a developer we can make changes of
a file in kernel source and able to apply a single patch to
the kernel source.
ref:https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases
Signed-off-by: Mazliana
---
meta/lib/oeqa/selftest/cases/kerneldevelopment.py | 67 +++
1 file changed, 67 insertions(+)
create mode 100644 meta/lib/oeqa/selftest/cases/kerneldevelopment.py
diff --git a/meta/lib/oeqa/selftest/cases/kerneldevelopment.py
b/meta/lib/oeqa/selftest/cases/kerneldevelopment.py
new file mode 100644
index 000..a61876e
--- /dev/null
+++ b/meta/lib/oeqa/selftest/cases/kerneldevelopment.py
@@ -0,0 +1,67 @@
+import os
+from oeqa.selftest.case import OESelftestTestCase
+from oeqa.utils.commands import runCmd, get_bb_var
+from oeqa.utils.git import GitRepo
+
+class KernelDev(OESelftestTestCase):
+
+@classmethod
+def setUpClass(cls):
+super(KernelDev, cls).setUpClass()
+# Create the recipe directory structure inside the created layer
+cls.layername = 'meta-kerneltest'
+runCmd('bitbake-layers create-layer %s' % cls.layername)
+runCmd('mkdir -p %s/recipes-kernel/linux/linux-yocto' % cls.layername)
+cls.recipes_linuxyocto_dir = os.path.join \
+(cls.builddir, cls.layername, 'recipes-kernel', 'linux',
'linux-yocto')
+cls.recipeskernel_dir = os.path.dirname(cls.recipes_linuxyocto_dir)
+runCmd('bitbake-layers add-layer %s' % cls.layername)
+
+@classmethod
+def tearDownClass(cls):
+runCmd('bitbake-layers remove-layer %s' % cls.layername,
ignore_status=True)
+runCmd('rm -rf %s' % cls.layername)
+super(KernelDev, cls).tearDownClass()
+
+def setUp(self):
+super(KernelDev, self).setUp()
+self.set_machine_config('MACHINE = "qemux86-64"\n')
+
+def test_apply_patches(self):
+"""
+Summary: Able to apply a single patch to the Linux kernel source
+Expected:The README file should exist and the patch changes should
be
+ displayed at the end of the file.
+Product: Kernel Development
+Author: Yeoh Ee Peng
+AutomatedBy: Mazliana Mohamad
+"""
+runCmd('bitbake virtual/kernel -c patch')
+kernel_source = get_bb_var('STAGING_KERNEL_DIR')
+readme = os.path.join(kernel_source, 'README')
+
+# This test step adds modified file 'README' to git and creates a
+# patch file '0001-KERNEL_DEV_TEST_CASE.patch' at the same location as
file
+patch_content = 'This is a test to apply a patch to the kernel'
+with open(readme, 'a+') as f:
+f.write(patch_content)
+repo = GitRepo('%s' % kernel_source, is_topdir=True)
+repo.run_cmd('add %s' % readme)
+repo.run_cmd(['commit', '-m', 'KERNEL_DEV_TEST_CASE'])
+repo.run_cmd(['format-patch', '-1'])
+patch_name = '0001-KERNEL_DEV_TEST_CASE.patch'
+patchpath = os.path.join(kernel_source, patch_name)
+runCmd('mv %s %s' % (patchpath, self.recipes_linuxyocto_dir))
+runCmd('rm %s ' % readme)
+self.assertFalse(os.path.exists(readme))
+
+recipe_append = os.path.join(self.recipeskernel_dir,
'linux-yocto_%.bbappend')
+with open(recipe_append, 'w+') as fh:
+fh.write('SRC_URI += "file://%s"\n' % patch_name)
+fh.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"')
+
+runCmd('bitbake virtual/kernel -c clean')
+runCmd('bitbake virtual/kernel -c patch')
+self.assertTrue(os.path.exists(readme))
+result = runCmd('tail -n 1 %s' % readme)
+self.assertEqual(result.output, patch_content)
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for oeqa/kerneldevelopment: Able to apply a single patch to the Linux kernel source (rev3)
== Series Details == Series: oeqa/kerneldevelopment: Able to apply a single patch to the Linux kernel source (rev3) Revision: 3 URL : https://patchwork.openembedded.org/series/19411/ 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 Errors in your Python code were encountered [test_pylint] Suggested fixCorrect the lines introduced by your patch Output Please, fix the listed issues: meta/lib/oeqa/selftest/cases/kerneldevelopment.py does not exist 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] libwacom: add recipe
From: Kai Kang
Package libinput has a package config 'libwacom'. When it is set,
package libwacom is required. So add the recipe of libwacom.
Signed-off-by: Kai Kang
---
meta/recipes-graphics/libwacom/libwacom_0.33.bb | 15 +++
1 file changed, 15 insertions(+)
create mode 100644 meta/recipes-graphics/libwacom/libwacom_0.33.bb
diff --git a/meta/recipes-graphics/libwacom/libwacom_0.33.bb
b/meta/recipes-graphics/libwacom/libwacom_0.33.bb
new file mode 100644
index 00..deb2922216
--- /dev/null
+++ b/meta/recipes-graphics/libwacom/libwacom_0.33.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "libwacom is a library to identify wacom tablets and their
model-specific features."
+HOMEPAGE = "https://github.com/linuxwacom/libwacom/wiki;
+SECTION = "libs"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e"
+
+DEPENDS = "libgudev"
+
+SRC_URI = "git://github.com/linuxwacom/libwacom.git;protocol=https"
+SRCREV = "87cc710e21a6220e267dd08936bbec2932aa3658"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
--
2.20.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bind: fix build with python3 PACKAGECONFIG enabled
If the PACKAGECONFIG item, python3, is enabled, we get the following
QA issue when multilib is enabled.
ERROR: bind-9.11.5-P4-r0 do_package: QA Issue: bind: Files/directories were
installed but not shipped in any package:
/usr/lib
/usr/lib/python3.7
/usr/lib/python3.7/site-packages
/usr/lib/python3.7/site-packages/isc-2.0-py3.7.egg-info
/usr/lib/python3.7/site-packages/isc
/usr/lib/python3.7/site-packages/isc/policy.py
[snip]
The thing is, when --with-python is specified with a path instead of 'yes',
the --with-python-install-dir is in fact ignored.
Fix this issue by specifying the correct arguments.
Signed-off-by: Chen Qi
---
meta/recipes-connectivity/bind/bind_9.11.5-P4.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb
b/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb
index 93c406f778..69b1174073 100644
--- a/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb
+++ b/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb
@@ -39,7 +39,7 @@ PACKAGECONFIG[httpstats] =
"--with-libxml2=${STAGING_DIR_HOST}${prefix},--withou
PACKAGECONFIG[readline] = "--with-readline=-lreadline,,readline"
PACKAGECONFIG[libedit] = "--with-readline=-ledit,,libedit"
PACKAGECONFIG[urandom] =
"--with-randomdev=/dev/urandom,--with-randomdev=/dev/random,,"
-PACKAGECONFIG[python3] = "--with-python=${PYTHON}
--with-python-install-dir=${D}/${PYTHON_SITEPACKAGES_DIR} , --without-python,
python3-ply-native,"
+PACKAGECONFIG[python3] = "--with-python=yes
--with-python-install-dir=${PYTHON_SITEPACKAGES_DIR} , --without-python,
python3-ply-native,"
ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6',
'yes', 'no', d)}"
EXTRA_OECONF = " ${ENABLE_IPV6} --with-libtool --enable-threads \
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 02/12] qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips
On Tue, 2019-08-20 at 17:32 +0200, Alexander Kanavin wrote: > This is the qemu default since qemu 2.2, is generally supported > better, > and is recommended by upstream. It also has already been in use for > arm/risc > and ovmf. > > Additional information: > https://bugzilla.yoctoproject.org/show_bug.cgi?id=13466 > https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/ > > '-vga virtio' emulated hardware remains in use when virgl is enabled > via a runqemu override. > > Also, adjust the error whitelist, as there is a number of new > messages > coming from the drivers that are not actual errors. > > Signed-off-by: Alexander Kanavin > --- > meta/conf/machine/include/qemuboot-mips.inc | 2 +- > meta/conf/machine/include/qemuboot-x86.inc | 2 +- > meta/conf/machine/qemux86-64.conf | 1 + > meta/conf/machine/qemux86.conf | 1 + > meta/lib/oeqa/runtime/cases/parselogs.py| 5 - > scripts/runqemu | 6 -- > 6 files changed, 8 insertions(+), 9 deletions(-) The patches in master-next had some failures: https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/636 I think but am not 100% sure it could from this patch? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bbtests.py: remove recipe-depends.dot
This file is giving misleading information. There's a patch
for bitbake to remove the generation of this file. Remove
it from OEQA as well.
Signed-off-by: Chen Qi
---
meta/lib/oeqa/selftest/cases/bbtests.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py
b/meta/lib/oeqa/selftest/cases/bbtests.py
index 0693ba8cf8..8e59bafae3 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -119,7 +119,7 @@ class BitbakeTests(OESelftestTestCase):
def test_bitbake_g(self):
result = bitbake('-g core-image-minimal')
-for f in ['pn-buildlist', 'recipe-depends.dot', 'task-depends.dot']:
+for f in ['pn-buildlist', 'task-depends.dot']:
self.addCleanup(os.remove, f)
self.assertTrue('Task dependencies saved to \'task-depends.dot\'' in
result.output, msg = "No task dependency \"task-depends.dot\" file was
generated for the given task target. bitbake output: %s" % result.output)
self.assertTrue('busybox' in
ftools.read_file(os.path.join(self.builddir, 'task-depends.dot')), msg = "No
\"busybox\" dependency found in task-depends.dot file.")
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] screen: add /etc/screenrc as global config file
Ping..
The /etc/screenrc exists in other distributions as the default config file.
//Yi
On 8/16/19 4:56 PM, Yi Zhao wrote:
Signed-off-by: Yi Zhao
---
meta/recipes-extended/screen/screen_4.6.2.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/screen/screen_4.6.2.bb
b/meta/recipes-extended/screen/screen_4.6.2.bb
index 24ec751..21b476d 100644
--- a/meta/recipes-extended/screen/screen_4.6.2.bb
+++ b/meta/recipes-extended/screen/screen_4.6.2.bb
@@ -35,10 +35,11 @@ inherit autotools texinfo
PACKAGECONFIG ??= ""
PACKAGECONFIG[utempter] =
"ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter,"
-EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \
+EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5
--with-sys-screenrc=${sysconfdir}/screenrc \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam',
'--disable-pam', d)}"
do_install_append () {
+ install -D -m 644 ${S}/etc/etcscreenrc ${D}/${sysconfdir}/screenrc
if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then
install -D -m 644 ${WORKDIR}/screen.pam
${D}/${sysconfdir}/pam.d/screen
fi
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Automatic prebuilt management
On Mon, 5 Aug 2019 at 18:39, chris.lapla...@agilent.com <
chris.lapla...@agilent.com> wrote:
> > But I would like something smarter, e.g. first trying to check if the
> SRC_URI is available, if not switching on using the prebuilt package if
> available (e.g.
> > in a DIR_PREBUILT)...
> >
> > Before going further is there already an existing solution for that? do
> you have any recommendation on the easier/best way to
> > achieve this?
>
> I don't have a "best practice" recommendation to offer. But coincidentally
> I suggested something similar for upstreaming a few weeks ago. It was
> (rightfully) rejected as too "hacky" for inclusion in core code.
> Regardless, here's a bbclass we currently use:
>
> addhandler skip_eventhandler
> python skip_eventhandler() {
> try:
> bb.fetch2.Fetch(d.getVar("SRC_URI").split(), d)
> except bb.fetch2.FetchError:
> raise bb.parse.SkipRecipe("skip-inaccessible: could not access
> upstream repo; check SRC_URI, access rights, and network availability")
> }
> skip_eventhandler[eventmask] = "bb.event.RecipePreFinalise"
>
>
> As was pointed out to me, this is a pretty heavy-handed approach - it can
> fail for any number of reasons, not just the URI actually being
> unavailable. So you may consider a more surgical check, e.g. actually
> trying to fetch the SRC_URI directly using raw GET requests.
>
> To implement the handover, you'd have separate recipes for the
> build-from-source and the prebuilt case which PROVIDE the same package. You
> probably also want to set PREFERRED_PROVIDER in your layer conf to prefer
> the build-from-source recipe.
>
> Alternatively, you can do it all in a single recipe by rewriting the
> SRC_URI from within the event handler. But I think separate recipes is
> nicer.
>
Well, I ended up with the attached class, which generates or install
prebuilt tarball. It's only a draft and I'll come back with a polished
version, but the idea is to look for the related prebuilt package into a
'PREBUILT_SRC_DIR' (if defined) and install it instead of fetching and
compiling from source. This allows having only one recipe. Then a company
just needs to provide closed-source software as a set of prebuilt tarballs
and customer need to point to the prebuilt dir (e.g. in local.conf).
Regards,
Loic
prebuilt.bbclass
Description: Binary data
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libffi: Make it build for MIPS o32
This solves the following errors: src/mips/o32.S: Assembler messages: src/mips/o32.S:286: Error: opcode not supported on this processor: mips32r2 (mips32r2) `s.d $f12,((16*4)-10*4)($fp)' src/mips/o32.S:287: Error: opcode not supported on this processor: mips32r2 (mips32r2) `s.d $f14,((16*4)-8*4)($fp)' Signed-off-by: Peter Kjellerstedt --- ...-missed-ifndef-for-__mips_soft_float.patch | 30 +++ meta/recipes-support/libffi/libffi_3.3~rc0.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch diff --git a/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch b/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch new file mode 100644 index 00..a20bc3f4ed --- /dev/null +++ b/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch @@ -0,0 +1,30 @@ +From 4149a7627a998731cc246d3f58a36808745d04c8 Mon Sep 17 00:00:00 2001 +From: Carl Hurd +Date: Wed, 18 Jul 2018 09:04:32 -0400 +Subject: [PATCH] Fixed missed #ifndef for __mips_soft_float + +--- +Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/442] + + src/mips/o32.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/mips/o32.S b/src/mips/o32.S +index 44e74cb..799139b 100644 +--- a/src/mips/o32.S b/src/mips/o32.S +@@ -282,9 +282,11 @@ $LCFI12: + li $13, 1 # FFI_O32 + bne $16, $13, 1f# Skip fp save if FFI_O32_SOFT_FLOAT + ++#ifndef __mips_soft_float + # Store all possible float/double registers. + s.d $f12, FA_0_0_OFF2($fp) + s.d $f14, FA_1_0_OFF2($fp) ++#endif + 1: + # prepare arguments for ffi_closure_mips_inner_O32 + REG_L a0, 4($15) # cif +-- +2.21.0 + diff --git a/meta/recipes-support/libffi/libffi_3.3~rc0.bb b/meta/recipes-support/libffi/libffi_3.3~rc0.bb index dadde0b2a0..3e2845546e 100644 --- a/meta/recipes-support/libffi/libffi_3.3~rc0.bb +++ b/meta/recipes-support/libffi/libffi_3.3~rc0.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b" SRC_URI = "https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz \ file://not-win32.patch \ + file://0001-Fixed-missed-ifndef-for-__mips_soft_float.patch \ " SRC_URI[md5sum] = "8d2a82a78faf10a5e53c27d986e8f04e" SRC_URI[sha256sum] = "403d67aabf1c05157855ea2b1d9950263fb6316536c8c333f5b9ab1eb2f20ecf" -- 2.21.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for libffi: Make it build for MIPS o32
== Series Details == Series: libffi: Make it build for MIPS o32 Revision: 1 URL : https://patchwork.openembedded.org/series/19446/ 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/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch) 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
Re: [OE-core] [PATCH] libwacom: add recipe
On Fri, 23 Aug 2019 at 10:20, wrote: > Package libinput has a package config 'libwacom'. When it is set, > package libwacom is required. So add the recipe of libwacom. > This recipe probably needs to go to meta-oe? Why oe-core? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 02/12] qemu: switch to '-vga std' emulated hardware from vmware/cirrus for x86/mips
On Fri, 23 Aug 2019 at 11:13, Richard Purdie < richard.pur...@linuxfoundation.org> wrote: > The patches in master-next had some failures: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/85/builds/636 > > I think but am not 100% sure it could from this patch? > Yes, at least two of those are direct X11 failures (X server crash on x32; X refusing to start if mesa is built with llvmpipe in step8 of qa-extras2). I'll try to look into them. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] oeqa/kerneldevelopment: Able to apply a single patch to the Linux kernel source
On 8/22/19 7:29 PM, mazliana.moha...@intel.com wrote:
> From: Mazliana
>
> Purpose of kernel development is basically to customize our
> own recipes kernel by reused existing recipes.
>
> This is an initiative of automating manual kernel development
> test cases. Applying a single patch to the Linux kernel source
> is one of the manual test cases of kernel development.
Doesn't this allow us to remove
"kernel-dev.kernel-dev.Kernel_dev_Applying_patches" from the
manual/kernel-dev.json?
- armin
>
> Objective of this test is as a developer we can make changes of
> a file in kernel source and able to apply a single patch to
> the kernel source.
>
> ref:https://wiki.yoctoproject.org/wiki/Kernel_Development_Test_Cases
>
> Signed-off-by: Mazliana
> ---
> meta/lib/oeqa/selftest/cases/kerneldevelopment.py | 67
> +++
> 1 file changed, 67 insertions(+)
> create mode 100644 meta/lib/oeqa/selftest/cases/kerneldevelopment.py
>
> diff --git a/meta/lib/oeqa/selftest/cases/kerneldevelopment.py
> b/meta/lib/oeqa/selftest/cases/kerneldevelopment.py
> new file mode 100644
> index 000..a61876e
> --- /dev/null
> +++ b/meta/lib/oeqa/selftest/cases/kerneldevelopment.py
> @@ -0,0 +1,67 @@
> +import os
> +from oeqa.selftest.case import OESelftestTestCase
> +from oeqa.utils.commands import runCmd, get_bb_var
> +from oeqa.utils.git import GitRepo
> +
> +class KernelDev(OESelftestTestCase):
> +
> +@classmethod
> +def setUpClass(cls):
> +super(KernelDev, cls).setUpClass()
> +# Create the recipe directory structure inside the created layer
> +cls.layername = 'meta-kerneltest'
> +runCmd('bitbake-layers create-layer %s' % cls.layername)
> +runCmd('mkdir -p %s/recipes-kernel/linux/linux-yocto' %
> cls.layername)
> +cls.recipes_linuxyocto_dir = os.path.join \
> +(cls.builddir, cls.layername, 'recipes-kernel', 'linux',
> 'linux-yocto')
> +cls.recipeskernel_dir = os.path.dirname(cls.recipes_linuxyocto_dir)
> +runCmd('bitbake-layers add-layer %s' % cls.layername)
> +
> +@classmethod
> +def tearDownClass(cls):
> +runCmd('bitbake-layers remove-layer %s' % cls.layername,
> ignore_status=True)
> +runCmd('rm -rf %s' % cls.layername)
> +super(KernelDev, cls).tearDownClass()
> +
> +def setUp(self):
> +super(KernelDev, self).setUp()
> +self.set_machine_config('MACHINE = "qemux86-64"\n')
> +
> +def test_apply_patches(self):
> +"""
> +Summary: Able to apply a single patch to the Linux kernel source
> +Expected:The README file should exist and the patch changes
> should be
> + displayed at the end of the file.
> +Product: Kernel Development
> +Author: Yeoh Ee Peng
> +AutomatedBy: Mazliana Mohamad
> +"""
> +runCmd('bitbake virtual/kernel -c patch')
> +kernel_source = get_bb_var('STAGING_KERNEL_DIR')
> +readme = os.path.join(kernel_source, 'README')
> +
> +# This test step adds modified file 'README' to git and creates a
> +# patch file '0001-KERNEL_DEV_TEST_CASE.patch' at the same location
> as file
> +patch_content = 'This is a test to apply a patch to the kernel'
> +with open(readme, 'a+') as f:
> +f.write(patch_content)
> +repo = GitRepo('%s' % kernel_source, is_topdir=True)
> +repo.run_cmd('add %s' % readme)
> +repo.run_cmd(['commit', '-m', 'KERNEL_DEV_TEST_CASE'])
> +repo.run_cmd(['format-patch', '-1'])
> +patch_name = '0001-KERNEL_DEV_TEST_CASE.patch'
> +patchpath = os.path.join(kernel_source, patch_name)
> +runCmd('mv %s %s' % (patchpath, self.recipes_linuxyocto_dir))
> +runCmd('rm %s ' % readme)
> +self.assertFalse(os.path.exists(readme))
> +
> +recipe_append = os.path.join(self.recipeskernel_dir,
> 'linux-yocto_%.bbappend')
> +with open(recipe_append, 'w+') as fh:
> +fh.write('SRC_URI += "file://%s"\n' % patch_name)
> +fh.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"')
> +
> +runCmd('bitbake virtual/kernel -c clean')
> +runCmd('bitbake virtual/kernel -c patch')
> +self.assertTrue(os.path.exists(readme))
> +result = runCmd('tail -n 1 %s' % readme)
> +self.assertEqual(result.output, patch_content)
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] elfutils: 0.176 -> 0.177
On Fri, Aug 23, 2019 at 09:28:11AM +0800, Hongxu Jia wrote: > On 8/23/19 1:01 AM, Adrian Bunk wrote: > > On Thu, Aug 22, 2019 at 09:40:18AM +0800, Hongxu Jia wrote: > > > - Update Debian patches > > > > > > http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz > > > > > > - Rebase Debian patches to 0.177 > > >debian/hppa_backend.diff > > >debian/mips_backend.diff > > >debian/arm_backend.diff > > >debian/mips_readelf_w.patch > > >debian/testsuite-ignore-elflint.diff > > >debian/mips_cfi.patch > > > ... > > > ...1-fix-compile-failure-with-debian-patches.patch | 48 > > > ... > > > .../elfutils/files/debian/hppa_backend.diff| 57 + > > > .../elfutils/files/debian/hurd_path.patch | 17 +-- > > > ... > > > .../elfutils/files/debian/kfreebsd_path.patch | 13 +- > > > ... > > > .../elfutils/files/debian/mips_cfi.patch | 131 > > > + > > > ... > > Why are we following Debian patches in a package with active upstream? > > I am afraid no, we need to rebase them (0.176) to 0.177 The part about rebasing existing patches is clear. But why are we for example adding mips_cfi.patch when this is not upstream? There might be a good reason for doing so, but "because it is a Debian patch" is not a good reason. And the existing hppa/hurd/kfreebsd patches from Debian are unlikely to make sense in OE. > //Hongxu cu Adrian -- "Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: Print a buildtime warning about the status with musl
It is possible if a user really has to use it, but not recommended.
Signed-off-by: Adrian Bunk
---
meta/recipes-core/systemd/systemd_242.bb | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/recipes-core/systemd/systemd_242.bb
b/meta/recipes-core/systemd/systemd_242.bb
index ceee3aa0cb..6fbb854886 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_242.bb
@@ -615,6 +615,12 @@ python __anonymous() {
d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
}
+python do_warn_musl() {
+if d.getVar('TCLIBC') == "musl":
+bb.warn("Using systemd with musl is not recommended since it is not
supported upstream and some patches are known to be problematic.")
+}
+addtask warn_musl before do_configure
+
ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel resolv-conf"
ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] linux-dtb.inc: Remove
It only printed a warning since Yocto 2.4,
documented to be removed in a future release.
Signed-off-by: Adrian Bunk
---
meta/recipes-kernel/linux/linux-dtb.inc | 3 ---
1 file changed, 3 deletions(-)
delete mode 100644 meta/recipes-kernel/linux/linux-dtb.inc
diff --git a/meta/recipes-kernel/linux/linux-dtb.inc
b/meta/recipes-kernel/linux/linux-dtb.inc
deleted file mode 100644
index f1912775ca..00
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-python() {
-bb.warn("You are using the linux-dtb.inc which is deprecated. You can
safely remove it as the Device Tree support is automatically enabled when
KERNEL_DEVICETREE is set.")
-}
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: Update to the latest 242 branch
Remove backported patches applied upstream.
Signed-off-by: Adrian Bunk
---
meta/recipes-core/systemd/systemd.inc | 2 +-
...-max-sysctl-to-LONG_MAX-rather-than-.patch | 39
.../systemd/0001-networkd-fix-link-up.patch | 66 -
.../0002-network-do-not-send-ipv6.patch | 96 ---
...remove-redunant-link-name-in-message.patch | 41
meta/recipes-core/systemd/systemd_242.bb | 4 -
6 files changed, 1 insertion(+), 247 deletions(-)
delete mode 100644
meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0002-network-do-not-send-ipv6.patch
delete mode 100644
meta/recipes-core/systemd/systemd/0006-network-remove-redunant-link-name-in-message.patch
diff --git a/meta/recipes-core/systemd/systemd.inc
b/meta/recipes-core/systemd/systemd.inc
index 3a353b009b..491361ccca 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,7 +14,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
-SRCREV = "db2e367bfc3b119609f837eb973d915f6c550b2f"
+SRCREV = "07f0549ffe3413f0e78b656dd34d64681cbd8f00"
SRCBRANCH = "v242-stable"
SRC_URI =
"git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
diff --git
a/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch
b/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch
deleted file mode 100644
index ff64f58c9c..00
---
a/meta/recipes-core/systemd/systemd/0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6e2f78948403a4cce45b9e34311c9577c624f066 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering
-Date: Mon, 17 Jun 2019 10:51:25 +0200
-Subject: [PATCH] core: set fs.file-max sysctl to LONG_MAX rather than
- ULONG_MAX
-
-Since kernel 5.2 the kernel thankfully returns proper errors when we
-write a value out of range to the sysctl. Which however breaks writing
-ULONG_MAX to request the maximum value. Hence let's write the new
-maximum value instead, LONG_MAX.
-
-/cc @brauner
-
-Fixes: #12803
-
-Upstream-Status: Backport
-
-Signed-off-by: Matthias Schiffer
- src/core/main.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/core/main.c b/src/core/main.c
-index b33ea1b5b5..e7f51815f0 100644
a/src/core/main.c
-+++ b/src/core/main.c
-@@ -1245,9 +1245,9 @@ static void bump_file_max_and_nr_open(void) {
- #endif
-
- #if BUMP_PROC_SYS_FS_FILE_MAX
--/* I so wanted to use STRINGIFY(ULONG_MAX) here, but alas we can't as
glibc/gcc define that as
-- * "(0x7fffL * 2UL + 1UL)". Seriously. */
--if (asprintf(, "%lu\n", ULONG_MAX) < 0) {
-+/* The maximum the kernel allows for this since 5.2 is LONG_MAX, use
that. (Previously thing where
-+ * different but the operation would fail silently.) */
-+if (asprintf(, "%li\n", LONG_MAX) < 0) {
- log_oom();
- return;
- }
diff --git a/meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch
b/meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch
deleted file mode 100644
index 4c7a0a33a3..00
--- a/meta/recipes-core/systemd/systemd/0001-networkd-fix-link-up.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 6bd76d2d4ff130decd3aa13e0c2dbfd56ff8d7b7 Mon Sep 17 00:00:00 2001
-From: Susant Sahani
-Date: Thu, 9 May 2019 07:35:35 +0530
-Subject: [PATCH] networkd: fix link_up() (#12505)
-
-Fillup IFLA_INET6_ADDR_GEN_MODE while we do link_up.
-
-Fixes the following error:
-```
-dummy-test: Could not bring up interface: Invalid argument
-```
-
-After reading the kernel code when we do a link up
-```
-net/core/rtnetlink.c
-IFLA_AF_SPEC
- af_ops->set_link_af(dev, af);
- inet6_set_link_af
- if (tb[IFLA_INET6_ADDR_GEN_MODE])
- Here it looks for IFLA_INET6_ADDR_GEN_MODE
-```
-Since link up we didn't filling up that it's failing.
-
-Closes #12504.
-
-Signed-off-by: Ricardo Ribalda Delgado
-
-Upstream-Status: Backport
[https://github.com/systemd/systemd/commit/4eb086a38712ea98faf41e075b84555b11b54362.patch]
-
- src/network/networkd-link.c | 15 +++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
-index e466b96792..042496173c 100644
a/src/network/networkd-link.c
-+++ b/src/network/networkd-link.c
-@@ -2034,6 +2034,8 @@ static int link_up(Link *link) {
- }
-
- if (link_ipv6_enabled(link)) {
-+uint8_t ipv6ll_mode;
-+
- r = sd_netlink_message_open_container(req,
Re: [OE-core] [PATCH 3/3] elfutils: 0.176 -> 0.177
On 8/23/19 10:26 PM, Adrian Bunk wrote: On Fri, Aug 23, 2019 at 09:28:11AM +0800, Hongxu Jia wrote: On 8/23/19 1:01 AM, Adrian Bunk wrote: On Thu, Aug 22, 2019 at 09:40:18AM +0800, Hongxu Jia wrote: - Update Debian patches http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz - Rebase Debian patches to 0.177 debian/hppa_backend.diff debian/mips_backend.diff debian/arm_backend.diff debian/mips_readelf_w.patch debian/testsuite-ignore-elflint.diff debian/mips_cfi.patch ... ...1-fix-compile-failure-with-debian-patches.patch | 48 ... .../elfutils/files/debian/hppa_backend.diff| 57 + .../elfutils/files/debian/hurd_path.patch | 17 +-- ... .../elfutils/files/debian/kfreebsd_path.patch | 13 +- ... .../elfutils/files/debian/mips_cfi.patch | 131 + ... Why are we following Debian patches in a package with active upstream? I am afraid no, we need to rebase them (0.176) to 0.177 The part about rebasing existing patches is clear. But why are we for example adding mips_cfi.patch when this is not upstream? There might be a good reason for doing so, but "because it is a Debian patch" is not a good reason. And the existing hppa/hurd/kfreebsd patches from Debian are unlikely to make sense in OE. I just integrate debian patches as a whole, if you are familiar with elfutils and make sure some of them does not make sense, modification on them is welcome //Hongxu //Hongxu cu Adrian -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for systemd: Update to the latest 242 branch
== Series Details == Series: systemd: Update to the latest 242 branch Revision: 1 URL : https://patchwork.openembedded.org/series/19451/ 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 Series cannot be parsed correctly due to malformed diff lines [test_mbox_format] Suggested fixCreate the series again using git-format-patch and ensure it can be applied using git am Diff lineHunk is shorter than expected * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 64f9fd2a1e) 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] [PATCHv2] libffi: Make it build for MIPS o32
This solves the following errors: src/mips/o32.S: Assembler messages: src/mips/o32.S:286: Error: opcode not supported on this processor: mips32r2 (mips32r2) `s.d $f12,((16*4)-10*4)($fp)' src/mips/o32.S:287: Error: opcode not supported on this processor: mips32r2 (mips32r2) `s.d $f14,((16*4)-8*4)($fp)' Signed-off-by: Peter Kjellerstedt --- PATCHv2: Add Signed-off-by to the patch file. ...-missed-ifndef-for-__mips_soft_float.patch | 31 +++ meta/recipes-support/libffi/libffi_3.3~rc0.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch diff --git a/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch b/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch new file mode 100644 index 00..00a30a3554 --- /dev/null +++ b/meta/recipes-support/libffi/libffi/0001-Fixed-missed-ifndef-for-__mips_soft_float.patch @@ -0,0 +1,31 @@ +From 4149a7627a998731cc246d3f58a36808745d04c8 Mon Sep 17 00:00:00 2001 +From: Carl Hurd +Date: Wed, 18 Jul 2018 09:04:32 -0400 +Subject: [PATCH] Fixed missed #ifndef for __mips_soft_float + +Signed-off-by: Peter Kjellerstedt +--- +Upstream-Status: Submitted [https://github.com/libffi/libffi/pull/442] + + src/mips/o32.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/mips/o32.S b/src/mips/o32.S +index 44e74cb..799139b 100644 +--- a/src/mips/o32.S b/src/mips/o32.S +@@ -282,9 +282,11 @@ $LCFI12: + li $13, 1 # FFI_O32 + bne $16, $13, 1f# Skip fp save if FFI_O32_SOFT_FLOAT + ++#ifndef __mips_soft_float + # Store all possible float/double registers. + s.d $f12, FA_0_0_OFF2($fp) + s.d $f14, FA_1_0_OFF2($fp) ++#endif + 1: + # prepare arguments for ffi_closure_mips_inner_O32 + REG_L a0, 4($15) # cif +-- +2.21.0 + diff --git a/meta/recipes-support/libffi/libffi_3.3~rc0.bb b/meta/recipes-support/libffi/libffi_3.3~rc0.bb index dadde0b2a0..3e2845546e 100644 --- a/meta/recipes-support/libffi/libffi_3.3~rc0.bb +++ b/meta/recipes-support/libffi/libffi_3.3~rc0.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b" SRC_URI = "https://github.com/libffi/libffi/releases/download/v3.3-rc0/libffi-3.3-rc0.tar.gz \ file://not-win32.patch \ + file://0001-Fixed-missed-ifndef-for-__mips_soft_float.patch \ " SRC_URI[md5sum] = "8d2a82a78faf10a5e53c27d986e8f04e" SRC_URI[sha256sum] = "403d67aabf1c05157855ea2b1d9950263fb6316536c8c333f5b9ab1eb2f20ecf" -- 2.21.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [OE-Core][warrior][PATCH] rng-tools: start rngd early in the boot process again
From: "Bedel, Alban" It do make sense to start rngd early in the boot process because otherwise we would need to track every service that might need entropy and explicitly configure it to start after rngd. When used with systemd rngd blocked the shutdown process because it simply missed the proper unit configuration. As the systemd documentation explains, when using DefaultDependencies=no one also have to explicitly configure the unit to properly stop at some point. This is normaly achieved by having Before=shutdown.target and Conflicts=shutdown.target set for the unit. To have rngd started early again we reverte the changes done to rngd.service in commit edf7606822 (rng-tools: fix rngd blocks system shutdown). To have it properly stopped on shutdown we also add Before=shutdown.target and Conflicts=shutdown.target. Signed-off-by: Alban Bedel Signed-off-by: Richard Purdie (cherry picked from commit a74e7df33e2c8ab2152e3217c0a5df3f65971713) --- meta/recipes-support/rng-tools/rng-tools/rngd.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/rng-tools/rng-tools/rngd.service b/meta/recipes-support/rng-tools/rng-tools/rngd.service index f0355db14fc..5c8253b5fba 100644 --- a/meta/recipes-support/rng-tools/rng-tools/rngd.service +++ b/meta/recipes-support/rng-tools/rng-tools/rngd.service @@ -2,7 +2,8 @@ Description=Hardware RNG Entropy Gatherer Daemon DefaultDependencies=no After=systemd-udev-settle.service -Before=sysinit.target +Before=sysinit.target shutdown.target +Conflicts=shutdown.target [Service] ExecStart=@SBINDIR@/rngd -f -r /dev/hwrng -- 2.20.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [OE-Core][warrior][PATCH] rng-tools: start rngd early in the boot process again
Without this change, images with systemd hang on shutdown/reboot. On Fri, Aug 23, 2019 at 1:39 PM Fabio Berton wrote: > > From: "Bedel, Alban" > > It do make sense to start rngd early in the boot process because > otherwise we would need to track every service that might need entropy > and explicitly configure it to start after rngd. > > When used with systemd rngd blocked the shutdown process because it > simply missed the proper unit configuration. As the systemd > documentation explains, when using DefaultDependencies=no one also > have to explicitly configure the unit to properly stop at some point. > This is normaly achieved by having Before=shutdown.target and > Conflicts=shutdown.target set for the unit. > > To have rngd started early again we reverte the changes done to > rngd.service in commit edf7606822 (rng-tools: fix rngd blocks system > shutdown). To have it properly stopped on shutdown we also add > Before=shutdown.target and Conflicts=shutdown.target. > > Signed-off-by: Alban Bedel > Signed-off-by: Richard Purdie > (cherry picked from commit a74e7df33e2c8ab2152e3217c0a5df3f65971713) > --- > meta/recipes-support/rng-tools/rng-tools/rngd.service | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-support/rng-tools/rng-tools/rngd.service > b/meta/recipes-support/rng-tools/rng-tools/rngd.service > index f0355db14fc..5c8253b5fba 100644 > --- a/meta/recipes-support/rng-tools/rng-tools/rngd.service > +++ b/meta/recipes-support/rng-tools/rng-tools/rngd.service > @@ -2,7 +2,8 @@ > Description=Hardware RNG Entropy Gatherer Daemon > DefaultDependencies=no > After=systemd-udev-settle.service > -Before=sysinit.target > +Before=sysinit.target shutdown.target > +Conflicts=shutdown.target > > [Service] > ExecStart=@SBINDIR@/rngd -f -r /dev/hwrng > -- > 2.20.1 > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Automatic prebuilt management
On Mon, Aug 5, 2019 at 9:06 AM Loic Poulain wrote:
> Say a company works with an OE internal tree, with open-source and
> closed-source packages. The company wants to release the tree so that its
> customers can fully customize the images/distro. The closed sources being
> only available internally, the company has to generate and handle prebuilt
> binaries for proprietary packages. Ideally, with a unified public/internal OE
> tree (same recipes for internal/public build).
>
> This question is actually similar to an older thread:
> https://marc.info/?l=openembedded-core=146779329804683
That very old thread was also referenced recently in a follow up where
I shared a later solution, see:
http://lists.openembedded.org/pipermail/openembedded-core/2019-July/284896.html
> I started to work on this and added a 'generate-prebuilt' class which
> generates a tarball of ${D} in deploy/prebuilts after do_install task.
> Symmetrically, It's also possible to create an 'install-prebuilt' class which
> bypasses do_fetch, do_unpack, ..., do_install with noexec flag and instead
> uncompresses a previously generated prebuilt tarball into ${D} and continue
> normally. But I would like something smarter, e.g. first trying to check if
> the SRC_URI is available, if not switching on using the prebuilt package if
> available (e.g. in a DIR_PREBUILT)...
>
> Before going further is there already an existing solution for that? do you
> have any recommendation on the easier/best way to achieve this?
I did initially try the approach of having a single recipe which can
automatically support both building from source and extracting a
prebuilts tar file, but that (for me anyway) turned out to be a dead
end. Building from source requires build dependencies and config
options but extracting a prebuilt tar file does not, so the two end up
sharing very little... so 90% of the recipe ends up being conditional
on which mode it's running in. The solution I ended up with (see link
above) was for the class which creates the prebuilt tar file to also
create a dedicated mini recipe to extract it.
>From my experience however an equally hard part of the problem is the
distribution of prebuilts. It starts off easy (you share a tar file
via email or an ftp site and the receiver manually copies to their
downloads directory...) but that doesn't scale if you need to make
regular updates. My solution is discussed a little more in the thread
linked to above.
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
