[oe-commits] org.oe.dev merge of '192efb6d3bfaa24757749bea21bc0515b1017108'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Aug 5 06:54:30 UTC 2007
merge of '192efb6d3bfaa24757749bea21bc0515b1017108'
and 'baf87732958baffc539a6e90858e6c2fe5972a1e'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 0e52f1e01921645006874bb54726884ce2137d0c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0e52f1e01921645006874bb54726884ce2137d0c
Files:
1
packages/uboot/u-boot-mkimage-gta01-native
packages/uboot/u-boot-mkimage-openmoko-native
packages/uboot/u-boot-mkimage-gta01-native_oe.bb
packages/uboot/u-boot-mkimage-openmoko-native_oe.bb
packages/uboot/uboot-gta01_svn.bb
packages/uboot/uboot-openmoko_svn.bb
packages/gtk+/gtk+_2.10.14.bb
packages/linux/linux-gta01.inc
packages/linux/linux-gta01_2.6.21.3.bb
packages/linux/linux-gta01_2.6.21.5.bb
packages/linux/linux-smdk2443_2.6.20+git.bb
packages/linux/linux.inc
conf/distro/include/preferred-gpe-versions-2.8.inc
Diffs:
#
# mt diff -r192efb6d3bfaa24757749bea21bc0515b1017108 -r0e52f1e01921645006874bb54726884ce2137d0c
#
#
#
# rename "packages/uboot/u-boot-mkimage-gta01-native"
# to "packages/uboot/u-boot-mkimage-openmoko-native"
#
# rename "packages/uboot/u-boot-mkimage-gta01-native_oe.bb"
# to "packages/uboot/u-boot-mkimage-openmoko-native_oe.bb"
#
# rename "packages/uboot/uboot-gta01_svn.bb"
# to "packages/uboot/uboot-openmoko_svn.bb"
#
# patch "packages/gtk+/gtk+_2.10.14.bb"
# from [81d88b860767ea54cfcd4a8eee4be9c678e3a3ed]
# to [24217fbf69efe0b63507cafaf62a0697c73f3585]
#
# patch "packages/linux/linux-gta01.inc"
# from [b9cd2d85a96c0356b675190788e767d1e96ca9c5]
# to [e61ffbfbb60a872ecdc4780ba4e38014521061ed]
#
# patch "packages/linux/linux-gta01_2.6.21.3.bb"
# from [a2e7d818d98132928b2ee4a8056f77cef18f111e]
# to [b3c4657d21eee337514632f216cab7f23b395109]
#
# patch "packages/linux/linux-gta01_2.6.21.5.bb"
# from [b1936abf638c2ef95ea6ca878f69b3ccc447851d]
# to [e6db6ff2a3c5110427abc294b19a748b07070848]
#
# patch "packages/linux/linux-smdk2443_2.6.20+git.bb"
# from [a1840195b97c8cc47bdb27762c8a012f7766475c]
# to [c27379189e17f0ff7e634ba08b7076848bbe8924]
#
# patch "packages/linux/linux.inc"
# from [08e72ce149668a87f2289e9d8b21ed7c99ea7fb8]
# to [86d436757b3b9cb61a1a381d76950ef21596b40c]
#
# patch "packages/uboot/uboot-openmoko_svn.bb"
# from [32eb07ab20fbe4bfcde0f6e323b372dcbb347192]
# to [dfadccc827c84da11256d43fc3d8e7caf1111222]
#
============================================================
--- packages/gtk+/gtk+_2.10.14.bb 81d88b860767ea54cfcd4a8eee4be9c678e3a3ed
+++ packages/gtk+/gtk+_2.10.14.bb 24217fbf69efe0b63507cafaf62a0697c73f3585
@@ -1,6 +1,6 @@ require gtk-2.10.inc
require gtk-2.10.inc
-PR = "r2"
+PR = "r3"
# disable per default - untested and not all patches included.
DEFAULT_PREFERENCE = "-1"
@@ -35,4 +35,9 @@ SRC_URI_append_fic-gta02 = " file://lowe
# 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-gta01.inc b9cd2d85a96c0356b675190788e767d1e96ca9c5
+++ packages/linux/linux-gta01.inc e61ffbfbb60a872ecdc4780ba4e38014521061ed
@@ -1,9 +1,9 @@ LICENSE = "GPL"
DESCRIPTION = "2.6 Linux Development Kernel for FIC Neo1973 (GTA01)"
SECTION = "kernel"
AUTHOR = "Harald Welte <laforge at openmoko.org>"
HOMEPAGE = "N/A"
LICENSE = "GPL"
-DEPENDS += "quilt-native uboot-gta01"
+DEPENDS += "quilt-native uboot-openmoko"
inherit kernel
============================================================
--- packages/linux/linux-gta01_2.6.21.3.bb a2e7d818d98132928b2ee4a8056f77cef18f111e
+++ packages/linux/linux-gta01_2.6.21.3.bb b3c4657d21eee337514632f216cab7f23b395109
@@ -1,10 +1,10 @@ MOKOR = "moko10"
require linux-gta01.inc
SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1"
MOKOR = "moko10"
-PR = "${MOKOR}-r3"
+PR = "${MOKOR}-r4"
VANILLA_VERSION = "2.6.21.3"
============================================================
--- packages/linux/linux-gta01_2.6.21.5.bb b1936abf638c2ef95ea6ca878f69b3ccc447851d
+++ packages/linux/linux-gta01_2.6.21.5.bb e6db6ff2a3c5110427abc294b19a748b07070848
@@ -1,10 +1,10 @@ MOKOR = "moko10"
require linux-gta01.inc
SRC_URI += "svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http"
SRC_URI += "file://fix-EVIOCGRAB-semantics.patch;patch=1"
MOKOR = "moko10"
-PR = "${MOKOR}-r1"
+PR = "r2"
VANILLA_VERSION = "2.6.21.5"
============================================================
--- packages/linux/linux-smdk2443_2.6.20+git.bb a1840195b97c8cc47bdb27762c8a012f7766475c
+++ packages/linux/linux-smdk2443_2.6.20+git.bb c27379189e17f0ff7e634ba08b7076848bbe8924
@@ -1,7 +1,7 @@ LICENSE = "GPL"
DESCRIPTION = "Linux Kernel for smdk2443 compatible machines"
SECTION = "kernel"
LICENSE = "GPL"
-DEPENDS += "u-boot-mkimage-gta01-native"
+DEPENDS += "u-boot-mkimage-openmoko-native"
PR = "r1"
============================================================
--- packages/linux/linux.inc 08e72ce149668a87f2289e9d8b21ed7c99ea7fb8
+++ packages/linux/linux.inc 86d436757b3b9cb61a1a381d76950ef21596b40c
@@ -1,13 +1,13 @@ LICENSE = "GPL"
DESCRIPTION = "Linux Kernel"
SECTION = "kernel"
LICENSE = "GPL"
# These devices need mkimage to generate a kernel image
-DEPENDS_kb9202 = "u-boot-mkimage-gta01-native"
-DEPENDS_at32stk1000 = "u-boot-mkimage-gta01-native"
-DEPENDS_atngw100 = "u-boot-mkimage-gta01-native"
-DEPENDS_at91sam9263ek = "u-boot-mkimage-gta01-native"
-DEPENDS_sarge-at91 = "u-boot-mkimage-gta01-native"
+DEPENDS_kb9202 = "u-boot-mkimage-openmoko-native"
+DEPENDS_at32stk1000 = "u-boot-mkimage-openmoko-native"
+DEPENDS_atngw100 = "u-boot-mkimage-openmoko-native"
+DEPENDS_at91sam9263ek = "u-boot-mkimage-openmoko-native"
+DEPENDS_sarge-at91 = "u-boot-mkimage-openmoko-native"
inherit kernel
============================================================
--- packages/uboot/uboot-gta01_svn.bb 32eb07ab20fbe4bfcde0f6e323b372dcbb347192
+++ packages/uboot/uboot-openmoko_svn.bb dfadccc827c84da11256d43fc3d8e7caf1111222
@@ -44,33 +44,36 @@ do_compile () {
}
do_compile () {
- chmod +x board/neo1973/gta*/split_by_variant.sh
- for mach in ${UBOOT_MACHINES}
- do
- oe_runmake ${mach}_config
- oe_runmake clean
- oe_runmake all
- oe_runmake u-boot.udfu
- if [ -f u-boot.udfu ]; then
- mv u-boot.udfu u-boot_${mach}.bin
- else
- mv u-boot.bin u-boot_${mach}.bin
- fi
- if [ -f board/${mach}/lowlevel_foo.bin ]; then
- mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin
- fi
- done
+ chmod +x board/neo1973/gta*/split_by_variant.sh
+ for mach in ${UBOOT_MACHINES}
+ do
+ oe_runmake ${mach}_config
+ oe_runmake clean
+ find board -name lowlevel_foo.bin -exec rm '{}' \;
+ oe_runmake all
+ oe_runmake u-boot.udfu
+ if [ -f u-boot.udfu ]; then
+ mv u-boot.udfu u-boot_${mach}.bin
+ else
+ mv u-boot.bin u-boot_${mach}.bin
+ fi
+ if [ -f board/${mach}/lowlevel_foo.bin ]; then
+ mv board/${mach}/lowlevel_foo.bin \
+ lowlevel_foo_${mach}.bin
+ else
+ find board -name lowlevel_foo.bin \
+ -exec mv '{}' lowlevel_foo_${mach}.bin \;
+ fi
+ done
}
do_deploy () {
install -d ${DEPLOY_DIR_IMAGE}
for mach in ${UBOOT_MACHINES}
do
- install -m 0644 ${S}/u-boot_${mach}.bin \
- ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PR}.bin
+ install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin
if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
- install -m 0644 ${S}/lowlevel_foo_${mach}.bin \
- ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PR}.bin
+ install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin
fi
done
install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
#
# mt diff -rbaf87732958baffc539a6e90858e6c2fe5972a1e -r0e52f1e01921645006874bb54726884ce2137d0c
#
#
#
# patch "conf/distro/include/preferred-gpe-versions-2.8.inc"
# from [129ed53421fa5e4508470e9d73e907deb80ed268]
# to [95d8384bd258f6fdf1d0b790aeb71658730dfb06]
#
============================================================
--- conf/distro/include/preferred-gpe-versions-2.8.inc 129ed53421fa5e4508470e9d73e907deb80ed268
+++ conf/distro/include/preferred-gpe-versions-2.8.inc 95d8384bd258f6fdf1d0b790aeb71658730dfb06
@@ -22,8 +22,13 @@ PREFERRED_VERSION_libhandoff ?= "0.1"
PREFERRED_VERSION_libcontactsdb ?= "0.5"
PREFERRED_VERSION_libtododb ?= "0.11"
PREFERRED_VERSION_libhandoff ?= "0.1"
-PREFERRED_VERSION_libmimedir ?= "0.4.1"
+PREFERRED_VERSION_libmimedir ?= "0.4.2"
PREFERRED_VERSION_libsoundgen ?= "0.6"
+PREFERRED_VERSION_libdotdesktop ?= "0.11"
+PREFERRED_VERSION_libeventdb ?= "0.90"
+PREFERRED_VERSION_libgpelaunch ?= "0.14"
+PREFERRED_VERSION_libgtkstylus ?= "0.3"
+PREFERRED_VERSION_libxsettings-client ?= "0.17"
PREFERRED_VERSION_gpe-icons ?= "0.25"
@@ -33,20 +38,31 @@ PREFERRED_VERSION_gpe-dm ?= "0.51"
PREFERRED_VERSION_keylaunch ?= "2.0.10"
PREFERRED_VERSION_startup-monitor ?= "0.18-2"
PREFERRED_VERSION_gpe-dm ?= "0.51"
+PREFERRED_VERSION_ipaq-sleep ?= "0.9"
+PREFERRED_VERSION_teleport ?= "0.34"
+PREFERRED_VERSION_xst ?= "0.15"
+
+PREFERRED_VERSION_gpe-aerial ?= "0.3.0"
+PREFERRED_VERSION_gpe-appmgr ?= "2.8"
+PREFERRED_VERSION_gpe-autostarter ?= "0.12"
PREFERRED_VERSION_gpe-todo ?= "0.56"
PREFERRED_VERSION_gpe-calendar ?= "0.91"
PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"
PREFERRED_VERSION_gpe-contacts ?= "0.47"
PREFERRED_VERSION_gpe-beam ?= "0.2.9"
PREFERRED_VERSION_gpe-bluetooth ?= "0.55"
+PREFERRED_VERSION_gpe-bootsplash ?= "1.15"
PREFERRED_VERSION_gpe-conf ?= "0.2.6"
+PREFERRED_VERSION_gpe-confd ?= "0.16"
PREFERRED_VERSION_gpe-clock ?= "0.25"
PREFERRED_VERSION_gpe-mininet ?= "0.7"
PREFERRED_VERSION_gpe-mixer ?= "0.42"
PREFERRED_VERSION_gpe-shield ?= "0.9"
PREFERRED_VERSION_gpe-taskmanager ?= "0.20"
PREFERRED_VERSION_minilite ?= "0.50"
+PREFERRED_VERSION_miniclipboard ?= "0.3"
+PREFERRED_VERSION_minimix ?= "0.8"
PREFERRED_VERSION_gpe-edit ?= "0.40"
PREFERRED_VERSION_gpe-gallery ?= "0.97"
PREFERRED_VERSION_gpe-calculator ?= "0.2"
@@ -64,8 +80,13 @@ PREFERRED_VERSION_starling ?= "0.2"
PREFERRED_VERSION_gpe-timesheet ?= "0.32"
PREFERRED_VERSION_gpe-irc ?= "0.08"
PREFERRED_VERSION_starling ?= "0.2"
+PREFERRED_VERSION_gpe-keylock ?= "0.12"
+PREFERRED_VERSION_gpe-ownerinfo ?= "0.28"
+PREFERRED_VERSION_gpe-question ?= "0.04"
+PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-julia ?= "0.0.6"
PREFERRED_VERSION_gpe-lights ?= "0.13"
PREFERRED_VERSION_gpe-othello ?= "0.2-1"
PREFERRED_VERSION_gpe-plucker ?= "0.4"
More information about the Openembedded-commits
mailing list