[d-i-commits] r32026 - in trunk/packages/hw-detect: . debian

[Sven Luther]

Author: luther
Date: 2005-11-14 13:47:11 +0000 (Mon, 14 Nov 2005)
New Revision: 32026

Added:
   trunk/packages/hw-detect/discover-ibm.sh
Removed:
   trunk/packages/hw-detect/discover-rs6k.sh
Modified:
   trunk/packages/hw-detect/Makefile
   trunk/packages/hw-detect/debian/changelog
   trunk/packages/hw-detect/hw-detect.sh
Log:
Adapted hw-detect to chrp_rs6k -> chrp_ibm change, keeping backward compatible link.


Modified: trunk/packages/hw-detect/Makefile
===================================================================
--- trunk/packages/hw-detect/Makefile	2005-11-14 13:22:13 UTC (rev 32025)
+++ trunk/packages/hw-detect/Makefile	2005-11-14 13:47:11 UTC (rev 32026)
@@ -52,7 +52,7 @@
 	$(INSTALL) hw-detect.prebaseconfig $(pbcdir)/30hw-detect
 ifeq ($(DEB_HOST_ARCH),powerpc)
 	$(INSTALL) discover-mac-io.sh $(bindir)/discover-mac-io
-	$(INSTALL) discover-rs6k.sh $(bindir)/discover-rs6k
+	$(INSTALL) discover-ibm.sh $(bindir)/discover-ibm
 endif
 else
 	$(INSTALL) detect-stub.sh $(bindir)/hw-detect

Modified: trunk/packages/hw-detect/debian/changelog
===================================================================
--- trunk/packages/hw-detect/debian/changelog	2005-11-14 13:22:13 UTC (rev 32025)
+++ trunk/packages/hw-detect/debian/changelog	2005-11-14 13:47:11 UTC (rev 32026)
@@ -1,12 +1,16 @@
 hw-detect (1.25) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * If we're using coldplugging udev rather than hotplug, run udevsynthesize
     when modules are added.
   * Add a udev rule to make sure our net event hook is run even without the
     rest of hotplug.
 
- -- Colin Watson <cjwatson at debian.org>  Mon, 26 Sep 2005 16:58:23 +0200
+  [ Sven Luther ]
+  * chrp_rs6k -> chrp_ibm change, still keeping backward compatible support.
 
+ -- Sven Luther <luther at debian.org>  Mon, 14 Nov 2005 13:46:00 +0000
+
 hw-detect (1.24) unstable; urgency=low
 
   * Use log-output.

Copied: trunk/packages/hw-detect/discover-ibm.sh (from rev 32025, trunk/packages/hw-detect/discover-rs6k.sh)

Deleted: trunk/packages/hw-detect/discover-rs6k.sh
===================================================================
--- trunk/packages/hw-detect/discover-rs6k.sh	2005-11-14 13:22:13 UTC (rev 32025)
+++ trunk/packages/hw-detect/discover-rs6k.sh	2005-11-14 13:47:11 UTC (rev 32026)
@@ -1,25 +0,0 @@
-#! /bin/sh
-set -e
-
-# Detect hardware from Open Firmware's exported device tree that are
-# related to IBM pseries/js20 blades/rs6k machines.
-#
-# If the hardware is of use within d-i, then echo it and register-module it;
-# otherwise, just use register-module.
-
-for dir in $(find "/proc/device-tree/" -type d); do
-	name="$(cat "$dir/name" 2>/dev/null || true)"
-	device_type="$(cat "$dir/device_type" 2>/dev/null || true)"
-	compatible="$(cat "$dir/compatible" 2>/dev/null || true)"
-
-	# drivers/pseries
-	if [ "$name" = l-lan ]; then
-		echo "ibmveth:IBM Virtual Ethernet"
-		register-module ibmveth
-	fi
-	# drivers/scsi
-	if [ "$name" = v-scsi ]; then
-		echo "ibmvscsic:IBM Virtual SCSI"
-		register-module ibmvscsic
-	fi
-done

Modified: trunk/packages/hw-detect/hw-detect.sh
===================================================================
--- trunk/packages/hw-detect/hw-detect.sh	2005-11-14 13:22:13 UTC (rev 32025)
+++ trunk/packages/hw-detect/hw-detect.sh	2005-11-14 13:47:11 UTC (rev 32026)
@@ -230,8 +230,8 @@
 get_detected_hw_info() {
 	if [ "${SUBARCH%%/*}" = powerpc ]; then
 		discover-mac-io
-		if [ "$SUBARCH" = powerpc/chrp_rs6k ]; then
-			discover-rs6k
+		if [ "$SUBARCH" = powerpc/chrp_rs6k ] || [ "$SUBARCH" = powerpc/chrp_ibm ]; then
+			discover-ibm
 		fi
 	fi
 	discover_hw