Write /opt/pakfire/db/core/mine in stage2.

diff --git a/config/rootfiles/common/pakfire b/config/rootfiles/common/pakfire
index f46a7b0df15e0e411ca1b775a9273c4386eae0d2..ab439c5bd43b4e5b09f4f961cd59409e3dd8dc25 100644 (file)
--- a/config/rootfiles/common/pakfire
+++ b/config/rootfiles/common/pakfire
@@ -1,7 +1,4 @@
-#opt/pakfire

 opt/pakfire/cache
 opt/pakfire/cache

-#opt/pakfire/db
-opt/pakfire/db/core

 opt/pakfire/db/installed
 opt/pakfire/db/lists
 opt/pakfire/db/meta
 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 1e91b37438ca79f0a708841013680160ae77957f..da95512b58f5f2d40dbfee52b2b63470dfadb119 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -50,6 +50,10 @@ media/floppy
 media/usbkey
 mnt
 #opt
 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
 #root
 root/.bash_logout
 root/.bash_profile

diff --git a/lfs/stage2 b/lfs/stage2
index beb0abbcb2d4fb0a884080c1856c8c7f3b826092..8d302ebc6ff81be8d3a0534fd312fb9b913f4cc6 100644 (file)
--- 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
 
        -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)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index e80a951085ccfac5a168b30ec7e80a9e823022aa..edee082f07f46deef1c9833fa036da044bb84e4a 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -774,7 +774,6 @@ buildipfire() {
   ipfiremake iptraf-ng
   ipfiremake iotop
 
   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
   if [ "$(git status -s | wc -l)" == "0" ]; then
        GIT_STATUS=""
   else

diff --git a/tools/make-functions b/tools/make-functions
index 6d77db442cae7c6d2c05493a3893081a0b4656b4..0385528a81c22186e59740ce71e4a609fc587c57 100644 (file)
--- 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 \
        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" \
                                                CONFIG_ROOT=$CONFIG_ROOT \
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                                CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \