[oe-commits] Mike Westerhof : SHR: linux kernel - add linux-openmoko-shr-devel kernel recipe.

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: f1fa5981d57286c49fd5191d37538680f7835efd
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f1fa5981d57286c49fd5191d37538680f7835efd

Author: Mike Westerhof <mwester at dls.net>
Date:   Mon Jun  1 01:21:06 2009 -0500

SHR: linux kernel - add linux-openmoko-shr-devel kernel recipe.
This obsoletes the patches in the SHR overlay.

---

 conf/distro/include/shr-autorev-unstable.inc       |    2 +-
 conf/distro/include/shr-autorev.inc                |    2 +-
 conf/distro/include/shr-om-gta02.conf              |    2 +-
 .../linux-openmoko-shr-devel/fix-install.patch     |   23 ++++++++++++++++++
 recipes/linux/linux-openmoko-shr-devel_git.bb      |   25 ++++++++++++++++++++
 5 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc
index 4b144fe..e7a0d96 100644
--- a/conf/distro/include/shr-autorev-unstable.inc
+++ b/conf/distro/include/shr-autorev-unstable.inc
@@ -38,7 +38,7 @@ SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}"
 #SRCREV_pn-python-elementary = "40756"
 
 # KERNEL
-SRCREV_pn-linux-openmoko-2.6.28 = "${AUTOREV}"
+SRCREV_pn-linux-openmoko-shr-devel = "${AUTOREV}"
 SRCREV_pn-linux-eten = "df9715883efa3e6a88866813168fabb1c16b0b7a"
 
 # other stuff
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 1f412cd..ab4bd39 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -20,7 +20,7 @@ DISTRO_DEV_MANAGER = "udev"
 # with each change.  So if you change one of these, go to the kernel recipe
 # and bump the OEV value up as well.
 SRCREV_pn-linux-eten = "df9715883efa3e6a88866813168fabb1c16b0b7a"
-SRCREV_pn-linux-openmoko-2.6.28 = "f16c3431a1a7510eb3504ec5d96677dd0fac4cd6"
+SRCREV_pn-linux-openmoko-shr-devel = "f16c3431a1a7510eb3504ec5d96677dd0fac4cd6"
 
 PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
 PREFERRED_PROVIDER_frameworkd = "frameworkd"
diff --git a/conf/distro/include/shr-om-gta02.conf b/conf/distro/include/shr-om-gta02.conf
index 2267878..2d830d4 100644
--- a/conf/distro/include/shr-om-gta02.conf
+++ b/conf/distro/include/shr-om-gta02.conf
@@ -1,2 +1,2 @@
 # SHR-specific overrides to the machine.conf file
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-2.6.28"
+PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
diff --git a/recipes/linux/linux-openmoko-shr-devel/fix-install.patch b/recipes/linux/linux-openmoko-shr-devel/fix-install.patch
new file mode 100644
index 0000000..b14ca7d
--- /dev/null
+++ b/recipes/linux/linux-openmoko-shr-devel/fix-install.patch
@@ -0,0 +1,23 @@
+From: Steve Sakoman <steve at sakoman.com>
+Date: Mon, 18 Aug 2008 16:07:31 +0000 (-0700)
+Subject: scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
+X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=f039944bdd491cde7327133e9976881d3133ae70
+
+scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
+
+This was causing build failures on some machines
+---
+
+diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
+index 6bf8e87..fb20532 100644
+--- a/scripts/Makefile.fwinst
++++ b/scripts/Makefile.fwinst
+@@ -37,7 +37,7 @@
+        @true
+
+ quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@)
+-      cmd_install = $(INSTALL) -m0644 $< $@
++      cmd_install = $(INSTALL) -m 0644 $< $@
+
+ $(installed-fw-dirs):
+        $(call cmd,mkdir)
diff --git a/recipes/linux/linux-openmoko-shr-devel_git.bb b/recipes/linux/linux-openmoko-shr-devel_git.bb
new file mode 100644
index 0000000..2a98ce6
--- /dev/null
+++ b/recipes/linux/linux-openmoko-shr-devel_git.bb
@@ -0,0 +1,25 @@
+require linux.inc
+require linux-openmoko.inc
+
+DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Smartphones"
+
+KERNEL_RELEASE = "2.6.29"
+KERNEL_VERSION = "2.6.29-rc3"
+
+OMV = "oe10"
+PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCREV}"
+PR = "r3.5"
+
+SRC_URI = "\
+  git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
+  file://fix-install.patch;patch=1 \
+"
+S = "${WORKDIR}/git"
+
+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
+}