Config: Support rootfiles with spaces in filenames

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

diff --git a/lfs/Config b/lfs/Config
index 3e4de3b3fd48eaddd07bc76be60b0aaca78ceadd..2b2e9f56926b3e48bac8ca4f89be5c42da7c4d46 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -13,7 +13,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -84,6 +84,11 @@ else
        PREFIX = /usr
 endif
 
+# Permit building with 32 bit time_t on 32 bit architectures
+ifeq "$(IS_32BIT)" "1"
+       export TIME_T_32_BIT_OK = yes
+endif
+
 TAR_OPTIONS = \
        --format=pax \
        --acls \
@@ -152,7 +157,11 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 endif
 
 # Rust
-RUST_ARCH  = $(BUILD_ARCH)
+ifeq "$(BUILD_ARCH)" "riscv64"
+       RUST_ARCH = riscv64gc
+else
+       RUST_ARCH = $(BUILD_ARCH)
+endif
 
 ifeq "$(BUILD_ARCH)" "armv6l"
        RUST_PLATFORM = arm-unknown-linux-gnueabi
@@ -200,9 +209,15 @@ CARGO = \
        --offline
 
 CARGO_OPTIONS = \
-       $(MAKETUNING) \
        -Z avoid-dev-deps
 
+# Cargo dealocks on riscv64 when building on multiple cores at the same time
+ifeq "$(BUILD_ARCH)" "riscv64"
+       CARGO_OPTIONS += -j1
+else
+       CARGO_OPTIONS += $(MAKETUNING)
+endif
+
 define CARGO_PREPARE
        mkdir -p $(CARGO_PATH) && \
        echo "$${CARGO_CONFIG}" > $(CARGO_PATH)/config && \
@@ -239,7 +254,7 @@ endef
 # Common Macro Definitions
 ###############################################################################
 
-# For each package we create a list of files that it installed under 
+# For each package we create a list of files that it installed under
 # log/<TARGET> name. Modified files are not identified
 #
 define FIND_FILES
@@ -279,9 +294,8 @@ define POSTBUILD
        @rm -rf $(GOPATH) /root/.cargo
        @$(FIND_FILES) > $(DIR_SRC)/lsalrnew
        @diff $(DIR_SRC)/lsalr $(DIR_SRC)/lsalrnew | grep '^> ' | sed 's/^> //' > $(TARGET)_diff
-       @cp -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
-       @rm -f $(DIR_SRC)/lsalrnew
-       sed -i -e 's+.\/++' $(TARGET)_diff
+       @mv -f $(DIR_SRC)/lsalrnew $(DIR_SRC)/lsalr
+       @sed -i -e 's+.\/++' $(TARGET)_diff
        # compare roofile ( same name as lfs script) with the list of installed files
        # special cases
        # - if the corresponding rootfile is not found, touch $(TARGET)_missing_rootfile
@@ -290,7 +304,7 @@ define POSTBUILD
        # ROOTFILE : reference of include/exclude files
        # $(TARGET)_rootfile : ROOTFILE with KVER replacement
        # $(TARGET) : log result with {commented|include|added} files
-       if [ -s "$(TARGET)_diff" ]; then \
+       @if [ -s "$(TARGET)_diff" ]; then \
                LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))$(KCFG); \
                echo $(LFS_SCRIPT); \
                ROOTFILE=$$(find -L $(DIR_SRC)/config/rootfiles/{common,packages}/{$(BUILD_ARCH),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
@@ -300,13 +314,13 @@ define POSTBUILD
                        echo "error $$LFS_SCRIPT not found in config/rootfiles"; \
                fi; \
                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 \
+               while read -r line; do \
                        if grep -qG "^#$$line$$" $(TARGET)_rootfile; then echo "#$$line" >> $(TARGET); \
                        elif grep -qG "^$$line$$" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \
                        else echo "+$$line" >> $(TARGET); \
                        fi; \
-               done; \
-               for line in `grep -v "^#" $(TARGET)_rootfile`; do \
+               done < $(TARGET)_diff; \
+               grep -v "^#" $(TARGET)_rootfile | while read -r line; do \
                        if ! grep -qG "^$$line$$" $(TARGET)_diff ; then echo "-$$line" >> $(TARGET); \
                        fi; \
                done; \
@@ -332,14 +346,13 @@ endef
 define LOAD
        @echo -e "$(MESSAGE)Download: $($(notdir $@))"
        wget -T 60 -t 1 -nv -U "IPFireSourceGrabber/2.x" $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@)
-       [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ] # detect page not found answer
+       [ "$($(notdir $@)_BLAKE2)" = "$$(b2sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }')" ] # detect page not found answer
        mv $(DIR_TMP)/$(notdir $@) $(DIR_DL)
 endef
 
-define MD5
+define B2SUM
        # error mean file signature don't match the one in lfs script
-       [ "$($@_MD5)" = `md5sum $(DIR_DL)/$@ | awk '{ print $$1 }'` ]
-       echo "$@ checksum OK"
+       [ "$($@_BLAKE2)" = "$$(b2sum $(DIR_DL)/$@ | awk '{ print $$1 }')" ] && echo "$@ checksum OK"
 endef
 
 define PAK
@@ -394,13 +407,16 @@ define PAK
        # Cleanup
        rm -rf $(DIR_TMP_PAK)
 
-       # Create meta file
+       # Escape SUMMARY variable and create meta file
+       summaryEscaped=$$(sed 's/[&/\]/\\&/g' <<< "$(SUMMARY)"); \
        sed \
                -e "s/NAME/$(PROG)/g" \
+               -e "s/SUMMARY/$$summaryEscaped/g" \
                -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/SERVICES/$(SERVICES)/g" \
          < /usr/src/src/pakfire/meta > /install/packages/meta-$(PROG)
 endef
 
@@ -408,6 +424,12 @@ define INSTALL_INITSCRIPT
        install -m 754 -v $(DIR_SRC)/src/initscripts/packages/$(1)  /etc/rc.d/init.d/$(1)
 endef
 
+define INSTALL_INITSCRIPTS
+       for initscript in $(1); do \
+               $(call INSTALL_INITSCRIPT,$$initscript) || exit 1; \
+    done
+endef
+
 ifeq "$(BUILD_ARCH)" "$(filter $(BUILD_ARCH),aarch64 riscv64)"
 define UPDATE_AUTOMAKE
        for i in $$(find $(DIR_APP) -name config.guess -o -name config.sub); do \