SVN: bootdisk/trunk/Makefile.am

[hawk]

Author: hawk
Date: Thu Apr  5 00:02:34 2007
New Revision: 8428

Modified:
   bootdisk/trunk/Makefile.am
Log:
- added addons4 disk
- adjustements necessary for support squashfs in mkinstaller


Modified: bootdisk/trunk/Makefile.am
==============================================================================
--- bootdisk/trunk/Makefile.am	(original)
+++ bootdisk/trunk/Makefile.am	Thu Apr  5 00:02:34 2007
@@ -1,8 +1,8 @@
 # These parameters are configurable (preferably from make(1) command line)
 # the name of dir in <arch> subtree
 # example: /PLD/installer/2.4-experimental
-INSTALLER_DIR := /PLD/inst/2.4.32-experimental
-KERNEL_VER := 2.4.32-4BOOT
+INSTALLER_DIR := /PLD/inst/2.4.34
+KERNEL_VER := 2.4.34-1BOOT
 FTP_DIST_DIR := /dists/2.0/PLD
 # as for now:
 # 2 - 2.2.*
@@ -20,7 +20,8 @@
 ADDONS := \
 	addons1.img \
 	addons2.img \
-	addons3.img
+	addons3.img \
+	addons4.img
 
 	
 ADDONS1_MODS := \
@@ -28,8 +29,7 @@
 	arcnet \
 	pcmcia \
 	eth \
-	eth-gbit \
-	tr
+	eth-gbit
 
 ADDONS2_MODS := \
 	hdraid \
@@ -41,19 +41,25 @@
 	jfs \
 	reiserfs \
 	vfat \
-	$(shell if [ $(KERNEL_VERCODE) -gt 2 ] ; then echo ext3 xfs ; fi) 
+	ext2 \
+	ext3 \
+	xfs
 
 ADDONS3_MODS := \
 	scsi \
 	scsi-low \
 	i2o \
 	mpt \
-	parport \
 	usb
+
+ADDONS4_MODS := \
+	scsi-low-big \
+	serial
 	
 ADDONS1_MODS_TBZ2 := $(patsubst %,mod/%-mod.tar.bz2, $(ADDONS1_MODS))
 ADDONS2_MODS_TBZ2 := $(patsubst %,mod/%-mod.tar.bz2, $(ADDONS2_MODS))
 ADDONS3_MODS_TBZ2 := $(patsubst %,mod/%-mod.tar.bz2, $(ADDONS3_MODS))
+ADDONS4_MODS_TBZ2 := $(patsubst %,mod/%-mod.tar.bz2, $(ADDONS4_MODS))
 
 TOPDIR := $(shell pwd)
 MY_ROOT = $(DESTDIR)/usr/lib/bootdisk/tarbz2
@@ -115,7 +121,7 @@
 
 mkinstaller-clean:
 	rm -rf floppy kernel mkinstaller-local tmp-etc 
-	rm -f config/{dev_gen{ext2fs,romfs},mkinstaller.conf} initrd_*
+	rm -f config/{dev_gen{ext2fs,romfs},dev_make,mkinstaller.conf} initrd_*
 
 pkgs-clean:
 	rm -f installer-rc
@@ -163,6 +169,14 @@
 	genext2fs -r 0 -i 40 -b 1440 -d addons3-root addons3.img
 	rm -rf addons3-root
 
+addons4.img: Makefile.am $(ADDONS4_MODS_TBZ2)
+	rm -rf addons4-root
+	mkdir addons4-root
+	install -d addons4-root$(INSTALLER_DIR)
+	install -m 644 $(ADDONS4_MODS_TBZ2) addons4-root$(INSTALLER_DIR)
+	genext2fs -r 0 -i 40 -b 1440 -d addons4-root addons4.img
+	rm -rf addons4-root
+
 lists-pkg:
 	rm -rf $@-root/*
 	install -d $@-root/etc/lists.{packages,addons}
@@ -180,6 +194,9 @@
 	for i in $(ADDONS3_MODS); do \
 		echo $$i-mod >>$@-root/etc/lists.addons/3 ; \
 	done
+	for i in $(ADDONS4_MODS); do \
+		echo $$i-mod >>$@-root/etc/lists.addons/4 ; \
+	done
 	
 
 .PHONY: install-user 
@@ -197,12 +214,12 @@
 		ls -l testfile.tar | awk '{ print $$5 }'; rm testfile.tar`" >> config/mkinstaller.conf
 	echo "safe_area=500000" >> config/mkinstaller.conf
 	
-mkinstaller-local: config/dev_genext2fs config/dev_genromfs config/mkinstaller.conf
+mkinstaller-local: config/dev_make config/dev_genext2fs config/dev_genromfs config/mkinstaller.conf
 	rm -rf tarbz2
 	mkdir tarbz2
 	cp pkg/*.tar.bz2 mod/*.tar.bz2 tarbz2
 	mkdir tarbz2/config
-	cp config/dev_genext2fs config/dev_genromfs config/mkinstaller.conf tarbz2/config
+	cp config/dev_make config/dev_genext2fs config/dev_genromfs config/mkinstaller.conf tarbz2/config
 	mkdir -p tarbz2/floppy
 	install -m 644 doc/f1.txt config/syslinux.cfg tarbz2/floppy
 	install -m 644 doc/logo/logo.pld-baggins tarbz2/floppy/logo.pld
@@ -224,7 +241,7 @@
 install-user: mkinstaller-local install-ui
 	install -d $(MY_ROOT)/{config,floppy,kernel}
 	install -m 644 $(PKGS_TBZ2) $(MODS_TBZ2) $(MY_ROOT)
-	install -m 644 config/{dev_gen{ext2fs,romfs},mkinstaller.conf} $(MY_ROOT)/config
+	install -m 644 config/{dev_gen{ext2fs,romfs},dev_make,mkinstaller.conf} $(MY_ROOT)/config
 	install -m 644 floppy/* $(MY_ROOT)/floppy
 	install -m 644 $(ROOT)/boot/vmlinuz-$(KERNEL_VER) $(MY_ROOT)/kernel
 	install -d $(DESTDIR)/usr/bin