Patchwork [1/1] buildhistory: fix multiple commit of images and packages at the same time

login
register
mail settings
Submitter Paul Eggleton
Date May 4, 2012, 1:36 p.m.
Message ID <372b4f451158c03f0d62bf406db1a16a883faa80.1336138307.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/27061/
State Accepted
Commit 2086bb86885951d0a74342e30ff205c24cb93f0d
Headers show

Comments

Paul Eggleton - May 4, 2012, 1:36 p.m.
The echo line here was merging multiple lines into one, and the result
was that if both image and package changes had to be comitted then only
the image changes were being committed and the package changes could
potentially be merged into the next package change. Quoting the variable
reference fixes this.

Fixes [YOCTO #2411]

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/buildhistory.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Koen Kooi - May 4, 2012, 1:50 p.m.
Op 4 mei 2012, om 15:36 heeft Paul Eggleton het volgende geschreven:

> The echo line here was merging multiple lines into one, and the result
> was that if both image and package changes had to be comitted then only
> the image changes were being committed and the package changes could
> potentially be merged into the next package change. Quoting the variable
> reference fixes this.
> 
> Fixes [YOCTO #2411]
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Looks good to me. If this goes in, can it go on the denzil shortlist as well?

regards,

Koen
Paul Eggleton - May 4, 2012, 2:30 p.m.
On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
> Looks good to me. If this goes in, can it go on the denzil shortlist as
> well?

I hope so, hence I've CC'd Scott Garman who is pulling together a branch for 
1.2.1.

Cheers,
Paul
Koen Kooi - May 4, 2012, 3:06 p.m.
Op 4 mei 2012, om 16:30 heeft Paul Eggleton het volgende geschreven:

> On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
>> Looks good to me. If this goes in, can it go on the denzil shortlist as
>> well?
> 
> I hope so, hence I've CC'd Scott Garman who is pulling together a branch for 
> 1.2.1.

oe-core or poky? I only care about oe-core.
Paul Eggleton - May 4, 2012, 3:09 p.m.
On Friday 04 May 2012 17:06:51 Koen Kooi wrote:
> > I hope so, hence I've CC'd Scott Garman who is pulling together a branch
> > for 1.2.1.
> 
> oe-core or poky? I only care about oe-core.

That's a question for Scott. I only came up with the patch.

Cheers,
Paul
Richard Purdie - May 4, 2012, 3:13 p.m.
On Fri, 2012-05-04 at 17:06 +0200, Koen Kooi wrote:
> Op 4 mei 2012, om 16:30 heeft Paul Eggleton het volgende geschreven:
> 
> > On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
> >> Looks good to me. If this goes in, can it go on the denzil shortlist as
> >> well?
> > 
> > I hope so, hence I've CC'd Scott Garman who is pulling together a branch for 
> > 1.2.1.
> 
> oe-core or poky? I only care about oe-core.

Both. Nothing goes into poky these days unless it comes from one of the
appropriate trees.

Cheers,

Richard
Koen Kooi - May 4, 2012, 3:16 p.m.
Op 4 mei 2012, om 17:13 heeft Richard Purdie het volgende geschreven:

> On Fri, 2012-05-04 at 17:06 +0200, Koen Kooi wrote:
>> Op 4 mei 2012, om 16:30 heeft Paul Eggleton het volgende geschreven:
>> 
>>> On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
>>>> Looks good to me. If this goes in, can it go on the denzil shortlist as
>>>> well?
>>> 
>>> I hope so, hence I've CC'd Scott Garman who is pulling together a branch for 
>>> 1.2.1.
>> 
>> oe-core or poky? I only care about oe-core.
> 
> Both. Nothing goes into poky these days unless it comes from one of the
> appropriate trees.

That's not what I was asking. I was asking it scott is doing a poky or oe-core effort. From Scotts emails it seems like a poky effort.
Scott Garman - May 4, 2012, 9:25 p.m.
On 05/04/2012 08:16 AM, Koen Kooi wrote:
>>>> On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
>>>>> Looks good to me. If this goes in, can it go on the denzil
>>>>> shortlist as well?
>>>>
>>>> I hope so, hence I've CC'd Scott Garman who is pulling together
>>>> a branch for 1.2.1.
>>>
>>> oe-core or poky? I only care about oe-core.
>>
>> Both. Nothing goes into poky these days unless it comes from one of
>> the appropriate trees.
>
> That's not what I was asking. I was asking it scott is doing a poky
> or oe-core effort. From Scotts emails it seems like a poky effort.

Hi Koen,

I apologize for having made some confusing comments earlier about 
rebasing a denzil-next branch on my poky-contrib repo from being based 
on oe-core to poky. Since then, Richard has given me access to the 
oe-core-contrib repo, and I am now maintaining two denzil-next branches.

This one is based on oe-core:

http://git.openembedded.org/openembedded-core-contrib/log/?h=sgarman/denzil-next

and this one is based on poky:

http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=sgarman/denzil-next

My workflow will continue to be based on how Richard pulls commits into 
Poky master - which only happens after they have been merged into 
oe-core first.

Scott
Koen Kooi - May 5, 2012, 6:55 a.m.
Op 4 mei 2012, om 23:25 heeft Scott Garman het volgende geschreven:

> On 05/04/2012 08:16 AM, Koen Kooi wrote:
>>>>> On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
>>>>>> Looks good to me. If this goes in, can it go on the denzil
>>>>>> shortlist as well?
>>>>> 
>>>>> I hope so, hence I've CC'd Scott Garman who is pulling together
>>>>> a branch for 1.2.1.
>>>> 
>>>> oe-core or poky? I only care about oe-core.
>>> 
>>> Both. Nothing goes into poky these days unless it comes from one of
>>> the appropriate trees.
>> 
>> That's not what I was asking. I was asking it scott is doing a poky
>> or oe-core effort. From Scotts emails it seems like a poky effort.
> 
> Hi Koen,
> 
> I apologize for having made some confusing comments earlier about rebasing a denzil-next branch on my poky-contrib repo from being based on oe-core to poky. Since then, Richard has given me access to the oe-core-contrib repo, and I am now maintaining two denzil-next branches.
> 
> This one is based on oe-core:
> 
> http://git.openembedded.org/openembedded-core-contrib/log/?h=sgarman/denzil-next

When is that going to get merged into denzil? I'm in serious need of that connman tests fix, so I have been using http://cgit.openembedded.org/openembedded-core/log/?h=denzil-next locally. 

regards,

Koen
Scott Garman - May 7, 2012, 3:47 p.m.
On 05/04/2012 11:55 PM, Koen Kooi wrote:
>
> Op 4 mei 2012, om 23:25 heeft Scott Garman het volgende geschreven:
>
>> On 05/04/2012 08:16 AM, Koen Kooi wrote:
>>>>>> On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
>>>>>>> Looks good to me. If this goes in, can it go on the
>>>>>>> denzil shortlist as well?
>>>>>>
>>>>>> I hope so, hence I've CC'd Scott Garman who is pulling
>>>>>> together a branch for 1.2.1.
>>>>>
>>>>> oe-core or poky? I only care about oe-core.
>>>>
>>>> Both. Nothing goes into poky these days unless it comes from
>>>> one of the appropriate trees.
>>>
>>> That's not what I was asking. I was asking it scott is doing a
>>> poky or oe-core effort. From Scotts emails it seems like a poky
>>> effort.
>>
>> Hi Koen,
>>
>> I apologize for having made some confusing comments earlier about
>> rebasing a denzil-next branch on my poky-contrib repo from being
>> based on oe-core to poky. Since then, Richard has given me access
>> to the oe-core-contrib repo, and I am now maintaining two
>> denzil-next branches.
>>
>> This one is based on oe-core:
>>
>> http://git.openembedded.org/openembedded-core-contrib/log/?h=sgarman/denzil-next
>
>>
> When is that going to get merged into denzil? I'm in serious need of
> that connman tests fix, so I have been using
> http://cgit.openembedded.org/openembedded-core/log/?h=denzil-next
> locally.

The commit just got into master, so I'm hoping to pull it into my 
denzil-next-testing branch and run some build tests overnight tonight, 
then merge it if all goes well tomorrow.

As for the denzil-next branch on the main oe-core repository: I asked 
Richard about this and I believe he may end up deleting it, as I don't 
have the ability to push to that branch. The authoritative oe-core 
branch for denzil-next will be

http://git.openembedded.org/openembedded-core-contrib/log/?h=sgarman/denzil-next

until we're ready to do the release.

Scott
Koen Kooi - May 7, 2012, 4:03 p.m.
Op 7 mei 2012, om 17:47 heeft Scott Garman het volgende geschreven:

> On 05/04/2012 11:55 PM, Koen Kooi wrote:
>> 
>> Op 4 mei 2012, om 23:25 heeft Scott Garman het volgende geschreven:
>> 
>>> On 05/04/2012 08:16 AM, Koen Kooi wrote:
>>>>>>> On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
>>>>>>>> Looks good to me. If this goes in, can it go on the
>>>>>>>> denzil shortlist as well?
>>>>>>> 
>>>>>>> I hope so, hence I've CC'd Scott Garman who is pulling
>>>>>>> together a branch for 1.2.1.
>>>>>> 
>>>>>> oe-core or poky? I only care about oe-core.
>>>>> 
>>>>> Both. Nothing goes into poky these days unless it comes from
>>>>> one of the appropriate trees.
>>>> 
>>>> That's not what I was asking. I was asking it scott is doing a
>>>> poky or oe-core effort. From Scotts emails it seems like a poky
>>>> effort.
>>> 
>>> Hi Koen,
>>> 
>>> I apologize for having made some confusing comments earlier about
>>> rebasing a denzil-next branch on my poky-contrib repo from being
>>> based on oe-core to poky. Since then, Richard has given me access
>>> to the oe-core-contrib repo, and I am now maintaining two
>>> denzil-next branches.
>>> 
>>> This one is based on oe-core:
>>> 
>>> http://git.openembedded.org/openembedded-core-contrib/log/?h=sgarman/denzil-next
>> 
>>> 
>> When is that going to get merged into denzil? I'm in serious need of
>> that connman tests fix, so I have been using
>> http://cgit.openembedded.org/openembedded-core/log/?h=denzil-next
>> locally.
> 
> The commit just got into master, so I'm hoping to pull it into my denzil-next-testing branch and run some build tests overnight tonight, then merge it if all goes well tomorrow.

Merge it into the oe-core 'denzil' branch, right?
Scott Garman - May 7, 2012, 5 p.m.
On 05/07/2012 09:03 AM, Koen Kooi wrote:
>
> Op 7 mei 2012, om 17:47 heeft Scott Garman het volgende geschreven:
>
>> On 05/04/2012 11:55 PM, Koen Kooi wrote:
>>>
>>> Op 4 mei 2012, om 23:25 heeft Scott Garman het volgende geschreven:
>>>
>>>> On 05/04/2012 08:16 AM, Koen Kooi wrote:
>>>>>>>> On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
>>>>>>>>> Looks good to me. If this goes in, can it go on the
>>>>>>>>> denzil shortlist as well?
>>>>>>>>
>>>>>>>> I hope so, hence I've CC'd Scott Garman who is pulling
>>>>>>>> together a branch for 1.2.1.
>>>>>>>
>>>>>>> oe-core or poky? I only care about oe-core.
>>>>>>
>>>>>> Both. Nothing goes into poky these days unless it comes from
>>>>>> one of the appropriate trees.
>>>>>
>>>>> That's not what I was asking. I was asking it scott is doing a
>>>>> poky or oe-core effort. From Scotts emails it seems like a poky
>>>>> effort.
>>>>
>>>> Hi Koen,
>>>>
>>>> I apologize for having made some confusing comments earlier about
>>>> rebasing a denzil-next branch on my poky-contrib repo from being
>>>> based on oe-core to poky. Since then, Richard has given me access
>>>> to the oe-core-contrib repo, and I am now maintaining two
>>>> denzil-next branches.
>>>>
>>>> This one is based on oe-core:
>>>>
>>>> http://git.openembedded.org/openembedded-core-contrib/log/?h=sgarman/denzil-next
>>>
>>>>
>>> When is that going to get merged into denzil? I'm in serious need of
>>> that connman tests fix, so I have been using
>>> http://cgit.openembedded.org/openembedded-core/log/?h=denzil-next
>>> locally.
>>
>> The commit just got into master, so I'm hoping to pull it into my denzil-next-testing branch and run some build tests overnight tonight, then merge it if all goes well tomorrow.
>
> Merge it into the oe-core 'denzil' branch, right?

No. I do not have commit access to the oe-core repository, just the 
oe-core-contrib repo, where my sgarman/denzil-next branch lives.

Richard is on holiday until tomorrow, can you hold on until then and 
maybe he can help clear up the remaining confusion?

Scott

Patch

diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 8d5b096..d2d19ff 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -402,7 +402,7 @@  buildhistory_commit() {
 			git add ${BUILDHISTORY_DIR}/*
 			HOSTNAME=`hostname 2>/dev/null || echo unknown`
 			# porcelain output looks like "?? packages/foo/bar"
-			for entry in `echo $repostatus | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do
+			for entry in `echo "$repostatus" | awk '{print $2}' | awk -F/ '{print $1}' | sort | uniq` ; do
 				git commit ${BUILDHISTORY_DIR}/$entry -m "$entry: Build ${BUILDNAME} of ${DISTRO} ${DISTRO_VERSION} for machine ${MACHINE} on $HOSTNAME" --author "${BUILDHISTORY_COMMIT_AUTHOR}" > /dev/null
 			done
 			if [ "${BUILDHISTORY_PUSH_REPO}" != "" ] ; then