[oe-commits] org.oe.dev merge of '3903211109bcf34b8e6540e6f23ab4860f0236d8'
koen commit
openembedded-commits at lists.openembedded.org
Tue Jul 31 07:23:59 UTC 2007
merge of '3903211109bcf34b8e6540e6f23ab4860f0236d8'
and '5aa52a23ca3ba7054d5e294b0347d5f5e02dc077'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 24cba5923360fef7c5cc81d51000e30b90355eb9
ViewMTN: http://monotone.openembedded.org/revision.psp?id=24cba5923360fef7c5cc81d51000e30b90355eb9
Files:
1
packages/nonworking/minisip
packages/nonworking/minisip/minisip_1.0a.bb
packages/openmoko2/openmoko-session2/matchbox-session
packages/libmikey
packages/nonworking/libmikey
packages/libmikey/libmikey0_svn.bb
packages/minisip/libmikey_svn.bb
packages/libmnetutil
packages/nonworking/libmnetutil
packages/libmnetutil/libmnetutil0_svn.bb
packages/minisip/libmnetutil_svn.bb
packages/libmsip
packages/nonworking/libmsip
packages/libmsip/libmsip0_svn.bb
packages/minisip/libmsip_svn.bb
packages/libmutil/libmutil0_svn.bb
packages/minisip/libmutil0_svn.bb
packages/minisip
packages/minisip/minisip-video_svn.bb
packages/minisip/minisip_svn.bb
packages/nylon/simple-firewall.bb
packages/nonworking/nylon/simple-firewall.bb
packages/redboot-utils/fis_1.0.bb
packages/nonworking/redboot-utils/fis_1.0.bb
packages/nonworking/nylon
packages/nonworking/redboot-utils
classes/openmoko-panel-plugin.bbclass
conf/bitbake.conf
packages/openmoko2/openmoko-session2.bb
conf/distro/include/sane-srcdates.inc
Diffs:
#
# mt diff -r3903211109bcf34b8e6540e6f23ab4860f0236d8 -r24cba5923360fef7c5cc81d51000e30b90355eb9
#
#
#
# delete "packages/nonworking/minisip"
#
# delete "packages/nonworking/minisip/minisip_1.0a.bb"
#
# delete "packages/openmoko2/openmoko-session2/matchbox-session"
#
# rename "packages/libmikey"
# to "packages/nonworking/libmikey"
#
# rename "packages/libmikey/libmikey0_svn.bb"
# to "packages/minisip/libmikey_svn.bb"
#
# rename "packages/libmnetutil"
# to "packages/nonworking/libmnetutil"
#
# rename "packages/libmnetutil/libmnetutil0_svn.bb"
# to "packages/minisip/libmnetutil_svn.bb"
#
# rename "packages/libmsip"
# to "packages/nonworking/libmsip"
#
# rename "packages/libmsip/libmsip0_svn.bb"
# to "packages/minisip/libmsip_svn.bb"
#
# rename "packages/libmutil/libmutil0_svn.bb"
# to "packages/minisip/libmutil0_svn.bb"
#
# rename "packages/minisip"
# to "packages/nonworking/minisip"
#
# rename "packages/minisip/minisip-video_svn.bb"
# to "packages/minisip/minisip-video_svn.bb"
#
# rename "packages/minisip/minisip_svn.bb"
# to "packages/minisip/minisip_svn.bb"
#
# rename "packages/nylon/simple-firewall.bb"
# to "packages/nonworking/nylon/simple-firewall.bb"
#
# rename "packages/redboot-utils/fis_1.0.bb"
# to "packages/nonworking/redboot-utils/fis_1.0.bb"
#
# add_dir "packages/minisip"
#
# add_dir "packages/nonworking/nylon"
#
# add_dir "packages/nonworking/redboot-utils"
#
# patch "classes/openmoko-panel-plugin.bbclass"
# from [012f38a2bf927dd13a92d1a76a02c43173db369f]
# to [55cfc79fba369b1c7c2ef58c00b1cec8af73670c]
#
# patch "conf/bitbake.conf"
# from [cb6550c833966af0deba898eb3e14cf54b4bd8c8]
# to [ee130e54dc68eb5516e965696fbced464a542166]
#
# patch "packages/minisip/libmikey_svn.bb"
# from [3f38f2dce5bc9a944ef323ab2263bed00b2a4453]
# to [a65e19f78f2cbfb5b75beca33f8ae626a33ea3da]
#
# patch "packages/minisip/libmnetutil_svn.bb"
# from [786a86b33f9f2d6515f7cf61d72c423c1937df8e]
# to [0b3c1266c0390434be8435998d21356da9f38162]
#
# patch "packages/minisip/libmsip_svn.bb"
# from [2ad3bdbdd693264322879c1d92bbea8551f356de]
# to [b6d456330d47fbbf3f605ecb7ea992f1ff8fc945]
#
# patch "packages/minisip/libmutil0_svn.bb"
# from [d631dd28173db0b1e57a3b7f459c7f593c8dc630]
# to [b306ca216c1ba5d7ffe9761dae2199837eca90b2]
#
# patch "packages/minisip/minisip-video_svn.bb"
# from [17768b692afbd5b4d96622114f55a6af420ab655]
# to [b242289b728aa9d6a738169fa3fda7ee45715ed9]
#
# patch "packages/minisip/minisip_svn.bb"
# from [bf6c1fdeb823b6b245daa2fb7c6a4ff9d69524f2]
# to [acac6fd6c5435c301c87aa3141a718c243941656]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c]
# to [287c0e28376a34132ad66d96f657e7b35fbabfdb]
#
============================================================
--- classes/openmoko-panel-plugin.bbclass 012f38a2bf927dd13a92d1a76a02c43173db369f
+++ classes/openmoko-panel-plugin.bbclass 55cfc79fba369b1c7c2ef58c00b1cec8af73670c
@@ -1,5 +1,5 @@ SECTION = "openmoko/panel-plugin"
SECTION = "openmoko/panel-plugin"
-DEPENDS += "matchbox-panel-2"
+DEPENDS += "matchbox-panel-2 libmokopanelui2"
inherit openmoko2
============================================================
--- conf/bitbake.conf cb6550c833966af0deba898eb3e14cf54b4bd8c8
+++ conf/bitbake.conf ee130e54dc68eb5516e965696fbced464a542166
@@ -365,6 +365,7 @@ SRCDATE = "${DATE}"
UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
SRCDATE = "${DATE}"
+SRCREV = "${@bb.fetch.get_srcrev(d)}"
SRC_URI = "file://${FILE}"
============================================================
--- packages/libmikey/libmikey0_svn.bb 3f38f2dce5bc9a944ef323ab2263bed00b2a4453
+++ packages/minisip/libmikey_svn.bb a65e19f78f2cbfb5b75beca33f8ae626a33ea3da
@@ -1,26 +1,17 @@
-PV = "0.3.2+svn${SRCDATE}"
-LICENSE = "LGPL"
-
DESCRIPTION = "C++ implementation of the Multimedia Internet KEYing (RFC3830)"
-SECTION = "libs"
+HOMEPAGE = "http://www.minisip.org"
+SECTION = "libs/network"
PRIORITY = "optional"
DEPENDS = "libmutil0 openssl"
-DEFAULT_PREFERENCE = "-1"
+PV = "0.3.2+svn${SRCDATE}"
+LICENSE = "LGPL"
-
inherit autotools
-SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmikey"
+SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmikey"
S = "${WORKDIR}/libmikey"
-
-PACKAGES = "${PN}"
-
-FILES_${PN} = " ${libdir}/libmikey.so.0 ${libdir}/libmikey.so.0.0.0 "
-
do_stage() {
- oe_libinstall -a -so libmikey ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/libmikey
- install -m 0644 ${S}/include/libmikey/* ${STAGING_INCDIR}/libmikey
+ autotools_stage_all
}
+
============================================================
--- packages/libmnetutil/libmnetutil0_svn.bb 786a86b33f9f2d6515f7cf61d72c423c1937df8e
+++ packages/minisip/libmnetutil_svn.bb 0b3c1266c0390434be8435998d21356da9f38162
@@ -1,25 +1,16 @@
-PV = "0.2.2+svn${SRCDATE}"
-LICENSE = "LGPL"
-
DESCRIPTION = "Networking class library for C++ programming"
-SECTION = "libs"
+HOMEPAGE = "http://www.minisip.org"
+SECTION = "libs/network"
PRIORITY = "optional"
DEPENDS = "libmutil0 openssl"
-DEFAULT_PREFERENCE = "-1"
+PV = "0.2.2+svn${SRCDATE}"
+LICENSE = "LGPL"
inherit autotools
-SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmnetutil"
-S="${WORKDIR}/libmnetutil"
+SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmnetutil"
+S = "${WORKDIR}/libmnetutil"
-
-PACKAGES = "${PN}"
-
-FILES_${PN} = " ${libdir}/libmnetutil.so.0 ${libdir}/libmnetutil.so.0.0.0 "
-
do_stage() {
- oe_libinstall -a -so libmnetutil ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/libmnetutil
- install -m 0644 ${S}/include/libmnetutil/* ${STAGING_INCDIR}/libmnetutil
+ autotools_stage_all
}
============================================================
--- packages/libmsip/libmsip0_svn.bb 2ad3bdbdd693264322879c1d92bbea8551f356de
+++ packages/minisip/libmsip_svn.bb b6d456330d47fbbf3f605ecb7ea992f1ff8fc945
@@ -1,25 +1,16 @@
-PV = "0.2.2+svn${SRCDATE}"
-LICENSE = "LGPL"
-
DESCRIPTION = "C++ implementation Session Initiation Protocol (RFC3261)"
-SECTION = "libs"
+HOMEPAGE = "http://www.minisip.org"
+SECTION = "libs/network"
PRIORITY = "optional"
DEPENDS = "libmnetutil0 libmutil0"
-DEFAULT_PREFERENCE = "-1"
+PV = "0.2.2+svn${SRCDATE}"
+LICENSE = "LGPL"
inherit autotools
-SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=libmsip"
-S="${WORKDIR}/libmsip"
+SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=libmsip"
+S = "${WORKDIR}/libmsip"
-
-PACKAGES = "${PN}"
-
-FILES_${PN} = " ${libdir}/libmsip.so.0 ${libdir}/libmsip.so.0.0.0 "
-
do_stage() {
- oe_libinstall -a -so libmsip ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/libmsip
- install -m 0644 ${S}/include/libmsip/* ${STAGING_INCDIR}/libmsip
+ autotools_stage_all
}
============================================================
--- packages/libmutil/libmutil0_svn.bb d631dd28173db0b1e57a3b7f459c7f593c8dc630
+++ packages/minisip/libmutil0_svn.bb b306ca216c1ba5d7ffe9761dae2199837eca90b2
@@ -1,10 +1,9 @@ DESCRIPTION = "Class library implementin
DESCRIPTION = "Class library implementing utilities for C++ programming"
+HOMEPAGE = "http://www.minisip.org"
LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
-
DEPENDS = "openssl"
-
PV = "0.3.1+svn${SRCDATE}"
inherit autotools lib_package
@@ -13,8 +12,5 @@ do_stage() {
S = "${WORKDIR}/libmutil"
do_stage() {
- oe_libinstall -a -so libmutil ${STAGING_LIBDIR}
-
- install -d ${STAGING_INCDIR}/libmutil
- install -m 0644 ${S}/include/libmutil/* ${STAGING_INCDIR}/libmutil
+ autotools_stage_all
}
============================================================
--- packages/minisip/minisip-video_svn.bb 17768b692afbd5b4d96622114f55a6af420ab655
+++ packages/minisip/minisip-video_svn.bb b242289b728aa9d6a738169fa3fda7ee45715ed9
@@ -1,18 +1,13 @@
-PV = "0.6.2+svn${SRCDATE}"
+DESCRIPTION = "SIP user agent, with focus on security - video support"
LICENSE = "GPL"
SECTION = "x11/utils"
-PR = "r0"
+DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmikey0"
CONFLICTS = "minisip"
+PV = "0.6.2+svn${SRCDATE}"
-DESCRIPTION = "SIP user agent, with focus on security - video support"
-DEPENDS = "libsdl-x11 ffmpeg-0.4.9-pre1+cvs${SRCDATE} libglademm libmsip0 libmikey0"
-SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip"
+SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=minisip"
S = "${WORKDIR}/minisip"
-
-
-FILES_${PN} += "${datadir}/minisip"
-
inherit autotools
EXTRA_OECONF = "--enable-ipaq --enable-video --with-avcodec=${STAGING_INCDIR}/ffmpeg"
@@ -23,3 +18,6 @@ do_install_append () {
install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png
install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop
}
+
+FILES_${PN} += "${datadir}/minisip"
+
============================================================
--- packages/minisip/minisip_svn.bb bf6c1fdeb823b6b245daa2fb7c6a4ff9d69524f2
+++ packages/minisip/minisip_svn.bb acac6fd6c5435c301c87aa3141a718c243941656
@@ -1,28 +1,23 @@
-PV = "0.6.2+svn${SRCDATE}"
+DESCRIPTION = "SIP user agent, with focus on security"
+HOMEPAGE = "http://www.minisip.org"
+DEPENDS = "libglademm libmsip0 libmikey0"
LICENSE = "GPL"
SECTION = "x11/utils"
-PR = "r0"
+PV = "0.6.2+svn${SRCDATE}"
-DESCRIPTION = "SIP user agent, with focus on security"
-DEPENDS = "libglademm libmsip0 libmikey0"
-SRC_URI = "svn://svn.minisip.org/var/svn/minisip/trunk;module=minisip"
+SRC_URI = "svn://svn.minisip.org/minisip/trunk;module=minisip"
S = "${WORKDIR}/${PN}"
-DEFAULT_PREFERENCE="-1"
-
-FILES_${PN} += "${datadir}/minisip"
-
inherit autotools
EXTRA_OECONF = "--enable-ipaq"
-# do_configure_prepend() {
-# ./bootstrap
-#}
-
do_install_append () {
install -d ${D}${datadir}/pixmaps
install -d ${D}${datadir}/applications
install -m 0644 share/minisip.png ${D}${datadir}/pixmaps/minisip.png
install -m 0644 share/minisip.desktop ${D}${datadir}/applications/minisip.desktop
}
+
+FILES_${PN} += "${datadir}/minisip"
+
============================================================
--- packages/openmoko2/openmoko-session2.bb 9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c
+++ packages/openmoko2/openmoko-session2.bb 287c0e28376a34132ad66d96f657e7b35fbabfdb
@@ -1,16 +1,14 @@ SECTION = "x11"
DESCRIPTION = "Custom MB session files for poky"
LICENSE = "GPL"
SECTION = "x11"
-RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
-RCONFLICTS = "matchbox-common openmoko-session"
-PR = "r20"
+RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
+RCONFLICTS = "openmoko-session"
+PR = "r21"
-SRC_URI = "file://etc file://matchbox-session"
+SRC_URI = "file://etc"
S = ${WORKDIR}
do_install() {
- install -d ${D}/${bindir}
- install -m 0755 ${S}/matchbox-session ${D}/${bindir}
cp -R ${S}/etc ${D}/etc
rm -fR ${D}/etc/.svn
rm -fR ${D}/etc/matchbox/.svn
#
# mt diff -r5aa52a23ca3ba7054d5e294b0347d5f5e02dc077 -r24cba5923360fef7c5cc81d51000e30b90355eb9
#
#
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [8698a726b2cf1a7d464c0f5539b1e2c306008f79]
# to [e8003cd4b71e0bc0e573da4ffb43083ce839581e]
#
============================================================
--- conf/distro/include/sane-srcdates.inc 8698a726b2cf1a7d464c0f5539b1e2c306008f79
+++ conf/distro/include/sane-srcdates.inc e8003cd4b71e0bc0e573da4ffb43083ce839581e
@@ -1,5 +1,4 @@
-# Lock down some SRCDATEs
-# (see http://svn.o-hand.com/view/poky/trunk/meta/conf/distro/poky.conf for wher it comes from)
+# Lock down some SRCDATEs, see http://svn.o-hand.com/view/poky/trunk/openembedded/conf/distro/poky.conf for the original version
# Kernel modules
SRCDATE_at76c503a-modules ?= "20060814"
@@ -32,7 +31,6 @@ SRCDATE_matchbox-panel-manager ?= "20060
SRCDATE_matchbox-keyboard ?= "20060725"
SRCDATE_matchbox-panel ?= "20060612"
SRCDATE_matchbox-panel-manager ?= "20060612"
-SRCDATE_matchbox-panel-2 ?= "20070720"
SRCDATE_matchbox-stroke ?= "20060612"
SRCDATE_matchbox-themes-extra ?= "20060612"
SRCDATE_matchbox-wm ?= "20060612"
@@ -52,7 +50,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
SRCDATE_gnome-vfs ?= "20060119"
SRCDATE_gtkhtml2 ?= "20060323"
-# Enlightenment Foundation Libraries (EFL)
+# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
SRCDATE_edb-native = "20070721"
@@ -140,20 +138,3 @@ SRCDATE_poppler0.6 = "20070708"
# Freedesktop.org
SRCDATE_poppler0.6 = "20070708"
-# OpenMoko
-SRCDATE_libgsmd ?= "now"
-SRCDATE_libmokogsmd2 ?= "now"
-SRCDATE_libmokoui2 ?= "now"
-SRCDATE_libmokojournal2 ?= "now"
-SRCDATE_libmokopanelui2 ?= "now"
-SRCDATE_openmoko-today2 ?= "now"
-SRCDATE_openmoko-dialer2 ?= "now"
-SRCDATE_openmoko-contacts2 ?= "now"
-
-SRCDATE_openmoko-panel-battery ?= "now"
-SRCDATE_openmoko-panel-clock ?= "now"
-SRCDATE_openmoko-panel-gsm ?= "now"
-SRCDATE_openmoko-panel-usb ?= "now"
-SRCDATE_openmoko-panel-bt ?= "now"
-SRCDATE_openmoko-panel-gps ?= "now"
-
More information about the Openembedded-commits
mailing list