Patchwork [RFC] bitbake.conf: use empty SRC_URI by default

login
register
mail settings
Submitter Andreas Oberritter
Date March 8, 2012, 2:51 a.m.
Message ID <1331175070-12257-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/22891/
State Accepted
Commit 516d2029b31b014de1c87d23dd86208a4480579c
Headers show

Comments

Andreas Oberritter - March 8, 2012, 2:51 a.m.
* Otherwise, recipes that only append to SRC_URI instead of
  overwriting it will get the full path of the recipe written
  into the Source: field of the package.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
* I haven't tested this yet, I don't know whether there
  are any caveeats. What's the purpose of having ${FILE}
  in there, anyway?

 meta/conf/bitbake.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Andreas Oberritter - March 8, 2012, 9:38 p.m.
On 08.03.2012 03:51, Andreas Oberritter wrote:
> * Otherwise, recipes that only append to SRC_URI instead of
>   overwriting it will get the full path of the recipe written
>   into the Source: field of the package.
> 
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
> * I haven't tested this yet, I don't know whether there
>   are any caveeats. What's the purpose of having ${FILE}
>   in there, anyway?

Richard, did you commit this by accident? In the meantime I've started a
clean build with this patch applied and noticed eglibc-locale failing,
because opkg-build complains about a missing "Source" field.

Regards,
Andreas
Saul Wold - March 9, 2012, 8:07 a.m.
On 03/08/2012 01:38 PM, Andreas Oberritter wrote:
> On 08.03.2012 03:51, Andreas Oberritter wrote:
>> * Otherwise, recipes that only append to SRC_URI instead of
>>    overwriting it will get the full path of the recipe written
>>    into the Source: field of the package.
>>
>> Signed-off-by: Andreas Oberritter<obi@opendreambox.org>
>> ---
>> * I haven't tested this yet, I don't know whether there
>>    are any caveeats. What's the purpose of having ${FILE}
>>    in there, anyway?
>
> Richard, did you commit this by accident? In the meantime I've started a
> clean build with this patch applied and noticed eglibc-locale failing,
> because opkg-build complains about a missing "Source" field.
>
Agreed, this seems to have been committed by accident, we see the same 
failures on the Autobuilder.

Sau!

> Regards,
> Andreas
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Richard Purdie - March 9, 2012, 2:25 p.m.
On Fri, 2012-03-09 at 00:07 -0800, Saul Wold wrote:
> On 03/08/2012 01:38 PM, Andreas Oberritter wrote:
> > On 08.03.2012 03:51, Andreas Oberritter wrote:
> >> * Otherwise, recipes that only append to SRC_URI instead of
> >>    overwriting it will get the full path of the recipe written
> >>    into the Source: field of the package.
> >>
> >> Signed-off-by: Andreas Oberritter<obi@opendreambox.org>
> >> ---
> >> * I haven't tested this yet, I don't know whether there
> >>    are any caveeats. What's the purpose of having ${FILE}
> >>    in there, anyway?
> >
> > Richard, did you commit this by accident? In the meantime I've started a
> > clean build with this patch applied and noticed eglibc-locale failing,
> > because opkg-build complains about a missing "Source" field.
> >
> Agreed, this seems to have been committed by accident, we see the same 
> failures on the Autobuilder.

I meant to do some local testing but it ended up getting merged, sorry
about that. Since there weren't too many issues on the autobuilder, I
pushed a follow up which sets Source to be "None" rather than unset and
the last set of builds are looking pretty green.

Cheers,

Richard

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c8d9a31..216da75 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -577,7 +577,7 @@  SRCREV ??= "INVALID"
 AUTOREV = "${@bb.fetch2.get_autorev(d)}"
 SRCPV = "${@bb.fetch2.get_srcrev(d)}"
 
-SRC_URI = "file://${FILE}"
+SRC_URI = ""
 
 # Use pseudo as the fakeroot implementation
 PSEUDO_LOCALSTATEDIR ?= "${WORKDIR}/pseudo/"