[oe-commits] org.oe.dev merge of '12f1208ddddebc7934d98fcac3f803d022a1ba28'
oe commit
oe at amethyst.openembedded.net
Fri May 23 18:27:56 UTC 2008
merge of '12f1208ddddebc7934d98fcac3f803d022a1ba28'
and '8b21a69e52feb768f1d096aa78e44dd20ce3aed4'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 8104662b136ce70b58ae47f1c87a35fb7a8e242c
ViewMTN: http://monotone.openembedded.org/revision/info/8104662b136ce70b58ae47f1c87a35fb7a8e242c
Files:
1
packages/jpeg/jpeg-6b/install.patch
packages/jpeg/jpeg-6b/libtool.patch
packages/jpeg/jpeg-6b/libtool_tweak.patch
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex
packages/linux/gumstix-kernel-2.6.21/gumstix-connex
packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex
packages/linux/gumstix-kernel-2.6.21/gumstix-verdex
packages/oprofile/oprofile/opcontrol-busybox-compat.patch
classes/kernel.bbclass
classes/oestats-client.bbclass
classes/seppuku.bbclass
conf/distro/include/angstrom.inc
packages/avahi/avahi.inc
packages/avahi/avahi_0.6.19.bb
packages/avahi/avahi_0.6.20.bb
packages/avahi/avahi_0.6.21.bb
packages/avahi/avahi_0.6.22.bb
packages/images/minimal-gpe-image.bb
packages/images/nas-server-image.bb
packages/images/x11-sato-image.bb
packages/jpeg/jpeg-6b/debian.patch
packages/jpeg/jpeg_6b.bb
packages/linux/gumstix-kernel_2.6.21.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-rp-2.6.24/defconfig-akita
packages/linux/linux-rp-2.6.24/defconfig-c7x0
packages/linux/linux-rp-2.6.24/defconfig-poodle
packages/linux/linux-rp-2.6.24/defconfig-spitz
packages/linux/linux-rp-2.6.24/defconfig-tosa
packages/linux/linux-rp_2.6.24.bb
packages/oprofile/oprofile_0.9.3.bb
conf/distro/chinook-compat.conf
Diffs:
#
# mt diff -r12f1208ddddebc7934d98fcac3f803d022a1ba28 -r8104662b136ce70b58ae47f1c87a35fb7a8e242c
#
#
#
# delete "packages/jpeg/jpeg-6b/install.patch"
#
# rename "packages/jpeg/jpeg-6b/libtool.patch"
# to "packages/jpeg/jpeg-6b/libtool_tweak.patch"
#
# rename "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-connex"
# to "packages/linux/gumstix-kernel-2.6.21/gumstix-connex"
#
# rename "packages/linux/gumstix-kernel-2.6.21/gumstix-custom-verdex"
# to "packages/linux/gumstix-kernel-2.6.21/gumstix-verdex"
#
# add_file "packages/oprofile/oprofile/opcontrol-busybox-compat.patch"
# content [a28510c61c28ca4ebbff5efaf0175e9767234f19]
#
# patch "classes/kernel.bbclass"
# from [8ed575119a74e50c5bcb39266997cba3f60792c2]
# to [8bfcc768d0866b5f1fce354eb3490df2d206628b]
#
# patch "classes/oestats-client.bbclass"
# from [9f4ff853acd1082675e4590ab2bfe012dc7e2fc3]
# to [589563f5373f1a4448a5ea5dd3915a3010a96e46]
#
# patch "classes/seppuku.bbclass"
# from [97be1cf15677f7c326c40bcc51d7b2a31f25260f]
# to [503bd4965d85136d5e8b8f6a4cad80e3d82e7440]
#
# patch "conf/distro/include/angstrom.inc"
# from [07055167d1e686bc6894c9e490f73d1ff54f7c89]
# to [81b35f382e812295b2b67a266c4c3751b2b7ff59]
#
# patch "packages/avahi/avahi.inc"
# from [4fa00bfeab78501b5f96381ad7362170b9b43670]
# to [43834b0521bfa682033d94ab0f585788c3343deb]
#
# patch "packages/avahi/avahi_0.6.19.bb"
# from [b79ad80e97d4543f28d1a53c5b017057371d031f]
# to [31876c8a22a42cf1aa6837bb7555de371381d3cf]
#
# patch "packages/avahi/avahi_0.6.20.bb"
# from [b79ad80e97d4543f28d1a53c5b017057371d031f]
# to [31876c8a22a42cf1aa6837bb7555de371381d3cf]
#
# patch "packages/avahi/avahi_0.6.21.bb"
# from [26918362d7839d99e5016a6b67015a2f5e442910]
# to [601996f503c03a8271af8251c380475caeb88960]
#
# patch "packages/avahi/avahi_0.6.22.bb"
# from [7cc7310ab622a94d9c9df777edca8e64664ab30d]
# to [2e254bff547105d0abcbff5c287d52affacd37fa]
#
# patch "packages/images/minimal-gpe-image.bb"
# from [b6ec94cbbd30d656387b5fc96133954bd84abaaa]
# to [803dc5fad5d3e6b5e37fbd2991ce0aba70c4aee5]
#
# patch "packages/images/nas-server-image.bb"
# from [560048e8fa92ea93876cac92e66f0d4241079ad6]
# to [569c1b6bb8ec4aea022dd50dd0c3ef14a155f28b]
#
# patch "packages/images/x11-sato-image.bb"
# from [ba6ee9b7eb840b773a10d6d81c1e5a3b78b04c68]
# to [a2fdff4124ec3089640314c249f06ec32ea9fd96]
#
# patch "packages/jpeg/jpeg-6b/debian.patch"
# from [99bf3d9e426841282a723c49d473082b018f76d2]
# to [6224a5ac1ce196fc588a069308a8526109ab4571]
#
# patch "packages/jpeg/jpeg-6b/libtool_tweak.patch"
# from [e1f50f78f3e34e8ef56df9ac7bd8f38d088b84d8]
# to [f77f2f59ccee20a2199db6cbf30ef5f5243cf96a]
#
# patch "packages/jpeg/jpeg_6b.bb"
# from [0f825c07e85f10fdd361d224cb45a1f833962d0d]
# to [2f1cd5402f50d3be05860e5fd4688329e8337c73]
#
# patch "packages/linux/gumstix-kernel_2.6.21.bb"
# from [abcf379ae73f3805d3364fbbf7d4e735d4c887b2]
# to [1f1a51ddd361d503ab44e816d5c0dee09e9bbff2]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [e416b8dd7c16fdaef29109914cf909b457592d00]
# to [2c7debe2bcbaf6c6bdefa0a63a33254f23ad30d4]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-akita"
# from [33d8cc0f8a30277b834a2c1da09fb6ece1d098a5]
# to [1d797e5ffd81b69e0985d2fe9663db5a798b79a1]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-c7x0"
# from [b45f438b494270a020d8feec2d5110707bde21f1]
# to [ddc33aec79255b267fcfce9b3fc13ea540b0ae1f]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-poodle"
# from [c66e00f8061a663ee80edff2c737bc0266f3df43]
# to [2c9baccc4098e9b1d1e1392f20c2b55aa947bb28]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-spitz"
# from [58c5d3463be6ec2d735fef9b44f8c1be7c658075]
# to [1f2f1fd61af250329c4ee2ae60d0315acf2f95c0]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-tosa"
# from [8f0bf8a513bad928394f2e4ff80b6284302f6685]
# to [a69c2dbac0a15fbbcf77f0f6b52223e92fa6210d]
#
# patch "packages/linux/linux-rp_2.6.24.bb"
# from [a462636fa146486f11ad987d424ad2ebdd235df2]
# to [bdf515f4dba80c6b7d3022a76de73a5130b8ed5a]
#
# patch "packages/oprofile/oprofile_0.9.3.bb"
# from [f756427d410e1704dcdc1e0d1000a9e01fbc4313]
# to [a084caeffd2ac9506fb9d4e8cedf2a8e04a6757d]
#
============================================================
--- packages/oprofile/oprofile/opcontrol-busybox-compat.patch a28510c61c28ca4ebbff5efaf0175e9767234f19
+++ packages/oprofile/oprofile/opcontrol-busybox-compat.patch a28510c61c28ca4ebbff5efaf0175e9767234f19
@@ -0,0 +1,49 @@
+Index: oprofile-0.9.3/utils/opcontrol
+===================================================================
+--- oprofile-0.9.3.orig/utils/opcontrol 2008-05-23 16:54:21.000000000 +0800
++++ oprofile-0.9.3/utils/opcontrol 2008-05-23 00:47:38.000000000 +0800
+@@ -908,7 +908,7 @@
+ return
+ fi
+
+- kill -s 0 `cat $LOCK_FILE` 2>/dev/null
++ kill -0 `cat $LOCK_FILE` 2>/dev/null
+ if test "$?" -ne 0; then
+ echo "Detected stale lock file. Removing." >&2
+ rm -f "$LOCK_FILE"
+@@ -919,7 +919,7 @@
+ echo "Stopping profiling."
+ echo 0 >/dev/oprofile/enable
+ fi
+- kill -s USR2 `cat $LOCK_FILE` 2>/dev/null
++ kill -usr2 `cat $LOCK_FILE` 2>/dev/null
+ }
+
+
+@@ -932,7 +932,7 @@
+ return
+ fi
+
+- kill -s 0 `cat $LOCK_FILE` 2>/dev/null
++ kill -0 `cat $LOCK_FILE` 2>/dev/null
+ if test "$?" -ne 0; then
+ echo "Detected stale lock file. Removing." >&2
+ rm -f "$LOCK_FILE"
+@@ -1274,7 +1274,7 @@
+ {
+
+ if test -f "$LOCK_FILE"; then
+- kill -s 0 `cat $LOCK_FILE` 2>/dev/null
++ kill -0 `cat $LOCK_FILE` 2>/dev/null
+ if test "$?" -eq 0; then
+ return;
+ else
+@@ -1341,7 +1341,7 @@
+ if test "$KERNEL_SUPPORT" = "yes"; then
+ echo 1 >$MOUNT/enable
+ fi
+- kill -s USR1 `cat $LOCK_FILE` 2>/dev/null
++ kill -USR1 `cat $LOCK_FILE` 2>/dev/null
+ echo "Profiler running."
+ }
+
============================================================
--- classes/kernel.bbclass 8ed575119a74e50c5bcb39266997cba3f60792c2
+++ classes/kernel.bbclass 8bfcc768d0866b5f1fce354eb3490df2d206628b
@@ -91,9 +91,9 @@ do_builtin_initramfs() {
# Make sure to kill injected initramfs, in case someone will do "-c compile -f"
rm usr/initramfs_data.cpio.gz
}
-addtask builtin_initramfs after do_compile
-do_builtin_initramfs[nostamp] = "1"
-do_builtin_initramfs[depends] = "${INITRAMFS_IMAGE_TARGET}:do_rootfs"
+#addtask builtin_initramfs after do_compile
+#do_builtin_initramfs[nostamp] = "1"
+#do_builtin_initramfs[depends] = "${INITRAMFS_IMAGE_TARGET}:do_rootfs"
kernel_do_stage() {
ASMDIR=`readlink include/asm`
============================================================
--- classes/oestats-client.bbclass 9f4ff853acd1082675e4590ab2bfe012dc7e2fc3
+++ classes/oestats-client.bbclass 589563f5373f1a4448a5ea5dd3915a3010a96e46
@@ -44,7 +44,7 @@ def oestats_send(server, action, vars =
# build headers
headers = {
- "User-agent": "oestats-client/0.4",
+ "User-agent": "oestats-client/0.5",
"Content-type": "multipart/form-data; boundary=%s" % bound,
"Content-length": str(len(body))}
@@ -66,8 +66,9 @@ def oestats_start(server, builder, d):
try:
data = oestats_send(server, "/builds/", {
'builder': builder,
- 'branch': bb.data.getVar('METADATA_BRANCH', d, True),
- 'revision': bb.data.getVar('METADATA_REVISION', d, True),
+ 'build_arch': bb.data.getVar('BUILD_ARCH', d, True),
+ 'metadata_branch': bb.data.getVar('METADATA_BRANCH', d, True),
+ 'metadata_revision': bb.data.getVar('METADATA_REVISION', d, True),
'machine': bb.data.getVar('MACHINE', d, True),
'distro': bb.data.getVar('DISTRO', d, True),
})
@@ -117,7 +118,7 @@ def oestats_task(server, d, task, status
except:
elapsed = 0
- # send the log for failures
+ # prepare files
files = {}
if status == 'Failed':
logs = glob.glob("%s/log.%s.*" % (bb.data.getVar('T', d, True), task))
@@ -129,18 +130,25 @@ def oestats_task(server, d, task, status
'content': file(log).read(),
'content-type': 'text/plain'}
+ # prepare report
+ vars = {
+ 'build': id,
+ 'package': bb.data.getVar('PN', d, True),
+ 'version': bb.data.getVar('PV', d, True),
+ 'revision': bb.data.getVar('PR', d, True),
+ 'depends': bb.data.getVar('DEPENDS', d, True),
+ 'task': task,
+ 'status': status,
+ 'time': str(elapsed)}
+ bug_number = bb.data.getVar('OESTATS_BUG_NUMBER', d, True)
+ bug_tracker = bb.data.getVar('OESTATS_BUG_TRACKER', d, True)
+ if bug_number and bug_tracker:
+ vars['bug_number'] = bug_number
+ vars['bug_tracker'] = bug_tracker
+
# send report
try:
- response = oestats_send(server, "/tasks/", {
- 'build': id,
- 'package': bb.data.getVar('PN', d, True),
- 'version': bb.data.getVar('PV', d, True),
- 'revision': bb.data.getVar('PR', d, True),
- 'depends': bb.data.getVar('DEPENDS', d, True),
- 'task': task,
- 'status': status,
- 'time': str(elapsed),
- }, files)
+ response = oestats_send(server, "/tasks/", vars, files)
except:
bb.note("oestats: error sending task, disabling stats")
oestats_setid(d, "")
============================================================
--- classes/seppuku.bbclass 97be1cf15677f7c326c40bcc51d7b2a31f25260f
+++ classes/seppuku.bbclass 503bd4965d85136d5e8b8f6a4cad80e3d82e7440
@@ -380,5 +380,10 @@ python seppuku_eventhandler() {
else:
print >> debug_file, "Not trying to create an attachment for bug #%s" % bug_number
+ # store bug number for oestats-client
+ if bug_number:
+ bb.data.setVar('OESTATS_BUG_NUMBER', bug_number, event.data)
+ bb.data.setVar('OESTATS_BUG_TRACKER', "http://bugs.openembedded.net/", event.data)
+
return NotHandled
}
============================================================
--- conf/distro/include/angstrom.inc 07055167d1e686bc6894c9e490f73d1ff54f7c89
+++ conf/distro/include/angstrom.inc 81b35f382e812295b2b67a266c4c3751b2b7ff59
@@ -295,7 +295,7 @@ SEPPUKU_PRODUCT = "Openembedded"
SEPPUKU_AUTOBUILD = "1"
SEPPUKU_PRODUCT = "Openembedded"
-SEPPUKU_COMPONENT = "build"
+SEPPUKU_COMPONENT = "org.openembedded.dev"
============================================================
--- packages/avahi/avahi.inc 4fa00bfeab78501b5f96381ad7362170b9b43670
+++ packages/avahi/avahi.inc 43834b0521bfa682033d94ab0f585788c3343deb
@@ -20,8 +20,7 @@ RDEPENDS_append = ""
RDEPENDS_append = ""
# TODO: build and enable all the extra stuff avahi offers
-EXTRA_OECONF = "--with-distro=debian --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
-EXTRA_OECONF_append_mipsel = " --disable-stack-protector"
+EXTRA_OECONF = "--with-distro=debian --disable-stack-protector --disable-nls --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
AVAHI_PYTHON = "--disable-python"
AVAHI_GTK = "--disable-gtk"
============================================================
--- packages/avahi/avahi_0.6.19.bb b79ad80e97d4543f28d1a53c5b017057371d031f
+++ packages/avahi/avahi_0.6.19.bb 31876c8a22a42cf1aa6837bb7555de371381d3cf
@@ -1,3 +1,3 @@ require avahi.inc
require avahi.inc
+PR = "r7"
-PR = "r6"
============================================================
--- packages/avahi/avahi_0.6.20.bb b79ad80e97d4543f28d1a53c5b017057371d031f
+++ packages/avahi/avahi_0.6.20.bb 31876c8a22a42cf1aa6837bb7555de371381d3cf
@@ -1,3 +1,3 @@ require avahi.inc
require avahi.inc
+PR = "r7"
-PR = "r6"
============================================================
--- packages/avahi/avahi_0.6.21.bb 26918362d7839d99e5016a6b67015a2f5e442910
+++ packages/avahi/avahi_0.6.21.bb 601996f503c03a8271af8251c380475caeb88960
@@ -1,6 +1,6 @@ require avahi.inc
require avahi.inc
-PR = "r6"
+PR = "r7"
SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
SRC_URI += "file://avr32-ipv6-fix.patch;patch=1"
============================================================
--- packages/avahi/avahi_0.6.22.bb 7cc7310ab622a94d9c9df777edca8e64664ab30d
+++ packages/avahi/avahi_0.6.22.bb 2e254bff547105d0abcbff5c287d52affacd37fa
@@ -1,6 +1,6 @@ DEPENDS += "intltool-native"
require avahi.inc
DEPENDS += "intltool-native"
-PR = "r6"
+PR = "r7"
PACKAGES =+ "libavahi-gobject"
============================================================
--- packages/images/minimal-gpe-image.bb b6ec94cbbd30d656387b5fc96133954bd84abaaa
+++ packages/images/minimal-gpe-image.bb 803dc5fad5d3e6b5e37fbd2991ce0aba70c4aee5
@@ -1,6 +1,6 @@
#Angstrom minimal gpe image
# This image provides a barebone dm and 'desktop'
-# Very angstrom and ipkg centric
+# Very angstrom and opkg centric
XSERVER ?= "xserver-kdrive-fbdev"
@@ -16,7 +16,7 @@ IMAGE_INSTALL = "\
matchbox-wm \
gpe-terminal \
angstrom-feed-configs \
- ipkg \
+ opkg-nogpg opkg-collateral \
"
#zap root password for release images
============================================================
--- packages/images/nas-server-image.bb 560048e8fa92ea93876cac92e66f0d4241079ad6
+++ packages/images/nas-server-image.bb 569c1b6bb8ec4aea022dd50dd0c3ef14a155f28b
@@ -20,7 +20,7 @@ DISTRO_SSH_DAEMON ?= "dropbear"
# intended to be distro-agnostic.
DISTRO_SSH_DAEMON ?= "dropbear"
-DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+DISTRO_PACKAGE_MANAGER ?= "opkg-nogpg opkg-collateral"
DEPENDS = "\
task-boot \
============================================================
--- packages/images/x11-sato-image.bb ba6ee9b7eb840b773a10d6d81c1e5a3b78b04c68
+++ packages/images/x11-sato-image.bb a2fdff4124ec3089640314c249f06ec32ea9fd96
@@ -1,5 +1,5 @@ DISTRO_SSH_DAEMON ?= "dropbear"
DISTRO_SSH_DAEMON ?= "dropbear"
-DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+DISTRO_PACKAGE_MANAGER ?= "opkg-nogpg opkg-collateral"
IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
============================================================
--- packages/jpeg/jpeg-6b/debian.patch 99bf3d9e426841282a723c49d473082b018f76d2
+++ packages/jpeg/jpeg-6b/debian.patch 6224a5ac1ce196fc588a069308a8526109ab4571
@@ -1,8 +1,3 @@
-
-#
-# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
--- jpeg-6b/jpegtran.1~libjpeg6bb-5
+++ jpeg-6b/jpegtran.1
@@ -131,6 +131,24 @@
@@ -41,16 +36,6 @@
# Initialize some other variables.
subdirs=
-@@ -1559,7 +1559,8 @@
- if test "x$LTSTATIC" = xno; then
- disable_static="--disable-static"
- fi
-- $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh
-+ chmod a+x $srcdir/ltconfig.new
-+ $srcdir/ltconfig.new $disable_shared $disable_static $srcdir/ltmain.new.sh $host
- fi
-
- # Select memory manager depending on user input.
--- jpeg-6b/makefile.cfg~libjpeg6bb-5
+++ jpeg-6b/makefile.cfg
@@ -17,7 +17,7 @@
@@ -1886,8129 +1871,4 @@
#endif /* TRANSFORMS_SUPPORTED */
+
---- jpeg-6b/config.guess~libjpeg6bb-5
-+++ jpeg-6b/config.guess
-@@ -1,4 +1,10 @@
- #! /bin/sh
-+# autotools-dev hack (<ballombe at debian.org>, Wed, 14 Nov 2001 10:13:10 +0100)
-+if [ -x /usr/share/misc/config.guess ]; then
-+ /usr/share/misc/config.guess $*
-+ exit $?
-+fi
-+
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
- #
---- jpeg-6b/config.sub~libjpeg6bb-5
-+++ jpeg-6b/config.sub
-@@ -1,4 +1,10 @@
- #! /bin/sh
-+# autotools-dev hack (<ballombe at debian.org>, Wed, 14 Nov 2001 10:13:10 +0100)
-+if [ -x /usr/share/misc/config.sub ]; then
-+ /usr/share/misc/config.sub $*
-+ exit $?
-+fi
-+
- # Configuration validation subroutine script, version 1.1.
- # Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
- # This file is (in principle) common to ALL GNU software.
---- /dev/null
-+++ jpeg-6b/libtool.cfg
-@@ -0,0 +1,224 @@
-+# libtool.cfg - Libtool configuration file.
-+# Generated automatically by ltconfig (GNU libtool 1.3.3 (1.385.2.181 1999/07/02 15:49:11))
-+# Libtool was configured as follows, on host yellowpig:
-+#
-+# CC="old_CC" CFLAGS="old_CFLAGS" CPPFLAGS="old_CPPFLAGS" \
-+# LD="old_LD" LDFLAGS="old_LDFLAGS" LIBS="old_LIBS" \
-+# NM="old_NM" RANLIB="old_RANLIB" LN_S="old_LN_S" \
-+# DLLTOOL="old_DLLTOOL" OBJDUMP="old_OBJDUMP" AS="old_AS" \
-+# ./ltconfig.new ./ltmain.sh.new i386-gnu
-+#
-+# Compiler and other test output produced by ltconfig.new, useful for
-+# debugging ltconfig.new, is in ./config.log if it exists.
-+
-+# The version of ltconfig.new that generated this script.
-+LTCONFIG_VERSION=1.3.3
-+
-+# Shell to use when invoki%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r8b21a69e52feb768f1d096aa78e44dd20ce3aed4 -r8104662b136ce70b58ae47f1c87a35fb7a8e242c
#
#
#
# patch "conf/distro/chinook-compat.conf"
# from [c5844f900694f22660695c8b7f810b0ff9eb235c]
# to [6f4774c59d5c8589f1b8d21db8f3fed3f209e847]
#
============================================================
--- conf/distro/chinook-compat.conf c5844f900694f22660695c8b7f810b0ff9eb235c
+++ conf/distro/chinook-compat.conf 6f4774c59d5c8589f1b8d21db8f3fed3f209e847
@@ -163,8 +163,10 @@ PREFERRED_VERSION_osso-gnome-vfs2 = "2.1
PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
# Java stuff
+PREFERRED_PROVIDER_midpath = "midpath-maemo"
+PREFERRED_PROVIDER_midpath-backend-gtk = "midpath-backend-gtk-hildon"
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_classpath = "classpath"
PREFERRED_VERSION_classpath = "0.97.1"
@@ -197,6 +199,8 @@ PKG_libsdl-directfb = "libsdl1.2"
PKG_libsdl-image = "libsdl-image1.2"
PKG_libsdl-directfb = "libsdl1.2"
+PKG_libsdl-ttf = "libsdl-ttf2.0-0"
+PKG_libsdl-gfx = "libsdl-gfx1.2-4"
PKG_bluez-libs = "libbluetooth2"
More information about the Openembedded-commits
mailing list