]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
make.sh: Export BUILD_DIR and LOG_DIR
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Jul 2024 19:53:15 +0000 (19:53 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 22 Jul 2024 15:21:20 +0000 (15:21 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/Config
make.sh

index 8323683fc3d40c3f519837a4afad7f43774ed005..0e0408d2d8e0990ee8cd0fda2473a165b365b99b 100644 (file)
@@ -32,6 +32,8 @@
 
 # Cleanup environment from any variables
 unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR
+unexport BUILD_DIR
+unexport LOG_DIR
 unexport XZ_OPT
 unexport ZSTD_OPT
 
@@ -94,7 +96,7 @@ DIR_SRC = $(ROOT)/usr/src
 DIR_DL      = $(LFS_BASEDIR)/cache
 DIR_CHK     = $(LFS_BASEDIR)/cache/check
 DIR_CONF    = $(LFS_BASEDIR)/config
-DIR_INFO    = $(LFS_BASEDIR)/log
+DIR_INFO    = $(LOG_DIR)
 DIR_TMP     = /tmp
 DIR_TMP_PAK = $(DIR_TMP)/package-$(PROG)
 
diff --git a/make.sh b/make.sh
index f350fb9f05c66a54df6d695eb370c57f3e8a7ca2..dc568b99b0cf5d9e13dd65002b809999498ec7a8 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -595,7 +595,9 @@ execute() {
 
                # Paths
                [LFS_BASEDIR]="${BASEDIR}"
+               [BUILD_DIR]="${BUILD_DIR}"
                [IMAGES_DIR]="${IMAGES_DIR}"
+               [LOG_DIR]="${LOG_DIR}"
                [PACKAGES_DIR]="${PACKAGES_DIR}"
                [TOOLS_DIR]="${TOOLS_DIR}"
        )
@@ -643,7 +645,9 @@ execute() {
 
                                        # Paths
                                        [LFS_BASEDIR]="/usr/src"
+                                       [BUILD_DIR]="/"
                                        [IMAGES_DIR]="/usr/src/images"
+                                       [LOG_DIR]="/usr/src/log"
                                        [PACKAGES_DIR]="/usr/src/images/packages"
 
                                        # Compiler Cache