From e8571985933b71250e66f89cdaec1519683db3d3 Mon Sep 17 00:00:00 2001 From: Markham Date: Wed, 12 Jun 2019 19:46:17 +0200 Subject: [PATCH] fix build mtd-utils for host --- archive-patches/host-mtd-utils-1.5.2.patch | 16 ---------------- make/bootstrap.mk | 11 +++++++++-- 2 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 archive-patches/host-mtd-utils-1.5.2.patch diff --git a/archive-patches/host-mtd-utils-1.5.2.patch b/archive-patches/host-mtd-utils-1.5.2.patch deleted file mode 100644 index 628aa6e..0000000 --- a/archive-patches/host-mtd-utils-1.5.2.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -62,11 +62,8 @@ endif - $(MAKE) -C $(TESTS) clean - - install:: $(addprefix $(BUILDDIR)/,${BINS}) ${SCRIPTS} -- mkdir -p ${DESTDIR}/${SBINDIR} -- install -m 0755 $^ ${DESTDIR}/${SBINDIR}/ -- mkdir -p ${DESTDIR}/${MANDIR}/man1 -- install -m 0644 mkfs.jffs2.1 ${DESTDIR}/${MANDIR}/man1/ -- -gzip -9f ${DESTDIR}/${MANDIR}/man1/*.1 -+ mkdir -p ${DESTDIR}/${BINDIR} -+ install -m 0755 $^ ${DESTDIR}/${BINDIR}/ - - tests:: - $(MAKE) -C $(TESTS) diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 3a32b0f..900a2e4 100755 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -111,8 +111,15 @@ $(D)/host_mtd-utils: $(ARCHIVE)/mtd-utils-$(HOST_MTD_UTILS_VER).tar.bz2 $(REMOVE)/mtd-utils-$(HOST_MTD_UTILS_VER) $(UNTAR)/mtd-utils-$(HOST_MTD_UTILS_VER).tar.bz2 set -e; cd $(BUILD_TMP)/mtd-utils-$(HOST_MTD_UTILS_VER); \ - $(PATCH)/host-mtd-utils-$(HOST_MTD_UTILS_VER).patch; \ - $(MAKE) `pwd`/mkfs.jffs2 `pwd`/sumtool BUILDDIR=`pwd` WITHOUT_XATTR=1 + ./configure \ + --mandir=/.remove \ + --enable-silent-rules \ + --disable-tests \ + --without-xattr \ + --without-lzo \ + ; \ + $(MAKE); \ + : install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(HOST_MTD_UTILS_VER)/sumtool $(HOSTPREFIX)/bin install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(HOST_MTD_UTILS_VER)/mkfs.jffs2 $(HOSTPREFIX)/bin $(REMOVE)/mtd-utils-$(HOST_MTD_UTILS_VER) -- 2.39.5