ppcrcd/trunk: Makefile mkvmlinuz noinst.pkgs

[sparky]

Author: sparky
Date: Sat Jan 14 17:51:04 2006
New Revision: 6805

Modified:
   ppcrcd/trunk/Makefile
   ppcrcd/trunk/mkvmlinuz
   ppcrcd/trunk/noinst.pkgs
Log:
- few small changes, mainly for "nightly build"


Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile	(original)
+++ ppcrcd/trunk/Makefile	Sat Jan 14 17:51:04 2006
@@ -79,7 +79,7 @@
 	touch $@
 
 $(root_initrd):	out/touch/root_installed initrd.dir
-	rm -rf $@{,.work}
+	$(SU) rm -rf $@{,.work}
 	cp -r initrd.dir $@.work
 	find $@.work -name .svn | xargs rm -rf
 	sed -e 's/@_VERSION_@/$(VERSION)/g'	\
@@ -203,7 +203,7 @@
 out/rpm/rpms/%:
 	@#XXX every package neads something like: $(R)/setup: $(P)/setup
 	#######################################################################
-	###	Building $(notdir $@)
+	###	Building $(notdir $(firstword $^))
 	#######################################################################
 	cd out/rpm/SPECS && ( rpmbuild -bb	\
 		--define="_topdir $(PWD)/out/rpm"	\
@@ -217,7 +217,8 @@
 			sed -e 's at .*/@@g' -e 's/-[^-]*-[^-]*$$//'`;	\
 	done
 	rm buildout EXIT
-	-rm -r out/rpm/BUILD/*
+	-rm -rf out/rpm/BUILD/*
+	###	Build done
 	$(if $(NOTEQ-$(notdir $(firstword $^))), rm -f \
 		out/touch/$(NOTEQ-$(notdir $(firstword $^))),#)
 	sleep 1 && touch $@
@@ -252,9 +253,10 @@
 		-i out/rpm/SPECS/builder
 	sleep 1 && touch $@
 
+.PHONY:	info
 info:
-	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" > $@
+	@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"
 
 .PHONY:	specsup
 specsup:

Modified: ppcrcd/trunk/mkvmlinuz
==============================================================================
--- ppcrcd/trunk/mkvmlinuz	(original)
+++ ppcrcd/trunk/mkvmlinuz	Sat Jan 14 17:51:04 2006
@@ -25,7 +25,6 @@
                default: /boot/libs-<kernel-version>/
  -kb         - specify if using kernel build directory as <libdir>
  -n          - do not use an initrd
- -f          - force
  -V          - verbose operation
  -D          - debug (set -x)
 
@@ -79,9 +78,6 @@
 		-n|--noinitrd)
 			initrd="no"
 			;;
-		-f|--force)
-			force="yes"
-			;;
 		-V|--verbose)
 			verbose="yes"
 			;;
@@ -105,11 +101,6 @@
 
 is_yes "$DEBUG" && set -x
 
-# check everything
-if [ -e "$output" ]; then
-	is_yes "$force" || error 1 "$output exists"
-fi
-
 is_yes "$verbose" && echo "=== Preparing kernel version $version."
 
 is_yes "$verbose" && echo "=== Building for sub-architecture chrp."

Modified: ppcrcd/trunk/noinst.pkgs
==============================================================================
--- ppcrcd/trunk/noinst.pkgs	(original)
+++ ppcrcd/trunk/noinst.pkgs	Sat Jan 14 17:51:04 2006
@@ -8,4 +8,12 @@
 $(R)/gcc:	$(P)/gcc
 
 $(R)/linux-libc-headers:	$(P)/linux-libc-headers
+
+$(R)/perl-DB_File:	$(P)/perl-DB_File
+
+$(R)/perl-MLDBM:	$(P)/perl-MLDBM
+
+$(R)/perl-FreezeThaw:	$(P)/perl-FreezeThaw
+
+
 # vim: syntax=make