Could someone review this patch? I tested the build image yesterday,
and one of the problems it ran into was not finding /usr/bin/ppcdetect.
I remembered archdetect had replaced ppcdetect, this looks like what
is needed to complete the transition for powerpc.
Index: tools/base-installer/debian/changelog
===================================================================
RCS file:
/cvs/debian-boot/debian-installer/tools/base-installer/debian/changelog,v
retrieving revision 1.158
diff -u -r1.158 changelog
--- tools/base-installer/debian/changelog 14 Oct 2003 08:52:27 -0000
1.158
+++ tools/base-installer/debian/changelog 14 Oct 2003 14:24:54 -0000
@@ -7,6 +7,8 @@
* Alastair McKinstry
- Add versioned depends on libdebconfclient-dev, to get working debconf_
macros.
+ * Chris Tillman
+ - change ppcdetect to archdetect and corresponding CASEs
-- Alastair McKinstry <[EMAIL PROTECTED]> Sun, 12 Oct 2003 22:01:30 +0100
Index: tools/base-installer/debian/kernel-installer.postinst
===================================================================
RCS file:
/cvs/debian-boot/debian-installer/tools/base-installer/debian/kernel-installer.postinst,v
retrieving revision 1.31
diff -u -r1.31 kernel-installer.postinst
--- tools/base-installer/debian/kernel-installer.postinst 7 Oct 2003
01:35:17 -0000 1.31
+++ tools/base-installer/debian/kernel-installer.postinst 14 Oct 2003
14:24:54 -0000
@@ -116,22 +116,26 @@
;;
powerpc)
version=2.4.22 #hack, hack!
- MODEL=`/usr/bin/ppcdetect`
+ MODEL=`/usr/bin/archdetect`
case "$MODEL" in
- NewWorld)
+ "powerpc/powermac_newworld")
kernel=kernel-image-$version-powerpc
;;
- # what's below is probably nonsene, porters have to start building
2.4 kernels for d-i!
+ # what's below is probably nonsense, porters have to start building
2.4 kernels for d-i!
# But at least the infrastructure will be there and these are the
latest versions in
# the archive.
- OldWorld)
+ "powerpc/powermac_oldworld")
kernel=kernel-image-$version-powerpc
;;
- PReP)
+ "powerpc/prep")
kernel=kernel-image-2.2.20-prep
;;
- CHRP)
+ # do we need a special case here for powerpc/chrp_pegasos?
+ "powerpc/chrp")
kernel=kernel-image-2.2.20-chrp
+ ;;
+ "powerpc/amiga")
+ kernel=kernel-image-2.4.20-apus
;;
*)
log "warning: Unknown powerpc subarchitecture '$MODEL'."
Index: tools/partitioner/debian/changelog
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/partitioner/debian/changelog,v
retrieving revision 1.44
diff -u -r1.44 changelog
--- tools/partitioner/debian/changelog 13 Oct 2003 21:05:26 -0000 1.44
+++ tools/partitioner/debian/changelog 14 Oct 2003 14:24:55 -0000
@@ -7,6 +7,8 @@
- Update pt_BR (Brazilian Portuguese) translation.
* Denis Barbier
- Add a comment in templates file to flag the main menu item.
+ * Chris Tillman
+ - change ppcdetect to archdetect and corresponding CASEs
-- Alastair McKinstry <[EMAIL PROTECTED]> Sun, 12 Oct 2003 22:07:19 +0100
Index: tools/partitioner/scripts/powerpc.sh
===================================================================
RCS file:
/cvs/debian-boot/debian-installer/tools/partitioner/scripts/powerpc.sh,v
retrieving revision 1.5
diff -u -r1.5 powerpc.sh
--- tools/partitioner/scripts/powerpc.sh 1 Oct 2003 15:35:14 -0000
1.5
+++ tools/partitioner/scripts/powerpc.sh 14 Oct 2003 14:24:55 -0000
@@ -2,14 +2,23 @@
DISK="$1"
[ -z "$DISK" ] && exit 1
-case "`/usr/bin/ppcdetect`" in
-"NewWorld PowerMac"|"OldWorld PowerMac")
+case "`/usr/bin/archdetect`" in
+"powerpc/powermac_newworld")
mac-fdisk $DISK
;;
-"CHRP Pegasos")
+"powerpc/powermac_oldworld")
+ mac-fdisk $DISK
+ ;;
+"powerpc/chrp_pegasos")
parted $DISK
;;
-"Amiga")
+"powerpc/chrp")
+ fdisk $DISK
+ ;;
+"powerpc/prep")
+ fdisk $DISK
+ ;;
+"powerpc/amiga")
parted $DISK
;;
*)
Index: tools/yaboot-installer/debian/isinstallable
===================================================================
RCS file:
/cvs/debian-boot/debian-installer/tools/yaboot-installer/debian/isinstallable,v
retrieving revision 1.3
diff -u -r1.3 isinstallable
--- tools/yaboot-installer/debian/isinstallable 27 Sep 2003 11:12:59 -0000
1.3
+++ tools/yaboot-installer/debian/isinstallable 14 Oct 2003 14:24:56 -0000
@@ -1,5 +1,5 @@
#!/bin/sh
-/usr/bin/ppcdetect | grep -q "NewWorld PowerMac"
+/usr/bin/archdetect | grep -q "powermac_newworld"
exit $?
Index: tools/yaboot-installer/debian/changelog
===================================================================
RCS file:
/cvs/debian-boot/debian-installer/tools/yaboot-installer/debian/changelog,v
retrieving revision 1.45
diff -u -r1.45 changelog
--- tools/yaboot-installer/debian/changelog 14 Oct 2003 08:52:27 -0000
1.45
+++ tools/yaboot-installer/debian/changelog 14 Oct 2003 14:28:19 -0000
@@ -5,7 +5,9 @@
* Alastair McKinstry
- Convert to new debconf_ macros; depend on libdebconfclient0-dev for
them.
-
+ * Chris Tillman
+ - Change ppcdetect to archdetect
+
-- Alastair McKinstry <[EMAIL PROTECTED]> Mon, 13 Oct 2003 21:33:38 +0100
yaboot-installer (0.0.7) unstable; urgency=low
--
Debian GNU/Linux Operating System
By the People, For the People
Chris Tillman (a people instance)
toff one at cox dot net
