[kernel] r6932 - in dists/trunk/utils/mkvmlinuz/mkvmlinuz: . debian

[Sven Luther]

Author: luther
Date: Fri Jun 30 21:46:29 2006
New Revision: 6932

Added:
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/compat
Removed:
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/boot/.gitignore
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/boot/Makefile.linux
Modified:
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/boot/Makefile
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz

Log:
Bumped debhelper compatibility to 4.
Cleaned the boot directory, and built addnote too.
Fixed mkvmlinuz typo in the check for /usr/lib/mkvmlinuz.


Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/boot/Makefile
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/boot/Makefile	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/boot/Makefile	Fri Jun 30 21:46:29 2006
@@ -11,7 +11,7 @@
  
 progs := addnote
 
-all: $(obj)
+all: $(obj) $(progs)
 
 $(patsubst %.c,%.o, $(filter %.c, $(src))): %.o: %.c
 	$(GCC) $(CFLAGS) -c -o $@ $<

Added: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/compat
==============================================================================
--- (empty file)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/compat	Fri Jun 30 21:46:29 2006
@@ -0,0 +1 @@
+4

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/rules	Fri Jun 30 21:46:29 2006
@@ -20,7 +20,6 @@
 	dh_testdir
 	touch build-stamp
 
-	# TODO
 	make -C boot
 
 %.8:	debian/%.sgml
@@ -34,6 +33,8 @@
 
 	rm -f mkvmlinuz.8
 
+	make -C boot clean
+
 	dh_clean 
 
 install: build
@@ -42,14 +43,14 @@
 	dh_clean -k 
 	dh_installdirs
 
-	$(INSTALL_EXEC) mkvmlinuz $(CURDIR)/debian/tmp/usr/sbin
-	$(INSTALL_EXEC) debian/kernel-image.postinst $(CURDIR)/debian/tmp/etc/kernel/postinst.d/mkvmlinuz
-	$(INSTALL_EXEC) debian/kernel-image.postrm $(CURDIR)/debian/tmp/etc/kernel/postrm.d/mkvmlinuz
-	$(INSTALL_EXEC) mkvmlinuz $(CURDIR)/debian/tmp/usr/sbin
-	$(INSTALL_DATA) mkvmlinuz.8 $(CURDIR)/debian/tmp/usr/share/man/man8
-	$(INSTALL_DATA) output $(CURDIR)/debian/tmp/etc/mkvmlinuz
-	$(INSTALL_EXEC) boot/addnote boot/addRamDisk $(CURDIR)/debian/tmp/usr/lib/mkvmlinuz
-	$(INSTALL_DATA) boot/*.o boot/zImage.lds $(CURDIR)/debian/tmp/usr/lib/mkvmlinuz
+	$(INSTALL_EXEC) mkvmlinuz $(CURDIR)/debian/mkvmlinuz/usr/sbin
+	$(INSTALL_EXEC) debian/kernel-image.postinst $(CURDIR)/debian/mkvmlinuz/etc/kernel/postinst.d/mkvmlinuz
+	$(INSTALL_EXEC) debian/kernel-image.postrm $(CURDIR)/debian/mkvmlinuz/etc/kernel/postrm.d/mkvmlinuz
+	$(INSTALL_EXEC) mkvmlinuz $(CURDIR)/debian/mkvmlinuz/usr/sbin
+	$(INSTALL_DATA) mkvmlinuz.8 $(CURDIR)/debian/mkvmlinuz/usr/share/man/man8
+	$(INSTALL_DATA) output $(CURDIR)/debian/mkvmlinuz/etc/mkvmlinuz
+	$(INSTALL_EXEC) boot/addnote $(CURDIR)/debian/mkvmlinuz/usr/lib/mkvmlinuz
+	$(INSTALL_DATA) boot/*.o boot/zImage.lds $(CURDIR)/debian/mkvmlinuz/usr/lib/mkvmlinuz
 
 # Build architecture-independent files here.
 binary-indep: build install

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	Fri Jun 30 21:46:29 2006
@@ -159,7 +159,7 @@
 	:
     elif objdir=/usr/lib/kernel-image-$release; test -d $objdir; then
 	:
-    elif test -n "$post_2_6_16" && test "$arch" = "chrp" && ( objdir=/usr/lib/mkvmlinuz; test -d $objdir ); then
+    elif objdir=/usr/lib/mkvmlinuz; test -d $objdir && test -n "$post_2_6_16" && test "$arch" = "chrp"; then
 	:
     else
 	objdir="$PWD"