[oe-commits] org.oe.dev merge of '380d0bd7c4a4d64fd250a72fc04232264b91f091'
ifaistos commit
openembedded-commits at lists.openembedded.org
Sun Oct 21 14:05:29 UTC 2007
merge of '380d0bd7c4a4d64fd250a72fc04232264b91f091'
and 'cd2dae68b2957306378aca79319d9d009a776ed2'
Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: dba2fa38df57ebf59ac6ec770ac48625401fee12
ViewMTN: http://monotone.openembedded.org/revision/info/dba2fa38df57ebf59ac6ec770ac48625401fee12
Files:
1
classes/qtopia4core.bbclass
packages/webkit/webkit-qt.inc
packages/webkit/webkit-qt_svn.bb
packages/webkit/webkit-qtopia_svn.bb
packages/webkit/webkit.inc
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/sane-srcrevs.inc
packages/webkit/files/WebKit.pro
packages/webkit/webkit-gtk_svn.bb
classes/icecc.bbclass
packages/dbus/dbus.inc
packages/dbus/dbus_1.0.2.bb
Diffs:
#
# mt diff -r380d0bd7c4a4d64fd250a72fc04232264b91f091 -rdba2fa38df57ebf59ac6ec770ac48625401fee12
#
#
#
# add_file "classes/qtopia4core.bbclass"
# content [f05bb12d7e6296c2ea9e9656a44b1c93f5f0cf21]
#
# add_file "packages/webkit/webkit-qt.inc"
# content [0d47aaa6f3b4850c8e35d881a2a71b271b6b589a]
#
# add_file "packages/webkit/webkit-qt_svn.bb"
# content [8a7e0008b0321d228d80e15a433d3a8b60cd718c]
#
# add_file "packages/webkit/webkit-qtopia_svn.bb"
# content [fd38f04ea3408debdff8222ee61518c57420e507]
#
# add_file "packages/webkit/webkit.inc"
# content [37dc3651ff08fde99eab8a8c58f1a4922d578ad1]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [d48553ca2c8834d9a31b70bac2f131105e409961]
# to [b40bd65a2cdb5c69b0945a3c6c406e9b20a31746]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [853ecf974e4e8b0eb1c9ddac0e504455aa88abd8]
# to [28b596e1b8de32d09be5c775f8e611602cad4dcd]
#
# patch "packages/webkit/files/WebKit.pro"
# from [3fcda9c52630ed394b0c75da8bd0ab4d43099125]
# to [dd444c86e92aeb8c404efbd945a61ec54293c346]
#
# patch "packages/webkit/webkit-gtk_svn.bb"
# from [1bdedb776717ed3d1b2512c2e784c47970489c45]
# to [84963a3b5a31a26c3902cc1010efa9df33f746a5]
#
============================================================
--- classes/qtopia4core.bbclass f05bb12d7e6296c2ea9e9656a44b1c93f5f0cf21
+++ classes/qtopia4core.bbclass f05bb12d7e6296c2ea9e9656a44b1c93f5f0cf21
@@ -0,0 +1,11 @@
+DEPENDS_prepend = "${@["qtopia-core ", ""][(bb.data.getVar('PN', d, 1) == 'qtopia-core')]}"
+inherit qmake2
+
+#
+# override variables set by qmake-base to compile QtopiaCore apps
+#
+export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore4"
+export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore4/"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = ""
+EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork "
============================================================
--- packages/webkit/webkit-qt.inc 0d47aaa6f3b4850c8e35d881a2a71b271b6b589a
+++ packages/webkit/webkit-qt.inc 0d47aaa6f3b4850c8e35d881a2a71b271b6b589a
@@ -0,0 +1,20 @@
+WEBKIT_PORT = "qt"
+WEBKIT_EXTRA_OPTIONS = ""
+PACKAGES =+ "webkit-qtlauncher-dbg webkit-qtlauncher"
+
+FILES_webkit-qtlauncher = "${bindir}/QtLauncher"
+FILES_webkit-qtlauncher-dbg = "${bindir}/.debug/*"
+
+require webkit.inc
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${libdir}
+ install -d ${D}${libdir}/pkgconfig
+
+ install -m 0755 ${S}/WebKitBuilds/Debug/bin/QtLauncher ${D}${bindir}
+ cd ${S}/WebKitBuilds/Debug
+ PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro
+ oe_runmake install
+}
+
============================================================
--- packages/webkit/webkit-qt_svn.bb 8a7e0008b0321d228d80e15a433d3a8b60cd718c
+++ packages/webkit/webkit-qt_svn.bb 8a7e0008b0321d228d80e15a433d3a8b60cd718c
@@ -0,0 +1,2 @@
+require webkit-qt.inc
+inherit qt4x11
============================================================
--- packages/webkit/webkit-qtopia_svn.bb fd38f04ea3408debdff8222ee61518c57420e507
+++ packages/webkit/webkit-qtopia_svn.bb fd38f04ea3408debdff8222ee61518c57420e507
@@ -0,0 +1,3 @@
+BROKEN="1"
+require webkit-qt.inc
+inherit qtopia4core
============================================================
--- packages/webkit/webkit.inc 37dc3651ff08fde99eab8a8c58f1a4922d578ad1
+++ packages/webkit/webkit.inc 37dc3651ff08fde99eab8a8c58f1a4922d578ad1
@@ -0,0 +1,48 @@
+DEPENDS += "flex-native gperf-native perl-native sqlite3"
+SRCREV_FORMAT = "webcore-rwebkit"
+
+# Yes, this is wrong...
+PV = "0.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit qmake2 pkgconfig
+
+SRC_URI = "\
+ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptGlue;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebCore;proto=http;name=webcore \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \
+ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \
+ file://Makefile \
+ file://Makefile.shared \
+ file://WebKit.pri \
+ file://WebKit.pro \
+"
+S = "${WORKDIR}/"
+
+WEBKIT_QMAKE = "qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ ${WEBKIT_EXTRA_OPTIONS} CONFIG+=${WEBKIT_PORT}"
+
+do_configure() {
+ qmake2 -spec ${QMAKESPEC} CONFIG+=${WEBKIT_PORT} ${WEBKIT_EXTRA_OPTIONS} CONFIG-=release CONFIG+=debug
+ mkdir -p WebKitBuilds/Debug
+ cd WebKitBuilds/Debug
+ PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir} $PWD/../../WebKit.pro
+}
+
+do_compile_prepend() {
+ mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+ cd ${S}/JavaScriptCore/pcre
+ ${BUILD_CC} dftables.c -o dftables -I. -I../wtf
+ cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
+ cd ${S}/WebKitBuilds/Debug
+}
+
+do_stage() {
+ install -d ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}
+ cd ${S}/WebKitBuilds/Debug
+ PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR} $PWD/../../WebKit.pro
+ oe_runmake install
+}
+
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc d48553ca2c8834d9a31b70bac2f131105e409961
+++ conf/distro/include/angstrom-2007-preferred-versions.inc b40bd65a2cdb5c69b0945a3c6c406e9b20a31746
@@ -13,7 +13,6 @@ PREFERRED_VERSION_agg ?= "2.5"
PREFERRED_VERSION_addressbook ?= "0.1"
PREFERRED_VERSION_adns ?= "1.0"
PREFERRED_VERSION_agg ?= "2.5"
-PREFERRED_VERSION_aiostress ?= "0.0"
PREFERRED_VERSION_aircrack ?= "2.41"
PREFERRED_VERSION_aircrack-ng ?= "0.9.1"
PREFERRED_VERSION_albumshaper ?= "2.1"
@@ -25,19 +24,6 @@ PREFERRED_VERSION_altboot ?= "1.1.1"
PREFERRED_VERSION_alsa-state ?= "0.1.0"
PREFERRED_VERSION_alsa-utils ?= "1.0.14"
PREFERRED_VERSION_altboot ?= "1.1.1"
-PREFERRED_VERSION_angstrom-bootmanager ?= "1.0"
-PREFERRED_VERSION_angstrom-feed-configs ?= "1.0"
-PREFERRED_VERSION_angstrom-gpe-task-apps ?= "1.0"
-PREFERRED_VERSION_angstrom-gpe-task-base ?= "1.0"
-PREFERRED_VERSION_angstrom-gpe-task-game ?= "1.0"
-PREFERRED_VERSION_angstrom-gpe-task-pim ?= "1.0"
-PREFERRED_VERSION_angstrom-gpe-task-settings ?= "1.0"
-PREFERRED_VERSION_angstrom-ohand-task-pim ?= "1.0"
-PREFERRED_VERSION_angstrom-task-office ?= "1.0"
-PREFERRED_VERSION_angstrom-task-printing ?= "1.0"
-PREFERRED_VERSION_angstrom-task-sectest ?= "1.0"
-PREFERRED_VERSION_angstrom-version ?= "2007.9-test-20071013"
-PREFERRED_VERSION_angstrom-x11-base-depends ?= "1.0"
PREFERRED_VERSION_anthy ?= "7811"
PREFERRED_VERSION_anthy-native ?= "7811"
PREFERRED_VERSION_antlr ?= "2.7.5"
@@ -63,7 +49,6 @@ PREFERRED_VERSION_at ?= "3.1.8"
PREFERRED_VERSION_asterisk ?= "1.4.10"
PREFERRED_VERSION_asterisk-sounds ?= "1.2.1"
PREFERRED_VERSION_at ?= "3.1.8"
-PREFERRED_VERSION_at76c503a-modules ?= "0.0"
PREFERRED_VERSION_atd ?= "0.70"
PREFERRED_VERSION_atftp ?= "0.7"
PREFERRED_VERSION_atk ?= "1.20.0"
@@ -91,7 +76,6 @@ PREFERRED_VERSION_bc ?= "1.06"
PREFERRED_VERSION_bazaar ?= "1.2"
PREFERRED_VERSION_bb ?= "1.2"
PREFERRED_VERSION_bc ?= "1.06"
-PREFERRED_VERSION_bcm2035-tool ?= "0.0"
PREFERRED_VERSION_bdftopcf ?= "1.0.1"
PREFERRED_VERSION_beecrypt ?= "3.1.0"
PREFERRED_VERSION_beecrypt-native ?= "3.1.0"
@@ -111,8 +95,6 @@ PREFERRED_VERSION_bitchx ?= "1.1"
PREFERRED_VERSION_bison-native ?= "2.0"
PREFERRED_VERSION_bitbake ?= "1.8.6"
PREFERRED_VERSION_bitchx ?= "1.1"
-PREFERRED_VERSION_bl ?= "0.0"
-PREFERRED_VERSION_blueprobe ?= "0.18"
PREFERRED_VERSION_bluesnarfer ?= "0.1"
PREFERRED_VERSION_bluez-cups-backend ?= "3.20"
PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0"
@@ -155,7 +137,6 @@ PREFERRED_VERSION_calendar ?= "1.0"
PREFERRED_VERSION_cairo-directfb ?= "1.4.8"
PREFERRED_VERSION_cairomm ?= "1.2.4"
PREFERRED_VERSION_calendar ?= "1.0"
-PREFERRED_VERSION_calibrateproto ?= "0.0"
PREFERRED_VERSION_came ?= "1.7"
PREFERRED_VERSION_camera-assistant ?= "0.2.0"
PREFERRED_VERSION_camsource ?= "0.7.0"
@@ -199,8 +180,6 @@ PREFERRED_VERSION_cms92init ?= "0.1"
PREFERRED_VERSION_clutter-glx ?= "0.3.1"
PREFERRED_VERSION_cmake-native ?= "2.2.3"
PREFERRED_VERSION_cms92init ?= "0.1"
-PREFERRED_VERSION_composite-pixbuf ?= "0.0"
-PREFERRED_VERSION_compositeext ?= "0.0"
PREFERRED_VERSION_compositeproto ?= "0.4"
PREFERRED_VERSION_comprec ?= "0.02"
PREFERRED_VERSION_confuse ?= "2.5"
@@ -310,14 +289,11 @@ PREFERRED_VERSION_driftnet-nogui ?= "0.1
PREFERRED_VERSION_dpkg-native ?= "1.13.25"
PREFERRED_VERSION_driftnet ?= "0.1.6"
PREFERRED_VERSION_driftnet-nogui ?= "0.1.6"
-PREFERRED_VERSION_drm-kernel ?= "0.0"
PREFERRED_VERSION_dropbear ?= "0.49"
PREFERRED_VERSION_dsniff ?= "2.3"
PREFERRED_VERSION_duma ?= "2.5.7"
PREFERRED_VERSION_dvb-image ?= "1.0"
-PREFERRED_VERSION_dvbstream ?= "0.0"
PREFERRED_VERSION_dvbtraffic ?= "0.0cvs20060814"
-PREFERRED_VERSION_dvbtune ?= "0.0"
PREFERRED_VERSION_dviviewer ?= "1.0.2"
PREFERRED_VERSION_e-uae ?= "0.8.28"
PREFERRED_VERSION_e-utils ?= "0.0.0"
@@ -340,8 +316,6 @@ PREFERRED_VERSION_edje-native ?= "0.5.0.
PREFERRED_VERSION_edje ?= "0.5.0.41"
PREFERRED_VERSION_edje-editor ?= "0.0.0"
PREFERRED_VERSION_edje-native ?= "0.5.0.41"
-PREFERRED_VERSION_edje-viewer ?= "0.0.0"
-PREFERRED_VERSION_eds-dbus ?= "1.4.0"
PREFERRED_VERSION_eds-feed ?= "0.3.2"
PREFERRED_VERSION_eel ?= "2.12.2"
PREFERRED_VERSION_eet ?= "0.9.10.041"
@@ -349,7 +323,6 @@ PREFERRED_VERSION_ekg ?= "1.6"
PREFERRED_VERSION_eflpp ?= "0.1.0"
PREFERRED_VERSION_efreet ?= "0.0.3.003"
PREFERRED_VERSION_ekg ?= "1.6"
-PREFERRED_VERSION_elf2flt ?= "0.0"
PREFERRED_VERSION_elfkickers ?= "2.0a"
PREFERRED_VERSION_elfkickers-native ?= "2.0a"
PREFERRED_VERSION_elftoaout ?= "2.3"
@@ -368,11 +341,8 @@ PREFERRED_VERSION_encodings ?= "1.0.2"
PREFERRED_VERSION_enca ?= "1.9"
PREFERRED_VERSION_enchant ?= "1.3.0"
PREFERRED_VERSION_encodings ?= "1.0.2"
-PREFERRED_VERSION_engrave ?= "0.0.0"
-PREFERRED_VERSION_enhance ?= "0.0.0"
PREFERRED_VERSION_enna ?= "0.2.0"
PREFERRED_VERSION_enscript ?= "1.6.4"
-PREFERRED_VERSION_entice ?= "0.0.0"
PREFERRED_VERSION_entrance ?= "0.9.0.010"
PREFERRED_VERSION_epdf ?= "0.1.0"
PREFERRED_VERSION_epdfview ?= "0.1.6"
@@ -395,11 +365,7 @@ PREFERRED_VERSION_evince ?= "2.20.0"
PREFERRED_VERSION_eventlog ?= "0.2.5"
PREFERRED_VERSION_evieext ?= "1.0.2"
PREFERRED_VERSION_evince ?= "2.20.0"
-PREFERRED_VERSION_evolve ?= "0.0.0"
-PREFERRED_VERSION_evolve-native ?= "0.0.0"
PREFERRED_VERSION_ewl ?= "0.5.1"
-PREFERRED_VERSION_examine ?= "0.0.0"
-PREFERRED_VERSION_exhibit ?= "0.0.0"
PREFERRED_VERSION_exiv2 ?= "0.15"
PREFERRED_VERSION_exmap-console ?= "0.4"
PREFERRED_VERSION_exml ?= "cvs"
@@ -407,11 +373,9 @@ PREFERRED_VERSION_expect ?= "5.44.1"
PREFERRED_VERSION_expat ?= "2.0.0"
PREFERRED_VERSION_expat-native ?= "1.95.7"
PREFERRED_VERSION_expect ?= "5.44.1"
-PREFERRED_VERSION_expedite ?= "0.0.0"
PREFERRED_VERSION_ez-ipupdate ?= "3.0.10"
PREFERRED_VERSION_ezx-boot-usb-native ?= "0.1.0"
PREFERRED_VERSION_ezx-gpiotool ?= "1877"
-PREFERRED_VERSION_ezxd ?= "0.0"
PREFERRED_VERSION_faac ?= "1.24"
PREFERRED_VERSION_faad2 ?= "2.0"
PREFERRED_VERSION_fakechroot ?= "2.5"
@@ -425,7 +389,6 @@ PREFERRED_VERSION_fbgrab ?= "1.0"
PREFERRED_VERSION_fastjar-native ?= "0.95"
PREFERRED_VERSION_fbgetty ?= "0.1.698"
PREFERRED_VERSION_fbgrab ?= "1.0"
-PREFERRED_VERSION_fbgrab-viewer-native ?= "0.0"
PREFERRED_VERSION_fbpanel ?= "4.3"
PREFERRED_VERSION_fbreader ?= "0.8.2a"
PREFERRED_VERSION_fbset ?= "2.1"
@@ -435,7 +398,6 @@ PREFERRED_VERSION_fcron ?= "3.0.2"
PREFERRED_VERSION_fceu ?= "0.98.13-pre"
PREFERRED_VERSION_fconfig ?= "20060419"
PREFERRED_VERSION_fcron ?= "3.0.2"
-PREFERRED_VERSION_fdclock ?= "0.0"
PREFERRED_VERSION_feh ?= "1.2.7"
PREFERRED_VERSION_fetchmail ?= "6.2.5"
PREFERRED_VERSION_ffmpeg ?= "0.4.9-pre1"
@@ -451,7 +413,6 @@ PREFERRED_VERSION_fish ?= "1.1.0"
PREFERRED_VERSION_firefox ?= "1.0.7"
PREFERRED_VERSION_fis ?= "1.0"
PREFERRED_VERSION_fish ?= "1.1.0"
-PREFERRED_VERSION_fixesext ?= "0.0"
PREFERRED_VERSION_fixesproto ?= "4.0"
PREFERRED_VERSION_flac ?= "1.1.2"
PREFERRED_VERSION_flex ?= "2.5.31"
@@ -485,10 +446,7 @@ PREFERRED_VERSION_frozen-bubble ?= "1.0.
PREFERRED_VERSION_froot ?= "0.7.1"
PREFERRED_VERSION_frotz ?= "2.43"
PREFERRED_VERSION_frozen-bubble ?= "1.0.0"
-PREFERRED_VERSION_fs ?= "0.0"
PREFERRED_VERSION_fsi-client ?= "20040803"
-PREFERRED_VERSION_fstests ?= "0.0"
-PREFERRED_VERSION_fsx-linux ?= "0.0"
PREFERRED_VERSION_ftdi-eeprom ?= "0.2"
PREFERRED_VERSION_ftdi-eeprom-native ?= "0.2"
PREFERRED_VERSION_ftpd-topfield ?= "0.7.4"
@@ -511,7 +469,6 @@ PREFERRED_VERSION_gccmakedep ?= "1.0.2"
PREFERRED_VERSION_gawk-native ?= "3.1.4"
PREFERRED_VERSION_gcalctool ?= "5.7.32"
PREFERRED_VERSION_gccmakedep ?= "1.0.2"
-PREFERRED_VERSION_gchub-module ?= "0.0"
PREFERRED_VERSION_gconf ?= "2.6.1"
PREFERRED_VERSION_gconf-native ?= "2.6.1"
PREFERRED_VERSION_gd ?= "2.0.33"
@@ -537,7 +494,6 @@ PREFERRED_VERSION_genlist ?= "1.0"
PREFERRED_VERSION_genext2fs ?= "1.3"
PREFERRED_VERSION_genext2fs-native ?= "1.3"
PREFERRED_VERSION_genlist ?= "1.0"
-PREFERRED_VERSION_geoclue ?= "0.0"
PREFERRED_VERSION_geode-accessbus5536 ?= "2.6.11"
PREFERRED_VERSION_geode-aeslx ?= "2.6.11"
PREFERRED_VERSION_geode-alsa5536 ?= "2.6.11"
@@ -608,7 +564,6 @@ PREFERRED_VERSION_gomunicator ?= "0.1.3"
PREFERRED_VERSION_gobby ?= "0.4.1"
PREFERRED_VERSION_goffice ?= "0.2.1"
PREFERRED_VERSION_gomunicator ?= "0.1.3"
-PREFERRED_VERSION_gosmore ?= "0.0"
PREFERRED_VERSION_gparted ?= "0.3.3"
PREFERRED_VERSION_gpdf ?= "2.10.0"
PREFERRED_VERSION_gpe-aerial ?= "0.3.0"
@@ -832,7 +787,6 @@ PREFERRED_VERSION_intltool-native ?= "0.
PREFERRED_VERSION_intercom ?= "0.15"
PREFERRED_VERSION_intltool ?= "0.35.2"
PREFERRED_VERSION_intltool-native ?= "0.35.0"
-PREFERRED_VERSION_ion3 ?= "0.0"
PREFERRED_VERSION_iozone3 ?= "263"
PREFERRED_VERSION_ipaq-sleep ?= "0.9"
PREFERRED_VERSION_ipatience ?= "0.1"
@@ -879,7 +833,6 @@ PREFERRED_VERSION_kernbench ?= "0.41"
PREFERRED_VERSION_kbproto-native ?= "1.0.3"
PREFERRED_VERSION_kdepimpi ?= "2.2.7"
PREFERRED_VERSION_kernbench ?= "0.41"
-PREFERRED_VERSION_kernel-module-dm9601 ?= "0.0"
PREFERRED_VERSION_kernel-module-wlags49-h1-cs ?= "718"
PREFERRED_VERSION_kernel-module-wlags49-h2-cs ?= "718"
PREFERRED_VERSION_kexec-tools ?= "1.101"
@@ -930,7 +883,6 @@ PREFERRED_VERSION_libatomics-ops ?= "1.2
PREFERRED_VERSION_libassa ?= "3.4.2"
PREFERRED_VERSION_libassuan ?= "0.6.9"
PREFERRED_VERSION_libatomics-ops ?= "1.2"
-PREFERRED_VERSION_libbacon ?= "0.0"
PREFERRED_VERSION_libbedic ?= "1.0"
PREFERRED_VERSION_libbonobo ?= "2.14.0"
PREFERRED_VERSION_libbonoboui ?= "2.18.0"
@@ -991,7 +943,6 @@ PREFERRED_VERSION_libextutils-pkgconfig-
PREFERRED_VERSION_libextutils-parsexs-perl-native ?= "2.16"
PREFERRED_VERSION_libextutils-pkgconfig-perl ?= "1.07"
PREFERRED_VERSION_libextutils-pkgconfig-perl-native ?= "1.07"
-PREFERRED_VERSION_libfakekey ?= "0.2"
PREFERRED_VERSION_libffi ?= "2.0"
PREFERRED_VERSION_libflv ?= "0.2"
PREFERRED_VERSION_libfontenc ?= "1.0.4"
@@ -1020,7 +971,6 @@ PREFERRED_VERSION_libgpepimc-hildon ?= "
PREFERRED_VERSION_libgpephone ?= "0.4"
PREFERRED_VERSION_libgpepimc ?= "0.9"
PREFERRED_VERSION_libgpepimc-hildon ?= "0.5"
-PREFERRED_VERSION_libgpeplugin ?= "0.0"
PREFERRED_VERSION_libgpevtype ?= "0.50"
PREFERRED_VERSION_libgpewidget ?= "0.115"
PREFERRED_VERSION_libgpewidget-hildon ?= "0.102"
@@ -1115,7 +1065,6 @@ PREFERRED_VERSION_libosso-help ?= "2.1.2
PREFERRED_VERSION_libosso ?= "1.20"
PREFERRED_VERSION_libosso-gsf ?= "1.11.10.4"
PREFERRED_VERSION_libosso-help ?= "2.1.2"
-PREFERRED_VERSION_libowl ?= "0.0"
PREFERRED_VERSION_libpam ?= "0.79"
PREFERRED_VERSION_libparams-util-perl ?= "0.20"
PREFERRED_VERSION_libparams-util-perl-native ?= "0.20"
@@ -1168,7 +1117,6 @@ PREFERRED_VERSION_libsvg ?= "0.1.4"
PREFERRED_VERSION_libsub-uplevel-perl ?= "0.13"
PREFERRED_VERSION_libsub-uplevel-perl-native ?= "0.13"
PREFERRED_VERSION_libsvg ?= "0.1.4"
-PREFERRED_VERSION_libsvg-cairo ?= "0.0"
PREFERRED_VERSION_libsyncml ?= "0.4.2"
PREFERRED_VERSION_libtelepathy ?= "0.0.53"
PREFERRED_VERSION_libtest-builder-tester-perl ?= "1.01"
@@ -1212,7 +1160,6 @@ PREFERRED_VERSION_libxaw ?= "1.0.4"
PREFERRED_VERSION_libxau ?= "1.0.3"
PREFERRED_VERSION_libxau-native ?= "1.0.3"
PREFERRED_VERSION_libxaw ?= "1.0.4"
-PREFERRED_VERSION_libxcalibrate ?= "0.0"
PREFERRED_VERSION_libxcb ?= "1.0"%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rcd2dae68b2957306378aca79319d9d009a776ed2 -rdba2fa38df57ebf59ac6ec770ac48625401fee12
#
#
#
# patch "classes/icecc.bbclass"
# from [85ea9ee2e04f7cf2e0b9311d2d6ad1e2438cf2b4]
# to [9c947e1b89f7e9f05b8448240eee79d396cce6b0]
#
# patch "packages/dbus/dbus.inc"
# from [48cb134904afe4a578baf16f396d59c68b477c4f]
# to [9c959556ad6f5662b1f849ccc7ae1feaa63c5a47]
#
# patch "packages/dbus/dbus_1.0.2.bb"
# from [a834dbd101a738964f62a624dc76389e3aa31a6d]
# to [9de1f18991491d917d3af33afea1153ea2e6aca2]
#
============================================================
--- classes/icecc.bbclass 85ea9ee2e04f7cf2e0b9311d2d6ad1e2438cf2b4
+++ classes/icecc.bbclass 9c947e1b89f7e9f05b8448240eee79d396cce6b0
@@ -9,7 +9,8 @@
# ICECC_VERSION accordingly.
#
#The class now handles all 3 different compile 'stages' (i.e native ,cross-kernel and target) creating the
-#necessary enviroment tar.gz file to be used by the remote machines
+#necessary enviroment tar.gz file to be used by the remote machines.
+#It also supports meta-toolchain generation
#
#If ICECC_PATH is not set in local.conf then the class will try to locate it using 'which'
#but nothing is sure ;)
@@ -186,12 +187,15 @@ def create_env(bb,d):
def create_env(bb,d):
#return create_cross_kernel_env(bb,d)
+
if bb.data.inherits_class("native", d):
return create_native_env(bb,d)
elif bb.data.inherits_class("kernel", d):
return create_cross_kernel_env(bb,d)
elif bb.data.inherits_class("cross", d):
return create_native_env(bb,d)
+ elif bb.data.inherits_class("sdk", d):
+ return create_native_env(bb,d)
else:
return create_cross_env(bb,d)
@@ -253,11 +257,11 @@ def icc_path(bb,d,compile):
#"system" package blacklist contains a list of packages that can not distribute compile tasks
#for one reason or the other
- system_package_blacklist = [ "uclibc", "glibc-intermediate", "qemu" ]
+ system_package_blacklist = [ "uclibc", "glibc-intermediate", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant" ]
for black in system_package_blacklist:
if black in package_tmp:
- bb.data.setVar('PARALLEL_MAKE' , '', d)
+ bb.data.setVar("PARALLEL_MAKE" , "", d)
return ""
#user defined exclusion list
@@ -266,7 +270,7 @@ def icc_path(bb,d,compile):
for black in user_package_blacklist:
if black in package_tmp:
- bb.data.setVar('PARALLEL_MAKE' , '', d)
+ bb.data.setVar("PARALLEL_MAKE" , "", d)
return ""
@@ -280,7 +284,6 @@ def icc_path(bb,d,compile):
return create_path( ["gcc", "g++"], "native", bb, d)
elif compile and bb.data.inherits_class("kernel", d):
- #kernel_cc = bb.data.expand('${KERNEL_CC}', d)
return create_path( [get_cross_kernel_ver(bb,d), "foo"], "cross-kernel", bb, d)
elif not compile or len(prefix) == 0:
@@ -305,7 +308,7 @@ def get_cross_kernel_ver(bb,d):
def get_cross_kernel_ver(bb,d):
return bb.data.expand('${KERNEL_CC}', d).strip() or "gcc"
-
+
# set the icecream environment variables
do_configure_prepend() {
export PATH=${@icc_path(bb,d,False)}$PATH
@@ -316,7 +319,7 @@ do_compile_prepend() {
do_compile_prepend() {
export PATH=${@icc_path(bb,d,True)}$PATH
-
+
#check if we are building a kernel and select gcc-cross-kernel
if [ "${@check_for_kernel(bb,d)}" = "yes" ]; then
export ICECC_CC="${@get_cross_kernel_ver(bb,d)}"
============================================================
--- packages/dbus/dbus.inc 48cb134904afe4a578baf16f396d59c68b477c4f
+++ packages/dbus/dbus.inc 9c959556ad6f5662b1f849ccc7ae1feaa63c5a47
@@ -36,6 +36,9 @@ chown "$MESSAGEUSER"."$MESSAGEUSER" "$ME
mkdir -p $MESSAGEHOME || true
chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
+
+grep -q netdev: /etc/group || addgroup netdev
+
}
EXTRA_OECONF = "--disable-qt --disable-qt3 --disable-gtk --disable-tests \
============================================================
--- packages/dbus/dbus_1.0.2.bb a834dbd101a738964f62a624dc76389e3aa31a6d
+++ packages/dbus/dbus_1.0.2.bb 9de1f18991491d917d3af33afea1153ea2e6aca2
@@ -1,8 +1,8 @@ DEFAULT_PREFERENCE = "1"
require dbus.inc
DEFAULT_PREFERENCE = "1"
-PR = "r7"
+PR = "r8"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
file://tmpdir.patch;patch=1 \
More information about the Openembedded-commits
mailing list