Skip to contentSkip to conversation

Buildhistory fix

PATCH Applied Paul Eggleton 5 participants 14 messages May 4, 2012 – May 7, 2012

lore
Share & tools
lore
#0 lore raw

cover Buildhistory fix

This fix should also go into 1.2.1.

The following change since commit 0be64cda0a20ca3aab75ee0cc360236d2dc40c95:

gcc-package-target: add libexec for plugin (2012-05-03 15:38:07 +0100)

is available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/buildhistory-commit
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/buildhistory-commit

Paul Eggleton (1):
buildhistory: fix multiple commit of images and packages at the same
time

 meta/classes/buildhistory.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/1 buildhistory: fix multiple commit of images and packages at the same time

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]

---
 meta/classes/buildhistory.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/buildhistory.bbclass +1 -1
index 8d5b096..d2d19ff 100644
@@ -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
Signature · 1 line
1.7.5.4
#2 lore raw

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

Op 4 mei 2012, om 15:36 heeft Paul Eggleton het volgende geschreven:

Quoted 9 lines

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]

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

regards,

Koen

#3 lore raw

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

Quoted 2 lines · 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

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#4 lore raw

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

Op 4 mei 2012, om 16:30 heeft Paul Eggleton het volgende geschreven:

Quoted 6 lines · On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
Quoted 2 lines

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.

#5 lore raw

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

Quoted 4 lines · On Friday 04 May 2012 17:06:51 Koen Kooi wrote:
Quoted 2 lines

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

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#6 lore raw

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

In reply to Koen Kooi
Quoted 10 lines · Koen Kooi

Op 4 mei 2012, om 16:30 heeft Paul Eggleton het volgende geschreven:

Quoted 6 lines · On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
Quoted 2 lines

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

#7 lore raw

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

Op 4 mei 2012, om 17:13 heeft Richard Purdie het volgende geschreven:

Quoted 7 lines · Koen Kooi
Quoted 6 lines

Op 4 mei 2012, om 16:30 heeft Paul Eggleton het volgende geschreven:

Quoted 4 lines · On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
Quoted 2 lines

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

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

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.

#8 lore raw

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

Quoted 7 lines · Koen Kooi
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines · On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
Quoted 2 lines

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.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

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

Signature · 3 lines
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
#9 lore raw

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

Op 4 mei 2012, om 23:25 heeft Scott Garman het volgende geschreven:

Quoted 16 lines · Koen Kooi
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines · On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
Quoted 2 lines

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.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

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.

Quoted 7 lines

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

#10 lore raw

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

Quoted 30 lines · Koen Kooi

Op 4 mei 2012, om 23:25 heeft Scott Garman het volgende geschreven:

Quoted 27 lines · Koen Kooi
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines · On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
Quoted 2 lines

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.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

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:

Quoted 7 lines
Quoted 3 lines

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

Signature · 3 lines
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
#11 lore raw

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

Op 7 mei 2012, om 17:47 heeft Scott Garman het volgende geschreven:

Quoted 34 lines · Koen Kooi
Quoted 33 lines

Op 4 mei 2012, om 23:25 heeft Scott Garman het volgende geschreven:

Quoted 30 lines · Koen Kooi
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines · On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
Quoted 2 lines

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.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

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

Quoted 6 lines
Quoted 4 lines

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?

#12 lore raw

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

Quoted 37 lines · Koen Kooi

Op 7 mei 2012, om 17:47 heeft Scott Garman het volgende geschreven:

Quoted 34 lines · Koen Kooi
Quoted 33 lines

Op 4 mei 2012, om 23:25 heeft Scott Garman het volgende geschreven:

Quoted 30 lines · Koen Kooi
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines · On Friday 04 May 2012 15:50:16 Koen Kooi wrote:
Quoted 2 lines

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.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

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

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

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

Signature · 3 lines
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
Applied
#13 lore raw
In reply to Paul Eggleton
Quoted 11 lines · Paul Eggleton

This fix should also go into 1.2.1.

The following change since commit 0be64cda0a20ca3aab75ee0cc360236d2dc40c95:

   gcc-package-target: add libexec for plugin (2012-05-03 15:38:07 +0100)

is available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/buildhistory-commit
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/buildhistory-commit

Quoted 7 lines

Paul Eggleton (1):
buildhistory: fix multiple commit of images and packages at the same
time

  meta/classes/buildhistory.bbclass |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

Merged into OE-Core

Thanks
Sau!