rework target e2fsprogs and bump version 1.42.12

diff --git a/make/applications.mk b/make/applications.mk
index 189e3403055d34311099a83ff7438d260c14fab0..27ede33380d5d511276fc39cacf4de1c3106c568 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -27,62 +27,14 @@ $(D)/busybox: $(ARCHIVE)/busybox-1.22.1.tar.bz2 | $(TARGETPREFIX)
        $(REMOVE)/busybox-1.22.1
        touch $@
 
-$(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-1.42.9.tar.gz | $(TARGETPREFIX)
-       if [ $(PLATFORM) = "nevis" ]; then \
-               $(MAKE) $(D)/e2fsprogs-nevis; \
-       elif [ $(PLATFORM) = "apollo" ]; then \
-               $(MAKE) $(D)/e2fsprogs-apollo; \
-       elif [ $(PLATFORM) = "kronos" ]; then \
-               $(MAKE) $(D)/e2fsprogs-kronos; \
-       else \
-               $(MAKE) $(D)/e2fsprogs-nevis; \
-       fi
-       touch $@
-
-$(D)/e2fsprogs-nevis: $(ARCHIVE)/e2fsprogs-1.42.9.tar.gz | $(TARGETPREFIX)
-       $(UNTAR)/e2fsprogs-1.42.9.tar.gz
-       cd $(BUILD_TMP)/e2fsprogs-1.42.9 && \
-               ln -sf /bin/true ./ldconfig && \
-               CC=$(TARGET)-gcc \
-               RANLIB=$(TARGET)-ranlib \
-               CFLAGS="-O2 -msoft-float" \
-               LDFLAGS="$(TARGET_LDFLAGS)" \
-               PATH=$(BUILD_TMP)/e2fsprogs-1.42.9:$(PATH) \
-               ./configure \
-                       --build=$(BUILD) \
-                       --host=$(TARGET) \
-                       --target=$(TARGET) \
-                       --prefix=/ \
-                       --infodir=/.remove \
-                       --mandir=/.remove \
-                       --with-linker=$(TARGET)-ld \
-                       --disable-evms \
-                       --enable-htree \
-                       --disable-profile \
-                       --disable-e2initrd-helper \
-                       --disable-swapfs \
-                       --disable-debugfs \
-                       --disable-imager \
-                       --disable-resizer \
-                       --disable-uuidd \
-                       --enable-dynamic-e2fsck \
-                       --enable-fsck \
-                       --with-gnu-ld \
-                       --disable-nls && \
-               $(MAKE) && \
-               $(MAKE) install DESTDIR=$(TARGETPREFIX)
-       $(REMOVE)/e2fsprogs-1.42.9
-       rm -r $(TARGETPREFIX)/.remove
-
-$(D)/e2fsprogs-apollo: $(ARCHIVE)/e2fsprogs-1.42.9.tar.gz | $(TARGETPREFIX)
-       $(UNTAR)/e2fsprogs-1.42.9.tar.gz
-       cd $(BUILD_TMP)/e2fsprogs-1.42.9 && \
-               ln -sf /bin/true ./ldconfig && \
+$(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX)
+       $(UNTAR)/e2fsprogs-$(E2FSPROGS_VER).tar.gz
+       set -e; cd $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER); \
+               ln -sf /bin/true ./ldconfig; \
                CC=$(TARGET)-gcc \
                RANLIB=$(TARGET)-ranlib \
-               CFLAGS="-O2" \
-               LDFLAGS="$(TARGET_LDFLAGS)" \
-               PATH=$(BUILD_TMP)/e2fsprogs-1.42.9:$(PATH) \
+               CFLAGS="-Os" \
+               PATH=$(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER):$(PATH) \
                ./configure \
                        --build=$(BUILD) \
                        --host=$(TARGET) \
@@ -90,61 +42,29 @@ $(D)/e2fsprogs-apollo: $(ARCHIVE)/e2fsprogs-1.42.9.tar.gz | $(TARGETPREFIX)
                        --prefix=/ \
                        --infodir=/.remove \
                        --mandir=/.remove \
-                       --with-linker=$(TARGET)-ld \
-                       --disable-evms \
+                       --enable-elf-shlibs \
                        --enable-htree \
                        --disable-profile \
                        --disable-e2initrd-helper \
-                       --disable-swapfs \
                        --disable-debugfs \
                        --disable-imager \
                        --disable-resizer \
                        --disable-uuidd \
-                       --enable-dynamic-e2fsck \
                        --enable-fsck \
-                       --with-gnu-ld \
                        --disable-defrag \
-                       --disable-nls && \
-               $(MAKE) && \
-               $(MAKE) install DESTDIR=$(TARGETPREFIX)
-       $(REMOVE)/e2fsprogs-1.42.9
-       rm -r $(TARGETPREFIX)/.remove
-
-$(D)/e2fsprogs-kronos: $(ARCHIVE)/e2fsprogs-1.42.9.tar.gz | $(TARGETPREFIX)
-       $(UNTAR)/e2fsprogs-1.42.9.tar.gz
-       cd $(BUILD_TMP)/e2fsprogs-1.42.9 && \
-               ln -sf /bin/true ./ldconfig && \
-               CC=$(TARGET)-gcc \
-               RANLIB=$(TARGET)-ranlib \
-               CFLAGS="-O2" \
-               LDFLAGS="$(TARGET_LDFLAGS)" \
-               PATH=$(BUILD_TMP)/e2fsprogs-1.42.9:$(PATH) \
-               ./configure \
-                       --build=$(BUILD) \
-                       --host=$(TARGET) \
-                       --target=$(TARGET) \
-                       --prefix=/ \
-                       --infodir=/.remove \
-                       --mandir=/.remove \
-                       --with-linker=$(TARGET)-ld \
-                       --disable-evms \
-                       --enable-htree \
-                       --disable-profile \
-                       --disable-e2initrd-helper \
-                       --disable-swapfs \
-                       --disable-debugfs \
-                       --disable-imager \
-                       --disable-resizer \
-                       --disable-uuidd \
-                       --enable-dynamic-e2fsck \
-                       --enable-fsck \
                        --with-gnu-ld \
-                       --disable-defrag \
-                       --disable-nls && \
-               $(MAKE) && \
-               $(MAKE) install DESTDIR=$(TARGETPREFIX)
-       $(REMOVE)/e2fsprogs-1.42.9
-       rm -r $(TARGETPREFIX)/.remove
+                       --enable-symlink-install \
+                       --disable-nls; \
+               $(MAKE); \
+               $(MAKE) install DESTDIR=$(TARGETPREFIX); \
+               $(MAKE) -C lib/uuid  install DESTDIR=$(TARGETPREFIX); \
+               $(MAKE) -C lib/blkid install DESTDIR=$(TARGETPREFIX); \
+               :
+       $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER) $(TARGETPREFIX)/.remove
+       $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/uuid.pc
+       $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/blkid.pc
+       $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER)
+       touch $@
 
 $(D)/hotplug: $(D)/libblkid $(D)/libuuid $(ARCHIVE)/hotplug.tar.gz | $(TARGETPREFIX)
        $(UNTAR)/hotplug.tar.gz

diff --git a/make/archives.mk b/make/archives.mk
index ca63cce311f165cacc76ac38da75cc7216a40b70..464af96f2f2f1ed5fc0b1866fb327481a2d8cbe1 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -81,8 +81,8 @@ $(ARCHIVE)/samba-3.3.9.tar.gz:
 $(ARCHIVE)/strace-4.6.tar.xz:
        $(WGET) http://www.fhloston-paradise.de/strace-4.6.tar.xz
 
-$(ARCHIVE)/e2fsprogs-1.42.9.tar.gz:
-       $(WGET) http://www.fhloston-paradise.de/e2fsprogs-1.42.9.tar.gz
+$(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz:
+       $(WGET) http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(E2FSPROGS_VER)/e2fsprogs-$(E2FSPROGS_VER).tar.gz
 
 $(ARCHIVE)/xfsprogs-3.1.11.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/xfsprogs-3.1.11.tar.gz

diff --git a/make/versions.mk b/make/versions.mk
index 615b0b8a89edcc55c51dd54781f4165a936f0631..e1832bb19ed43b606cfc99e283a07b3913f212be 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -5,6 +5,9 @@ GIFLIB_VER=5.1.1
 # curl; command line tool for transferring data with URL syntax
 CURL_VER = 7.45.0
 
+# e2fsprogs; filesystem utilities for use with the ext[x] filesystem
+E2FSPROGS_VER=1.42.12
+
 # C library for parsing XML
 EXPAT_VER = 2.1.0