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

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

2005/06/01 16:21:13+02:00 utwente.nl!koen
linux-omap1_2.6.12_rc2.bb:  de-omap5912osk-ize the .bb a bit. Everyhting 5912 related should be using overrides now

2005/06/01 16:12:02+02:00 utwente.nl!koen
nokia770.conf:  use tune-arm926ejs instead of xscale
tune-arm926ejs.conf:  set PACKAGE_ARCH to arm926ejs
osso-af-utils_0.4.bb:  typo--

BKrev: 429dc8c9dgJ24USve8RZRxOdgR8NUQ

diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index ef381f1..468e1e9 100644 (file)
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -13,8 +13,9 @@ GPE_EXTRA_INSTALL += "gaim sylpheed"
 
 include conf/machine/handheld-common.conf
 
-# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
-include conf/machine/tune-xscale.conf
+# Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/tune-arm926ejs.conf
+
 
 #size of the root partition (yes, it is 123 MB)
 ROOT_FLASH_SIZE = "123"

diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/tune-arm926ejs.conf
index e69de29..b07b603 100644 (file)
--- a/conf/machine/tune-arm926ejs.conf
+++ b/conf/machine/tune-arm926ejs.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
+PACKAGE_ARCH = "arm926ejs"

diff --git a/packages/linux/linux-omap1_2.6.12_rc2.bb b/packages/linux/linux-omap1_2.6.12_rc2.bb
index 67f82be..f59999c 100644 (file)
--- a/packages/linux/linux-omap1_2.6.12_rc2.bb
+++ b/packages/linux/linux-omap1_2.6.12_rc2.bb
@@ -3,8 +3,9 @@ DESCRIPTION = "Linux kernel for OMAP processors"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.12-rc2.tar.bz2 \
-           http://www.muru.com/linux/omap/patches/patch-2.6.12-rc2-omap1.bz2;patch=1 \
-           file://defconfig"
+           http://www.muru.com/linux/omap/patches/patch-2.6.12-rc2-omap1.bz2;patch=1"
+
+SRC_URI_append_omap5912osk = "file://defconfig"
 
 S = "${WORKDIR}/linux-2.6.12-rc2"
 
@@ -23,12 +24,12 @@ python __anonymous () {
 }
 
 
-do_configure_prepend() {
+do_configure_prepend_omap5912osk() {
        install -m 0644 ${WORKDIR}/defconfig ${S}/.config
         oe_runmake oldconfig
 }
 
-do_deploy() {
+do_deploy_omap5912osk() {
         install -d ${DEPLOY_DIR}/images
         arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR}/linux.bin
         gzip -f -9 ${DEPLOY_DIR}/linux.bin
@@ -37,6 +38,7 @@ do_deploy() {
 #        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
 }
 
+
 do_deploy[dirs] = "${S}"
 
 addtask deploy before do_build after do_compile

diff --git a/packages/maemo/osso-af-utils_0.4.bb b/packages/maemo/osso-af-utils_0.4.bb
index e69de29..e80711b 100644 (file)
--- a/packages/maemo/osso-af-utils_0.4.bb
+++ b/packages/maemo/osso-af-utils_0.4.bb
@@ -0,0 +1,12 @@
+LICENSE =      "LGPL"
+MAINTAINER=    "Koen Kooi <koen@handhelds.org>"
+
+DEPENDS =      "x11 dbus libosso"
+SRC_URI =      "http://stage.maemo.org:80/pool/maemo/ossw/source/o/osso-af-utils/osso-af-utils_${PV}-1.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage() {
+       autotools_stage_includes
+
+}