[oe-commits] org.oe.dev merge of '377affcc88dad749e2168484cc2d59021e306d9b'
xora commit
openembedded-commits at lists.openembedded.org
Mon Oct 15 10:17:26 UTC 2007
merge of '377affcc88dad749e2168484cc2d59021e306d9b'
and 'c76fe54295e0ac9fbb43c7c1d9d72d130c96f33a'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: c126d75a3abc575727d231339e1a4b186d51362d
ViewMTN: http://monotone.openembedded.org/revision/info/c126d75a3abc575727d231339e1a4b186d51362d
Files:
1
packages/gtk+/gtk+-fastscaling_2.10.14.bb
conf/distro/openmoko.conf
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/gtk+/gtk+_2.10.14.bb
packages/linux/linux-openmoko.inc
conf/distro/include/sane-srcrevs.inc
Diffs:
#
# mt diff -r377affcc88dad749e2168484cc2d59021e306d9b -rc126d75a3abc575727d231339e1a4b186d51362d
#
#
#
# add_file "packages/gtk+/gtk+-fastscaling_2.10.14.bb"
# content [ce64606a5f1dcd6be709945a0b16a7f87bddc59f]
#
# 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/gtk+/gtk+_2.10.14.bb"
# from [66f337108f751a97bbfe129832a7cd2aef048d90]
# to [04c9956cab18c353c456a1340133ce32f3ec30af]
#
# patch "packages/linux/linux-openmoko.inc"
# from [b9222c4501de8897b4b95070063bf7ad153f484d]
# to [1f02706985352c91ef85b46bb76e79e552b66368]
#
============================================================
--- packages/gtk+/gtk+-fastscaling_2.10.14.bb ce64606a5f1dcd6be709945a0b16a7f87bddc59f
+++ packages/gtk+/gtk+-fastscaling_2.10.14.bb ce64606a5f1dcd6be709945a0b16a7f87bddc59f
@@ -0,0 +1,14 @@
+require gtk+_${PV}.bb
+
+FILESPATH_prepend = "${FILE_DIRNAME}/gtk+-${PV}:"
+
+DEFAULT_PREFERENCE = "-1"
+
+PROVIDES = "gtk+"
+RPROVIDES_${PN} = "gtk+"
+PR = "r0"
+
+SRC_URI += "file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
+
+S = "${WORKDIR}/gtk+-${PV}"
+
============================================================
--- 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/gtk+/gtk+_2.10.14.bb 66f337108f751a97bbfe129832a7cd2aef048d90
+++ packages/gtk+/gtk+_2.10.14.bb 04c9956cab18c353c456a1340133ce32f3ec30af
@@ -30,12 +30,3 @@ EXTRA_OECONF += "${@get_gtk_fpu_setting(
require gtk-fpu.inc
EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
-# try to squeeze some more performance out of it
-SRC_URI_append_fic-gta01 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
-SRC_URI_append_fic-gta02 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
-
-# this doesn't seem to work
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-# let's do it manually then
-PACKAGE_ARCH_fic-gta01 = "fic-gta01"
-PACKAGE_ARCH_fic-gta02 = "fic-gta02"
============================================================
--- 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
}
#
# mt diff -rc76fe54295e0ac9fbb43c7c1d9d72d130c96f33a -rc126d75a3abc575727d231339e1a4b186d51362d
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [32c8bb4a0fd7ec05c2bb58544741775fd310207b]
# to [e19cc489466ab1c83a6c5132c5524e2bb08ab088]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc 32c8bb4a0fd7ec05c2bb58544741775fd310207b
+++ conf/distro/include/sane-srcrevs.inc e19cc489466ab1c83a6c5132c5524e2bb08ab088
@@ -87,7 +87,7 @@ SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-theme-standard2 ?= "3044"
SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964"
SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3088"
+SRCREV_pn-openmoko-today2 ?= "3169"
SRCREV_pn-openmoko-today2-folders ?= "2680"
SRCREV_pn-openocd ?= "206"
SRCREV_pn-openocd-native ?= "206"
More information about the Openembedded-commits
mailing list