On Tue, Feb 18, 2025 at 09:47:04PM +0100, Christian Melki wrote: > 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.
Fyi, I accidentally pushed v1 to master, so I modified the commit message when I applied this as the delta only. Michael > Signed-off-by: Christian Melki <[email protected]> > --- > ...-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 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
