Merge bk://openembedded@openembedded.bkbits.net/packages

into handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/09/27 22:55:06+02:00 handhelds.org!zecke
PPPD:
Fix the fix(patch) to enable mppe/ms-chap2

2004/09/27 22:51:01+02:00 handhelds.org!zecke
Beagle:
-PREEMPT enable/disable for PCMCIA to avoid crashes
-Do not ship zImage and System.map in ROM

2004/09/27 00:10:19+02:00 handhelds.org!zecke
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/09/27 00:06:48+02:00 handhelds.org!zecke
Change staging of libxine_1.0.0-rc6a to install more headers into xine/ . These headers
are needed to build OpiePlayer2 against this version of libxine

2004/09/26 20:52:35+02:00 handhelds.org!zecke
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported

2004/09/26 20:52:05+02:00 handhelds.org!zecke
Beagle:
	-Switch away from modutils-colliteral
	-Provide alaiases for ppp
	-Build only needed TS lib modules to save space

BKrev: 41588a4byF20Bu-W-MhZ73U55lhrCQ

3 files changed, 17 insertions, 6 deletions

diff --git a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
index 82d1d8e5e5..181b7eb1e6 100644
--- a/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
+++ b/linux/montavista-sa-2.4.17-mvl21/defconfig-beagle
@@ -172,14 +172,12 @@ CONFIG_BINFMT_ELF=y
 CONFIG_PM=y
 CONFIG_APM=y
 # CONFIG_ARTHUR is not set
-CONFIG_CMDLINE="noinitrd root=/dev/mtdblock/1 init=/linuxrc mem=27M console=ttySA0"
+CONFIG_CMDLINE="root=/dev/mtdblock/1 mem=27M console=ttySA0 noinitrd"
 CONFIG_LEDS=y
 CONFIG_LEDS_TIMER=y
 # CONFIG_LEDS_CPU is not set
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_PREEMPT=y
-# CONFIG_PREEMPT_TIMES is not set
-# CONFIG_LOCK_BREAK is not set
 
 #
 # Parallel port support
@@ -699,7 +697,7 @@ CONFIG_DEVFS_MOUNT=y
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QNX4FS_RW is not set
 # CONFIG_ROMFS_FS is not set
-# CONFIG_EXT2_FS is not set
+CONFIG_EXT2_FS=m
 # CONFIG_SYSV_FS is not set
 # CONFIG_UDF_FS is not set
 # CONFIG_UDF_RW is not set
diff --git a/linux/montavista-sa-2.4.17-mvl21/pcmcia_preempt.patch b/linux/montavista-sa-2.4.17-mvl21/pcmcia_preempt.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/montavista-sa-2.4.17-mvl21/pcmcia_preempt.patch
diff --git a/linux/montavista-sa_2.4.17-mvl21.oe b/linux/montavista-sa_2.4.17-mvl21.oe
index 5c4cd74141..ae9841d289 100644
--- a/linux/montavista-sa_2.4.17-mvl21.oe
+++ b/linux/montavista-sa_2.4.17-mvl21.oe
@@ -21,10 +21,16 @@ SRC_URI = "http://www.vanille.de/temp/linux-${KV}_${MVLV}.tar.gz \
 	   file://beagle-sound.patch;patch=1 \
 	   file://linux-2.4.18-list_move.patch;patch=1 \
 	   file://ucb1x_kill-zombie.patch;patch=1 \
+	   file://pcmcia_preempt.patch;patch=1 \
            file://defconfig-${MACHINE}"
 
 S = "${WORKDIR}/linux-${KV}_${MVLV}"
 
+def beagle_multiline_ppp():
+	str = "alias char-major-108\tppp_generic\nalias /dev/ppp\tppp_generic"
+	return str
+
+
 inherit kernel
 
 CMDLINE = "root=/dev/mtdblock/1 mem=32M console=ttySA0 noinitrd"
@@ -41,13 +47,20 @@ module_conf_ppp_async = "alias ppp0 ppp_async"
 module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
 module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
 module_conf_spectrum_cs = "options spectrum_cs ignore_cis_vcc=1"
-
+module_conf_ppp_generic = "${@beagle_multiline_ppp()} "
+module_conf_ppp_mppe = "alais ppp-compress-18 ppp_mppe"
 module_conf_usbdmonitor = "alias usbd0 usbdmonitor"
 module_conf_sa1100_bi = "below sa1100_bi net_fd usbdcore "
+
+
 module_autoload_sa1100_bi = "sa1100_bi"
 module_autoload_sa1100_pcmcia = "sa1100_pcmcia"
 module_autoload_unix = "unix"
-module_autoload_usb_eth = "usb-eth"
+module_autoload_usb-eth = "usb-eth"
+module_autoload_af_packet = "af_packet"
+
+FILES_kernel = ""
+ALLOW_EMPTY  = 1
 
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."