[oe-commits] Angus Ainslie : More gta03->3d7k renaming

[GIT User account]

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

Author: Angus Ainslie <nytowl at openmoko.org>
Date:   Thu Mar  5 12:05:35 2009 -0700

More gta03->3d7k renaming

---

 packages/linux/linux-openmoko-devel_git.bb  |   21 ++++++++++++++-------
 packages/linux/linux-openmoko-stable_git.bb |    4 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index 4860cca..53f5108 100644
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -8,19 +8,26 @@ DEFAULT_PREFERENCE = "-1"
 KERNEL_RELEASE = "2.6.28"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
-OEV = "oe1"
-PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r2"
+OMV = "andy-tracking"
+PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCREV}"
+PR = "r3"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
-  file://openwrt-ledtrig-netdev.patch;patch=1 \
-  file://defconfig-oe.patch \
 "
 S = "${WORKDIR}/git"
 
 do_configure_prepend() {
-	install -m 644 ./arch/arm/configs/gta02-packaging-defconfig ${WORKDIR}/defconfig-oe
-	cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
+	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}
 }
 
diff --git a/packages/linux/linux-openmoko-stable_git.bb b/packages/linux/linux-openmoko-stable_git.bb
index 3b700e5..37398ae 100644
--- a/packages/linux/linux-openmoko-stable_git.bb
+++ b/packages/linux/linux-openmoko-stable_git.bb
@@ -25,8 +25,8 @@ do_configure_prepend() {
 	if [ ${MACHINE} = "om-gta02" ] ; then
 		install -m 644 ./arch/arm/configs/gta02_packaging_defconfig ${WORKDIR}/defconfig-oe
 	fi
-	if [ ${MACHINE} = "om-gta03" ] ; then
-		install -m 644 ./arch/arm/configs/gta03_defconfig ${WORKDIR}/defconfig-oe
+	if [ ${MACHINE} = "om-3d7k" ] ; then
+		install -m 644 ./arch/arm/configs/om_3d7k_defconfig ${WORKDIR}/defconfig-oe
 	fi
 #	cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
 }