[oe-commits] Mike Westerhof : Openmoko: linux-openmoko-2.6. 29 - commit new recipe tied to upstream kernel

[GIT User account]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 01742d3aa24e37c344140b809e6038bccf7fdcb3
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=01742d3aa24e37c344140b809e6038bccf7fdcb3

Author: Mike Westerhof <mwester at dls.net>
Date:   Wed Apr 15 20:01:10 2009 -0500

Openmoko: linux-openmoko-2.6.29 - commit new recipe tied to upstream kernel
git repo, which is currently at 2.6.29-rc3 + Openmoko patches.  Note that
the preferred kernel remains unchanged; select this kernel via local.conf.

---

 conf/distro/include/sane-srcrevs.inc      |    2 +-
 recipes/linux/linux-openmoko-devel_git.bb |   26 ++++++++++----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 81488c0..cc1de8d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -101,7 +101,7 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1085"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "34240a1c06ae36180dee695aa25bbae869b2aa26"
-SRCREV_pn-linux-openmoko-devel ?= "34240a1c06ae36180dee695aa25bbae869b2aa26"
+SRCREV_pn-linux-openmoko-devel ?= "9a690f4a8733bbeeba62ff28ae38ff7f869e4b05"
 SRCREV_pn-linux-openmoko-stable ?= "0e5fe639e234cdeb11d8441f19c5b3109a8b6a17"
 SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-llvm-gcc4 ?= "374"
diff --git a/recipes/linux/linux-openmoko-devel_git.bb b/recipes/linux/linux-openmoko-devel_git.bb
index 53f5108..20fd4f8 100644
--- a/recipes/linux/linux-openmoko-devel_git.bb
+++ b/recipes/linux/linux-openmoko-devel_git.bb
@@ -1,33 +1,27 @@
 require linux.inc
 require linux-openmoko.inc
 
-DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones"
+DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Smartphones"
 
 DEFAULT_PREFERENCE = "-1"
 
 KERNEL_RELEASE = "2.6.28"
-KERNEL_VERSION = "${KERNEL_RELEASE}"
+KERNEL_VERSION = "2.6.29-rc3"
 
 OMV = "andy-tracking"
 PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
+#  file://fix-install.patch;patch=1 \
 "
 S = "${WORKDIR}/git"
 
-do_configure_prepend() {
-	if [ ${MACHINE} = "om-gta01" ] ; then
-		install -m 644 ./arch/arm/configs/gta01_moredrivers_defconfig ${WORKDIR}/defconfig-oe
-	fi
-	if [ ${MACHINE} = "om-gta02" ] ; then
-		install -m 644 ./arch/arm/configs/gta02_packaging_defconfig ${WORKDIR}/defconfig-oe
-	fi
-	if [ ${MACHINE} = "om-3d7k" ] ; then
-		install -m 644 ./arch/arm/configs/om_3d7k_defconfig ${WORKDIR}/defconfig-oe
-	fi
-#	install -m 644 ./arch/arm/configs/gta02_packaging_defconfig ${WORKDIR}/defconfig-oe
-#	cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
-}
+CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
+CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig"
+CONFIG_NAME_om-gta03 = "gta03_defconfig"
 
+do_configure_prepend() { 
+	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
+}