[oe-commits] org.oe.dev merge of '2b134fb4a5278b379deec7fbafe34576ac3f266c'

[hrw commit]

merge of '2b134fb4a5278b379deec7fbafe34576ac3f266c'
     and '7c95723b0419570396f3810cc7a82f22626eb854'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 86b0497d4fe52237e4f52c1f3b0086f931a8720f
ViewMTN: http://monotone.openembedded.org/revision/info/86b0497d4fe52237e4f52c1f3b0086f931a8720f
Files:
1
packages/dbench/dbench
packages/dbench/files
packages/dbench/dbench_3.04.bb
packages/dbench/dbench_4.0.bb
packages/kismet/kismet-2007-10-R1
packages/dbench/files/makefile.patch
packages/kismet/kismet.inc
packages/kismet/kismet_2007-10-R1.bb
site/ix86-common
Diffs:

#
# mt diff -r2b134fb4a5278b379deec7fbafe34576ac3f266c -r86b0497d4fe52237e4f52c1f3b0086f931a8720f
#
# 
# 
# rename "packages/dbench/dbench"
#     to "packages/dbench/files"
# 
# rename "packages/dbench/dbench_3.04.bb"
#     to "packages/dbench/dbench_4.0.bb"
# 
# add_dir "packages/kismet/kismet-2007-10-R1"
# 
# add_file "packages/dbench/files/makefile.patch"
#  content [a433d79a9af17a3e69c4bd16ad39a9cc87904ae3]
# 
# patch "packages/dbench/dbench_4.0.bb"
#  from [cbf87ff1dd8e9b60ee21974290e07e9adc8efabf]
#    to [461fc7cd50fd08e9c6df6ca8883d52b05ead16d0]
# 
# patch "packages/kismet/kismet.inc"
#  from [6d7f0ae5376d1127a682ca46b5c14143495885a1]
#    to [928e2513ff9fd3f15c2ec25813e5adbeb7f9dfd7]
# 
# patch "packages/kismet/kismet_2007-10-R1.bb"
#  from [44c52fb61cc91d305df7c9f9ad5404b97f45f5c4]
#    to [199e9c58662ed0632365e5ef1fedbc76ba89b2cf]
# 
============================================================
--- packages/dbench/files/makefile.patch	a433d79a9af17a3e69c4bd16ad39a9cc87904ae3
+++ packages/dbench/files/makefile.patch	a433d79a9af17a3e69c4bd16ad39a9cc87904ae3
@@ -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
+ 
============================================================
--- packages/dbench/dbench_3.04.bb	cbf87ff1dd8e9b60ee21974290e07e9adc8efabf
+++ packages/dbench/dbench_4.0.bb	461fc7cd50fd08e9c6df6ca8883d52b05ead16d0
@@ -1,12 +1,14 @@ LICENSE = "GPL"
 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"
+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
 
============================================================
--- packages/kismet/kismet.inc	6d7f0ae5376d1127a682ca46b5c14143495885a1
+++ packages/kismet/kismet.inc	928e2513ff9fd3f15c2ec25813e5adbeb7f9dfd7
@@ -11,6 +11,9 @@ inherit autotools
 
 inherit autotools
 
+# .depend is needed by the main compile but can run in parallel
+PARALLE_MAKE = ""
+
 fakeroot do_install() {
      oe_runmake "DESTDIR=${D}" suidinstall
 }
============================================================
--- packages/kismet/kismet_2007-10-R1.bb	44c52fb61cc91d305df7c9f9ad5404b97f45f5c4
+++ packages/kismet/kismet_2007-10-R1.bb	199e9c58662ed0632365e5ef1fedbc76ba89b2cf
@@ -1,3 +1,5 @@ require kismet.inc
 require kismet.inc
 
+SRC_URI += "file://fix_strip.patch;patch=1"
+
+PR = "r5"
-PR = "r3"


#
# mt diff -r7c95723b0419570396f3810cc7a82f22626eb854 -r86b0497d4fe52237e4f52c1f3b0086f931a8720f
#
# 
# 
# patch "site/ix86-common"
#  from [d8fa481822d52ac3e2192ceabc012ca07c564206]
#    to [3ba01662e716a9a700f22da76af85b9536a2e231]
# 
============================================================
--- site/ix86-common	d8fa481822d52ac3e2192ceabc012ca07c564206
+++ site/ix86-common	3ba01662e716a9a700f22da76af85b9536a2e231
@@ -134,6 +134,7 @@ glib_cv_use_pid_surrogate=${glib_cv_use_
 utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
 ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
 glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
+ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
 
 # guile
 ac_cv_sys_restartable_syscalls=yes