From 85e21d9abb2daf68be31c33dcdbc8874c3cc8fdc Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 4 Jan 2000 22:13:57 +0000
Subject: no_comment

---
 tools/Makefile            |  2 +-
 tools/make_mdkinst_stage2 | 25 ++++++++++++++++++++-----
 2 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'tools')

diff --git a/tools/Makefile b/tools/Makefile
index 3ffd8a0cd..cfc861723 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -14,7 +14,7 @@ $(DIRS):
 
 install:
 	$(MAKE) gendepslist rpm2header
-	install make_mdkinst_stage2 gendepslist rpm2header genhdlist $(ROOTDEST)/misc
+	install make_mdkinst_stage2 build_archive gendepslist rpm2header genhdlist $(ROOTDEST)/misc
 	mkdir -p $(DEST)/usr/bin
 
 xhost+: %: %.c
diff --git a/tools/make_mdkinst_stage2 b/tools/make_mdkinst_stage2
index f2619095e..483bdfaaa 100755
--- a/tools/make_mdkinst_stage2
+++ b/tools/make_mdkinst_stage2
@@ -13,6 +13,13 @@ REP4PMS=/usr/bin/perl-install
 DEST=$1
 STAGE2=$2
 
+testandset() { [ -x $1/build_archive ] && BUILD_ARCHIVE=$1/build_archive; }
+testandset `pwd`/misc
+testandset `pwd`/.
+testandset /$DEST/../../misc
+testandset `pwd`/$DEST/../../misc
+[ -z "$BUILD_ARCHIVE" ] && { echo "can't find build_archive"; exit 1; }
+
 if [ $EUID != "0" ]; then
     SUDO="sudo"
     PATH="/sbin:/usr/sbin:$PATH"
@@ -24,19 +31,27 @@ $SUDO cp -a $DEST/* $STAGE2TMP
 
 mkdir -p $MNTPOINT 2>/dev/null
 for i in $MNTPOINT $STAGE2; do $SUDO umount $i 2>/dev/null ; done
-dd if=/dev/zero of=$STAGE2 bs=1k count=15700
+dd if=/dev/zero of=$STAGE2 bs=1k count=16000
 $MKE2FS -N 1000 $STAGE2
 $SUDO mount -t ext2 $STAGE2 $MNTPOINT -o loop
 
 # hack to reduce the STAGE2 image (do not edit without modifying in DrakX)
-rm $STAGE2TMP/usr/X11R6/bin/XF86_VGA16
-for i in /usr/share/locale /usr/share/keymaps /usr/share/xmodmap $REP4PMS/po; do \
-	name=`basename $i` ; \
-	(cd $STAGE2TMP/$i ; find * | cpio -o 2>/dev/null | bzip2 > ../$name.cpio.bz2 ; cd .. ; rm -rf $name) \
+rm -f $STAGE2TMP/usr/X11R6/bin/XF86_VGA16
+rm -f $STAGE2TMP/$REP4PMS/po/DrakX.pot
+for i in /usr/share/locale; do \
+    name=`basename $i` ; \
+    (cd $STAGE2TMP/$i ; find * | cpio -o 2>/dev/null | bzip2 > ../$name.cpio.bz2 ; cd .. ; rm -rf $name) \
+done
+for i in /usr/share/keymaps /usr/share/xmodmap $REP4PMS/po; do
+    name=`basename $i`
+    (cd $STAGE2TMP/$i ; ls * | $BUILD_ARCHIVE ../$name 400000)
+    rm -rf $STAGE2TMP/$i
 done
+	
 $SUDO cp -a $STAGE2TMP/* $MNTPOINT
 $SUDO rm -rf $STAGE2TMP
 
+df $MNTPOINT
 $SUDO umount $STAGE2
 rmdir $MNTPOINT
 
-- 
cgit v1.2.1