[oe-commits] org.oe.dev merge of 'df62641d95864e75f130d2ac3448745cd933e572'
freyther commit
openembedded-commits at lists.openembedded.org
Sun Oct 21 13:26:06 UTC 2007
merge of 'df62641d95864e75f130d2ac3448745cd933e572'
and 'e2ef6c7c9f67b4e28fb1c4393ee4307e8358d81d'
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 775b589cf130e8f819ffd10ac936338120bb8071
ViewMTN: http://monotone.openembedded.org/revision/info/775b589cf130e8f819ffd10ac936338120bb8071
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/sane-srcrevs.inc
packages/webkit/files/WebKit.pro
packages/webkit/webkit-gtk_svn.bb
packages/gnutls/gnutls/onceonly.m4
packages/libmutil
packages/mono/collect-paths.py
packages/mono/mono_files.py
packages/opie-usermanager
packages/opie-usermanager/opie-usermanager.inc
packages/opie-usermanager/opie-usermanager_1.2.2.bb
packages/opie-usermanager/opie-usermanager_1.2.3.bb
packages/opie-usermanager/opie-usermanager_cvs.bb
packages/xfcalendar
packages/xfcalendar/xfcalendar.inc
packages/xfcalendar/xfcalendar_4.2.0.bb
packages/xfcalendar/xfcalendar_4.2.2.bb
packages/xfcalendar/xfcalendar_4.2.3.bb
packages/xffm
packages/xffm/xffm-4.2.0
packages/xffm/xffm-4.2.0/link.patch
packages/xffm/xffm.inc
packages/xffm/xffm_4.2.0.bb
packages/xffm/xffm_4.2.2.bb
packages/xffm/xffm_4.2.3.bb
packages/xffm/xffm_4.3.99.2.bb
packages/xfprint
packages/xfprint/xfprint_4.3.99.2.bb
packages/libid3tag/libid3tag_0.15.0b.bb
packages/libid3tag/libid3tag_0.15.1b.bb
packages/libzvbi/libzvbi_0.2.24.bb
packages/libzvbi/libzvbi_0.2.25.bb
packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch
packages/uboot/files/makefile-no-dirafter.patch
packages/zlib/zlib-1.2.3
packages/zlib/files
contrib/source-checker
packages/base-files/base-files/ghi270
packages/bluez/files/ghi270
packages/bluez/files/r1000
packages/gypsy
packages/gypsy/files
packages/linux/em-x270-2.6.23
packages/linux/linux/i586-generic
packages/linux/linux/i686-generic
packages/linux/linux/x86
packages/linux/linux-2.6.23/mpc8313e-rdb
packages/linux/linux-bfin
packages/linux/linux-bfin/adzs-bf548-ezlite
packages/linux/linux-handhelds-2.6/ghi270
packages/linux-libc-headers/linux-libc-headers-2.6.23
packages/netbase/netbase/ghi270
packages/usbpath
packages/xserver-common/files/ghi270
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/machine/adzs-bf548-ezlite.conf
conf/machine/em-x270.conf
conf/machine/ghi270.conf
conf/machine/include/tune-ppce300c3.inc
conf/machine/mpc8313e-rdb.conf
contrib/source-checker/oe-source-checker.py
packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state
packages/binutils/binutils-2.16/binutils-2.16.1-e300c2c3.patch
packages/gcc/gcc-4.1.2/gcc-4.0.2-e300c2c3.patch
packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch
packages/gtk+/gtk+-fastscaling_2.10.14.bb
packages/gtk-webcore/midori_0.0.10.bb
packages/gypsy/files/fixups.patch
packages/gypsy/gypsy.inc
packages/gypsy/gypsy_svn.bb
packages/linux/em-x270-2.6.23/defconfig
packages/linux/em-x270-2.6.23/em-x270.patch
packages/linux/em-x270_2.6.23.bb
packages/linux/linux/i586-generic/defconfig
packages/linux/linux/i686-generic/defconfig
packages/linux/linux/x86/defconfig
packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig
packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig
packages/linux/linux-bfin_svn.bb
packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb
packages/linux/linux-openmoko-devel/hack-gta02-cpu.patch
packages/linux/linux-openmoko-devel/printascii-2.6.23.patch
packages/linux-libc-headers/linux-libc-headers-2.6.23/procinfo.h
packages/linux-libc-headers/linux-libc-headers_2.6.23.bb
packages/meta/meta-toolchain-openmoko.bb
packages/openmoko2/openmoko-appearance_svn.bb
packages/openssh/files/sftp-server-nolibcrypto.patch
packages/sato-icon-theme/sato-icon-theme.inc
packages/tasks/task-toolchain-openmoko-sdk.bb
packages/telepathy/empathy_0.14.bb
packages/telepathy/libtelepathy_0.2.0.bb
packages/telepathy/telepathy-glib_0.6.0.bb
packages/telepathy/telepathy-mission-control_4.45.bb
packages/telepathy/telepathy-python_0.14.0.bb
packages/usbpath/usbpath-native_svn.bb
packages/usbpath/usbpath_svn.bb
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm
MAINTAINERS
classes/angstrom-mirrors.bbclass
classes/base.bbclass
classes/mono.bbclass
classes/rootfs_deb.bbclass
classes/rootfs_ipk.bbclass
classes/sdk.bbclass
conf/bitbake.conf
conf/checksums.ini
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/distro/generic.conf
conf/distro/include/angstrom.inc
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/slugos.inc
conf/distro/openmoko.conf
conf/machine/adsp-bf537-stamp.conf
conf/machine/adzs-bf538f-ezlite.conf
conf/machine/at91sam9260ek.conf
conf/machine/at91sam9261ek.conf
conf/machine/bd-neon.conf
conf/machine/dht-walnut.conf
conf/machine/efika.conf
conf/machine/epia.conf
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
conf/machine/i586-generic.conf
conf/machine/i686-generic.conf
conf/machine/magicbox.conf
conf/machine/magician.conf
conf/machine/sequoia.conf
conf/machine/x86-32-nocona.conf
conf/machine/x86-prescott.conf
conf/machine/x86.conf
packages/alsa/alsa-state/fic-gta01/stereoout.state
packages/alsa/alsa-state.bb
packages/angstrom/angstrom-version.bb
packages/binutils/binutils_2.16.bb
packages/bluez/bluez-utils.inc
packages/check/check_0.9.2.bb
packages/dfu-util/dfu-util-native_svn.bb
packages/dfu-util/dfu-util_svn.bb
packages/directfb/directfb_1.1.0.bb
packages/exmap-console/exmap-console.inc
packages/exmap-console/exmap-console_svn.bb
packages/ezx/ezxd/ezxd.init
packages/ezx/ezxd_svn.bb
packages/gcc/gcc_4.1.2.bb
packages/gnutls/gnutls.inc
packages/gpe-conf/gpe-conf_0.2.6.bb
packages/gpephone/linphone_1.5.0.bb
packages/gsm/libgsmd_svn.bb
packages/gstreamer/gst-meta-base_0.10.bb
packages/gstreamer/gst-plugins-ugly_0.10.6.bb
packages/gtk+/gtk+_2.10.14.bb
packages/gtk-engines/gtk-clearlooks-engine_0.6.2.bb
packages/gtk-sharp/gtk-sharp_2.10.2.bb
packages/gtkhtml2/gtkhtml2_svn.bb
packages/hostap/hostap-utils_0.4.7.bb
packages/ipkg/ipkg-collateral.bb
packages/keymaps/keymaps_1.0.bb
packages/libfakekey/libfakekey_svn.bb
packages/libmad/libmad_0.15.1b.bb
packages/libqpe/libqpe-opie_cvs.bb
packages/libxml/libxml2_2.6.29.bb
packages/linux/linux-handhelds-2.6.inc
packages/linux/linux-openmoko.inc
packages/linux/linux-x86-2.6.20/i486-defconfig
packages/linux/linux-x86_2.6.20.bb
packages/linux/linux.inc
packages/linux/linux_2.6.23.bb
packages/mathomatic/mathomatic_unstable.bb
packages/meta/foonas-packages.bb
packages/meta/meta-toolchain.bb
packages/meta/openprotium-packages.bb
packages/meta/slugos-native-packages.bb
packages/meta/slugos-native.bb
packages/meta/slugos-packages.bb
packages/meta/unslung-binary-kernel-packages.bb
packages/meta/unslung-packages.bb
packages/mono/README
packages/musicpd/mpd-alsa_svn.bb
packages/openmoko2/openmoko-appmanager2_svn.bb
packages/openmoko2/openmoko-common2_svn.bb
packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
packages/openmoko2/openmoko-icon-theme-standard2_svn.bb
packages/openmoko2/openmoko-mediaplayer2_svn.bb
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
packages/openmoko2/openmoko-theme-standard2-qvga_svn.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
packages/openssh/openssh_4.6p1.bb
packages/python/python-2.5-manifest.inc
packages/python/python-pygtk_2.10.3.bb
packages/python/python-pygtk_2.10.4.bb
packages/sato-icon-theme/sato-icon-theme_0.1.bb
packages/sysfsutils/sysfsutils_2.0.0.bb
packages/tasks/task-base.bb
packages/tasks/task-openmoko.bb
packages/tasks/task-sdk.bb
packages/ttf-fonts/ttf-liberation_0.2.bb
packages/uboot/u-boot_git.bb
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/uboot/uboot-openmoko_svn.bb
packages/uclibc/elf2flt_svn.bb
packages/uicmoc/uicmoc4-native_4.3.1.bb
packages/vlc/vlc-gpe_0.8.4.bb
packages/wv/wv_1.2.0.bb
packages/xorg-lib/libxpm_3.5.6.bb
packages/xorg-lib/libxpm_3.5.7.bb
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_1.3.0.0.bb
packages/xserver-kdrive-common/xserver-kdrive-common/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/Xserver
packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
packages/zlib/zlib-native_1.2.3.bb
site/ix86-common
mtn:manual_merge
true
Diffs:
#
# mt diff -rdf62641d95864e75f130d2ac3448745cd933e572 -r775b589cf130e8f819ffd10ac936338120bb8071
#
#
#
# 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/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/sane-srcrevs.inc 853ecf974e4e8b0eb1c9ddac0e504455aa88abd8
+++ conf/distro/include/sane-srcrevs.inc 28b596e1b8de32d09be5c775f8e611602cad4dcd
@@ -100,6 +100,8 @@ SRCREV_pn-webkit-gtk ?= "26079"
SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "44"
SRCREV_pn-webkit-gtk ?= "26079"
+SRCREV_pn-webkit-qt ?= "26079"
+SRCREV_pn-webkit-qtopia ?= "26079"
SRCREV_pn-xoo ?= "1623"
SRCREV_pn-mplayer ?= "24587"
SRCREV_pn-networkmanager ?= "2887"
============================================================
--- packages/webkit/files/WebKit.pro 3fcda9c52630ed394b0c75da8bd0ab4d43099125
+++ packages/webkit/files/WebKit.pro dd444c86e92aeb8c404efbd945a61ec54293c346
@@ -1,16 +1,11 @@ SUBDIRS += \
TEMPLATE = subdirs
CONFIG += ordered
!gtk-port:CONFIG += qt-port
qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins
SUBDIRS += \
- WebCore \
- JavaScriptCore/kjs/testkjs.pro
+ WebCore
-qt-port {
- SUBDIRS += WebKit/qt/QtLauncher
-
- !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
-}
-
+qt-port:SUBDIRS += \
+ WebKit/qt/QtLauncher
gtk-port:SUBDIRS += \
WebKitTools/GtkLauncher
============================================================
--- packages/webkit/webkit-gtk_svn.bb 1bdedb776717ed3d1b2512c2e784c47970489c45
+++ packages/webkit/webkit-gtk_svn.bb 84963a3b5a31a26c3902cc1010efa9df33f746a5
@@ -1,43 +1,14 @@
-DEPENDS = "flex-native gperf-native gperf perl-native curl icu libxml2 sqlite3 cairo libxslt libidn gnutls gtk+"
-SRCREV_FORMAT = "webcore-rwebkit"
+DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+"
-# Yes, this is wrong...
-PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+WEBKIT_PORT = "gtk-port"
+WEBKIT_EXTRA_OPTIONS = "CONFIG-=qt"
+PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
-inherit qmake2 pkgconfig
+FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
+FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
-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=WebKitQt;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}/"
+require webkit.inc
-do_configure() {
- qmake2 -spec ${QMAKESPEC} CONFIG+=gtk-port CONFIG-=qt CONFIG-=release CONFIG+=debug
- mkdir -p WebKitBuilds/Debug
- cd WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
- WEBKIT_INC_DIR=${prefix}/include WEBKIT_LIB_DIR=${libdir}
-}
-
-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_install() {
install -d ${D}${bindir}
install -d ${D}${libdir}
@@ -45,22 +16,7 @@ do_install() {
install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GtkLauncher/GtkLauncher ${D}${bindir}
cd ${S}/WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
- WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir}
+ PWD=`pwd` ${WEBKIT_QMAKE} WEBKIT_INC_DIR=${D}${prefix}/include WEBKIT_LIB_DIR=${D}${libdir} $PWD/../../WebKit.pro
oe_runmake install
}
-do_stage() {
- install -d ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}
- cd ${S}/WebKitBuilds/Debug
- PWD=`pwd` qmake2 -spec ${QMAKESPEC} -r OUTPUT_DIR=$PWD/ CONFIG-=qt CONFIG+=gtk-port $PWD/../../WebKit.pro \
- WEBKIT_INC_DIR=${STAGING_INCDIR} WEBKIT_LIB_DIR=${STAGING_LIBDIR}
- oe_runmake install
-}
-
-
-PACKAGES =+ "webkit-gtklauncher-dbg webkit-gtklauncher"
-
-FILES_webkit-gtklauncher = "${bindir}/GtkLauncher"
-FILES_webkit-gtklauncher-dbg = "${bindir}/.debug/GtkLauncher"
#
# mt diff -re2ef6c7c9f67b4e28fb1c4393ee4307e8358d81d -r775b589cf130e8f819ffd10ac936338120bb8071
#
#
#
# delete "packages/gnutls/gnutls/onceonly.m4"
#
# delete "packages/libmutil"
#
# delete "packages/mono/collect-paths.py"
#
# delete "packages/mono/mono_files.py"
#
# delete "packages/opie-usermanager"
#
# delete "packages/opie-usermanager/opie-usermanager.inc"
#
# delete "packages/opie-usermanager/opie-usermanager_1.2.2.bb"
#
# delete "packages/opie-usermanager/opie-usermanager_1.2.3.bb"
#
# delete "packages/opie-usermanager/opie-usermanager_cvs.bb"
#
# delete "packages/xfcalendar"
#
# delete "packages/xfcalendar/xfcalendar.inc"
#
# delete "packages/xfcalendar/xfcalendar_4.2.0.bb"
#
# delete "packages/xfcalendar/xfcalendar_4.2.2.bb"
#
# delete "packages/xfcalendar/xfcalendar_4.2.3.bb"
#
# delete "packages/xffm"
#
# delete "packages/xffm/xffm-4.2.0"
#
# delete "packages/xffm/xffm-4.2.0/link.patch"
#
# delete "packages/xffm/xffm.inc"
#
# delete "packages/xffm/xffm_4.2.0.bb"
#
# delete "packages/xffm/xffm_4.2.2.bb"
#
# delete "packages/xffm/xffm_4.2.3.bb"
#
# delete "packages/xffm/xffm_4.3.99.2.bb"
#
# delete "packages/xfprint"
#
# delete "packages/xfprint/xfprint_4.3.99.2.bb"
#
# rename "packages/libid3tag/libid3tag_0.15.0b.bb"
# to "packages/libid3tag/libid3tag_0.15.1b.bb"
#
# rename "packages/libzvbi/libzvbi_0.2.24.bb"
# to "packages/libzvbi/libzvbi_0.2.25.bb"
#
# rename "packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch"
# to "packages/uboot/files/makefile-no-dirafter.patch"
#
# rename "packages/zlib/zlib-1.2.3"
# to "packages/zlib/files"
#
# add_dir "contrib/source-checker"
#
# add_dir "packages/base-files/base-files/ghi270"
#
# add_dir "packages/bluez/files/ghi270"
#
# add_dir "packages/bluez/files/r1000"
#
# add_dir "packages/gypsy"
#
# add_dir "packages/gypsy/files"
#
# add_dir "packages/libmutil"
#
# add_dir "packages/linux/em-x270-2.6.23"
#
# add_dir "packages/linux/linux/i586-generic"
#
# add_dir "packages/linux/linux/i686-generic"
#
# add_dir "packages/linux/linux/x86"
#
# add_dir "packages/linux/linux-2.6.23/mpc8313e-rdb"
#
# add_dir "packages/linux/linux-bfin"
#
# add_dir "packages/linux/linux-bfin/adzs-bf548-ezlite"
#
# add_dir "packages/linux/linux-handhelds-2.6/ghi270"
#
# add_dir "packages/linux-libc-headers/linux-libc-headers-2.6.23"
#
# add_dir "packages/netbase/netbase/ghi270"
#
# add_dir "packages/usbpath"
#
# add_dir "packages/xfcalendar"
#
# add_dir "packages/xffm"
#
# add_dir "packages/xffm/xffm-4.2.0"
#
# add_dir "packages/xfprint"
#
# add_dir "packages/xserver-common/files/ghi270"
#
# add_file "conf/distro/include/angstrom-2007-preferred-versions.inc"
# content [5f41a35120e7ff29258edeee4606234a3248565f]
#
# add_file "conf/machine/adzs-bf548-ezlite.conf"
# content [fd323dc62f2f3c668388604d1cd6269465340f41]
#
# add_file "conf/machine/em-x270.conf"
# content [5345e7b2b7ee8722993816968ec1019cd30e3669]
#
# add_file "conf/machine/ghi270.conf"
# content [89c677e4e394aa107cf2811abec8f2309af3bf55]
#
# add_file "conf/machine/include/tune-ppce300c3.inc"
# content [ffc349db6963070e4437bfd2cded3de7df475e98]
#
# add_file "conf/machine/mpc8313e-rdb.conf"
# content [3bc35c98310b138d5b2aa7dfe2f19230bb50a2c1]
#
# add_file "contrib/source-checker/oe-source-checker.py"
# content [1939cbdc301bfd4c929a2c51dd8f669ff73f6b98]
#
# add_file "packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state"
# content [bd1a1a0426f6ee33355f8a327e980e6dfea4b84e]
#
# add_file "packages/binutils/binutils-2.16/binutils-2.16.1-e300c2c3.patch"
# content [d2a4596119c2ee2138efb5e83e697add3dc7e0ca]
#
# add_file "packages/gcc/gcc-4.1.2/gcc-4.0.2-e300c2c3.patch"
# content [84568712feddebdf1d7bf5b760367393b94cf58d]
#
# add_file "packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch"
# content [8f08d4ff350ac0e64ecbd5238a9a8e1327106932]
#
# add_file "packages/gtk+/gtk+-fastscaling_2.10.14.bb"
# content [ce64606a5f1dcd6be709945a0b16a7f87bddc59f]
#
# add_file "packages/gtk-webcore/midori_0.0.10.bb"
# content [248eb3a40d4c7bdb50c581812cdbeaeb356a89fd]
#
# add_file "packages/gypsy/files/fixups.patch"
# content [fe674ff38ea1957d360b11cdd7485e2565c323ac]
#
# add_file "packages/gypsy/gypsy.inc"
# content [816a8a3e7c95ea800fd63fba2e778e93cd84bbef]
#
# add_file "packages/gypsy/gypsy_svn.bb"
# content [079cf68a5fae747fa3a2080dd75e0b659a566f08]
#
# add_file "packages/linux/em-x270-2.6.23/defconfig"
# content [3ba1f5da2fb6e006bcd0168f0a2cf3cbcf615bab]
#
# add_file "packages/linux/em-x270-2.6.23/em-x270.patch"
# content [cdb3b392a6db59350527fe77384cba4a2c06e4d1]
#
# add_file "packages/linux/em-x270_2.6.23.bb"
# content [d325248b45b97467425b18642a6edc661f795a55]
#
# add_file "packages/linux/linux/i586-generic/defconfig"
# content [14f9a584bc575578a02805b884d713da0669ed72]
#
# add_file "packages/linux/linux/i686-generic/defconfig"
# content [14f9a584bc575578a02805b884d713da0669ed72]
#
# add_file "packages/linux/linux/x86/defconfig"
# content [0bc90afc51dce1e7536c70ef6a6fb37e5e486451]
#
# add_file "packages/linux/linux-2.6.23/mpc8313e-rdb/defconfig"
# content [e7a24d25df10036f5defed1b674c023b5a3d1693]
#
# add_file "packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig"
# content [cc15cda7d452e91dd810cf9f70c76ef47053cca7]
#
# add_file "packages/linux/linux-bfin_svn.bb"
# content [acaf25dafeeaf1a75a5ad17d0c4409efc6f00188]
#
# add_file "packages/linux/linux-handhelds-2.6_2.6.21-hh11.bb"
# content [c26a32d382fd6fe671ee57d605f020bf10a181fa]
#
# add_file "packages/linux/linux-openmoko-devel/hack-gta02-cpu.patch"
# content [fa19347cd487bae37e0c721e8ca6e950ca917769]
#
# add_file "packages/linux/linux-openmoko-devel/printascii-2.6.23.patch"
# content [dc6b59d86cd6a614c83765aa09dc65df09c1d2b9]
#
# add_file "packages/linux-libc-headers/linux-libc-headers-2.6.23/procinfo.h"
# content [d25df5c46fa7bcbf7d5e7d097e80d032aee11716]
#
# add_file "packages/linux-libc-headers/linux-libc-headers_2.6.23.bb"
# content [1793c1f183598c2d981b16023c4a14245807fc77]
#
# add_file "packages/meta/meta-toolchain-openmoko.bb"
# content [5a2e215e02b6321dcc448a76c44590d15e889728]
#
# add_file "packages/openmoko2/openmoko-appearance_svn.bb"
# content [9c16ee551c7973be9ff5495835872d63bf640a06]
#
# add_file "packages/openssh/files/sftp-server-nolibcrypto.patch"
# content [485b76bc2a787612d9a03d9cc81a22ca3bba9523]
#
# add_file "packages/sato-icon-theme/sato-icon-theme.inc"
# content [3310d313a9f429140fe5eaab905196e5e6a2359c]
#
# add_file "packages/tasks/task-toolchain-openmoko-sdk.bb"
# content [7af4fab2e6a807dcffa21e3e435c72702f5f2e0f]
#
# add_file "packages/telepathy/empathy_0.14.bb"
# content [dd529b2443077254cd44017517e337d57f07d0d5]
#
# add_file "packages/telepathy/libtelepathy_0.2.0.bb"
# content [394bd38a1e74b5f54fac3400adbe22a19b7277bc]
#
# add_file "packages/telepathy/telepathy-glib_0.6.0.bb"
# content [488ea77c03a9df921494f5d1bdc80e878d99a236]
#
# add_file "packages/telepathy/telepathy-mission-control_4.45.bb"
# content [24eeb5be373d15a2eb60ea390cbf29104a7ef411]
#
# add_file "packages/telepathy/telepathy-python_0.14.0.bb"
# content [b72e5e36875b783b40a06c426e30d901358c86a7]
#
# add_file "packages/usbpath/usbpath-native_svn.bb"
# content [6349cf45fe11f5e62cb70c23cc3b3f4978b082a1]
#
# add_file "packages/usbpath/usbpath_svn.bb"
# content [e591bdd3d0b6a3f0591d035272658f7abed81521]
#
# add_file "packages/xfcalendar/xfcalendar.inc"
# content [af5f5660a2c113a5ce750349bc4cf6da36a09c78]
#
# add_file "packages/xfcalendar/xfcalendar_4.2.0.bb"
# content [af5f5660a2c113a5ce750349bc4cf6da36a09c78]
#
# add_file "packages/xfcalendar/xfcalendar_4.2.2.bb"
# content [09cc834036bdb51567acc82a01e5013ef697a0f8]
#
# add_file "packages/xfcalendar/xfcalendar_4.2.3.bb"
# content [3949b67b54d60ab1ea3cfe1c2ab5b3e42e5f06e8]
#
# add_file "packages/xffm/xffm-4.2.0/link.patch"
# content [f532b85c0fd1e2e667b15dc10b6d40cb86fabc8d]
#
# add_file "packages/xffm/xffm.inc"
# content [cfc4a8fafe24cda8ffb24895a094eded186ce9f9]
#
# add_file "packages/xffm/xffm_4.2.0.bb"
# content [3799ecaed4e92d9a9de2fba0bcc667b5b546c025]
#
# add_file "packages/xffm/xffm_4.2.2.bb"
# content [98efd0a900c46854dc73684232dd0e6f4d99cc8c]
#
# add_file "packages/xffm/xffm_4.2.3.bb"
# content [98efd0a900c46854dc73684232dd0e6f4d99cc8c]
#
# add_file "packages/xffm/xffm_4.3.99.2.bb"
# content [98efd0a900c46854dc73684232dd0e6f4d99cc8c]
#
# add_file "packages/xfprint/xfprint_4.3.99.2.bb"
# content [ef1c4d8b8c357b416556afc849d5777329fd13f7]
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-qvga.ppm"
# content [01cb2d765905e52f4a87fb84a3736f5025e20ba8]
#
# add_file "packages/xserver-kdrive-common/xserver-kdrive-common/openmoko/xsplash-vga.ppm"
# content [67e567a6535ec794e565e89b8e882fa10c20cacf]
#
# patch "MAINTAINERS"
# from [5080a341dfa97a07da2e61219e5e82138c3c6cfb]
# to [6fa14fef859cffdf7853b9a291310183a8dae80e]
#
# patch "classes/angstrom-mirrors.bbclass"
# from [12843eb50eb15e995dc38e63bf1c31e35b879ff4]
# to [5cb52a71d99b0e1e741b10beef5daa2a8a206bd0]
#
# patch "classes/base.bbclass"
# from [7a3b6633b42df8f8bc1dfd4e57a66773f8d0cde3]
# to [c613ae9e914f3d1caac56bfd222330fce26d9a52]
#
# patch "classes/mono.bbclass"
# from [5c5c200cdd97288cce70bcf2ed91d5a60eeb0573]
# to [5d50e08d7aafe36c91db4fc56497a7b639ccc431]
#
# patch "classes/rootfs_deb.bbclass"
# from [58bcec513e02215254895fcca453dfb26ab4d111]
# to [2626dcbe48732859448d08101587a14fe238e7ac]
#
# patch "classes/rootfs_ipk.bbclass"
# from [0a6a677036faf7c5f940acbb04357cb21c26a3fc]
# to [9a35d1bcda6049ada7a521242c47fa46ef40ee64]
#
# patch "classes/sdk.bbclass"
# from [ddb3418b1e5dbb4ae2c0684207c3dfb7d2343ea7]
# to [2c814910040ad3a2a065b5001ff19084627f4b30]
#
# patch "conf/bitbake.conf"
# from [b85561e831e643a7d8abd91fd97e935e8b1285e6]
# to [f410a6b3af115612f2bd104814d1035583d3518a]
#
# patch "conf/checksums.ini"
# from [0fa8e770b533da8a6bdb8b2aeba375325d6c5c83]
# to [75d2658af051ce6ee032da90880a92b443c0b2cf]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [1c185c3312e0511c6b64f8626a33d90d4e6a9e8e]
# to [006f8f5cbd25e8273224656f55efb910d6ad231f]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [8c385f9679d3be82f8b33e2f9106aaee068c9804]
# to [e988fd56275670ced98bb3525354ad475661f9c7]
#
# patch "conf/distro/generic.conf"
# from [d41e94c2db44f74181c78c031835b9fb8d602ce3]
# to [4c7db192371c90fef979ed8017dcb610a2842914]
#
# patch "conf/distro/include/angstrom.inc"
# from [a2a82e18304dfe7b293702a9f4e750a8b9793d6a]
# to [4d41dec0200341e616e594500fc2112370eafd7e]
#
# patch "conf/distro/include/insane-srcrevs.inc"
# from [6e7da1aa2c6130db2db09ae85664c3d6180a620c]
# to [b1efedd3d4ef2ad3d5f782c992e368ed4dd7e664]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [976be890989c81017f4dcd62106b6a418e60b250]
# to [377acba46a95e8d0301744e9742074791d93ed2e]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [15e4b10fbe98dedc177e719f6e16a00418d98db4]
# to [28b596e1b8de32d09be5c775f8e611602cad4dcd]
#
# patch "conf/distro/include/slugos.inc"
# from [a724746ec3f5b6ab813d5d7a21e191799ed2518b]
# to [27ec55118a85ef79a65d3627484080d6a4decbf8]
#
# patch "conf/distro/openmoko.conf"
# from [0a270926afec0c57fe65b21d888d50f318f58085]
# to [6a2e6be73d20c7c96c92f46207a589f96df4b427]
#
# patch "conf/machine/adsp-bf537-stamp.conf"
# from [0e4ae8573f75816c7fc87665b8cecc83062140c1]
# to [f2f3766d5f005cfbd822e0459b03196ed9d88c3b]
#
# patch "conf/machine/adzs-bf538f-ezlite.conf"
# from [f2a85e24d5481eff7d75087ab3d6cfaa2453c959]
# to [03714bc8d82e3fa8a43cc6b31d7fdc4069459802]
#
# patch "conf/machine/at91sam9260ek.conf"
# from [38a8c8ebda8664ef620ae8fafbb355c20430263e]
# to [ccdf7373c8151b655be9d0e00012b96f491fda02]
#
# patch "conf/machine/at91sam9261ek.conf"
# from [5fe4817f77fa73006d1e4c63a597bcf912350daf]
# to [082d4e7a74e6d03983cfdd96e32c42c037e91cfe]
#
# patch "conf/machine/bd-neon.conf"
# from [ddf51a5e947c9b41283ffbadc7113e36ebe7f1db]
# to [5f66259e09dda4c0f07e8bcf1fa3eb1c2f8e5e2b]
#
# patch "conf/machine/dht-walnut.conf"
# from [74013431b04d2e2f9a497c24b2941e148b833e1a]
# to [bb26cc95419c8f5c3a5b33db309f3dd223e684ae]
#
# patch "conf/machine/efika.conf"
# from [184e69179f6f62271e3e28383fe63d1f3da35f8e]
# to [a1fd4605b6240ee9e39f4b69cc6c3a96bed96262]
#
# patch "conf/machine/epia.conf"
# from [7ea29c9254e8cf7eb3efe9042c2597a57123e9d9]
# to [e38302e47146701110383c508240fa26398120ba]
#
# patch "conf/machine/fic-gta01.conf"
# from [3b60c2c075f0438fce7fc3fff2336638b598b475]
# to [e64606b6a28f0f3b4b886039026269014451aa2c]
#
# patch "conf/machine/fic-gta02.conf"
# from [58d451ef05171ddd801a8f0b60c8a31bfd0c4b56]
# to [33570e2cd1fc3f48a20119d6de06621cd900b3ed]
#
# patch "conf/machine/i586-generic.conf"
# from [d53211500c299b141a5911dd6cb8b095d46bf74a]
# to [4a887ba9af2a184e828b7bc68cf9011f3824cb2e]
#
# patch "conf/machine/i686-generic.conf"
# from [fe0d7dacb28a7233e9aec258ab69a439e0f89d7f]
# to [1b113798190f2b0c8fa137d2590ac3184044f3fd]
#
# patch "conf/machine/magicbox.conf"
# from [258d65a553b998a591c90af66c6065e4c922738a]
# to [d69397663a62a770f6f3058881f6bb0801b18d6c]
#
# patch "conf/machine/magician.conf"
# from [4266fe41e816fc7ff187a9504cb52b6064f20fb9]
# to [11824fa922d1925fe9b00525aa262b06a13767d1]
#
# patch "conf/machine/sequoia.conf"
# from [19f01cff204741e1068e53c071024eb52d6fa320]
# to [93bf49ad628dbf470a00b21f525d9e5a863e7ca7]
#
# patch "conf/machine/x86-32-nocona.conf"
# from [4751fe71ac3de06ec5669fd29663ce396bf3ac4f]
# to [6ec18a5628f4cd6d7ad3b15ba1866eab532bb548]
#
# patch "conf/machine/x86-prescott.conf"
# from [c4bf154f03bb4818ad538b852d24e1d50e653d76]
# to [1d4653c1ee4503181a0ef606680321a3977ba662]
#
# patch "conf/machine/x86.conf"
# from [28f63bda2b037a316931c0707a0db0f81b10a9cb]
# to [3aef3755eda37df09c8c0aef5b8b7673f4e8e8d3]
#
# patch "packages/alsa/alsa-state/fic-gta01/stereoout.state"
# from [60ed98cc23aa2632e929be42de88a235566c1567]
# to [63e54f8297425dddaa40a22a6e118b9b10452bdc]
#
# patch "packages/alsa/alsa-state.bb"
# from [c5a974bedd90b65940d3b4101b2bd8c1ceee517b]
# to [1e1db07daa4ed18374bac118212fb191e3bcd625]
#
# patch "packages/angstrom/angstrom-version.bb"
# from [ff131aaba95a9bcd3a37ebca6e4718b621306acf]
# to [defa19a91820c9e7dabd4292ad9625039cd8163a]
#
# patch "packages/binutils/binutils_2.16.bb"
# from [1717ed2d1c7d8d94b2bed69019e6e0336d14bd8e]
# to [e8f4d7f7221f84224deec02c960351b1cc143312]
#
# patch "packages/bluez/bluez-utils.inc"
# from [c8dd9e28f68c6726fb89a20b6723b6fc9395be33]
# to [c76d14a32b8b7dc51354eef96c448ca54da20825]
#
# patch "packages/check/check_0.9.2.bb"
# from [f8c45d44d7bac459264da34cd4b61627a5c03bb9]
# to [c5a60d4db32bacc31c6341076bbbe6907caa49b0]
#
# patch "packages/dfu-util/dfu-util-native_svn.bb"
# from [51d347879d9df6cb68a8cfe7839dea77544ac715]
# to [36c7a32697727fceeefe1a12b0c3abb728831cd4]
#
# patch "packages/dfu-util/dfu-util_svn.bb"
# from [cf6a45fe99370f4938bed1dbc2ca7123380f8322]
# to [ecc120ec36e47364e4715f34bd86856b6f93370f]
#
# patch "packages/directfb/directfb_1.1.0.bb"
# from [32e27f68890867b0d847d2ce82e8c21efeb704f9]
# to [c9da95fb956d450af0c360a3364023c960f9d1af]
#
# patch "packages/exmap-console/exmap-console.inc"
# from [e377d685a9615554dd91e58878e366d0c7d3d0a3]
# to [63d7774ca1ed640b50ead734368313117dad3a6c]
#
# patch "packages/exmap-console/exmap-console_svn.bb"
# from [9e500fd9df5191ba71310c281219b5b3dd9ab532]
# to [50e84e64c10611bab6685b53608fd43fde980c47]
#
# patch "packages/ezx/ezxd/ezxd.init"
# from [f7c1fdf056b8ad78416819cfa54762a3187fcb85]
# to [65a66a4dd80193c3ae0fbfd40048f78a1b6c0a59]
#
# patch "packages/ezx/ezxd_svn.bb"
# from [da9cb81d38e8d11e3e0ab84d48abfb9575ddf6aa]
# to [4799fe4237a081c436a74620de1334f3e8d9cb4d]
#
# patch "packages/gcc/gcc_4.1.2.bb"
# from [1bcca958ef7fe579cf9ef8cb370434924b1fa029]
# to [520d602fe4601361883e3c07caf5990c6203f558]
#
# patch "packages/gnutls/gnutls.inc"
# from [c9bbf39496c2bdfdabb153b72ae6dffd0abdca28]
# to [68f9beaa99eeb59c7371dd555e9485abd13efa46]
#
# patch "packages/gpe-conf/gpe-conf_0.2.6.bb"
# from [ab00b228e49cc53742b5fcd1ecb6dd579a926ef3]
# to [86e16babf4c0a37cb552a66f01e6d3fb2cd8fc2e]
#
# patch "packages/gpephone/linphone_1.5.0.bb"
# from [cf4c71c11372f4d8b35ca2746e59f323%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list