* [ptxdist] [PATCH v2 1/2] mtd-utils: Version bump. 2.2.1 -> 2.3.0
@ 2025-02-18 20:47 Christian Melki
2025-02-18 20:47 ` [ptxdist] [PATCH v2 2/2] host-mtd-utils: Follow target mtd-utils 2.2.1 -> 2.3.0 bump Christian Melki
2025-02-21 17:08 ` [ptxdist] [APPLIED] mtd-utils: add option for fsck.ubifs Michael Olbrich
0 siblings, 2 replies; 4+ messages in thread
From: Christian Melki @ 2025-02-18 20:47 UTC (permalink / raw)
To: ptxdist
Perhaps the most interesting bit is the ubifs-fsck:er.
https://lists.infradead.org/pipermail/linux-mtd/2025-February/108248.html
* Rearrange options, make zlib enabled as it is mandatory per .in.
* Add fsck.ubifs option
* Forward patchset. Applies cleanly.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...-nandmarkbad-new-util-to-mark-blocks-as-bad.patch | 0
.../{mtd-utils-2.2.1 => mtd-utils-2.3.0}/autogen.sh | 0
patches/{mtd-utils-2.2.1 => mtd-utils-2.3.0}/series | 0
rules/mtd-utils.in | 7 +++++++
rules/mtd-utils.make | 12 +++++++++---
5 files changed, 16 insertions(+), 3 deletions(-)
rename patches/{mtd-utils-2.2.1 => mtd-utils-2.3.0}/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch (100%)
rename patches/{mtd-utils-2.2.1 => mtd-utils-2.3.0}/autogen.sh (100%)
rename patches/{mtd-utils-2.2.1 => mtd-utils-2.3.0}/series (100%)
diff --git a/patches/mtd-utils-2.2.1/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch b/patches/mtd-utils-2.3.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch
similarity index 100%
rename from patches/mtd-utils-2.2.1/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch
rename to patches/mtd-utils-2.3.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch
diff --git a/patches/mtd-utils-2.2.1/autogen.sh b/patches/mtd-utils-2.3.0/autogen.sh
similarity index 100%
rename from patches/mtd-utils-2.2.1/autogen.sh
rename to patches/mtd-utils-2.3.0/autogen.sh
diff --git a/patches/mtd-utils-2.2.1/series b/patches/mtd-utils-2.3.0/series
similarity index 100%
rename from patches/mtd-utils-2.2.1/series
rename to patches/mtd-utils-2.3.0/series
diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
index 00dba7c1d..ed470dcb4 100644
--- a/rules/mtd-utils.in
+++ b/rules/mtd-utils.in
@@ -395,6 +395,13 @@ config MTD_UTILS_MKFS_UBIFS
help
Create ubifs filesystems
+config MTD_UTILS_FSCK_UBIFS
+ bool
+ prompt "fsck.ubifs"
+ select MTD_UTILS_UBIFS
+ help
+ Check ubifs filesystems
+
endif
config MTD_UTILS_MTDINFO
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index def360ae3..974075916 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils
#
# Paths and names
#
-MTD_UTILS_VERSION := 2.2.1
-MTD_UTILS_MD5 := 08b97c0df7e70916a7b42460b5030fff
+MTD_UTILS_VERSION := 2.3.0
+MTD_UTILS_MD5 := 06be1bd123cfea8575829e9b16e84f4b
MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION)
MTD_UTILS_SUFFIX := tar.bz2
MTD_UTILS_URL := https://infraroot.at/pub/mtd/$(MTD_UTILS).$(MTD_UTILS_SUFFIX)
@@ -35,11 +35,13 @@ MTD_UTILS_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--disable-unit-tests \
$(GLOBAL_LARGE_FILE_OPTION) \
- --$(call ptx/wwo,PTXCONF_MTD_UTILS_TESTS)-tests \
--$(call ptx/endis,PTXCONF_MTD_UTILS_UBIHEALTHD)-ubihealthd \
+ --disable-asan \
+ --$(call ptx/wwo,PTXCONF_MTD_UTILS_TESTS)-tests \
--$(call ptx/wwo, PTXCONF_MTD_UTILS_LSMTD)-lsmtd \
--$(call ptx/wwo, PTXCONF_MTD_UTILS_JFFS)-jffs \
--$(call ptx/wwo, PTXCONF_MTD_UTILS_UBIFS)-ubifs \
+ --with-zlib \
--without-xattr \
--$(call ptx/wwo, PTXCONF_MTD_UTILS_USE_LIBLZO)-lzo \
--without-zstd \
@@ -260,6 +262,10 @@ ifdef PTXCONF_MTD_UTILS_MKFS_UBIFS
@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
/usr/sbin/mkfs.ubifs);
endif
+ifdef PTXCONF_MTD_UTILS_FSCK_UBIFS
+ @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
+ /usr/sbin/fsck.ubifs);
+endif
ifdef PTXCONF_MTD_UTILS_MTDINFO
@$(call install_copy, mtd-utils, 0, 0, 0755, -, \
/usr/sbin/mtdinfo)
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread* [ptxdist] [PATCH v2 2/2] host-mtd-utils: Follow target mtd-utils 2.2.1 -> 2.3.0 bump
2025-02-18 20:47 [ptxdist] [PATCH v2 1/2] mtd-utils: Version bump. 2.2.1 -> 2.3.0 Christian Melki
@ 2025-02-18 20:47 ` Christian Melki
2025-02-21 17:08 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-02-21 17:08 ` [ptxdist] [APPLIED] mtd-utils: add option for fsck.ubifs Michael Olbrich
1 sibling, 1 reply; 4+ messages in thread
From: Christian Melki @ 2025-02-18 20:47 UTC (permalink / raw)
To: ptxdist
* Rearrange and fix options.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
rules/host-mtd-utils.make | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make
index 99de07083..b6f4fceba 100644
--- a/rules/host-mtd-utils.make
+++ b/rules/host-mtd-utils.make
@@ -24,11 +24,13 @@ HOST_MTD_UTILS_CONF_OPT := \
$(HOST_AUTOCONF) \
--disable-unit-tests \
--enable-largefile \
+ --disable-asan \
--without-tests \
--disable-ubihealthd \
--without-lsmtd \
--without-jffs \
--with-ubifs \
+ --with-zlib \
--with-xattr \
--with-lzo \
--with-zstd \
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] host-mtd-utils: Follow target mtd-utils 2.2.1 -> 2.3.0 bump
2025-02-18 20:47 ` [ptxdist] [PATCH v2 2/2] host-mtd-utils: Follow target mtd-utils 2.2.1 -> 2.3.0 bump Christian Melki
@ 2025-02-21 17:08 ` Michael Olbrich
0 siblings, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2025-02-21 17:08 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as b3ae4a2ac00e96bb64d8a4949a0d6c5da99f0a0e.
Michael
[sent from post-receive hook]
On Fri, 21 Feb 2025 18:08:18 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> * Rearrange and fix options.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20250218204705.3107977-2-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make
> index 99de070836aa..b6f4fceba041 100644
> --- a/rules/host-mtd-utils.make
> +++ b/rules/host-mtd-utils.make
> @@ -24,11 +24,13 @@ HOST_MTD_UTILS_CONF_OPT := \
> $(HOST_AUTOCONF) \
> --disable-unit-tests \
> --enable-largefile \
> + --disable-asan \
> --without-tests \
> --disable-ubihealthd \
> --without-lsmtd \
> --without-jffs \
> --with-ubifs \
> + --with-zlib \
> --with-xattr \
> --with-lzo \
> --with-zstd \
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [APPLIED] mtd-utils: add option for fsck.ubifs
2025-02-18 20:47 [ptxdist] [PATCH v2 1/2] mtd-utils: Version bump. 2.2.1 -> 2.3.0 Christian Melki
2025-02-18 20:47 ` [ptxdist] [PATCH v2 2/2] host-mtd-utils: Follow target mtd-utils 2.2.1 -> 2.3.0 bump Christian Melki
@ 2025-02-21 17:08 ` Michael Olbrich
1 sibling, 0 replies; 4+ messages in thread
From: Michael Olbrich @ 2025-02-21 17:08 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 4eba17ff2b3d478ef4cf25da2b1582d3c26d11ef.
Michael
[sent from post-receive hook]
On Fri, 21 Feb 2025 18:08:17 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> This was originally v2 of the version bump but v1 was accidentally
> merged, so this is just the diff.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20250218204705.3107977-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
> index 00dba7c1d458..ed470dcb4f63 100644
> --- a/rules/mtd-utils.in
> +++ b/rules/mtd-utils.in
> @@ -395,6 +395,13 @@ config MTD_UTILS_MKFS_UBIFS
> help
> Create ubifs filesystems
>
> +config MTD_UTILS_FSCK_UBIFS
> + bool
> + prompt "fsck.ubifs"
> + select MTD_UTILS_UBIFS
> + help
> + Check ubifs filesystems
> +
> endif
>
> config MTD_UTILS_MTDINFO
> diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
> index 84989ace4d36..974075916b65 100644
> --- a/rules/mtd-utils.make
> +++ b/rules/mtd-utils.make
> @@ -262,6 +262,10 @@ ifdef PTXCONF_MTD_UTILS_MKFS_UBIFS
> @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> /usr/sbin/mkfs.ubifs);
> endif
> +ifdef PTXCONF_MTD_UTILS_FSCK_UBIFS
> + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> + /usr/sbin/fsck.ubifs);
> +endif
> ifdef PTXCONF_MTD_UTILS_MTDINFO
> @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> /usr/sbin/mtdinfo)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-21 17:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-18 20:47 [ptxdist] [PATCH v2 1/2] mtd-utils: Version bump. 2.2.1 -> 2.3.0 Christian Melki
2025-02-18 20:47 ` [ptxdist] [PATCH v2 2/2] host-mtd-utils: Follow target mtd-utils 2.2.1 -> 2.3.0 bump Christian Melki
2025-02-21 17:08 ` [ptxdist] [APPLIED] " Michael Olbrich
2025-02-21 17:08 ` [ptxdist] [APPLIED] mtd-utils: add option for fsck.ubifs Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox