From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 27 Oct 2024 12:47:57 +0000 (+0100)
Subject: Config: add ROOTFILE_APPEND variable to select rootfile
X-Git-Tag: v2.29-core190~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da8dc5e86aa7706a29f05f3822f3ec5028ba535f;p=ipfire-2.x.git

Config: add ROOTFILE_APPEND variable to select rootfile

also gcc on riscv64 has to different rootfile at build so make
the selection of an additional rootfile univarsal.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/Config b/lfs/Config
index f14f6b63f2..1a59ebe1ed 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -282,11 +282,7 @@ define POSTBUILD
 	# $(TARGET)_rootfile : ROOTFILE with KVER replacement
 	# $(TARGET) : log result with {commented|include|added} files
 	@if [ -s "$(TARGET)_diff" ]; then \
-		if [ "$(HEADERS)" = "1" ]; then \
-			LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-headers ; \
-		else \
-			LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
-		fi; \
+		LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))${ROOTFILE_APPEND} ; \
 		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); \
 		if [ "$$ROOTFILE" = "" ]; then \
diff --git a/lfs/gcc b/lfs/gcc
index 93d25d26d1..a340442b0d 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -69,6 +69,7 @@ ifeq "$(ROOT)" ""
   EXTRA_INSTALL =
 ifeq "$(PASS)" "A"
   TARGET = $(DIR_INFO)/$(THISAPP)-libatomic
+  ROOTFILE_APPEND = "-libatomic"
 endif
 else
 ifeq "$(PASS)" "1"
diff --git a/lfs/linux b/lfs/linux
index 62e9519cbc..fa4b43b846 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -54,6 +54,7 @@ else
 	HEADERS_PREFIX = /usr
 ifeq "$(HEADERS)" "1"
 	TARGET = $(DIR_INFO)/$(THISAPP)-headers
+	ROOTFILE_APPEND="-headers"
 else
 	TARGET = $(DIR_INFO)/$(THISAPP)
 endif