diff options
author | Ming Liu <peter.x.liu@external.atlascopco.com> | 2016-08-09 10:01:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-17 10:35:42 +0100 |
commit | bba1b911c86557db66af4baf7f15813f43c1ae70 (patch) | |
tree | 5e5ce8c78ccb5fbc6ca1aea4f08127ca14e2de3e /meta/recipes-devtools/rpm | |
parent | 92f505b0162f666b14208e2835c7def9f2cd4f2c (diff) | |
download | poky-bba1b911c86557db66af4baf7f15813f43c1ae70.tar.gz |
Use PYTHON_SITEPACKAGES_DIR insted of hard-coded *site-packages*
For thoese recipes that are inheriting python*-dir.bbclass, there is
already a PYTHON_SITEPACKAGES_DIR present, use that definition replacing
redundant "${libdir}/python*/site-packages".
(From OE-Core rev: e7d842673952aa4aaa141f64958bc1344dbe8210)
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.16.bb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.16.bb b/meta/recipes-devtools/rpm/rpm_5.4.16.bb index d264d5011a..84adef661a 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.16.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.16.bb | |||
@@ -259,7 +259,7 @@ PACKAGECONFIG[xar] = "--with-xar,--without-xar,xar," | |||
259 | 259 | ||
260 | WITH_PYTHON = " --with-python=${PYTHON_BASEVERSION} \ | 260 | WITH_PYTHON = " --with-python=${PYTHON_BASEVERSION} \ |
261 | --with-python-inc-dir=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ | 261 | --with-python-inc-dir=${STAGING_INCDIR}/python${PYTHON_BASEVERSION} \ |
262 | --with-python-lib-dir=${libdir}/python${PYTHON_BASEVERSION}/site-packages \ | 262 | --with-python-lib-dir=${PYTHON_SITEPACKAGES_DIR} \ |
263 | --without-pythonembed" | 263 | --without-pythonembed" |
264 | PACKAGECONFIG[python] = "${WITH_PYTHON},--without-python,python," | 264 | PACKAGECONFIG[python] = "${WITH_PYTHON},--without-python,python," |
265 | 265 | ||
@@ -477,7 +477,7 @@ RDEPENDS_${PN}-build = "file bash perl" | |||
477 | 477 | ||
478 | RDEPENDS_python-rpm = "${PN} python" | 478 | RDEPENDS_python-rpm = "${PN} python" |
479 | 479 | ||
480 | FILES_python-rpm = "${libdir}/python*/site-packages/rpm" | 480 | FILES_python-rpm = "${PYTHON_SITEPACKAGES_DIR}/rpm" |
481 | PROVIDES += "python-rpm" | 481 | PROVIDES += "python-rpm" |
482 | 482 | ||
483 | FILES_perl-module-rpm = "${libdir}/perl/*/* \ | 483 | FILES_perl-module-rpm = "${libdir}/perl/*/* \ |
@@ -512,7 +512,7 @@ FILES_${PN}-staticdev = " \ | |||
512 | ${libdir}/librpmmisc.a \ | 512 | ${libdir}/librpmmisc.a \ |
513 | ${libdir}/librpmbuild.a \ | 513 | ${libdir}/librpmbuild.a \ |
514 | ${libdir}/rpm/lib/liblua.a \ | 514 | ${libdir}/rpm/lib/liblua.a \ |
515 | ${libdir}/python*/site-packages/rpm/*.a \ | 515 | ${PYTHON_SITEPACKAGES_DIR}/rpm/*.a \ |
516 | " | 516 | " |
517 | 517 | ||
518 | do_configure() { | 518 | do_configure() { |
@@ -581,10 +581,10 @@ do_install_append() { | |||
581 | rm -f ${D}/${mandir}/man1/lz*.1 | 581 | rm -f ${D}/${mandir}/man1/lz*.1 |
582 | rm -f ${D}/${libdir}/pkgconfig/liblzma* | 582 | rm -f ${D}/${libdir}/pkgconfig/liblzma* |
583 | 583 | ||
584 | rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.a | 584 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/*.a |
585 | rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/*.la | 585 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/*.la |
586 | rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/rpm/*.a | 586 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/rpm/*.a |
587 | rm -f ${D}/${libdir}/python%{with_python_version}/site-packages/rpm/*.la | 587 | rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/rpm/*.la |
588 | 588 | ||
589 | #find ${D}/${libdir}/perl5 -type f -a \( -name perllocal.pod -o -name .packlist \ | 589 | #find ${D}/${libdir}/perl5 -type f -a \( -name perllocal.pod -o -name .packlist \ |
590 | # -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' | 590 | # -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' |
@@ -647,11 +647,11 @@ EOF | |||
647 | } | 647 | } |
648 | 648 | ||
649 | do_install_append_class-native () { | 649 | do_install_append_class-native () { |
650 | sed -i -e 's|^#!.*/usr/bin/python|#! /usr/bin/env nativepython|' ${D}/${libdir}/python2.7/site-packages/rpm/transaction.py | 650 | sed -i -e 's|^#!.*/usr/bin/python|#! /usr/bin/env nativepython|' ${D}${PYTHON_SITEPACKAGES_DIR}/rpm/transaction.py |
651 | } | 651 | } |
652 | 652 | ||
653 | do_install_append_class-nativesdk () { | 653 | do_install_append_class-nativesdk () { |
654 | sed -i -e 's|^#!.*/usr/bin/python|#! /usr/bin/env python|' ${D}/${libdir}/python2.7/site-packages/rpm/transaction.py | 654 | sed -i -e 's|^#!.*/usr/bin/python|#! /usr/bin/env python|' ${D}${PYTHON_SITEPACKAGES_DIR}/rpm/transaction.py |
655 | } | 655 | } |
656 | 656 | ||
657 | def multilib_rpmmacros(d): | 657 | def multilib_rpmmacros(d): |