[oe-commits] org.oe.dev merge of '31bba0038265d49f89a999578ff89351b559e4a0'
coredump2 commit
openembedded-commits at lists.openembedded.org
Mon Jul 2 02:27:20 UTC 2007
merge of '31bba0038265d49f89a999578ff89351b559e4a0'
and 'a6fcc49ed2f48cc2516058b4deccdca676b66dd6'
Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: d5218964c2f86e0527cc53498f30ee2ba3e27628
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d5218964c2f86e0527cc53498f30ee2ba3e27628
Files:
1
conf/bitbake.conf
conf/sanity.conf
packages/linux/ixp4xx-kernel_2.6.21.5.bb
packages/orinoco/spectrum-fw.bb
packages/tasks/task-slugos.bb
packages/webkit/webkit/WebKit.pri
packages/webkit/webkit/WebKit.pro
packages/webkit/webkit_svn.bb
packages/gnome/libbonoboui_2.18.0.bb
conf/distro/angstrom-2007.1.conf
Diffs:
#
# mt diff -r31bba0038265d49f89a999578ff89351b559e4a0 -rd5218964c2f86e0527cc53498f30ee2ba3e27628
#
#
#
# patch "conf/bitbake.conf"
# from [51cc7d722038648d335388305f9dcdec4356c3f9]
# to [d52250874c724734f38a1342376ffb804d7a19fb]
#
# patch "conf/sanity.conf"
# from [08629cacf022df294e733bc30d71e2414892db21]
# to [0c7bde35788c8bef29a1bb5effc41bf31f6ec14a]
#
# patch "packages/linux/ixp4xx-kernel_2.6.21.5.bb"
# from [280077a18b031293c1f1b450119bc5c7d1ddf0c8]
# to [e9a048ca3969704b32d14ddaf7a1b15c1413e95f]
#
# patch "packages/orinoco/spectrum-fw.bb"
# from [aa5bcb1b2670dd2c736a9798af5426bcc094a5e0]
# to [154330d9fc9d18c12a0dd882b43b31e6aecb5f7c]
#
# patch "packages/tasks/task-slugos.bb"
# from [8c69c0f0db2c1ab6eccbe28cb5703ed893995c13]
# to [9b3a116faea9265f7fc10285942e53fbc831e391]
#
# patch "packages/webkit/webkit/WebKit.pri"
# from [c8e302cc4f89f413203d7495f5420b30bd4d00d5]
# to [66a2198f6e713621703e637cb558322feb4153e5]
#
# patch "packages/webkit/webkit/WebKit.pro"
# from [537b32b95d99345d2ca57b8a5d376255ab6fa594]
# to [c4db9377c267835f4ec934a4d53207e26c25b99c]
#
# patch "packages/webkit/webkit_svn.bb"
# from [5b915eb5f921279a87c586be1fe28c3ce04cfe70]
# to [a579828b28b3be2c2c2b36f20643de557f0778dc]
#
============================================================
--- conf/bitbake.conf 51cc7d722038648d335388305f9dcdec4356c3f9
+++ conf/bitbake.conf d52250874c724734f38a1342376ffb804d7a19fb
@@ -350,6 +350,10 @@ KERNELORG_MIRROR = "http://kernel.org/"
# export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
# into your local.conf
+FETCHCMD_svn = "/usr/bin/env svn"
+FETCHCMD_cvs = "/usr/bin/env cvs"
+FETCHCMD_wget = "/usr/bin/env wget -t 5"
+
FETCHCOMMAND = "ERROR, this must be a BitBake bug"
FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}"
============================================================
--- conf/sanity.conf 08629cacf022df294e733bc30d71e2414892db21
+++ conf/sanity.conf 0c7bde35788c8bef29a1bb5effc41bf31f6ec14a
@@ -1,8 +1,8 @@
# Sanity checks for common user misconfigurations
#
# See sanity.bbclass
#
# Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "1.6.8"
+BB_MIN_VERSION = "1.8.5"
INHERIT += "sanity"
============================================================
--- packages/linux/ixp4xx-kernel_2.6.21.5.bb 280077a18b031293c1f1b450119bc5c7d1ddf0c8
+++ packages/linux/ixp4xx-kernel_2.6.21.5.bb e9a048ca3969704b32d14ddaf7a1b15c1413e95f
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "879"
+IXP4XX_KERNEL_SVN_REV = "889"
#
# The directory containing the patches to be applied is
# specified below
============================================================
--- packages/orinoco/spectrum-fw.bb aa5bcb1b2670dd2c736a9798af5426bcc094a5e0
+++ packages/orinoco/spectrum-fw.bb 154330d9fc9d18c12a0dd882b43b31e6aecb5f7c
@@ -1,4 +1,5 @@ DESCRIPTION = "Firmware for Spectrum Wir
DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
+DEPENDS += " unzip-native "
LICENSE = "unknown"
PR = "r1"
============================================================
--- packages/tasks/task-slugos.bb 8c69c0f0db2c1ab6eccbe28cb5703ed893995c13
+++ packages/tasks/task-slugos.bb 9b3a116faea9265f7fc10285942e53fbc831e391
@@ -6,7 +6,7 @@ LICENSE = "MIT"
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r10"
+PR = "r11"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -100,6 +100,16 @@ madwifi-ng-modules madwifi-ng-tools \
madwifi-ng-modules madwifi-ng-tools \
"
+## Other wireless tools that should be considered
+## should space be available in the rootfs
+# wireless-tools wpa-supplicant \
+# zd1211-firmware kernel-module-zd1211rw \
+
+# Add kexec tools for rebooting alternate kernels
+SLUGOS_STANDARD_RRECOMMENDS += "\
+kexec-tools \
+"
+
# Add modules required for Network Console support
# NOTE: This module is desirable for systems lacking a physical
# console, but is usually only enabled if specific needs or issues
============================================================
--- packages/webkit/webkit/WebKit.pri c8e302cc4f89f413203d7495f5420b30bd4d00d5
+++ packages/webkit/webkit/WebKit.pri 66a2198f6e713621703e637cb558322feb4153e5
@@ -5,11 +5,11 @@ qt-port:DEFINES += BUILDING_QT__=1
!gdk-port:CONFIG += qt-port
qt-port:DEFINES += BUILDING_QT__=1
-qt-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt
+qt-port:!building-libs:LIBS += -L$$OUTPUT_DIR/lib -lQtWebKit
gdk-port:CONFIG += link_pkgconfig
gdk-port:PKGCONFIG += cairo gdk-2.0 gtk+-2.0 libcurl
gdk-port:DEFINES += BUILDING_GDK__=1 BUILDING_CAIRO__
-gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags)
+gdk-port:LIBS += -L$$OUTPUT_DIR/lib -lWebKitGdk $$system(icu-config --ldflags) -ljpeg -lpng
gdk-port:QMAKE_CXXFLAGS += $$system(icu-config --cppflags)
DEFINES += USE_SYSTEM_MALLOC
@@ -22,7 +22,7 @@ gdk-port:INCLUDEPATH += \
$$PWD/WebKitQt/Api
gdk-port:INCLUDEPATH += \
$$BASE_DIR/WebCore/platform/gdk \
- $$BASE_DIR/WebCore/platform/network/gdk \
+ $$BASE_DIR/WebCore/platform/network/curl \
$$BASE_DIR/WebCore/platform/graphics/cairo \
$$BASE_DIR/WebCore/loader/gdk \
$$BASE_DIR/WebCore/page/gdk
============================================================
--- packages/webkit/webkit/WebKit.pro 537b32b95d99345d2ca57b8a5d376255ab6fa594
+++ packages/webkit/webkit/WebKit.pro c4db9377c267835f4ec934a4d53207e26c25b99c
@@ -1,7 +1,8 @@ CONFIG += ordered
TEMPLATE = subdirs
CONFIG += ordered
!gdk-port:CONFIG += qt-port
-SUBDIRS = \
+qt-port:SUBDIRS += WebKitQt/Plugins
+SUBDIRS += \
WebCore \
JavaScriptCore/kjs/testkjs.pro
============================================================
--- packages/webkit/webkit_svn.bb 5b915eb5f921279a87c586be1fe28c3ce04cfe70
+++ packages/webkit/webkit_svn.bb a579828b28b3be2c2c2b36f20643de557f0778dc
@@ -41,7 +41,7 @@ do_install() {
install -m 0755 ${S}/WebKitBuilds/Debug/WebKitTools/GdkLauncher/GdkLauncher ${D}${bindir}
cp -pPR WebKitBuilds/Debug/lib/*.so* ${D}${libdir}
- cp -pPR WebKitBuilds/Debug/lib/*.pc ${D}${libdir}/pkgconfig/
+ cp -pPR WebKitBuilds/Debug/lib/*.pc ${D}${libdir}/pkgconfig/ || true
}
#
# mt diff -ra6fcc49ed2f48cc2516058b4deccdca676b66dd6 -rd5218964c2f86e0527cc53498f30ee2ba3e27628
#
#
#
# add_file "packages/gnome/libbonoboui_2.18.0.bb"
# content [29147e7ffba0f814ecba05e475e3a9c95990025a]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [7af571dec46a08f59ffc123620db98c3a5e6be4b]
# to [59159a926215caee1cf37b3d07c5a4bcf28deb10]
#
============================================================
--- packages/gnome/libbonoboui_2.18.0.bb 29147e7ffba0f814ecba05e475e3a9c95990025a
+++ packages/gnome/libbonoboui_2.18.0.bb 29147e7ffba0f814ecba05e475e3a9c95990025a
@@ -0,0 +1,59 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+PR = "r1"
+
+inherit gnome pkgconfig
+
+FILES_${PN} += "${libdir}/libglade/2.0/*.so"
+FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \
+ ${libdir}/bonobo-2.0/samples"
+FILES_${PN}-dbg += "${libdir}/bonobo-2.0/samples/.debug \
+ ${libdir}/libglade/2.0/.debug"
+
+DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+HEADERS = " \
+bonobo/bonobo-zoomable.h \
+bonobo/bonobo-ui-component.h \
+bonobo/bonobo-dock-layout.h \
+bonobo/bonobo-ui-type-builtins.h \
+bonobo/bonobo-canvas-component.h \
+bonobo/bonobo-widget.h \
+bonobo/bonobo-ui-engine.h \
+bonobo/bonobo-window.h \
+bonobo/bonobo-ui-toolbar.h \
+bonobo/bonobo-dock-band.h \
+bonobo/bonobo-ui-toolbar-item.h \
+bonobo/bonobo-control.h \
+bonobo/bonobo-dock-item.h \
+bonobo/bonobo-ui-config-widget.h \
+bonobo/bonobo-zoomable-frame.h \
+bonobo/bonobo-control-frame.h \
+bonobo/bonobo-dock.h \
+bonobo/bonobo-ui-main.h \
+bonobo/bonobo-canvas-item.h \
+bonobo/bonobo-ui-node.h \
+bonobo/bonobo-socket.h \
+bonobo/bonobo-selector.h \
+bonobo/bonobo-ui-sync.h \
+bonobo/bonobo-ui-util.h \
+bonobo/bonobo-plug.h \
+bonobo/bonobo-ui-toolbar-button-item.h \
+bonobo/bonobo-ui-toolbar-toggle-button-item.h \
+bonobo/bonobo-ui-container.h \
+bonobo/bonobo-file-selector-util.h \
+bonobo/bonobo-property-control.h \
+bonobo/bonobo-selector-widget.h \
+libbonoboui.h \
+bonobo.h \
+"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/libbonoboui-2.0/bonobo
+ for i in ${HEADERS}; do
+ install -m 0644 $i ${STAGING_INCDIR}/libbonoboui-2.0/$i
+ done
+ oe_libinstall -C bonobo -a -so libbonoboui-2 ${STAGING_LIBDIR}
+}
============================================================
--- conf/distro/angstrom-2007.1.conf 7af571dec46a08f59ffc123620db98c3a5e6be4b
+++ conf/distro/angstrom-2007.1.conf 59159a926215caee1cf37b3d07c5a4bcf28deb10
@@ -160,7 +160,7 @@ PREFERRED_VERSION_randrproto ?= "
PREFERRED_VERSION_xrandr ?= "1.2.0"
PREFERRED_VERSION_randrproto ?= "1.2.1"
-PREFERRED_VERSION_libgnomeui = "2.16.1"
+PREFERRED_VERSION_libgnomeui = "2.18.1"
PREFERRED_VERSION_prismstumbler = "0.7.3"
#use EABI ready toolchain
More information about the Openembedded-commits
mailing list