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