summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-04-20 21:48:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-04-20 21:48:51 +0000
commitef08d7c8a1b541e296b1192a2b5c0d6083c6de07 (patch)
treebbd2d3ee791bd7dfadbcfaa1f1198afb3842fd94
parent037d713f16af56333b0bbdc249ff7073ac81a368 (diff)
downloaddrakx-backup-do-not-use-ef08d7c8a1b541e296b1192a2b5c0d6083c6de07.tar
drakx-backup-do-not-use-ef08d7c8a1b541e296b1192a2b5c0d6083c6de07.tar.gz
drakx-backup-do-not-use-ef08d7c8a1b541e296b1192a2b5c0d6083c6de07.tar.bz2
drakx-backup-do-not-use-ef08d7c8a1b541e296b1192a2b5c0d6083c6de07.tar.xz
drakx-backup-do-not-use-ef08d7c8a1b541e296b1192a2b5c0d6083c6de07.zip
no_comment
-rw-r--r--Makefile19
-rwxr-xr-xrescue/make_rescue_img2
2 files changed, 12 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index aaee3d3b0..e904241d6 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ BOOT_IMG += $(RELEASE_BOOT_IMG)
BOOT_RDZ = $(BOOT_IMG:%.img=%.rdz)
BINS = install/install install/full-install install/local-install install/installinit/init
-DIRS = tools install install/installinit perl-install rescue
+DIRS = tools install install/installinit perl-install
ifeq (i386,$(ARCH))
#DIRS += lnx4win
endif
@@ -26,7 +26,7 @@ UPLOAD_DEST_CONTRIB = $(UPLOAD_DEST_)/contrib
AUTOBOOT = $(ROOTDEST)/dosutils/autoboot/mdkinst
-.PHONY: dirs $(FLOPPY_IMG) install network_ks.rdz pcmcia_ks.rdz
+.PHONY: dirs rescue $(FLOPPY_IMG) install network_ks.rdz pcmcia_ks.rdz
install: build autoboot
for i in images misc Mandrake Mandrake/base; do install -d $(ROOTDEST)/$$i ; done
@@ -59,6 +59,9 @@ endif
dirs:
for i in $(DIRS); do make -C $$i; done
+rescue: modules
+ make -C $@
+
network_ks.rdz pcmcia_ks.rdz: %_ks.rdz: %.rdz
network.rdz pcmcia.rdz hd.rdz cdrom.rdz: dirs modules
@@ -85,12 +88,12 @@ clean:
for i in $(DIRS); do make -C $$i clean; done
find . -name "*~" -o -name ".#*" | xargs rm -f
-upload: tar install
- touch /tmp/mdkinst_done
- 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 rescue_stage2.gz compss compssList compssUsers hdlists ; cd $(UPLOAD_DEST)/misc ; lcd ~/gi/tools/ ; put make_mdkinst_stage2" #,gendepslist,rpm2header"
+upload: #tar install
+# touch /tmp/mdkinst_done
+# 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 rescue_stage2.gz compss compssList compssUsers hdlists ; 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/rescue/make_rescue_img b/rescue/make_rescue_img
index 9c8f3f5c9..d77250fed 100755
--- a/rescue/make_rescue_img
+++ b/rescue/make_rescue_img
@@ -36,7 +36,7 @@ _ "$sudo rm -rf $tmp" if -e $tmp;
_ "mkdir $tmp";
_ 'find . -name "*~" | xargs rm -f';
_ "cp -a tree/* $tmp";
-_ "mkdir -p lib tmp modules proc";
+_ "cd $tmp; mkdir -p lib tmp modules proc";
foreach (keyboard::loadkeys_files) {