[oe-commits] org.oe.dev linux-openmoko_2.6.24.bb : openmoko kernel has diverged so same kernel does

[xora commit]

linux-openmoko_2.6.24.bb : openmoko kernel has diverged so same kernel does
not support two machines anymore.

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 39f05de8480aa04acd8f165a3ab42754a631b206
ViewMTN: http://monotone.openembedded.org/revision/info/39f05de8480aa04acd8f165a3ab42754a631b206
Files:
1
conf/distro/openmoko.conf
packages/linux/linux-openmoko.inc
packages/linux/linux-openmoko_2.6.24.bb
Diffs:

#
# mt diff -r1af32cac223255a8b64acab6e9b8aa5a8c5f3142 -r39f05de8480aa04acd8f165a3ab42754a631b206
#
#
#
# patch "conf/distro/openmoko.conf"
#  from [7b931a240a27b8440a071d8b6cd0b456a9005005]
#    to [cd50da2fc76ee8d83d951fec318dec373f73fc56]
# 
# patch "packages/linux/linux-openmoko.inc"
#  from [6f24382b0e0681456daf075975f293e1e06b0fb2]
#    to [777a8e257ca20eaa4dce93b025330219707a5f9a]
# 
# patch "packages/linux/linux-openmoko_2.6.24.bb"
#  from [519951860626242a7234a461de273b589811def8]
#    to [7f91b97bcdb927a494ac31c550753100bfa612e7]
#
============================================================
--- conf/distro/openmoko.conf	7b931a240a27b8440a071d8b6cd0b456a9005005
+++ conf/distro/openmoko.conf	cd50da2fc76ee8d83d951fec318dec373f73fc56
@@ -47,10 +47,13 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd"
 # override the PACKAGE_ARCH of certain packages for openmoko distro
 #
 # Same kernel runs on both these machines
-PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta01 = "${MACHINE_CLASS}"
-PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta02 = "${MACHINE_CLASS}"
+# Currently not used but left here in case someone wants to switch on
+# quickly
+#PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}"
+#PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}"
+#PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta01 = "${MACHINE_CLASS}"
+#PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta02 = "${MACHINE_CLASS}"
+
 # Same kernel so same usb
 PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta01 = "${MACHINE_CLASS}"
 PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta02 = "${MACHINE_CLASS}"
============================================================
--- packages/linux/linux-openmoko.inc	6f24382b0e0681456daf075975f293e1e06b0fb2
+++ packages/linux/linux-openmoko.inc	777a8e257ca20eaa4dce93b025330219707a5f9a
@@ -1,9 +1,7 @@ do_deploy_append() {
 # extra stuff we need for openmoko that is not in linux.inc
 do_deploy_append() {
-	mv ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE_CLASS}.tgz
-	mv ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin
 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
-	ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_CLASS}-latest.bin
+	ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_ARCH}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_ARCH}-latest.bin
 }
 
 RDEPENDS_kernel-image += "mtd-utils"
============================================================
--- packages/linux/linux-openmoko_2.6.24.bb	519951860626242a7234a461de273b589811def8
+++ packages/linux/linux-openmoko_2.6.24.bb	7f91b97bcdb927a494ac31c550753100bfa612e7
@@ -11,10 +11,10 @@ SRCREV_FORMAT = "patches"
 # re-enabled this when feature is fully implemented in OE
 #SRCREV_FORMAT = "patches-rconfig"
 SRCREV_FORMAT = "patches"
-CONFIG_REV = "4165"
-
+CONFIG_REV_fic-gta01 = "4251"
+CONFIG_REV_fic-gta02 = "4251"
 PV = "${VANILLA_VERSION}+svnr${SRCREV}-r${CONFIG_REV}"
-PR = "r4"
+PR = "r5"
 
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"
@@ -55,11 +55,14 @@ module_autoload_s3cmci = "s3cmci"
 # sd/mmc
 module_autoload_s3cmci = "s3cmci"
 
+CONFIG_NAME_fic-gta01 = "gta01"
+CONFIG_NAME_fic-gta02 = "gta02"
+
 do_prepatch() {
         mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
         mv patches patches.openmoko
         mv .pc .pc.old
-        mv ${WORKDIR}/config/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig
+        mv ${WORKDIR}/config/defconfig-${CONFIG_NAME} ${WORKDIR}/defconfig
 }
 
 addtask prepatch after do_unpack before do_patch