package/mdadm: bump to version 4.6
PATCH 1/1 package/mdadm: bump to version 4.6
Drop upstreamed/backported patches.
Release mail:
https://lore.kernel.org/linux-raid/CALTww2_2pjjOSsVj-WT++m35555CjnPWokU7fut+HwUJVV-=ZQ@mail.gmail.com/
--- ...not-require-libudev-h-if-DNO_LIBUDEV.patch | 34 --------------- ...ts-h-include-for-NAME_MAX-definition.patch | 32 -------------- .../0003-Create.c-fix-uclibc-build.patch | 42 ------------------- .../0004-Makefile-Move-pie-to-LDFLAGS.patch | 40 ------------------ package/mdadm/mdadm.hash | 5 ++- package/mdadm/mdadm.mk | 6 +-- 6 files changed, 6 insertions(+), 153 deletions(-) delete mode 100644 package/mdadm/0001-udev-c-Do-not-require-libudev-h-if-DNO_LIBUDEV.patch delete mode 100644 package/mdadm/0002-util-c-add-limits-h-include-for-NAME_MAX-definition.patch delete mode 100644 package/mdadm/0003-Create.c-fix-uclibc-build.patch delete mode 100644 package/mdadm/0004-Makefile-Move-pie-to-LDFLAGS.patch
package/mdadm/0001-udev-c-Do-not-require-libudev-h-if-DNO_LIBUDEV.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 1750758c7ff526e3560433f6235e5cfa35cf646a Mon Sep 17 00:00:00 2001 -From: Mariusz Tkaczyk <[email protected]> -Date: Wed, 6 Mar 2024 15:50:55 +0100 -Subject: udev.c: Do not require libudev.h if DNO_LIBUDEV - -libudev may not be presented at all, do not require it. - -Reported-by: Boian Bonev <[email protected]> -Signed-off-by: Mariusz Tkaczyk <[email protected]> - -Upstream: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=1750758c7ff526e3560433f6235e5cfa35cf646a -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - udev.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/udev.c b/udev.c -index bc4722b0..066e6ab1 100644 ---- a/udev.c -+++ b/udev.c -@@ -26,7 +26,10 @@ - #include <signal.h> - #include <limits.h> - #include <syslog.h> -+ -+#ifndef NO_LIBUDEV - #include <libudev.h> -+#endif - - static char *unblock_path; - --- -cgit 1.2.3-korg -
package/mdadm/0002-util-c-add-limits-h-include-for-NAME_MAX-definition.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 8bda86099089b44129ef6206764f9de47a45f0db Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 12 Mar 2024 11:01:50 +0100 -Subject: util.c: add limits.h include for NAME_MAX definition - -Add limits.h include for NAME_MAX definition. - -Signed-off-by: Alexander Kanavin <[email protected]> -Signed-off-by: Mariusz Tkaczyk <[email protected]> - -Upstream: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=8bda86099089b44129ef6206764f9de47a45f0db -Signed-off-by: Fabrice Fontaine <[email protected]> ---- - util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util.c b/util.c -index 05ad3343..49a9c6e2 100644 ---- a/util.c -+++ b/util.c -@@ -36,7 +36,7 @@ - #include <ctype.h> - #include <dirent.h> - #include <dlfcn.h> -- -+#include <limits.h> - - /* - * following taken from linux/blkpg.h because they aren't --- -cgit 1.2.3-korg -
package/mdadm/0003-Create.c-fix-uclibc-build.patch deleted +0 -42
42 lines not on this page · raw message
package/mdadm/0004-Makefile-Move-pie-to-LDFLAGS.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 893a55831e5abbcd15b171db66fa1f389fb61506 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine <[email protected]> -Date: Tue, 7 May 2024 19:32:16 +0200 -Subject: Makefile: Move -pie to LDFLAGS - -Move -pie from LDLIBS to LDFLAGS and make LDFLAGS configurable to allow -the user to drop it by setting their own LDFLAGS (e.g. PIE could be -enabled or disabled by the buildsystem such as buildroot). - -Suggested-by: Mariusz Tkaczyk <[email protected]> -Signed-off-by: Fabrice Fontaine <[email protected]> -Signed-off-by: Mariusz Tkaczyk <[email protected]> - -Upstream: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=893a55831e5abbcd15b171db66fa1f389fb61506 ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 7c221a89..adac7905 100644 ---- a/Makefile -+++ b/Makefile -@@ -132,12 +132,12 @@ CFLAGS += -DUSE_PTHREADS - MON_LDFLAGS += -pthread - endif - --LDFLAGS = -Wl,-z,now,-z,noexecstack -+LDFLAGS ?= -pie -Wl,-z,now,-z,noexecstack - - # If you want a static binary, you might uncomment these - # LDFLAGS += -static - # STRIP = -s --LDLIBS = -ldl -pie -+LDLIBS = -ldl - - # To explicitly disable libudev, set -DNO_LIBUDEV in CXFLAGS - ifeq (, $(findstring -DNO_LIBUDEV, $(CXFLAGS))) --- -cgit 1.2.3-korg -
package/mdadm/mdadm.hash +3 -2
@@ -1,4 +1,5 @@ -# From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc -sha256 416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f mdadm-4.3.tar.xz +# Locally calculated +sha256 e89f24994f403cea90068d03f3c1ee49957303c7a092cc5b2ed2c603df9649a7 mdadm-4.6.tar.gz + # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
package/mdadm/mdadm.mk +3 -3
@@ -4,9 +4,9 @@ # ################################################################################ -MDADM_VERSION = 4.3 -MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz -MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm +MDADM_VERSION = 4.6 +MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.gz +MDADM_SITE = https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/snapshot MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE_FILES = COPYING MDADM_CPE_ID_VALID = YES
Signature · 6 lines
2.47.3 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Maxin,
Thanks for the patch. I have few comments, see below.
Quoted 4 lines · Maxin John
Drop upstreamed/backported patches.
Release mail:
https://lore.kernel.org/linux-raid/CALTww2_2pjjOSsVj-WT++m35555CjnPWokU7fut+HwUJVV-=ZQ@mail.gmail.com/
Since this patch updates from 4.3 to 4.6, could you also include the announces for 4.4 and 4.5, please? For example:
4.4:
https://lore.kernel.org/linux-raid/20241213121438.7ed6a0fd@mtkaczyk-private-dev/
Quoted 17 lines
Signed-off-by Maxin John <[email protected]>--- ...not-require-libudev-h-if-DNO_LIBUDEV.patch | 34 --------------- ...ts-h-include-for-NAME_MAX-definition.patch | 32 -------------- .../0003-Create.c-fix-uclibc-build.patch | 42 ------------------- .../0004-Makefile-Move-pie-to-LDFLAGS.patch | 40 ------------------ package/mdadm/mdadm.hash | 5 ++- package/mdadm/mdadm.mk | 6 +-- 6 files changed, 6 insertions(+), 153 deletions(-) delete mode 100644 package/mdadm/0001-udev-c-Do-not-require-libudev-h-if-DNO_LIBUDEV.patch delete mode 100644 package/mdadm/0002-util-c-add-limits-h-include-for-NAME_MAX-definition.patch delete mode 100644 package/mdadm/0003-Create.c-fix-uclibc-build.patch delete mode 100644
package/mdadm/0004-Makefile-Move-pie-to-LDFLAGS.patch
[...]
Quoted 5 lines
package/mdadm/mdadm.mk +0
-0
package/mdadm/mdadm.mk line 9
Quoted 9 lines
package/mdadm/mdadm.mk +2
-3@@ -4,9 +4,9 @@ # ################################################################################ -MDADM_VERSION = 4.3 -MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz -MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm +MDADM_VERSION = 4.6 +MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.gz
This MDADM_SOURCE line is no longer needed and can be removed. This is because the .tar.gz name is the default value set by the package infra.
Quoted 2 lines
package/mdadm/mdadm.mk +1
-0+MDADM_SITE =https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/snapshot
Also, since commit:
https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/README.md?id=3f90be087fa62c0c7ed76c2ac26752f0ac3a89e7
The README.md mention:
"""
Effective immediately [Github](https://github.com/md-raid-utilities/mdadm) is the primary location for **mdadm**. Use pull request to contribute.
"""
Could you add this information in the commit log and change and change _SITE to use this primary github repo? For example, use:
MDADM_SITE = https://github.com/md-raid-utilities/mdadm/archive/refs/tags
Quoted 5 lines
MDADM_LICENSE= GPL-2.0+
MDADM_LICENSE_FILES= COPYING
MDADM_CPE_ID_VALID= YES
--
2.47.3
Could you send an updated patch please?
Best regards,
Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Julien,
Quoted 77 lines · Julien Olivain
Hi Maxin,
Thanks for the patch. I have few comments, see below.
Quoted 4 lines · Maxin John
Drop upstreamed/backported patches.
Release mail:
https://lore.kernel.org/linux-raid/CALTww2_2pjjOSsVj-WT++m35555CjnPWokU7fut+HwUJVV-=ZQ@mail.gmail.com/Since this patch updates from 4.3 to 4.6, could you also include the announces for 4.4 and 4.5, please?
For example:4.4:
https://lore.kernel.org/linux-raid/20241213121438.7ed6a0fd@mtkaczyk-private-dev/Quoted 16 lines
Signed-off-by Maxin John <[email protected]>--- ...not-require-libudev-h-if-DNO_LIBUDEV.patch | 34 --------------- ...ts-h-include-for-NAME_MAX-definition.patch | 32 -------------- .../0003-Create.c-fix-uclibc-build.patch | 42 ------------------- .../0004-Makefile-Move-pie-to-LDFLAGS.patch | 40 ------------------ package/mdadm/mdadm.hash | 5 ++- package/mdadm/mdadm.mk | 6 +-- 6 files changed, 6 insertions(+), 153 deletions(-) delete mode 100644 package/mdadm/0001-udev-c-Do-not-require-libudev-h-if-DNO_LIBUDEV.patch delete mode 100644 package/mdadm/0002-util-c-add-limits-h-include-for-NAME_MAX-definition.patch delete mode 100644 package/mdadm/0003-Create.c-fix-uclibc-build.patch delete mode 100644
package/mdadm/0004-Makefile-Move-pie-to-LDFLAGS.patch[...]
package/mdadm/mdadm.mk line 8
Quoted 13 lines
package/mdadm/mdadm.mk +2
-3@@ -4,9 +4,9 @@ # ################################################################################ -MDADM_VERSION = 4.3 -MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz -MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm +MDADM_VERSION = 4.6 +MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.gzThis
MDADM_SOURCEline is no longer needed and can be removed. This is because the .tar.gz name is the default value set by the package infra.Quoted 2 lines
package/mdadm/mdadm.mk +1
-0+MDADM_SITE =https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/snapshot
Also, since commit:
https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/README.md?id=3f90be087fa62c0c7ed76c2ac26752f0ac3a89e7The README.md mention:
"""
Effective immediately [Github](https://github.com/md-raid-utilities/mdadm) is the primary
location for **mdadm**. Use pull request to contribute.
"""Could you add this information in the commit log and change and change
_SITEto use this primary github repo? For example, use:
MDADM_SITE= https://github.com/md-raid-utilities/mdadm/archive/refs/tags
Quoted 7 lines
Quoted 5 lines
MDADM_LICENSE= GPL-2.0+
MDADM_LICENSE_FILES= COPYING
MDADM_CPE_ID_VALID= YES
--
2.47.3Could you send an updated patch please?
Thanks a lot for the review. I will send a v2.
Quoted 3 lines
Best regards,
Julien.
Best Regards,
Maxin
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot