From b7e904a4529ddfd149417c8091d1008c4fa39414 Mon Sep 17 00:00:00 2001 From: Markham Date: Sat, 11 Jan 2020 17:29:31 +0100 Subject: [PATCH] bump version autofs-5.1.6 --- make/applications.mk | 22 ++++++++++++---------- make/versions.mk | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/make/applications.mk b/make/applications.mk index e8f6ef3..e114dff 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -322,24 +322,26 @@ $(D)/autofs4: $(ARCHIVE)/autofs-4.1.4.tar.bz2 | $(TARGETPREFIX) $(REMOVE)/autofs-4.1.4 $(TOUCH) +AUTOFS5_PATCH = autofs-include-linux-nfs.h-directly-in-rpc_sub.patch +AUTOFS5_PATCH += autofs-force-STRIP-to-empty.patch + $(D)/autofs5: $(D)/libtirpc $(ARCHIVE)/autofs-$(AUTOFS5_VER).tar.gz | $(TARGETPREFIX) $(START_BUILD) $(REMOVE)/autofs-$(AUTOFS5_VER) $(UNTAR)/autofs-$(AUTOFS5_VER).tar.gz - cd $(BUILD_TMP)/autofs-$(AUTOFS5_VER) && \ - $(PATCH)/autofs-include-linux-nfs.h-directly-in-rpc_sub.patch && \ - export ac_cv_linux_procfs=yes && \ - export ac_cv_path_KRB5_CONFIG=no && \ - export ac_cv_path_MODPROBE=/sbin/modprobe && \ - export ac_cv_path_RANLIB=$(TARGET)-ranlib && \ - autoreconf -fi && \ + set -e; cd $(BUILD_TMP)/autofs-$(AUTOFS5_VER); \ + $(call apply_patches, $(AUTOFS5_PATCH)); \ + export ac_cv_linux_procfs=yes; \ + export ac_cv_path_KRB5_CONFIG=no; \ + export ac_cv_path_MODPROBE=/sbin/modprobe; \ + export ac_cv_path_RANLIB=$(TARGET)-ranlib; \ + autoreconf -fi; \ $(CONFIGURE) \ --prefix= \ --datarootdir=/.remove \ --disable-mount-locking \ --without-openldap \ --without-sasl \ - --enable-ignore-busy \ --with-path=$(PATH) \ --with-libtirpc \ --with-hesiod=no \ @@ -347,8 +349,8 @@ $(D)/autofs5: $(D)/libtirpc $(ARCHIVE)/autofs-$(AUTOFS5_VER).tar.gz | $(TARGETPR --with-mapdir=/var/etc \ --with-fifodir=/var/run \ --with-flagdir=/var/run \ - && \ - $(MAKE) SUBDIRS="lib daemon modules" DONTSTRIP=1 && \ + ; \ + $(MAKE) SUBDIRS="lib daemon modules" DONTSTRIP=1; \ $(MAKE) SUBDIRS="lib daemon modules" install DESTDIR=$(TARGETPREFIX) $(REMOVE)/autofs-$(AUTOFS5_VER) $(TOUCH) diff --git a/make/versions.mk b/make/versions.mk index f27b9aa..50b0a12 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -7,7 +7,7 @@ AUTOFS4_VER = 4.1.4 AUTOFS5_MAJOR = 5 AUTOFS5_MINOR = 1 -AUTOFS5_MICRO = 5 +AUTOFS5_MICRO = 6 AUTOFS5_VER = $(AUTOFS5_MAJOR).$(AUTOFS5_MINOR).$(AUTOFS5_MICRO) BUSYBOX_VER = 1.31.1 -- 2.39.5