Merge bk://oe-devel@oe-devel.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/11/27 12:48:07+01:00 uni-frankfurt.de!mickeyl
use ${HANDHELDS_CVS} (see default in oe.conf) instead of hardcoding cvs://cvs.handhelds.org/...

2004/11/27 12:46:42+01:00 uni-frankfurt.de!mickeyl
download zbedic from cvs

BKrev: 41a86995A2uN5wW4nZHxDvYiHvh3-A

8 files changed, 64 insertions, 7 deletions

diff --git a/linux/handhelds-pxa-2.6_cvs.oe b/linux/handhelds-pxa-2.6_cvs.oe
index 4e9a0f5abf..9713256abf 100644
--- a/linux/handhelds-pxa-2.6_cvs.oe
+++ b/linux/handhelds-pxa-2.6_cvs.oe
@@ -10,7 +10,7 @@ COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-pxa-${PV}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel26  \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig"
 
 S = "${WORKDIR}/kernel26"
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
index 905ba4a49e..785be3b0b8 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "ipaqpxa"
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-ipaqpxa \
 	   file://ipaq-hal.init \
 	   file://linux-2.4-no-short-loads.patch;patch=1 \
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe
index 50c4d88cb0..6321499630 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.13.oe
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "ipaqpxa"
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-ipaqpxa \
 	   file://ipaq-hal.init \
 	   file://linux-2.4-no-short-loads.patch;patch=1 \
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
index 58755e4452..f67ab8ddf8 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.14.oe
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "ipaqpxa"
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-ipaqpxa \
 	   file://ipaq-hal.init \
 	   file://linux-2.4-no-short-loads.patch;patch=1 \
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe
index 6f2ab3f42b..427dd142f0 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe
@@ -8,7 +8,7 @@ PACKAGE_ARCH = "ipaqpxa"
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
 	   file://defconfig-ipaqpxa \
 	   file://ipaq-hal.init \
 	   file://linux-2.4-no-short-loads.patch;patch=1 \
diff --git a/linux/handhelds-sa-2.6_cvs.oe b/linux/handhelds-sa-2.6_cvs.oe
index f0f13a8a96..6b2b5adbff 100644
--- a/linux/handhelds-sa-2.6_cvs.oe
+++ b/linux/handhelds-sa-2.6_cvs.oe
@@ -10,7 +10,7 @@ COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
 
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel26  \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig-${MACHINE}"
 
 S = "${WORKDIR}/kernel26"
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
index 429211f75d..2c457ae07e 100644
--- a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
+++ b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
@@ -9,7 +9,7 @@ KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig-ipaqsa \
 	   file://ipaq-hal.init \
 	   file://ipsec.patch;patch=1"
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe
index e69de29bb2..b5bf57692d 100644
--- a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe
+++ b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe
@@ -0,0 +1,57 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
+MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
+LICENSE = "GPL"
+PR = "r0"
+
+PACKAGE_ARCH = "ipaqsa"
+KERNEL_CCSUFFIX = "-3.3.3"
+COMPATIBLE_HOST = "arm.*-linux"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig-ipaqsa \
+	   file://ipaq-hal.init"
+
+S = "${WORKDIR}/kernel"
+
+inherit kernel update-rc.d
+
+K_MAJOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
+K_MINOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
+K_MICRO = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
+RMKV    = "${@oe.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}"
+PXAV    = "${@oe.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}"
+HHV     = "${@oe.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
+
+KERNEL_PRIORITY = "${@'%d' % (int(oe.data.getVar('K_MAJOR',d,1)) * 100000000 + int(oe.data.getVar('K_MINOR',d,1)) * 1000000 + int(oe.data.getVar('K_MICRO',d,1)) * 10000 + int(oe.data.getVar('RMKV',d,1)) * 1000 + int(oe.data.getVar('PXAV',d,1)) * 100 + float(oe.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_generic_sleeve = "h3600_generic_sleeve"
+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}/etc/init.d
+        install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
+}