summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-07-26 02:51:07 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-07-26 02:51:07 +0000
commit128d70150bc0c5188503f90d4d97311d7ba40cee (patch)
treeec01837c6c36c84715c853aefea4d2b213d12da1 /tools
parent9c29b12f0d1ea1a7d88d41d24c72a85cbc1b8862 (diff)
downloaddrakx-128d70150bc0c5188503f90d4d97311d7ba40cee.tar
drakx-128d70150bc0c5188503f90d4d97311d7ba40cee.tar.gz
drakx-128d70150bc0c5188503f90d4d97311d7ba40cee.tar.bz2
drakx-128d70150bc0c5188503f90d4d97311d7ba40cee.tar.xz
drakx-128d70150bc0c5188503f90d4d97311d7ba40cee.zip
adapt to new directories layout:
- Mandrake/mdkinst -> install/stage2/live - Mandrake/base/mdkinst_stage2.bz2 -> install/stage2/mdkinst_stage2.bz2 - Mandrake/base/rpmsrate -> media/media_info/rpmsrate - Mandrake/RPMS -> media/main - images -> install/images - isolinux -> install/isolinux - Mandrake/share/advertising -> install/extra/advertising
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile23
-rw-r--r--tools/i386/netboot/menu.lst.example6
-rwxr-xr-xtools/make_mdkinst_stage26
3 files changed, 17 insertions, 18 deletions
diff --git a/tools/Makefile b/tools/Makefile
index cafff8e29..d9c2b283a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,8 +1,7 @@
-ROOTDEST = /export
-DEST = $(ROOTDEST)/Mandrake/mdkinst
-RPMS = $(wildcard $(ROOTDEST)/Mandrake/RPMS/*.rpm)
+include ../Makefile.config
+
+RPMS = $(wildcard $(MAIN_RPMS_DIR)/*.rpm)
DIRS = ddcprobe serial_probe
-BASE = $(ROOTDEST)/Mandrake/base
CFLAGS = -Wall
ARCH := $(shell arch | egrep "(x86_64|sparc64|s390x)")
@@ -20,14 +19,14 @@ $(DIRS):
make -C $@
install:
- @install -d $(ROOTDEST)/misc/auto
- @install make_mdkinst_stage2 $(ROOTDEST)/misc
- @cp -rf `perl -Mpackdrake -le 'print $$INC{"packdrake.pm"}'` $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; }
- @cp -rf `perl -MURPM -le 'print $$INC{"URPM.pm"}' | sed s/URPM.pm//`URPM* $(ROOTDEST)/misc || { echo "install perl-URPM first!" ; exit 1; }
- @cp -rf `perl -MURPM -le 'print $$INC{"URPM.pm"}' | sed s/URPM.pm//`auto/URPM $(ROOTDEST)/misc/auto || { echo "install perl-URPM first!" ; exit 1; }
- @cd /usr/bin ; install packdrake $(ROOTDEST)/misc || { echo "packdrake is missing"; exit 1; }
- @cd /usr/bin ; install gendistrib rpm2header $(ROOTDEST)/misc || { echo "install rpmtools first!" ; exit 1; }
- @mkdir -p $(DEST)/usr/bin
+ @install -d $(MISC_DEST)/auto
+ @install make_mdkinst_stage2 $(MISC_DEST)
+ cp -rf `perl -Mpackdrake -le 'print $$INC{"packdrake.pm"}'` $(MISC_DEST) || { echo "install rpmtools first!" ; exit 1; }
+ @cp -rf `perl -MURPM -le 'print $$INC{"URPM.pm"}' | sed s/URPM.pm//`URPM* $(MISC_DEST) || { echo "install perl-URPM first!" ; exit 1; }
+ @cp -rf `perl -MURPM -le 'print $$INC{"URPM.pm"}' | sed s/URPM.pm//`auto/URPM $(MISC_DEST)/auto || { echo "install perl-URPM first!" ; exit 1; }
+ @cd /usr/bin ; install packdrake $(MISC_DEST) || { echo "packdrake is missing"; exit 1; }
+ @cd /usr/bin ; install gendistrib rpm2header $(MISC_DEST) || { echo "install rpmtools first!" ; exit 1; }
+ @mkdir -p $(STAGE2_LIVE)/usr/bin
xhost+: %: %.c
$(CC) $(CFLAGS) $< -L/usr/X11R6/$(LIB_NAME) -lX11 -o $@
diff --git a/tools/i386/netboot/menu.lst.example b/tools/i386/netboot/menu.lst.example
index 41022579a..3465fac62 100644
--- a/tools/i386/netboot/menu.lst.example
+++ b/tools/i386/netboot/menu.lst.example
@@ -4,18 +4,18 @@ default 0
title nfs
dhcp
tftpserver 192.168.100.39
-kernel (nd)/vmlinuz ramdisk=32000 vga=788 kickstart=Mandrake/base/auto_inst.cfg.pl useless_thing_accepted automatic=method:nfs,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
+kernel (nd)/vmlinuz ramdisk=32000 vga=788 kickstart=install/auto_inst.cfg.pl useless_thing_accepted automatic=method:nfs,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
initrd (nd)/network.rdz
title ftp
dhcp
tftpserver 192.168.100.39
-kernel (nd)/vmlinuz ramdisk=32000 vga=788 kickstart=Mandrake/base/auto_inst.cfg.pl useless_thing_accepted automatic=method:ftp,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
+kernel (nd)/vmlinuz ramdisk=32000 vga=788 kickstart=install/auto_inst.cfg.pl useless_thing_accepted automatic=method:ftp,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
initrd (nd)/network.rdz
title rescue
dhcp
tftpserver 192.168.100.39
-kernel (nd)/vmlinuz rescue rw root=/dev/ram3 ramdisk=32000 vga=788 kickstart=Mandrake/base/auto_inst.cfg.pl useless_thing_accepted automatic=method:nfs,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
+kernel (nd)/vmlinuz rescue rw root=/dev/ram3 ramdisk=32000 vga=788 kickstart=install/auto_inst.cfg.pl useless_thing_accepted automatic=method:nfs,network:static,ip:192.168.100.25,dns:192.168.100.11,gateway:192.168.100.1,server:192.168.100.39,directory:/export,user:a,pass:a
initrd (nd)/network.rdz
diff --git a/tools/make_mdkinst_stage2 b/tools/make_mdkinst_stage2
index 7af43d726..babb3d567 100755
--- a/tools/make_mdkinst_stage2
+++ b/tools/make_mdkinst_stage2
@@ -2,7 +2,7 @@
[ $# != 2 ] && {
echo "usage: make_mdkinst_stage2 <live dir> <output image>" ;
- echo " example: misc/make_mdkinst_stage2 Mandrake/mdkinst Mandrake/base/mdkinst_stage2"
+ echo " example: misc/make_mdkinst_stage2 install/stage2/live install/stage2/mdkinst_stage2"
exit
}
@@ -17,8 +17,8 @@ STAGE2=$2
testandset() { [ -x $1/packdrake ] && BUILD_ARCHIVE=$1/packdrake; }
testandset `pwd`/misc
testandset `pwd`/.
-testandset /$DEST/../../misc
-testandset `pwd`/$DEST/../../misc
+testandset /$DEST/../../../misc
+testandset `pwd`/$DEST/../../../misc
[ -z "$BUILD_ARCHIVE" ] && { echo "can't find packdrake"; exit 1; }
if [ $EUID != "0" ]; then