diff options
| -rwxr-xr-x | contrib/python/generate-manifest-2.5.py | 15 | ||||
| -rw-r--r-- | packages/dbench/dbench_4.0.bb (renamed from packages/dbench/dbench_3.04.bb) | 8 | ||||
| -rw-r--r-- | packages/dbench/files/.mtn2git_empty (renamed from packages/dbench/dbench/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/dbench/files/destdir.patch (renamed from packages/dbench/dbench/destdir.patch) | 0 | ||||
| -rw-r--r-- | packages/dbench/files/makefile.patch | 13 | ||||
| -rw-r--r-- | packages/kismet/kismet-2007-10-R1/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/kismet/kismet.inc | 3 | ||||
| -rw-r--r-- | packages/kismet/kismet_2007-10-R1.bb | 4 | ||||
| -rw-r--r-- | packages/python/python-2.5-manifest.inc | 12 | ||||
| -rw-r--r-- | packages/python/python_2.5.2.bb | 7 |
10 files changed, 39 insertions, 23 deletions
diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 3419cab2e5..94ae5ce4fd 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -9,12 +9,11 @@ import os import sys import time -VERSION = "2.5.1" -# increase when touching python-core, this should be the same ml version as in python_2.5.x.bb -BASEREV = 7 +VERSION = "2.5.2" +BASEREV = 0 __author__ = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" -__version__ = "20080122" +__version__ = "20080306" class MakefileMaker: @@ -188,7 +187,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-compression", "Python High Level Compression Support", "python-core python-zlib", "gzip.* zipfile.*" ) - m.addPackage( 0, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core", + m.addPackage( 1, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core", "hashlib.* md5.* sha.* lib-dynload/crypt.so lib-dynload/_hashlib.so lib-dynload/_sha256.so lib-dynload/_sha512.so" ) m.addPackage( 0, "python-textutils", "Python Option Parsing, Text Wrapping and Comma-Separated-Value Support", "python-core python-io python-re python-stringold", @@ -295,13 +294,13 @@ if __name__ == "__main__": m.addPackage( 0, "python-subprocess", "Python Subprocess Support", "python-core python-io python-re python-fcntl python-pickle", "subprocess.*" ) - m.addPackage( 0, "python-sqlite3", "Python Sqlite3 Database Support", "python-core", - "sqlite3" ) # package + m.addPackage( 1, "python-sqlite3", "Python Sqlite3 Database Support", "python-core", + "lib-dynload/_sqlite3.so sqlite3" ) # package m.addPackage( 0, "python-stringold", "Python String APIs [deprecated]", "python-core python-re", "lib-dynload/strop.so string.*" ) - m.addPackage( 0, "python-syslog", "Python's syslog Interface", "python-core", + m.addPackage( 0, "python-syslog", "Python's Syslog Interface", "python-core", "lib-dynload/syslog.so" ) m.addPackage( 0, "python-terminal", "Python Terminal Controlling Support", "python-core python-io", diff --git a/packages/dbench/dbench_3.04.bb b/packages/dbench/dbench_4.0.bb index 1f6b703ba8..aade4170ba 100644 --- a/packages/dbench/dbench_3.04.bb +++ b/packages/dbench/dbench_4.0.bb @@ -3,10 +3,12 @@ DESCRIPTION_dbench = "Filesystem load benchmark" DESCRIPTION_tbench = "TCP load benchmark" HOMEPAGE = "http://samba.org/ftp/tridge/dbench/" LICENSE = "GPL" -PR = "r1" +PR = "r0" -SRC_URI = "http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \ - file://destdir.patch;patch=1" +SRC_URI = "\ + http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \ + file://destdir.patch;patch=1 \ + file://makefile.patch;patch=1" inherit autotools diff --git a/packages/dbench/dbench/.mtn2git_empty b/packages/dbench/files/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/dbench/dbench/.mtn2git_empty +++ b/packages/dbench/files/.mtn2git_empty diff --git a/packages/dbench/dbench/destdir.patch b/packages/dbench/files/destdir.patch index 9fe1508f97..9fe1508f97 100644 --- a/packages/dbench/dbench/destdir.patch +++ b/packages/dbench/files/destdir.patch diff --git a/packages/dbench/files/makefile.patch b/packages/dbench/files/makefile.patch new file mode 100644 index 0000000000..4f57085e41 --- /dev/null +++ b/packages/dbench/files/makefile.patch @@ -0,0 +1,13 @@ +Index: dbench-4.0/Makefile.in +=================================================================== +--- dbench-4.0.orig/Makefile.in ++++ dbench-4.0/Makefile.in +@@ -35,7 +35,7 @@ install: all + ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir) + ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir) + ${INSTALLCMD} client.txt $(DESTDIR)$(datadir) +- ${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir) ++ ${INSTALLCMD} -m 644 dbench.1 $(DESTDIR)$(mandir) + ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1 + ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1 + diff --git a/packages/kismet/kismet-2007-10-R1/.mtn2git_empty b/packages/kismet/kismet-2007-10-R1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/kismet/kismet-2007-10-R1/.mtn2git_empty diff --git a/packages/kismet/kismet.inc b/packages/kismet/kismet.inc index 57298c5c00..efc987cf0c 100644 --- a/packages/kismet/kismet.inc +++ b/packages/kismet/kismet.inc @@ -11,6 +11,9 @@ EXTRA_OECONF = "--enable-wsp100 --with-pcap=linux \ inherit autotools +# .depend is needed by the main compile but can run in parallel +PARALLE_MAKE = "" + fakeroot do_install() { oe_runmake "DESTDIR=${D}" suidinstall } diff --git a/packages/kismet/kismet_2007-10-R1.bb b/packages/kismet/kismet_2007-10-R1.bb index ef1cf86c98..4786543ec8 100644 --- a/packages/kismet/kismet_2007-10-R1.bb +++ b/packages/kismet/kismet_2007-10-R1.bb @@ -1,3 +1,5 @@ require kismet.inc -PR = "r3" +SRC_URI += "file://fix_strip.patch;patch=1" + +PR = "r5" diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 5288bafbf4..9c4e68dfce 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ -######################################################################################################################## -### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Wed Feb 27 13:29:38 2008 +####################################################################################################################### +### AUTO-GENERATED by './contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer@vanille-media.de>] on Thu Mar 6 18:04:21 2008 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -127,7 +127,7 @@ PR_python-unixadmin="ml0" RDEPENDS_python-unixadmin="python-core" FILES_python-unixadmin="${libdir}/python2.5/lib-dynload/nis.so ${libdir}/python2.5/lib-dynload/grp.so ${libdir}/python2.5/lib-dynload/pwd.so ${libdir}/python2.5/getpass.* " -DESCRIPTION_python-syslog="Python's syslog Interface" +DESCRIPTION_python-syslog="Python's Syslog Interface" PR_python-syslog="ml0" RDEPENDS_python-syslog="python-core" FILES_python-syslog="${libdir}/python2.5/lib-dynload/syslog.so " @@ -213,9 +213,9 @@ RDEPENDS_python-mime="python-core python-io" FILES_python-mime="${libdir}/python2.5/mimetools.* ${libdir}/python2.5/uu.* ${libdir}/python2.5/quopri.* ${libdir}/python2.5/rfc822.* " DESCRIPTION_python-sqlite3="Python Sqlite3 Database Support" -PR_python-sqlite3="ml0" +PR_python-sqlite3="ml1" RDEPENDS_python-sqlite3="python-core" -FILES_python-sqlite3="${libdir}/python2.5/sqlite3 " +FILES_python-sqlite3="${libdir}/python2.5/lib-dynload/_sqlite3.so ${libdir}/python2.5/sqlite3 " DESCRIPTION_python-tests="Python Tests" PR_python-tests="ml0" @@ -278,7 +278,7 @@ RDEPENDS_python-db="python-core" FILES_python-db="${libdir}/python2.5/anydbm.* ${libdir}/python2.5/dumbdbm.* ${libdir}/python2.5/whichdb.* " DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support" -PR_python-crypt="ml0" +PR_python-crypt="ml1" RDEPENDS_python-crypt="python-core" FILES_python-crypt="${libdir}/python2.5/hashlib.* ${libdir}/python2.5/md5.* ${libdir}/python2.5/sha.* ${libdir}/python2.5/lib-dynload/crypt.so ${libdir}/python2.5/lib-dynload/_hashlib.so ${libdir}/python2.5/lib-dynload/_sha256.so ${libdir}/python2.5/lib-dynload/_sha512.so " diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index e6667cc04b..af907f23c9 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -5,9 +5,7 @@ SECTION = "devel/python" PRIORITY = "optional" DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" - -# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py -PR = "ml0" +PR = "ml1" PYTHON_MAJMIN = "2.5" @@ -82,11 +80,10 @@ do_install() { require python-${PYTHON_MAJMIN}-manifest.inc -# manual additions +# manual dependency additions RPROVIDES_python-core = "python" RRECOMMENDS_python-core = "python-readline" RRECOMMENDS_python-crypt = "openssl" -PR_python-crypt = "ml1" # add sitecustomize FILES_python-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" |