curl: Update to 7.75

[people/pmueller/ipfire-2.x.git] / lfs / Config

diff --git a/lfs/Config b/lfs/Config
index a278b015531ce84aaacb7a25a9dc77b68f498133..524ba35c0d3b21ae35d099ca76abffc25fe5cced 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -70,7 +70,10 @@ else
        PREFIX = /usr
 endif
 
-TAR_OPTIONS = --xz
+TAR_OPTIONS = \
+       --format=pax \
+       --acls \
+       --xattrs --xattrs-include='*'
 
 # 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.
@@ -117,8 +120,18 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 endif
 
 # Go
+export GOARCH
+export GOOS   = linux
 export GOPATH = $(HOME)/gopath
 
+ifeq "$(BUILD_ARCH)" "x86_64"
+       GOARCH = amd64
+endif
+
+ifeq "$(BUILD_ARCH)" "aarch64"
+       GOARCH = arm64
+endif
+
 ###############################################################################
 # Common Macro Definitions
 ###############################################################################
@@ -183,7 +196,7 @@ define POSTBUILD
                        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/$(BUILD_ARCH)/g" $$ROOTFILE > $(TARGET)_rootfile; \
+               sed -e "s/BUILDTARGET/$(BUILDTARGET)/g" -e "s/KVER/$(KVER)/g" -e "s/xxxMACHINExxx/$(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); \
@@ -247,7 +260,7 @@ define PAK
        sed -i $(DIR_TMP_PAK)/ROOTFILES \
                -e 's/BUILDTARGET/$(BUILDTARGET)/g' \
                -e 's/KVER/$(KVER)/g' \
-               -e 's/MACHINE/$(BUILD_ARCH)/g'
+               -e 's/xxxMACHINExxx/$(BUILD_ARCH)/g'
 
        # Replace variables in scripts
        sed -i $(DIR_TMP_PAK)/install.sh \