This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via da8dc5e86aa7706a29f05f3822f3ec5028ba535f (commit) from 61a8c7dcdbb911e592604a82e6fe4cf4c84f3c27 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit da8dc5e86aa7706a29f05f3822f3ec5028ba535f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 27 13:47:57 2024 +0100
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
-----------------------------------------------------------------------
Summary of changes: lfs/Config | 6 +----- lfs/gcc | 1 + lfs/linux | 1 + 3 files changed, 3 insertions(+), 5 deletions(-)
Difference in files: diff --git a/lfs/Config b/lfs/Config index f14f6b63f..1a59ebe1e 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 93d25d26d..a340442b0 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 62e9519cb..fa4b43b84 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
hooks/post-receive -- IPFire 2.x development tree