netbase: upgrade 6.1 -> 6.2
PATCH 1/23 netbase: upgrade 6.1 -> 6.2
Not sure why this didn't inherit allarch, but now it does - only static data is installed.
---
.../netbase/{netbase_6.1.bb => netbase_6.2.bb} | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
rename meta/recipes-core/netbase/{netbase_6.1.bb => netbase_6.2.bb} (65%)meta/recipes-core/netbase/netbase_6.2.bb renamed from meta/recipes-core/netbase/netbase_6.1.bb +7 -6
@@ -6,17 +6,18 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=3dd6192d306f582dee7687da3d8748ab" PE = "1" -SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}~bpo10+1.tar.xz" -S = "${WORKDIR}/${BPN}-${PV}~bpo10+1" +SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.tar.xz" -SRC_URI[md5sum] = "4fa7517285b4045ac0dc8dbf6730dd7a" -SRC_URI[sha256sum] = "4e9c3082dff8896cb6b6bea9bb2200d82fb0d7c8d8c8fc9b18704fe553316237" +inherit allarch + +SRC_URI[sha256sum] = "309a24146a06347d654b261e9e07a82fab844b173674a42e223803dd8258541e" UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/n/netbase/" -do_install () { - install -d ${D}/${mandir}/man8 ${D}${sysconfdir} +do_install () { + install -d ${D}${sysconfdir} install -m 0644 ${S}/etc/rpc ${D}${sysconfdir}/rpc install -m 0644 ${S}/etc/protocols ${D}${sysconfdir}/protocols install -m 0644 ${S}/etc/services ${D}${sysconfdir}/services + install -m 0644 ${S}/etc/ethertypes ${D}${sysconfdir}/ethertypes }
Signature · 1 line
2.29.2
PATCH 2/23 meson: upgrade 0.55.1 -> 0.56.0
---
meta/recipes-devtools/meson/meson.inc | 2 +-
.../0001-Make-CPU-family-warnings-fatal.patch | 12 +++----
.../meson/meson/0003-native_bindir.patch | 32 +++++++++----------
.../{meson_0.55.1.bb => meson_0.56.0.bb} | 0
...on_0.55.1.bb => nativesdk-meson_0.56.0.bb} | 0
5 files changed, 23 insertions(+), 23 deletions(-)
rename meta/recipes-devtools/meson/{meson_0.55.1.bb => meson_0.56.0.bb} (100%)
rename meta/recipes-devtools/meson/{nativesdk-meson_0.55.1.bb => nativesdk-meson_0.56.0.bb} (100%)meta/recipes-devtools/meson/meson.inc +1 -1
@@ -16,7 +16,7 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P file://0001-modules-python.py-do-not-substitute-python-s-install.patch \ file://0001-gnome.py-prefix-g-i-paths-with-PKG_CONFIG_SYSROOT_DI.patch \ " -SRC_URI[sha256sum] = "3b5741f884e04928bdfa1947467ff06afa6c98e623c25cef75adf71ca39ce080" +SRC_URI[sha256sum] = "291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213" SRC_URI_append_class-native = " \ file://0001-Make-CPU-family-warnings-fatal.patch \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +6 -6
@@ -1,4 +1,4 @@ -From 9311844b6c422479556e83b89a8e675ebcb2056c Mon Sep 17 00:00:00 2001 +From 110a525e5ebed2fca138d72da493c39510311c1f Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Tue, 3 Jul 2018 13:59:09 +0100 Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <[email protected]> 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 219b62e..d1be65b 100644 +index 13d0ba5..5ba3a1a 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -199,7 +199,7 @@ class MachineInfo: +@@ -254,7 +254,7 @@ class MachineInfo: cpu_family = literal['cpu_family'] if cpu_family not in known_cpu_families:
@@ -25,11 +25,11 @@ index 219b62e..d1be65b 100644 endian = literal['endian'] if endian not in ('little', 'big'): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index bf09a88..8eabe78 100644 +index 588005b..988e3ea 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py -@@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: - trial = 'parisc' +@@ -400,9 +400,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str: + trial = 'ppc64' if trial not in known_cpu_families: - mlog.warning('Unknown CPU family {!r}, please report this at '
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +16 -16
@@ -1,4 +1,4 @@ -From f06c89939d0d006090a8a8728b2a13d532b83047 Mon Sep 17 00:00:00 2001 +From cbc27ee1576b4d04ad8e9d80760c63a9d3b7f5ed Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado <[email protected]> Date: Wed, 15 Nov 2017 15:05:01 +0100 Subject: [PATCH] native_bindir
@@ -15,22 +15,21 @@ that is is OE only. https://github.com/mesonbuild/meson/issues/1849#issuecomment Upstream-Status: Inappropriate [OE specific] Signed-off-by: Ricardo Ribalda Delgado <[email protected]> - --- mesonbuild/dependencies/base.py | 19 +++++++++++-------- mesonbuild/dependencies/ui.py | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py -index 368a4bc..9fc398e 100644 +index 3a5f5f8..0af89f8 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -183,7 +183,7 @@ class Dependency: def get_exe_args(self, compiler): return [] -- def get_pkgconfig_variable(self, variable_name, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): +- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: ++ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: raise DependencyException('{!r} is not a pkgconfig dependency'.format(self.name)) def get_configtool_variable(self, variable_name):
@@ -38,12 +37,12 @@ index 368a4bc..9fc398e 100644 setattr(result, k, copy.deepcopy(v, memo)) return result -- def get_pkgconfig_variable(self, variable_name, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): +- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: ++ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: raise DependencyException('Method "get_pkgconfig_variable()" is ' 'invalid for an internal dependency') -@@ -634,15 +634,18 @@ class PkgConfigDependency(ExternalDependency): +@@ -639,8 +639,11 @@ class PkgConfigDependency(ExternalDependency): return s.format(self.__class__.__name__, self.name, self.is_found, self.version_reqs)
@@ -57,15 +56,16 @@ index 368a4bc..9fc398e 100644 p, out, err = Popen_safe(cmd, env=env) rc, out, err = p.returncode, out.strip(), err.strip() call = ' '.join(cmd) - mlog.debug("Called `{}` -> {}\n{}".format(call, rc, out)) - return rc, out, err +@@ -666,7 +669,7 @@ class PkgConfigDependency(ExternalDependency): + mlog.debug('PKG_CONFIG_LIBDIR: ' + new_pkg_config_libdir) + - def _call_pkgbin(self, args, env=None): + def _call_pkgbin(self, args, env=None, use_native=False): # Always copy the environment since we're going to modify it # with pkg-config variables if env is None: -@@ -668,7 +671,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -680,7 +683,7 @@ class PkgConfigDependency(ExternalDependency): targs = tuple(args) cache = PkgConfigDependency.pkgbin_cache if (self.pkgbin, targs, fenv) not in cache:
@@ -74,16 +74,16 @@ index 368a4bc..9fc398e 100644 return cache[(self.pkgbin, targs, fenv)] def _convert_mingw_paths(self, args: T.List[str]) -> T.List[str]: -@@ -877,7 +880,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -889,7 +892,7 @@ class PkgConfigDependency(ExternalDependency): (self.name, out_raw)) self.link_args, self.raw_link_args = self._search_libs(out, out_raw) -- def get_pkgconfig_variable(self, variable_name, kwargs): -+ def get_pkgconfig_variable(self, variable_name, kwargs, use_native=False): +- def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any]) -> str: ++ def get_pkgconfig_variable(self, variable_name: str, kwargs: T.Dict[str, T.Any], use_native=False) -> str: options = ['--variable=' + variable_name, self.name] if 'define_variable' in kwargs: -@@ -890,7 +893,7 @@ class PkgConfigDependency(ExternalDependency): +@@ -902,7 +905,7 @@ class PkgConfigDependency(ExternalDependency): options = ['--define-variable=' + '='.join(definition)] + options
@@ -93,7 +93,7 @@ index 368a4bc..9fc398e 100644 if ret != 0: if self.required: diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py -index 95dfe2b..5f82890 100644 +index 5dffd3a..fb3a178 100644 --- a/mesonbuild/dependencies/ui.py +++ b/mesonbuild/dependencies/ui.py @@ -325,7 +325,7 @@ class QtBaseDependency(ExternalDependency):
meta/recipes-devtools/meson/meson_0.56.0.bb renamed from meta/recipes-devtools/meson/meson_0.55.1.bb +0 -0
meta/recipes-devtools/meson/nativesdk-meson_0.56.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.55.1.bb +0 -0
Signature · 1 line
2.29.2
PATCH 3/23 vulkan-samples: update to latest revision
In reply to Alexander Kanavin--- meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/vulkan/vulkan-samples_git.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "f52361d3cd6ac8c30fc3365a464b4e220c32cfd6" +SRCREV = "b4fe3addff337f3c264a6f7dd62be60c726fcc03" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git"
Signature · 1 line
2.29.2
PATCH 4/23 libcap: update 2.44 -> 2.45
In reply to Alexander Kanavin---
...-tests-do-not-statically-link-a-test.patch | 36 +++++++++++++------
...-tests-do-not-run-target-executables.patch | 16 ++++-----
.../libcap/{libcap_2.44.bb => libcap_2.45.bb} | 2 +-
3 files changed, 34 insertions(+), 20 deletions(-)
rename meta/recipes-support/libcap/{libcap_2.44.bb => libcap_2.45.bb} (96%)meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch +25 -11
@@ -1,4 +1,4 @@ -From 03e925f0d68bc51e1acf1ac2014a9c2452c664bf Mon Sep 17 00:00:00 2001 +From c22c6c16362c7dbc8d6faea06edee5e07759c5fa Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Wed, 15 Jan 2020 17:16:28 +0100 Subject: [PATCH] tests: do not statically link a test
@@ -9,23 +9,37 @@ Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <[email protected]> --- + progs/Makefile | 2 +- tests/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + 2 files changed, 3 insertions(+), 3 deletions(-) +diff --git a/progs/Makefile b/progs/Makefile +index 1d7fc7a..37db8f7 100644 +--- a/progs/Makefile ++++ b/progs/Makefile +@@ -42,7 +42,7 @@ endif + test: $(PROGS) + + tcapsh-static: capsh.c $(DEPS) +- $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static ++ $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) + + sudotest: test tcapsh-static + sudo $(LDPATH) ./quicktest.sh diff --git a/tests/Makefile b/tests/Makefile -index d569650..f5ca377 100644 +index 3431df9..727fb86 100644 --- a/tests/Makefile +++ b/tests/Makefile -@@ -11,7 +11,7 @@ ifeq ($(DYNAMIC),yes) - LDPATH = LD_LIBRARY_PATH=../libcap - DEPSBUILD = all +@@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes) + DEPS += ../libcap/libpsx.so + endif else -LDFLAGS += --static -+LDFLAGS += - DEPSBUILD = libcap.a libpsx.a - endif - -@@ -51,7 +51,7 @@ libcap_psx_launch_test: libcap_launch_test.c $(DEPS) ++LDFLAGS += + DEPS=../libcap/libcap.a ../progs/tcapsh-static + ifeq ($(PTHREADS),yes) + DEPS += ../libcap/libpsx.a +@@ -106,7 +106,7 @@ noexploit: exploit.o $(DEPS) # This one runs in a chroot with no shared library files. noop: noop.c
meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch +8 -8
@@ -1,4 +1,4 @@ -From 7744c1f678f5226a151bc6b2a254a56835229d91 Mon Sep 17 00:00:00 2001 +From 652071e430d5eea758965176b7648e79ad404daa Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Fri, 20 Dec 2019 16:54:05 +0100 Subject: [PATCH] tests: do not run target executables
@@ -11,20 +11,20 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile -index 8956d5d..d569650 100644 +index fc39fee..3431df9 100644 --- a/tests/Makefile +++ b/tests/Makefile -@@ -27,13 +27,11 @@ sudotest: test run_libcap_launch_test run_libcap_launch_test - install: all +@@ -59,13 +59,11 @@ endif + # unprivileged run_psx_test: psx_test -- $(LDPATH) ./psx_test +- ./psx_test psx_test: psx_test.c $(DEPS) - $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) + $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) run_libcap_psx_test: libcap_psx_test -- $(LDPATH) ./libcap_psx_test +- ./libcap_psx_test libcap_psx_test: libcap_psx_test.c $(DEPS) - $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) + $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS)
meta/recipes-support/libcap/libcap_2.45.bb renamed from meta/recipes-support/libcap/libcap_2.44.bb +1 -1
@@ -12,7 +12,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ file://0002-tests-do-not-run-target-executables.patch \ file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[sha256sum] = "92188359cd5be86e8e5bd3f6483ac6ce582264f912398937ef763def2205c8e1" +SRC_URI[sha256sum] = "d66639f765c0e10557666b00f519caf0bd07a95f867dddaee131cd284fac3286" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
Signature · 1 line
2.29.2
PATCH 5/23 bind: upgrade 9.16.7 -> 9.16.9
In reply to Alexander KanavinLicense-Update: http -> https
---
.../0001-avoid-start-failure-with-bind-user.patch | 0
...0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0
...bind-ensure-searching-for-json-headers-searches-sysr.patch | 0
.../bind/{bind-9.16.7 => bind-9.16.9}/bind9 | 0
.../bind/{bind-9.16.7 => bind-9.16.9}/conf.patch | 0
.../bind/{bind-9.16.7 => bind-9.16.9}/generate-rndc-key.sh | 0
.../init.d-add-support-for-read-only-rootfs.patch | 0
.../make-etc-initd-bind-stop-work.patch | 0
.../bind/{bind-9.16.7 => bind-9.16.9}/named.service | 0
.../bind/{bind_9.16.7.bb => bind_9.16.9.bb} | 4 ++--
10 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/bind/{bind-9.16.7 => bind-9.16.9}/0001-avoid-start-failure-with-bind-user.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.7 => bind-9.16.9}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.7 => bind-9.16.9}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.7 => bind-9.16.9}/bind9 (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.7 => bind-9.16.9}/conf.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.7 => bind-9.16.9}/generate-rndc-key.sh (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.7 => bind-9.16.9}/init.d-add-support-for-read-only-rootfs.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.7 => bind-9.16.9}/make-etc-initd-bind-stop-work.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.16.7 => bind-9.16.9}/named.service (100%)
rename meta/recipes-connectivity/bind/{bind_9.16.7.bb => bind_9.16.9.bb} (96%)meta/recipes-connectivity/bind/bind-9.16.9/0001-avoid-start-failure-with-bind-user.patch renamed from meta/recipes-connectivity/bind/bind-9.16.7/0001-avoid-start-failure-with-bind-user.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.9/0001-named-lwresd-V-and-start-log-hide-build-options.patch renamed from meta/recipes-connectivity/bind/bind-9.16.7/0001-named-lwresd-V-and-start-log-hide-build-options.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.9/bind-ensure-searching-for-json-headers-searches-sysr.patch renamed from meta/recipes-connectivity/bind/bind-9.16.7/bind-ensure-searching-for-json-headers-searches-sysr.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.9/bind9 renamed from meta/recipes-connectivity/bind/bind-9.16.7/bind9 +0 -0
meta/recipes-connectivity/bind/bind-9.16.9/conf.patch renamed from meta/recipes-connectivity/bind/bind-9.16.7/conf.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.9/generate-rndc-key.sh renamed from meta/recipes-connectivity/bind/bind-9.16.7/generate-rndc-key.sh +0 -0
meta/recipes-connectivity/bind/bind-9.16.9/init.d-add-support-for-read-only-rootfs.patch renamed from meta/recipes-connectivity/bind/bind-9.16.7/init.d-add-support-for-read-only-rootfs.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.9/make-etc-initd-bind-stop-work.patch renamed from meta/recipes-connectivity/bind/bind-9.16.7/make-etc-initd-bind-stop-work.patch +0 -0
meta/recipes-connectivity/bind/bind-9.16.9/named.service renamed from meta/recipes-connectivity/bind/bind-9.16.7/named.service +0 -0
meta/recipes-connectivity/bind/bind_9.16.9.bb renamed from meta/recipes-connectivity/bind/bind_9.16.7.bb +2 -2
@@ -3,7 +3,7 @@ HOMEPAGE = "https://www.isc.org/bind/" SECTION = "console/network" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=188b8d0644bd6835df43b84e3f180be1" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4673dc07337cace3b93c65e9ffe57b60" DEPENDS = "openssl libcap zlib libuv"
@@ -19,7 +19,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \ file://0001-avoid-start-failure-with-bind-user.patch \ " -SRC_URI[sha256sum] = "9f7d1812ebbd26a699f62b6fa8522d5dec57e4bf43af0042a0d60d39ed8314d1" +SRC_URI[sha256sum] = "bcb292c4d738a46e3cbcb8afaa25ecf54f77652fa575135da9a2a1d525304a5a" UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/" # stay at 9.16 follow the ESV versions divisible by 4
Signature · 1 line
2.29.2
PATCH 6/23 quota: upgrade 4.05 -> 4.06
In reply to Alexander Kanavin---
...-realloc-3-instead-of-reallocarray-3.patch | 34 +++++++++++++++++++
.../quota/{quota_4.05.bb => quota_4.06.bb} | 4 +--
2 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/quota/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch
rename meta/recipes-extended/quota/{quota_4.05.bb => quota_4.06.bb} (89%)meta/recipes-extended/quota/quota/0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch new file +34 -0
@@ -0,0 +1,34 @@ +From 02b222a335527f1031cc9495d8c5ebc1bc5b1d4e Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine <[email protected]> +Date: Wed, 11 Nov 2020 15:00:47 +0100 +Subject: [PATCH] quota: Use realloc(3) instead of reallocarray(3) + +reallocarray(3) has been added to glibc relatively recently (version +2.26, from 2017) and apparently not all users run new enough glibc. Just +use realloc(3) for now since in this case there's no real risk of +overflow. + +Signed-off-by: Fabrice Fontaine <[email protected]> +Signed-off-by: Jan Kara <[email protected]> +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <[email protected]> +--- + quota.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/quota.c b/quota.c +index a6ed61f..a60de12 100644 +--- a/quota.c ++++ b/quota.c +@@ -385,7 +385,7 @@ int main(int argc, char **argv) + break; + case 259: + fscount++; +- fsnames = reallocarray(fsnames, fscount, sizeof(char *)); ++ fsnames = realloc(fsnames, fscount * sizeof(char *)); + if (!fsnames) + die(1, _("Not enough memory for filesystem names")); + fsnames[fscount - 1] = optarg; +-- +2.17.1 +
meta/recipes-extended/quota/quota_4.06.bb renamed from meta/recipes-extended/quota/quota_4.05.bb +2 -2
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://rquota_server.c;beginline=1;endline=20;md5=fe7e0d7e11 SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \ file://fcntl.patch \ + file://0001-quota-Use-realloc-3-instead-of-reallocarray-3.patch \ " -SRC_URI[md5sum] = "1c1dbd2cd3d680ccac661239b067e147" -SRC_URI[sha256sum] = "ef3b5b5d1014ed1344b46c1826145e20cbef8db967b522403c9a060761cf7ab9" +SRC_URI[sha256sum] = "2f3e03039f378d4f0d97acdb49daf581dcaad64d2e1ddf129495fd579fbd268d" CVE_PRODUCT = "linux_diskquota"
Signature · 1 line
2.29.2
PATCH 7/23 pango: upgrade 1.46.2 -> 1.48.0
In reply to Alexander KanavinAdd a patch to fix failing ptest.
---
...c-drop-assert-that-fails-with-Cantar.patch | 27 +++++++++++++++++++
.../{pango_1.46.2.bb => pango_1.48.0.bb} | 11 ++++++--
2 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/pango/pango/0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch
rename meta/recipes-graphics/pango/{pango_1.46.2.bb => pango_1.48.0.bb} (84%)meta/recipes-graphics/pango/pango/0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch new file +27 -0
@@ -0,0 +1,27 @@ +From eea900ec107920bc99c9df5ab258b7bc446c0b87 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <[email protected]> +Date: Fri, 4 Dec 2020 14:03:01 +0000 +Subject: [PATCH] tests/test-font.c: drop assert that fails with Cantarell + family + +Upstream bug: https://gitlab.gnome.org/GNOME/pango/-/issues/494 + +Upstream-Status: Inappropriate [needs a proper fix by upstream that handles font faces with identical names] +Signed-off-by: Alexander Kanavin <[email protected]> +--- + tests/test-font.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/test-font.c b/tests/test-font.c +index 486504f..7e45ba1 100644 +--- a/tests/test-font.c ++++ b/tests/test-font.c +@@ -217,7 +217,7 @@ test_enumerate (void) + for (i = 0; i < n_faces; i++) + { + face = pango_font_family_get_face (families[0], pango_font_face_get_face_name (faces[i])); +- g_assert_true (face == faces[i]); ++ //g_assert_true (face == faces[i]); + } + + desc = pango_font_description_new ();
meta/recipes-graphics/pango/pango_1.48.0.bb renamed from meta/recipes-graphics/pango/pango_1.46.2.bb +9 -2
@@ -15,8 +15,11 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection -SRC_URI += " file://run-ptest" -SRC_URI[archive.sha256sum] = "d89fab5f26767261b493279b65cfb9eb0955cd44c07c5628d36094609fc51841" +GIR_MESON_ENABLE_FLAG = "enabled" +GIR_MESON_DISABLE_FLAG = "disabled" + +SRC_URI += " file://0001-tests-test-font.c-drop-assert-that-fails-with-Cantar.patch" +SRC_URI[archive.sha256sum] = "391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
@@ -30,6 +33,10 @@ PACKAGECONFIG[thai] = ",,libthai" GTKDOC_MESON_OPTION = "gtk_doc" GIR_MESON_OPTION = 'introspection' +do_configure_prepend() { + chmod +x ${S}/tests/*.py +} + do_configure_prepend_toolchain-clang() { sed -i -e "/Werror=implicit-fallthrough/d" ${S}/meson.build }
Signature · 1 line
2.29.2
PATCH 8/23 elfutils: upgrade 0.181 -> 0.182
In reply to Alexander Kanavin---
.../{elfutils_0.181.bb => elfutils_0.182.bb} | 2 +-
.../files/0001-musl-obstack-fts.patch | 6 ++---
.../elfutils/files/0002-musl-libs.patch | 24 +++++++++----------
.../elfutils/files/0003-musl-utils.patch | 6 ++---
.../files/0004-Fix-error-on-musl.patch | 2 +-
.../0015-config-eu.am-do-not-use-Werror.patch | 2 +-
6 files changed, 20 insertions(+), 22 deletions(-)
rename meta/recipes-devtools/elfutils/{elfutils_0.181.bb => elfutils_0.182.bb} (98%)meta/recipes-devtools/elfutils/elfutils_0.182.bb renamed from meta/recipes-devtools/elfutils/elfutils_0.181.bb +1 -1
@@ -28,7 +28,7 @@ SRC_URI_append_libc-musl = " \ file://0004-Fix-error-on-musl.patch \ file://0015-config-eu.am-do-not-use-Werror.patch \ " -SRC_URI[sha256sum] = "29a6ad7421ec2acfee489bb4a699908281ead2cb63a20a027ce8804a165f0eb3" +SRC_URI[sha256sum] = "ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858" inherit autotools gettext ptest pkgconfig
meta/recipes-devtools/elfutils/files/0001-musl-obstack-fts.patch +3 -3
@@ -1,4 +1,4 @@ -From 1a62bb8e8f2cb0f180c749946a48114e8f391b55 Mon Sep 17 00:00:00 2001 +From dbaa05a519acfe4f6040784f5d4a28ca586c0fc4 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Fri, 23 Aug 2019 10:17:25 +0800 Subject: [PATCH] musl-obstack-fts
@@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia <[email protected]> 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index ab9c751..b057d86 100644 +index 53bab6a..dfea85e 100644 --- a/configure.ac +++ b/configure.ac -@@ -538,6 +538,60 @@ else +@@ -539,6 +539,60 @@ else fi AC_SUBST([argp_LDADD])
meta/recipes-devtools/elfutils/files/0002-musl-libs.patch +11 -13
@@ -1,4 +1,4 @@ -From 2e1f8ca0b67c1d1991c14d509938c347e09bae94 Mon Sep 17 00:00:00 2001 +From f4ca9db9d38f865505322595a8a1e8f69d5bb87c Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Fri, 23 Aug 2019 10:18:47 +0800 Subject: [PATCH] musl-libs
@@ -21,8 +21,8 @@ Signed-off-by: Hongxu Jia <[email protected]> lib/libeu.h | 1 + libdwfl/dwfl_error.c | 9 +++++++++ libdwfl/linux-kernel-modules.c | 1 + - libelf/elf.h | 9 ++++++--- - 6 files changed, 44 insertions(+), 4 deletions(-) + libelf/elf.h | 7 +++++++ + 6 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 lib/error.h diff --git a/lib/error.h b/lib/error.h
@@ -104,7 +104,7 @@ index 7bcf61c..11dcc8b 100644 return elf_errmsg (error & 0xffff); case OTHER_ERROR (LIBDW): diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c -index 0434f1e..5afaee8 100644 +index 6edb27f..f331e3c 100644 --- a/libdwfl/linux-kernel-modules.c +++ b/libdwfl/linux-kernel-modules.c @@ -50,6 +50,7 @@
@@ -116,26 +116,24 @@ index 0434f1e..5afaee8 100644 /* If fts.h is included before config.h, its indirect inclusions may not give us the right LFS aliases of these functions, so map them manually. */ diff --git a/libelf/elf.h b/libelf/elf.h -index 197b557..8e5b94c 100644 +index 6439c1a..a87c589 100644 --- a/libelf/elf.h +++ b/libelf/elf.h -@@ -21,7 +21,9 @@ +@@ -19,6 +19,10 @@ + #ifndef _ELF_H + #define _ELF_H 1 - #include <features.h> - --__BEGIN_DECLS +#ifdef __cplusplus +extern "C" { +#endif - ++ /* Standard ELF types. */ -@@ -4103,6 +4105,7 @@ enum + #include <stdint.h> +@@ -4101,4 +4105,7 @@ enum #define R_ARC_TLS_LE_S9 0x4a #define R_ARC_TLS_LE_32 0x4b --__END_DECLS -- +#ifdef __cplusplus +} +#endif
meta/recipes-devtools/elfutils/files/0003-musl-utils.patch +3 -3
@@ -1,4 +1,4 @@ -From 9b237f19f82d5ab1e0702637fece1866b1ef6681 Mon Sep 17 00:00:00 2001 +From e7e5333ed2e19f25ecbd7121f424eec99d61265a Mon Sep 17 00:00:00 2001 From: Hongxu Jia <[email protected]> Date: Fri, 23 Aug 2019 10:19:48 +0800 Subject: [PATCH] musl-utils
@@ -58,7 +58,7 @@ index 6ba6af4..0c7674b 100644 ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; diff --git a/src/readelf.c b/src/readelf.c -index 685d0b1..a842b10 100644 +index 64067a5..630739c 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -4829,10 +4829,11 @@ listptr_base (struct listptr *p)
@@ -142,7 +142,7 @@ index 48792a7..198a2e4 100644 /* Name and version of program. */ diff --git a/src/unstrip.c b/src/unstrip.c -index 9b8c09a..1fb5063 100644 +index a855038..df6fc1c 100644 --- a/src/unstrip.c +++ b/src/unstrip.c @@ -56,6 +56,15 @@
meta/recipes-devtools/elfutils/files/0004-Fix-error-on-musl.patch +1 -1
@@ -1,4 +1,4 @@ -From d3dc5f98f653342af97ebfbdf3479ee1f0d0cf38 Mon Sep 17 00:00:00 2001 +From ed87f11f7297c0edb3ca8950de1cc23e9b96217c Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 1 May 2019 22:15:03 +0100 Subject: [PATCH] Fix error on musl:
meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch +1 -1
@@ -1,4 +1,4 @@ -From 9b7554a3e21ccb455b3661a6b4e767636c2c5cf3 Mon Sep 17 00:00:00 2001 +From 574ac484c01125a97ba8737cf7292ca926897310 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 22 Jun 2020 21:35:16 +0000 Subject: [PATCH] config/eu.am: do not use -Werror
Signature · 1 line
2.29.2
PATCH 9/23 kea: upgrade 1.7.10 -> 1.8.1
In reply to Alexander Kanavin---
meta/recipes-connectivity/kea/{kea_1.7.10.bb => kea_1.8.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-connectivity/kea/{kea_1.7.10.bb => kea_1.8.1.bb} (96%)meta/recipes-connectivity/kea/kea_1.8.1.bb renamed from meta/recipes-connectivity/kea/kea_1.7.10.bb +1 -1
@@ -19,7 +19,7 @@ SRC_URI = "\ file://fix-multilib-conflict.patch \ file://fix_pid_keactrl.patch \ " -SRC_URI[sha256sum] = "4e121f0e58b175a827581c69cb1d60778647049fa47f142940dddc9ce58f3c82" +SRC_URI[sha256sum] = "52020cb16889484b661746d7fc4c7cd88974b1af5b7fc436eb6e69c62eb83734" inherit autotools systemd update-rc.d upstream-version-is-even
Signature · 1 line
2.29.2
PATCH 10/23 ifupdown: upgrade 0.8.35 -> 0.8.36
In reply to Alexander Kanavin---
.../ifupdown/{ifupdown_0.8.35.bb => ifupdown_0.8.36.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/ifupdown/{ifupdown_0.8.35.bb => ifupdown_0.8.36.bb} (97%)meta/recipes-core/ifupdown/ifupdown_0.8.36.bb renamed from meta/recipes-core/ifupdown/ifupdown_0.8.35.bb +1 -1
@@ -14,7 +14,7 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https \ file://run-ptest \ ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \ " -SRCREV = "4af76318cfc57f8e4a44d357104188666213bd4b" +SRCREV = "c73226073e2b13970ca613b20a13b9c0253bf9da" S = "${WORKDIR}/git"
Signature · 1 line
2.29.2
PATCH 11/23 createrepo-c: upgrade 0.16.1 -> 0.16.2
In reply to Alexander Kanavin---
.../{createrepo-c_0.16.1.bb => createrepo-c_0.16.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/createrepo-c/{createrepo-c_0.16.1.bb => createrepo-c_0.16.2.bb} (95%)meta/recipes-devtools/createrepo-c/createrepo-c_0.16.2.bb renamed from meta/recipes-devtools/createrepo-c/createrepo-c_0.16.1.bb +1 -1
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " -SRCREV = "634141eaefe0cc87466dfb91b07b64facce4384b" +SRCREV = "031f0524905c2a64a2faae555ca9d91281448d1b" S = "${WORKDIR}/git"
Signature · 1 line
2.29.2
PATCH 12/23 acpica: upgrade 20200925 -> 20201113
In reply to Alexander Kanavin---
.../acpica/{acpica_20200925.bb => acpica_20201113.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/acpica/{acpica_20200925.bb => acpica_20201113.bb} (94%)meta/recipes-extended/acpica/acpica_20201113.bb renamed from meta/recipes-extended/acpica/acpica_20200925.bb +1 -1
@@ -17,7 +17,7 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" DEPENDS = "m4-native flex-native bison-native" SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz" -SRC_URI[sha256sum] = "d44388e21e3d2e47c6d39e9c897935d3f775f04fec76271dcba072c74f834589" +SRC_URI[sha256sum] = "48c4e0c07b42581d017487cc9264470e6420605ddd24cbb5d16410d02a771461" UPSTREAM_CHECK_URI = "https://acpica.org/downloads"
Signature · 1 line
2.29.2
PATCH 13/23 grep: upgrade 3.5 -> 3.6
In reply to Alexander Kanavin---
meta/recipes-extended/grep/{grep_3.5.bb => grep_3.6.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/grep/{grep_3.5.bb => grep_3.6.bb} (93%)meta/recipes-extended/grep/grep_3.6.bb renamed from meta/recipes-extended/grep/grep_3.5.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" -SRC_URI[sha256sum] = "b82ac77707c2ab945520c8404c9fa9f890f7791a62cf2103cf6238acad87a44a" +SRC_URI[sha256sum] = "667e15e8afe189e93f9f21a7cd3a7b3f776202f417330b248c2ad4f997d9373e" inherit autotools gettext texinfo pkgconfig
Signature · 1 line
2.29.2
PATCH 14/23 man-pages: upgrade 5.08 -> 5.09
In reply to Alexander Kanavin---
.../man-pages/{man-pages_5.08.bb => man-pages_5.09.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/man-pages/{man-pages_5.08.bb => man-pages_5.09.bb} (91%)meta/recipes-extended/man-pages/man-pages_5.09.bb renamed from meta/recipes-extended/man-pages/man-pages_5.08.bb +1 -1
@@ -7,7 +7,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://README;md5=207f70f56526417514ac46b6680e314f" SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz" -SRC_URI[sha256sum] = "6e0b8ae23ee9467cee701f23dea908257a93e5fffa9e261b19a23efbd27e84a2" +SRC_URI[sha256sum] = "3bd9029b94520c730fe1a1fb78ed7d8d878236da0f725ca86ee71c1969de6c4f" inherit manpages
Signature · 1 line
2.29.2
PATCH 15/23 stress-ng: upgrade 0.11.23 -> 0.11.24
In reply to Alexander Kanavin---
.../stress-ng/{stress-ng_0.11.23.bb => stress-ng_0.11.24.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/stress-ng/{stress-ng_0.11.23.bb => stress-ng_0.11.24.bb} (90%)meta/recipes-extended/stress-ng/stress-ng_0.11.24.bb renamed from meta/recipes-extended/stress-ng/stress-ng_0.11.23.bb +1 -1
@@ -9,7 +9,7 @@ SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ file://no_daddr_t.patch \ " -SRC_URI[sha256sum] = "c0a76147a02f4c31af1fb4b9b7e0b90ac8bbd8590ccb54264d5cbe046c769cd2" +SRC_URI[sha256sum] = "5b3a724a85eed48743dedf37eab851b617ecf921b7fff427c6d0bbf405534671" DEPENDS = "coreutils-native"
Signature · 1 line
2.29.2
PATCH 16/23 libhandy: upgrade 1.0.1 -> 1.0.2
In reply to Alexander Kanavin---
.../libhandy/{libhandy_1.0.1.bb => libhandy_1.0.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-gnome/libhandy/{libhandy_1.0.1.bb => libhandy_1.0.2.bb} (91%)meta/recipes-gnome/libhandy/libhandy_1.0.2.bb renamed from meta/recipes-gnome/libhandy/libhandy_1.0.1.bb +1 -1
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://gitlab.gnome.org/GNOME/${BPN}.git;protocol=https" -SRCREV = "5cee0927b8b39dea1b2a62ec6d19169f73ba06c6" +SRCREV = "465c00f8f80c27330be494ed7c0ba2ffe26321c4" S = "${WORKDIR}/git" GIR_MESON_ENABLE_FLAG = 'enabled'
Signature · 1 line
2.29.2
PATCH 17/23 piglit: upgrade to latest revision
In reply to Alexander Kanavin--- meta/recipes-graphics/piglit/piglit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/piglit/piglit_git.bb +1 -1
@@ -11,7 +11,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "59e695c16fdcdd4ea4f16365f0e397a93cef7b80" +SRCREV = "0fda9f67a782edec640998286e7b6058e8933d17" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}"
Signature · 1 line
2.29.2
PATCH 18/23 xkbcomp: upgrade 1.4.3 -> 1.4.4
In reply to Alexander Kanavin---
.../xorg-app/{xkbcomp_1.4.3.bb => xkbcomp_1.4.4.bb} | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-app/{xkbcomp_1.4.3.bb => xkbcomp_1.4.4.bb} (79%)meta/recipes-graphics/xorg-app/xkbcomp_1.4.4.bb renamed from meta/recipes-graphics/xorg-app/xkbcomp_1.4.3.bb +1 -2
@@ -15,5 +15,4 @@ BBCLASSEXTEND = "native" EXTRA_OECONF += "--disable-selective-werror" -SRC_URI[md5sum] = "6e4751d99373f85d459ab4dff28893f5" -SRC_URI[sha256sum] = "06242c169fc11caf601cac46d781d467748c6a330e15b36dce46520b8ac8d435" +SRC_URI[sha256sum] = "59cce603a607a17722a0a1cf99010f4894e7812beb5d695abbc08474d59af27e"
Signature · 1 line
2.29.2
PATCH 19/23 lz4: upgrade 1.9.2 -> 1.9.3
In reply to Alexander Kanavin---
meta/recipes-support/lz4/{lz4_1.9.2.bb => lz4_1.9.3.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/lz4/{lz4_1.9.2.bb => lz4_1.9.3.bb} (90%)meta/recipes-support/lz4/lz4_1.9.3.bb renamed from meta/recipes-support/lz4/lz4_1.9.2.bb +2 -2
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://lib/LICENSE;md5=ebc2ea4814a64de7708f1571904b32cc \ PE = "1" -SRCREV = "fdf2ef5809ca875c454510610764d9125ef2ebbd" +SRCREV = "d44371841a2f1728a3f36839fd4b7e872d0927d3" -SRC_URI = "git://github.com/lz4/lz4.git;branch=dev \ +SRC_URI = "git://github.com/lz4/lz4.git;branch=release \ file://run-ptest \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
Signature · 1 line
2.29.2
PATCH 20/23 bison: upgrade 3.7.3 -> 3.7.4
In reply to Alexander Kanavin---
meta/recipes-devtools/bison/{bison_3.7.3.bb => bison_3.7.4.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/bison/{bison_3.7.3.bb => bison_3.7.4.bb} (93%)meta/recipes-devtools/bison/bison_3.7.4.bb renamed from meta/recipes-devtools/bison/bison_3.7.3.bb +1 -1
@@ -12,7 +12,7 @@ DEPENDS = "bison-native flex-native" SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ file://add-with-bisonlocaledir.patch \ " -SRC_URI[sha256sum] = "88d9e36856b004c0887a12ba00ea3c47db388519629483dd8c3fce9694d4da6f" +SRC_URI[sha256sum] = "a3b5813f48a11e540ef26f46e4d288c0c25c7907d9879ae50e430ec49f63c010" # No point in hardcoding path to m4, just use PATH EXTRA_OECONF += "M4=m4"
Signature · 1 line
2.29.2
PATCH 21/23 python3-setuptools-scm: fix upstream version check
In reply to Alexander Kanavin--- meta/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/python/python3-setuptools-scm_4.1.2.bb +2 -0
@@ -8,6 +8,8 @@ SRC_URI[sha256sum] = "a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090 PYPI_PACKAGE = "setuptools_scm" inherit pypi setuptools3 +UPSTREAM_CHECK_REGEX = "setuptools_scm-(?P<pver>.*)\.tar" + RDEPENDS_${PN} = "\ ${PYTHON_PN}-debugger \ ${PYTHON_PN}-json \
Signature · 1 line
2.29.2
PATCH 22/23 cantarell-fonts: update 0.0.25 -> 0.201
In reply to Alexander KanavinIncorrectly set git regex meant we were stuck with a 4 year old version.
Use tarballs as they contain prebuilt font files; building them from source requires a bunch of obscure dependencies.
Contains portions of libglyph which are Apache 2.x licensed.
--- .../cantarell-fonts/cantarell-fonts_0.201.bb | 18 +++++++++++++ .../cantarell-fonts/cantarell-fonts_git.bb | 25 ------------------- 2 files changed, 18 insertions(+), 25 deletions(-) create mode 100644 meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb delete mode 100644 meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb
meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.201.bb new file +18 -0
@@ -0,0 +1,18 @@ +SUMMARY = "Cantarell, a Humanist sans-serif font family" + +DESCRIPTION = "The Cantarell font typeface is designed as a \ + contemporary Humanist sans serif, and was developed for \ + on-screen reading; in particular, reading web pages on an \ + HTC Dream mobile phone." + +HOMEPAGE = "https://gitlab.gnome.org/GNOME/cantarell-fonts/" +SECTION = "fonts" +LICENSE = "OFL-1.1 & Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb1ef92b6909969a472a6ea3c4e99cb7" + +inherit gnomebase meson allarch fontcache pkgconfig +SRC_URI[archive.sha256sum] = "b61f64e5f6a48aa0abc7a53cdcbce60de81908ca36048a64730978fcd9ac9863" + +EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false" + +FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig"
meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb deleted +0 -25
@@ -1,25 +0,0 @@ -SUMMARY = "Cantarell, a Humanist sans-serif font family" - -DESCRIPTION = "The Cantarell font typeface is designed as a \ - contemporary Humanist sans serif, and was developed for \ - on-screen reading; in particular, reading web pages on an \ - HTC Dream mobile phone." - -HOMEPAGE = "https://gitlab.gnome.org/GNOME/cantarell-fonts/" -SECTION = "fonts" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=df91e3ffcab8cfb972a66bf11255188d" - -PV = "0.0.25" - -SRCREV = "e28a9096da43984212b5b4002b949bcb8c7527f9" -SRC_URI = "git://gitlab.gnome.org/GNOME/cantarell-fonts.git;protocol=https;branch=reconstruction-0.0.25" -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!0\.13)(?!0\.10\.1)\d+\.\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit autotools allarch fontcache pkgconfig - -PACKAGECONFIG ??= "" -PACKAGECONFIG[fontforge] = "--enable-source-rebuild=yes,--enable-source-rebuild=no,fontforge-native" -FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig"
Signature · 1 line
2.29.2
PATCH 23/23 ptest-packagelists.inc: exclude lttng-tools-ptest
In reply to Alexander KanavinThese tests have been failing for a long time (and even more failing tests are already patched out); no one in YP has the expertise to fix the issues, so until upstream steps in, let's take them out, and try to reach the goal of hard ptest failures so that ptest regressions are caught as they happen.
--- meta/conf/distro/include/ptest-packagelists.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/ptest-packagelists.inc +1 -1
@@ -60,6 +60,7 @@ PTESTS_FAST_remove_mips64 = "qemu-ptest" # bash-ptest \ # Test outcomes are non-deterministic by design # ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py # mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts +# lttng-tools-ptest \ # multiple sporadic failures, lack of expertise in the project to look into them #" PTESTS_SLOW = "\
@@ -73,7 +74,6 @@ PTESTS_SLOW = "\ gstreamer1.0-ptest \ libevent-ptest \ libinput-ptest \ - lttng-tools-ptest \ openssh-ptest \ openssl-ptest \ perl-ptest \
Signature · 1 line
2.29.2
Re: [OE-core] [PATCH 23/23] ptest-packagelists.inc: exclude lttng-tools-ptest
Hi,
Upstream here.
Always happy to give input as long as we are put in the loop.
Also bugs/sporadic test failure can be reported on our mailing list [1] and bug tracker[2].
[1] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
[2] https://bugs.lttng.org/
We understand that the burden can be quite high for a project such as lttng given we end up doing weird testing due to the nature of our work and that we are human ;).
Still we are always interested in getting info about "sporadic" failures.
To be clear, we are not against this patch. We understand the burden associated with testing lttng.
Cheers
----- Original Message -----
Quoted 46 lines
From: "Alexander Kanavin" <[email protected]>
To: "openembedded-core" <[email protected]>
Cc: "Alexander Kanavin" <[email protected]>
Sent: Friday, December 4, 2020 3:07:36 PM
Subject: [OE-core] [PATCH 23/23] ptest-packagelists.inc: exclude lttng-tools-ptestThese tests have been failing for a long time (and even more failing tests are already patched out); no one in YP has the expertise to fix the issues, so until upstream steps in, let's take them out, and try to reach the goal of hard ptest failures so that ptest regressions are caught as they happen.
Signed-off-by Alexander Kanavin <[email protected]>---
meta/conf/distro/include/ptest-packagelists.inc | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)meta/conf/distro/include/ptest-packagelists.inc +0
-0@@ -60,6 +60,7 @@ PTESTS_FAST_remove_mips64 = "qemu-ptest" # bash-ptest \ # Test outcomes are non-deterministic by design # ifupdown-ptest \ # Tested separately in
lib/oeqa/selftest/cases/imagefeatures.py
# mdadm-ptest \ # Tests rely on non-deterministicsleep()amounts
+# lttng-tools-ptest \ # multiple sporadic failures, lack of expertise in the
project to look into them
#"
PTESTS_SLOW= "\meta/conf/distro/include/ptest-packagelists.inc +0
-2@@ -73,7 +74,6 @@ PTESTS_SLOW = "\ gstreamer1.0-ptest \ libevent-ptest \ libinput-ptest \ - lttng-tools-ptest \ openssh-ptest \ openssl-ptest \ perl-ptest \ --2.29.2
Re: [OE-core] [PATCH 23/23] ptest-packagelists.inc: exclude lttng-tools-ptest
This is the patch that disables the sporadically failing stuff:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch
And this is the bug I had filed upstream:
https://bugs.lttng.org/issues/1217
As no movement occurred on that bug since Jan, I am not keen on filing additional bugs, but you can see the additional, currently occuring failures here:
https://autobuilder.yocto.io/pub/non-release/20201204-4/testresults/qemux86-64-ptest/lttng-tools.log
Alex
Quoted 71 lines · Jonathan Rajotte-Julien
Hi,
Upstream here.
Always happy to give input as long as we are put in the loop. Also bugs/sporadic test failure can be reported on our mailing list [1] and bug tracker[2].
[1] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
[2] https://bugs.lttng.org/We understand that the burden can be quite high for a project such as lttng given we end up doing weird
testing due to the nature of our work and that we are human ;). Still we are always interested in getting info about "sporadic" failures.To be clear, we are not against this patch. We understand the burden associated with testing lttng.
Cheers
----- Original Message -----
Quoted 5 lines
From: "Alexander Kanavin" <[email protected]>
To: "openembedded-core" <[email protected]>
Cc: "Alexander Kanavin" <[email protected]>
Sent: Friday, December 4, 2020 3:07:36 PM
Subject: [OE-core] [PATCH 23/23] ptest-packagelists.inc: excludelttng-tools-ptest
Quoted 19 lines
These tests have been failing for a long time (and even more failing tests are already patched out); no one in YP has the expertise to fix the issues, so until upstream steps in, let's take them out, and try to reach the goal of hard ptest failures so that ptest regressions are caught as they happen.
Signed-off-by Alexander Kanavin <[email protected]>---
meta/conf/distro/include/ptest-packagelists.inc | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)meta/conf/distro/include/ptest-packagelists.inc +0
-0@@ -60,6 +60,7 @@ PTESTS_FAST_remove_mips64 = "qemu-ptest" # bash-ptest \ # Test outcomes are non-deterministic by design # ifupdown-ptest \ # Tested separately inQuoted 3 lines
lib/oeqa/selftest/cases/imagefeatures.py
# mdadm-ptest \ # Tests rely on non-deterministicsleep()amounts
+# lttng-tools-ptest \ # multiple sporadic failures, lack ofexpertise in the
Quoted 18 lines
project to look into them
#"
PTESTS_SLOW= "\meta/conf/distro/include/ptest-packagelists.inc +0
-2@@ -73,7 +74,6 @@ PTESTS_SLOW = "\ gstreamer1.0-ptest \ libevent-ptest \ libinput-ptest \ - lttng-tools-ptest \ openssh-ptest \ openssl-ptest \ perl-ptest \ --2.29.2
Re: [OE-core] [PATCH 23/23] ptest-packagelists.inc: exclude lttng-tools-ptest
Hi,
Quoted 7 lines
This is the patch that disables the sporadically failing stuff:
[
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch
|
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/lttng/lttng-tools/0001-tests-regression-disable-the-tools-live-tests.patch
]
I suspect that some of these tests are not that sporadic anymore since a lot of work was done on the live feature. Still, it is not up to you to prove this.
Quoted 2 lines
And this is the bug I had filed upstream:
[ https://bugs.lttng.org/issues/1217 | https://bugs.lttng.org/issues/1217 ]
Well, time goes by fast.
Quoted 2 lines
As no movement occurred on that bug since Jan, I am not keen on filing additional bugs, but you can see the additional,
I'm okay with taking responsibility regarding the long time to fix but not so much in not fixing bug/issues that are simply not reported. Not all issues are of the same nature and require the same amount of work to fix.
Quoted 6 lines
currently occuring failures here:
[
https://autobuilder.yocto.io/pub/non-release/20201204-4/testresults/qemux86-64-ptest/lttng-tools.log
|
https://autobuilder.yocto.io/pub/non-release/20201204-4/testresults/qemux86-64-ptest/lttng-tools.log
]
Thanks for the link. Any link or doc that would allow me to easily setup a similar build (conf file, ram size etc.).
Is core-image-sato-sdk-ptest a good image to reproduce this?
Cheers
Re: [OE-core] [PATCH 23/23] ptest-packagelists.inc: exclude lttng-tools-ptest
Quoted 9 lines · Jonathan Rajotte-Julien
Quoted 2 lines
And this is the bug I had filed upstream:
[ https://bugs.lttng.org/issues/1217 |https://bugs.lttng.org/issues/1217 ]
Thanks for the link. Any link or doc that would allow me to easily setup a similar build (conf file, ram size etc.).
Is core-image-sato-sdk-ptest a good image to reproduce this?
Yes, the steps to reproduce are the same as in the already filed bug, but you need to build the latest poky master.
You can also drop the patch that does the test disabling to see if the previous issues are still there.
Alex