[oe-commits] org.oe.dev merge of 'c45039b9d53ed9e37550259ce83254ec7ac435ed'
xora commit
openembedded-commits at lists.openembedded.org
Fri Oct 26 21:56:57 UTC 2007
merge of 'c45039b9d53ed9e37550259ce83254ec7ac435ed'
and 'c5975a0ccc287717a69db83c13d7d27a459c25cb'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: a93a1dd8de7fe4f2f480d9bbba485eea521fba9b
ViewMTN: http://monotone.openembedded.org/revision/info/a93a1dd8de7fe4f2f480d9bbba485eea521fba9b
Files:
1
packages/mono-xsp
packages/openmoko2/openmoko-tasks2
packages/kdepimpi/files/gcc42.patch
packages/mono-xsp/mono-xsp_1.2.5.bb
packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop
packages/openmoko2/openmoko-tasks2/openmoko-tasks.png
conf/distro/include/sane-srcrevs.inc
packages/gnome/gconf-dbus_svn.bb
packages/kdepimpi/kdepimpi_2.2.7.bb
packages/libowl/libowl_svn.bb
packages/linux/linux-rp.inc
packages/linux/linux.inc
packages/openmoko2/openmoko-tasks2_svn.bb
mtn:manual_merge
true
packages/rt2x00/rt2570-k2wrlz_1.6.1.bb
packages/rt2x00/rt73-k2wrlz_2.0.1.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
Diffs:
#
# mt diff -rc45039b9d53ed9e37550259ce83254ec7ac435ed -ra93a1dd8de7fe4f2f480d9bbba485eea521fba9b
#
#
#
# add_dir "packages/mono-xsp"
#
# add_dir "packages/openmoko2/openmoko-tasks2"
#
# add_file "packages/kdepimpi/files/gcc42.patch"
# content [af202c7b5a77e0f373d182f75dd9ef7763999d40]
#
# add_file "packages/mono-xsp/mono-xsp_1.2.5.bb"
# content [c07f58f87eccceac91242a9ea6e52aa94b9f439c]
#
# add_file "packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop"
# content [0ab5bae71daa84308ac799d949380fd1ac36df03]
#
# add_file "packages/openmoko2/openmoko-tasks2/openmoko-tasks.png"
# content [a92b7bc98d3c62fde9724584555eb631628f9fc0]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [e8db58e1bca9b6d26468e1c5616d8654cc8fcb2d]
# to [518ae2deeccbdfded4694878765da5102bf1c7af]
#
# patch "packages/gnome/gconf-dbus_svn.bb"
# from [736ff2e0f199bacf3c0368448f9d7fcbd6de5973]
# to [cfb0cd440b4736752691aef4cc9761eb15e6a9e4]
#
# patch "packages/kdepimpi/kdepimpi_2.2.7.bb"
# from [0349a4cb14b6823831790a11e39cfeff149c58a3]
# to [6829b6cdb42d14509e8415925657c5297cf50ddb]
#
# patch "packages/libowl/libowl_svn.bb"
# from [d5d85a76511d0833f4f28984af1609606a459337]
# to [de6095a1f1373fa2e02f7b7388d6b6fb4fed0483]
#
# patch "packages/linux/linux-rp.inc"
# from [f0c317eb10cb2f40cf0bff43801c47d20836ed32]
# to [3a8abe2f6791601f240fbf36eb1b3f9dbbab5d37]
#
# patch "packages/linux/linux.inc"
# from [725c2f919e6f7ef208779c7e133aaa60648fb1b3]
# to [14e3b9590c6a3ef9334959ab19c1b24b1954b55b]
#
# patch "packages/openmoko2/openmoko-tasks2_svn.bb"
# from [073ff06008149dc89ef3cdff2c63a306ba506b58]
# to [c75dbbf995c60915a9e42fbc9f458dec42664fe9]
#
# set "packages/openmoko2/openmoko-tasks2/openmoko-tasks.png"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
--- packages/kdepimpi/files/gcc42.patch af202c7b5a77e0f373d182f75dd9ef7763999d40
+++ packages/kdepimpi/files/gcc42.patch af202c7b5a77e0f373d182f75dd9ef7763999d40
@@ -0,0 +1,13 @@
+diff --git a/kabc/secrecy.h b/kabc/secrecy.h
+index 21e22f2..3011ae9 100644
+--- a/kabc/secrecy.h
++++ b/kabc/secrecy.h
+@@ -98,5 +98,8 @@ private:
+ int mType;
+ };
+
++QDataStream& operator<<(QDataStream& s,const Secrecy &secrecy);
++QDataStream& operator>>(QDataStream& s,Secrecy &secrecy);
++
+ }
+ #endif
============================================================
--- packages/mono-xsp/mono-xsp_1.2.5.bb c07f58f87eccceac91242a9ea6e52aa94b9f439c
+++ packages/mono-xsp/mono-xsp_1.2.5.bb c07f58f87eccceac91242a9ea6e52aa94b9f439c
@@ -0,0 +1,229 @@
+DESCRIPTION = "Standalone web server written in C# that can be used to run ASP.NET applications"
+SECTION = "devel/mono"
+
+# Issues:
+# - packaging of mono-xsp is still broken. It using using the default
+# FILES list instead of the one specified below
+# - scripts in /usr/bin contain the wrong paths
+#
+
+
+PR = "r4"
+
+DEPENDS = "mono"
+RDEPENDS = "mono"
+
+inherit autotools mono
+
+SRC_URI = "http://go-mono.com/sources/xsp/xsp-${PV}.tar.bz2"
+
+S = "${WORKDIR}/xsp-${PV}"
+
+PACKAGES = "\
+ libmono-webserver1.0-cil \
+ libmono-webserver2.0-cil \
+ mono-xsp \
+ mono-xsp2 \
+ mono-xsp-test \
+ mono-mod-mono-server \
+ mono-mod-mono-server2 \
+ mono-xsp-doc \
+ mono-xsp-dev \
+ "
+
+FILES_libmono-webserver1.0-cil-dbg = " \
+ /usr/lib/mono/gac/Mono.WebServer/0.1.*/*.mdb \
+ "
+FILES_libmono-webserver1.0-cil = " \
+ /usr/lib/mono/gac/Mono.WebServer/0.1.*/ \
+ /usr/lib/mono/1.0/Mono.WebServer.dll \
+ "
+FILES_libmono-webserver2.0-cil-dbg = " \
+ /usr/lib/mono/gac/Mono.WebServer2/0.2.*/*.mdb \
+ "
+FILES_libmono-webserver2.0-cil = " \
+ /usr/lib/mono/gac/Mono.WebServer2/0.2.*/ \
+ /usr/lib/mono/2.0/Mono.WebServer2.dll \
+ "
+FILES_${PN}-dbg = " \
+ /usr/lib/mono/gac/xsp/1.2.*/*.mdb \
+ "
+FILES_${PN} = " \
+ /usr/lib/mono/gac/xsp/1.2.*/ \
+ /usr/lib/mono/1.0/xsp.exe \
+ /usr/bin/xsp \
+ /usr/bin/asp-state \
+ /usr/bin/dbsessmgr \
+ /usr/lib/xsp/1.0/asp-state.exe.config \
+ /usr/lib/xsp/1.0/asp-state.exe \
+ /usr/lib/xsp/1.0/dbsessmgr.exe.config \
+ /usr/lib/xsp/1.0/dbsessmgr.exe \
+ "
+FILES_mono-xsp2-dbg = " \
+ /usr/lib/mono/gac/xsp2/1.2.*/*.dbg \
+ "
+FILES_mono-xsp2 = " \
+ /usr/lib/mono/gac/xsp2/1.2.*/ \
+ /usr/lib/mono/2.0/xsp2.exe \
+ /usr/bin/xsp2 \
+ /usr/bin/asp-state2 \
+ /usr/bin/dbsessmgr2 \
+ /usr/lib/xsp/2.0/asp-state2.exe.config \
+ /usr/lib/xsp/2.0/asp-state2.exe \
+ /usr/lib/xsp/2.0/dbsessmgr2.exe.config \
+ /usr/lib/xsp/2.0/dbsessmgr2.exe \
+ "
+FILES_mono-mod-mono-server-dbg = "\
+ /usr/lib/mono/gac/mod-mono-server/1.2.*/*.mdb \
+ "
+FILES_mono-mod-mono-server = "\
+ /usr/lib/mono/gac/mod-mono-server/1.2.*/ \
+ /usr/lib/mono/1.0/mod-mono-server.exe \
+ /usr/bin/mod-mono-server \
+ "
+FILES_mono-mod-mono-server2-dbg = "\
+ /usr/lib/mono/gac/mod-mono-server2/1.2.*/*.mdb \
+ "
+FILES_mono-mod-mono-server2 = "\
+ /usr/lib/mono/gac/mod-mono-server2/1.2.*/ \
+ /usr/lib/mono/2.0/mod-mono-server2.exe \
+ /usr/bin/mod-mono-server2 \
+ "
+FILES_mono-xsp-dev = "\
+ /usr/lib/pkgconfig/xsp.pc \
+ /usr/lib/pkgconfig/xsp-2.pc \
+ "
+FILES_mono-xsp-test = " \
+ /usr/lib/xsp/test/1.1/authtest/index.aspx \
+ /usr/lib/xsp/test/1.1/authtest/login.aspx \
+ /usr/lib/xsp/test/1.1/authtest/web.config \
+ /usr/lib/xsp/test/1.1/asp.net/browsercaps.aspx \
+ /usr/lib/xsp/test/1.1/asp.net/codebehind1.aspx \
+ /usr/lib/xsp/test/1.1/asp.net/code-render.aspx \
+ /usr/lib/xsp/test/1.1/asp.net/body.inc \
+ /usr/lib/xsp/test/1.1/asp.net/header.inc \
+ /usr/lib/xsp/test/1.1/asp.net/registertest1.ascx \
+ /usr/lib/xsp/test/1.1/asp.net/registertest2.ascx \
+ /usr/lib/xsp/test/1.1/asp.net/includetest.aspx \
+ /usr/lib/xsp/test/1.1/asp.net/registertest.aspx \
+ /usr/lib/xsp/test/1.1/asp.net/server-side-object.aspx \
+ /usr/lib/xsp/test/1.1/asp.net/session1.aspx \
+ /usr/lib/xsp/test/1.1/asp.net/typedesc.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/listitem.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/temperature.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/validator1.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_adrotator.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_button.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_checkbox.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_checkboxlist.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_datagrid.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_datagrid_command.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_dropdownlist.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_hyperlink.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_image.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_imagebutton.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_label.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_linkbutton.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_listbox.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_literal.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_panel.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_placeholder.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_radiobutton.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_radiobuttonlist.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_regularexpressionvalidator.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_repeater.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_table2.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_table.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_textbox.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/web_xml.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/calendar.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/datalist.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/dbpage1.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/dbpage2.aspx \
+ /usr/lib/xsp/test/1.1/webcontrols/people.xml \
+ /usr/lib/xsp/test/1.1/webcontrols/web_adrotator.xml \
+ /usr/lib/xsp/test/1.1/webcontrols/peopletable.xsl \
+ /usr/lib/xsp/test/1.1/html/button.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlanchor.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlbutton.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlgeneric.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlimage.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlinputbutton.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlinputcheckbox.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlinputfile.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlinputhidden.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlinputimage.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlinputradiobutton.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlinputtext.aspx \
+ /usr/lib/xsp/test/1.1/html/htmlselect.aspx \
+ /usr/lib/xsp/test/1.1/html/htmltable.aspx \
+ /usr/lib/xsp/test/1.1/html/htmltextarea.aspx \
+ /usr/lib/xsp/test/1.1/webservice/ConverterService.asmx \
+ /usr/lib/xsp/test/1.1/webservice/TestService.asmx \
+ /usr/lib/xsp/test/1.1/webservice/ServiceClient.exe.config \
+ /usr/lib/xsp/test/1.1/webservice/CompressExtension.cs \
+ /usr/lib/xsp/test/1.1/databind/databind-arraylist.aspx \
+ /usr/lib/xsp/test/1.1/databind/databind-attribute.aspx \
+ /usr/lib/xsp/test/1.1/databind/databind-class.aspx \
+ /usr/lib/xsp/test/1.1/databind/databind-template.aspx \
+ /usr/lib/xsp/test/1.1/handlers/chunked.ashx \
+ /usr/lib/xsp/test/1.1/handlers/empty.ashx \
+ /usr/lib/xsp/test/1.1/handlers/monodoc.ashx \
+ /usr/lib/xsp/test/1.1/handlers/webhandler.ashx \
+ /usr/lib/xsp/test/1.1/handlers/async.ashx \
+ /usr/lib/xsp/test/1.1/customcontrol/tabcontrol2.aspx \
+ /usr/lib/xsp/test/1.1/customcontrol/tabcontrol.aspx \
+ /usr/lib/xsp/test/ServiceClient.exe \
+ /usr/lib/xsp/test/extensions.dll \
+ /usr/lib/xsp/test/mod-mono-server.exe.config \
+ /usr/lib/xsp/test/index.aspx \
+ /usr/lib/xsp/test/index2.aspx \
+ /usr/lib/xsp/test/xsp.exe.config \
+ /usr/lib/xsp/test/web.config \
+ /usr/lib/xsp/test/global.asax \
+ /usr/lib/xsp/test/mono.png \
+ /usr/lib/xsp/test/monobutton.png \
+ /usr/lib/xsp/test/mono-powered-big.png \
+ /usr/lib/xsp/test/small-icon.png \
+ /usr/lib/xsp/test/sample.webapp \
+ /usr/lib/xsp/test/favicon.ico \
+ /usr/lib/xsp/test/mono-xsp.css \
+ /usr/lib/xsp/test/bin/codebehind1.dll \
+ /usr/lib/xsp/test/bin/typedesc.dll \
+ /usr/lib/xsp/test/bin/extensions.dll \
+ /usr/lib/xsp/test/bin/tabcontrol.dll \
+ /usr/lib/xsp/test/bin/tabcontrol2.dll \
+ /usr/lib/xsp/test/bin/treeview.dll \
+ /usr/lib/xsp/test/2.0/menu/menu1.aspx \
+ /usr/lib/xsp/test/2.0/menu/menu2.aspx \
+ /usr/lib/xsp/test/2.0/menu/stock_copy_24.png \
+ /usr/lib/xsp/test/2.0/menu/stock_cut_24.png \
+ /usr/lib/xsp/test/2.0/menu/stock_paste_24.png \
+ /usr/lib/xsp/test/2.0/treeview/populate-on-demand.aspx \
+ /usr/lib/xsp/test/2.0/treeview/populate.cs \
+ /usr/lib/xsp/test/2.0/treeview/treeview.aspx \
+ /usr/lib/xsp/test/2.0/treeview/treeview-databound.aspx \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/dash.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/dashminus.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/dashplus.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/i.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/l.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/lminus.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/lplus.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/minus.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/noexpand.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/plus.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/r.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/rminus.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/rplus.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/t.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/tminus.gif \
+ /usr/lib/xsp/test/2.0/treeview/TreeLineImages/tplus.gif \
+ /usr/lib/xsp/test/2.0/masterpages/simple.master \
+ /usr/lib/xsp/test/2.0/masterpages/simple.aspx \
+ /usr/lib/xsp/test/2.0/masterpages/frame.master \
+ /usr/lib/xsp/test/2.0/masterpages/content1.aspx \
+ /usr/lib/xsp/test/2.0/masterpages/content2.aspx \
+ "
+
+
============================================================
--- packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop 0ab5bae71daa84308ac799d949380fd1ac36df03
+++ packages/openmoko2/openmoko-tasks2/openmoko-tasks.desktop 0ab5bae71daa84308ac799d949380fd1ac36df03
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Tasks
+Comment=What you need to do
+Exec=tasks
+Icon=openmoko-tasks
+Terminal=false
+Type=Application
+Categories=GTK;Application;PIM;Office
+MimeType=text/x-vcard;
+SingleInstance=true
+StartupNotify=true
============================================================
# packages/openmoko2/openmoko-tasks2/openmoko-tasks.png is binary
============================================================
--- conf/distro/include/sane-srcrevs.inc e8db58e1bca9b6d26468e1c5616d8654cc8fcb2d
+++ conf/distro/include/sane-srcrevs.inc 518ae2deeccbdfded4694878765da5102bf1c7af
@@ -52,7 +52,7 @@ SRCREV_pn-openmoko-appmanager ?= "1851"
SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-openmoko-appearance ?= "3239"
SRCREV_pn-openmoko-appmanager ?= "1851"
-SRCREV_pn-openmoko-appmanager2 ?= "3090"
+SRCREV_pn-openmoko-appmanager2 ?= "3271"
SRCREV_pn-openmoko-browser2 ?= "3249"
SRCREV_pn-openmoko-calculator ?= "2404"
SRCREV_pn-openmoko-calculator2 ?= "3235"
@@ -63,7 +63,7 @@ SRCREV_pn-openmoko-dialer ?= "2811"
SRCREV_pn-openmoko-dates ?= "467"
SRCREV_pn-openmoko-dates2 ?= "658"
SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3182"
+SRCREV_pn-openmoko-dialer2 ?= "3282"
SRCREV_pn-openmoko-feedreader2 ?= "3080"
SRCREV_pn-openmoko-finger-demo ?= "1671"
SRCREV_pn-openmoko-firststart2 ?= "3158"
@@ -73,9 +73,9 @@ SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3225"
SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3263"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3274"
SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-panel-battery ?= "2897"
+SRCREV_pn-openmoko-panel-battery ?= "3272"
SRCREV_pn-openmoko-panel-bt ?= "2896"
SRCREV_pn-openmoko-panel-clock ?= "2567"
SRCREV_pn-openmoko-panel-demo ?= "1622"
@@ -98,7 +98,7 @@ SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-theme-standard2 ?= "3210"
SRCREV_pn-openmoko-theme-standard2-qvga ?= "3210"
SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3180"
+SRCREV_pn-openmoko-today2 ?= "3287"
SRCREV_pn-openmoko-today2-folders ?= "2680"
SRCREV_pn-openmoko-worldclock2 ?= "3241"
SRCREV_pn-openocd ?= "206"
============================================================
--- packages/gnome/gconf-dbus_svn.bb 736ff2e0f199bacf3c0368448f9d7fcbd6de5973
+++ packages/gnome/gconf-dbus_svn.bb cfb0cd440b4736752691aef4cc9761eb15e6a9e4
@@ -7,7 +7,7 @@ PV = "2.16.0+svnr${SRCREV}"
RPROVIDES_${PN}-dev = "gconf-dev"
PV = "2.16.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
file://69gconfd-dbus"
@@ -35,6 +35,4 @@ do_install_append () {
do_install_append () {
install -d ${D}/${sysconfdir}/X11/Xsession.d
install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
- install -d ${D}/${datadir}/dbus-1.0/services/
- install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
}
============================================================
--- packages/kdepimpi/kdepimpi_2.2.7.bb 0349a4cb14b6823831790a11e39cfeff149c58a3
+++ packages/kdepimpi/kdepimpi_2.2.7.bb 6829b6cdb42d14509e8415925657c5297cf50ddb
@@ -1,6 +1,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimp
SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
file://gcc4.patch;patch=1 \
- file://qt-mt.patch;patch=1"
+ file://qt-mt.patch;patch=1 \
+ file://gcc42.patch;patch=1"
require kdepimpi-base.inc
============================================================
--- packages/libowl/libowl_svn.bb d5d85a76511d0833f4f28984af1609606a459337
+++ packages/libowl/libowl_svn.bb de6095a1f1373fa2e02f7b7388d6b6fb4fed0483
@@ -11,10 +11,10 @@ SECTION = "libs"
HOMEPAGE = "http://www.o-hand.com"
LICENSE = "LGPL"
SECTION = "libs"
-PR = "r3"
+DEPENDS = "gtk+"
PV = "0.0+svnr${SRCREV}"
+PR = "r3"
-DEPENDS = "gtk+ glib-2.0"
PACKAGES = ""
SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http"
@@ -37,12 +37,3 @@ do_stage() {
done
install -m 644 libowl/.libs/libowl.a ${STAGING_LIBDIR}/
}
-
-do_install() {
-}
-
-do_package() {
-}
-
-do_package_write() {
-}
============================================================
--- packages/linux/linux-rp.inc f0c317eb10cb2f40cf0bff43801c47d20836ed32
+++ packages/linux/linux-rp.inc 3a8abe2f6791601f240fbf36eb1b3f9dbbab5d37
@@ -13,7 +13,6 @@ TKSRC %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rc5975a0ccc287717a69db83c13d7d27a459c25cb -ra93a1dd8de7fe4f2f480d9bbba485eea521fba9b
#
#
#
# add_file "packages/rt2x00/rt2570-k2wrlz_1.6.1.bb"
# content [3f9c2ee2e87ed099cb42b31719bc8538d10c8d36]
#
# add_file "packages/rt2x00/rt73-k2wrlz_2.0.1.bb"
# content [94c5ade405abb7ff66b4e2d6453b847385e0e177]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [0c1a451d57ee0e65eab2d12437ba3a1aa062c4f7]
# to [913ecac98860fe4b30ebace43de31d2b0170a40b]
#
============================================================
--- packages/rt2x00/rt2570-k2wrlz_1.6.1.bb 3f9c2ee2e87ed099cb42b31719bc8538d10c8d36
+++ packages/rt2x00/rt2570-k2wrlz_1.6.1.bb 3f9c2ee2e87ed099cb42b31719bc8538d10c8d36
@@ -0,0 +1,25 @@
+DESCRIPTION = "Enhanced Driver for Ralink rt2570 USB 802.11g WiFi sticks"
+HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan"
+SECTION = "kernel/modules"
+LICENSE = "GPL"
+
+SRC_URI = "http://homepages.tu-darmstadt.de/~p_larbig/wlan/${PN}-${PV}.tar.bz2"
+
+inherit module
+
+S = "${WORKDIR}/${PN}-${PV}/Module/"
+
+do_compile_prepend_arm () {
+ MAKE_TARGETS="arm"
+}
+
+do_compile() {
+ export KERNDIR=${STAGING_KERNEL_DIR}
+ module_do_compile
+}
+
+do_install() {
+ install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+ install -m 0644 rt2570${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/
+}
+
============================================================
--- packages/rt2x00/rt73-k2wrlz_2.0.1.bb 94c5ade405abb7ff66b4e2d6453b847385e0e177
+++ packages/rt2x00/rt73-k2wrlz_2.0.1.bb 94c5ade405abb7ff66b4e2d6453b847385e0e177
@@ -0,0 +1,21 @@
+DESCRIPTION = "Enhanced Driver for Ralink rt73 USB 802.11g WiFi sticks"
+HOMEPAGE = "http://homepages.tu-darmstadt.de/~p_larbig/wlan"
+SECTION = "kernel/modules"
+LICENSE = "GPL"
+
+SRC_URI="http://homepages.tu-darmstadt.de/~p_larbig/wlan/${PN}-${PV}.tar.bz2"
+
+inherit module
+
+S = "${WORKDIR}/${PN}-${PV}/Module/"
+
+do_compile() {
+ export KERNDIR=${STAGING_KERNEL_DIR}
+ module_do_compile
+}
+
+do_install() {
+ install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+ install -m 0644 rt73${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/
+}
+
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc 0c1a451d57ee0e65eab2d12437ba3a1aa062c4f7
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 913ecac98860fe4b30ebace43de31d2b0170a40b
@@ -1662,8 +1662,8 @@ PREFERRED_VERSION_rt2570 ?= "1.1.0-b2"
PREFERRED_VERSION_rrdtool ?= "1.0.49"
PREFERRED_VERSION_rsync ?= "2.6.9"
PREFERRED_VERSION_rt2570 ?= "1.1.0-b2"
-PREFERRED_VERSION_rt2570-k2wrlz ?= "1.6.0"
-PREFERRED_VERSION_rt73-k2wrlz ?= "1.0.0"
+PREFERRED_VERSION_rt2570-k2wrlz ?= "1.6.1"
+PREFERRED_VERSION_rt73-k2wrlz ?= "2.0.1"
PREFERRED_VERSION_rtaudio-tests ?= "3.0.1"
PREFERRED_VERSION_ruby ?= "1.8.5"
PREFERRED_VERSION_ruby-native ?= "1.8.5"
More information about the Openembedded-commits
mailing list