From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 1/3] Config: Support rootfiles with spaces in filenames Date: Wed, 18 Jan 2023 11:36:26 +0000 Message-ID: <20230118113628.3309496-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0509229632209092024==" List-Id: --===============0509229632209092024== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Our build scripts can't handle any spaces in filenames. This is being fixed by this patch with only a slightly changed set of shell commands. Signed-off-by: Michael Tremer --- lfs/Config | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lfs/Config b/lfs/Config index 1d02e969c..2b2e9f569 100644 --- a/lfs/Config +++ b/lfs/Config @@ -294,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 fil= es # special cases # - if the corresponding rootfile is not found, touch $(TARGET)_missing_roo= tfile @@ -305,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=3D$(firstword $(MAKEFILE_LIST))$(KCFG); \ echo $(LFS_SCRIPT); \ ROOTFILE=3D$$(find -L $(DIR_SRC)/config/rootfiles/{common,packages}/{$(BUI= LD_ARCH),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \ @@ -315,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/xxxMAC= HINExxx/$(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" >> $(TAR= GET); \ elif grep -qG "^$$line$$" $(TARGET)_rootfile ; then echo "$$line" >> $(TA= RGET); \ 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" >> $(TARGE= T); \ fi; \ done; \ --=20 2.30.2 --===============0509229632209092024==--