[Debian-eeepc-devel] [SCM] custom debian-installer for EeePC branch, master, updated. a938fbaa963771493f6d1bf140bded9ec0ad2e58

[Glenn Saberton]

The following commit has been merged in the master branch:
commit a938fbaa963771493f6d1bf140bded9ec0ad2e58
Author: Glenn Saberton <gsaberton at foomagic.org>
Date:   Fri Apr 18 17:21:30 2008 +0800

    netcfg has been fixed upstream. we no longer need to edit and build netcfg.

diff --git a/build-eeepc.sh b/build-eeepc.sh
index a601cae..3293dd8 100755
--- a/build-eeepc.sh
+++ b/build-eeepc.sh
@@ -44,14 +44,12 @@ eee_wheel() {
         1)
                 eee_download; PART=2; eee_wheel;;
         2)
-		eee_netcfg; PART=3; eee_wheel;;
-	3)
-                eee_kernelwedge; PART=4; eee_wheel;;
+		eee_kernelwedge; PART=3; eee_wheel;;
+        3)
+                eee_di; PART=4; eee_wheel;;
         4)
-                eee_di; PART=5; eee_wheel;;
+                eee_iso2img; PART=5; eee_wheel;;
         5)
-                eee_iso2img; PART=6; eee_wheel;;
-        6)
                 eee_cleantmp; PART=0; eee_wheel;;
         *)
                 echo -e "\033[1;32;41m Script complete. Happy days. \033[0m"; exit 0;;
@@ -88,19 +86,6 @@ eee_download() {
     echo -e "\033[1;32;41m Part 1 complete. \033[0m "
 }
 
-#this isnt nice to have to do, but is required as netcfg causes ath_hal to oops the kernel
-
-eee_netcfg() {
-    echo -e "\033[1;32;41m Beginning part 2... (preparing patched netcfg for the installer) \033[0m "
-    cd "$BASEDIR"/tmp
-    apt-get source netcfg && apt-get -y build-dep netcfg
-    cd netcfg*
-    sed -i 's/\/\* ignore tunnel devices \*\//\/\* ignore tunnel devices \*\/\n\t    continue;\n\t if \(!strncmp\(ibuf, "wifi", 3\)\)/' netcfg-common.c
-    $SUDO debuild -us -uc
-    cp ../*.udeb ../../debian-installer/installer/build/localudebs/
-    cd ../../ && $SUDO rm -r ./tmp/*
-}
-
 eee_kernelwedge() {
     echo -e "\033[1;32;41m Beginning part 3... (kernel-wedge) \033[0m "
     cd "$BASEDIR"/kernel-wedge/linux-kernel-di-i386-2.6

-- 
custom debian-installer for EeePC