From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] Config: Don't interpret file names as regular expressions Date: Sat, 07 Dec 2024 11:50:51 +0000 Message-ID: <20241207115051.3730583-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6109140279253711771==" List-Id: --===============6109140279253711771== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 --- lfs/Config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/Config b/lfs/Config index 1a59ebe1e..8547f69c6 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/xxxMAC= HINExxx/$(BUILD_ARCH)/g" $$ROOTFILE > $(TARGET)_rootfile; \ 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); \ + if grep -qFx "#$$line" $(TARGET)_rootfile; then echo "#$$line" >> $(TARGE= T); \ + elif grep -qFx "$$line" $(TARGET)_rootfile ; then echo "$$line" >> $(TARG= ET); \ 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" >> $(TARGE= T); \ + if ! grep -qFx "$$line" $(TARGET)_diff ; then echo "-$$line" >> $(TARGET)= ; \ fi; \ done; \ rm -f $(TARGET)_rootfile; \ --=20 2.39.5 --===============6109140279253711771==--