# HG changeset patch # User Matthias Förste # Date 1301574279 -7200 # Node ID 6be53dc1088c223d2ea07914e47da4f72aec5176 # Parent 7799d0886d37fe495f85790b46faa7ddf913f3e1 thinstation build area fixes diff -r 7799d0886d37 -r 6be53dc1088c thinstation/build.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/thinstation/build.patch Thu Mar 31 14:24:39 2011 +0200 @@ -0,0 +1,177 @@ +diff --git a/build.conf b/build.conf +index 560127f..e09157d 100644 +--- a/build.conf ++++ b/build.conf +@@ -293,7 +293,8 @@ module r8169 # Realtek 8169 Gigabit Ethernet support (v. 6.011) + #module snd-rme96 # RME Digi96, Digi96/8 and Digi96/8 PRO/PAD/PST soundcards + #module snd-rme9652 # RME Hammerfall (RME Digi9652/Digi9636) soundcards + #module snd-hdsp # RME Hammerfall DSP Audio soundcards +-#module snd-hda-intel model=auto position_fix=1 # Intel HD Audio with default parameters - you may need to change these ++module snd-hda-intel model=auto position_fix=1 # Intel HD Audio with default parameters - you may need to change these ++module snd-pcm-oss + #module snd-trident # Trident 4D-Wave DX/NX or SiS 7018 chips + #module snd-ymfpci # Yamaha PCI chips YMF724,YMF724F,YMF740,YMF740C,YMF744,YMF754 + #module snd-als4000 # Avance Logic ALS4000 chips +@@ -322,7 +323,7 @@ module usb-cdrom # Needed for USB CD-Rom Drives + #!!Storage Devices + #module ide-floppy # LS-120, Iomega Zip + #module floppy # Floppy disk support +-module ide-cd # CD-Rom Drive Support ++module ide-cd_mod # CD-Rom Drive Support + #module ahci # ACHI SATA support + module ata_piix # Intel piix SATA chipset support + #module sata_nv # NVidia SATA support +@@ -342,7 +343,7 @@ module vfat # Fat and VFat file system support + module ntfs # NTFS file system support + module ext2 # Ext2 file system support + module ext3 # Ext3 file system support +-module supermount # Supermount support for auto unmounting of removable media ++#module supermount # Supermount support for auto unmounting of removable media + #module nfs # NFS file system support + #module smbfs # Samba client FS Support, allows you to mount smb filesystems + +@@ -365,8 +366,8 @@ module supermount # Supermount support for auto unmounting of removable m + package hwclock # Utility to set system time from hardware clock + package rdate # Utility to obtain date & time from network + #package ntp # Utility to obtain date & time from network (only use one of these) +-#package sound-esd # Enable sound-esd or sound-nasd if you want to be able to control +-#package sound-nasd # sound on your thin client from another computer or ++package sound-esd # Enable sound-esd or sound-nasd if you want to be able to control ++package sound-nasd # sound on your thin client from another computer or + # your remote session. + #package iptables # IP Tables support + +@@ -538,12 +539,13 @@ package xtdesk # Adds icons to desktop + ### --- Miscellaneous Parameters --- ### + ######################################## + #!!Basic +-param rootpasswd pleasechangeme # Do Change! Console/telnet password for root ++param rootpasswd x # Do Change! Console/telnet password for root + # If this is enabled, Telnetd will be enabled. +-param xorgvncpasswd pleasechangeme # VNC Access Password +-param storagepasswd pleasechangeme # Password for storage server +-param dialuppasswd pleasechangeme # Password for dialin account +-param sambapasswd pleasechangeme # Password for samba shares when using user mode security ++param xorgvncpasswd x # VNC Access Password ++param storagepasswd x # Password for storage server ++param dialuppasswd x # Password for dialin account ++param sambapasswd x # Password for samba shares when using user mode security ++# set this to false to remove the 'splash=...' kernel parameter + param bootlogo true # Backgound picture during boot + param bootresolution 1024x768 # Resolution used during Thinstation boot + param desktop ./background.jpg # Background image for the desktop. More images in backgrounds/ +diff --git a/kernel/dependencies_module/ata_piix b/kernel/dependencies_module/ata_piix +new file mode 100644 +index 0000000..b60306b +--- /dev/null ++++ b/kernel/dependencies_module/ata_piix +@@ -0,0 +1,2 @@ ++module libata ++module dock +diff --git a/kernel/dependencies_module/button b/kernel/dependencies_module/button +index 2029fec..85324d5 100644 +--- a/kernel/dependencies_module/button ++++ b/kernel/dependencies_module/button +@@ -4,4 +4,7 @@ module fan + module processor + module thermal + module video ++module thermal_sys ++module output ++module backlight + package acpi +diff --git a/kernel/dependencies_module/ext3 b/kernel/dependencies_module/ext3 +new file mode 100644 +index 0000000..70cd362 +--- /dev/null ++++ b/kernel/dependencies_module/ext3 +@@ -0,0 +1,2 @@ ++module mbcache ++module jbd +diff --git a/kernel/dependencies_module/snd-hda-intel b/kernel/dependencies_module/snd-hda-intel +index 46fac61..7c9cf3f 100644 +--- a/kernel/dependencies_module/snd-hda-intel ++++ b/kernel/dependencies_module/snd-hda-intel +@@ -1 +1,5 @@ +-snd-hda-codec ++module snd-pcm ++module snd-page-alloc ++module snd ++module soundcore ++module snd-timer +diff --git a/kernel/dependencies_module/snd-pcm-oss b/kernel/dependencies_module/snd-pcm-oss +new file mode 100644 +index 0000000..c0b1976 +--- /dev/null ++++ b/kernel/dependencies_module/snd-pcm-oss +@@ -0,0 +1,6 @@ ++module snd-pcm ++module snd ++module soundcore ++module snd-page-alloc ++module snd-timer ++module snd-mixer-oss +diff --git a/kernel/dependencies_module/soundcore b/kernel/dependencies_module/soundcore +deleted file mode 100644 +index 37aac51..0000000 +--- a/kernel/dependencies_module/soundcore ++++ /dev/null +@@ -1,3 +0,0 @@ +-module snd-mixer-oss +-module snd-pcm-oss +-module snd-seq-oss +diff --git a/kernel/dependencies_module/sr_mod b/kernel/dependencies_module/sr_mod +new file mode 100644 +index 0000000..0b48de6 +--- /dev/null ++++ b/kernel/dependencies_module/sr_mod +@@ -0,0 +1,2 @@ ++module scsi_mod ++module cdrom +diff --git a/kernel/dependencies_module/usb-storage b/kernel/dependencies_module/usb-storage +index a98ee9c..c9a618c 100644 +--- a/kernel/dependencies_module/usb-storage ++++ b/kernel/dependencies_module/usb-storage +@@ -1 +1,2 @@ +-module sd_mod ++module usbcore ++module scsi_mod +diff --git a/kernel/dependencies_module/usbhid b/kernel/dependencies_module/usbhid +new file mode 100644 +index 0000000..5970e67 +--- /dev/null ++++ b/kernel/dependencies_module/usbhid +@@ -0,0 +1,4 @@ ++module usbcore ++module ehci-hcd ++module ohci-hcd ++module uhci-hcd +diff --git a/kernel/dependencies_module/vfat b/kernel/dependencies_module/vfat +index 603a11d..23cb22e 100644 +--- a/kernel/dependencies_module/vfat ++++ b/kernel/dependencies_module/vfat +@@ -1,2 +1,3 @@ ++module fat + module nls_cp850 + module nls_iso8859-1 +diff --git a/packages/base/etc/thinstation.init b/packages/base/etc/thinstation.init +index 390f9e4..6b9c193 100755 +--- a/packages/base/etc/thinstation.init ++++ b/packages/base/etc/thinstation.init +@@ -43,7 +43,7 @@ umask 022 + + # Mount Filesystems + mount -t tmpfs tmpfs /mnt/dynamic +-mount -t unionfs -o dirs=/mnt/dynamic:/ unionfs /mnt/union ++mount -t unionfs -o dirs=/mnt/dynamic:/=ro unionfs /mnt/union + cd /mnt/union + mkdir oldroot + pivot_root . /mnt/union/oldroot +diff --git a/thinstation.conf.buildtime b/thinstation.conf.buildtime +index 5965772..d1dfaf1 100644 +--- a/thinstation.conf.buildtime ++++ b/thinstation.conf.buildtime +@@ -1,2 +1,3 @@ + SESSION_0_TYPE=icewm + SESSION_0_AUTOSTART=on ++AUDIO_LEVEL=100