From: Markham Date: Tue, 11 Jun 2019 20:40:33 +0000 (+0200) Subject: bump version e2fsprogs-1.44.5 for newer gcc-8.x.x X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=8e3b4357df70f47e45f8a61a7649a65ac7e31856;p=bs-cst-neutrino-hd.git bump version e2fsprogs-1.44.5 for newer gcc-8.x.x --- diff --git a/make/applications.mk b/make/applications.mk index 07b4ca3..994a962 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -103,25 +103,27 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX) $(START_BUILD) $(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 \ + autoreconf -fi; \ CFLAGS="-Os" \ - PATH=$(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER):$(PATH) \ ./configure \ --build=$(BUILD) \ --host=$(TARGET) \ --target=$(TARGET) \ --prefix=/ \ + --datarootdir=/.remove \ --infodir=/.remove \ --mandir=/.remove \ --disable-nls \ --disable-profile \ --disable-e2initrd-helper \ --disable-backtrace \ + --disable-bmap-stats \ --disable-debugfs \ + --disable-fuse2fs \ --disable-imager \ + --disable-mmp \ --disable-rpath \ + --disable-tdb \ --disable-uuidd \ --disable-blkid-debug \ --disable-jbd-debug \ @@ -134,13 +136,11 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX) --enable-symlink-build \ --with-gnu-ld \ $(OPT_RESIZE2FS); \ - make; \ - make install DESTDIR=$(TARGETPREFIX); \ - make -C lib/uuid install DESTDIR=$(TARGETPREFIX); \ - make -C lib/blkid install DESTDIR=$(TARGETPREFIX); \ + $(MAKE); \ + $(MAKE) install DESTDIR=$(TARGETPREFIX); \ : - -rm $(addprefix $(TARGETPREFIX)/bin/, chattr lsattr uuidgen) - -rm $(addprefix $(TARGETPREFIX)/sbin/, dumpe2fs e2freefrag e2undo filefrag logsave) + -rm $(addprefix $(TARGETPREFIX)/bin/, chattr compile_et lsattr mk_cmds uuidgen) + -rm $(addprefix $(TARGETPREFIX)/sbin/, dumpe2fs e2freefrag e2mmpstatus e2undo e4crypt filefrag logsave) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/uuid.pc $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/blkid.pc $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER) diff --git a/make/versions.mk b/make/versions.mk index 0c9f641..c2072df 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -45,7 +45,11 @@ GIFLIB_VER=5.1.8 CURL_VER = 7.65.1 # e2fsprogs; filesystem utilities for use with the ext[x] filesystem -E2FSPROGS_VER=1.42.13 +E2FSPROGS_VER = 1.44.5 +ifeq ($(BOXTYPE), coolstream) +# formatting ext4 failes with newer versions +E2FSPROGS_VER = 1.42.13 +endif # dosfstools consists of the programs mkfs.fat, fsck.fat and fatlabel to create, check and label file systems of the FAT family. DOSFSTOOLS_VER = 4.1