Bug#131030: Please check this patch
I saw your post in January where you checked and fixed up the kernel
script bootprep.sh for boot-floppies. Would you check this patch which
I think might close bug #131030?
I suppose bootprep.sh itself wouldn't need to change; I just thought
it might be well to carry the changed variable name through.
Index: bootprep.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/bootprep.sh,v
retrieving revision 1.15
diff -u -r1.15 bootprep.sh
--- bootprep.sh 2001/05/30 14:51:23 1.15
+++ bootprep.sh 2002/03/05 05:18:58
@@ -6,11 +6,11 @@
# Usage message
if [ $# -lt 2 ]; then
-echo "usage: "$0" archive kver" 1>&2
+echo "usage: "$0" archive prepkver" 1>&2
cat 1>&2 << EOF
archive: the directory where Debian binary packages will be downloaded
- kver: kernel version
+ prepkver: kernel version
EOF
exit -1
@@ -20,7 +20,7 @@
archive=$1
# set this to the kernel version
-kver=$2
+prepkver=$2
#-----------------------------------------------
# build PReP bootable images
@@ -35,21 +35,21 @@
make_tmpdir $builddir
# Extract kernel source and patches
-THEPKG=$(grab_paths kernel-source-$kver)
+THEPKG=$(grab_paths kernel-source-$prepkver)
dpkg --extract $THEPKG $builddir
-THEPKG=$(grab_paths kernel-patch-$kver-powerpc)
+THEPKG=$(grab_paths kernel-patch-$prepkver-powerpc)
dpkg --extract $THEPKG $builddir
# Unpack kernel source
cd $builddir/usr/src
-if [ -f kernel-source-${kver}.tar.gz ]; then
- tar zxf kernel-source-$kver.tar.gz
+if [ -f kernel-source-${prepkver}.tar.gz ]; then
+ tar zxf kernel-source-$prepkver.tar.gz
else
- tar x --bzip2 -f kernel-source-$kver.tar.bz2
+ tar x --bzip2 -f kernel-source-$prepkver.tar.bz2
fi
# Patch kernel source - FIXME: allow for other patches
-cd kernel-source-$kver
+cd kernel-source-$prepkver
# this patch may be getting applied twice. Comment
# this out if you get messages about patches being already
# applied.
Index: config
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/config,v
retrieving revision 1.137
diff -u -r1.137 config
--- config 2002/03/04 01:02:48 1.137
+++ config 2002/03/05 05:18:58
@@ -28,6 +28,7 @@
endif
ifeq "$(architecture)" "powerpc"
kver := 2.2.20
+ prepkver := 2.2.20-prep
pcmcia_kver := 2.2.20-pmac
apuskver := 2.2.10
# NewWorld powermacs really need a 2.4 kernel
Index: make/powerpc.rules
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/make/powerpc.rules,v
retrieving revision 1.3
diff -u -r1.3 powerpc.rules
--- make/powerpc.rules 2001/12/19 00:44:21 1.3
+++ make/powerpc.rules 2002/03/05 05:18:58
@@ -6,7 +6,7 @@
#-----------------------------------------------------------------------
bootprep.bin bootprepfull.bin: bootprep.sh rootprep.bin
- $(ROOTCMD) ./bootprep.sh $(archive) $(kver)
+ $(ROOTCMD) ./bootprep.sh $(archive) $(prepkver)
##
## XXX: apus isn't keeping up with the other powerpc kernels
##
--
*------v--------- Installing Debian GNU/Linux 3.0 --------v------*
| <http://www.debian.org/releases/woody/installmanual> |
| debian-imac (potato): <http://debian-imac.sourceforge.net> |
| Chris Tillman tillman@azstarnet.com |
| May the Source be with you |
*----------------------------------------------------------------*
Reply to: