malekith: bootdisk Makefile.am,1.109,1.110, configure.in,1.11,1.12, mkimages,1.6,1.7

Michał Moskal malekith w pld-linux.org
Pon, 18 Mar 2002, 10:29:04 CET 

Module name:    bootdisk
Changes by:     malekith

Changed RCS file: /cvsroot/bootdisk/Makefile.am,v
----------------------------
revision 1.110
date: 2002/03/18 09:28:59;  author: malekith;  state: Exp;  lines: +70 -476
- new build system (using uc-chroot built binaries)
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/bootdisk/Makefile.am,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- Makefile.am	20 Feb 2002 17:40:20 -0000	1.109
+++ Makefile.am	18 Mar 2002 09:28:59 -0000	1.110
@@ -2,81 +2,18 @@
 # the name of dir in <arch> subtree
 # example: /PLD/installer/2.4-experimental
 INSTALLER_DIR := /PLD/inst/pkg
-KERNEL_VER := 2.2.20
+KERNEL_VER := 2.4.7
 FTP_DIST_DIR := /dists/ra/PLD
 # as for now:
 # 2 - 2.2.*
 # 4 - 2.4.*
 # this is used to detect whatever to build ext3 etc stuff
-KERNEL_VERCODE := 2
+KERNEL_VERCODE := 4
 # end of configurable parameters
 
-SUBDIRS=batch-installer
-
-EXTRA_DIST=scripts doc config modules-list
-
-ROOT:=/usr/lib/bootdisk
-
-BOOTDISK_TYPES := \
-	ide \
-	net_eth \
-	scsi \
-	pcmcia \
-	iso
-
-# lists-pkg must be the last one:
-PKGS := \
-	ext2 \
-	fdisk \
- 	libc \
-	msdos \
-	net \
-	parted \
-	pci \
-	pcmcia \
-	poldek \
-	reiserfs \
-	jfs \
-	root \
-	rpm \
-	trace \
-	ui \
-	wuch \
-	md \
-	lists \
-	$(shell if [ $(KERNEL_VERCODE) -gt 2 ] ; then echo xfs ; fi)
-
-
-MODS := \
-	eth \
-	cdrom \
-	tr \
-	parport \
-	reiserfs \
-	jfs \
-	nfs \
-	arcnet \
-	md \
-	scsi-low \
-	scsi \
-	vfat \
-	floppy \
-	eth-gbit \
-	old-cdrom \
-	ide \
-	pcmcia \
-	af_packet \
-	ipv6 \
-	hdraid \
-	i2o \
-	usb \
-	$(shell if [ $(KERNEL_VERCODE) -gt 2 ] ; then echo ext3 xfs ; fi)
-
-######################################
-
-BOOTDISKS := $(patsubst %,bootdisk_%.img,$(BOOTDISK_TYPES))
-BOOTDISKS_TXT := $(patsubst %,bootdisk_%.txt,$(BOOTDISK_TYPES))
+SUBDIRS = batch-installer mod pkg
 
+EXTRA_DIST = scripts doc config modules-list
 
 ADDONS := \
 	addons1.img \
@@ -106,188 +43,83 @@
 	$(shell if [ $(KERNEL_VERCODE) -gt 2 ] ; then echo ext3 xfs ; fi) \
 	scsi-low 
 	
-ADDONS3_MODS := 
-
-BATCH_INSTALLER_FILES := \
-	batch-installer/setup batch-installer/installer \
-	batch-installer/load-config \
-	$(addprefix batch-installer/installer-, functions prep validate dest pkgs boot conf raid-functions)
-
-ADDONS1_PKGS_TGZ := $(addsuffix -pkg.tar.gz, $(ADDONS1_PKGS))
-ADDONS1_MODS_TGZ := $(addsuffix -mod.tar.gz, $(ADDONS1_MODS))
-
-ADDONS2_PKGS_TGZ := $(addsuffix -pkg.tar.gz, $(ADDONS2_PKGS))
-ADDONS2_MODS_TGZ := $(addsuffix -mod.tar.gz, $(ADDONS2_MODS))
-
-ADDONS3_PKGS_TGZ := $(addsuffix -pkg.tar.gz, $(ADDONS3_PKGS))
-ADDONS3_MODS_TGZ := $(addsuffix -mod.tar.gz, $(ADDONS3_MODS))
-
-MODS_TGZ := $(addsuffix .tar.gz, $(addsuffix -mod, $(MODS)))
-PKGS_TGZ := $(addsuffix .tar.gz, $(addsuffix -pkg, $(PKGS)))
-PACKAGES_TGZ := $(MODS_TGZ) $(PKGS_TGZ)
+ADDONS1_MODS_TGZ := $(patsubst %,mod/%-mod.tar.gz, $(ADDONS1_MODS))
+ADDONS2_MODS_TGZ := $(patsubst %,mod/%-mod.tar.gz, $(ADDONS2_MODS))
 
 TOPDIR := $(shell pwd)
 MY_ROOT = $(DESTDIR)/usr/lib/bootdisk/targz
 
-.PHONY: all addons packages cycle prep clean $(PKGS) $(MODS)
-
 # main targets
 
-all: checktools rmpkgs packages lists bootdisks addons buildlog.txt
-
-buildlog.txt: bootdisk_net.img
-	cat boot*txt > buildlog.txt
-
-rmpkgs:
-	rm -f ui-pkg.tar.gz root-pkg.tar.gz
-
-clean: initrds-clean addons-clean packages-clean \
-       bootdisks-clean mkinstaller-clean
-
-
-cycle: dist-clean prep all
-
+all: checktools all-batch-installer modules lists-pkg packages \
+     bootdisks addons buildlog.txt
 
-# subtargets
 NEEDED_PACKAGES = \
-	genext2fs dosfstools syslinux mtools gettext-devel ash-BOOT \
-	e3-BOOT iproute2-BOOT dhcpcd-BOOT snarf-BOOT dml-BOOT parted-BOOT \
-	poldek-BOOT e2fsprogs-BOOT reiserfsprogs-BOOT jfsutils-BOOT \
-	wuch-BOOT pcmcia-cs-BOOT pciutils strace ltrace mdctl-BOOT \
-	busybox-BOOT util-linux-BOOT jfsutils-BOOT xfsprogs-BOOT rpm-4.0.2
-#kernel-BOOT-$(KERNEL_VER)
+	genext2fs dosfstools syslinux mtools gettext-devel 
+
+all-recursive:
+	:
 
+# give me a breake with informative message, we would have to explain
+# building stuff in chroot too
 checktools:
-	@echo -n "Checking tools ."
-	@for pkg in $(NEEDED_PACAKGES) ; do \
-		echo -n "."; \
-		if rpm -q "$$pkg" > /dev/null 2>&1 ; then true ; else \
-			echo ""; \
-			echo "Not found installed rpm package: $$pkg\n"; \
-			echo "You must have installed this package.\n"; \
-			echo "Look at ftp://ftp.pld.org.pl/PLD-1.0/<arch>/PLD/{RPMS,BOOT}/\n"; \
-			exit 1; \
-		fi; \
-	done
-	@test -d $(ROOT)/lib/modules/$(KERNEL_VER) || { \
+	@if rpm -q $(NEEDED_PACKAGES) > /dev/null ; then : ; \
+	else rpm -q $(NEEDED_PACKAGES) ; fi
+	@test -d /usr/lib/bootdisk/lib/modules/$(KERNEL_VER) || { \
 		echo "Cannot find modules for $(KERNEL_VER) kernel." ; \
 		exit 1 ; }
-	@echo "OK"
-	touch checktools
+	@echo "tools seems OK"
 
-packages: $(PACKAGES_TGZ)
+all-batch-installer:
+	$(MAKE) -C batch-installer
+
+modules:
+	$(MAKE) -C mod
+
+packages:
+	$(MAKE) -C pkg
 
 bootdisks: bootdisk-stamp
 
-bootdisk-stamp: mkinstaller-local $(PACKAGES_TGZ)
+buildlog.txt: bootdisk_net.img
+	cat boot*txt > buildlog.txt
+	rm boot*txt
+
+bootdisk-stamp: pkg/root-pkg.tar.gz mod/eth-mod.tar.gz mkinstaller-local
 	FTP_DIST_DIR="$(FTP_DIST_DIR)" sh mkimages
 	touch bootdisk-stamp
 
 addons: $(ADDONS)
 
-bootdisks-clean:
-	rm -f bootdisk*.img bootdisk*.txt bootdisk-stamp checktools
 
-packages-clean:
-	rm -f  $(PACKAGES_TGZ) *.tar.gz
-	rm -fr $(addsuffix -pkg-root, $(PKGS)) mod-root
+####### cleanup #############
+
+clean-local: bootdisks-clean addons-clean mkinstaller-clean pkgs-clean
+
+bootdisks-clean:
+	rm -f bootdisk*.img bootdisk*.txt bootdisk-stamp buildlog.txt
 
 addons-clean:
 	rm -f  $(ADDONS)
 	rm -fr $(patsubst %.img,%-root, $(ADDONS))
 
-initrds-clean:
-	rm -rf initrd.gz initrd-root
-
 mkinstaller-clean:
-	rm -rf floppy kernel mkinstaller-local tmp-etc
+	rm -rf floppy kernel mkinstaller-local tmp-etc 
 	rm -f config/{dev_genext2fs,mkinstaller.conf}
 
+pkgs-clean:
+	rm -f installer-rc
+	rm -rf lists-pkg-root targz
 
-######################## initrd #########################
-
-# basic initrd stuff to be copied as a base of another initrds
-root-pkg:
-	rm -rf $@-root
-	mkdir $@-root
-#	directories
-	install -d $@-root/{bin,etc,lib/modules/$(KERNEL_VER),mnt,proc,doc/coinst,usr,var/{run,log},tmp,src,dest}
-	ln -sf . $@-root/lib/modules/$(KERNEL_VER)/misc
-	ln -sf bin $@-root/sbin
-	ln -sf ../bin $@-root/usr/bin
-	ln -sf ../bin $@-root/usr/sbin
-	ln -sf ../lib $@-root/usr/lib
-#	tools
-	cp -a $(ROOT)/bin/e3* $@-root/bin
-	cp -a $(ROOT)/bin/{emacs,vi,ws,pico,ne,editor.sh} $@-root/bin
-	cp -a $(ROOT)/bin/{ash,sh} $@-root/bin
-	cp -a $(ROOT)/bin/busybox $@-root/bin
-	cp -a `ls -la $(ROOT)/bin | grep ' -> busybox' | sed 's/ ->.*//' | sed 's w .* @$(ROOT)/bin/@'` $@-root/bin
-#	scripts
-	install -m 755 scripts/rc $@-root/etc
-	install -m 755 scripts/HOWTO.sh $@-root/bin/howto
-	install -m 755 scripts/modprobe $@-root/bin
-	install -m 755 scripts/vfjuggle $@-root/bin
-	install -m 755 scripts/init-wrapper $@-root/bin
-	install -m 755 scripts/shell $@-root/bin
-#	config
+installer-rc: force
 	( echo 'INSTALLER_DIR="$(INSTALLER_DIR)"' ; \
 	  echo 'KERNEL_VER="$(KERNEL_VER)"' ; \
 	  echo 'KERNEL_VERCODE="$(KERNEL_VERCODE)"' ; \
-	  echo 'FTP_DIST_DIR="$(FTP_DIST_DIR)"' ) > $@-root/etc/installer-rc
-	install -m 644 config/fstab $@-root/etc
-	install -m 644 config/mtab $@-root/etc
-	install -m 644 config/inittab $@-root/etc
-	install -m 644 config/ld.so.conf $@-root/etc
-	install -m 644 config/group $@-root/etc
-	install -m 644 config/nsswitch.conf $@-root/etc
-	install -m 644 config/passwd $@-root/etc
-	install -m 644 config/protocols $@-root/etc
-	install -m 644 config/services $@-root/etc
-	install -m 644 config/motd     $@-root/etc/motd.en
-	install -m 644 config/motd.bye $@-root/etc/motd.bye.en
-	ln -sf motd.en  $@-root/etc/motd
-	ln -sf motd.bye.en $@-root/etc/motd.bye
-	install -m 644 config/motd*.pl $@-root/etc/
-	perl -pi -e "s/\@builddate\@/`date '+%Y%m%d'`/g" $@-root/etc/motd.*
-	install -m 644 config/modules.dep $@-root/etc/
-#	install -m 755 config/linuxrc $@-root/
-#	docs
-	install -m 644 doc/devices.txt $@-root/doc
-	install -m 644 doc/install-HOWTO $@-root/doc
-#	TODO
-#	install -m 644 doc/install-HOWTO.pl $@-root/doc
-#	autodetection tool
-	sed -e 's@^datafile=.*@datafile=/etc/sh-scan-pci.list-net@' \
-		batch-installer/pci/sh-scan-pci > $@-root/bin/detect-net-devices
-	chmod 755 $@-root/bin/detect-net-devices
-	sed -e 's@^datafile=.*@datafile=/etc/sh-scan-pci.list-scsi@' \
-		batch-installer/pci/sh-scan-pci > $@-root/bin/detect-scsi-devices
-	chmod 755 $@-root/bin/detect-scsi-devices
-	install -m 644 batch-installer/pci/sh-scan-pci.list-{net,scsi} $@-root/etc
-#	batch-installer
-	install -m 755 $(BATCH_INSTALLER_FILES) $@-root/bin
-	ln -s load-config	 $@-root/bin/save-config
-	ln -s installer-prep     $@-root/bin/load_package
-	ln -s installer-prep     $@-root/bin/load_module
-	ln -s installer-prep     $@-root/bin/installer-prep-source
-	ln -s installer-validate $@-root/bin/installer-validate-source
-	ln -s installer-validate $@-root/bin/installer-validate-draft
-#	fonts and maps
-	install -d $@-root/usr/share/fonts
-	install -m 644 config/lat2-16.psfu.gz $@-root/usr/share/fonts/l2.psfu.gz
-#	install -m 644 /usr/share/kbd/consoletrans/8859-2* $@-root/usr/share/fonts/
-#	initial configs
-	install batch-installer/installer.conf	  $@-root/etc/installer.conf
-	install batch-installer/ui/data/groups	  $@-root/etc/installer.groups
-	install batch-installer/installer.sysconf $@-root/etc/installer.sysconf
-#	pkgsets:
-	install -d $@-root/etc/installer.pkgsets
-	cd batch-installer; sh mkallpkgsets ../$@-root/etc/installer.pkgsets
-	install $@-root/etc/installer.pkgsets/basic $@-root/etc/installer.pkgs
+	  echo 'FTP_DIST_DIR="$(FTP_DIST_DIR)"' ) > installer-rc
 
-# force remake if we change installer files, ideally we should add more things here
-root-pkg.tar.gz: $(BATCH_INSTALLER_FILES)
+.PHONY: force
+
+force:
 
 # make list of devices
 config/dev_genext2fs: config/dev_make scripts/dev2genext
@@ -295,268 +127,29 @@
 
 ######################## addons and lists #########################
 
-addons1.img: Makefile.am $(ADDONS1_MODS_TGZ) $(ADDONS1_PKGS_TGZ)
+addons1.img: Makefile.am $(ADDONS1_MODS_TGZ)
 	rm -rf addons1-root
 	mkdir addons1-root
 	install -d addons1-root$(INSTALLER_DIR)
-	install -m 644 $(ADDONS1_MODS_TGZ) $(ADDONS1_PKGS_TGZ) addons1-root$(INSTALLER_DIR)
+	install -m 644 $(ADDONS1_MODS_TGZ) addons1-root$(INSTALLER_DIR)
 	genext2fs -r 0 -i 40 -b 1440 -d addons1-root addons1.img
 	rm -rf addons1-root
 
-
-addons2.img: Makefile.am $(ADDONS2_MODS_TGZ) $(ADDONS2_PKGS_TGZ)
+addons2.img: Makefile.am $(ADDONS2_MODS_TGZ)
 	rm -rf addons2-root
 	mkdir addons2-root
 	install -d addons2-root$(INSTALLER_DIR)
-	install -m 644 $(ADDONS2_MODS_TGZ) $(ADDONS2_PKGS_TGZ) addons2-root$(INSTALLER_DIR)
+	install -m 644 $(ADDONS2_MODS_TGZ) addons2-root$(INSTALLER_DIR)
 	genext2fs -r 0 -i 40 -b 1440 -d addons2-root addons2.img
 	rm -rf addons2-root
 
-addons3.img: Makefile.am $(ADDONS3_MODS_TGZ) $(ADDONS3_PKGS_TGZ)
-	rm -rf addons3-root
-	mkdir addons3-root
-	install -d addons3-root$(INSTALLER_DIR)
-	install -m 644 $(ADDONS3_MODS_TGZ) $(ADDONS3_PKGS_TGZ) addons3-root$(INSTALLER_DIR)
-	genext2fs -r 0 -i 40 -b 1440 -d addons3-root addons3.img
-	rm -rf addons3-root
-
-
-######################## modules #########################
-
-AF_PACKET_MODS := af_packet.o
-ARCNET_MODS := arc-rimi.o arcnet.o com20020.o com90io.o com90xx.o
-CDROM_MODS := cdrom.o isofs.o
-ETH_GBIT_MODS := acenic.o hamachi.o sk98lin.o yellowfin.o
-ETH_MODS := \
-	3c501.o 3c503.o 3c505.o 3c507.o 3c509.o 3c515.o 3c59x.o 8139too.o \
-	82596.o 8390.o ac3200.o at1700.o cs89x0.o de4x5.o depca.o dmfe.o \
-	e2100.o eepro.o eepro100.o eexpress.o epic100.o es3210.o eth16i.o \
-	ewrk3.o fmv18x.o hp-plus.o hp.o hp100.o lance.o lne390.o ne.o \
-	ne2k-pci.o ne3210.o ni5010.o ni52.o ni65.o old_tulip.o pcnet32.o \
-	rtl8139.o sis900.o smc-ultra.o smc-ultra32.o smc9194.o tlan.o \
-	tulip.o via-rhine.o wd.o
-FLOPPY_MODS := floppy.o
-HDRAID_MODS := DAC960.o cciss.o cpqarray.o
-IDE_MODS := ide-cd.o ide-disk.o ide-mod.o ide-probe-mod.o
-IPV6_MODS := ipv6.o
-JFS_MODS := jfs.o
-MD_MODS := linear.o raid0.o raid1.o raid5.o $(shell if [ $(KERNEL_VERCODE) -gt 2 ] ; then echo md.o ; fi)
-NFS_MODS := lockd.o nfs.o sunrpc.o
-OLD_CDROM_MODS := \
-	aztcd.o cdu31a.o cm206.o gscd.o isp16.o mcd.o mcdx.o optcd.o sbpcd.o \
-	sjcd.o sonycd535.o
-PARPORT_MODS := parport.o parport_pc.o
-PCMCIA_MODS := \
-	3c574_cs.o 3c575_cb.o 3c589_cs.o 8390.o aha152x_cs.o airo.o airo_cs.o \
-	apa1480_cb.o axnet_cs.o cb_enabler.o ds.o dummy_cs.o eepro100_cb.o \
-	epic_cb.o fdomain_cs.o fmvj18x_cs.o ftl_cs.o i82365.o ibmtr_cs.o \
-	ide_cs.o iflash2+_mtd.o iflash2_mtd.o memory_cb.o memory_cs.o \
-	netwave_cs.o nmclan_cs.o ohci1394_cb.o parport_cs.o pcilynx_cb.o \
-	pcmcia_core.o pcnet_cs.o qlogic_cs.o ray_cs.o serial_cb.o serial_cs.o \
-	smc91c92_cs.o sram_mtd.o tcic.o tulip_cb.o wavelan_cs.o wvlan_cs.o \
-	xirc2ps_cs.o 8390.o
-REISERFS_MODS := reiserfs.o
-SCSI_LOW_MODS := \
-	3w-xxxx.o 53c7,8xx.o AM53C974.o BusLogic.o NCR53c406a.o a100u2w.o \
-	advansys.o aha152x.o aha1542.o aha1740.o aic7xxx.o atp870u.o dtc.o \
-	eata.o eata_pio.o fdomain.o g_NCR5380.o gdth.o imm.o in2000.o \
-	initio.o ips.o megaraid.o ncr53c8xx.o pas16.o pci2000.o pci2220i.o \
-	ppa.o psi240i.o qlogicfas.o qlogicfc.o qlogicisp.o scsi-low.list.in \
-	seagate.o sim710.o sym53c416.o sym53c8xx.o t128.o tmscsim.o u14-34f.o \
-	ultrastor.o wd7000.o
-SCSI_MODS := scsi_mod.o sd_mod.o sg.o sr_mod.o
-TR_MODS := ibmtr.o lanstreamer.o olympic.o sktr.o
-VFAT_MODS := fat.o floppy.o vfat.o
-I2O_MODS := $(patsubst %, i2o_%.o, core proc block scsi pci)
-USB_MODS := usbcore.o usb-ohci.o usb-uhci.o
-
-# 2.4.* :
-
-EXT3_MODS := jbd.o ext3.o
-XFS_MODS := xfs.o xfs_support.o
-
-# tar packages
-%-pkg.tar.gz:
-	rm -rf $*-pkg-root
-	install -d $*-pkg-root
-	make $*-pkg
-	tar czf $@ -C $*-pkg-root .
-	if [ "$*" != root ] ; then rm -rf $*-pkg-root ; fi
-
-# tar modules
-%-mod.tar.gz:
-	@echo "Making $* modules..."
-	rm -rf mod-root
-	install -d mod-root
-	$(MAKE) MODULE_FILES="$($(shell echo $*-mods | tr "a-z-" "A-Z_"))" copy-mods
-	(cd mod-root; tar czf ../$@ *)
-	rm -rf mod-root
-
-# next two targets are tricky, they get called uppon recursive make
-# execution. 
-# copy-mods copies modules specified by $(MODULE_FILES) parameter
-# basic-pkg-setup copies files to $(PKG_ROOT)/something
-#  BIN_FILES       gets simply copied $(PKG_ROOT)/bin
-#  ROOT_SBIN_FILES contains list of files in $(ROOT)/sbin, 
-#                  that get copied to $(PKG_ROOT)/bin
-#  DEST_BIN_FILES  contains list of files to be copied to 
-#                  $(PKG_ROOT)/dest/installer/bin
-
-copy-mods:
-	re="" ; \
-	for f in $(MODULE_FILES) ; do re="$$re/$$f|" ; done ; \
-	re="$${re}wontgonnafindme\$$" ; \
-	install -m 644 `find $(ROOT)/lib/modules/$(KERNEL_VER)/* | egrep "$$re"` mod-root
-#	for f in $(MODULE_FILES) ; do \
-#		test -f mod-root/$$f || { echo "$$f not found"; exit 1; } ; \
-#	done
-
-basic-pkg-setup:
-	if test -n "$(BIN_FILES)" ; then \
-		install -d $(PKG_ROOT)/bin && \
-		install $(BIN_FILES) $(PKG_ROOT)/bin && \
-		chmod 755 $(PKG_ROOT)/bin/* ; \
-	fi
-	if test -n "$(DEST_BIN_FILES)" ; then \
-		install -d $(PKG_ROOT)/{,dest/installer/}bin && \
-		install $(DEST_BIN_FILES) $(PKG_ROOT)/dest/installer/bin && \
-		chmod 755 $(PKG_ROOT)/dest/installer/bin/* && \
-		install -d $(PKG_ROOT)/bin && \
-		cd $(PKG_ROOT)/bin && \
-		ln -s ../dest/installer/bin/* . ; \
-	fi
-	if test -n "$(ROOT_SBIN_FILES)" ; then \
-		install -d $(PKG_ROOT)/bin && \
-		install $(addprefix $(ROOT)/sbin/, $(ROOT_SBIN_FILES)) $(PKG_ROOT)/bin && \
-		chmod 755 $(PKG_ROOT)/bin/* ; \
-	fi
-
-BASIC = $(MAKE) PKG_ROOT="$@-root" basic-pkg-setup
-
-######################## packages #########################
-# simple packages, just copy few files from $(ROOT)/sbin to x-root/bin/
-fdisk-pkg:
-	$(BASIC) ROOT_SBIN_FILES="fdisk badblocks"
-
-ext2-pkg:
-	$(BASIC) ROOT_SBIN_FILES="mke2fs"
-
-md-pkg:
-	$(BASIC) ROOT_SBIN_FILES="mdctl"
-
-reiserfs-pkg:
-	$(BASIC) ROOT_SBIN_FILES="mkreiserfs"
-
-jfs-pkg:
-	$(BASIC) ROOT_SBIN_FILES="mkfs.jfs"
-
-xfs-pkg:
-	$(BASIC) ROOT_SBIN_FILES="mkfs.xfs"
-
-net-pkg:
-	$(BASIC) ROOT_SBIN_FILES="ip snarf dhcpcd" BIN_FILES="scripts/shirc scripts/pldbug"
-	
-parted-pkg:
-	$(BASIC) ROOT_SBIN_FILES="parted"
-
-# this one is somewhat more complicated...
-pcmcia-pkg:
-# pcinitrd pack_cis dump_cis ftl_check ftl_format setpnp lspnp
-	$(BASIC) \
-		ROOT_SBIN_FILES="cardmgr cardctl probe ide_info scsi_info ifport ifuser"
-	install -d $@-root/{etc/pcmcia,var/lib/pcmcia,usr/bin,var/run}
-	cp -a $(ROOT)/etc/pcmcia/ $@-root/etc
-	rm -f $@-root/etc/pcmcia/network*
-	install config/pcmcia-network $@-root/etc/pcmcia/network
-	
-ui-pkg:
-	install -d $@-root/{bin,etc}
-#	terminfo for dml
-	install -d $@-root/usr/share/terminfo/{l,v}
-	install -m 644 /usr/share/terminfo/l/linux $@-root/usr/share/terminfo/l
-	install -m 644 /usr/share/terminfo/v/vt100 $@-root/usr/share/terminfo/v
-	ln -s vt100 $@-root/usr/share/terminfo/v/vt102
-#	ui for batch-installer
-	install -m 755 batch-installer/ui/ui-{functions,main,makeform,pkgs,conf,parted,dialogs,parted2,wizard} \
-		$@-root/bin
-#	cp -a batch-installer/ui/data $@-root/usr/lib/ui
-#	find $@-root/usr/lib/ui/data -name CVS | xargs rm -rf
-#	localization
-	install -d $@-root/usr/lib/installer
-	for i in $(CATALOGS); do \
-		install batch-installer/po/$$i $@-root/usr/lib/installer/`basename $$i .gmo`.mo ; \
-	done
-	install -m 755 $(ROOT)/bin/dml $@-root/bin/dml
-	install -m 644 config/dml.conf $@-root/etc
-#	device descriptions
-	install -d $@-root/etc
-	install -m 644 modules-list/eth.list.in $@-root/etc
-	install -m 644 modules-list/scsi-low.list.in $@-root/etc
-
-# pacakges that goes to tmp directory on /dest
-libc-pkg:
-#	poldek must have this 
-	install -d $@-root/dest/installer/lib
-	install -d $@-root/dest/installer/tmp
-	install -m 755 /lib/libc.so.6 $@-root/dest/installer/lib
-	install -m 755 /lib/ld-linux.so.2 $@-root/dest/installer/lib
-	install -m 755 /lib/libnss_files.so.2 $@-root/dest/installer/lib
-	install -m 755 /lib/libnss_dns.so.2 $@-root/dest/installer/lib
-	install -m 755 /lib/libresolv.so.2 $@-root/dest/installer/lib
-	install -m 755 /lib/libdl.so.2 $@-root/dest/installer/lib
-	install -m 755 /lib/libnsl.so.1 $@-root/dest/installer/lib
-#	install -m 755 /lib/libz.so.1 $@-root/dest/installer/lib
-#	some links
-	install -d $@-root/lib
-	( cd $@-root/lib; ln -s ../dest/installer/lib/* . ; )
-
-rpm-pkg:
-	install -d $@-root/dest/usr/lib/rpm
-	install -d $@-root/dest/var/lib/rpm
-	rpm -r `pwd`/$@-root/dest/var/lib/rpm --dbpath / --initdb
-	install -m 644 $@-root/dest/var/lib/rpm/{Packages,Basenames}
-	install -m 644 $@-root/dest/var/lib/rpm/{Packages,Conflictname}
-	install -m 644 $@-root/dest/var/lib/rpm/{Packages,Group}
-	install -m 644 $@-root/dest/var/lib/rpm/{Packages,Name}
-	install -m 644 $@-root/dest/var/lib/rpm/{Packages,Providename}
-	install -m 644 $@-root/dest/var/lib/rpm/{Packages,Requirename}
-	install -m 644 $@-root/dest/var/lib/rpm/{Packages,Triggername}
-	install -m 644 config/{macros,rpmrc,rpmpopt-4.0} $@-root/dest/usr/lib/rpm
-	install -d $@-root/usr/lib
-	install -d $@-root/var/lib
-	ln -s /dest/usr/lib/rpm $@-root/usr/lib/rpm
-	ln -s /dest/var/lib/rpm $@-root/var/lib/rpm
-#	rpm itself
-	install -d $@-root/dest/installer/bin
-	install /bin/rpm $@-root/dest/installer/bin
-	
-pci-pkg:
-	install -d $@-root/{usr/{bin,share/misc},tmp}
-	install -m 644 /usr/share/misc/pci.ids $@-root/usr/share/misc
-	$(BASIC) DEST_BIN_FILES="/sbin/lspci"
-
-poldek-pkg:
-	$(BASIC) DEST_BIN_FILES="$(ROOT)/sbin/poldek"
-	
-wuch-pkg:
-	$(BASIC) DEST_BIN_FILES="$(ROOT)/sbin/wuch"
-
-# gotta make strace-BOOT, ltrace will go to /dev/drzewo I think...
-trace-pkg:
-	$(BASIC) DEST_BIN_FILES="/usr/bin/strace /usr/bin/ltrace"
-	
-# ditto
-pnp-pkg:
-	$(BASIC) DEST_BIN_FILES="/sbin/pnpdump /sbin/isapnp"
-
-msdos-pkg:
-	$(BASIC) DEST_BIN_FILES="/sbin/mkdosfs"
-
 lists-pkg:
 	rm -rf $@-root/*
 	install -d $@-root/etc/lists.{packages,addons}
-	for i in $(MODS); do \
-		tar tzf $$i-mod.tar.gz >$@-root/etc/lists.packages/$$i-mod ; \
+	for i in mod/*-mod.tar.gz ; do \
+		tar tzf $$i > \
+			$@-root/etc/lists.packages/`echo $$i | \
+				sed -e 's|mod/||; s|.tar.gz||'` ; \
 	done
 	for i in $(ADDONS1_MODS); do \
 		echo $$i-mod >>$@-root/etc/lists.addons/1 ; \
@@ -564,33 +157,34 @@
 	for i in $(ADDONS2_MODS); do \
 		echo $$i-mod >>$@-root/etc/lists.addons/2 ; \
 	done
-	for i in $(ADDONS3_MODS); do \
-		echo $$i-mod >>$@-root/etc/lists.addons/3 ; \
-	done
 	
 
 .PHONY: install-user 
 
 # prepare for using mkinstaller in this build directory
 
-config/mkinstaller.conf: Makefile $(addsuffix -pkg.tar.gz, ext2 parted reiserfs)
+config/mkinstaller.conf: Makefile \
+		$(patsubst %,pkg/%-pkg.tar.gz, ext2 parted reiserfs)
 	echo "kernel_ver=$(KERNEL_VER)" > config/mkinstaller.conf
-	echo "ext2_pkg_size=`gzip -l ext2-pkg.tar.gz | tail -1 \
+	echo "ext2_pkg_size=`gzip -l pkg/ext2-pkg.tar.gz | tail -1 \
 		| sed -e 's/ *[0-9]* *//; s/  *.*//'`" >> config/mkinstaller.conf
-	echo "parted_pkg_size=`gzip -l parted-pkg.tar.gz | tail -1 \
+	echo "parted_pkg_size=`gzip -l pkg/parted-pkg.tar.gz | tail -1 \
 		| sed -e 's/ *[0-9]* *//; s/  *.*//'`" >> config/mkinstaller.conf
-	echo "reiserfs_pkg_size=`gzip -l reiserfs-pkg.tar.gz | tail -1 \
+	echo "reiserfs_pkg_size=`gzip -l pkg/reiserfs-pkg.tar.gz | tail -1 \
 		| sed -e 's/ *[0-9]* *//; s/  *.*//'`" >> config/mkinstaller.conf
 	echo "safe_area=1000000" >> config/mkinstaller.conf
 	
-mkinstaller-local: $(PACKAGES_TGZ) config/dev_genext2fs config/mkinstaller.conf
-	mkdir -p floppy
-	install -m 644 doc/f1.txt config/syslinux.cfg floppy
-	install -m 644 doc/logo/logo.pld-baggins floppy/logo.pld
-	install -m 644 /usr/lib/syslinux/ldlinux.sys floppy/
-	rm -f kernel
-	ln -s /usr/lib/bootdisk/boot kernel
-	touch mkinstaller-local
+mkinstaller-local: config/dev_genext2fs config/mkinstaller.conf
+	rm -rf targz
+	mkdir targz
+	cp pkg/*.tar.gz mod/*.tar.gz targz
+	mkdir targz/config
+	cp config/dev_genext2fs config/mkinstaller.conf targz/config
+	mkdir -p targz/floppy
+	install -m 644 doc/f1.txt config/syslinux.cfg targz/floppy
+	install -m 644 doc/logo/logo.pld-baggins targz/floppy/logo.pld
+	install -m 644 /usr/lib/syslinux/ldlinux.sys targz/floppy/
+	ln -s /usr/lib/bootdisk/boot targz/kernel
 
 install-ui:
 	install -d $(DESTDIR)/usr/lib/bootdisk/ui

Changed RCS file: /cvsroot/bootdisk/configure.in,v
----------------------------
revision 1.12
date: 2002/03/18 09:28:59;  author: malekith;  state: Exp;  lines: +3 -1
- new build system (using uc-chroot built binaries)
 

Index: configure.in
===================================================================
RCS file: /cvsroot/bootdisk/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- configure.in	29 Dec 2001 13:09:52 -0000	1.11
+++ configure.in	18 Mar 2002 09:28:59 -0000	1.12
@@ -91,4 +91,6 @@
 	batch-installer/Makefile \
 	batch-installer/po/Makefile \
 	batch-installer/ui/Makefile \
+	mod/Makefile \
+	pkg/Makefile \
 	)

Changed RCS file: /cvsroot/bootdisk/mkimages,v
----------------------------
revision 1.7
date: 2002/03/18 09:28:59;  author: malekith;  state: Exp;  lines: +3 -3
- new build system (using uc-chroot built binaries)
 

Index: mkimages
===================================================================
RCS file: /cvsroot/bootdisk/mkimages,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mkimages	9 Feb 2002 12:11:12 -0000	1.6
+++ mkimages	18 Mar 2002 09:28:59 -0000	1.7
@@ -18,10 +18,10 @@
     opt="$opt -e $f"
   done
 
-  sh scripts/mkinstaller -t `pwd` $opt "$@" \
+  sh scripts/mkinstaller -t `pwd`/targz $opt "$@" \
   	-I bootdisk_${name}.txt \
 	-o bootdisk_${name}.img
-  sh scripts/mkinstaller -t `pwd` -a $opt "$@" \
+  sh scripts/mkinstaller -t `pwd`/targz -a $opt "$@" \
   	-I bootdisk_${name}_slow.txt \
 	-o bootdisk_${name}_slow.img
   
@@ -46,7 +46,7 @@
 rm -rf tmp-etc
 mkdir tmp-etc
 
-. root-pkg-root/etc/installer-rc
+. ./installer-rc
 
 network_conf

Więcej informacji o liście dyskusyjnej pld-installer