From 065c9931acf1296f287e9f783ec0a4668289c886 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 30 Sep 2013 21:08:44 +0200
Subject: [PATCH] Write /opt/pakfire/db/core/mine in stage2.

---
 config/rootfiles/common/pakfire | 3 ---
 config/rootfiles/common/stage2  | 4 ++++
 lfs/stage2                      | 4 ++++
 make.sh                         | 1 -
 tools/make-functions            | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/config/rootfiles/common/pakfire b/config/rootfiles/common/pakfire
index f46a7b0df1..ab439c5bd4 100644
--- a/config/rootfiles/common/pakfire
+++ b/config/rootfiles/common/pakfire
@@ -1,7 +1,4 @@
-#opt/pakfire
 opt/pakfire/cache
-#opt/pakfire/db
-opt/pakfire/db/core
 opt/pakfire/db/installed
 opt/pakfire/db/lists
 opt/pakfire/db/meta
diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 1e91b37438..da95512b58 100644
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -50,6 +50,10 @@ media/floppy
 media/usbkey
 mnt
 #opt
+#opt/pakfire
+#opt/pakfire/db
+#opt/pakfire/db/core
+opt/pakfire/db/core/mine
 #root
 root/.bash_logout
 root/.bash_profile
diff --git a/lfs/stage2 b/lfs/stage2
index beb0abbcb2..8d302ebc6f 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -121,4 +121,8 @@ $(TARGET) :
 	-mkdir -pv /usr/share/doc/licenses/
 	cp -vf $(DIR_SRC)/doc/COPYING /usr/share/doc/licenses/GPLv3
 
+	# Pakfire
+	-mkdir -pv /opt/pakfire/db/core
+	echo "$(PAKFIRE_CORE)" > /opt/pakfire/db/core/mine
+
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index e80a951085..edee082f07 100755
--- a/make.sh
+++ b/make.sh
@@ -774,7 +774,6 @@ buildipfire() {
   ipfiremake iptraf-ng
   ipfiremake iotop
 
-  echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
   if [ "$(git status -s | wc -l)" == "0" ]; then
 	GIT_STATUS=""
   else
diff --git a/tools/make-functions b/tools/make-functions
index 6d77db442c..0385528a81 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -414,7 +414,7 @@ lfsmake2() {
 	chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
 						PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
-						VERSION=$VERSION \
+						VERSION=$VERSION PAKFIRE_CORE="${PAKFIRE_CORE}" \
 						CONFIG_ROOT=$CONFIG_ROOT \
 						NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
 						CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
-- 
2.39.2