ppcrcd/trunk: Makefile base.pkgs

[sparky]

Author: sparky
Date: Sat Jan  7 00:25:47 2006
New Revision: 6754

Modified:
   ppcrcd/trunk/Makefile
   ppcrcd/trunk/base.pkgs
Log:
- fev more fixes and transition hopefully finished


Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile	(original)
+++ ppcrcd/trunk/Makefile	Sat Jan  7 00:25:47 2006
@@ -162,12 +162,12 @@
 	ln -sf $(root_inst) $@
 
 $(touch)/root-ok-deps:	$(INSTALL) $(root_inst)
-	rpm -Va --nofiles --root=$(root_inst)
+	rpm -Va --nofiles --root=$(PWD)/$(root_inst)
 	@touch $@
 	
 $(root_inst):
 	mkdir $@
-	$(SU) rpm --root=$@ --initdb
+	$(SU) rpm --root=$(PWD)/$@ --initdb
 
 out/rpm/installed/%:	out/rpm/rpms/% $(root_inst)
 	@$(SU) rpm -Uhv --root=$(PWD)/$(root_inst) `cat $(firstword $^)`  \
@@ -224,34 +224,28 @@
 	touch $@
 
 info:
-	LANGUAGE= LANG= LC_ALL=C rpm --root=$(root_inst) -qa \
+	LANGUAGE= LANG= LC_ALL=C rpm --root=$(PWD)/$(root_inst) -qa \
 		--queryformat="<b>%{NAME}</b>(%{EPOCH}:%{VERSION}-%{RELEASE})ľ\t<i>%{SUMMARY}</i>\n" | sort | tr "ľ" "\n" > $@
 
-#fix:
-#	@if ls .*_pre > /dev/null 2>&1; then touch ./.*_pre; fi
-#	@if ls .*_prep > /dev/null 2>&1; then touch ./.*_prep; fi
-#	@if ls .*_rpm > /dev/null 2>&1; then touch ./.*_rpm; fi
-#	@if ls .*_installed > /dev/null 2>&1; then touch ./.*_installed; fi
-#	@echo "Fixed"
-	
+
 clean:
 	@echo use one of: distclean clean-all clean-inst clean-root clean-img clean-yaboot
 	
 distclean:	clean-all
-	rm -rf rpm builder_prepared
+	$(SU) rm -rf out
 
 clean-all:	clean-inst clean-yaboot
-	rm -rf .*_pre .*_rpm
+	rm -rf out/rpm/prep/* out/rpm/rpms/*
 
-clean-inst:		clean-root
-	rm -rf .*_installed root.installed root-ok-deps
-	$(SU) rm -rf root.inst
+clean-inst:	clean-root
+	rm -rf out/rpm/installed/* $(root_installed) $(touch)/root-ok-deps
+	$(SU) rm -rf $(root_inst)
 
 clean-root:	clean-img
-	$(SU) rm -rf root.stripped boot.work boot initrd.work
+	$(SU) rm -rf $(root_stripped) $(boot) $(root_initrd)
 
 clean-img:
-	rm -rf ppcrcd.iso ppcrcd.sqf initrd.sqf image
+	rm -rf $(ppcrcd_iso) $(ppcrcd_sqf) $(initrd_sqf) $(cdroot)
 
 clean-yaboot:
 	make -C yaboot clean

Modified: ppcrcd/trunk/base.pkgs
==============================================================================
--- ppcrcd/trunk/base.pkgs	(original)
+++ ppcrcd/trunk/base.pkgs	Sat Jan  7 00:25:47 2006
@@ -23,6 +23,9 @@
 # glibc <-> glibc-misc
 $(addprefix $(R)/,glibc glibc-misc iconv):	$(P)/glibc
 
+I +=	libsepol
+$(R)/libsepol:	$(P)/libsepol
+
 I +=	libselinux
 $(R)/libselinux:	$(P)/libselinux
 
@@ -75,9 +78,6 @@
 # -initrd
 $(R)/udev:	$(P)/udev
 
-I +=	libsepol
-$(R)/libsepol:	$(P)/libsepol
-
 I +=	device-mapper
 # -selinux
 $(R)/device-mapper:	$(P)/device-mapper
@@ -296,7 +296,7 @@
 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: $(sources)/module-init-tools
+$(P)/module-init-tools: out/rpm/sources/module-init-tools
 	sed -e '/BuildR/s/static/devel/' \
 		-i $(OUT)/rpm/SPECS/module-init-tools.spec
 	sed -e "/^%patch2/ased -e 's/insmod.static//' -i Makefile.am" \
@@ -305,7 +305,7 @@
 		-i $(OUT)/rpm/SPECS/module-init-tools.spec
 	touch $@
 
-$(P)/kernel: $(sources)/kernel
+$(P)/kernel: out/rpm/sources/kernel
 	rm -f $(touch)/kerneleq
 	cd $(OUT)/rpm/SPECS && patch -p0 < $(PWD)/kernel.spec-patch
 	cp linux-squashfs2.2_lzma.patch $(OUT)/rpm/SOURCES
@@ -313,12 +313,12 @@
 	cp kernel.config $(OUT)/rpm/SOURCES/kernel-ppc-smp.config
 	touch $@
 
-$(P)/busybox: $(sources)/busybox
+$(P)/busybox: out/rpm/sources/busybox
 	sed -e '/ifnarch/s/$$/ ppc/' \
 		-i $(OUT)/rpm/SPECS/busybox.spec
 	touch $@
 
-$(touch)/kerneleq:
+out/touch/kerneleq:
 	-$(SU) rpm --erase kernel-grsecurity-source
 	-$(SU) rpm --erase kernel-grsecurity-module-build
 	-$(SU) rpm --erase kernel-grsecurity-headers
@@ -329,8 +329,8 @@
 		`cat $(R)/kernel-grsecurity-{source,module-build,headers}`
 	touch $@
 
-$(installed_dir)/virtual-mount-proc:
-	$(SU) mount -t proc none root.inst/proc
+out/rpm/installed/virtual-mount-proc:
+	$(SU) mount -t proc none out/root/inst/proc
 	touch $@
 
 # vim: syntax=make