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

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

2005/05/31 21:19:39+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded

2005/05/31 21:19:18+02:00 utwente.nl!koen
  Rename: packages/maemo/osso-gwconnect_0.70.2.bb -> packages/maemo/osso-gwconnect_0.70.1.bb. some upstream person removed the sources. ~lart maemo/nokia

2005/05/31 20:58:56+02:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2005/05/31 20:58:35+02:00 dyndns.org!reenoo
handhelds-sa: upgrade to -hh40. DEFAULT_PREFERENCE=-1 since not yet tested on a device.

BKrev: 429cbd9aY-JHvYdCqIo26US7bO0oZA

diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh39/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600
similarity index 100%
rename from packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh39/defconfig-h3600
rename to packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600

diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh39.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh39.bb
deleted file mode 100644 (file)
index 1b09df7..0000000
--- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh39.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
-LICENSE = "GPL"
-PR = "r5"
-DEFAULT_PREFERENCE = "-1"
-
-KERNEL_CCSUFFIX = "-3.3.3"
-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/maemo/osso-gwconnect_0.70.2.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb
similarity index 100%
rename from packages/maemo/osso-gwconnect_0.70.2.bb
rename to packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh40.bb

diff --git a/packages/maemo/osso-gwconnect_0.70.1.bb b/packages/maemo/osso-gwconnect_0.70.1.bb
new file mode 100644 (file)
index 0000000..e69de29