From f2fce26932d86ac6e15ec33d58ae432958411410 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 7 Dec 2024 11:50:51 +0000 Subject: [PATCH] Config: Don't interpret file names as regular expressions When we are searching for changes in rootfiles, we walk through each file that we have found in the build and check if it exists in the rootfile. That check interpreted filenames as regular expressions which caused a problem in the case of "/usr/bin/[". This patch changes that grep will only search for an exact string match (-F) and the string must be the entire line (-x). Signed-off-by: Michael Tremer Reviewed-by: Adolf Belka Signed-off-by: Michael Tremer --- lfs/Config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/Config b/lfs/Config index 1a59ebe1ed..8547f69c63 100644 --- a/lfs/Config +++ b/lfs/Config @@ -292,13 +292,13 @@ define POSTBUILD fi; \ sed -e "s/BUILDTARGET/$(BUILDTARGET)/g" -e "s/KVER/$(KVER)/g" -e "s/xxxMACHINExxx/$(BUILD_ARCH)/g" $$ROOTFILE > $(TARGET)_rootfile; \ 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); \ + if grep -qFx "#$$line" $(TARGET)_rootfile; then echo "#$$line" >> $(TARGET); \ + elif grep -qFx "$$line" $(TARGET)_rootfile ; then echo "$$line" >> $(TARGET); \ else echo "+$$line" >> $(TARGET); \ fi; \ done < $(TARGET)_diff; \ grep -v "^#" $(TARGET)_rootfile | while read -r line; do \ - if ! grep -qG "^$$line$$" $(TARGET)_diff ; then echo "-$$line" >> $(TARGET); \ + if ! grep -qFx "$$line" $(TARGET)_diff ; then echo "-$$line" >> $(TARGET); \ fi; \ done; \ rm -f $(TARGET)_rootfile; \ -- 2.39.5