r2578 - in trunk/utils/mkvmlinuz/mkvmlinuz: . debian
Sven Luther
luther@costa.debian.org
Mon, 28 Feb 2005 15:51:25 +0100
Author: luther
Date: 2005-02-28 15:51:25 +0100 (Mon, 28 Feb 2005)
New Revision: 2578
Added:
trunk/utils/mkvmlinuz/mkvmlinuz/debian/config
trunk/utils/mkvmlinuz/mkvmlinuz/debian/postinst
Removed:
trunk/utils/mkvmlinuz/mkvmlinuz/debian/configure
Modified:
trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postinst
trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postrm
trunk/utils/mkvmlinuz/mkvmlinuz/debian/mkvmlinuz.templates
trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
Log:
Works for 2.4 chrp kernels now, prep and pmac/coff todo still, altough 2.4 is broken on prep.
Copied: trunk/utils/mkvmlinuz/mkvmlinuz/debian/config (from rev 2561, trunk/utils/mkvmlinuz/mkvmlinuz/debian/configure)
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/debian/configure 2005-02-25 16:39:14 UTC (rev 2561)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/debian/config 2005-02-28 14:51:25 UTC (rev 2578)
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+case $(grep ^machine /proc/cpuinfo) in
+ *PReP*Blackhawk*) arch=ppcbug ;;
+ *PReP*) arch=prep ;;
+ *CHRP*Pegasos*) arch=chrp_pegasos ;;
+ *CHRP*) arch=chrp ;;
+ *Amiga*) arch=apus ;;
+ *iSeries*) arch=iseries ;;
+ *)
+ case $(grep ^pmac-generation /proc/cpuinfo) in
+ *NewWorld) arch=pmac_newworld ;;
+ *OldWorld) arch=pmac_oldworld ;;
+ *NuBus) arch=pmac_nubus ;;
+ *) arch=unknown ;;
+ esac
+ ;;
+esac
+
+# List of bootloader per subarch.
+case $arch in
+ chrp|pmac_newworld) bootloaders="yaboot, mkvmlinuz" ;;
+ pmac_oldworld) bootloaders="quik, mkvmlinuz" ;;
+ ppcbug|prep|chrp_pegasos) bootloaders="mkvmlinuz" ;;
+ *) bootloaders="unknown" ;;
+esac
+
+# If there is more than one bootloader present, ask the user
+# at medium priority
+
+db_subst mkvmlinuz/bootloaders choices "$bootloaders"
+db_subst mkvmlinuz/bootloaders default "${bootloaders%, *}"
+db_input medium mkvmlinuz/bootloaders || true
+db_go || true
Deleted: trunk/utils/mkvmlinuz/mkvmlinuz/debian/configure
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/debian/configure 2005-02-28 14:28:51 UTC (rev 2577)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/debian/configure 2005-02-28 14:51:25 UTC (rev 2578)
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-case $(grep ^machine /proc/cpuinfo) in
- *PReP*Blackhawk*) arch=ppcbug ;;
- *PReP*) arch=prep ;;
- *CHRP*Pegasos*) arch=chrp_pegasos ;;
- *CHRP*) arch=chrp ;;
- *Amiga*) arch=apus ;;
- *iSeries*) arch=iseries ;;
- *)
- case $(grep ^pmac-generation /proc/cpuinfo) in
- *NewWorld) arch=pmac_newworld ;;
- *OldWorld) arch=pmac_oldworld ;;
- *NuBus) arch=pmac_nubus ;;
- *) arch=unknown ;;
- esac
- ;;
-esac
-
-# List of bootloader per subarch.
-case $arch in
- chrp|pmac_newworld) bootloaders="yaboot, mkvmlinuz" ;;
- pmac_oldworld) bootloaders="quik, mkvmlinuz" ;;
- ppcbug|prep|chrp_pegasos) bootloaders="mkvmlinuz" ;;
- *) bootloaders="unknown" ;;
-esac
-
-# If there is more than one bootloader present, ask the user
-# at medium priority
-
-db_subst kernel-image-powerpc/bootloaders choices "$bootloaders"
-db_subst kernel-image-powerpc/bootloaders default "${bootloaders%, *}"
-db_input medium kernel-image-powerpc/bootloaders || true
-db_go || true
Modified: trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postinst
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postinst 2005-02-28 14:28:51 UTC (rev 2577)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postinst 2005-02-28 14:51:25 UTC (rev 2578)
@@ -4,7 +4,7 @@
. /usr/share/debconf/confmodule
-db_get kernel-image-powerpc/bootloaders
+db_get mkvmlinuz/bootloaders
bootloader="$RET"
if [ "$bootloader" = mkvmlinuz ]; then
Modified: trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postrm
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postrm 2005-02-28 14:28:51 UTC (rev 2577)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/debian/kernel-image.postrm 2005-02-28 14:51:25 UTC (rev 2578)
@@ -4,7 +4,7 @@
. /usr/share/debconf/confmodule
-db_get kernel-image-powerpc/bootloaders
+db_get mkvmlinuz/bootloaders
bootloader="$RET"
# Let's erase the kernel created by mkvmlinuz too.
Modified: trunk/utils/mkvmlinuz/mkvmlinuz/debian/mkvmlinuz.templates
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/debian/mkvmlinuz.templates 2005-02-28 14:28:51 UTC (rev 2577)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/debian/mkvmlinuz.templates 2005-02-28 14:51:25 UTC (rev 2578)
@@ -1,7 +1,7 @@
-Template: kernel-image-powerpc/bootloaders
+Template: mkvmlinuz/bootloaders
Type: select
Choices: ${choices}
Default: ${default}
-Description: select your bootloader
+Description: select your bootloader.
Your PowerPC arch supports more than one bootloader,
please chose the one you want to use.
Added: trunk/utils/mkvmlinuz/mkvmlinuz/debian/postinst
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/debian/postinst 2005-02-28 14:28:51 UTC (rev 2577)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/debian/postinst 2005-02-28 14:51:25 UTC (rev 2578)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
Modified: trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz
===================================================================
--- trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz 2005-02-28 14:28:51 UTC (rev 2577)
+++ trunk/utils/mkvmlinuz/mkvmlinuz/mkvmlinuz 2005-02-28 14:51:25 UTC (rev 2578)
@@ -172,23 +172,33 @@
# libraries and common object files
libs=$objdir/lib
objs=$objdir/obj
-case "$arch" in
- prep|ppcbug)
+case "$arch","$release" in
+ prep,2.6*|ppcbug,2.6*)
test -d $objs/simple && objs=$objs/simple
if test -r $objs/legacy.o; then prepmap=legacy; else prepmap=prepmap; fi
OBJS="$objs/head.o $objs/relocate.o $objs/$prepmap.o $objs/misc.o $objs/misc-prep.o $objs/mpc10x_memory.o"
LIBS="$libs/common.a $libs/ppc.a $libs/of.a"
+ dummy=$objs/dummy.o
;;
- pmac)
+ pmac,2.6*)
test -d $objs/openfirmware && objs=$objs/openfirmware
OBJS="$objs/start.o $objs/misc.o $objs/common.o $objs/newworldmain.o"
LIBS="$libs/lib.a $libs/ppc.a $libs/of.a $libs/common.a"
+ dummy=$objs/dummy.o
;;
- *)
+ *,2.6*)
test -d $objs/openfirmware && objs=$objs/openfirmware
OBJS="$objs/start.o $objs/misc.o $objs/common.o $objs/${arch}main.o"
LIBS="$libs/lib.a $libs/ppc.a $libs/of.a $libs/common.a"
+ dummy=$objs/dummy.o
;;
+ chrp,2.4*)
+ test -d $objs/chrp && objs=$objs/chrp
+ OBJS="$objs/start.o $objs/main.o $objs/misc.o"
+ OBJS="$OBJS $objs/../common/string.o $objs/../common/ofcommon.o"
+ LIBS="$libs/lib.a $libs/zlib.a $libs/of1275.a"
+ dummy=$objs/../common/dummy.o
+ ;;
esac
# off we go...
@@ -212,7 +222,7 @@
# create the raw ELF image file; this is not needed for the miBoot image
if test "$arch" != miboot; then
test -z "$verbose" || echo === Putting everything into ELF image file image.o...
- do_cmd $OBJCOPY -R .comment $objs/dummy.o $work/image.o
+ do_cmd $OBJCOPY -R .comment $dummy $work/image.o
do_cmd $OBJCOPY $work/image.o $work/image.o \
--add-section=.image=$work/vmlinux.gz \
--set-section-flags=.image=contents,alloc,load,readonly,data
@@ -233,43 +243,49 @@
LD_ARGS="-T $objdir/boot/ld.script"
OBJCOPY_ARGS="-R .comment"
test -z "$verbose" || echo === Creating bootable kernel image file vmlinuz.$arch...
-case $arch in
- chrp)
+case "$arch","$release" in
+ chrp,2.6*)
LD_ARGS="$LD_ARGS -e _start -Ttext 0x00800000"
do_cmd $LD -o $vmlinuz $LD_ARGS $objs/crt0.o $OBJS $work/image.o $LIBS
do_cmd $OBJCOPY $OBJCOPY_ARGS $vmlinuz $vmlinuz
do_cmd cp -p $objdir/boot/note $work
do_cmd $ADDNOTE $vmlinuz
;;
- coff)
+ chrp,2.4*)
+ LD_ARGS="$LD_ARGS -e _start -Ttext 0x00800000"
+ do_cmd $LD -o $vmlinuz $LD_ARGS $objs/../common/crt0.o $OBJS $work/image.o $LIBS
+ do_cmd $OBJCOPY $OBJCOPY_ARGS $vmlinuz $vmlinuz
+ do_cmd $ADDNOTE $vmlinuz
+ ;;
+ coff,2.6*)
LD_ARGS="$LD_ARGS -e _start -Ttext 0x00500000 -Bstatic"
OBJCOPY_ARGS="-O aixcoff-rs6000 -R .stab -R .stabstr $OBJCOPY_ARGS"
do_cmd $LD -o $vmlinuz $LD_ARGS $objs/coffcrt0.o $OBJS $work/image.o $LIBS
do_cmd $OBJCOPY $OBJCOPY_ARGS $vmlinuz $vmlinuz
do_cmd $HACKOFF $vmlinuz
;;
- miboot)
+ miboot,2.6*)
OBJCOPY_ARGS="-O aixcoff-rs6000 -R .stab -R .stabstr $OBJCOPY_ARGS"
do_cmd $OBJCOPY $OBJCOPY_ARGS --add-section=image=$work/vmlinux.gz $objs/dummy.o $vmlinuz
if test -n "$initrd"; then
do_cmd $OBJCOPY $OBJCOPY_ARGS --add-section=initrd=$work/initrd.gz $vmlinuz $vmlinuz
fi
;;
- pmac)
+ pmac,2.6*)
LD_ARGS="$LD_ARGS -e _start -Ttext 0x01000000"
OBJCOPY_ARGS="--add-section=.note=$work/note $OBJCOPY_ARGS"
do_cmd $LD -o $vmlinuz $LD_ARGS $objs/crt0.o $OBJS $LIBS $work/image.o
do_cmd $MKNOTE > $work/note
do_cmd $OBJCOPY $OBJCOPY_ARGS $vmlinuz $vmlinuz
;;
- ppcbug)
+ ppcbug,2.6*)
LD_ARGS="$LD_ARGS -Ttext 0x00800000 -Bstatic"
OBJCOPY_ARGS="-O elf32-powerpc $OBJCOPY_ARGS -R .stab -R .stabstr -R .sysmap"
do_cmd $LD -o $vmlinuz $LD_ARGS $OBJS $work/image.o $LIBS
do_cmd $OBJCOPY $OBJCOPY_ARGS $vmlinuz $vmlinuz.tmp
do_cmd $MKBUGBOOT $vmlinuz.tmp $vmlinuz
;;
- prep)
+ prep,2.6*)
LD_ARGS="$LD_ARGS -Ttext 0x00800000 -Bstatic"
OBJCOPY_ARGS="-O elf32-powerpc $OBJCOPY_ARGS -R .stab -R .stabstr -R .sysmap"
do_cmd $LD -o $vmlinuz $LD_ARGS $OBJS $work/image.o $LIBS
@@ -277,7 +293,7 @@
do_cmd $MKPREP -pbp $vmlinuz.tmp $vmlinuz
;;
*)
- echo Sorry, I do not know how to handle PowerPC sub-architecture $arch.
+ echo Sorry, I do not know how to handle PowerPC sub-architecture $arch in version $release.
esac
# move bootable kernel image to its final location