From 7428c41ce9c0e120eb57486671c45b45d52b123f Mon Sep 17 00:00:00 2001
From: phanes <phanes@forge.silogroup.lan>
Date: Sun, 2 Apr 2023 18:49:57 -0400
Subject: [PATCH] fixed bug introduced in download_sources target

---
 Makefile                                          | 1 +
 make.project/download_sources.sh                  | 1 -
 rex.project/x86_64/components/livecd/libxml2.bash | 2 +-
 rex.project/x86_64/components/livecd/livecd.bash  | 7 +++++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 7d072d9..097f362 100644
--- a/Makefile
+++ b/Makefile
@@ -99,6 +99,7 @@ master:
 
 livecd:
 	set -e
+	make disarm_chroot
 	sudo /usr/bin/env -i bash -c ". ./project_config.sh && ${dir_make}/livecd.sh"
 
 # example:
diff --git a/make.project/download_sources.sh b/make.project/download_sources.sh
index 7023ab7..9485b73 100755
--- a/make.project/download_sources.sh
+++ b/make.project/download_sources.sh
@@ -19,7 +19,6 @@ wget \
 	https://storage.darkhorselinux.org/sources/upstream_sources/ \
 	|| echofail "Downloading sources..."
 
-
 echo "Validating source downloads..."
 pushd ${dir_sources} 1>/dev/null 2>/dev/null
 
diff --git a/rex.project/x86_64/components/livecd/libxml2.bash b/rex.project/x86_64/components/livecd/libxml2.bash
index d8eaf65..5b287fe 100755
--- a/rex.project/x86_64/components/livecd/libxml2.bash
+++ b/rex.project/x86_64/components/livecd/libxml2.bash
@@ -138,7 +138,7 @@ mode_build() {
 		--sysconfdir=/etc \
 		--disable-static \
 		--with-history \
-		--docdir=/usr/share/doc/${APPNAME}-${VERSION}
+		--docdir=/usr/share/doc/${APPNAME}-${VERSION} \
 		PYTHON=/usr/bin/python3
 	assert_zero $?
 	
diff --git a/rex.project/x86_64/components/livecd/livecd.bash b/rex.project/x86_64/components/livecd/livecd.bash
index 916f5f9..f47fe62 100755
--- a/rex.project/x86_64/components/livecd/livecd.bash
+++ b/rex.project/x86_64/components/livecd/livecd.bash
@@ -41,6 +41,13 @@ assert_zero $?
 pushd ${dir_artifacts}
 assert_zero $?
 
+logprint "Emptying source stage..."
+rm -Rf ${TEMP_STAGE_DIR}
+assert_zero $?
+
+rm -Rf /rex_embedded
+assert_zero $?
+
 logprint "Generating initramfs..."
 # TODO chroot ignores this, and it breaks binutils pass 3
 ulimit -n 3000000