From f5169bb4213c59f9a82ed15441f22a3fe3129fd9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 6 Mar 2008 16:10:42 +0000 Subject: kismet: Disable stripping and parallel make --- packages/kismet/kismet-2007-10-R1/.mtn2git_empty | 0 packages/kismet/kismet.inc | 3 +++ packages/kismet/kismet_2007-10-R1.bb | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 packages/kismet/kismet-2007-10-R1/.mtn2git_empty (limited to 'packages') 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 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" -- cgit v1.2.3 From 9fab57528848c104a95662bfb416378d7e50d666 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 6 Mar 2008 16:41:49 +0000 Subject: dbench 3.04 update to 4.0 and apply patch to make it compile again --- packages/dbench/dbench/.mtn2git_empty | 0 packages/dbench/dbench/destdir.patch | 23 ----------------------- packages/dbench/dbench_3.04.bb | 16 ---------------- packages/dbench/dbench_4.0.bb | 18 ++++++++++++++++++ packages/dbench/files/.mtn2git_empty | 0 packages/dbench/files/destdir.patch | 23 +++++++++++++++++++++++ packages/dbench/files/makefile.patch | 13 +++++++++++++ 7 files changed, 54 insertions(+), 39 deletions(-) delete mode 100644 packages/dbench/dbench/.mtn2git_empty delete mode 100644 packages/dbench/dbench/destdir.patch delete mode 100644 packages/dbench/dbench_3.04.bb create mode 100644 packages/dbench/dbench_4.0.bb create mode 100644 packages/dbench/files/.mtn2git_empty create mode 100644 packages/dbench/files/destdir.patch create mode 100644 packages/dbench/files/makefile.patch (limited to 'packages') diff --git a/packages/dbench/dbench/.mtn2git_empty b/packages/dbench/dbench/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/dbench/dbench/destdir.patch b/packages/dbench/dbench/destdir.patch deleted file mode 100644 index 9fe1508f97..0000000000 --- a/packages/dbench/dbench/destdir.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: dbench-3.04/Makefile.in -=================================================================== ---- dbench-3.04.orig/Makefile.in 2006-09-17 20:21:07.000000000 +0200 -+++ dbench-3.04/Makefile.in 2006-09-17 20:21:36.000000000 +0200 -@@ -32,12 +32,12 @@ - - # Careful here: don't install client.txt over itself. - install: all -- ${INSTALLCMD} -d $(bindir) $(datadir) $(mandir) -- ${INSTALLCMD} dbench tbench tbench_srv $(bindir) -- ${INSTALLCMD} client.txt $(datadir) -- ${INSTALLCMD} -m644 dbench.1 $(mandir) -- ln -sf dbench.1 $(mandir)/tbench.1 -- ln -sf dbench.1 $(mandir)/tbench_srv.1 -+ ${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) -+ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1 -+ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1 - - clean: - rm -f *.o *~ dbench tbench tbench_srv diff --git a/packages/dbench/dbench_3.04.bb b/packages/dbench/dbench_3.04.bb deleted file mode 100644 index 1f6b703ba8..0000000000 --- a/packages/dbench/dbench_3.04.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "The dbench (disk) and tbench (TCP) benchmarks" -DESCRIPTION_dbench = "Filesystem load benchmark" -DESCRIPTION_tbench = "TCP load benchmark" -HOMEPAGE = "http://samba.org/ftp/tridge/dbench/" -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \ - file://destdir.patch;patch=1" - -inherit autotools - -PACKAGES =+ "tbench tbench-dbg" - -FILES_tbench = "${bindir}/tbench*" -FILES_tbench-dbg += "${bindir}/.debug/tbench*" diff --git a/packages/dbench/dbench_4.0.bb b/packages/dbench/dbench_4.0.bb new file mode 100644 index 0000000000..aade4170ba --- /dev/null +++ b/packages/dbench/dbench_4.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "The dbench (disk) and tbench (TCP) benchmarks" +DESCRIPTION_dbench = "Filesystem load benchmark" +DESCRIPTION_tbench = "TCP load benchmark" +HOMEPAGE = "http://samba.org/ftp/tridge/dbench/" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "\ + http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \ + file://destdir.patch;patch=1 \ + file://makefile.patch;patch=1" + +inherit autotools + +PACKAGES =+ "tbench tbench-dbg" + +FILES_tbench = "${bindir}/tbench*" +FILES_tbench-dbg += "${bindir}/.debug/tbench*" diff --git a/packages/dbench/files/.mtn2git_empty b/packages/dbench/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/dbench/files/destdir.patch b/packages/dbench/files/destdir.patch new file mode 100644 index 0000000000..9fe1508f97 --- /dev/null +++ b/packages/dbench/files/destdir.patch @@ -0,0 +1,23 @@ +Index: dbench-3.04/Makefile.in +=================================================================== +--- dbench-3.04.orig/Makefile.in 2006-09-17 20:21:07.000000000 +0200 ++++ dbench-3.04/Makefile.in 2006-09-17 20:21:36.000000000 +0200 +@@ -32,12 +32,12 @@ + + # Careful here: don't install client.txt over itself. + install: all +- ${INSTALLCMD} -d $(bindir) $(datadir) $(mandir) +- ${INSTALLCMD} dbench tbench tbench_srv $(bindir) +- ${INSTALLCMD} client.txt $(datadir) +- ${INSTALLCMD} -m644 dbench.1 $(mandir) +- ln -sf dbench.1 $(mandir)/tbench.1 +- ln -sf dbench.1 $(mandir)/tbench_srv.1 ++ ${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) ++ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1 ++ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1 + + clean: + rm -f *.o *~ dbench tbench tbench_srv 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 + -- cgit v1.2.3 From 0b80abf3a5a3256700ca39d5a41b8c5877f3080c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 6 Mar 2008 17:09:44 +0000 Subject: python 2.5.2 ship _sqlite3.so binary module in python-sqlite3 (thanks emdete for spotting) --- packages/python/python-2.5-manifest.inc | 12 ++++++------ packages/python/python_2.5.2.bb | 7 ++----- 2 files changed, 8 insertions(+), 11 deletions(-) (limited to 'packages') 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 ] on Wed Feb 27 13:29:38 2008 +####################################################################################################################### +### AUTO-GENERATED by './contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer ] 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" -- cgit v1.2.3