summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-08-24 15:57:23 +0000
committerFrancois Pons <fpons@mandriva.com>2000-08-24 15:57:23 +0000
commit328ce33d9b48588abd507591d403ffcdf9612a93 (patch)
tree376572183d1ad3ac56718f5a21b08d721c7486f4 /tools
parentae6724e80a75c2e253daa9ded045c756f399e860 (diff)
downloaddrakx-328ce33d9b48588abd507591d403ffcdf9612a93.tar
drakx-328ce33d9b48588abd507591d403ffcdf9612a93.tar.gz
drakx-328ce33d9b48588abd507591d403ffcdf9612a93.tar.bz2
drakx-328ce33d9b48588abd507591d403ffcdf9612a93.tar.xz
drakx-328ce33d9b48588abd507591d403ffcdf9612a93.zip
*** empty log message ***
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile10
-rwxr-xr-xtools/gencompss2
-rwxr-xr-xtools/make_mdkinst_stage28
3 files changed, 10 insertions, 10 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 822d17a33..834d727cd 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -14,7 +14,7 @@ $(DIRS):
install:
install make_mdkinst_stage2 gencompss $(ROOTDEST)/misc
- cd /usr/bin ; install build_archive $(ROOTDEST)/misc || { echo "build_archive is missing"; exit 1; }
+ cd /usr/bin ; install packdrake $(ROOTDEST)/misc || { echo "packdrake is missing"; exit 1; }
cd /usr/bin ; install gendepslist2 rpm2header genhdlist_cz2 $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; }
mkdir -p $(DEST)/usr/bin
@@ -25,16 +25,16 @@ ddcprobe/ddcxinfos:
$(MAKE) -C ddcprobe ddcxinfos
$(BASE)/compss: $(BASE)/hdlists $(BASE)/hdlist.cz2
- ./gencompss `cat $< | perl -pe 's|(.*)|'$(BASE)'/$$1|' ` > $@
+ ./gencompss `cat $< | perl -pe 's|^(\S*).*|'$(BASE)'/$$1|' ` > $@
$(BASE)/depslist: $(BASE)/hdlists $(BASE)/hdlist.cz2
-# gendepslist2 -o $@ `cat $< | perl -pe 's|^(\S*).*|'$(BASE)'/$$1|' `
+ gendepslist2 -o $@ `cat $< | perl -pe 's|^(\S*).*|'$(BASE)'/$$1|' `
$(BASE)/filelist: $(RPMS)
-# genfilelist $(ROOTDEST)/Mandrake/RPMS* >$@
+ genfilelist $(ROOTDEST)/Mandrake/RPMS* >$@
$(BASE)/hdlist.cz2: $(BASE)/hdlists $(RPMS)
-# genhdlists --noclean --distrib $(ROOTDEST)
+ genhdlists --noclean --distrib $(ROOTDEST)
clean:
for i in $(DIRS); do $(MAKE) -C $$i clean; done
diff --git a/tools/gencompss b/tools/gencompss
index 333d02f0c..b12328e49 100755
--- a/tools/gencompss
+++ b/tools/gencompss
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-open F, "bzip2 -dc @ARGV 2>/dev/null | hdlist2groups - |";
+open F, "packdrake -c @ARGV | hdlist2groups - |";
foreach (<F>) {
chop;
/(.*):(.*)/;
diff --git a/tools/make_mdkinst_stage2 b/tools/make_mdkinst_stage2
index f480634b2..80075ce0b 100755
--- a/tools/make_mdkinst_stage2
+++ b/tools/make_mdkinst_stage2
@@ -13,12 +13,12 @@ REP4PMS=/usr/bin/perl-install
DEST=$1
STAGE2=$2
-testandset() { [ -x $1/build_archive ] && BUILD_ARCHIVE=$1/build_archive; }
+testandset() { [ -x $1/packdrake ] && BUILD_ARCHIVE=$1/packdrake; }
testandset `pwd`/misc
testandset `pwd`/.
testandset /$DEST/../../misc
testandset `pwd`/$DEST/../../misc
-[ -z "$BUILD_ARCHIVE" ] && { echo "can't find build_archive"; exit 1; }
+[ -z "$BUILD_ARCHIVE" ] && { echo "can't find packdrake"; exit 1; }
if [ $EUID != "0" ]; then
SUDO="sudo"
@@ -44,12 +44,12 @@ rm -f $STAGE2TMP/$REP4PMS/po/DrakX.pot
#done
for i in /usr/share/locale; do
name=`basename $i`
- (cd $STAGE2TMP/$i ; find * | $BUILD_ARCHIVE ../$name.cz2 4000000)
+ (cd $STAGE2TMP/$i ; find * | $BUILD_ARCHIVE -b9s ../$name.cz2 4000000)
rm -rf $STAGE2TMP/$i
done
for i in /usr/share/keymaps /usr/share/xmodmap $REP4PMS/po; do
name=`basename $i`
- (cd $STAGE2TMP/$i ; ls * | $BUILD_ARCHIVE ../$name.cz2 400000)
+ (cd $STAGE2TMP/$i ; ls * | $BUILD_ARCHIVE -b9s ../$name.cz2 400000)
rm -rf $STAGE2TMP/$i
done