[Lunar-commits] r15022 - in lunar-iso/trunk: . initrd scripts

[Auke Kok]

Author: sofar
Date: 2005-05-25 12:33:09 +0000 (Wed, 25 May 2005)
New Revision: 15022

Removed:
   lunar-iso/trunk/scripts/discover
Modified:
   lunar-iso/trunk/Makefile
   lunar-iso/trunk/initrd/initrd.list
Log:
Deleted separate discover building: we now use the one built in the rest of the ISO.


Modified: lunar-iso/trunk/Makefile
===================================================================
--- lunar-iso/trunk/Makefile	2005-05-25 12:23:40 UTC (rev 15021)
+++ lunar-iso/trunk/Makefile	2005-05-25 12:33:09 UTC (rev 15022)
@@ -16,7 +16,7 @@
 # define the location where the ISO will be generated
 ISO_TARGET = $(ISO_SOURCE)/BUILD
 
-export ISO_SOURCE ISO_TARGET ISO_VERSION ISO_CODENAME ISO_DATE ISO_CNAME ISO_KVER ISO_PVER ISO_LUNAR_MODULE ISO_KSUFFIX ISO_MAKES
+export ISO_SOURCE ISO_TARGET ISO_VERSION ISO_CODENAME ISO_DATE ISO_CNAME ISO_KVER ISO_PVER ISO_LUNAR_MODULE ISO_KSUFFIX ISO_MAKES ISO_REDUCE
 
 all: iso
 
@@ -33,16 +33,11 @@
 aaa_dev: $(ISO_SOURCE)/aaa_dev/aaa_dev.tar.bz2
 $(ISO_SOURCE)/aaa_dev/aaa_dev.tar.bz2: initrd
 
-initrd: discover memtest kernels $(ISO_SOURCE)/initrd/initrd
+initrd: memtest kernels $(ISO_SOURCE)/initrd/initrd
 $(ISO_SOURCE)/initrd/initrd:
 	@echo "Generating initrd image"
 	@scripts/initrd
 
-discover: $(ISO_SOURCE)/discover/discover
-$(ISO_SOURCE)/discover/discover:
-	@echo "Generating static discover"
-	@scripts/discover
-
 kernels: rebuild $(ISO_SOURCE)/kernels/.kernels
 $(ISO_SOURCE)/kernels/.kernels:
 	@echo "Building precompiled kernels"

Modified: lunar-iso/trunk/initrd/initrd.list
===================================================================
--- lunar-iso/trunk/initrd/initrd.list	2005-05-25 12:23:40 UTC (rev 15021)
+++ lunar-iso/trunk/initrd/initrd.list	2005-05-25 12:33:09 UTC (rev 15022)
@@ -24,15 +24,41 @@
 sbin/pivot_root
 sbin/reboot
 usr/bin/dialog
+usr/bin/discover
 usr/bin/e3
 usr/bin/e3em
 usr/bin/e3vi
 usr/bin/ldd
 usr/bin/lddlibc4
 usr/bin/nano
+usr/lib/libdiscover.so
+usr/lib/libdiscover.so.2
+usr/lib/libdiscover.so.2.0.0
 usr/lib/libexpat.so
 usr/lib/libexpat.so.0
 usr/lib/libexpat.so.0.5.0
+usr/share/discover/ata-busclass.xml
+usr/share/discover/ata-device.xml
+usr/share/discover/ata-vendor.xml
+usr/share/discover/list.xml
+usr/share/discover/pci-26.lst
+usr/share/discover/pci-busclass.xml
+usr/share/discover/pci-device.xml
+usr/share/discover/pci.lst
+usr/share/discover/pci-vendor.xml
+usr/share/discover/pcmcia-26.lst
+usr/share/discover/pcmcia-busclass.xml
+usr/share/discover/pcmcia-device.xml
+usr/share/discover/pcmcia.lst
+usr/share/discover/pcmcia-vendor.xml
+usr/share/discover/scsi-busclass.xml
+usr/share/discover/scsi-device.xml
+usr/share/discover/scsi-vendor.xml
+usr/share/discover/usb-26.lst
+usr/share/discover/usb-busclass.xml
+usr/share/discover/usb-device.xml
+usr/share/discover/usb.lst
+usr/share/discover/usb-vendor.xml
 usr/share/tabset
 usr/share/tabset/std
 usr/share/tabset/stdcrt

Deleted: lunar-iso/trunk/scripts/discover