Write /opt/pakfire/db/core/mine in stage2.
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 30 Sep 2013 19:08:44 +0000 (21:08 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 30 Sep 2013 19:08:44 +0000 (21:08 +0200)
config/rootfiles/common/pakfire
config/rootfiles/common/stage2
lfs/stage2
make.sh
tools/make-functions

index f46a7b0..ab439c5 100644 (file)
@@ -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
index 1e91b37..da95512 100644 (file)
@@ -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
index beb0abb..8d302eb 100644 (file)
@@ -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 e80a951..edee082 100755 (executable)
--- 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
index 6d77db4..0385528 100644 (file)
@@ -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" \