libvirt: Depend on ebtables

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

diff --git a/lfs/Config b/lfs/Config
index faf01ca1a69816eb65705a89fd6ba6c5d1834832..b16da91bdb4080c7a742b5a39ff64c79f29bd53c 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -117,8 +117,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 +193,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 +257,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 \
@@ -283,7 +293,7 @@ define PAK
                -e "s/VER/$(VER)/g" \
                -e "s/RELEASE/$(PAK_VER)/g" \
                -e "s/DEPS/$(DEPS)/g" \
-               -e "s/SIZE/$$(stat --format=\"%s\" /install/packages/$(PROG)-$(VER)-$(PAK_VER).ipfire)/g" \
+               -e "s/SIZE/$$(stat --format=%s /install/packages/$(PROG)-$(VER)-$(PAK_VER).ipfire)/g" \
          < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
 endef