diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-03-09 13:17:29 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-03-09 13:17:29 +0000 |
| commit | 29dbc8c49c643d5d18f64907ca9d5104ad9cf08e (patch) | |
| tree | 0d11cf6e3600aa14de7e50b5f01480c2132fdd1c | |
| parent | ee4ba937cf28b777ba9faa252ddc5379cef82cb8 (diff) | |
| download | drakx-29dbc8c49c643d5d18f64907ca9d5104ad9cf08e.tar drakx-29dbc8c49c643d5d18f64907ca9d5104ad9cf08e.tar.gz drakx-29dbc8c49c643d5d18f64907ca9d5104ad9cf08e.tar.bz2 drakx-29dbc8c49c643d5d18f64907ca9d5104ad9cf08e.tar.xz drakx-29dbc8c49c643d5d18f64907ca9d5104ad9cf08e.zip | |
no_comment
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | perl-install/Makefile | 4 | ||||
| -rw-r--r-- | perl-install/Makefile.config | 2 | ||||
| -rw-r--r-- | perl-install/share/list | 1 | ||||
| -rwxr-xr-x | update_kernel | 2 |
5 files changed, 6 insertions, 5 deletions
@@ -88,7 +88,7 @@ upload: tar install cd $(ROOTDEST)/Mandrake ; tar cfz mdkinst.tgz mdkinst lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST)/images ; mput $(ROOTDEST)/images/*.img" - lftp -c "open -u devel mandrakesoft.com; cd ~/tmp ; put $(ROOTDEST)/Mandrake/mdkinst.tgz ; put /tmp/mdkinst_done ; cd $(UPLOAD_DEST)/Mandrake/base ; lcd $(ROOTDEST)/Mandrake/base ; put mdkinst_stage2.gz compss compssList compssUsers ; cd $(UPLOAD_DEST)/misc ; lcd ~/gi/tools/ ; put make_mdkinst_stage2 build_archive genhdlist" #,gendepslist,rpm2header" + lftp -c "open -u devel mandrakesoft.com; cd ~/tmp ; put $(ROOTDEST)/Mandrake/mdkinst.tgz ; put /tmp/mdkinst_done ; cd $(UPLOAD_DEST)/Mandrake/base ; lcd $(ROOTDEST)/Mandrake/base ; put mdkinst_stage2.gz compss compssList compssUsers ; cd $(UPLOAD_DEST)/misc ; lcd ~/gi/tools/ ; put make_mdkinst_stage2" #,gendepslist,rpm2header" lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST)/dosutils/autoboot/mdkinst ; put $(ROOTDEST)/dosutils/autoboot/mdkinst/vmlinuz ; mput $(ROOTDEST)/dosutils/autoboot/mdkinst/initrd.*" lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST)/lnx4win ; lcd $(ROOTDEST)/lnx4win ; put initrd.gz vmlinuz" lftp -c "open -u devel mandrakesoft.com; cd $(UPLOAD_DEST_CONTRIB)/others/src ; put ../gi.tar.bz2" diff --git a/perl-install/Makefile b/perl-install/Makefile index c7255effd..5443526d5 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -57,7 +57,7 @@ get_needed_files: $(DIRS) # export PERL_INSTALL_TEST=1 ; strace -f -e trace=file -o '| grep -v "(No such file or directory)" | sed -e "s/[^\"]*\"//" -e "s/\".*//" | grep "^/" | grep -v -e "^/tmp" -e "^/home" -e "^/proc" -e "^/var" -e "^/dev" -e "^/etc" -e "^/usr/lib/rpm" > /tmp/list ' $(PERL) -d install2 < /dev/null perl -pe "s/ARCH/$(ARCH)/g" share/list > /tmp/list # perl -pi -e 's/00503/5.660/g' /tmp/list - cat `specific_arch share/list` >> /tmp/list + cat `../tools/specific_arch share/list` >> /tmp/list find auto -follow -name "*.so" >> /tmp/list for i in $(LOCALFILES) `cat /tmp/list` ; do \ @@ -109,7 +109,7 @@ endif perl -ane 'symlink "$$F[1]", "$(DEST)/usr/bin/$$F[0]"' aliases - for i in fonts keyboards locales gconv; do tar xfy `specific_arch share/$$i.tar.bz2` -C $(DEST); done + for i in fonts keyboards locales gconv; do tar xfy `../tools/specific_arch share/$$i.tar.bz2` -C $(DEST); done cp -a modparm.lst $(DEST)/usr/share cd share ; cp -a keymaps $(DEST)/usr/share diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config index d32328662..80ffaf36e 100644 --- a/perl-install/Makefile.config +++ b/perl-install/Makefile.config @@ -14,7 +14,7 @@ STAGE2 = $(ROOTDEST)/Mandrake/base/mdkinst_stage2 BASE = $(ROOTDEST)/Mandrake/base DESTREP4PMS = $(DEST)$(REP4PMS) PERL = perl -LOCALFILES = $(patsubst %, ../tools/%,$(ARCH)/e2fsck.shared ddcprobe/ddcxinfos pnp_serial/pnp_serial xhost+ extract_archive) +LOCALFILES = $(patsubst %, ../tools/%,$(ARCH)/e2fsck.shared ddcprobe/ddcxinfos pnp_serial/pnp_serial xhost+) DIRS = c Newt pci_probing resize_fat #po CFLAGS = -Wall override CFLAGS += -pipe diff --git a/perl-install/share/list b/perl-install/share/list index 7fcddc96e..64753eafe 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -14,6 +14,7 @@ /sbin/raidstart /usr/X11R6/lib/X11/Cards /usr/bin/bzip2 +/usr/bin/extract_archive /usr/bin/perl /usr/lib/gconv/BIG5.so /usr/lib/gconv/EUC-JP.so diff --git a/update_kernel b/update_kernel index 65b78ed56..e550c638d 100755 --- a/update_kernel +++ b/update_kernel @@ -42,7 +42,7 @@ rm -rf modules ; install -d modules cp -f `find ../"$KERNEL_BOOT_PATH"/lib/modules/ -name "*.o"` . /sbin/depmod -m ../System.map -i -e *.o | grep ': ' | sed 's/\.o//g' > modules.dep perl -pi -e 's/((plip|ppa|imm): parport)/$1 parport_pc/' modules.dep - ls *.o | ../tools/build_archive modules.cz2 400000 + ls *.o | build_archive modules.cz2 400000 ls *.o | cpio --quiet -H crc -o | bzip2 -9> modules.cpio.bz2 ls $NETWORK_MODULES | cpio --quiet -H crc -o | gzip -9 > network_modules.cgz ls $CDROM_MODULES | cpio --quiet -H crc -o | gzip -9 > cdrom_modules.cgz |