From 2432d74bf8ece63c1a9df8e6a3b4a56642c2bd77 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Jul 2024 13:01:27 +0000
Subject: [PATCH] cdrom+flash-images: Write images to the images directory

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/cdrom        |  7 +++++--
 lfs/flash-images |  5 ++++-
 make.sh          | 12 ++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lfs/cdrom b/lfs/cdrom
index e5c8a313b..44e2b8595 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -118,7 +118,7 @@ GRUB_EFI_MODULES = \
 	true \
 	usb_keyboard
 
-ISO_FILE = /install/images/$(SNAME)-$(VERSION)-core$(CORE)-$(BUILD_ARCH).iso
+ISO_FILE = $(IMAGES_DIR)/$(SNAME)-$(VERSION)-core$(CORE)-$(BUILD_ARCH).iso
 
 ###############################################################################
 # Top-level Rules
@@ -236,9 +236,12 @@ endif
 	cd $(DIR_TMP)/cdrom && find -type f ! -name md5sum.txt | grep -v "./boot" | \
 						xargs md5sum > md5sum.txt
 
-	mkdir -p /install/images
+	# Master the ISO file
 	cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) -o $(ISO_FILE) .
 
 ifeq "$(HAS_ISOLINUX)" "1"
 	isohybrid $(ISOHYBRID_ARGS) $(ISO_FILE)
 endif
+
+	# Create checksum file
+	cd $(IMAGES_DIR) && b2sum "$(notdir $(ISO_FILE))" > "$(notdir "$(ISO_FILE)").b2"
diff --git a/lfs/flash-images b/lfs/flash-images
index 0fe882b5e..da898db0c 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -36,7 +36,7 @@ ifeq "$(EFI)" "1"
 endif
 PART_ROOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
 
-IMAGE_FILE = /install/images/$(SNAME)-$(VERSION)-core$(CORE)-$(BUILD_ARCH).img.xz
+IMAGE_FILE = $(IMAGES_DIR)/$(SNAME)-$(VERSION)-core$(CORE)-$(BUILD_ARCH).img.xz
 
 FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
 
@@ -255,3 +255,6 @@ endif
 	# Compress Image
 	xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)
 	rm -rf $(IMG) $(MNThdd) $(DIR_TMP)/cdrom
+
+	# Create checksum file
+	cd $(IMAGES_DIR) && b2sum "$(notdir $(IMAGE_FILE))" > "$(notdir "$(IMAGE_FILE)").b2"
diff --git a/make.sh b/make.sh
index 9549ecb24..0c3f4884f 100755
--- a/make.sh
+++ b/make.sh
@@ -2128,19 +2128,15 @@ build_system() {
 
 	# use toolchain bash for chroot to strip
 	CUSTOM_PATH="${TOOLS_DIR}/bin" lfsmake2 strip
+
+	# Build images
+	lfsmake2 cdrom
+	lfsmake2 flash-images
 }
 
 buildpackages() {
   local LOGFILE="${LOG_DIR}/_build.packages.log"
 
-  # Create images for install
-  lfsmake2 cdrom
-
-  # Check if there is a loop device for building in virtual environments
-  lfsmake2 flash-images
-
-  mv ${BUILD_DIR}/install/images/{*.iso,*.img.xz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
-
   ipfirepackages
 
   cd $BASEDIR
-- 
2.39.5