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

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: e9a0747532601b393e46a861bca6b1f929d43605
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e9a0747532601b393e46a861bca6b1f929d43605

Author: Mike Westerhof <mwester at dls.net>
Date:   Wed Apr 15 23:33:57 2009 -0500

Revert "Openmoko: linux-openmoko-2.6.29 - commit new recipe tied to upstream kernel"

This reverts commit fb7eba513b2d59c33163bd380019a4cabc8b6782.

Change rejected.

---

 conf/distro/include/angstrom.inc                   |    1 -
 conf/distro/include/sane-srcrevs.inc               |    1 -
 .../linux/linux-openmoko-2.6.29/defconfig-oe.patch |   12 -------
 .../linux/linux-openmoko-2.6.29/fix-install.patch  |   23 --------------
 recipes/linux/linux-openmoko-2.6.29_git.bb         |   31 --------------------
 5 files changed, 0 insertions(+), 68 deletions(-)

diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index dd6eac4..60f2e55 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -92,7 +92,6 @@ ARM_KEEP_OABI = "0"
 # Do keep OABI compat for om-gta01 to keep the gllin binary working
 ARM_KEEP_OABI_pn-linux-openmoko-2.6.24_om-gta01 = "1"
 ARM_KEEP_OABI_pn-linux-openmoko-2.6.28_om-gta01 = "1"
-ARM_KEEP_OABI_pn-linux-openmoko-2.6.29_om-gta01 = "1"
 
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 607b752..2734271 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -114,7 +114,6 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "8aa6cdde17381dd8865d10ba15ee62c092ec2ba5"
-SRCREV_pn-linux-openmoko-2.6.29 ?= "9a690f4a8733bbeeba62ff28ae38ff7f869e4b05"
 SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
 SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-llvm-gcc4 ?= "374"
diff --git a/recipes/linux/linux-openmoko-2.6.29/defconfig-oe.patch b/recipes/linux/linux-openmoko-2.6.29/defconfig-oe.patch
deleted file mode 100644
index 3f65387..0000000
--- a/recipes/linux/linux-openmoko-2.6.29/defconfig-oe.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gta02-packaging-defconfig	2009-01-12 13:09:33.000000000 +0000
-+++ defconfig-oe	2009-01-12 13:18:23.000000000 +0000
-@@ -337,9 +337,6 @@
- #
- # At least one emulation must be selected
- #
--CONFIG_FPE_NWFPE=y
--# CONFIG_FPE_NWFPE_XP is not set
--# CONFIG_FPE_FASTFPE is not set
- 
- #
- # Userspace binary formats
diff --git a/recipes/linux/linux-openmoko-2.6.29/fix-install.patch b/recipes/linux/linux-openmoko-2.6.29/fix-install.patch
deleted file mode 100644
index 46bc25a..0000000
--- a/recipes/linux/linux-openmoko-2.6.29/fix-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 @@ install-all-dirs: $(installed-fw-dirs)
- 	@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-2.6.29_git.bb b/recipes/linux/linux-openmoko-2.6.29_git.bb
deleted file mode 100644
index 1942350..0000000
--- a/recipes/linux/linux-openmoko-2.6.29_git.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-require linux.inc
-require linux-openmoko.inc
-
-DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones"
-
-# NOTE: This recipe is tied to an upstream git repo; the KERNEL_VERSION must match the
-# the kernel version string as built, otherwise depmod will silently fail when building
-# the image itself.  KERNEL_RELEASE should match the kernel version in the recipe name.
-# This may have to be adjusted as the upstream git repository changes!
-KERNEL_RELEASE = "2.6.29"
-KERNEL_VERSION = "2.6.29-rc3"
-
-OEV = "oe1"
-PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "\
-  git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
-  file://fix-install.patch;patch=1 \
-  file://defconfig-oe.patch \
-"
-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
-	cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
-}