[oe-commits] org.oe.dev merge of '0c667a35be10770cb3368fea6703de654299e6a3'
rwhitby commit
openembedded-commits at lists.openembedded.org
Thu Jun 21 17:41:21 UTC 2007
merge of '0c667a35be10770cb3368fea6703de654299e6a3'
and '1ab663214c75f15191022cd0009603778fc2e828'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 26c11eced35769b1c0bbf0d0f40726505128a158
ViewMTN: http://monotone.openembedded.org/revision.psp?id=26c11eced35769b1c0bbf0d0f40726505128a158
Files:
1
packages/twisted/twisted-2.5.0
packages/busybox/slingbox-1.3.1/fdisk-readhex.patch
packages/perl/perl-5.8.8/native-ssp.patch
packages/twisted/twisted-2.5.0/remove-zope-check.patch
packages/twisted/twisted_2.5.0.bb
packages/zope/zope_3.3.1.bb
packages/busybox/slingbox_1.3.1.bb
packages/perl/perl-native_5.8.8.bb
packages/python/python-gst_0.10.7.bb
packages/usb-gadget-mode/usb-gadget-mode.bb
Diffs:
#
# mt diff -r0c667a35be10770cb3368fea6703de654299e6a3 -r26c11eced35769b1c0bbf0d0f40726505128a158
#
#
# no changes
#
#
# mt diff -r1ab663214c75f15191022cd0009603778fc2e828 -r26c11eced35769b1c0bbf0d0f40726505128a158
#
#
#
# add_dir "packages/twisted/twisted-2.5.0"
#
# add_file "packages/busybox/slingbox-1.3.1/fdisk-readhex.patch"
# content [018c0295334aa0554f0540625a92f2e564633193]
#
# add_file "packages/perl/perl-5.8.8/native-ssp.patch"
# content [4c615884d98871a7a8c0e32556ada8193f43bce5]
#
# add_file "packages/twisted/twisted-2.5.0/remove-zope-check.patch"
# content [b374e482b2da4f1221e40b958611a195b9209c39]
#
# add_file "packages/twisted/twisted_2.5.0.bb"
# content [c050d4b524d150533b83779ab9c7b4094bc32734]
#
# add_file "packages/zope/zope_3.3.1.bb"
# content [76e578bec4263108a7140a36df255eb9a816b9db]
#
# patch "packages/busybox/slingbox_1.3.1.bb"
# from [b5a1753ec92314354c2f39a66283165576a9fb1e]
# to [f366957202587b2eaefca465454f5dc881c4a445]
#
# patch "packages/perl/perl-native_5.8.8.bb"
# from [e9ee05100dabfbe3bc15ebb347c19860a472f457]
# to [c0743df758d0d39ece2b86e2f02407860b131a37]
#
# patch "packages/python/python-gst_0.10.7.bb"
# from [76b263d53f52575128191f4cecf75716c3132314]
# to [e533e39909a739ef843c00c1c244aaf27670136f]
#
# patch "packages/usb-gadget-mode/usb-gadget-mode.bb"
# from [3d3ee2ebfd57b8099099fc66590709a9d6dd03d7]
# to [f7ab66d1eb201c5aa314f4f38a0edb48bec097a6]
#
============================================================
--- packages/busybox/slingbox-1.3.1/fdisk-readhex.patch 018c0295334aa0554f0540625a92f2e564633193
+++ packages/busybox/slingbox-1.3.1/fdisk-readhex.patch 018c0295334aa0554f0540625a92f2e564633193
@@ -0,0 +1,20 @@
+--- busybox-1.3.1/util-linux/fdisk.c.orig 2007-06-06 21:18:45.000000000 -0500
++++ busybox-1.3.1/util-linux/fdisk.c 2007-06-06 21:17:20.000000000 -0500
+@@ -331,13 +331,16 @@
+ read_hex(const struct systypes *sys)
+ {
+ unsigned long v;
++ char *e;
+ while (1) {
+ read_nonempty(_("Hex code (type L to list codes): "));
+ if (*line_ptr == 'l' || *line_ptr == 'L') {
+ list_types(sys);
+ continue;
+ }
+- v = bb_strtoul(line_ptr, NULL, 16);
++ v = bb_strtoul(line_ptr, &e, 16);
++ /* Clear out EINVAL code if it's because of the trailing \n */
++ if ((errno == EINVAL) && (*e == '\n')) errno = 0;
+ if (errno || v > 0xff) continue;
+ return v;
+ }
============================================================
--- packages/perl/perl-5.8.8/native-ssp.patch 4c615884d98871a7a8c0e32556ada8193f43bce5
+++ packages/perl/perl-5.8.8/native-ssp.patch 4c615884d98871a7a8c0e32556ada8193f43bce5
@@ -0,0 +1,14 @@
+Fix for compiling with ssp enabled gcc:
+See http://bugs.openembedded.org/show_bug.cgi?id=1980
+
+diff -Naur perl-5.8.7.orig/cflags.SH perl-5.8.7/cflags.SH
+--- perl-5.8.7.orig/cflags.SH 2002-09-30 10:59:07.000000000 +0000
++++ perl-5.8.7/cflags.SH 2005-10-02 04:08:39.000000000 +0000
+@@ -165,6 +165,8 @@
+ esac
+
+ : Can we perhaps use $ansi2knr here
++ [[ $file == regcomp ]] && export ccflags="${ccflags} -fno-stack-protector"
++ [[ $file == regexec ]] && export ccflags="${ccflags} -fno-stack-protector"
+ echo "$cc -c -DPERL_CORE $ccflags $optimize $warn"
+ eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"'
============================================================
--- packages/twisted/twisted-2.5.0/remove-zope-check.patch b374e482b2da4f1221e40b958611a195b9209c39
+++ packages/twisted/twisted-2.5.0/remove-zope-check.patch b374e482b2da4f1221e40b958611a195b9209c39
@@ -0,0 +1,18 @@
+Index: Twisted-2.5.0/TwistedCore-2.5.0/twisted/__init__.py
+===================================================================
+--- Twisted-2.5.0.orig/TwistedCore-2.5.0/twisted/__init__.py 2007-03-05 16:30:08.117422472 +0100
++++ Twisted-2.5.0/TwistedCore-2.5.0/twisted/__init__.py 2007-03-05 16:30:13.810553949 +0100
+@@ -14,13 +14,6 @@
+ raise RuntimeError("Twisted requires Python 2.3 or later.")
+ del sys
+
+-# Ensure zope.interface is installed
+-try:
+- from zope.interface import Interface
+- del Interface
+-except ImportError:
+- raise ImportError("you need zope.interface installed "
+- "(http://zope.org/Products/ZopeInterface/)")
+
+ # Ensure compat gets imported
+ from twisted.python import compat
============================================================
--- packages/twisted/twisted_2.5.0.bb c050d4b524d150533b83779ab9c7b4094bc32734
+++ packages/twisted/twisted_2.5.0.bb c050d4b524d150533b83779ab9c7b4094bc32734
@@ -0,0 +1,180 @@
+DESCRIPTION = "Twisted is an event-driven networking framework written in Python and licensed under the LGPL. \
+Twisted supports TCP, UDP, SSL/TLS, multicast, Unix sockets, a large number of protocols \
+(including HTTP, NNTP, IMAP, SSH, IRC, FTP, and others), and much more."
+HOMEPAGE = "http://www.twistedmatrix.com"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+RDEPENDS = "python-core python-zopeinterface"
+RDEPENDS_python-twisted += "python-twisted-bin python-twisted-conch python-twisted-core \
+ python-twisted-lore python-twisted-mail python-twisted-names \
+ python-twisted-news python-twisted-runner python-twisted-web \
+ python-twisted-words"
+PR = "r6"
+
+SRC_URI = "http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/Twisted-${PV}.tar.bz2 \
+ file://remove-zope-check.patch;patch=1"
+
+S = "${WORKDIR}/Twisted-${PV}"
+
+inherit distutils
+
+PACKAGES += "python-twisted-zsh python-twisted-test python-twisted-protocols \
+ python-twisted-runner-dbg \
+ python-twisted-bin python-twisted-conch python-twisted-lore \
+ python-twisted-mail python-twisted-names python-twisted-news python-twisted-runner \
+ python-twisted-web python-twisted-words python-twisted python-twisted-core \
+ "
+
+ALLOW_EMPTY = "1"
+FILES_${PN} = ""
+FILES_python-twisted = ""
+
+FILES_python-twisted-test = " \
+${libdir}/python2.4/site-packages/twisted/python/web/test \
+"
+
+FILES_python-twisted-protocols = " \
+${libdir}/python2.4/site-packages/twisted/python/protocols/ \
+"
+
+FILES_python-twisted-zsh = " \
+${libdir}/python2.4/site-packages/twisted/python/zsh \
+${libdir}/python2.4/site-packages/twisted/python/zshcomp.* \
+"
+
+FILES_python-twisted-bin = " \
+${libdir}/python2.4/site-packages/twisted/protocols/_c_urlarg.so \
+${libdir}/python2.4/site-packages/twisted/spread/cBanana.so"
+
+FILES_python-twisted-conch = " \
+${bindir}/ckeygen \
+${bindir}/tkconch \
+${bindir}/conch \
+${bindir}/conchftp \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_conch.py \
+${libdir}/python2.4/site-packages/twisted/conch \
+"
+
+FILES_python-twisted-core = " \
+${bindir}/manhole \
+${bindir}/mktap \
+${bindir}/twistd \
+${bindir}/tap2deb \
+${bindir}/tap2rpm \
+${bindir}/tapconvert \
+${bindir}/tkmktap \
+${bindir}/trial \
+${libdir}/python2.4/site-packages/twisted/*.py \
+${libdir}/python2.4/site-packages/twisted/plugins/__init__.py \
+${libdir}/python2.4/site-packages/twisted/plugins/notestplugin.py \
+${libdir}/python2.4/site-packages/twisted/plugins/testplugin.py \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_ftp.py \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_inet.py \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_manhole.py \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_portforward.py \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_socks.py \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_telnet.py \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_trial.py \
+${libdir}/python2.4/site-packages/twisted/plugins/dropin.cache \
+${libdir}/python2.4/site-packages/twisted/application \
+${libdir}/python2.4/site-packages/twisted/cred \
+${libdir}/python2.4/site-packages/twisted/enterprise \
+${libdir}/python2.4/site-packages/twisted/internet \
+${libdir}/python2.4/site-packages/twisted/manhole \
+${libdir}/python2.4/site-packages/twisted/manhole \
+${libdir}/python2.4/site-packages/twisted/persisted \
+${libdir}/python2.4/site-packages/twisted/protocols\
+${libdir}/python2.4/site-packages/twisted/python\
+${libdir}/python2.4/site-packages/twisted/python/timeoutqueue.py \
+${libdir}/python2.4/site-packages/twisted/python/filepath.py \
+${libdir}/python2.4/site-packages/twisted/python/dxprofile.py \
+${libdir}/python2.4/site-packages/twisted/python/plugin.py \
+${libdir}/python2.4/site-packages/twisted/python/htmlizer.py \
+${libdir}/python2.4/site-packages/twisted/python/__init__.py \
+${libdir}/python2.4/site-packages/twisted/python/dispatch.py \
+${libdir}/python2.4/site-packages/twisted/python/hook.py \
+${libdir}/python2.4/site-packages/twisted/python/threadpool.py \
+${libdir}/python2.4/site-packages/twisted/python/otp.py \
+${libdir}/python2.4/site-packages/twisted/python/usage.py \
+${libdir}/python2.4/site-packages/twisted/python/roots.py \
+${libdir}/python2.4/site-packages/twisted/python/versions.py \
+${libdir}/python2.4/site-packages/twisted/python/urlpath.py \
+${libdir}/python2.4/site-packages/twisted/python/util.py \
+${libdir}/python2.4/site-packages/twisted/python/components.py \
+${libdir}/python2.4/site-packages/twisted/python/logfile.py \
+${libdir}/python2.4/site-packages/twisted/python/runtime.py \
+${libdir}/python2.4/site-packages/twisted/python/reflect.py \
+${libdir}/python2.4/site-packages/twisted/python/context.py \
+${libdir}/python2.4/site-packages/twisted/python/threadable.py \
+${libdir}/python2.4/site-packages/twisted/python/rebuild.py \
+${libdir}/python2.4/site-packages/twisted/python/failure.py \
+${libdir}/python2.4/site-packages/twisted/python/lockfile.py \
+${libdir}/python2.4/site-packages/twisted/python/formmethod.py \
+${libdir}/python2.4/site-packages/twisted/python/finalize.py \
+${libdir}/python2.4/site-packages/twisted/python/win32.py \
+${libdir}/python2.4/site-packages/twisted/python/dist.py \
+${libdir}/python2.4/site-packages/twisted/python/shortcut.py \
+${libdir}/python2.4/site-packages/twisted/python/zipstream.py \
+${libdir}/python2.4/site-packages/twisted/python/release.py \
+${libdir}/python2.4/site-packages/twisted/python/syslog.py \
+${libdir}/python2.4/site-packages/twisted/python/log.py \
+${libdir}/python2.4/site-packages/twisted/python/compat.py \
+${libdir}/python2.4/site-packages/twisted/python/zshcomp.py \
+${libdir}/python2.4/site-packages/twisted/python/procutils.py \
+${libdir}/python2.4/site-packages/twisted/python/text.py \
+${libdir}/python2.4/site-packages/twisted/python/_twisted_zsh_stub \
+${libdir}/python2.4/site-packages/twisted/scripts/ \
+${libdir}/python2.4/site-packages/twisted/spread/ \
+${libdir}/python2.4/site-packages/twisted/tap/ \
+${libdir}/python2.4/site-packages/twisted/trial/ \
+${libdir}/python2.4/site-packages/twisted/__init__.py \
+${libdir}/python2.4/site-packages/twisted/_version.py \
+${libdir}/python2.4/site-packages/twisted/copyright.py \
+${libdir}/python2.4/site-packages/twisted/im.py \
+${libdir}/python2.4/site-packages/twisted/plugin.py \
+"
+
+FILES_python-twisted-lore = " \
+${bindir}/bookify \
+${bindir}/lore \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_lore.py \
+${libdir}/python2.4/site-packages/twisted/lore \
+"
+
+FILES_python-twisted-mail = " \
+${bindir}/mailmail \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_mail.py \
+${libdir}/python2.4/site-packages/twisted/mail \
+"
+
+FILES_python-twisted-names = " \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_names.py \
+${libdir}/python2.4/site-packages/twisted/names \
+"
+
+FILES_python-twisted-news = " \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_news.py \
+${libdir}/python2.4/site-packages/twisted/news \
+"
+
+FILES_python-twisted-runner = " \
+${libdir}python2.4/site-packages/twisted/runner/portmap.so \
+${libdir}/python2.4/site-packages/twisted/runner\
+"
+
+FILES_python-twisted-web = " \
+${bindir}/websetroot \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_web.py \
+${libdir}/python2.4/site-packages/twisted/web\
+"
+
+FILES_python-twisted-words = " \
+${bindir}/im \
+${libdir}/python2.4/site-packages/twisted/plugins/twisted_words.py \
+${libdir}/python2.4/site-packages/twisted/words\
+"
+
+FILES_python-twisted-runner-dbg = " \
+${libdir}/python2.4/site-packages/twisted/runner/.debug"
+
============================================================
--- packages/zope/zope_3.3.1.bb 76e578bec4263108a7140a36df255eb9a816b9db
+++ packages/zope/zope_3.3.1.bb 76e578bec4263108a7140a36df255eb9a816b9db
@@ -0,0 +1,41 @@
+DESCRIPTION = "A full fledged pluggable content management system with integrated web server and much more."
+SECTION = "console/network"
+PRIORITY = "optional"
+DEPENDS = "python"
+RDEPENDS = "python-core python-shell"
+LICENSE = "ZPL"
+PR = "r2"
+
+SRC_URI = "http://www.zope.org/Products/Zope3/${PV}/Zope-${PV}.tgz"
+
+S = "${WORKDIR}/Zope-${PV}"
+
+do_configure() {
+ ./configure --with-python=${STAGING_BINDIR_NATIVE}/python --prefix=${prefix} --force
+}
+
+do_compile() {
+ oe_runmake HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
+}
+
+do_install() {
+ oe_runmake install prefix=${D}${prefix} HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
+}
+
+PACKAGES =+ "python-zopeinterface python-zopeinterface-dbg"
+
+FILES_${PN} = "${prefix}"
+FILES_${PN}_doc = "${prefix}/doc"
+FILES_${PN}-dbg += "\
+${libdir}/python/BTrees/.debug \
+${libdir}/python/persistent/.debug \
+${libdir}/python/zope/proxy/.debug \
+${libdir}/python/zope/thread/.debug \
+${libdir}/python/zope/security/.debug \
+${libdir}/python/zope/hookable/.debug \
+${libdir}/python/zope/app/container/.debug \
+${libdir}/python/zope/i18nmessageid/.debug \
+${libdir}/python/ZODB/.debug"
+FILES_python-zopeinterface-dbg += "${libdir}/python/zope/interface/.debug "
+
+FILES_python-zopeinterface = "${libdir}/python/zope/interface/*.* ${libdir}/python/zope/interface/common"
============================================================
--- packages/busybox/slingbox_1.3.1.bb b5a1753ec92314354c2f39a66283165576a9fb1e
+++ packages/busybox/slingbox_1.3.1.bb f366957202587b2eaefca465454f5dc881c4a445
@@ -1,10 +1,10 @@ PRIORITY = "required"
DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \
to enable ipkg to run on an Unslung NSLU2 device."
HOMEPAGE = "http://www.busybox.net"
LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-PR = "r0"
+PR = "r1"
COMPATIBLE_MACHINE = "nslu2"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -12,12 +12,11 @@ SRC_URI = "http://www.busybox.net/downlo
file://shadow_h_is_required.patch;patch=1 \
file://df_rootfs.patch;patch=1 \
file://lazy_umount.patch;patch=1 \
- file://halt.patch;patch=1" \
+ file://halt.patch;patch=1 \
+ file://fdisk-readhex.patch;patch=1 \
file://slingbox_name.patch;patch=1 \
file://slingbox.patch;patch=1"
-# file://wget-long-options.patch;patch=1 \
-
S = "${WORKDIR}/busybox-${PV}"
export EXTRA_CFLAGS = "${CFLAGS}"
============================================================
--- packages/perl/perl-native_5.8.8.bb e9ee05100dabfbe3bc15ebb347c19860a472f457
+++ packages/perl/perl-native_5.8.8.bb c0743df758d0d39ece2b86e2f02407860b131a37
@@ -1,9 +1,9 @@ DEPENDS = "virtual/db-native gdbm-native
DESCRIPTION = "Perl is a popular scripting language."
HOMEPAGE = "http://www.perl.org/"
SECTION = "libs"
LICENSE = "Artistic|GPL"
DEPENDS = "virtual/db-native gdbm-native"
-PR = "r10"
+PR = "r11"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/perl-${PV}"
@@ -14,7 +14,8 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/
file://native-nopacklist.patch;patch=1 \
file://native-no-gdbminc.patch;patch=1 \
file://native-perlinc.patch;patch=1 \
- file://native-makedepend-dash.patch;patch=1"
+ file://native-makedepend-dash.patch;patch=1 \
+ file://native-ssp.patch;patch=1"
S = "${WORKDIR}/perl-${PV}"
============================================================
--- packages/python/python-gst_0.10.7.bb 76b263d53f52575128191f4cecf75716c3132314
+++ packages/python/python-gst_0.10.7.bb e533e39909a739ef843c00c1c244aaf27670136f
@@ -1,7 +1,8 @@ LICENSE = "LGPL"
DESCRIPTION = "Python Gstreamer bindings"
SECTION = "devel/python"
LICENSE = "LGPL"
-DEPENDS = "gstreamer"
+DEPENDS = "gstreamer python-pygobject"
+PR = "r1"
SRC_URI = "http://gst%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list