[oe-commits] org.oe.dev merge of '2b134fb4a5278b379deec7fbafe34576ac3f266c'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Mar 6 20:11:15 UTC 2008
merge of '2b134fb4a5278b379deec7fbafe34576ac3f266c'
and 'e86cbb0aa6849e39a142ce4c582d140b921326d1'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: d2a693ac51bede321293c0e13105ee7dd40481c0
ViewMTN: http://monotone.openembedded.org/revision/info/d2a693ac51bede321293c0e13105ee7dd40481c0
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
contrib/python/generate-manifest-2.5.py
packages/kismet/kismet.inc
packages/kismet/kismet_2007-10-R1.bb
packages/python/python-2.5-manifest.inc
packages/python/python_2.5.2.bb
site/ix86-common
Diffs:
#
# mt diff -r2b134fb4a5278b379deec7fbafe34576ac3f266c -rd2a693ac51bede321293c0e13105ee7dd40481c0
#
#
#
# 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 "contrib/python/generate-manifest-2.5.py"
# from [045a4cfcdcfa62445a0716d10a1057f696e9cac2]
# to [52d051dca521630ef1ef4e37f1e346503652bcae]
#
# 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]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [3149b577117a804185b19cb4966369bbf44dc20a]
# to [e0702c0a123bad512850c3846b66ef177cad94ad]
#
# patch "packages/python/python_2.5.2.bb"
# from [404be2bec68ba8a044eec85af90dcf7f63213c6c]
# to [c372778f3b501ac0ddf12f07516438198387bec8]
#
============================================================
--- 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
+
============================================================
--- contrib/python/generate-manifest-2.5.py 045a4cfcdcfa62445a0716d10a1057f696e9cac2
+++ contrib/python/generate-manifest-2.5.py 52d051dca521630ef1ef4e37f1e346503652bcae
@@ -9,12 +9,11 @@ import time
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 at 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",
============================================================
--- 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"
============================================================
--- packages/python/python-2.5-manifest.inc 3149b577117a804185b19cb4966369bbf44dc20a
+++ packages/python/python-2.5-manifest.inc e0702c0a123bad512850c3846b66ef177cad94ad
@@ -1,5 +1,5 @@
-########################################################################################################################
-### AUTO-GENERATED by './generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer at 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 at 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 @@ FILES_python-unixadmin="${libdir}/python
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 @@ DESCRIPTION_python-sqlite3="Python Sqlit
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 @@ DESCRIPTION_python-crypt="Python Basic C
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 "
============================================================
--- packages/python/python_2.5.2.bb 404be2bec68ba8a044eec85af90dcf7f63213c6c
+++ packages/python/python_2.5.2.bb c372778f3b501ac0ddf12f07516438198387bec8
@@ -5,10 +5,8 @@ DEPENDS_sharprom = "python-native readli
PRIORITY = "optional"
DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
+PR = "ml1"
-# NOTE: Keep the digit in sync with BASEREV in contrib/generate-manifest-2.5.py
-PR = "ml0"
-
PYTHON_MAJMIN = "2.5"
SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
@@ -82,11 +80,10 @@ require python-${PYTHON_MAJMIN}-manifest
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"
#
# mt diff -re86cbb0aa6849e39a142ce4c582d140b921326d1 -rd2a693ac51bede321293c0e13105ee7dd40481c0
#
#
#
# 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
More information about the Openembedded-commits
mailing list