[OE-core] [PATCH 1/3] distutils/setuptools, distutils3/setuptools3: improve reproducibility

[Hongxu Jia]

On 2018年07月19日 21:05, Burton, Ross wrote:
> Hi Hongxu,
>
> Can you rebase this to current master?

No problem, V2 incoming

//Hongxu

> Cheers,
> Ross
>
> On 18 July 2018 at 01:57, Hongxu Jia <hongxu.jia at windriver.com> wrote:
>> - Unify var-DISTUTILS_INSTALL_ARGS in distutils and setuptools
>>
>> - Supply "--root" directory to the "install" command, and use
>>    it as a prefix to strip off the purported filename encoded
>>    in bytecode files. (It strips build path prefix from .pyc files)
>>
>> [YOCTO #8446]
>> [YOCTO #12084]
>>
>> Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
>> ---
>>   meta/classes/distutils.bbclass   | 8 +++++---
>>   meta/classes/distutils3.bbclass  | 8 +++++---
>>   meta/classes/setuptools.bbclass  | 5 -----
>>   meta/classes/setuptools3.bbclass | 4 ----
>>   4 files changed, 10 insertions(+), 15 deletions(-)
>>
>> diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
>> index 1930c35..db28767 100644
>> --- a/meta/classes/distutils.bbclass
>> +++ b/meta/classes/distutils.bbclass
>> @@ -4,8 +4,10 @@ DISTUTILS_BUILD_ARGS ?= ""
>>   DISTUTILS_STAGE_HEADERS_ARGS ?= "--install-dir=${STAGING_INCDIR}/${PYTHON_DIR}"
>>   DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${prefix} \
>>       --install-data=${STAGING_DATADIR}"
>> -DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
>> -    --install-data=${D}/${datadir}"
>> +DISTUTILS_INSTALL_ARGS ?= "--root=${D} \
>> +    --prefix=${prefix} \
>> +    --install-lib=${PYTHON_SITEPACKAGES_DIR} \
>> +    --install-data=${datadir}"
>>
>>   distutils_do_compile() {
>>            STAGING_INCDIR=${STAGING_INCDIR} \
>> @@ -34,7 +36,7 @@ distutils_do_install() {
>>           STAGING_INCDIR=${STAGING_INCDIR} \
>>           STAGING_LIBDIR=${STAGING_LIBDIR} \
>>           PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
>> -        ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
>> +        ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_INSTALL_ARGS} || \
>>           bbfatal_log "${PYTHON_PN} setup.py install execution failed."
>>
>>           # support filenames with *spaces*
>> diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
>> index d4b92a3..9637486 100644
>> --- a/meta/classes/distutils3.bbclass
>> +++ b/meta/classes/distutils3.bbclass
>> @@ -5,8 +5,10 @@ DISTUTILS_BUILD_EXT_ARGS ?= ""
>>   DISTUTILS_STAGE_HEADERS_ARGS ?= "--install-dir=${STAGING_INCDIR}/${PYTHON_DIR}"
>>   DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${prefix} \
>>       --install-data=${STAGING_DATADIR}"
>> -DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \
>> -    --install-data=${D}/${datadir}"
>> +DISTUTILS_INSTALL_ARGS ?= "--root=${D} \
>> +    --prefix=${prefix} \
>> +    --install-lib=${PYTHON_SITEPACKAGES_DIR} \
>> +    --install-data=${datadir}"
>>
>>   distutils3_do_configure() {
>>          if [ "${CLEANBROKEN}" != "1" ] ; then
>> @@ -45,7 +47,7 @@ distutils3_do_install() {
>>           STAGING_INCDIR=${STAGING_INCDIR} \
>>           STAGING_LIBDIR=${STAGING_LIBDIR} \
>>           PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
>> -        ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
>> +        ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_INSTALL_ARGS} || \
>>           bbfatal_log "${PYTHON_PN} setup.py install execution failed."
>>
>>           # support filenames with *spaces*
>> diff --git a/meta/classes/setuptools.bbclass b/meta/classes/setuptools.bbclass
>> index 157ef63..a923ea3 100644
>> --- a/meta/classes/setuptools.bbclass
>> +++ b/meta/classes/setuptools.bbclass
>> @@ -1,8 +1,3 @@
>>   inherit distutils
>>
>>   DEPENDS += "python-setuptools-native"
>> -
>> -DISTUTILS_INSTALL_ARGS = "--root=${D} \
>> -    --prefix=${prefix} \
>> -    --install-lib=${PYTHON_SITEPACKAGES_DIR} \
>> -    --install-data=${datadir}"
>> diff --git a/meta/classes/setuptools3.bbclass b/meta/classes/setuptools3.bbclass
>> index de6dd94..8ca66ee 100644
>> --- a/meta/classes/setuptools3.bbclass
>> +++ b/meta/classes/setuptools3.bbclass
>> @@ -2,7 +2,3 @@ inherit distutils3
>>
>>   DEPENDS += "python3-setuptools-native"
>>
>> -DISTUTILS_INSTALL_ARGS = "--root=${D} \
>> -    --prefix=${prefix} \
>> -    --install-lib=${PYTHON_SITEPACKAGES_DIR} \
>> -    --install-data=${datadir}"
>> --
>> 2.7.4
>>