* [OE-core][dunfell 01/17] gcr: depends on gnupg-native
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 02/17] bison: fix the parallel build Steve Sakoman
` (15 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Kai Kang <kai.kang@windriver.com>
It fails to build gcr if no commmand gpg on build host:
| meson.build:44:0: ERROR: Program(s) ['gpg2', 'gpg'] not found or not executable
Add dependency gnupg-native to fix the error.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit e4a6eda4c246b2bca059defed796bdab19a7ab5f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-gnome/gcr/gcr_3.34.0.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-gnome/gcr/gcr_3.34.0.bb b/meta/recipes-gnome/gcr/gcr_3.34.0.bb
index 9853b3f416..39e87de5f0 100644
--- a/meta/recipes-gnome/gcr/gcr_3.34.0.bb
+++ b/meta/recipes-gnome/gcr/gcr_3.34.0.bb
@@ -8,7 +8,7 @@ BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt \
+DEPENDS = "gtk+3 p11-kit glib-2.0 libgcrypt gnupg-native \
${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}"
inherit gnomebase gtk-icon-cache gtk-doc features_check upstream-version-is-even vala gobject-introspection gettext mime mime-xdg
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 02/17] bison: fix the parallel build
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 01/17] gcr: depends on gnupg-native Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 03/17] archiver.bbclass: Make do_deploy_archives a recursive dependency Steve Sakoman
` (14 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Mingli Yu <mingli.yu@windriver.com>
Explicitly make the BUILT_SOURCES which
are the generated headers such as stdio.h,
fcntl.h and etc to be the dependencies of
the gl_LIBOBJS such as libbison_a-sprintf.o,
libbison_a-printf.o and etc to guarantee the
BUILT_SOURCES is generated before begin to
compile EXTRA_lib_libbison_a_SOURCES such as
fprintf.c in parallel builid, otherwise there
may come below error:
| muscle-tab.c:(.text+0x77a): undefined reference to `rpl_sprintf'
It does the same for src_bison_OBJECTS and
lib_libbison_a_OBJECTS to make sure BUILT_SOURCES
generated before begin to compile src_bison_SOURCES
which contains AnnotationList.c and etc.
BTW, the MOSTLYCLEANFILES also contains the
generated header needs to be created early
in the build process, so add it also in to
avoid below error:
| ./lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory
[YOCTO #13825]
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit 43d74b11095092b13f94074785d0306484fabea6)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../0001-bison-fix-the-parallel-build.patch | 63 +++++++++++++++++++
meta/recipes-devtools/bison/bison_3.5.3.bb | 1 +
2 files changed, 64 insertions(+)
create mode 100644 meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch
diff --git a/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch b/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch
new file mode 100644
index 0000000000..c3be91a109
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison/0001-bison-fix-the-parallel-build.patch
@@ -0,0 +1,63 @@
+From e0dbcee6e25b3c0cb11a627bbfe3af45ef67ec30 Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 14 May 2020 15:23:16 +0800
+Subject: [PATCH] bison: fix the parallel build
+
+Explicitly make the BUILT_SOURCES which
+are the generated headers such as stdio.h,
+fcntl.h and etc to be the dependencies of
+the gl_LIBOBJS such as libbison_a-sprintf.o,
+libbison_a-printf.o and etc to guarantee the
+BUILT_SOURCES is generated before begin to
+compile EXTRA_lib_libbison_a_SOURCES such as
+fprintf.c in parallel builid, otherwise there
+may come below error:
+ | muscle-tab.c:(.text+0x77a): undefined reference to `rpl_sprintf'
+
+It does the same for src_bison_OBJECTS and
+lib_libbison_a_OBJECTS to make sure BUILT_SOURCES
+generated before begin to compile src_bison_SOURCES
+which contains AnnotationList.c and etc.
+
+BTW, the MOSTLYCLEANFILES also contains the
+generated header needs to be created early
+in the build process, so add it also in to
+avoid below error:
+ | ./lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory
+
+Upstream-Status: Submitted [bison-patches@gnu.org maillist]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ lib/gnulib.mk | 2 ++
+ src/local.mk | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/lib/gnulib.mk b/lib/gnulib.mk
+index c21c656..27fb3dc 100644
+--- a/lib/gnulib.mk
++++ b/lib/gnulib.mk
+@@ -120,6 +120,8 @@ lib_libbison_a_SOURCES =
+ lib_libbison_a_LIBADD = $(gl_LIBOBJS)
+ lib_libbison_a_DEPENDENCIES = $(gl_LIBOBJS)
+ EXTRA_lib_libbison_a_SOURCES =
++$(lib_libbison_a_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
++$(gl_LIBOBJS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
+
+ lib_libbison_a_CPPFLAGS = $(AM_CPPFLAGS) -DDEFAULT_TEXT_DOMAIN=\"bison-gnulib\"
+
+diff --git a/src/local.mk b/src/local.mk
+index 61dc573..b5b9079 100644
+--- a/src/local.mk
++++ b/src/local.mk
+@@ -24,6 +24,7 @@ if RELOCATABLE_VIA_LD
+ src_bison_LDFLAGS = `$(RELOCATABLE_LDFLAGS) $(bindir)`
+ endif
+
++$(src_bison_OBJECTS): $(BUILT_SOURCES) $(MOSTLYCLEANFILES:%.h)
+ src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS)
+ src_bison_SOURCES = \
+ src/AnnotationList.c \
+--
+2.17.1
+
diff --git a/meta/recipes-devtools/bison/bison_3.5.3.bb b/meta/recipes-devtools/bison/bison_3.5.3.bb
index 27e09434f8..36c29fe4df 100644
--- a/meta/recipes-devtools/bison/bison_3.5.3.bb
+++ b/meta/recipes-devtools/bison/bison_3.5.3.bb
@@ -12,6 +12,7 @@ DEPENDS = "bison-native flex-native"
SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
file://dont-depend-on-help2man.patch.patch \
file://add-with-bisonlocaledir.patch \
+ file://0001-bison-fix-the-parallel-build.patch \
"
SRC_URI[sha256sum] = "2bf85b5f88a5f2fa8069aed2a2dfc3a9f8d15a97e59c713e3906e5fdd982a7c4"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 03/17] archiver.bbclass: Make do_deploy_archives a recursive dependency
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 01/17] gcr: depends on gnupg-native Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 02/17] bison: fix the parallel build Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 04/17] python3-setuptools: add the missing rdepends Steve Sakoman
` (13 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Paul Barker <pbarker@konsulko.com>
To ensure that archives are captured for all dependencies of a typical
bitbake build we add do_deploy_archives to the list of recursive
dependencies of do_build. Without this, archives may be missed for
recipes such as gcc-source which do not create packages or populate a
sysroot.
do_deploy_archives is also added to the recursive dependencies of
do_populate_sdk so that all sources required for an SDK can be captured.
Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit e1feb6030cd8e77c553ec10a366cbeb7e902bada)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/archiver.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 48b4913a9f..43333a7551 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -583,7 +583,9 @@ addtask do_ar_configured after do_unpack_and_patch
addtask do_ar_mirror after do_fetch
addtask do_dumpdata
addtask do_ar_recipe
-addtask do_deploy_archives before do_build
+addtask do_deploy_archives
+do_build[recrdeptask] += "do_deploy_archives"
+do_populate_sdk[recrdeptask] += "do_deploy_archives"
python () {
# Add tasks in the correct order, specifically for linux-yocto to avoid race condition.
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 04/17] python3-setuptools: add the missing rdepends
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (2 preceding siblings ...)
2020-05-25 22:36 ` [OE-core][dunfell 03/17] archiver.bbclass: Make do_deploy_archives a recursive dependency Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 05/17] recipes-kernel/linux-firmware: Add wlanmdsp.mbn to qcom-modem package Steve Sakoman
` (12 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Mingli Yu <mingli.yu@windriver.com>
Add the missing rdepends to fix below error:
# python3
[snip]
>>> import setuptools.lib2to3_ex
[snip]
ModuleNotFoundError: No module named 'lib2to3'
ModuleNotFoundError: No module named 'pickle'
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit be5c3c989d75290863cc7aef9949cf6e82d3070f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/python/python-setuptools.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-devtools/python/python-setuptools.inc b/meta/recipes-devtools/python/python-setuptools.inc
index 58267966ba..29be852f66 100644
--- a/meta/recipes-devtools/python/python-setuptools.inc
+++ b/meta/recipes-devtools/python/python-setuptools.inc
@@ -16,6 +16,7 @@ SRC_URI[sha256sum] = "89c6e6011ec2f6d57d43a3f9296c4ef022c2cbf49bab26b407fe67992a
DEPENDS += "${PYTHON_PN}"
RDEPENDS_${PN} = "\
+ ${PYTHON_PN}-2to3 \
${PYTHON_PN}-compile \
${PYTHON_PN}-compression \
${PYTHON_PN}-ctypes \
@@ -25,6 +26,7 @@ RDEPENDS_${PN} = "\
${PYTHON_PN}-json \
${PYTHON_PN}-netserver \
${PYTHON_PN}-numbers \
+ ${PYTHON_PN}-pickle \
${PYTHON_PN}-pkgutil \
${PYTHON_PN}-plistlib \
${PYTHON_PN}-shell \
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 05/17] recipes-kernel/linux-firmware: Add wlanmdsp.mbn to qcom-modem package
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (3 preceding siblings ...)
2020-05-25 22:36 ` [OE-core][dunfell 04/17] python3-setuptools: add the missing rdepends Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 06/17] recipes-kernel/linux-firmware: Add adreno-a630 firmware package Steve Sakoman
` (11 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Aníbal Limón <anibal.limon@linaro.org>
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit 730999efcab0b8e49f1ade4e535a59f6d8e395e0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
index 7173409e05..139307cda3 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
@@ -851,7 +851,7 @@ FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw $
FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*"
FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*"
FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*"
-FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.*"
+FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn"
RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license"
RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license"
RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 06/17] recipes-kernel/linux-firmware: Add adreno-a630 firmware package
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (4 preceding siblings ...)
2020-05-25 22:36 ` [OE-core][dunfell 05/17] recipes-kernel/linux-firmware: Add wlanmdsp.mbn to qcom-modem package Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 07/17] linux-firmware: Update to 20200122 -> 20200421 Steve Sakoman
` (10 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Aníbal Limón <anibal.limon@linaro.org>
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit f3021d19eff3c9705cd91e407c042a1aa3b8e7d9)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
index 139307cda3..ac7d6ec431 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
@@ -288,7 +288,7 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
${PN}-qat ${PN}-qat-license \
${PN}-qcom-license \
${PN}-qcom-venus-1.8 ${PN}-qcom-venus-4.2 \
- ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 \
+ ${PN}-qcom-adreno-a3xx ${PN}-qcom-adreno-a530 ${PN}-qcom-adreno-a630 \
${PN}-qcom-sdm845-audio ${PN}-qcom-sdm845-compute ${PN}-qcom-sdm845-modem \
${PN}-whence-license \
${PN}-license \
@@ -849,6 +849,7 @@ FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*"
FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*"
FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw"
FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*"
+FILES_${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*"
FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*"
FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*"
FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn"
@@ -856,6 +857,7 @@ RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license"
RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license"
RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license"
RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license"
+RDEPENDS_${PN}-qcom-adreno-a630 = "${PN}-qcom-license"
RDEPENDS_${PN}-qcom-sdm845-audio = "${PN}-qcom-license"
RDEPENDS_${PN}-qcom-sdm845-compute = "${PN}-qcom-license"
RDEPENDS_${PN}-qcom-sdm845-modem = "${PN}-qcom-license"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 07/17] linux-firmware: Update to 20200122 -> 20200421
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (5 preceding siblings ...)
2020-05-25 22:36 ` [OE-core][dunfell 06/17] recipes-kernel/linux-firmware: Add adreno-a630 firmware package Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 08/17] make-mod-scripts: Fix dependence error Steve Sakoman
` (9 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Aníbal Limón <anibal.limon@linaro.org>
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit 7f52475a2c84197c95928d65debf894bf59c90e7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...inux-firmware_20200122.bb => linux-firmware_20200421.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-kernel/linux-firmware/{linux-firmware_20200122.bb => linux-firmware_20200421.bb} (99%)
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb
similarity index 99%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
rename to meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb
index ac7d6ec431..fa0507a88c 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20200122.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20200421.bb
@@ -125,7 +125,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \
file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \
file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \
- file://WHENCE;md5=c27d0c06cd5d376d8ab55860e65ba4e4 \
+ file://WHENCE;md5=cb9a66eff0464b55335d3a7374fbc51c \
"
# These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -196,8 +196,8 @@ PE = "1"
SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "ac291b21f366ae2a37193ec8f14c39d2"
-SRC_URI[sha256sum] = "a30e811b3736a72b874ac27e10662f5e5409b1cadf8aab7ba88e8f8bc8083986"
+SRC_URI[md5sum] = "229a93395f4033da68429f165a62b952"
+SRC_URI[sha256sum] = "6dd7cba25d694c031f65529b9027cc8faaffaddfae70a4e3b58c2e4a0af3bfa8"
inherit allarch
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 08/17] make-mod-scripts: Fix dependence error.
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (6 preceding siblings ...)
2020-05-25 22:36 ` [OE-core][dunfell 07/17] linux-firmware: Update to 20200122 -> 20200421 Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 09/17] libubootenv: Depend on zlib Steve Sakoman
` (8 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: zhengruoqin <zhengrq.fnst@cn.fujitsu.com>
Error:
Problem: conflicting requests
- nothing provides make-mod-scripts = 1.0-r0 needed by
make-mod-scripts-dev-1.0-r0
Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit 41fff377b921070f371c0aa639e37c27c113ccb9)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
index 460e05a445..0be1422a24 100644
--- a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
+++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
@@ -12,6 +12,8 @@ S = "${WORKDIR}"
do_configure[depends] += "virtual/kernel:do_shared_workdir openssl-native:do_populate_sysroot"
do_compile[depends] += "virtual/kernel:do_compile_kernelmodules"
+RDEPENDS_${PN}-dev = ""
+
DEPENDS += "bc-native bison-native"
EXTRA_OEMAKE = " HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}""
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 09/17] libubootenv: Depend on zlib
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (7 preceding siblings ...)
2020-05-25 22:36 ` [OE-core][dunfell 08/17] make-mod-scripts: Fix dependence error Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-26 8:24 ` Paul Barker
2020-05-25 22:36 ` [OE-core][dunfell 10/17] qemu: fix CVE-2020-11869 Steve Sakoman
` (7 subsequent siblings)
16 siblings, 1 reply; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Marek Vasut <marex@denx.de>
The libubootenv depends on zlib as it calls at least crc32() from
there and links against it. Add the DEPENDS entry.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit db513f9ec59b7ac526b2cdc42b0eb2573e134bc4)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
index 3251d0f05b..fa90a12bf8 100644
--- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
+++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
@@ -1,5 +1,5 @@
SUMMARY = "U-Boot libraries and tools to access environment"
-DEPENDS += "mtd-utils"
+DEPENDS += "mtd-utils zlib"
DESCRIPTION = "This package contains tools and libraries to read \
and modify U-Boot environment. \
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [OE-core][dunfell 09/17] libubootenv: Depend on zlib
2020-05-25 22:36 ` [OE-core][dunfell 09/17] libubootenv: Depend on zlib Steve Sakoman
@ 2020-05-26 8:24 ` Paul Barker
2020-05-26 8:56 ` Adrian Bunk
0 siblings, 1 reply; 24+ messages in thread
From: Paul Barker @ 2020-05-26 8:24 UTC (permalink / raw)
To: Steve Sakoman; +Cc: openembedded-core
On Mon, 25 May 2020 at 23:37, Steve Sakoman <steve@sakoman.com> wrote:
>
> From: Marek Vasut <marex@denx.de>
>
> The libubootenv depends on zlib as it calls at least crc32() from
> there and links against it. Add the DEPENDS entry.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Stefano Babic <sbabic@denx.de>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> (cherry picked from commit db513f9ec59b7ac526b2cdc42b0eb2573e134bc4)
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> ---
> meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> index 3251d0f05b..fa90a12bf8 100644
> --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> @@ -1,5 +1,5 @@
> SUMMARY = "U-Boot libraries and tools to access environment"
> -DEPENDS += "mtd-utils"
> +DEPENDS += "mtd-utils zlib"
>
> DESCRIPTION = "This package contains tools and libraries to read \
> and modify U-Boot environment. \
> --
> 2.17.1
Is this actually needed for the u-boot version in dunfell? My
understanding when I saw the original patch was that this is a new
requirement of the latest u-boot.
Thanks,
--
Paul Barker
Konsulko Group
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [OE-core][dunfell 09/17] libubootenv: Depend on zlib
2020-05-26 8:24 ` Paul Barker
@ 2020-05-26 8:56 ` Adrian Bunk
2020-05-26 8:57 ` Paul Barker
0 siblings, 1 reply; 24+ messages in thread
From: Adrian Bunk @ 2020-05-26 8:56 UTC (permalink / raw)
To: Paul Barker; +Cc: Steve Sakoman, openembedded-core, Marek Vasut, Stefano Babic
On Tue, May 26, 2020 at 09:24:59AM +0100, Paul Barker wrote:
> On Mon, 25 May 2020 at 23:37, Steve Sakoman <steve@sakoman.com> wrote:
> >
> > From: Marek Vasut <marex@denx.de>
> >
> > The libubootenv depends on zlib as it calls at least crc32() from
> > there and links against it. Add the DEPENDS entry.
> >
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Stefano Babic <sbabic@denx.de>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > (cherry picked from commit db513f9ec59b7ac526b2cdc42b0eb2573e134bc4)
> > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > ---
> > meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> > index 3251d0f05b..fa90a12bf8 100644
> > --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> > +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> > @@ -1,5 +1,5 @@
> > SUMMARY = "U-Boot libraries and tools to access environment"
> > -DEPENDS += "mtd-utils"
> > +DEPENDS += "mtd-utils zlib"
> >
> > DESCRIPTION = "This package contains tools and libraries to read \
> > and modify U-Boot environment. \
> > --
> > 2.17.1
>
> Is this actually needed for the u-boot version in dunfell? My
> understanding when I saw the original patch was that this is a new
> requirement of the latest u-boot.
libubootenv (not u-boot) uses zlib also in dunfell,
and a direct dependency looks correct to me.
I assume the breaking case involves a layer shipping an own mtd-utils
recipe that does not pull in zlib.
> Thanks,
cu
Adrian
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [OE-core][dunfell 09/17] libubootenv: Depend on zlib
2020-05-26 8:56 ` Adrian Bunk
@ 2020-05-26 8:57 ` Paul Barker
2020-05-26 9:07 ` Stefano Babic
0 siblings, 1 reply; 24+ messages in thread
From: Paul Barker @ 2020-05-26 8:57 UTC (permalink / raw)
To: Adrian Bunk; +Cc: Steve Sakoman, openembedded-core, Marek Vasut, Stefano Babic
On Tue, 26 May 2020 at 09:56, Adrian Bunk <bunk@stusta.de> wrote:
>
> On Tue, May 26, 2020 at 09:24:59AM +0100, Paul Barker wrote:
> > On Mon, 25 May 2020 at 23:37, Steve Sakoman <steve@sakoman.com> wrote:
> > >
> > > From: Marek Vasut <marex@denx.de>
> > >
> > > The libubootenv depends on zlib as it calls at least crc32() from
> > > there and links against it. Add the DEPENDS entry.
> > >
> > > Signed-off-by: Marek Vasut <marex@denx.de>
> > > Cc: Stefano Babic <sbabic@denx.de>
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > > (cherry picked from commit db513f9ec59b7ac526b2cdc42b0eb2573e134bc4)
> > > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > > ---
> > > meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> > > index 3251d0f05b..fa90a12bf8 100644
> > > --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> > > +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> > > @@ -1,5 +1,5 @@
> > > SUMMARY = "U-Boot libraries and tools to access environment"
> > > -DEPENDS += "mtd-utils"
> > > +DEPENDS += "mtd-utils zlib"
> > >
> > > DESCRIPTION = "This package contains tools and libraries to read \
> > > and modify U-Boot environment. \
> > > --
> > > 2.17.1
> >
> > Is this actually needed for the u-boot version in dunfell? My
> > understanding when I saw the original patch was that this is a new
> > requirement of the latest u-boot.
>
> libubootenv (not u-boot) uses zlib also in dunfell,
> and a direct dependency looks correct to me.
>
> I assume the breaking case involves a layer shipping an own mtd-utils
> recipe that does not pull in zlib.
Thanks for the confirmation, I understand now. Looks good for dunfell.
--
Paul Barker
Konsulko Group
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [OE-core][dunfell 09/17] libubootenv: Depend on zlib
2020-05-26 8:57 ` Paul Barker
@ 2020-05-26 9:07 ` Stefano Babic
0 siblings, 0 replies; 24+ messages in thread
From: Stefano Babic @ 2020-05-26 9:07 UTC (permalink / raw)
To: Paul Barker, Adrian Bunk
Cc: Steve Sakoman, openembedded-core, Marek Vasut, Stefano Babic
On 26.05.20 10:57, Paul Barker wrote:
> On Tue, 26 May 2020 at 09:56, Adrian Bunk <bunk@stusta.de> wrote:
>>
>> On Tue, May 26, 2020 at 09:24:59AM +0100, Paul Barker wrote:
>>> On Mon, 25 May 2020 at 23:37, Steve Sakoman <steve@sakoman.com> wrote:
>>>>
>>>> From: Marek Vasut <marex@denx.de>
>>>>
>>>> The libubootenv depends on zlib as it calls at least crc32() from
>>>> there and links against it. Add the DEPENDS entry.
>>>>
>>>> Signed-off-by: Marek Vasut <marex@denx.de>
>>>> Cc: Stefano Babic <sbabic@denx.de>
>>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>>>> Signed-off-by: Steve Sakoman <steve@sakoman.com>
>>>> (cherry picked from commit db513f9ec59b7ac526b2cdc42b0eb2573e134bc4)
>>>> Signed-off-by: Steve Sakoman <steve@sakoman.com>
>>>> ---
>>>> meta/recipes-bsp/u-boot/libubootenv_0.2.bb | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
>>>> index 3251d0f05b..fa90a12bf8 100644
>>>> --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
>>>> +++ b/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
>>>> @@ -1,5 +1,5 @@
>>>> SUMMARY = "U-Boot libraries and tools to access environment"
>>>> -DEPENDS += "mtd-utils"
>>>> +DEPENDS += "mtd-utils zlib"
>>>>
>>>> DESCRIPTION = "This package contains tools and libraries to read \
>>>> and modify U-Boot environment. \
>>>> --
>>>> 2.17.1
>>>
>>> Is this actually needed for the u-boot version in dunfell? My
>>> understanding when I saw the original patch was that this is a new
>>> requirement of the latest u-boot.
>>
>> libubootenv (not u-boot) uses zlib also in dunfell,
>> and a direct dependency looks correct to me.
>>
>> I assume the breaking case involves a layer shipping an own mtd-utils
>> recipe that does not pull in zlib.
>
Yes, it is exactly the case. dunfell builds without issues
libubootenv-bin (fw_setenv / fw_printenv). Users of library have
doscovered the issue because they have not zlib in their own recipe.
> Thanks for the confirmation, I understand now. Looks good for dunfell.
>
Regards,
Stefano
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 24+ messages in thread
* [OE-core][dunfell 10/17] qemu: fix CVE-2020-11869
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (8 preceding siblings ...)
2020-05-25 22:36 ` [OE-core][dunfell 09/17] libubootenv: Depend on zlib Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 11/17] base/insane: Check pkgs lics are subset of recipe lics only once Steve Sakoman
` (6 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit 5f01d45266bbc0d0f1a32d10c0841326193cc9c1)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/qemu/qemu.inc | 1 +
.../qemu/qemu/CVE-2020-11869.patch | 97 +++++++++++++++++++
2 files changed, 98 insertions(+)
create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2020-11869.patch
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 7a1ccf2115..126e7d442c 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -37,6 +37,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://CVE-2020-7211.patch \
file://0001-qemu-Do-not-include-file-if-not-exists.patch \
file://CVE-2020-11102.patch \
+ file://CVE-2020-11869.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2020-11869.patch b/meta/recipes-devtools/qemu/qemu/CVE-2020-11869.patch
new file mode 100644
index 0000000000..ca7ffed934
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/CVE-2020-11869.patch
@@ -0,0 +1,97 @@
+From ac2071c3791b67fc7af78b8ceb320c01ca1b5df7 Mon Sep 17 00:00:00 2001
+From: BALATON Zoltan <balaton@eik.bme.hu>
+Date: Mon, 6 Apr 2020 22:34:26 +0200
+Subject: [PATCH] ati-vga: Fix checks in ati_2d_blt() to avoid crash
+
+In some corner cases (that never happen during normal operation but a
+malicious guest could program wrong values) pixman functions were
+called with parameters that result in a crash. Fix this and add more
+checks to disallow such cases.
+
+Reported-by: Ziming Zhang <ezrakiez@gmail.com>
+Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
+Message-id: 20200406204029.19559747D5D@zero.eik.bme.hu
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+
+Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commit;h=ac2071c3791b67fc7af78b8ceb320c01ca1b5df7]
+CVE: CVE-2020-11869
+Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
+---
+ hw/display/ati_2d.c | 37 ++++++++++++++++++++++++++-----------
+ 1 file changed, 26 insertions(+), 11 deletions(-)
+
+diff --git a/hw/display/ati_2d.c b/hw/display/ati_2d.c
+index 42e8231..23a8ae0 100644
+--- a/hw/display/ati_2d.c
++++ b/hw/display/ati_2d.c
+@@ -53,12 +53,20 @@ void ati_2d_blt(ATIVGAState *s)
+ s->vga.vbe_start_addr, surface_data(ds), surface_stride(ds),
+ surface_bits_per_pixel(ds),
+ (s->regs.dp_mix & GMC_ROP3_MASK) >> 16);
+- int dst_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
+- s->regs.dst_x : s->regs.dst_x + 1 - s->regs.dst_width);
+- int dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
+- s->regs.dst_y : s->regs.dst_y + 1 - s->regs.dst_height);
++ unsigned dst_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
++ s->regs.dst_x : s->regs.dst_x + 1 - s->regs.dst_width);
++ unsigned dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
++ s->regs.dst_y : s->regs.dst_y + 1 - s->regs.dst_height);
+ int bpp = ati_bpp_from_datatype(s);
++ if (!bpp) {
++ qemu_log_mask(LOG_GUEST_ERROR, "Invalid bpp\n");
++ return;
++ }
+ int dst_stride = DEFAULT_CNTL ? s->regs.dst_pitch : s->regs.default_pitch;
++ if (!dst_stride) {
++ qemu_log_mask(LOG_GUEST_ERROR, "Zero dest pitch\n");
++ return;
++ }
+ uint8_t *dst_bits = s->vga.vram_ptr + (DEFAULT_CNTL ?
+ s->regs.dst_offset : s->regs.default_offset);
+
+@@ -82,12 +90,16 @@ void ati_2d_blt(ATIVGAState *s)
+ switch (s->regs.dp_mix & GMC_ROP3_MASK) {
+ case ROP3_SRCCOPY:
+ {
+- int src_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
+- s->regs.src_x : s->regs.src_x + 1 - s->regs.dst_width);
+- int src_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
+- s->regs.src_y : s->regs.src_y + 1 - s->regs.dst_height);
++ unsigned src_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
++ s->regs.src_x : s->regs.src_x + 1 - s->regs.dst_width);
++ unsigned src_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
++ s->regs.src_y : s->regs.src_y + 1 - s->regs.dst_height);
+ int src_stride = DEFAULT_CNTL ?
+ s->regs.src_pitch : s->regs.default_pitch;
++ if (!src_stride) {
++ qemu_log_mask(LOG_GUEST_ERROR, "Zero source pitch\n");
++ return;
++ }
+ uint8_t *src_bits = s->vga.vram_ptr + (DEFAULT_CNTL ?
+ s->regs.src_offset : s->regs.default_offset);
+
+@@ -137,8 +149,10 @@ void ati_2d_blt(ATIVGAState *s)
+ dst_y * surface_stride(ds),
+ s->regs.dst_height * surface_stride(ds));
+ }
+- s->regs.dst_x += s->regs.dst_width;
+- s->regs.dst_y += s->regs.dst_height;
++ s->regs.dst_x = (s->regs.dp_cntl & DST_X_LEFT_TO_RIGHT ?
++ dst_x + s->regs.dst_width : dst_x);
++ s->regs.dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
++ dst_y + s->regs.dst_height : dst_y);
+ break;
+ }
+ case ROP3_PATCOPY:
+@@ -179,7 +193,8 @@ void ati_2d_blt(ATIVGAState *s)
+ dst_y * surface_stride(ds),
+ s->regs.dst_height * surface_stride(ds));
+ }
+- s->regs.dst_y += s->regs.dst_height;
++ s->regs.dst_y = (s->regs.dp_cntl & DST_Y_TOP_TO_BOTTOM ?
++ dst_y + s->regs.dst_height : dst_y);
+ break;
+ }
+ default:
+--
+1.8.3.1
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 11/17] base/insane: Check pkgs lics are subset of recipe lics only once
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (9 preceding siblings ...)
2020-05-25 22:36 ` [OE-core][dunfell 10/17] qemu: fix CVE-2020-11869 Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 12/17] testresults.json: add duration of the tests as well Steve Sakoman
` (5 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Quentin Schulz <quentin.schulz@streamunlimited.com>
Move logic checking that all packages licenses are only a subset of
recipe licenses from base.bbclass to the insane.bbclass so that it's
evaluated only once, during do_package_qa.
As explained in the linked bugzilla entry, if a package license is not
part of the recipe license, the warning message gets shown an
unreasonable amount of time because it's evaluated every time a recipe
is parsed.
[YOCTO #10130]
This also makes it possible to silence this error with INSANE_SKIP.
Signed-off-by: Quentin Schulz <quentin.schulz@streamunlimited.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 852408ed4be1f64c57e196688728b7ed223d3493)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/classes/base.bbclass | 13 -------------
meta/classes/insane.bbclass | 21 ++++++++++++++++++++-
2 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 45f9435fd8..7aa2e144eb 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -584,19 +584,6 @@ python () {
bb.debug(1, "Skipping recipe %s because of incompatible license(s): %s" % (pn, ' '.join(incompatible_lic)))
raise bb.parse.SkipRecipe("it has incompatible license(s): %s" % ' '.join(incompatible_lic))
- # Try to verify per-package (LICENSE_<pkg>) values. LICENSE should be a
- # superset of all per-package licenses. We do not do advanced (pattern)
- # matching of license expressions - just check that all license strings
- # in LICENSE_<pkg> are found in LICENSE.
- license_set = oe.license.list_licenses(license)
- for pkg in d.getVar('PACKAGES').split():
- pkg_license = d.getVar('LICENSE_' + pkg)
- if pkg_license:
- unlisted = oe.license.list_licenses(pkg_license) - license_set
- if unlisted:
- bb.warn("LICENSE_%s includes licenses (%s) that are not "
- "listed in LICENSE" % (pkg, ' '.join(unlisted)))
-
needsrcrev = False
srcuri = d.getVar('SRC_URI')
for uri in srcuri.split():
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 7fc8f33a98..3a0efa3ad6 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -28,7 +28,7 @@ WARN_QA ?= "ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi \
pn-overrides infodir build-deps src-uri-bad \
unknown-configure-option symlink-to-sysroot multilib \
invalid-packageconfig host-user-contaminated uppercase-pn patch-fuzz \
- mime mime-xdg \
+ mime mime-xdg unlisted-pkg-lics \
"
ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \
perms dep-cmp pkgvarcheck perm-config perm-line perm-link \
@@ -897,6 +897,25 @@ def package_qa_check_expanded_d(package, d, messages):
sane = False
return sane
+QAPKGTEST[unlisted-pkg-lics] = "package_qa_check_unlisted_pkg_lics"
+def package_qa_check_unlisted_pkg_lics(package, d, messages):
+ """
+ Check that all licenses for a package are among the licenses for the recipe.
+ """
+ pkg_lics = d.getVar('LICENSE_' + package)
+ if not pkg_lics:
+ return True
+
+ recipe_lics_set = oe.license.list_licenses(d.getVar('LICENSE'))
+ unlisted = oe.license.list_licenses(pkg_lics) - recipe_lics_set
+ if not unlisted:
+ return True
+
+ package_qa_add_message(messages, "unlisted-pkg-lics",
+ "LICENSE_%s includes licenses (%s) that are not "
+ "listed in LICENSE" % (package, ' '.join(unlisted)))
+ return False
+
def package_qa_check_encoding(keys, encode, d):
def check_encoding(key, enc):
sane = True
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 12/17] testresults.json: add duration of the tests as well
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (10 preceding siblings ...)
2020-05-25 22:36 ` [OE-core][dunfell 11/17] base/insane: Check pkgs lics are subset of recipe lics only once Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:36 ` [OE-core][dunfell 13/17] file: add bzip2-replacement-native to DEPENDS to fix sstate issue Steve Sakoman
` (4 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Alexander Kanavin <alex.kanavin@gmail.com>
This is printed by testimage, but isn't actually saved.
It's a useful metric for tracking execution times.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 8fc19639f47b959a141dae231395bbababa644e1)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/lib/oeqa/core/runner.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py
index 1284295c34..00b7d0bb12 100644
--- a/meta/lib/oeqa/core/runner.py
+++ b/meta/lib/oeqa/core/runner.py
@@ -182,8 +182,10 @@ class OETestResult(_TestResult):
(status, log) = self._getTestResultDetails(case)
t = ""
+ duration = 0
if case.id() in self.starttime and case.id() in self.endtime:
- t = " (" + "{0:.2f}".format(self.endtime[case.id()] - self.starttime[case.id()]) + "s)"
+ duration = self.endtime[case.id()] - self.starttime[case.id()]
+ t = " (" + "{0:.2f}".format(duration) + "s)"
if status not in logs:
logs[status] = []
@@ -191,6 +193,8 @@ class OETestResult(_TestResult):
report = {'status': status}
if log:
report['log'] = log
+ if duration:
+ report['duration'] = duration
if dump_streams and case.id() in self.logged_output:
(stdout, stderr) = self.logged_output[case.id()]
report['stdout'] = stdout
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 13/17] file: add bzip2-replacement-native to DEPENDS to fix sstate issue
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (11 preceding siblings ...)
2020-05-25 22:36 ` [OE-core][dunfell 12/17] testresults.json: add duration of the tests as well Steve Sakoman
@ 2020-05-25 22:36 ` Steve Sakoman
2020-05-25 22:37 ` [OE-core][dunfell 14/17] newlib: Upgrade to latest yearly release 3.3.0 Steve Sakoman
` (3 subsequent siblings)
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:36 UTC (permalink / raw)
To: openembedded-core
From: Jan-Simon Moeller <dl9pf@gmx.de>
file-native when built on a Debian 10 host will embed a dependency to
'libbz2.so.1.0' (instead of 'libbz2.so.1'). This can cause issues
when sharing the sstate between hosts e.g.:
recipe-sysroot-native/usr/lib/rpm/rpmdeps:
error while loading shared libraries: libbz2.so.1.0: \
cannot open shared object file: No such file or directory
To avoid this situation, let's add the bzip2-replacement-native to the
file recipe's DEPENDS_class-native .
Details in https://bugzilla.yoctoproject.org/show_bug.cgi?id=13915 .
Signed-off-by: Jan-Simon Moeller <dl9pf@gmx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4a996574464028bd5d57b90920d0887d1a81e9e9)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/file/file_5.38.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/file/file_5.38.bb b/meta/recipes-devtools/file/file_5.38.bb
index f5ad568936..2d62ead10b 100644
--- a/meta/recipes-devtools/file/file_5.38.bb
+++ b/meta/recipes-devtools/file/file_5.38.bb
@@ -9,7 +9,7 @@ LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdda1b"
DEPENDS = "file-replacement-native"
-DEPENDS_class-native = ""
+DEPENDS_class-native = "bzip2-replacement-native"
SRC_URI = "git://github.com/file/file.git"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 14/17] newlib: Upgrade to latest yearly release 3.3.0
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (12 preceding siblings ...)
2020-05-25 22:36 ` [OE-core][dunfell 13/17] file: add bzip2-replacement-native to DEPENDS to fix sstate issue Steve Sakoman
@ 2020-05-25 22:37 ` Steve Sakoman
2020-05-26 8:31 ` Paul Barker
2020-05-25 22:37 ` [OE-core][dunfell 15/17] git: Upgrade 2.24.1 -> 2.24.3 Steve Sakoman
` (2 subsequent siblings)
16 siblings, 1 reply; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:37 UTC (permalink / raw)
To: openembedded-core
From: Alejandro Hernandez <alejandro@enedino.org>
Upgrade to the latest snapshot, also drop md5sum while were at it.
(From OE-Core rev: d73aa359e42e707dbc7cfa29c55a2fc8e6bb938a)
Signed-off-by: Alejandro Hernandez Samaniego <alhe@linux.microsoft.com>
Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
.../newlib/{libgloss_3.2.0.bb => libgloss_3.3.0.bb} | 0
meta/recipes-core/newlib/newlib.inc | 3 +--
meta/recipes-core/newlib/{newlib_3.2.0.bb => newlib_3.3.0.bb} | 0
3 files changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-core/newlib/{libgloss_3.2.0.bb => libgloss_3.3.0.bb} (100%)
rename meta/recipes-core/newlib/{newlib_3.2.0.bb => newlib_3.3.0.bb} (100%)
diff --git a/meta/recipes-core/newlib/libgloss_3.2.0.bb b/meta/recipes-core/newlib/libgloss_3.3.0.bb
similarity index 100%
rename from meta/recipes-core/newlib/libgloss_3.2.0.bb
rename to meta/recipes-core/newlib/libgloss_3.3.0.bb
diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc
index 5edea8aba1..96e230f985 100644
--- a/meta/recipes-core/newlib/newlib.inc
+++ b/meta/recipes-core/newlib/newlib.inc
@@ -16,8 +16,7 @@ LIC_FILES_CHKSUM = " \
"
SRC_URI = "https://sourceware.org/pub/newlib/newlib-${PV}.tar.gz"
-SRC_URI[md5sum] = "afb3a01c8c82b6717ea55659a4de30ec"
-SRC_URI[sha256sum] = "f7b2322964a1e3b37bec0768da20f50dfb62247d729110974dd95756a53bb6d4"
+SRC_URI[sha256sum] = "58dd9e3eaedf519360d92d84205c3deef0b3fc286685d1c562e245914ef72c66"
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS = "virtual/${TARGET_PREFIX}gcc"
diff --git a/meta/recipes-core/newlib/newlib_3.2.0.bb b/meta/recipes-core/newlib/newlib_3.3.0.bb
similarity index 100%
rename from meta/recipes-core/newlib/newlib_3.2.0.bb
rename to meta/recipes-core/newlib/newlib_3.3.0.bb
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [OE-core][dunfell 14/17] newlib: Upgrade to latest yearly release 3.3.0
2020-05-25 22:37 ` [OE-core][dunfell 14/17] newlib: Upgrade to latest yearly release 3.3.0 Steve Sakoman
@ 2020-05-26 8:31 ` Paul Barker
2020-05-26 13:59 ` Steve Sakoman
0 siblings, 1 reply; 24+ messages in thread
From: Paul Barker @ 2020-05-26 8:31 UTC (permalink / raw)
To: Steve Sakoman; +Cc: openembedded-core
On Mon, 25 May 2020 at 23:37, Steve Sakoman <steve@sakoman.com> wrote:
>
> From: Alejandro Hernandez <alejandro@enedino.org>
>
> Upgrade to the latest snapshot, also drop md5sum while were at it.
>
> (From OE-Core rev: d73aa359e42e707dbc7cfa29c55a2fc8e6bb938a)
>
> Signed-off-by: Alejandro Hernandez Samaniego <alhe@linux.microsoft.com>
> Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Steve Sakoman <steve@sakoman.com>
> ---
> .../newlib/{libgloss_3.2.0.bb => libgloss_3.3.0.bb} | 0
> meta/recipes-core/newlib/newlib.inc | 3 +--
> meta/recipes-core/newlib/{newlib_3.2.0.bb => newlib_3.3.0.bb} | 0
> 3 files changed, 1 insertion(+), 2 deletions(-)
> rename meta/recipes-core/newlib/{libgloss_3.2.0.bb => libgloss_3.3.0.bb} (100%)
> rename meta/recipes-core/newlib/{newlib_3.2.0.bb => newlib_3.3.0.bb} (100%)
>
> diff --git a/meta/recipes-core/newlib/libgloss_3.2.0.bb b/meta/recipes-core/newlib/libgloss_3.3.0.bb
> similarity index 100%
> rename from meta/recipes-core/newlib/libgloss_3.2.0.bb
> rename to meta/recipes-core/newlib/libgloss_3.3.0.bb
> diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc
> index 5edea8aba1..96e230f985 100644
> --- a/meta/recipes-core/newlib/newlib.inc
> +++ b/meta/recipes-core/newlib/newlib.inc
> @@ -16,8 +16,7 @@ LIC_FILES_CHKSUM = " \
> "
>
> SRC_URI = "https://sourceware.org/pub/newlib/newlib-${PV}.tar.gz"
> -SRC_URI[md5sum] = "afb3a01c8c82b6717ea55659a4de30ec"
> -SRC_URI[sha256sum] = "f7b2322964a1e3b37bec0768da20f50dfb62247d729110974dd95756a53bb6d4"
> +SRC_URI[sha256sum] = "58dd9e3eaedf519360d92d84205c3deef0b3fc286685d1c562e245914ef72c66"
>
> INHIBIT_DEFAULT_DEPS = "1"
> DEPENDS = "virtual/${TARGET_PREFIX}gcc"
> diff --git a/meta/recipes-core/newlib/newlib_3.2.0.bb b/meta/recipes-core/newlib/newlib_3.3.0.bb
> similarity index 100%
> rename from meta/recipes-core/newlib/newlib_3.2.0.bb
> rename to meta/recipes-core/newlib/newlib_3.3.0.bb
> --
> 2.17.1
NACK: https://lists.openembedded.org/g/openembedded-core/message/137847
--
Paul Barker
Konsulko Group
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [OE-core][dunfell 14/17] newlib: Upgrade to latest yearly release 3.3.0
2020-05-26 8:31 ` Paul Barker
@ 2020-05-26 13:59 ` Steve Sakoman
0 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-26 13:59 UTC (permalink / raw)
To: Paul Barker; +Cc: openembedded-core
On Mon, May 25, 2020 at 10:31 PM Paul Barker <pbarker@konsulko.com> wrote:
>
> On Mon, 25 May 2020 at 23:37, Steve Sakoman <steve@sakoman.com> wrote:
> >
> > From: Alejandro Hernandez <alejandro@enedino.org>
> >
> > Upgrade to the latest snapshot, also drop md5sum while were at it.
> >
> > (From OE-Core rev: d73aa359e42e707dbc7cfa29c55a2fc8e6bb938a)
> >
> > Signed-off-by: Alejandro Hernandez Samaniego <alhe@linux.microsoft.com>
> > Signed-off-by: Alejandro Hernandez Samaniego <alejandro@enedino.org>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Signed-off-by: Steve Sakoman <steve@sakoman.com>
> > ---
> > .../newlib/{libgloss_3.2.0.bb => libgloss_3.3.0.bb} | 0
> > meta/recipes-core/newlib/newlib.inc | 3 +--
> > meta/recipes-core/newlib/{newlib_3.2.0.bb => newlib_3.3.0.bb} | 0
> > 3 files changed, 1 insertion(+), 2 deletions(-)
> > rename meta/recipes-core/newlib/{libgloss_3.2.0.bb => libgloss_3.3.0.bb} (100%)
> > rename meta/recipes-core/newlib/{newlib_3.2.0.bb => newlib_3.3.0.bb} (100%)
> >
> > diff --git a/meta/recipes-core/newlib/libgloss_3.2.0.bb b/meta/recipes-core/newlib/libgloss_3.3.0.bb
> > similarity index 100%
> > rename from meta/recipes-core/newlib/libgloss_3.2.0.bb
> > rename to meta/recipes-core/newlib/libgloss_3.3.0.bb
> > diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc
> > index 5edea8aba1..96e230f985 100644
> > --- a/meta/recipes-core/newlib/newlib.inc
> > +++ b/meta/recipes-core/newlib/newlib.inc
> > @@ -16,8 +16,7 @@ LIC_FILES_CHKSUM = " \
> > "
> >
> > SRC_URI = "https://sourceware.org/pub/newlib/newlib-${PV}.tar.gz"
> > -SRC_URI[md5sum] = "afb3a01c8c82b6717ea55659a4de30ec"
> > -SRC_URI[sha256sum] = "f7b2322964a1e3b37bec0768da20f50dfb62247d729110974dd95756a53bb6d4"
> > +SRC_URI[sha256sum] = "58dd9e3eaedf519360d92d84205c3deef0b3fc286685d1c562e245914ef72c66"
> >
> > INHIBIT_DEFAULT_DEPS = "1"
> > DEPENDS = "virtual/${TARGET_PREFIX}gcc"
> > diff --git a/meta/recipes-core/newlib/newlib_3.2.0.bb b/meta/recipes-core/newlib/newlib_3.3.0.bb
> > similarity index 100%
> > rename from meta/recipes-core/newlib/newlib_3.2.0.bb
> > rename to meta/recipes-core/newlib/newlib_3.3.0.bb
> > --
> > 2.17.1
>
> NACK: https://lists.openembedded.org/g/openembedded-core/message/137847
Thanks Paul! I agree of course ;-)
I'll drop this patch in my final merge request.
Steve
^ permalink raw reply [flat|nested] 24+ messages in thread
* [OE-core][dunfell 15/17] git: Upgrade 2.24.1 -> 2.24.3
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (13 preceding siblings ...)
2020-05-25 22:37 ` [OE-core][dunfell 14/17] newlib: Upgrade to latest yearly release 3.3.0 Steve Sakoman
@ 2020-05-25 22:37 ` Steve Sakoman
2020-05-25 22:37 ` [OE-core][dunfell 16/17] wireless-regdb: Upgrade 2019.06.03 -> 2020.04.29 Steve Sakoman
2020-05-25 22:37 ` [OE-core][dunfell 17/17] avahi: Don't advertise example services by default Steve Sakoman
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:37 UTC (permalink / raw)
To: openembedded-core
From: Adrian Bunk <bunk@stusta.de>
This includes the fixes for CVE-2020-5260 and CVE-2020-11008.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-devtools/git/git_2.24.1.bb | 11 -----------
meta/recipes-devtools/git/git_2.24.3.bb | 9 +++++++++
2 files changed, 9 insertions(+), 11 deletions(-)
delete mode 100644 meta/recipes-devtools/git/git_2.24.1.bb
create mode 100644 meta/recipes-devtools/git/git_2.24.3.bb
diff --git a/meta/recipes-devtools/git/git_2.24.1.bb b/meta/recipes-devtools/git/git_2.24.1.bb
deleted file mode 100644
index daea31eab2..0000000000
--- a/meta/recipes-devtools/git/git_2.24.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require git.inc
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
- ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
- "
-EXTRA_OEMAKE += "NO_GETTEXT=1"
-
-SRC_URI[tarball.md5sum] = "166bde96adbbc11c8843d4f8f4f9811b"
-SRC_URI[tarball.sha256sum] = "ad5334956301c86841eb1e5b1bb20884a6bad89a10a6762c958220c7cf64da02"
-SRC_URI[manpages.md5sum] = "31c2272a8979022497ba3d4202df145d"
-SRC_URI[manpages.sha256sum] = "9a7ae3a093bea39770eb96ca3e5b40bff7af0b9f6123f089d7821d0e5b8e1230"
diff --git a/meta/recipes-devtools/git/git_2.24.3.bb b/meta/recipes-devtools/git/git_2.24.3.bb
new file mode 100644
index 0000000000..ddd875f07b
--- /dev/null
+++ b/meta/recipes-devtools/git/git_2.24.3.bb
@@ -0,0 +1,9 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+ ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+ "
+EXTRA_OEMAKE += "NO_GETTEXT=1"
+
+SRC_URI[tarball.sha256sum] = "ef6d1d1de1d7921a54d23d07479bd2766f050d6435cea5d3b5322aa4897cb3d7"
+SRC_URI[manpages.sha256sum] = "325795ba33c0be02370de79636f32ad3b447665c1f2b5b4de65181fa804bed31"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 16/17] wireless-regdb: Upgrade 2019.06.03 -> 2020.04.29
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (14 preceding siblings ...)
2020-05-25 22:37 ` [OE-core][dunfell 15/17] git: Upgrade 2.24.1 -> 2.24.3 Steve Sakoman
@ 2020-05-25 22:37 ` Steve Sakoman
2020-05-25 22:37 ` [OE-core][dunfell 17/17] avahi: Don't advertise example services by default Steve Sakoman
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:37 UTC (permalink / raw)
To: openembedded-core
From: Adrian Bunk <bunk@kernel.org>
(From OE-Core rev: 5b71a3f3d1bca6b52f53b97971131a6771618420)
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
...reless-regdb_2019.06.03.bb => wireless-regdb_2020.04.29.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2019.06.03.bb => wireless-regdb_2020.04.29.bb} (91%)
diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2019.06.03.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2020.04.29.bb
similarity index 91%
rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2019.06.03.bb
rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2020.04.29.bb
index 9076d94601..a5827b9ef0 100644
--- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2019.06.03.bb
+++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2020.04.29.bb
@@ -5,8 +5,7 @@ LICENSE = "ISC"
LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz"
-SRC_URI[md5sum] = "4b5ba3f089db7fdb7b9daae6a7c1f2cb"
-SRC_URI[sha256sum] = "cd917ed86b63ce8d93947979f1f18948f03a4ac0ad89ec25227b36ac00dc54bf"
+SRC_URI[sha256sum] = "89fd031aed5977c219a71501e144375a10e7c90d1005d5d086ea7972886a2c7a"
inherit bin_package allarch
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread* [OE-core][dunfell 17/17] avahi: Don't advertise example services by default
2020-05-25 22:36 [OE-core][dunfell 00/17] Patch review Steve Sakoman
` (15 preceding siblings ...)
2020-05-25 22:37 ` [OE-core][dunfell 16/17] wireless-regdb: Upgrade 2019.06.03 -> 2020.04.29 Steve Sakoman
@ 2020-05-25 22:37 ` Steve Sakoman
16 siblings, 0 replies; 24+ messages in thread
From: Steve Sakoman @ 2020-05-25 22:37 UTC (permalink / raw)
To: openembedded-core
From: Paul Barker <pbarker@konsulko.com>
The example service files are placed into /etc/avahi/services when we
run `make install` for avahi. This results in ssh and sftp-ssh services
being announced by default even if no ssh server is installed in an
image.
These example files should be moved away to another location such as
/usr/share/doc/avahi (taking inspiration from Arch Linux).
Signed-off-by: Paul Barker <pbarker@konsulko.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
meta/recipes-connectivity/avahi/avahi.inc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 94fe6a16b6..6acedb5412 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -77,6 +77,11 @@ do_install() {
rm -rf ${D}${datadir}/dbus-1/interfaces
test -d ${D}${datadir}/dbus-1 && rmdir --ignore-fail-on-non-empty ${D}${datadir}/dbus-1
rm -rf ${D}${libdir}/avahi
+
+ # Move example service files out of /etc/avahi/services so we don't
+ # advertise ssh & sftp-ssh by default
+ install -d ${D}${docdir}/avahi
+ mv ${D}${sysconfdir}/avahi/services/* ${D}${docdir}/avahi
}
PACKAGES =+ "${@bb.utils.contains("PACKAGECONFIG", "libdns_sd", "libavahi-compat-libdnssd", "", d)}"
--
2.17.1
^ permalink raw reply related [flat|nested] 24+ messages in thread