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

[Glenn Saberton]

The following commit has been merged in the master branch:
commit aafca6bfe42604f6fb32d227ceab9c51b2bcfc87
Author: Glenn Saberton <gsaberton at foomagic.org>
Date:   Sat Aug 30 19:22:03 2008 +0800

    Release for 26
    
    atl2 is now natively supported by d-i.
    atl1e is supported by mainline kernel and therefore d-i.
    add the thermal nocrt workaround so 26 will boot.

diff --git a/build-eeepc.sh b/build-eeepc.sh
index e532e50..ab20e33 100755
--- a/build-eeepc.sh
+++ b/build-eeepc.sh
@@ -22,8 +22,8 @@
 
 # Variables
 BASEDIR=${BASEDIR:-$HOME/test}
-KERNELVER=${KERNELVER:-2.6.25-2-486}
-DEBMIRROR=${DEBMIRROR:-http://ftp.au.debian.org}
+KERNELVER=${KERNELVER:-2.6.26-1-486}
+DEBMIRROR=${DEBMIRROR:-http://ftp.us.debian.org}
 IMAGENAME=${IMAGENAME:-debian-eeepc.img}
 
 # Root check
@@ -68,19 +68,17 @@ 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.25-2-486_2.6.25-7_i386.deb
-    dpkg -L linux-image-2.6.25-2-486 || $SUDO dpkg -i linux-image-2.6.25-2-486_2.6.25-7_i386.deb
-    wget -c $DEBMIRROR/debian/pool/main/l/linux-modules-extra-2.6/atl2-modules-2.6.25-2-486_2.6.25+2.0.3-5_i386.deb
-    wget -c http://eeepc.debian.net/pool/non-free/e/eeepc-modules-non-free-2.6/madwifi-eeepc-modules-2.6.25-2-486_2.6.25+0.9.4+r3366-2_i386.deb
-    dpkg -L atl2-modules-2.6.25-2-486 || $SUDO dpkg -i atl2-modules-2.6.25-2-486_2.6.25+2.0.3-5_i386.deb
-    dpkg -L madwifi-eeepc-modules-2.6.25-2-486 || $SUDO dpkg -i madwifi-eeepc-modules-2.6.25-2-486_2.6.25+0.9.4+r3366-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-3_i386.deb
+    dpkg -L linux-image-2.6.26-1-486 || $SUDO dpkg -i linux-image-2.6.26-1-486_2.6.26-3_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
     $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 \
     mkisofs tofrodos bf-utf-source upx-ucl win32-loader dosfstools initramfs-tools module-init-tools
-    wget -c $DEBMIRROR/debian/pool/main/l/linux-kernel-di-i386-2.6/linux-kernel-di-i386-2.6_1.65.tar.gz
+    wget -c $DEBMIRROR/debian/pool/main/l/linux-kernel-di-i386-2.6/linux-kernel-di-i386-2.6_1.67.tar.gz
     cd "$BASEDIR"/kernel-wedge
-    tar xf "$BASEDIR"/tmpdebs/linux-kernel-di-i386-2.6_1.65.tar.gz
+    tar xf "$BASEDIR"/tmpdebs/linux-kernel-di-i386-2.6_1.67.tar.gz
     cd "$BASEDIR"
     svn co svn://svn.debian.org/svn/d-i/trunk debian-installer
     echo -e "\033[1;32;41m Part 1 complete. \033[0m "
@@ -89,9 +87,8 @@ 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 "atl2\natl1e\n" >> ./modules/i386/nic-modules
     echo -ne "ath_pci\nath_rate_sample\nath_hal\nwlan_wep\nwlan_scan_sta\nwlan" >> ./modules/i386/nic-wireless-modules
-    sed -i 's/i386     2.6.25-2 686-bigmem/#i386     2.6.25-2 686-bigmem/g' ./kernel-versions
+    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/
     echo -e "\033[1;32;41m Part 2 complete. \033[0m "
@@ -104,10 +101,10 @@ eee_di() {
     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 atl2-modules-2.6-686 atl1e-modules-2.6-686 madwifi-tools eeepc-acpi-scripts madwifi-eeepc-modules-2.6.25-2-686 eeepc-acpi-modules-2.6-686" >> ../../../tmp/preseed.cfg
-    echo "d-i preseed/late_command string echo -e eeepc_acpi >> /target/etc/modules; echo -e "blacklist ath5k" >> /target/etc/modprobe.d/blacklist" >> ../../../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 preseed/late_command string echo -e eeepc_acpi >> /target/etc/modules; echo -e "blacklist ath5k" >> /target/etc/modprobe.d/blacklist; echo -e "thermal options nocrt=1" > /target/etc/modprobe.d/thermal" >> ../../../tmp/preseed.cfg
     sed -i 's/PRESEED = .*/PRESEED = ..\/..\/..\/tmp\/preseed.cfg/g' ./config/common
-    sed -i 's/# netboot-xen #floppy #monolithic/monolithic # netboot-xen #floppy/g' ./config/i386.cfg
+    sed -i 's/#floppy #monolithic/monolithic #floppy/g' ./config/i386.cfg
     sed -i 's/DEBIAN_RELEASE = .*/DEBIAN_RELEASE = lenny/g' ./config/common
     fakeroot make build_monolithic 
     rm ../../../tmp/preseed.cfg

-- 
custom debian-installer for EeePC