diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-03-06 17:58:28 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-03-06 17:58:28 +0000 |
| commit | be3ea0c1dad004e8ad2e5ea113880e3769fa2b18 (patch) | |
| tree | 82076c288c87484c949c68ded151e384f5b3f665 | |
| parent | 9ce9cc1d57bb17dbc03a0a9ecc744e2778759e36 (diff) | |
| parent | 9fab57528848c104a95662bfb416378d7e50d666 (diff) | |
merge of '2b134fb4a5278b379deec7fbafe34576ac3f266c'
and '7c95723b0419570396f3810cc7a82f22626eb854'
| -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 |
7 files changed, 24 insertions, 4 deletions
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" |