X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2FConfig;h=516fb1cabb8ee276ea639a30050beef9feb8c79e;hp=7360ac675ecee54f2784cfc72578cef194477c60;hb=aba59b7c7664f83e0b07a8fa0dc1f133d3fe55d3;hpb=207c9813bc3e1ef121bb1bac89752c0a850dda6d diff --git a/lfs/Config b/lfs/Config index 7360ac675e..516fb1cabb 100644 --- a/lfs/Config +++ b/lfs/Config @@ -30,12 +30,31 @@ # # ############################################################################### +# Cleanup environment from any variables +unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR + +ifeq "$(BUILD_ARCH)" "aarch64" + IS_64BIT = 1 +endif + +ifeq "$(BUILD_ARCH)" "x86_64" + IS_64BIT = 1 +endif + +ifeq "$(TOOLCHAIN)" "1" + PREFIX = $(TOOLS_DIR) +else + PREFIX = /usr +endif + +TAR_OPTIONS = --xz + # 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_IPFIRE = https://source.ipfire.org/source-2.x +URL_TOOLCHAIN = https://source.ipfire.org/toolchains +URL_SOURCE = git.ipfire.org:/pub/sources/source-2.x # Don't change this; it will be overridden by other makefiles where necessary. # @@ -57,7 +76,21 @@ DIR_CONF = $(LFS_BASEDIR)/config DIR_INFO = $(LFS_BASEDIR)/log DIR_TMP = /tmp -KGCC = gcc +# 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 @@ -68,8 +101,9 @@ KGCC = gcc # define FIND_FILES cd $(ROOT)/ && find -mount \ - -not -path './tools*' -not -path './tmp*' -not -path './usr/src*' \ - -not -path './dev*' -not -path './proc*' -not -path './install*' | sort + \( -path '.$(TOOLS_DIR)' -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. @@ -115,13 +149,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 -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 ; \ 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); \ @@ -162,7 +196,6 @@ define MD5 # error mean file signature don't match the one in lfs script [ "$($@_MD5)" = `md5sum $(DIR_DL)/$@ | awk '{ print $$1 }'` ] echo "$@ checksum OK" - echo "$@" >>$(DIR_INFO)/_build.othersrc-list.log endef define PAK @@ -176,22 +209,20 @@ 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='#*' \ - -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 -c -p --numeric-owner -f /install/packages/package/files * + 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 -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES @@ -204,3 +235,18 @@ 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 + +ifeq "$(BUILD_ARCH)" "aarch64" +define UPDATE_AUTOMAKE + for i in $$(find $(DIR_APP) -name config.guess -o -name config.sub); do \ + cp -vf /usr/share/automake*/$$(basename $${i}) $${i}; \ + done +endef +endif + +test: + $(call INSTALL_INITSCRIPT,hostapd)