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

[Glenn Saberton]

The following commit has been merged in the master branch:
commit dceebc4c978c64611413f96c1041284a44523bfe
Author: Glenn Saberton <gsaberton at foomagic.org>
Date:   Fri Nov 14 22:46:38 2008 +0900

    New 901 and WPA support
    
    WPA is now default. Add a custom finish-install udeb so we install the correct wireless modules for the model.

diff --git a/build-eeepc.sh b/build-eeepc.sh
index 672a4b2..b1eed3a 100755
--- a/build-eeepc.sh
+++ b/build-eeepc.sh
@@ -68,10 +68,12 @@ eee_download() {
     echo -e "\033[1;32;41m Beginning part 1... (downloading and installing parts) \033[0m "
     cd "$BASEDIR"/tmpdebs
     $SUDO apt-get -y update
-    wget -c http://http.us.debian.org/debian/pool/main/l/linux-2.6/linux-image-2.6.26-1-486_2.6.26-8_i386.deb
-    dpkg -L linux-image-2.6.26-1-486 || $SUDO dpkg -i linux-image-2.6.26-1-486_2.6.26-8_i386.deb
-    wget -c http://eeepc.debian.net/pool/non-free/e/eeepc-modules-non-free-2.6/madwifi-modules-2.6.26-1-486_2.6.26+0.9.4+r3772.20080716-2_i386.deb
-    dpkg -L madwifi-modules-2.6.26-1-486 || $SUDO dpkg -i madwifi-modules-2.6.26-1-486_2.6.26+0.9.4+r3772.20080716-2_i386.deb
+    wget -c http://http.us.debian.org/debian/pool/main/l/linux-2.6/linux-image-2.6.26-1-486_2.6.26-10_i386.deb
+    $SUDO dpkg -i linux-image-2.6.26-1-486_2.6.26-10_i386.deb
+    wget -c http://eeepc.debian.net/debian/pool/non-free/e/eeepc-modules-non-free-2.6/madwifi-modules-2.6.26-1-486_2.6.26+0.9.4+r3772.20080716-3_i386.deb
+    $SUDO dpkg -i madwifi-modules-2.6.26-1-486_2.6.26+0.9.4+r3772.20080716-3_i386.deb
+    wget -c http://eeepc.debian.net/debian/pool/non-free/e/eeepc-modules-non-free-2.6/rt2860-modules-2.6.26-1-486_2.6.26+1.8.0.0-3_i386.deb
+    $SUDO dpkg -i rt2860-modules-2.6.26-1-486_2.6.26+1.8.0.0-3_i386.deb
     $SUDO apt-get -y install kernel-wedge build-essential subversion fakeroot madwifi-tools \
     syslinux wget gzip cpio dctrl-tools debiandoc-sgml docbook-xsl bc devscripts \
     libbogl-dev libc6-pic libslang2-pic libnewt-pic genext2fs mklibs xsltproc \
@@ -87,10 +89,15 @@ eee_download() {
 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
-    echo -ne "ath_pci\nath_rate_sample\nath_hal\nwlan_wep\nwlan_scan_sta\nwlan\nwlan_ccmp\nwlan_tkip\nwlan_acl" >> ./modules/i386/nic-wireless-modules
+    echo -ne "ath_pci\nath_rate_sample\nath_hal\nwlan_wep\nwlan_scan_sta\nwlan\nwlan_ccmp\nwlan_tkip\nwlan_acl\nrt2860sta" >> ./modules/i386/nic-wireless-modules
     sed -i 's/i386     2.6.26-1 686-bigmem/#i386     2.6.26-1 686-bigmem/g' ./kernel-versions
     kernel-wedge build-all
-    cp -r ../*.udeb "$BASEDIR"/debian-installer/installer/build/localudebs/
+    cd "$BASEDIR"/debian-installer/installer/build/localudebs/
+    cp "$BASEDIR"/kernel-wedge/*.udeb .
+    wget http://ftp.debian.org/debian/pool/main/w/wireless-tools/wireless-tools-udeb_29-1.1_i386.udeb
+    wget http://eeepc.debian.net/debian/extra/finish-install_2.22_all.udeb
+    wget http://eeepc.debian.net/debian/extra/netcfg_1.46_i386.udeb
+    wget http://eeepc.debian.net/debian/extra/wpasupplicant-udeb_0.6.5-1_i386.udeb
     echo -e "\033[1;32;41m Part 2 complete. \033[0m "
 }
 
@@ -100,8 +107,8 @@ eee_di() {
     echo -ne "d-i apt-setup/non-free boolean true\nd-i apt-setup/contrib boolean true\n" > ../../../tmp/preseed.cfg
     echo "d-i apt-setup/local0/repository string http://eeepc.debian.net/debian lenny main contrib non-free" >> ../../../tmp/preseed.cfg
     echo "d-i apt-setup/local0/comment string eeepc repository" >> ../../../tmp/preseed.cfg
-    echo "d-i apt-setup/local0/key string http://nion.modprobe.de/65301FF6.asc" >> ../../../tmp/preseed.cfg
-    echo "d-i pkgsel/include string madwifi-tools eeepc-acpi-scripts madwifi-modules-2.6-686" >> ../../../tmp/preseed.cfg
+    echo "d-i apt-setup/local0/key string http://eeepc.debian.net/debian/archive-key-eeepc.asc" >> ../../../tmp/preseed.cfg
+    echo "d-i pkgsel/include string eeepc-acpi-scripts" >> ../../../tmp/preseed.cfg
     echo "d-i preseed/late_command string echo -e laptop_eeepc >> /target/etc/modules" >> ../../../tmp/preseed.cfg
     sed -i 's/PRESEED = .*/PRESEED = ..\/..\/..\/tmp\/preseed.cfg/g' ./config/common
     sed -i 's/#floppy #monolithic/monolithic #floppy/g' ./config/i386.cfg

-- 
custom debian-installer for EeePC