[Lunar-commits] r15329 - lunar-iso/branches/lunar-iso-2.6

[Jaime Buffery]

Author: nestu
Date: 2005-06-10 14:34:23 +0000 (Fri, 10 Jun 2005)
New Revision: 15329

Modified:
   lunar-iso/branches/lunar-iso-2.6/Makefile
Log:
Syncing with trunk\!

Modified: lunar-iso/branches/lunar-iso-2.6/Makefile
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/Makefile	2005-06-10 14:29:46 UTC (rev 15328)
+++ lunar-iso/branches/lunar-iso-2.6/Makefile	2005-06-10 14:34:23 UTC (rev 15329)
@@ -16,20 +16,15 @@
 # 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
+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
 
-iso: isolinux $(ISO_TARGET)/.iso
+iso: initrd proper $(ISO_TARGET)/.iso
 $(ISO_TARGET)/.iso:
-	@echo "Generating .iso file"
+	@echo "Generating ISO"
 	@scripts/isofs
 
-isolinux: proper memtest $(ISO_TARGET)/isolinux
-$(ISO_TARGET)/isolinux:
-	@echo "Generating isolinux files"
-	@scripts/isolinux
-
 proper: aaa_dev aaa_base $(ISO_TARGET)/.proper
 $(ISO_TARGET)/.proper:
 	@echo "Cleaning BUILD"
@@ -38,22 +33,17 @@
 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: $(ISO_SOURCE)/kernels/.kernels
+kernels: rebuild $(ISO_SOURCE)/kernels/.kernels
 $(ISO_SOURCE)/kernels/.kernels:
 	@echo "Building precompiled kernels"
 	@scripts/kernels
 
-memtest: $(ISO_SOURCE)/memtest/memtest
+memtest: rebuild $(ISO_SOURCE)/memtest/memtest
 $(ISO_SOURCE)/memtest/memtest:
 	@echo "Generating memtest boot image"
 	@scripts/memtest
@@ -78,12 +68,16 @@
 	@echo "Getting a proper moonbase"
 	@scripts/moonbase
 
-
-unpack: dirs $(ISO_TARGET)/.unpack
+unpack: cachefill dirs $(ISO_TARGET)/.unpack
 $(ISO_TARGET)/.unpack:
 	@echo "Unpacking binaries and copying sources"
 	@scripts/unpack
 
+cachefill: dirs $(ISO_TARGET)/.cachefill
+$(ISO_TARGET)/.cachefill:
+	@echo "Fetching cache tarballs and sources"
+	@scripts/cachefill
+
 dirs: init $(ISO_TARGET)/.dirs
 $(ISO_TARGET)/.dirs:
 	@echo "Creating LSB directory structure"
@@ -94,16 +88,16 @@
 	@echo "Creating BUILD root"
 	@scripts/init
 
+
 clean:
 	umount BUILD/dev &> /dev/null || true
 	umount BUILD/proc &> /dev/null || true
 	rm -rf BUILD
 	rm -rf initrd/BUILD initrd/initrd
 	rm -rf aaa_base aaa_dev
-	rm -rf kernels/TAR kernels/*.tar.bz2 kernels/.kernels
+	rm -rf memtest
+	rm -rf kernels/TAR kernels/*.tar.bz2 kernels/.kernels kernels/.initrd_kernels
 	rm -f template/moonbase.tar.bz2
-	rm -f discover/discover
-	rm -f memtest/memtest
 	rm -f kernels/linux kernels/linux.map
 	rm -f kernels/safe kernels/safe.map
 
@@ -113,3 +107,18 @@
 burn:
 	@scripts/burn
 
+# these are for hacking around and doing manual adjustments
+tar:
+	tar cf BUILD.tar BUILD
+
+moonbase-extract:
+	tar xf $(ISO_TARGET)/var/lib/lunar/moonbase.tar.bz2 -C $(ISO_TARGET)/var/lib/lunar
+	rm $(ISO_TARGET)/var/lib/lunar/moonbase.tar.bz2
+	@echo "Don't forget to do a 'make moonbase-pack!'"
+
+moonbase-pack:
+	tar cjf $(ISO_TARGET)/var/lib/lunar/moonbase.tar.bz2 -C $(ISO_TARGET)/var/lib/lunar moonbase/
+	rm -rf $(ISO_TARGET)/var/lib/lunar/moonbase
+	@echo "Packed up moonbase."
+
+