[oe-commits] org.oe.dev merge of '34aab52ad6f5f23f024db0327f33a822b205c50f'
coredump2 commit
openembedded-commits at lists.openembedded.org
Tue Nov 20 00:29:34 UTC 2007
merge of '34aab52ad6f5f23f024db0327f33a822b205c50f'
and '7474dc274cd34419f2c76088f150e44ce8b545df'
Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 7b058f143b4eee35a2bd1d8ede964b31eca43bb4
ViewMTN: http://monotone.openembedded.org/revision/info/7b058f143b4eee35a2bd1d8ede964b31eca43bb4
Files:
1
classes/setuptools.bbclass
packages/python/python-pyrad_1.1.bb
classes/distutils.bbclass
packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb
packages/openmoko2/libmokogsmd2_svn.bb
packages/altboot/altboot_1.1.1+wip-SVNR66.bb
packages/altboot/altboot_1.1.1+wip-SVNR69.bb
Diffs:
#
# mt diff -r34aab52ad6f5f23f024db0327f33a822b205c50f -r7b058f143b4eee35a2bd1d8ede964b31eca43bb4
#
#
#
# add_file "classes/setuptools.bbclass"
# content [f0a6d602e9af754216e3616efb17302d0116fe3b]
#
# add_file "packages/python/python-pyrad_1.1.bb"
# content [bc619b3deaeb5223fc8b86f6a209e19434b1d55a]
#
# patch "classes/distutils.bbclass"
# from [09ebff44a5c1e71a442d953d3616f2d4f8c4eaaa]
# to [41980eec92cf67538cc2af843af8a2424a084a31]
#
# patch "packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb"
# from [f60ec286158f9d8da9bd433b8b9341f694325bee]
# to [41a6fc6eda060eb641f0a9ae235b35370d6eb755]
#
# patch "packages/openmoko2/libmokogsmd2_svn.bb"
# from [37257745643dc337dbe76f5c6b0c8c55883fa32b]
# to [de4e0686206340e87564ed3907a7ca3aac170cef]
#
============================================================
--- classes/setuptools.bbclass f0a6d602e9af754216e3616efb17302d0116fe3b
+++ classes/setuptools.bbclass f0a6d602e9af754216e3616efb17302d0116fe3b
@@ -0,0 +1,8 @@
+inherit distutils
+
+DEPENDS += "python-setuptools"
+
+DISTUTILS_INSTALL_ARGS = "--root=${D} \
+ --single-version-externally-managed \
+ --prefix=${prefix} \
+ --install-data=${datadir}"
============================================================
--- packages/python/python-pyrad_1.1.bb bc619b3deaeb5223fc8b86f6a209e19434b1d55a
+++ packages/python/python-pyrad_1.1.bb bc619b3deaeb5223fc8b86f6a209e19434b1d55a
@@ -0,0 +1,11 @@
+DESCRIPTION = "Python Radius Client and Server"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "BSD"
+RDEPENDS = "python-crypt"
+SRCNAME = "pyrad"
+
+SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
============================================================
--- classes/distutils.bbclass 09ebff44a5c1e71a442d953d3616f2d4f8c4eaaa
+++ classes/distutils.bbclass 41980eec92cf67538cc2af843af8a2424a084a31
@@ -1,5 +1,11 @@ inherit distutils-base
inherit distutils-base
+DISTUTILS_STAGE_HEADERS_ARGS ?= "--install-dir=${STAGING_INCDIR}/${PYTHON_DIR}"
+DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${layout_prefix} \
+ --install-data=${STAGING_DATADIR}"
+DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
+ --install-data=${D}/${datadir}"
+
distutils_do_compile() {
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py build || \
@@ -8,7 +14,7 @@ distutils_stage_headers() {
distutils_stage_headers() {
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR_NATIVE}/python setup.py install_headers --install-dir=${STAGING_INCDIR}/${PYTHON_DIR} || \
+ ${STAGING_BINDIR_NATIVE}/python setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
oefatal "python setup.py install_headers execution failed."
}
@@ -16,7 +22,7 @@ distutils_stage_all() {
install -d ${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages
PYTHONPATH=${STAGING_DIR_HOST}${layout_prefix}/${PYTHON_DIR}/site-packages \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_DIR_HOST}${layout_prefix} --install-data=${STAGING_DATADIR} || \
+ ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
oefatal "python setup.py install (stage) execution failed."
}
@@ -24,7 +30,7 @@ distutils_do_install() {
install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \
+ ${STAGING_BINDIR_NATIVE}/python setup.py install ${DISTUTILS_INSTALL_ARGS} || \
oefatal "python setup.py install execution failed."
for i in `find ${D} -name "*.py"` ; do \
============================================================
--- packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb f60ec286158f9d8da9bd433b8b9341f694325bee
+++ packages/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb 41a6fc6eda060eb641f0a9ae235b35370d6eb755
@@ -1,6 +1,6 @@ PV = "0.1.0+svn${SVNREV}"
DESCRIPTION = "Shows the GSM / GPRS status in the OpenMoko panel"
DEPENDS = "libgsmd libnotify"
PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PR = "r1"
inherit openmoko-panel-plugin
============================================================
--- packages/openmoko2/libmokogsmd2_svn.bb 37257745643dc337dbe76f5c6b0c8c55883fa32b
+++ packages/openmoko2/libmokogsmd2_svn.bb de4e0686206340e87564ed3907a7ca3aac170cef
@@ -1,7 +1,7 @@ PV = "0.1.0+svnr${SRCREV}"
SECTION = "openmoko/libs"
DEPENDS = "libgsmd glib-2.0"
PV = "0.1.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
inherit openmoko2
#
# mt diff -r7474dc274cd34419f2c76088f150e44ce8b545df -r7b058f143b4eee35a2bd1d8ede964b31eca43bb4
#
#
#
# rename "packages/altboot/altboot_1.1.1+wip-SVNR66.bb"
# to "packages/altboot/altboot_1.1.1+wip-SVNR69.bb"
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR69.bb"
# from [32cf1f7f5740db54ab2208b1cbf3daf0fb4b01c0]
# to [f853485448631fad56e6fb98656afc1312240e9e]
#
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR66.bb 32cf1f7f5740db54ab2208b1cbf3daf0fb4b01c0
+++ packages/altboot/altboot_1.1.1+wip-SVNR69.bb f853485448631fad56e6fb98656afc1312240e9e
@@ -1,10 +1,10 @@ require altboot.inc
require altboot.inc
-PR = "r1"
+PR = "r0"
-SVN_REV = "66"
+SVN_REV = "69"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
- file://sd-dynamic-fix.patch;patch=1"
+ "
do_install() {
install -d ${D}/sbin
More information about the Openembedded-commits
mailing list