[oe-commits] org.oe.dev distro/openmoko.conf : make gta01/02 equivalent machines for packages

[xora commit]

distro/openmoko.conf : make gta01/02 equivalent machines for packages
where the resulting packages are in fact identical.

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: c76fe54295e0ac9fbb43c7c1d9d72d130c96f33a
ViewMTN: http://monotone.openembedded.org/revision/info/c76fe54295e0ac9fbb43c7c1d9d72d130c96f33a
Files:
1
conf/distro/openmoko.conf
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/linux/linux-openmoko.inc
Diffs:

#
# mt diff -r394c920b98ef99e9e6c302341352c7229dd1d226 -rc76fe54295e0ac9fbb43c7c1d9d72d130c96f33a
#
# 
# 
# patch "conf/distro/openmoko.conf"
#  from [0a270926afec0c57fe65b21d888d50f318f58085]
#    to [9e093358b00d1965dc02e8efe6c6716c5e56fb80]
# 
# patch "conf/machine/fic-gta01.conf"
#  from [3b60c2c075f0438fce7fc3fff2336638b598b475]
#    to [e64606b6a28f0f3b4b886039026269014451aa2c]
# 
# patch "conf/machine/fic-gta02.conf"
#  from [58d451ef05171ddd801a8f0b60c8a31bfd0c4b56]
#    to [33570e2cd1fc3f48a20119d6de06621cd900b3ed]
# 
# patch "packages/linux/linux-openmoko.inc"
#  from [b9222c4501de8897b4b95070063bf7ad153f484d]
#    to [1f02706985352c91ef85b46bb76e79e552b66368]
# 
============================================================
--- conf/distro/openmoko.conf	0a270926afec0c57fe65b21d888d50f318f58085
+++ conf/distro/openmoko.conf	9e093358b00d1965dc02e8efe6c6716c5e56fb80
@@ -39,3 +39,31 @@ require conf/distro/include/preferred-op
 # Bleeding-edge developers should add the following line to their local.conf:
 # require conf/distro/include/moko-autorev.inc
 
+# 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}"
+# Same touchscreen on both these machines
+PACKAGE_ARCH_pn-pointercal_fic-gta01 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-pointercal_fic-gta02 = "${MACHINE_CLASS}"
+SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta01 = "0"
+SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta02 = "0"
+# 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}"
+# same kernel so same keymaps
+PACKAGE_ARCH_pn-keymaps_fic-gta01 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-keymaps_fic-gta02 = "${MACHINE_CLASS}"
+# neod knows about both machines
+PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}"
+PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}"
+
+# Select packge versions we wash to use.
+PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
+PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
+
+# deploy gta01 and gta02 in ${MACHINE_CLASS} directory
+DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
+DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
+
============================================================
--- conf/machine/fic-gta01.conf	3b60c2c075f0438fce7fc3fff2336638b598b475
+++ conf/machine/fic-gta01.conf	e64606b6a28f0f3b4b886039026269014451aa2c
@@ -5,7 +5,8 @@ TARGET_ARCH = "arm"
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
+MACHINE_CLASS = "neo1973"
+PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
============================================================
--- conf/machine/fic-gta02.conf	58d451ef05171ddd801a8f0b60c8a31bfd0c4b56
+++ conf/machine/fic-gta02.conf	33570e2cd1fc3f48a20119d6de06621cd900b3ed
@@ -5,7 +5,8 @@ TARGET_ARCH = "arm"
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4t"
+MACHINE_CLASS = "neo1973"
+PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
 UBOOT_ENTRYPOINT = "30008000"
@@ -46,4 +47,4 @@ include conf/machine/include/tune-arm920
 include conf/machine/include/tune-arm920t.inc
 
 # build YAFFS2
+IMAGE_FSTYPES ?= "jffs2 yaffs2"
-IMAGE_FSTYPES =+ "yaffs2"
============================================================
--- packages/linux/linux-openmoko.inc	b9222c4501de8897b4b95070063bf7ad153f484d
+++ packages/linux/linux-openmoko.inc	1f02706985352c91ef85b46bb76e79e552b66368
@@ -83,13 +83,13 @@ do_deploy() {
 #
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}.bin
-	tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
+	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE_CLASS}.bin
+	tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE_CLASS}.tgz -C ${D} lib
 	${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
 	rm -f linux.bin.gz
 	gzip -9 linux.bin
-	${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
-	ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE}-latest.bin
+	${STAGING_BINDIR_NATIVE}/uboot-mkimage -A arm -O linux -T kernel -C gzip -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA01/2)" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin
+	ln -sf ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE_CLASS}.bin ${DEPLOY_DIR_IMAGE}/uImage-${MACHINE_CLASS}-latest.bin
 	rm -f linux.bin.gz
 }