All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH] dfu-utils-native: fix do_deploy sstate handling
@ 2017-12-01 10:48 Stefan Müller-Klieser
  2017-12-01 14:46 ` Khem Raj
  0 siblings, 1 reply; 4+ messages in thread
From: Stefan Müller-Klieser @ 2017-12-01 10:48 UTC (permalink / raw)
  To: openembedded-devel

We need to install to the sstate input dir and not the output dir, so
sstate handling will work correctly.

Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
---
 meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
index 7a7a662..aeca23b 100644
--- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
+++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
@@ -8,9 +8,8 @@ SRC_URI += "file://0001-Revert-Makefile.am-Drop-static-dfu-util.patch"
 
 do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}"
 do_deploy() {
-    install -d ${DEPLOY_DIR_TOOLS}
-    install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV}
-    rm -f ${DEPLOY_DIR_TOOLS}/dfu-util
-    ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util
+    install -m 0755 src/dfu-util_static ${DEPLOYDIR}/dfu-util-${PV}
+    rm -f ${DEPLOYDIR}/dfu-util
+    ln -sf ./dfu-util-${PV} ${DEPLOYDIR}/dfu-util
 }
 addtask deploy before do_package after do_install
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [meta-oe][PATCH] dfu-utils-native: fix do_deploy sstate handling
  2017-12-01 10:48 [meta-oe][PATCH] dfu-utils-native: fix do_deploy sstate handling Stefan Müller-Klieser
@ 2017-12-01 14:46 ` Khem Raj
  2017-12-01 15:13   ` Stefan Müller-Klieser
  0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2017-12-01 14:46 UTC (permalink / raw)
  To: Stefan Müller-Klieser; +Cc: openembeded-devel

On Fri, Dec 1, 2017 at 2:48 AM, Stefan Müller-Klieser
<s.mueller-klieser@phytec.de> wrote:
> We need to install to the sstate input dir and not the output dir, so
> sstate handling will work correctly.
>

how can we validate this fix ? do you have steps

> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
> ---
>  meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
> index 7a7a662..aeca23b 100644
> --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
> +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
> @@ -8,9 +8,8 @@ SRC_URI += "file://0001-Revert-Makefile.am-Drop-static-dfu-util.patch"
>
>  do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}"
>  do_deploy() {
> -    install -d ${DEPLOY_DIR_TOOLS}
> -    install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV}
> -    rm -f ${DEPLOY_DIR_TOOLS}/dfu-util
> -    ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util
> +    install -m 0755 src/dfu-util_static ${DEPLOYDIR}/dfu-util-${PV}
> +    rm -f ${DEPLOYDIR}/dfu-util
> +    ln -sf ./dfu-util-${PV} ${DEPLOYDIR}/dfu-util
>  }
>  addtask deploy before do_package after do_install
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [meta-oe][PATCH] dfu-utils-native: fix do_deploy sstate handling
  2017-12-01 14:46 ` Khem Raj
@ 2017-12-01 15:13   ` Stefan Müller-Klieser
  2017-12-05 11:34     ` Stefan Müller-Klieser
  0 siblings, 1 reply; 4+ messages in thread
From: Stefan Müller-Klieser @ 2017-12-01 15:13 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel

On 01.12.2017 15:46, Khem Raj wrote:
> On Fri, Dec 1, 2017 at 2:48 AM, Stefan Müller-Klieser
> <s.mueller-klieser@phytec.de> wrote:
>> We need to install to the sstate input dir and not the output dir, so
>> sstate handling will work correctly.
>>
> 
> how can we validate this fix ? do you have steps

I guess the easiest test would be to run a -c clean. If all files are
removed, sstate is working, if not, you moved some files out of sstate
control.

> 
>> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
>> ---
>>  meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb | 7 +++----
>>  1 file changed, 3 insertions(+), 4 deletions(-)
>>
>> diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
>> index 7a7a662..aeca23b 100644
>> --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
>> +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
>> @@ -8,9 +8,8 @@ SRC_URI += "file://0001-Revert-Makefile.am-Drop-static-dfu-util.patch"
>>
>>  do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}"
>>  do_deploy() {
>> -    install -d ${DEPLOY_DIR_TOOLS}
>> -    install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV}
>> -    rm -f ${DEPLOY_DIR_TOOLS}/dfu-util
>> -    ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util
>> +    install -m 0755 src/dfu-util_static ${DEPLOYDIR}/dfu-util-${PV}
>> +    rm -f ${DEPLOYDIR}/dfu-util
>> +    ln -sf ./dfu-util-${PV} ${DEPLOYDIR}/dfu-util
>>  }
>>  addtask deploy before do_package after do_install
>> --
>> 2.7.4
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [meta-oe][PATCH] dfu-utils-native: fix do_deploy sstate handling
  2017-12-01 15:13   ` Stefan Müller-Klieser
@ 2017-12-05 11:34     ` Stefan Müller-Klieser
  0 siblings, 0 replies; 4+ messages in thread
From: Stefan Müller-Klieser @ 2017-12-05 11:34 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembeded-devel

Hi Khem,

On 01.12.2017 16:13, Stefan Müller-Klieser wrote:
> On 01.12.2017 15:46, Khem Raj wrote:
>> On Fri, Dec 1, 2017 at 2:48 AM, Stefan Müller-Klieser
>> <s.mueller-klieser@phytec.de> wrote:
>>> We need to install to the sstate input dir and not the output dir, so
>>> sstate handling will work correctly.
>>>
>>
>> how can we validate this fix ? do you have steps
> 
> I guess the easiest test would be to run a -c clean. If all files are
> removed, sstate is working, if not, you moved some files out of sstate
> control.

Ok. I already found a bug in this patch. When two machines want to build
the dfu recipe, sstate clashes with the providers conflicting. So apparently
the original code was a workaround for the fact that you cannot handle those
conflicts at the recipe level.
This patch cannot go in until some handling in deploy.bbclass is implemented.
Any tips may help. I will try to find a solution.

Regards, Stefan

> 
>>
>>> Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
>>> ---
>>>  meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb | 7 +++----
>>>  1 file changed, 3 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
>>> index 7a7a662..aeca23b 100644
>>> --- a/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
>>> +++ b/meta-oe/recipes-support/dfu-util/dfu-util-native_0.9.bb
>>> @@ -8,9 +8,8 @@ SRC_URI += "file://0001-Revert-Makefile.am-Drop-static-dfu-util.patch"
>>>
>>>  do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_TOOLS}"
>>>  do_deploy() {
>>> -    install -d ${DEPLOY_DIR_TOOLS}
>>> -    install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV}
>>> -    rm -f ${DEPLOY_DIR_TOOLS}/dfu-util
>>> -    ln -sf ./dfu-util-${PV} ${DEPLOY_DIR_TOOLS}/dfu-util
>>> +    install -m 0755 src/dfu-util_static ${DEPLOYDIR}/dfu-util-${PV}
>>> +    rm -f ${DEPLOYDIR}/dfu-util
>>> +    ln -sf ./dfu-util-${PV} ${DEPLOYDIR}/dfu-util
>>>  }
>>>  addtask deploy before do_package after do_install
>>> --
>>> 2.7.4
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-12-05 11:33 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-01 10:48 [meta-oe][PATCH] dfu-utils-native: fix do_deploy sstate handling Stefan Müller-Klieser
2017-12-01 14:46 ` Khem Raj
2017-12-01 15:13   ` Stefan Müller-Klieser
2017-12-05 11:34     ` Stefan Müller-Klieser

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.