sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

rpm: Change the way the python version is determined so its sane and works with checksumming 

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2010-09-03 23:23:09 +01:00
parent 3e38d633c9
commit 0843607a2b
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/conf/distro/include/poky-fixed-revisions.inc
View File

@ -29,6 +29,11 @@ PREFERRED_VERSION_hal-info ?= "20091130"
PREFERRED_VERSION_udev ?= "158"
PREFERRED_VERSION_wpa-supplicant ?= "0.6.10"
# Force the python versions in one place
PYTHON_BASEVERSION ?= "2.6"
PREFERRED_VERSION_python ?= "2.6.5"
PREFERRED_VERSION_python-native ?= "2.6.5"
#
# meta-moblin package PREFERRED_VERSIONS

23
meta/recipes-devtools/rpm/rpm_5.1.10.bb
View File

@ -19,9 +19,9 @@ acpaths = "-I ${S}/db/dist/aclocal -I ${S}/db/dist/aclocal_java"
# Specify the default rpm macros in terms of adjustable variables
rpm_macros = "%{_usrlibrpm}/macros:%{_usrlibrpm}/poky/macros:%{_usrlibrpm}/poky/%{_target}/macros:~/.oerpmmacros"
EXTRA_OECONF = "--with-python=$PYTHONVER \
--with-python-inc-dir=${STAGING_INCDIR}/python$PYTHONVER \
--with-python-lib-dir=${libdir}/python$PYTHONVER \
EXTRA_OECONF = "--with-python=${PYTHON_BASEVERSION} \
--with-python-inc-dir=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \
--with-python-lib-dir=${libdir}/python${PYTHON_BASEVERSION} \
--with-db=internal \
--with-db-tools-integrated \
--with-libelf \
@ -122,22 +122,9 @@ do_install_append() {
install -m 0755 ${WORKDIR}/perfile_rpmdeps.sh ${D}/${libdir}/rpm/perfile_rpmdeps.sh
mv ${D}/${libdir}/python$PYTHONVER/rpm/${HOST_SYS}-__init__.py \
${D}/${libdir}/python$PYTHONVER/rpm/__init__.py
mv ${D}/${libdir}/python${PYTHON_BASEVERSION}/rpm/${HOST_SYS}-__init__.py \
${D}/${libdir}/python${PYTHON_BASEVERSION}/rpm/__init__.py
}
def rpm_python_version(d):
import os, bb
staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
if os.path.exists( "%s/python2.6" % staging_incdir ): return "2.6"
if os.path.exists( "%s/python2.5" % staging_incdir ): return "2.5"
if os.path.exists( "%s/python2.4" % staging_incdir ): return "2.4"
if os.path.exists( "%s/python2.3" % staging_incdir ): return "2.3"
raise "No Python in STAGING_INCDIR. Forgot to build python/python-native?"
# Use a shell variable here since otherwise gettext trys to expand this at
# parse time when it manipulates EXTRA_OECONF which fails
export PYTHONVER = "${@rpm_python_version(d)}"
BBCLASSEXTEND = "native"