rgb: update 1.1.0 -> 1.1.1
PATCH 1/4 rgb: update 1.1.0 -> 1.1.1
From: Ankur Tyagi <[email protected]>
License-Update: updated md5 hash because of commit[1]
[1] https://gitlab.freedesktop.org/xorg/app/rgb/-/commit/fb06ee0b71ec15d63b6ee4797f954187ec014a37
---
meta/recipes-graphics/xorg-app/{rgb_1.1.0.bb => rgb_1.1.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-app/{rgb_1.1.0.bb => rgb_1.1.1.bb} (71%)meta/recipes-graphics/xorg-app/rgb_1.1.1.bb renamed from meta/recipes-graphics/xorg-app/rgb_1.1.0.bb +2 -2
@@ -7,10 +7,10 @@ lookup, the rgb program to convert the text file into the binary database \ format." DEPENDS += " xorgproto util-macros" -LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a" +LIC_FILES_CHKSUM = "file://COPYING;md5=dc4f23db04773a414e3c39cc97a9f415" PE = "1" SRC_URI_EXT = "xz" -SRC_URI[sha256sum] = "fc03d7f56e5b2a617668167f8927948cce54f93097e7ccd9f056077f479ed37b" +SRC_URI[sha256sum] = "c80ff280a02f56c30fadc2dfa210fc6979c4ab968afa315278cb97768b64ecab" FILES:${PN} += "${datadir}/X11"
PATCH 2/4 glew: update 2.2.0 -> 2.3.1
From: Ankur Tyagi <[email protected]>
Dropped patches which are part of upstream version
- 0001-Fix-build-race-in-Makefile.patch [1]
- no-strip.patch [2]
[1] https://github.com/nigels-com/glew/commit/767e0316450911f1158bd4f7fd8dcd066bae5c55
[2] https://github.com/nigels-com/glew/commit/d7693eea09ac76c67f5f3aa538bb911ce2291e2c
---
.../0001-Fix-build-race-in-Makefile.patch | 56 -------------------
.../recipes-graphics/glew/glew/no-strip.patch | 12 ----
.../glew/{glew_2.2.0.bb => glew_2.3.1.bb} | 5 +-
3 files changed, 2 insertions(+), 71 deletions(-)
delete mode 100644 meta/recipes-graphics/glew/glew/0001-Fix-build-race-in-Makefile.patch
delete mode 100644 meta/recipes-graphics/glew/glew/no-strip.patch
rename meta/recipes-graphics/glew/{glew_2.2.0.bb => glew_2.3.1.bb} (90%)meta/recipes-graphics/glew/glew/0001-Fix-build-race-in-Makefile.patch deleted +0 -56
@@ -1,56 +0,0 @@ -Upstream-Status: Backport [767e0316450911f1158bd4f7fd8dcd066bae5c55] -Signed-off-by: Ross Burton <[email protected]> - -From 0ce0a85597db48a2fca619bd95e34af091e54ae8 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Thu, 22 Jul 2021 16:31:11 +0100 -Subject: [PATCH] Fix build race in Makefile - -The current rule for the binaries is: - -glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) - -In parallel builds, all of those targets happen at the same time. This -means that 'bin' can happen *after* 'bin/$(GLEWINFO.BIN)', which is a -problem as the 'bin' target's responsibility is to create the directory -that the other target writes into. - -Solve this by not having a separate 'create directory' target which is -fundamentally racy, and simply mkdir in each target which writes into it. ---- - Makefile | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index d0e4614..04af44c 100644 ---- a/Makefile -+++ b/Makefile -@@ -171,21 +171,20 @@ VISUALINFO.BIN.OBJ := $(VISUALINFO.BIN.OBJ:.c=.o) - # Don't build glewinfo or visualinfo for NaCL, yet. - - ifneq ($(filter nacl%,$(SYSTEM)),) --glew.bin: glew.lib bin -+glew.bin: glew.lib - else --glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) -+glew.bin: glew.lib bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) - endif - --bin: -- mkdir bin -- - bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED) -+ @mkdir -p $(dir $@) - $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) - ifneq ($(STRIP),) - $(STRIP) -x $@ - endif - - bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED) -+ @mkdir -p $(dir $@) - $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) - ifneq ($(STRIP),) - $(STRIP) -x $@ --- -2.25.1 -
meta/recipes-graphics/glew/glew/no-strip.patch deleted +0 -12
@@ -1,12 +0,0 @@ -Don't forcibly strip the binaries. - -Signed-off-by: Ross Burton <[email protected]> -Upstream-Status: Backport [d7693eea09ac76c67f5f3aa538bb911ce2291e2c] - -diff --git a/Makefile b/Makefile -index 6a9803c..170c0ce 100644 ---- a/Makefile -+++ b/Makefile -@@ -285 +285 @@ install.bin: glew.bin -- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) "$(DESTDIR)$(BINDIR)/" -+ $(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) "$(DESTDIR)$(BINDIR)/"
meta/recipes-graphics/glew/glew_2.3.1.bb renamed from meta/recipes-graphics/glew/glew_2.2.0.bb +2 -3
@@ -6,11 +6,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ - file://0001-Fix-build-race-in-Makefile.patch \ file://notempdir.patch \ - file://no-strip.patch" +" -SRC_URI[sha256sum] = "d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1" +SRC_URI[sha256sum] = "b64790f94b926acd7e8f84c5d6000a86cb43967bd1e688b03089079799c9e889" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/glew/files/glew" UPSTREAM_CHECK_REGEX = "/glew/(?P<pver>(\d+[\.\-_]*)+)/"
PATCH 3/4 stress-ng: update 0.19.06 -> 0.20.00
In reply to [email protected]From: Ankur Tyagi <[email protected]>
Changelog:
https://github.com/ColinIanKing/stress-ng/releases/tag/V0.20.00
---
.../stress-ng/{stress-ng_0.19.06.bb => stress-ng_0.20.00.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/stress-ng/{stress-ng_0.19.06.bb => stress-ng_0.20.00.bb} (94%)meta/recipes-extended/stress-ng/stress-ng_0.20.00.bb renamed from meta/recipes-extended/stress-ng/stress-ng_0.19.06.bb +1 -1
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master;tag=V${PV}" -SRCREV = "310c900f697028dce78fea82c2b1d28a244c86c2" +SRCREV = "dcd2902c888c1eac1d958785b13cf232f46894a0" DEPENDS = "coreutils-native libbsd"
PATCH 4/4 mdadm: upgrade 4.4 -> 4.5
In reply to [email protected]From: Ankur Tyagi <[email protected]>
Changelog:
https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/tree/CHANGELOG.md?h=mdadm-4.5
Replaced 0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch with 0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch as partial changes from first patch are part of the upstream version[1].
Dropped xmalloc.patch which is part of upstream version[2].
Also refreshed other patches.
[1] https://github.com/md-raid-utilities/mdadm/commit/787cc1b60130b8031be59e49d54463c58cd8cf74
[2] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/raid6check.c?h=mdadm-4.5&id=e0df6c4c984d564e9e40913727e916a6cd8f466e
---
...-corosync-and-dlm-header-files-check.patch | 6 +--
.../files/0001-Makefile-install-mdcheck.patch | 8 +--
...tripe.c-Use-64-bit-off_t-across-both.patch | 54 +++++++++++++++++++
...-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch | 6 +--
.../mdadm/{mdadm_4.4.bb => mdadm_4.5.bb} | 5 +-
5 files changed, 66 insertions(+), 13 deletions(-)
create mode 100644 meta/recipes-extended/mdadm/files/0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch
rename meta/recipes-extended/mdadm/{mdadm_4.4.bb => mdadm_4.5.bb} (96%)meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch +3 -3
@@ -1,4 +1,4 @@ -From 232101e2fcc6359fb6db2bc232570e373e368c75 Mon Sep 17 00:00:00 2001 +From 77e9527a0ea995ed377e00813eeeb17175dbce72 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" <[email protected]> Date: Tue, 9 Feb 2016 11:44:01 +0200 Subject: [PATCH] Fix the path of corosync and dlm header files check
@@ -14,10 +14,10 @@ Signed-off-by: Maxin B. John <[email protected]> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index bcd092de..0a78cd22 100644 +index 8031ce24..788ff5d9 100644 --- a/Makefile +++ b/Makefile -@@ -130,8 +130,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots +@@ -120,8 +120,8 @@ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots SYSTEMD_DIR=/lib/systemd/system LIB_DIR=/usr/libexec/mdadm
meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch +4 -4
@@ -1,4 +1,4 @@ -From 407691e11037709af888ce2cf6bd5eac6971ac61 Mon Sep 17 00:00:00 2001 +From ed0163039de3e22ee6501162616649b6ec0e0366 Mon Sep 17 00:00:00 2001 From: Chen Qi <[email protected]> Date: Tue, 25 Jan 2022 16:25:01 +0800 Subject: [PATCH] Makefile: install mdcheck
@@ -14,14 +14,14 @@ Signed-off-by: Chen Qi <[email protected]> 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile -index 981e16fa..b28e7855 100644 +index 788ff5d9..2201a6e3 100644 --- a/Makefile +++ b/Makefile -@@ -345,6 +345,7 @@ install-systemd: systemd/[email protected] +@@ -327,6 +327,7 @@ install-systemd: systemd/[email protected] install-bin: mdadm mdmon $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon + $(INSTALL) -D -m 755 misc/mdcheck $(DESTDIR)/usr/share/mdadm/mdcheck uninstall: - rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm + rm -f $(DESTDIR)$(BINDIR)/mdadm $(DESTDIR)$(BINDIR)/mdmon
meta/recipes-extended/mdadm/files/0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch new file +54 -0
54 lines not on this page · raw message
meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch +3 -3
@@ -1,4 +1,4 @@ -From 8de073c637a1ea968b7304f373a20b13a4a47bbc Mon Sep 17 00:00:00 2001 +From b7e51fbedc1fbc44af00398a4a7aef51cdf191ee Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Tue, 12 Mar 2024 10:54:08 +0100 Subject: [PATCH] Create.c: include linux/falloc.h for FALLOC_FL_ZERO_RANGE
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <[email protected]> 1 file changed, 1 insertion(+) diff --git a/Create.c b/Create.c -index fd6c9215..3210a03e 100644 +index 4aa75b7e..5d5fc806 100644 --- a/Create.c +++ b/Create.c -@@ -33,6 +33,7 @@ +@@ -31,6 +31,7 @@ #include <signal.h> #include <sys/signalfd.h> #include <sys/wait.h>
meta/recipes-extended/mdadm/mdadm_4.5.bb renamed from meta/recipes-extended/mdadm/mdadm_4.4.bb +2 -3
@@ -13,12 +13,11 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \ file://mdadm.init \ file://0001-Makefile-install-mdcheck.patch \ - file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \ file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \ - file://xmalloc.patch \ + file://0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch \ " -SRCREV = "8e56efac9afd7080bb42bae4b77cdad5f345633a" +SRCREV = "8f0c7692d48414ff7b3fe927ce75799c65ef24b1" inherit ptest systemd
Re: [OE-core][PATCH 4/4] mdadm: upgrade 4.4 -> 4.5
Quoted 11 lines · Ankur Tyagi via lists.openembedded.org
From: Ankur Tyagi <[email protected]>
Changelog:
https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/tree/CHANGELOG.md?h=mdadm-4.5Replaced 0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch with 0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch as partial changes from first patch are part of the upstream version[1].
Dropped xmalloc.patch which is part of upstream version[2].
Quoted 7 lines
Also refreshed other patches.
[1] https://github.com/md-raid-utilities/mdadm/commit/787cc1b60130b8031be59e49d54463c58cd8cf74
[2] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/raid6check.c?h=mdadm-4.5&id=e0df6c4c984d564e9e40913727e916a6cd8f466eSigned-off-by Ankur Tyagi <[email protected]>---
Hi Ankur,
Thanks for your patch.
meta/recipes-extended/mdadm/mdadm_4.5.bb SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra · line 18
Quoted 11 lines
meta/recipes-extended/mdadm/mdadm_4.5.bb renamed from meta/recipes-extended/mdadm/mdadm_4.4.bb +1
-2@@ -13,12 +13,11 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \ file://mdadm.init \ file://0001-Makefile-install-mdcheck.patch \ - file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \ file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \ - file://xmalloc.patch \ + file://0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch \ "
You should also remove the two unused patches from git.
Also, we have a second issue: I suspect this upgrade is responsible of some intermittent reproducibility issue. I already had it twice on my branch:
AssertionError: The following deb packages are different and not in exclusion list:/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/mdadm_4.5-r0_amd64.deb The following ipk packages are different and not in exclusion list:/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/ipk/./x86-64-v3/mdadm_4.5-r0_x86-64-v3.ipk The following rpm packages are different and not in exclusion list:/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./x86_64_v3/mdadm-4.5-r0.x86_64_v3.rpm
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3278
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3274
Corresponding diffoscope output can be found here:
https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260129-v__phvnk/packages/diff-html/
https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260129-5hbi93fk/packages/diff-html/
It looks like the difference is some path that is sometimes appearing as "BINDIR/mdadm" and sometimes as "/sbin/mdadm".
I know these reproducibility issues are not the easiest ones to debug, but I would appreciate if you could have a look for obvious failure reasons.
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [OE-core][PATCH 4/4] mdadm: upgrade 4.4 -> 4.5
Quoted 59 lines · Mathieu Dubois-Briand
Quoted 11 lines · Ankur Tyagi via lists.openembedded.org
From: Ankur Tyagi <[email protected]>
Changelog:
https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/tree/CHANGELOG.md?h=mdadm-4.5Replaced 0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch with 0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch as partial changes from first patch are part of the upstream version[1].
Dropped xmalloc.patch which is part of upstream version[2].
Quoted 7 lines
Also refreshed other patches.
[1] https://github.com/md-raid-utilities/mdadm/commit/787cc1b60130b8031be59e49d54463c58cd8cf74
[2] https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/raid6check.c?h=mdadm-4.5&id=e0df6c4c984d564e9e40913727e916a6cd8f466eSigned-off-by Ankur Tyagi <[email protected]>---
Hi Ankur,
Thanks for your patch.
meta/recipes-extended/mdadm/mdadm_4.5.bb SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra · line 18
Quoted 11 lines
meta/recipes-extended/mdadm/mdadm_4.5.bb renamed from meta/recipes-extended/mdadm/mdadm_4.4.bb +1
-2@@ -13,12 +13,11 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra file://0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch \ file://mdadm.init \ file://0001-Makefile-install-mdcheck.patch \ - file://0001-restripe.c-Use-_FILE_OFFSET_BITS-to-enable-largefile.patch \ file://0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch \ - file://xmalloc.patch \ + file://0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch \ "You should also remove the two unused patches from git.
Also, we have a second issue: I suspect this upgrade is responsible of some intermittent reproducibility issue. I already had it twice on my branch:
AssertionError: The following deb packages are different and not in exclusion list:
/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/deb/./x86-64-v3/mdadm_4.5-r0_amd64.debThe following ipk packages are different and not in exclusion list:/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/ipk/./x86-64-v3/mdadm_4.5-r0_x86-64-v3.ipkThe following rpm packages are different and not in exclusion list:/srv/pokybuild/yocto-worker/reproducible/build/build-st/reproducibleB-extended/tmp/deploy/rpm/./x86_64_v3/mdadm-4.5-r0.x86_64_v3.rpmhttps://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3278
https://autobuilder.yoctoproject.org/valkyrie/#/builders/37/builds/3274Corresponding diffoscope output can be found here:
https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260129-v__phvnk/packages/diff-html/
https://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20260129-5hbi93fk/packages/diff-html/
Quoted 7 lines
It looks like the difference is some path that is sometimes appearing as "BINDIR/mdadm" and sometimes as "
/sbin/mdadm".I know these reproducibility issues are not the easiest ones to debug, but I would appreciate if you could have a look for obvious failure reasons.
Thanks for your review, I will look into the issues and try to resolve them.
Quoted 8 lines
Thanks,
Mathieu--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com