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 f14f6b63f235e4e202f04310f65c23f47aeb344b..1a59ebe1edcf9f9d30bb8131c03e655d5eacebc0 100644 (file)
--- 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 93d25d26d178f96b5bc9fa9bff6621dd24186924..a340442b0dadaab9dd93014ed22f6ee3e04232ed 100644 (file)
--- 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 62e9519cbc7ddf73c0a2bb8eb768985748b614f3..fa4b43b846bc4e5dc72be4c35ed33aa8a4312afa 100644 (file)
--- 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