[pkgsrc/trunk]: pkgsrc/sysutils/mklivecd Update to 0.14.1:

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d9a1a66053a9
branches:  trunk
changeset: 519943:d9a1a66053a9
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Oct 12 15:03:51 2006 +0000

description:
Update to 0.14.1:

* Don't modify menu.lst if it's not available.
* Update some comments.

diffstat:

 sysutils/mklivecd/Makefile          |   4 ++--
 sysutils/mklivecd/files/mklivecd.sh |  30 +++++++++++++++++-------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diffs (94 lines):

diff -r fa95704fa5c1 -r d9a1a66053a9 sysutils/mklivecd/Makefile
--- a/sysutils/mklivecd/Makefile        Thu Oct 12 14:43:17 2006 +0000
+++ b/sysutils/mklivecd/Makefile        Thu Oct 12 15:03:51 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2006/10/08 19:08:38 xtraeme Exp $
+# $NetBSD: Makefile,v 1.30 2006/10/12 15:03:51 xtraeme Exp $
 
-DISTNAME=      mklivecd-0.14
+DISTNAME=      mklivecd-0.14.1
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r fa95704fa5c1 -r d9a1a66053a9 sysutils/mklivecd/files/mklivecd.sh
--- a/sysutils/mklivecd/files/mklivecd.sh       Thu Oct 12 14:43:17 2006 +0000
+++ b/sysutils/mklivecd/files/mklivecd.sh       Thu Oct 12 15:03:51 2006 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: mklivecd.sh,v 1.25 2006/10/08 19:08:38 xtraeme Exp $
+# $NetBSD: mklivecd.sh,v 1.26 2006/10/12 15:03:51 xtraeme Exp $
 #
 # Copyright (c) 2004-2006 Juan Romero Pardines.
 # All rights reserved.
@@ -253,8 +253,10 @@
 
 copy_bootfiles()
 {
+    #
+    # GNU GRUB.
+    #
     if [ "$USE_GNU_GRUB" = "yes" ]; then
-    # GNU Grub selected.
         [ ! -d $ISODIR/$GRUB_BOOTDIR ] && mkdir -p $ISODIR/$GRUB_BOOTDIR
        for f in $GRUB_FILES
         do
@@ -271,7 +273,9 @@
             fi
         done
     else
-        # We are using cdboot.
+    #
+    # NetBSD cd9660 bootloader (bootxx_cd9660)
+    #
         if [ -f ${CDBOOT_DIR}/${CDBOOT_IMG} ]; then
             cp -f ${CDBOOT_DIR}/${CDBOOT_IMG} $ISODIR
         else
@@ -345,7 +349,6 @@
             if [ "$USE_GNU_GRUB" = "yes" ]; then
                 cp $WORKDIR/$kernname/netbsd $ISODIR/$GRUB_BOOTDIR/$bootkern
             else
-            # We are using cdboot.
                 cp $WORKDIR/$kernname/netbsd $ISODIR/$bootkern
             fi
             [ -n "$verbose_mode" ] && \
@@ -433,8 +436,7 @@
                    config -s $SOURCEDIR/sys -b $WORKDIR/$KERNEL_NAME \
                        $BOOTKERN
                cd $KERNEL_NAME
-               make depend
-               make COPTS="-Os"        # Don't use additional flags
+               make depend && make
                if [ "$?" -eq 0 ]; then
                    copy_bootfiles
                    showmsg_n "Compressing kernel $BOOTKERN..."
@@ -553,7 +555,7 @@
        cat > $ISODIR/etc/rc.d/root <<_EOF_
 #!/bin/sh
 #
-# \$NetBSD: mklivecd.sh,v 1.25 2006/10/08 19:08:38 xtraeme Exp $
+# \$NetBSD: mklivecd.sh,v 1.26 2006/10/12 15:03:51 xtraeme Exp $
 # 
 
 # PROVIDE: root
@@ -882,12 +884,14 @@
         #
         # Detect if we are running a MULTIBOOT kernel.
         #
-        grep -q MULTIBOOT $WORKDIR/$BOOTKERN
-        if [ "$?" -eq 0 ]; then
-            showmsg "Applying fix for MULTIBOOT kernel..."
-            sed -e "s|\--type=netbsd||g" $ISODIR/boot/grub/menu.lst > \
-                $ISODIR/boot/grub/menu.lst.in
-            mv $ISODIR/boot/grub/menu.lst.in $ISODIR/boot/grub/menu.lst
+        if [ -f $ISODIR/boot/grub/menu.lst ]; then
+            grep -q MULTIBOOT $WORKDIR/$BOOTKERN
+            if [ "$?" -eq 0 ]; then
+                showmsg "Applying fix for MULTIBOOT kernel..."
+                sed -e "s|\--type=netbsd||g" $ISODIR/boot/grub/menu.lst > \
+                    $ISODIR/boot/grub/menu.lst.in
+                mv $ISODIR/boot/grub/menu.lst.in $ISODIR/boot/grub/menu.lst
+            fi
         fi
 
         _do_real_iso_image()