ppcrcd/trunk: Makefile add.pkgs base.pkgs

[sparky]

Author: sparky
Date: Sat Jan  7 21:56:45 2006
New Revision: 6769

Modified:
   ppcrcd/trunk/Makefile
   ppcrcd/trunk/add.pkgs
   ppcrcd/trunk/base.pkgs
Log:
- move changes in spec to spec-preparing rule


Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile	(original)
+++ ppcrcd/trunk/Makefile	Sat Jan  7 21:56:45 2006
@@ -242,6 +242,7 @@
 	rm -rf out/rpm/prep/* out/rpm/rpms/*
 
 clean-inst:	clean-root
+	-$(SU) umount $(root_inst)/proc
 	rm -rf out/rpm/installed/* $(root_installed) $(touch)/root-ok-deps \
 		out/touch/stop/*
 	$(SU) rm -rf $(root_inst)

Modified: ppcrcd/trunk/add.pkgs
==============================================================================
--- ppcrcd/trunk/add.pkgs	(original)
+++ ppcrcd/trunk/add.pkgs	Sat Jan  7 21:56:45 2006
@@ -12,8 +12,8 @@
 
 I +=	libgcc libstdc++
 # will not build it
-$(R)/libgcc libstdc++:
-	echo out/rpm/RPMS/$(notdir $@)-4.1.0-0.20051206r108118.1.ppc.rpm > $@
+$(R)/gcc $(R)/libgcc $(R)/libstdc++:	$(P)/gcc
+	echo out/rpm/RPMS/$(notdir $@)-4.1.0-0.20060105r109369.1.ppc.rpm > $@
 
 include fs.pkgs
 

Modified: ppcrcd/trunk/base.pkgs
==============================================================================
--- ppcrcd/trunk/base.pkgs	(original)
+++ ppcrcd/trunk/base.pkgs	Sat Jan  7 21:56:45 2006
@@ -297,16 +297,21 @@
 BCOND-gcc = --without ada --without fortran --without java --without objc --without objcxx
 #-ada -fortran -java -objc -objcxx +multilib +profiling -bootstrap +tests
 
-$(P)/module-init-tools: out/rpm/sources/module-init-tools
+out/rpm/SPECS/module-init-tools.spec:	out/touch/builder_prepared
+	cd $(dir $@) && cvs up $(if $(REV-$(@:out/rpm/SPECS/%.spec=%)),-r \
+		$(REV-$(@:out/rpm/SPECS/%.spec=%)),-A) $(notdir $@)
 	sed -e '/BuildR/s/static/devel/' \
-		-i out/rpm/SPECS/module-init-tools.spec
+		-i $@
 	sed -e "/^%patch2/ased -e 's/insmod.static//' -i Makefile.am" \
-		-i out/rpm/SPECS/module-init-tools.spec
+		-i $@
 	sed -e "/^%patch2/ased -n -e '/insmod_static/!p' -i Makefile.am" \
-		-i out/rpm/SPECS/module-init-tools.spec
+		-i $@
 	sleep 1 && touch $@
 
-$(P)/kernel: out/rpm/sources/kernel
+out/rpm/SPECS/kernel.spec:	out/touch/builder_prepared
+	rm -r $@
+	cd $(dir $@) && cvs up $(if $(REV-$(@:out/rpm/SPECS/%.spec=%)),-r \
+		$(REV-$(@:out/rpm/SPECS/%.spec=%)),-A) $(notdir $@)
 	rm -f $(touch)/kerneleq
 	cd out/rpm/SPECS && patch -p0 < $(PWD)/kernel.spec-patch
 	cp linux-squashfs2.2_lzma.patch out/rpm/SOURCES
@@ -314,9 +319,11 @@
 	cp kernel.config out/rpm/SOURCES/kernel-ppc-smp.config
 	sleep 1 && touch $@
 
-$(P)/busybox: out/rpm/sources/busybox
+out/rpm/SPECS/busybox.spec:	out/touch/builder_prepared
+	cd $(dir $@) && cvs up $(if $(REV-$(@:out/rpm/SPECS/%.spec=%)),-r \
+		$(REV-$(@:out/rpm/SPECS/%.spec=%)),-A) $(notdir $@)
 	sed -e '/ifnarch/s/$$/ ppc/' \
-		-i out/rpm/SPECS/busybox.spec
+		-i $@
 	sleep 1 && touch $@
 
 out/touch/kerneleq: