summaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorAlexander Dahl <ada@thorsis.com>2017-08-30 16:49:41 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-09-05 08:08:01 +0200
commit11c111c3af117e786b71279ae1bf71530b2a4d32 (patch)
tree32d7be4678485eef804bbdbab6a2698528d9c825 /rules
parenta4ee0b457baa1682ce6738f8ffb3b24c817e1dd0 (diff)
downloadptxdist-11c111c3af117e786b71279ae1bf71530b2a4d32.tar.gz
ptxdist-11c111c3af117e786b71279ae1bf71530b2a4d32.tar.xz
mtd-utils: Upgrade from 1.5.2 to 2.0.1
This is a major upgrade, mtd-utils switched from a hand written Makefile build to autotools. See the release announcements for 2.0.0 and 2.0.1: http://lists.infradead.org/pipermail/linux-mtd/2016-December/071145.html http://lists.infradead.org/pipermail/linux-mtd/2017-August/076477.html For the ptxdist package the menu entries were kept the same, while some of them now control the ./configure switches for jffs and ubifs by selecting new hidden kconfig variables. On the old patches: 0001 and 0002 made ubifs and lzo configurable at build time, this is done by autotools with configure options now. All other patches were applied upstream. Signed-off-by: Alexander Dahl <ada@thorsis.com> [mol: fix kconfig symbol typo] Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r--rules/mtd-utils.in16
-rw-r--r--rules/mtd-utils.make31
2 files changed, 25 insertions, 22 deletions
diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
index 4d76f5c68..552f28912 100644
--- a/rules/mtd-utils.in
+++ b/rules/mtd-utils.in
@@ -5,8 +5,7 @@ menuconfig MTD_UTILS
prompt "mtd-utils "
select LIBC_M if MTD_UTILS_MKFS_UBIFS
select ZLIB
- select LIBUUID if MTD_UTILS_MKFS_UBIFS
- select ATTR if MTD_UTILS_MKFS_UBIFS
+ select LIBUUID if MTD_UTILS_UBIFS
select LIBLZO if MTD_UTILS_USE_LIBLZO
help
Memory Technology Device Utilities
@@ -16,6 +15,12 @@ menuconfig MTD_UTILS
if MTD_UTILS
+config MTD_UTILS_JFFS
+ bool
+
+config MTD_UTILS_UBIFS
+ bool
+
config MTD_UTILS_USE_LIBLZO
bool
prompt "liblzo support"
@@ -116,13 +121,15 @@ config MTD_UTILS_FTL_FORMAT
config MTD_UTILS_JFFS2_DUMP
bool
- prompt "jffs2_dump"
+ prompt "jffs2dump"
+ select MTD_UTILS_JFFS
help
This utility dumps the contents of a binary JFFS2 image.
#config MTD_UTILS_JFFS2READER
# bool
# prompt "jffs2reader"
+# select MTD_UTILS_JFFS
# help
# A jffs2 image reader
@@ -187,6 +194,7 @@ config MTD_UTILS_NFTLDUMP
config MTD_UTILS_MKJFFS2
bool
prompt "mkfs.jffs2"
+ select MTD_UTILS_JFFS
help
Build a JFFS2 image in a file, from a given directory tree.
@@ -217,6 +225,7 @@ config MTD_UTILS_SERVE_IMAGE
config MTD_UTILS_SUMTOOL
bool
prompt "sumtool"
+ select MTD_UTILS_JFFS
help
Sumtool can be used to generate EBS(Erase Block Summary)
information for a jffs2 image. This way we can do faster
@@ -335,6 +344,7 @@ comment "busybox' ubiupdatevol is selected!"
config MTD_UTILS_MKFS_UBIFS
bool
prompt "mkfs.ubifs"
+ select MTD_UTILS_UBIFS
help
Create ubifs filesystems
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index ba633c33e..7244b0e35 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils
#
# Paths and names
#
-MTD_UTILS_VERSION := 1.5.2
-MTD_UTILS_MD5 := 596bc7b20a6d4fb86d63fc9b8af674d6
+MTD_UTILS_VERSION := 2.0.1
+MTD_UTILS_MD5 := ef065490799f5e21e90199dd25d033b6
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)
@@ -30,23 +30,16 @@ MTD_UTILS_LICENSE := GPL-2.0+
# Prepare
# ----------------------------------------------------------------------------
-MTD_UTILS_CONF_TOOL := NO
-
-MTD_UTILS_COMPILE_ENV := \
- $(CROSS_ENV) \
- CROSS="$(COMPILER_PREFIX)" \
- WITHOUT_XATTR=1
-
-ifndef PTXCONF_MTD_UTILS_USE_LIBLZO
-MTD_UTILS_COMPILE_ENV += WITHOUT_LZO=1
-endif
-
-ifndef PTXCONF_MTD_UTILS_MKFS_UBIFS
-MTD_UTILS_COMPILE_ENV += WITHOUT_MKUBIFS=1
-endif
-
-MTD_UTILS_COMPILE_OPT := \
- BUILDDIR=$(MTD_UTILS_DIR)
+MTD_UTILS_CONF_TOOL := autoconf
+MTD_UTILS_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --disable-unit-tests \
+ --disable-tests \
+ --disable-install-tests \
+ --$(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
# ----------------------------------------------------------------------------
# Target-Install