* [ptxdist] [PATCH 0/3] mtd-utils
@ 2019-10-02 13:05 Alexander Dahl
2019-10-02 13:05 ` [ptxdist] [PATCH 1/3] host-mtd-utils: Switch to autoconf based build Alexander Dahl
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alexander Dahl @ 2019-10-02 13:05 UTC (permalink / raw)
To: ptxdist
Hei hei,
I wanted to investigate the hot and new 'ubihealthd' [1] from
mtd-utils master, so I decided to upgrade mtd-utils first, also
because I was curious about the new tool 'lsmtd'. While at it I
stumbled over something I forgot when doing the bump from 1.5.x to
2.0.x two years ago … you might want to review that first patch a
little more closely!
Greets
Alex
[1] http://git.infradead.org/mtd-utils.git/commitdiff/7f0e2dc21fb291a9815fedb6e9e2c572db43c8c9
Alexander Dahl (3):
host-mtd-utils: Switch to autoconf based build
mtd-utils: version bump 2.0.2 -> 2.1.1
mtd-utils: Add option for new tool 'lsmtd'
...rkbad-new-util-to-mark-blocks-as-bad.patch | 0
.../autogen.sh | 0
.../series | 0
rules/host-mtd-utils.make | 29 +++++++++++--------
rules/mtd-utils.in | 8 +++++
rules/mtd-utils.make | 14 +++++++--
6 files changed, 36 insertions(+), 15 deletions(-)
rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch (100%)
rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/autogen.sh (100%)
rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/series (100%)
--
2.20.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread* [ptxdist] [PATCH 1/3] host-mtd-utils: Switch to autoconf based build 2019-10-02 13:05 [ptxdist] [PATCH 0/3] mtd-utils Alexander Dahl @ 2019-10-02 13:05 ` Alexander Dahl 2019-10-02 13:06 ` [ptxdist] [PATCH 2/3] mtd-utils: version bump 2.0.2 -> 2.1.1 Alexander Dahl 2019-10-02 13:06 ` [ptxdist] [PATCH 3/3] mtd-utils: Add option for new tool 'lsmtd' Alexander Dahl 2 siblings, 0 replies; 6+ messages in thread From: Alexander Dahl @ 2019-10-02 13:05 UTC (permalink / raw) To: ptxdist mtd-utils went from plain Makefile to autotools with version 2. This was considered for the target package, but not for the host package. host-mtd-utils build will break however when upgrading to mtd-utils v2.1.x, so we fix this first before the version bump. Fixes: 11c111c3af11 ("mtd-utils: Upgrade from 1.5.2 to 2.0.1") Signed-off-by: Alexander Dahl <ada@thorsis.com> --- rules/host-mtd-utils.make | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make index 457ecefb4..09709ba80 100644 --- a/rules/host-mtd-utils.make +++ b/rules/host-mtd-utils.make @@ -12,21 +12,22 @@ # HOST_PACKAGES-$(PTXCONF_HOST_MTD_UTILS) += host-mtd-utils -# -# Paths and names -# -HOST_MTD_UTILS_DIR = $(HOST_BUILDDIR)/$(MTD_UTILS) - # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -# don't use := here -HOST_MTD_UTILS_MAKEVARS = \ - PREFIX=/ \ - BUILDDIR=$(HOST_MTD_UTILS_DIR) \ - DESTDIR=$(HOST_MTD_UTILS_PKGDIR) - -HOST_MTD_UTILS_CFLAGS := -fgnu89-inline +# +# autoconf +# +HOST_MTD_UTILS_CONF_TOOL := autoconf +HOST_MTD_UTILS_CONF_OPT := \ + $(HOST_AUTOCONF) \ + --disable-unit-tests \ + --disable-tests \ + --disable-install-tests \ + --without-jffs \ + --with-ubifs \ + --with-xattr \ + --with-lzo # vim: syntax=make -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 2/3] mtd-utils: version bump 2.0.2 -> 2.1.1 2019-10-02 13:05 [ptxdist] [PATCH 0/3] mtd-utils Alexander Dahl 2019-10-02 13:05 ` [ptxdist] [PATCH 1/3] host-mtd-utils: Switch to autoconf based build Alexander Dahl @ 2019-10-02 13:06 ` Alexander Dahl 2019-10-02 17:06 ` Ladislav Michl 2019-10-02 13:06 ` [ptxdist] [PATCH 3/3] mtd-utils: Add option for new tool 'lsmtd' Alexander Dahl 2 siblings, 1 reply; 6+ messages in thread From: Alexander Dahl @ 2019-10-02 13:06 UTC (permalink / raw) To: ptxdist Signed-off-by: Alexander Dahl <ada@thorsis.com> --- ...01-nandmarkbad-new-util-to-mark-blocks-as-bad.patch | 0 .../{mtd-utils-2.0.2 => mtd-utils-2.1.1}/autogen.sh | 0 patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/series | 0 rules/host-mtd-utils.make | 6 +++++- rules/mtd-utils.make | 10 +++++++--- 5 files changed, 12 insertions(+), 4 deletions(-) rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch (100%) rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/autogen.sh (100%) rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/series (100%) diff --git a/patches/mtd-utils-2.0.2/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch b/patches/mtd-utils-2.1.1/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch similarity index 100% rename from patches/mtd-utils-2.0.2/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch rename to patches/mtd-utils-2.1.1/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch diff --git a/patches/mtd-utils-2.0.2/autogen.sh b/patches/mtd-utils-2.1.1/autogen.sh similarity index 100% rename from patches/mtd-utils-2.0.2/autogen.sh rename to patches/mtd-utils-2.1.1/autogen.sh diff --git a/patches/mtd-utils-2.0.2/series b/patches/mtd-utils-2.1.1/series similarity index 100% rename from patches/mtd-utils-2.0.2/series rename to patches/mtd-utils-2.1.1/series diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make index 09709ba80..f49a08261 100644 --- a/rules/host-mtd-utils.make +++ b/rules/host-mtd-utils.make @@ -25,9 +25,13 @@ HOST_MTD_UTILS_CONF_OPT := \ --disable-unit-tests \ --disable-tests \ --disable-install-tests \ + --disable-lsmtd \ --without-jffs \ --with-ubifs \ --with-xattr \ - --with-lzo + --with-lzo \ + --without-zstd \ + --without-selinux \ + --without-crypto # vim: syntax=make diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index aa64bd2c9..57b7691fc 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.0.2 -MTD_UTILS_MD5 := 3f05981551e73f1c6de28b2ea4edec7c +MTD_UTILS_VERSION := 2.1.1 +MTD_UTILS_MD5 := 94bbd31b217a5169ae26ab8c0442f691 MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) MTD_UTILS_SUFFIX := tar.bz2 MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) @@ -36,10 +36,14 @@ MTD_UTILS_CONF_OPT := \ --disable-unit-tests \ --disable-tests \ --disable-install-tests \ + --disable-lsmtd \ --$(call ptx/wwo, PTXCONF_MTD_UTILS_JFFS)-jffs \ --$(call ptx/wwo, PTXCONF_MTD_UTILS_UBIFS)-ubifs \ --without-xattr \ - --$(call ptx/wwo, PTXCONF_MTD_UTILS_USE_LIBLZO)-lzo + --$(call ptx/wwo, PTXCONF_MTD_UTILS_USE_LIBLZO)-lzo \ + --without-zstd \ + --without-selinux \ + --without-crypto # ---------------------------------------------------------------------------- # Target-Install -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH 2/3] mtd-utils: version bump 2.0.2 -> 2.1.1 2019-10-02 13:06 ` [ptxdist] [PATCH 2/3] mtd-utils: version bump 2.0.2 -> 2.1.1 Alexander Dahl @ 2019-10-02 17:06 ` Ladislav Michl 2019-10-07 8:25 ` Alexander Dahl 0 siblings, 1 reply; 6+ messages in thread From: Ladislav Michl @ 2019-10-02 17:06 UTC (permalink / raw) To: ptxdist Hi, On Wed, Oct 02, 2019 at 03:06:00PM +0200, Alexander Dahl wrote: > Signed-off-by: Alexander Dahl <ada@thorsis.com> > --- > ...01-nandmarkbad-new-util-to-mark-blocks-as-bad.patch | 0 > .../{mtd-utils-2.0.2 => mtd-utils-2.1.1}/autogen.sh | 0 > patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/series | 0 > rules/host-mtd-utils.make | 6 +++++- > rules/mtd-utils.make | 10 +++++++--- > 5 files changed, 12 insertions(+), 4 deletions(-) > rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch (100%) > rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/autogen.sh (100%) > rename patches/{mtd-utils-2.0.2 => mtd-utils-2.1.1}/series (100%) > > diff --git a/patches/mtd-utils-2.0.2/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch b/patches/mtd-utils-2.1.1/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch > similarity index 100% > rename from patches/mtd-utils-2.0.2/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch > rename to patches/mtd-utils-2.1.1/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch > diff --git a/patches/mtd-utils-2.0.2/autogen.sh b/patches/mtd-utils-2.1.1/autogen.sh > similarity index 100% > rename from patches/mtd-utils-2.0.2/autogen.sh > rename to patches/mtd-utils-2.1.1/autogen.sh > diff --git a/patches/mtd-utils-2.0.2/series b/patches/mtd-utils-2.1.1/series > similarity index 100% > rename from patches/mtd-utils-2.0.2/series > rename to patches/mtd-utils-2.1.1/series > diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make > index 09709ba80..f49a08261 100644 > --- a/rules/host-mtd-utils.make > +++ b/rules/host-mtd-utils.make > @@ -25,9 +25,13 @@ HOST_MTD_UTILS_CONF_OPT := \ > --disable-unit-tests \ > --disable-tests \ > --disable-install-tests \ > + --disable-lsmtd \ > --without-jffs \ > --with-ubifs \ > --with-xattr \ > - --with-lzo > + --with-lzo \ > + --without-zstd \ > + --without-selinux \ > + --without-crypto > > # vim: syntax=make > diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make > index aa64bd2c9..57b7691fc 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.0.2 > -MTD_UTILS_MD5 := 3f05981551e73f1c6de28b2ea4edec7c > +MTD_UTILS_VERSION := 2.1.1 > +MTD_UTILS_MD5 := 94bbd31b217a5169ae26ab8c0442f691 > MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) > MTD_UTILS_SUFFIX := tar.bz2 > MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) > @@ -36,10 +36,14 @@ MTD_UTILS_CONF_OPT := \ > --disable-unit-tests \ > --disable-tests \ > --disable-install-tests \ > + --disable-lsmtd \ > --$(call ptx/wwo, PTXCONF_MTD_UTILS_JFFS)-jffs \ > --$(call ptx/wwo, PTXCONF_MTD_UTILS_UBIFS)-ubifs \ > --without-xattr \ > - --$(call ptx/wwo, PTXCONF_MTD_UTILS_USE_LIBLZO)-lzo > + --$(call ptx/wwo, PTXCONF_MTD_UTILS_USE_LIBLZO)-lzo \ > + --without-zstd \ > + --without-selinux \ We have global selinux option available... > + --without-crypto > > # ---------------------------------------------------------------------------- > # Target-Install > -- > 2.20.1 > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH 2/3] mtd-utils: version bump 2.0.2 -> 2.1.1 2019-10-02 17:06 ` Ladislav Michl @ 2019-10-07 8:25 ` Alexander Dahl 0 siblings, 0 replies; 6+ messages in thread From: Alexander Dahl @ 2019-10-07 8:25 UTC (permalink / raw) To: ptxdist Hei hei, Am Mittwoch, 2. Oktober 2019, 19:06:44 CEST schrieb Ladislav Michl: > On Wed, Oct 02, 2019 at 03:06:00PM +0200, Alexander Dahl wrote: > > Signed-off-by: Alexander Dahl <ada@thorsis.com> > > + --without-selinux \ > > We have global selinux option available... I'll try to remember next time. ;-) I guess Michael adapted that line when applying the patches. Thanks for that. Greets Alex _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 3/3] mtd-utils: Add option for new tool 'lsmtd' 2019-10-02 13:05 [ptxdist] [PATCH 0/3] mtd-utils Alexander Dahl 2019-10-02 13:05 ` [ptxdist] [PATCH 1/3] host-mtd-utils: Switch to autoconf based build Alexander Dahl 2019-10-02 13:06 ` [ptxdist] [PATCH 2/3] mtd-utils: version bump 2.0.2 -> 2.1.1 Alexander Dahl @ 2019-10-02 13:06 ` Alexander Dahl 2 siblings, 0 replies; 6+ messages in thread From: Alexander Dahl @ 2019-10-02 13:06 UTC (permalink / raw) To: ptxdist Signed-off-by: Alexander Dahl <ada@thorsis.com> --- rules/mtd-utils.in | 8 ++++++++ rules/mtd-utils.make | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in index 6e829667a..8988ba116 100644 --- a/rules/mtd-utils.in +++ b/rules/mtd-utils.in @@ -119,6 +119,14 @@ config MTD_UTILS_FTL_FORMAT Utility to create an FTL (Flash Translation Layer) partition in a memory region +config MTD_UTILS_LSMTD + bool + prompt "lsmtd" + help + Pretty prints a list with hierarchical information about all + available or the specified MTD and UBI devices. Tries to + imitate the lsblk program from util-linux. + config MTD_UTILS_JFFS2_DUMP bool prompt "jffs2dump" diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index 57b7691fc..7e2f3c13a 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -36,7 +36,7 @@ MTD_UTILS_CONF_OPT := \ --disable-unit-tests \ --disable-tests \ --disable-install-tests \ - --disable-lsmtd \ + --$(call ptx/endis, PTXCONF_MTD_UTILS_LSMTD)-lsmtd \ --$(call ptx/wwo, PTXCONF_MTD_UTILS_JFFS)-jffs \ --$(call ptx/wwo, PTXCONF_MTD_UTILS_UBIFS)-ubifs \ --without-xattr \ @@ -110,6 +110,10 @@ ifdef PTXCONF_MTD_UTILS_FTL_FORMAT @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/ftl_format) endif +ifdef PTXCONF_MTD_UTILS_LSMTD + @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ + /usr/sbin/lsmtd) +endif ifdef PTXCONF_MTD_UTILS_JFFS2_DUMP @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/jffs2dump) -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-07 8:25 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-10-02 13:05 [ptxdist] [PATCH 0/3] mtd-utils Alexander Dahl 2019-10-02 13:05 ` [ptxdist] [PATCH 1/3] host-mtd-utils: Switch to autoconf based build Alexander Dahl 2019-10-02 13:06 ` [ptxdist] [PATCH 2/3] mtd-utils: version bump 2.0.2 -> 2.1.1 Alexander Dahl 2019-10-02 17:06 ` Ladislav Michl 2019-10-07 8:25 ` Alexander Dahl 2019-10-02 13:06 ` [ptxdist] [PATCH 3/3] mtd-utils: Add option for new tool 'lsmtd' Alexander Dahl
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox