[pkg-fso-commits] [SCM] Debian packaging for uboot-envtools branch, master, updated. debian/20081215-2-20-gfb3d1d1

[Per Andersson]

The following commit has been merged in the master branch:
commit 4470f4236efc8dee6f100410e05aa10e430add04
Author: Per Andersson <avtobiff at gmail.com>
Date:   Thu Aug 12 00:13:04 2010 +0200

    Fixed automatic device configuration.

diff --git a/debian/uboot-envtools.postinst b/debian/uboot-envtools.postinst
index c722fd7..f706bc6 100644
--- a/debian/uboot-envtools.postinst
+++ b/debian/uboot-envtools.postinst
@@ -6,11 +6,11 @@ set -e
 
 [ ! -f /etc/fw_env.config ] || exit 0 # bail if already configured
 
-db_get uboot-envtools/machine
+db_get uboot-envtools/machine || true
 machine="$RET"
 
-if [ "x$machine" = "x" ]; then
-    machine="$(cat /proc/cpuinfo | sed 's/^Hardware:\s*//')"
+if [ "$machine" = "Automatic" ]; then
+    machine="$(sed -n '/^Hardware/ {s/^Hardware\s*:\s*//;p}' /proc/cpuinfo)"
 fi
 
 case "$machine" in
@@ -26,10 +26,10 @@ case "$machine" in
     "Linkstation HG")
         file="lsppchg.config"
         ;;
-    "OpenMoko Neo 1973 (GTA01)" | "GTA01")
+    "Openmoko Neo 1973 (GTA01)" | "GTA01")
         file="openmoko_gta01.config"
         ;;
-    "OpenMoko FreeRunner (GTA02)" | "GTA02")
+    "Openmoko FreeRunner (GTA02)" | "GTA02")
         file="openmoko_gta02.config"
         ;;
     "QNAP TS-101")
diff --git a/debian/uboot-envtools.templates b/debian/uboot-envtools.templates
index e407ffe..e137d12 100644
--- a/debian/uboot-envtools.templates
+++ b/debian/uboot-envtools.templates
@@ -1,6 +1,7 @@
 Template: uboot-envtools/machine
 Type: select
-Choices: Kurobox Pro, Linkstation Pro Live, Linkstation Mipsel, Linkstation HG, OpenMoko Neo 1973 (GTA01), OpenMoko FreeRunner (GTA02), QNAP TS-101, QNAP TS-109/TS-209, QNAP TS-119/TS-219, Do not configure
+Choices: Automatic, Do not configure, Kurobox Pro, Linkstation Pro Live, Linkstation Mipsel, Linkstation HG, Openmoko Neo 1973 (GTA01), Openmoko FreeRunner (GTA02), QNAP TS-101, QNAP TS-109/TS-209, QNAP TS-119/TS-219
+Default: Automatic
 _Description: Device to automaticatically configure for
  The U-Boot boot loader has an environment stored on flash. The U-Boot
  environment tools needs to be configured in order to be able to read and

-- 
Debian packaging for uboot-envtools