rename target flashcp to mtd-utils; bump version 1.5.2

diff --git a/Makefile b/Makefile
index b327c26794e1e4969ce902e6d91062a20f1f39b3..7d50e39cfcd831a9086cda000d57f032ce6271ba 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -166,7 +166,7 @@ neutrino-libs:
 
 # applications.mk
 applications:
-       $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/ntp
+       $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/mtd-utils $(D)/ntp
        if [ $(WIFI) = "yes" ]; then \
                $(MAKE) $(D)/wpa_supplicant; \
        else \

diff --git a/make/applications.mk b/make/applications.mk
index 355aaa1221b6a98c955fd9f39f6decdccd3ddd1a..5d059f34009d27db0093c551297ae3437621a5ed 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -272,17 +272,62 @@ $(D)/gdb-remote: $(ARCHIVE)/gdb-7.3.1.tar.bz2 | $(TARGETPREFIX)
        $(REMOVE)/gdb-7.3.1
        touch $@
 
-$(D)/flashcp: $(ARCHIVE)/mtd-utils-1.4.6.tar.bz2 | $(TARGETPREFIX)
-       tar -C $(BUILD_TMP) -xpf $(ARCHIVE)/mtd-utils-1.4.6.tar.bz2
-       cd $(BUILD_TMP)/mtd-utils-1.4.6 && \
+ifeq ($(PLATFORM), nevis)
+$(D)/mtd-utils: $(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2 | $(TARGETPREFIX)
+       tar -C $(BUILD_TMP) -xpf $(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2
+       cd $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER) && \
                $(MAKE) `pwd`/mkfs.jffs2 `pwd`/sumtool BUILDDIR=`pwd` WITHOUT_XATTR=1 WITHOUT_LZO=1 && \
                cp -a mkfs.jffs2 sumtool $(HOSTPREFIX)/bin && \
                $(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) flashcp.c -lpng -lz -o $(TARGETPREFIX)/sbin/flashcp
        cd $(TARGETPREFIX)/sbin && \
        ln -sf flashcp fcp
-       rm -rf $(BUILD_TMP)/mtd-utils-1.4.6
+       rm -rf $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER)
        touch $@
 
+else
+
+MTD_BUILDDIR = `pwd`/build
+MTD_BUILDS_HOST = \
+       $(MTD_BUILDDIR)/mkfs.jffs2 \
+       $(MTD_BUILDDIR)/sumtool \
+       $(MTD_BUILDDIR)/jffs2reader \
+       $(MTD_BUILDDIR)/jffs2dump
+
+MTD_BUILDS = \
+       $(MTD_BUILDDIR)/flash_erase \
+       $(MTD_BUILDDIR)/nanddump \
+       $(MTD_BUILDDIR)/nandwrite \
+       $(MTD_BUILDDIR)/nandtest
+
+$(D)/mtd-utils: $(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2 $(D)/zlib | $(TARGETPREFIX)
+       # build for target
+       rm -fr $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER); \
+       $(UNTAR)/mtd-utils-$(MTD_UTILS_VER).tar.bz2; \
+       set -e; cd $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER); \
+               $(MAKE) $(MTD_BUILDS) BUILDDIR=$(MTD_BUILDDIR) WITHOUT_XATTR=1 WITHOUT_LZO=1 \
+                       CROSS=$(CROSS_DIR)/bin/$(TARGET)- \
+                       ZLIBCPPFLAGS="-I$(TARGETPREFIX)/include" \
+                       X_LDLIBS="-L$(TARGETPREFIX)/lib" \
+                       X_LDSTATIC="$(TARGETPREFIX)/lib"
+               cd $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER); \
+               mkdir -p $(TARGETPREFIX)/sbin; \
+               $(TARGET)-strip $(MTD_BUILDS); \
+               cp -a $(MTD_BUILDS) $(TARGETPREFIX)/sbin; \
+       # build for host
+       cd $(BUILD_TMP); \
+       rm -rf $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER); \
+       $(UNTAR)/mtd-utils-$(MTD_UTILS_VER).tar.bz2; \
+       set -e; cd $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER); \
+               $(MAKE) $(MTD_BUILDS_HOST) BUILDDIR=$(MTD_BUILDDIR) WITHOUT_XATTR=1 WITHOUT_LZO=1 \
+               X_LDSTATIC="/usr/lib"
+               cd $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER); \
+               strip $(MTD_BUILDS_HOST); \
+               cp -a $(MTD_BUILDS_HOST) $(HOSTPREFIX)/bin; \
+       rm -rf $(BUILD_TMP)/mtd-utils-$(MTD_UTILS_VER) $(BUILD_TMP)/.remove
+       touch $@
+
+endif # ifeq ($(PLATFORM), nevis)
+
 $(D)/samba: $(D)/libiconv $(ARCHIVE)/samba-3.3.9.tar.gz | $(TARGETPREFIX)
        $(UNTAR)/samba-3.3.9.tar.gz
        cd $(BUILD_TMP)/samba-3.3.9 && \

diff --git a/make/archives.mk b/make/archives.mk
index 4242b7cff67c6f1bd17481d9f0324b81f1da79b9..11092e6ca202cd68c0dc3005c90c6b8516c6612f 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -120,8 +120,8 @@ $(ARCHIVE)/util-linux-2.20.tar.bz2:
 $(ARCHIVE)/hddtemp-0.3-beta15.tar.bz2:
        $(WGET) http://www.fhloston-paradise.de/hddtemp-0.3-beta15.tar.bz2
 
-$(ARCHIVE)/mtd-utils-1.4.6.tar.bz2:
-       $(WGET) http://www.fhloston-paradise.de/mtd-utils-1.4.6.tar.bz2
+$(ARCHIVE)/mtd-utils-$(MTD_UTILS_VER).tar.bz2:
+       $(WGET) ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-$(MTD_UTILS_VER).tar.bz2
 
 $(ARCHIVE)/wpa_supplicant-0.7.3.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/wpa_supplicant-0.7.3.tar.gz

diff --git a/make/flashimage.mk b/make/flashimage.mk
index 8b7bfa05bb1a2e236d5c7becb27baad4fa9832ec..23a23dc08328cf1384a95566295834862cb69b5a 100755 (executable)
--- a/make/flashimage.mk
+++ b/make/flashimage.mk
@@ -8,7 +8,7 @@ ERASEBLOCK = 0x20000
 FLASHIMG = $(BUILD_TMP)/nevis-system-tmp.img
 SUMIMG   = $(BUILD_TMP)/nevis-system-$(DATE).sum.img
 
-flash: $(D)/flashcp
+flash: $(D)/mtd-utils
        rm -fr $(BUILD_TMP)/rootfs/oldroot
        echo "/dev/console c 0600 0 0 5 1 0 0 0" > $(BUILD_TMP)/devtable; \
        tar cfz $(BUILD_TMP)/rootfs.tar.gz $(BUILD_TMP)/rootfs; \
@@ -37,7 +37,7 @@ FLASHIMG   = $(FLASHIMG_BODY).$(DATE).tmp.img
 SUMIMG     = $(SUMIMG_BODY).$(DATE).img
 endif
 
-flash: $(D)/flashcp
+flash: $(D)/mtd-utils
        rm -fr $(BUILD_TMP)/rootfs/oldroot; \
        echo "/dev/console c 0600 0 0 5 1 0 0 0" > $(BUILD_TMP)/devtable; \
        mkfs.jffs2 -n -e $(ERASEBLOCK) -l -U -D $(BUILD_TMP)/devtable -r $(BUILD_TMP)/rootfs -o $(FLASHIMG); \
@@ -58,7 +58,7 @@ FLASHIMG   = $(FLASHIMG_BODY).$(DATE).tmp.img
 SUMIMG     = $(SUMIMG_BODY).$(DATE).img
 
 
-flash: $(D)/flashcp
+flash: $(D)/mtd-utils
        rm -fr $(BUILD_TMP)/rootfs/oldroot; \
        echo "/dev/console c 0600 0 0 5 1 0 0 0" > $(BUILD_TMP)/devtable; \
        mkfs.jffs2 -n -e $(ERASEBLOCK) -l -U -D $(BUILD_TMP)/devtable -r $(BUILD_TMP)/rootfs -o $(FLASHIMG); \

diff --git a/make/versions.mk b/make/versions.mk
index ec5256cc7325ee013197ade5a1420bd190c068ae..d48db763d37e74318d335ec121c444c3ec1a3e96 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -29,6 +29,9 @@ LUACURL_VER=v3
 
 LUA_EXPAT_VER = 1.2.0
 
+# mtd-utils for the host...
+MTD_UTILS_VER = 1.5.2
+
 # ntfs-3g; file system driver for the NTFS file system, enabling read/write support of NTFS file systems
 NTFS_3G_VER=2015.3.14