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

[Aurélien GÉRÔME]

Author: ag-guest
Date: Sat Jan 13 23:30:29 2007
New Revision: 8174

Modified:
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
   dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
Log:
* Fix silent failure by adding some checks. (Closes: #381787)


Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/debian/changelog	Sat Jan 13 23:30:29 2007
@@ -20,8 +20,9 @@
     + Add debian/lintian.overrides for debconf-is-not-a-registry,
       because we need a debconf setting from mkvmlinuz in kernel
       scripts.
+  * Fix silent failure by adding some checks. (Closes: #381787)
 
- -- Aurélien GÉRÔME <ag at roxor.cx>  Sat, 13 Jan 2007 19:52:07 +0100
+ -- Aurélien GÉRÔME <ag at roxor.cx>  Sat, 13 Jan 2007 23:27:51 +0100
 
 mkvmlinuz (29) unstable; urgency=high
 

Modified: dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
==============================================================================
--- dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	(original)
+++ dists/trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz	Sat Jan 13 23:30:29 2007
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 
 # usage information
 usage() {
@@ -177,6 +177,10 @@
 	objdir="$PWD"
     fi
 fi
+if test \! -d "$objdir"; then
+    echo Object directory does not exist.
+    exit 1
+fi
 
 test -z "$verbose" || echo === Using object files from $objdir.
 
@@ -201,10 +205,12 @@
 # utilities
 if test "$post_2_6_16"; then
   ADDNOTE=$objdir/addnote
-  ADDRAMDISK=$objdir/addRamDisk
+  ADDRAMDISK=$objdir/addRamDisk # no longer exists
   objs=$objdir
   STRIP="strip -s -R .comment"
   GZIP="gzip --force --best"
+# The tools below no longer exist, so schedule them for removal along
+# with their calling occurrences afterwards.
 else
   ADDNOTE=$objdir/utils/addnote
   HACKOFF=$objdir/utils/hack-coff
@@ -216,6 +222,10 @@
   GZIP=gzip
   STRIP=strip
 fi
+if test \! -f "$ADDNOTE"; then
+    echo Missing utility in object directory.
+    exit 1
+fi
 LD=ld
 OBJCOPY=objcopy
 MV=mv
@@ -337,7 +347,7 @@
   else
   	do_cmd $MV $work/vmlinux.gz $work/vmlinuz.$arch.tmp
   fi
-  
+
   # link everything into the final image file and make it bootable
   vmlinuz=$work/vmlinuz.$arch
   if test "$post_2_6_16"; then
@@ -440,7 +450,7 @@
     fi
   fi
 fi
-  
+
 # clean up
 test -z "$verbose" || echo === Cleaning up...
 rm -rf $work