X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2FConfig;h=76f279da96236003618f0b176873aea8f80d1ff6;hp=1cb9e2db4690a50c2d2fcd4c8c15aa95059d4534;hb=035f6c75aed2165a8ecd92571c48daf07edf4ab5;hpb=0d1df90f70d1768ebe54c29fba82df8bfc94bc80

diff --git a/lfs/Config b/lfs/Config
index 1cb9e2db46..76f279da96 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -37,10 +37,22 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 	IS_64BIT = 1
 endif
 
+ifeq "$(BUILD_ARCH)" "armv7hl"
+	IS_32BIT = 1
+endif
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+	IS_32BIT = 1
+endif
+
 ifeq "$(BUILD_ARCH)" "x86_64"
 	IS_64BIT = 1
 endif
 
+ifeq "$(BUILD_ARCH)" "i586"
+	IS_32BIT = 1
+endif
+
 ifeq "$(TOOLCHAIN)" "1"
 	PREFIX = $(TOOLS_DIR)
 else
@@ -79,6 +91,19 @@ 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)
 
+# We support EFI on x86_64 and aarch64
+ifeq "$(BUILD_ARCH)" "x86_64"
+	EFI = 1
+	EFI_ARCH = x64
+	GRUB_ARCH = $(BUILD_ARCH)
+endif
+
+ifeq "$(BUILD_ARCH)" "aarch64"
+	EFI = 1
+	EFI_ARCH = aa64
+	GRUB_ARCH = arm64
+endif
+
 ###############################################################################
 # Common Macro Definitions
 ###############################################################################
@@ -136,7 +161,7 @@ define POSTBUILD
 	if [ -s "$(TARGET)_diff" ]; then \
 		LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))$(KCFG); \
 		echo $(LFS_SCRIPT); \
-		ROOTFILE=$$(find $(DIR_SRC)/config/rootfiles/{common,packages}/{$(BUILD_ARCH),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
+		ROOTFILE=$$(find -L $(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 ; \
@@ -205,11 +230,9 @@ define PAK
 	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='#*' \
-		-p --numeric-owner
+	cd / && tar cfp /install/packages/package/files.tmp --numeric-owner --exclude='#*' --files-from=/install/packages/package/ROOTFILES
 	# Double tar to remove double files
-	tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \
-		-p --numeric-owner
+	tar xfp /install/packages/package/files.tmp --numeric-owner -C /install/packages/package/tmp/
 	rm -f /install/packages/package/files.tmp
 	cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner * | xz $(XZ_OPT) > /install/packages/package/files.tar.xz
 	rm -r /install/packages/package/tmp