ppcrcd/trunk: Makefile initrd.dir/linuxrc

sparky cvs at pld-linux.org
Thu Mar 23 00:20:31 CET 2006


Author: sparky
Date: Thu Mar 23 00:20:27 2006
New Revision: 7289

Modified:
   ppcrcd/trunk/Makefile
   ppcrcd/trunk/initrd.dir/linuxrc
Log:
- typos
- zImage.* needs kernel-libs


Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile	(original)
+++ ppcrcd/trunk/Makefile	Thu Mar 23 00:20:27 2006
@@ -269,7 +269,7 @@
 
 out/images/zImage.chrp:	NONOTE := ADDNOTE=:
 
-out/images/zImage.%: out/images/initrd.sqf out/images/vmlinux
+out/images/zImage.%:	$(vmlinuz)
 	$(NONOTE) /usr/sbin/mkvmlinuz -f $@ ppcrcd_kernel	\
 		-a $(patsubst %-rs6k,%,$(@:out/images/zImage.%=%)) \
 		-i out/images/initrd.sqf	\

Modified: ppcrcd/trunk/initrd.dir/linuxrc
==============================================================================
--- ppcrcd/trunk/initrd.dir/linuxrc	(original)
+++ ppcrcd/trunk/initrd.dir/linuxrc	Thu Mar 23 00:20:27 2006
@@ -35,13 +35,13 @@
 checkcd() {
 	FS=$1
 	$B/echo "${cG}*** Searching PPCRCD cdrom${cE}"
-	echo -n "$FS: "
+	$B/echo -n "$FS: "
 	for CD in $DRIVES; do
 		$B/echo "$TRIED" | $B/awk "/:$CD:/ {exit 0}; {exit 1}" \
 			&& continue
 		$B/echo -n "$CD.."
 		$B/mount -n -t $FS $P/dev/$CD /media/ppcrcd -r 2>$P/dev/null
-		if $B/test -eq 0 && $B/test -n "`ls /media/ppcrcd`"; then
+		if $B/test $? -eq 0 && $B/test -n "`ls /media/ppcrcd`"; then
 			TRIED="$TRIED$CD:"
 		fi
 		if $B/test -f /media/ppcrcd/ppcrcd.sqf; then
@@ -51,7 +51,7 @@
 		fi
 		$B/umount /media/ppcrcd 2>$P/dev/null
 	done
-	echo
+	$B/echo
 }
 
 findcd() {


More information about the pld-cvs-commit mailing list