* [OE-core][PATCH 2/4] glew: update 2.2.0 -> 2.3.1
2026-01-26 10:27 [OE-core][PATCH 1/4] rgb: update 1.1.0 -> 1.1.1 ankur.tyagi85
@ 2026-01-26 10:27 ` ankur.tyagi85
2026-01-26 10:27 ` [OE-core][PATCH 3/4] stress-ng: update 0.19.06 -> 0.20.00 ankur.tyagi85
2026-01-26 10:27 ` [OE-core][PATCH 4/4] mdadm: upgrade 4.4 -> 4.5 ankur.tyagi85
2 siblings, 0 replies; 6+ messages in thread
From: ankur.tyagi85 @ 2026-01-26 10:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Ankur Tyagi
From: Ankur Tyagi <ankur.tyagi85@gmail.com>
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
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
.../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%)
diff --git a/meta/recipes-graphics/glew/glew/0001-Fix-build-race-in-Makefile.patch b/meta/recipes-graphics/glew/glew/0001-Fix-build-race-in-Makefile.patch
deleted file mode 100644
index 2418646689..0000000000
--- a/meta/recipes-graphics/glew/glew/0001-Fix-build-race-in-Makefile.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Upstream-Status: Backport [767e0316450911f1158bd4f7fd8dcd066bae5c55]
-Signed-off-by: Ross Burton <ross.burton@arm.com>
-
-From 0ce0a85597db48a2fca619bd95e34af091e54ae8 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@arm.com>
-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
-
diff --git a/meta/recipes-graphics/glew/glew/no-strip.patch b/meta/recipes-graphics/glew/glew/no-strip.patch
deleted file mode 100644
index 5708d93082..0000000000
--- a/meta/recipes-graphics/glew/glew/no-strip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Don't forcibly strip the binaries.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-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)/"
diff --git a/meta/recipes-graphics/glew/glew_2.2.0.bb b/meta/recipes-graphics/glew/glew_2.3.1.bb
similarity index 90%
rename from meta/recipes-graphics/glew/glew_2.2.0.bb
rename to meta/recipes-graphics/glew/glew_2.3.1.bb
index b82b25c602..fb4b866fd2 100644
--- a/meta/recipes-graphics/glew/glew_2.2.0.bb
+++ b/meta/recipes-graphics/glew/glew_2.3.1.bb
@@ -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+[\.\-_]*)+)/"
^ permalink raw reply related [flat|nested] 6+ messages in thread* [OE-core][PATCH 4/4] mdadm: upgrade 4.4 -> 4.5
2026-01-26 10:27 [OE-core][PATCH 1/4] rgb: update 1.1.0 -> 1.1.1 ankur.tyagi85
2026-01-26 10:27 ` [OE-core][PATCH 2/4] glew: update 2.2.0 -> 2.3.1 ankur.tyagi85
2026-01-26 10:27 ` [OE-core][PATCH 3/4] stress-ng: update 0.19.06 -> 0.20.00 ankur.tyagi85
@ 2026-01-26 10:27 ` ankur.tyagi85
2026-01-30 7:03 ` Mathieu Dubois-Briand
2 siblings, 1 reply; 6+ messages in thread
From: ankur.tyagi85 @ 2026-01-26 10:27 UTC (permalink / raw)
To: openembedded-core; +Cc: Ankur Tyagi
From: Ankur Tyagi <ankur.tyagi85@gmail.com>
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
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
...-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%)
diff --git a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
index 8598aea1f1..9572c2e8c7 100644
--- a/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
+++ b/meta/recipes-extended/mdadm/files/0001-Fix-the-path-of-corosync-and-dlm-header-files-check.patch
@@ -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" <maxin.john@intel.com>
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 <maxin.john@intel.com>
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
diff --git a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
index bb4e8d0604..6d4e8c3f29 100644
--- a/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
+++ b/meta/recipes-extended/mdadm/files/0001-Makefile-install-mdcheck.patch
@@ -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 <Qi.Chen@windriver.com>
Date: Tue, 25 Jan 2022 16:25:01 +0800
Subject: [PATCH] Makefile: install mdcheck
@@ -14,14 +14,14 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
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/mdmon@.service
+@@ -327,6 +327,7 @@ install-systemd: systemd/mdmon@.service
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
diff --git a/meta/recipes-extended/mdadm/files/0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch b/meta/recipes-extended/mdadm/files/0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch
new file mode 100644
index 0000000000..ca4cec5ab8
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-raid6check.c-restripe.c-Use-64-bit-off_t-across-both.patch
@@ -0,0 +1,54 @@
+From 0d685f4ec8b54860a031fe3e04a2fff535288f80 Mon Sep 17 00:00:00 2001
+From: Ankur Tyagi <ankur.tyagi85@gmail.com>
+Date: Mon, 26 Jan 2026 22:46:51 +1300
+Subject: [PATCH] raid6check.c, restripe.c: Use 64-bit off_t across both musl
+ and glibc
+
+This commit is adaptation of original patch[1] after commit[2] addressed
+lseek issues.
+
+[1] https://lore.kernel.org/linux-raid/20221110225546.337164-1-raj.khem@gmail.com/
+[2] https://github.com/md-raid-utilities/mdadm/commit/787cc1b60130b8031be59e49d54463c58cd8cf74
+
+Upstream-Status: Submitted [https://github.com/md-raid-utilities/mdadm/pull/235]
+Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
+---
+ raid6check.c | 4 ++--
+ restripe.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/raid6check.c b/raid6check.c
+index 4469dc8f..fa50d44e 100644
+--- a/raid6check.c
++++ b/raid6check.c
+@@ -288,7 +288,7 @@ int manual_repair(int chunk_size, int syndrome_disks,
+ }
+
+ int write_res1, write_res2;
+- off64_t seek_res;
++ off_t seek_res;
+
+ seek_res = lseek(source[fd1], offsets[fd1] + start * chunk_size, SEEK_SET);
+ if (seek_res < 0) {
+@@ -381,7 +381,7 @@ int check_stripes(struct mdinfo *info, int *source, unsigned long long *offsets,
+ goto exitCheck;
+ }
+ for (i = 0 ; i < raid_disks ; i++) {
+- off64_t seek_res = lseek(source[i], offsets[i] + start * chunk_size,
++ off_t seek_res = lseek(source[i], offsets[i] + start * chunk_size,
+ SEEK_SET);
+ if (seek_res < 0) {
+ fprintf(stderr, "lseek to source %d failed\n", i);
+diff --git a/restripe.c b/restripe.c
+index ec8d6275..58c0f5f5 100644
+--- a/restripe.c
++++ b/restripe.c
+@@ -756,7 +756,7 @@ int restore_stripes(int *dest, unsigned long long *offsets,
+ if (src_buf == NULL) {
+ /* read from file */
+ if (lseek(source, read_offset, 0) !=
+- (off64_t)read_offset) {
++ (off_t)read_offset) {
+ rv = -1;
+ goto abort;
+ }
diff --git a/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch b/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch
index e425fc446e..2ef92418ed 100644
--- a/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch
+++ b/meta/recipes-extended/mdadm/files/0002-Create.c-include-linux-falloc.h-for-FALLOC_FL_ZERO_R.patch
@@ -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 <alex@linutronix.de>
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 <alex@linutronix.de>
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>
diff --git a/meta/recipes-extended/mdadm/mdadm_4.4.bb b/meta/recipes-extended/mdadm/mdadm_4.5.bb
similarity index 96%
rename from meta/recipes-extended/mdadm/mdadm_4.4.bb
rename to meta/recipes-extended/mdadm/mdadm_4.5.bb
index 26a60e4c1a..8305215b07 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.4.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.5.bb
@@ -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
^ permalink raw reply related [flat|nested] 6+ messages in thread