[meta-python][PATCH] python-smbus: remove sed to replace i2c path

[meta-python][PATCH] python-smbus: remove sed to replace i2c path

[Derek Straka]

The i2c-dev file is now installed in the standard location, so
the sed to change the path can be removed

Signed-off-by: Derek Straka <derek@asterius.io>
---
 meta-python/recipes-devtools/python/python-smbus.inc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python-smbus.inc b/meta-python/recipes-devtools/python/python-smbus.inc
index 0bca58f..57ca8ae 100644
--- a/meta-python/recipes-devtools/python/python-smbus.inc
+++ b/meta-python/recipes-devtools/python/python-smbus.inc
@@ -9,9 +9,3 @@ SRC_URI[sha256sum] = "5b60daf6f011de0acb61de57dba62f2054bb39f19961d67e0c91610f07
 DEPENDS += "i2c-tools"
 
 S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/"
-
-do_configure_prepend() {
-    # Adjust for OE header rename
-    sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: Module.mk
-    sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: smbusmodule.c
-}
-- 
2.7.4

Re: [meta-python][PATCH] python-smbus: remove sed to replace i2c path

[Martin Jansa]

Thanks, works for me.

On Thu, Feb 8, 2018 at 2:58 PM, Derek Straka <derek@asterius.io> wrote:

> The i2c-dev file is now installed in the standard location, so
> the sed to change the path can be removed
>
> Signed-off-by: Derek Straka <derek@asterius.io>
> ---
>  meta-python/recipes-devtools/python/python-smbus.inc | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/meta-python/recipes-devtools/python/python-smbus.inc
> b/meta-python/recipes-devtools/python/python-smbus.inc
> index 0bca58f..57ca8ae 100644
> --- a/meta-python/recipes-devtools/python/python-smbus.inc
> +++ b/meta-python/recipes-devtools/python/python-smbus.inc
> @@ -9,9 +9,3 @@ SRC_URI[sha256sum] = "5b60daf6f011de0acb61de57dba62f
> 2054bb39f19961d67e0c91610f07
>  DEPENDS += "i2c-tools"
>
>  S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/"
> -
> -do_configure_prepend() {
> -    # Adjust for OE header rename
> -    sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: Module.mk
> -    sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: smbusmodule.c
> -}
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Re: [meta-python][PATCH] python-smbus: remove sed to replace i2c path

[Martin Jansa]

There is small issue I've noticed in incremental builds.. when do_configure
is re-executed in the same WORKDIR where this sed was already executed it
will fail with the same error about missing i2c-dev-user.h.

It can be fixed by additional PR bump to force new WORKDIR.

On Fri, Feb 9, 2018 at 8:16 PM, Martin Jansa <martin.jansa@gmail.com> wrote:

> Thanks, works for me.
>
> On Thu, Feb 8, 2018 at 2:58 PM, Derek Straka <derek@asterius.io> wrote:
>
>> The i2c-dev file is now installed in the standard location, so
>> the sed to change the path can be removed
>>
>> Signed-off-by: Derek Straka <derek@asterius.io>
>> ---
>>  meta-python/recipes-devtools/python/python-smbus.inc | 6 ------
>>  1 file changed, 6 deletions(-)
>>
>> diff --git a/meta-python/recipes-devtools/python/python-smbus.inc
>> b/meta-python/recipes-devtools/python/python-smbus.inc
>> index 0bca58f..57ca8ae 100644
>> --- a/meta-python/recipes-devtools/python/python-smbus.inc
>> +++ b/meta-python/recipes-devtools/python/python-smbus.inc
>> @@ -9,9 +9,3 @@ SRC_URI[sha256sum] = "5b60daf6f011de0acb61de57dba62
>> f2054bb39f19961d67e0c91610f07
>>  DEPENDS += "i2c-tools"
>>
>>  S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/"
>> -
>> -do_configure_prepend() {
>> -    # Adjust for OE header rename
>> -    sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: Module.mk
>> -    sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: smbusmodule.c
>> -}
>> --
>> 2.7.4
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
>
>

Re: [meta-python][PATCH] python-smbus: remove sed to replace i2c path

[Derek Straka]

Bumped the PR and sent a V2.  Thanks for catching that.

On Sat, Feb 10, 2018 at 5:35 AM, Martin Jansa <martin.jansa@gmail.com>
wrote:

> There is small issue I've noticed in incremental builds.. when
> do_configure is re-executed in the same WORKDIR where this sed was already
> executed it will fail with the same error about missing i2c-dev-user.h.
>
> It can be fixed by additional PR bump to force new WORKDIR.
>
> On Fri, Feb 9, 2018 at 8:16 PM, Martin Jansa <martin.jansa@gmail.com>
> wrote:
>
>> Thanks, works for me.
>>
>> On Thu, Feb 8, 2018 at 2:58 PM, Derek Straka <derek@asterius.io> wrote:
>>
>>> The i2c-dev file is now installed in the standard location, so
>>> the sed to change the path can be removed
>>>
>>> Signed-off-by: Derek Straka <derek@asterius.io>
>>> ---
>>>  meta-python/recipes-devtools/python/python-smbus.inc | 6 ------
>>>  1 file changed, 6 deletions(-)
>>>
>>> diff --git a/meta-python/recipes-devtools/python/python-smbus.inc
>>> b/meta-python/recipes-devtools/python/python-smbus.inc
>>> index 0bca58f..57ca8ae 100644
>>> --- a/meta-python/recipes-devtools/python/python-smbus.inc
>>> +++ b/meta-python/recipes-devtools/python/python-smbus.inc
>>> @@ -9,9 +9,3 @@ SRC_URI[sha256sum] = "5b60daf6f011de0acb61de57dba62
>>> f2054bb39f19961d67e0c91610f07
>>>  DEPENDS += "i2c-tools"
>>>
>>>  S = "${WORKDIR}/i2c-tools-${PV}/py-smbus/"
>>> -
>>> -do_configure_prepend() {
>>> -    # Adjust for OE header rename
>>> -    sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: Module.mk
>>> -    sed -i s:linux/i2c-dev.h:linux/i2c-dev-user.h: smbusmodule.c
>>> -}
>>> --
>>> 2.7.4
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>>
>>
>>
>