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

Glenn Saberton gsaberton at foomagic.org
Tue Apr 1 14:09:43 UTC 2008


The following commit has been merged in the master branch:
commit e6c2c3dc486a67f4e150506e447d3fb2ad01eb20
Author: Glenn Saberton <gsaberton at foomagic.org>
Date:   Wed Apr 2 01:08:06 2008 +1100

    Build for 2.6.24
    Add wireless and acpi support

diff --git a/build-eeepc.sh b/build-eeepc.sh
index 0c9a629..c2ef33e 100755
--- a/build-eeepc.sh
+++ b/build-eeepc.sh
@@ -1,8 +1,9 @@
 #!/bin/sh -e
+set -x
 #
 #######################################################################
 #
-# build-eeepc 0.5 - Builds an eeepc-specific monolithic debian installer.
+# build-eeepc 0.6 - Builds an eeepc-specific monolithic debian installer.
 # Copyright (C) 2008  Brendan M.
 # 
 # This program is free software: you can redistribute it and/or modify
@@ -22,7 +23,7 @@
 
 # Variables
 BASEDIR=${BASEDIR:-$HOME/test}
-KERNELVER=${KERNELVER:-2.6.22-3-486}
+KERNELVER=${KERNELVER:-2.6.24-1-486}
 DEBMIRROR=${DEBMIRROR:-http://ftp.au.debian.org}
 IMAGENAME=${IMAGENAME:-debian-eeepc.img}
 
@@ -44,12 +45,14 @@ eee_wheel() {
         1)
                 eee_download; PART=2; eee_wheel;;
         2)
-                eee_kernelwedge; PART=3; eee_wheel;;
-        3)
-                eee_di; PART=4; eee_wheel;;
+		eee_netcfg; PART=3; eee_wheel;;
+	3)
+                eee_kernelwedge; PART=4; eee_wheel;;
         4)
-                eee_iso2img; PART=5; eee_wheel;;
+                eee_di; 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;;
@@ -72,8 +75,8 @@ eee_download() {
     dpkg -L linux-image-2.6.24-1-486 || $SUDO dpkg -i linux-image-2.6.24-1-486_2.6.24-4_i386.deb
     wget -c $DEBMIRROR/debian/pool/main/l/linux-modules-extra-2.6/atl2-modules-2.6.24-1-486_2.6.24+2.0.3-4_i386.deb
     dpkg -L atl2-modules-2.6.24-1-486 || $SUDO dpkg -i atl2-modules-2.6.24-1-486_2.6.24+2.0.3-4_i386.deb
-    $SUDO apt-get -y install kernel-wedge build-essential subversion fakeroot \
-    syslinux wget gzip cpio dctrl-tools debiandoc-sgml docbook-xsl bc \
+    $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.58.tar.gz
@@ -84,10 +87,24 @@ 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 2... (kernel-wedge) \033[0m "
+    echo -e "\033[1;32;41m Beginning part 3... (kernel-wedge) \033[0m "
     cd "$BASEDIR"/kernel-wedge/linux-kernel-di-i386-2.6
     echo atl2 >> ./modules/i386/nic-modules
+    echo -ne "ath_pci\nath_rate_sample\nath_hal\nwlan_wep\nwlan_scan_sta\nwlan" >> ./modules/i386/nic-wireless-modules
     kernel-wedge build-all
     cp -r ../*.udeb "$BASEDIR"/debian-installer/installer/build/localudebs/
     echo -e "\033[1;32;41m Part 2 complete. \033[0m "
@@ -96,11 +113,15 @@ eee_kernelwedge() {
 eee_di() {
     echo -e "\033[1;32;41m Beginning part 3... (debian-installer) \033[0m "
     cd "$BASEDIR"/debian-installer/installer/build
-    echo "d-i pkgsel/include string atl2-modules-2.6-686" > ../../../tmp/preseed.cfg
-    sed -ie 's/PRESEED = .*/PRESEED = ..\/..\/..\/tmp\/preseed.cfg/g' ./config/common
-    sed -ie 's/#monolithic/monolithic/g' ./config/i386.cfg
-    sed -ie 's/DEBIAN_RELEASE = .*/DEBIAN_RELEASE = lenny/g' ./config/common
-    fakeroot make build_monolithic
+    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 atl2-modules-2.6-686 madwifi-tools cpp-4.1 gcc-4.1 libmudflap0 libmudflap0-dev linux-headers-2.6.24-1-686 linux-kbuild-2.6.24 eeepc-acpi-scripts madwifi-eeepc-source build-essential module-assistant eeepc-acpi-source" >> ../../../tmp/preseed.cfg
+    sed -i 's/PRESEED = .*/PRESEED = ..\/..\/..\/tmp\/preseed.cfg/g' ./config/common
+    sed -i 's/#monolithic/monolithic/g' ./config/i386.cfg
+    sed -i 's/DEBIAN_RELEASE = .*/DEBIAN_RELEASE = lenny/g' ./config/common
+    fakeroot make build_monolithic 
     rm ../../../tmp/preseed.cfg
     echo -e "\033[1;32;41m Part 3 complete. \033[0m "
 }
@@ -135,7 +156,6 @@ eee_wheel
 exit 1 #Just incase the wheel says no.
 
 
-
 #######################################################################
 #
 #   Changelog
@@ -160,7 +180,10 @@ exit 1 #Just incase the wheel says no.
 #   - Removed initrd function and add preseed file
 #   - add a few cleanups after build
 #
-#   29/03/2008 - 0.6
-#   - kernel revision - 2.6.24
+#   11/03/2008 -0.6
+#   - Add support for wireless install
+#   - Add support for acpi after install 
+#   - Add eeepc.debian.net to preseed for eeepc specific modules
 #
 #######################################################################
+

-- 
custom debian-installer for EeePC



More information about the Debian-eeepc-devel mailing list