Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/04 14:47:13+02:00 handhelds.org!zecke
meta-opie:
	Fix building of meta-opie by fixing dependencies

2005/06/04 14:45:15+02:00 handhelds.org!zecke
h3600 compile fixes:
	Fix the default h3600 build (distro familiar-0.9.0)

BKrev: 42a1af386QiNy3ZtnVoOMVkqpfUqmg

6 files changed, 61 insertions, 5 deletions

diff --git a/packages/hostap/hostap-modules_0.3.7.bb b/packages/hostap/hostap-modules_0.3.7.bb
index 1f86935ae1..4597451369 100644
--- a/packages/hostap/hostap-modules_0.3.7.bb
+++ b/packages/hostap/hostap-modules_0.3.7.bb
@@ -7,10 +7,10 @@ PR = "r1"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
            file://hostap_cs.conf \
-	   file://ipaq_compat.patch;patch=1 \
 	   file://Makefile.patch;patch=1"
 SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
 	file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
+SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
 
 S = "${WORKDIR}/hostap-driver-${PV}"
 
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
index 50d22387be..e9bd8b26b0 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
 LICENSE = "GPL"
 PR = "r2"
 
-KERNEL_CCSUFFIX = "-3.3.3"
+KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
index 4125999b56..d95bcb2459 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
 LICENSE = "GPL"
 PR = "r2"
 
-KERNEL_CCSUFFIX = "-3.3.3"
+KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
index 0e63dec2fb..1fa6a96919 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
 LICENSE = "GPL"
 PR = "r5"
 
-KERNEL_CCSUFFIX = "-3.3.3"
+KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
index e69de29bb2..3abb8719c5 100644
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
+++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
@@ -0,0 +1,56 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
+MAINTAINER = "Rene Wagner <rw@handhelds.org>"
+LICENSE = "GPL"
+PR = "r0"
+DEFAULT_PREFERENCE = "-1"
+
+KERNEL_CCSUFFIX = "-3.3.4"
+COMPATIBLE_HOST = "arm.*-linux"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig-${PACKAGE_ARCH} \
+	   file://ipaq-hal.init"
+
+S = "${WORKDIR}/kernel"
+
+inherit kernel update-rc.d
+
+K_MAJOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
+K_MINOR = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
+K_MICRO = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
+RMKV    = "${@bb.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}"
+PXAV    = "${@bb.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}"
+HHV     = "${@bb.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
+
+KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + int(bb.data.getVar('RMKV',d,1)) * 1000 + int(bb.data.getVar('PXAV',d,1)) * 100 + float(bb.data.getVar('HHV',d,1)))}"
+
+module_conf_h3600_micro = "alias ipaq_hal_3600 h3600_micro"
+module_conf_h3600_asic = "alias ipaq_hal_3800 h3600_asic"
+module_conf_sa1100_ir = "alias irda0 sa1100_ir"
+module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1"
+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_autoload_h3600_ts = "h3600_ts"
+module_autoload_apm = "apm"
+module_autoload_h3600-uda1341 = "h3600-uda1341"
+module_autoload_af_packet = "af_packet"
+module_autoload_ppp_async = "ppp_async"
+module_autoload_usb-eth = "usb-eth"
+
+FILES_kernel += "/etc/init.d/ipaq-hal"
+INITSCRIPT_NAME = "ipaq-hal"
+INITSCRIPT_PARAMS = "start 21 S ."
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config
+}
+
+do_install_append() {
+        install -d ${D}${sysconfdir}/init.d
+        install ${WORKDIR}/ipaq-hal.init ${D}${sysconfdir}/init.d/ipaq-hal
+}
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index 3de66204d2..3db610ecc2 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -378,7 +378,7 @@ DEPENDS += " ${task-opie-wlan}"
 task-qpe-emulators = "\
 frodo \
 snes9x-sdl-qpe \
-uae \
+e-uae \
 "
 RDEPENDS_task-qpe-emulators = "${task-qpe-emulators}"
 DEPENDS += " ${task-qpe-emulators}"