X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2FConfig;h=d7d2a24a18a82f10ee5fde802ef4b6a69b130ea7;hb=6033b2710346f9bf4e1182db706775ccde59e5c1;hp=415766d123da4b2bbd5ab7c87fa8ffda8b4b906b;hpb=38d45f0154f828e7c9fc99149800a6f99b165d27;p=ipfire-2.x.git

diff --git a/lfs/Config b/lfs/Config
index 415766d123..d7d2a24a18 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -30,12 +30,23 @@
 #                                                                             #
 ###############################################################################
 
+# Cleanup environment from any variables
+unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN
+
+ifeq "$(BUILD_ARCH)" "aarch64"
+	IS_64BIT = 1
+endif
+
+ifeq "$(BUILD_ARCH)" "x86_64"
+	IS_64BIT = 1
+endif
+
 # URLs that are common sources of downloads.  If you're having trouble with
 # a site you should change its URL to that of a suitable mirror site.
 #
 URL_IPFIRE  = http://source.ipfire.org/source-2.x
 URL_TOOLCHAIN = http://source.ipfire.org/toolchains
-URL_SOURCE = source.ipfire.org:/pub/source/source-2.x
+URL_SOURCE = git.ipfire.org:/pub/sources/source-2.x
 
 # Don't change this; it will be overridden by other makefiles where necessary.
 #
@@ -57,6 +68,9 @@ DIR_CONF    = $(LFS_BASEDIR)/config
 DIR_INFO    = $(LFS_BASEDIR)/log
 DIR_TMP     = /tmp
 
+# Add the compiler location and version and specs to the ccache hash
+CCACHE_COMPILERCHECK += $(shell gcc -dumpspecs 2>/dev/null | md5sum | cut -d ' ' -f1)
+
 ###############################################################################
 # Common Macro Definitions
 ###############################################################################
@@ -66,8 +80,9 @@ DIR_TMP     = /tmp
 #
 define FIND_FILES
 	cd $(ROOT)/ && find -mount \
-	-not -path './tools*' -not -path './tmp*' -not -path './usr/src*' -not -path './run/*' \
-	-not -path './dev*' -not -path './proc*' -not -path './install*' | sort
+		\( -path './tools' -or -path './tmp' -or -path './usr/src' \
+		-or -path './run' -or -path './dev' -or -path './proc' \
+		-or -path './install' \) -prune -or -print | sort
 endef
 
 # This is common starting logic for builds.
@@ -113,13 +128,13 @@ define POSTBUILD
 	if [ -s "$(TARGET)_diff" ]; then \
 		LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))$(KCFG); \
 		echo $(LFS_SCRIPT); \
-		ROOTFILE=$$(find $(DIR_SRC)/config/rootfiles/{common,packages}/{$(MACHINE),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
+		ROOTFILE=$$(find $(DIR_SRC)/config/rootfiles/{common,packages}/{$(BUILD_ARCH),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
 		if [ "$$ROOTFILE" = "" ]; then \
 			touch $(TARGET)_missing_rootfile; \
 			ROOTFILE=$(TARGET)_missing_rootfile ; \
 			echo "error $$LFS_SCRIPT not found in config/rootfiles"; \
 		fi; \
-		sed -e "s/BUILDTARGET/$(BUILDTARGET)/g" -e "s/KVER/$(KVER)/g" -e "s/MACHINE/$(MACHINE)/g" $$ROOTFILE > $(TARGET)_rootfile; \
+		sed -e "s/BUILDTARGET/$(BUILDTARGET)/g" -e "s/KVER/$(KVER)/g" -e "s/MACHINE/$(BUILD_ARCH)/g" $$ROOTFILE > $(TARGET)_rootfile; \
 		for line in `cat $(TARGET)_diff`; do \
 			if grep -qG "^#$$line$$" $(TARGET)_rootfile; then echo "#$$line" >> $(TARGET); \
 			elif grep -qG "^$$line$$" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \
@@ -174,13 +189,13 @@ define PAK
 		cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/update.sh \
 		/install/packages/package; \
 	fi
-	for i in $(DIR_SRC)/config/rootfiles/packages/{$(MACHINE),}/$(PROG); do \
+	for i in $(DIR_SRC)/config/rootfiles/packages/{$(BUILD_ARCH),}/$(PROG); do \
 		if [ -e "$${i}" ]; then \
 			cp -v $${i} /install/packages/package/ROOTFILES; \
 			break; \
 		fi; \
 	done
-	sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(MACHINE)/g' -i /install/packages/package/ROOTFILES
+	sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(BUILD_ARCH)/g' -i /install/packages/package/ROOTFILES
 	sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
 	chmod 755 /install/packages/package/{{,un}install,update}.sh
 	cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
@@ -202,3 +217,10 @@ define PAK
 			-e s/SIZE/`ls -l \/install\/packages\/$(PROG)-$(VER)-$(PAK_VER).ipfire | awk '{ print $$5 }'`/g \
 	  < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
 endef
+
+define INSTALL_INITSCRIPT
+	install -m 754 -v $(DIR_SRC)/src/initscripts/packages/$(1)  /etc/rc.d/init.d/$(1)
+endef
+
+test:
+	$(call INSTALL_INITSCRIPT,hostapd)