Skip to contentSkip to conversation

buildhistory fix

PATCH Applied Paul Eggleton 2 participants 3 messages Dec 5, 2011

lore
Share & tools
lore
#0 lore raw

cover buildhistory fix

Because of a screw-up by me when I fixed the copyright date in the buildhistory branch, a previous version of the tree got pushed and the default to not create package history files for every version got lost. This patch restores the functionality.

(To be clear, this change *was* in the original RFC pull request.)

The following changes since commit d512a41ed8843a66ed9c5c5978c5f33248083464:

libx11-trim: Fix keysymdir configure option mismatch (2011-12-05 16:47:50 +0000)

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

Paul Eggleton (1):
classes/buildhistory: do not save old packagehistory files by default

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

PATCH 1/1 classes/buildhistory: do not save old packagehistory files by default

Disable storing package history as version named files unless BUILDHISTORY_KEEP_VERSIONS is set to 1; otherwise the adds of these files that duplicate what is already in git anyway is just noise in the git log.

---
 meta/classes/buildhistory.bbclass |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
meta/classes/buildhistory.bbclass +7 -2
index 1859961..e4534e9 100644
@@ -258,8 +258,13 @@ def write_latestlink(pkg, pe, pv, pr, d):
 		filedir = os.path.join(pkghistdir, pkg)
 	else:
 		filedir = pkghistdir
-	rm_link(os.path.join(filedir, "latest"))
-	shutil.copy(os.path.join(filedir, "%s:%s-%s" % (pe, pv, pr)), os.path.join(filedir, "latest"))
+	latest_file = os.path.join(filedir, "latest")
+	ver_file = os.path.join(filedir, "%s:%s-%s" % (pe, pv, pr))
+	rm_link(latest_file)
+	if d.getVar('BUILDHISTORY_KEEP_VERSIONS', True) == '1':
+		shutil.copy(ver_file, latest_file)
+	else:
+		shutil.move(ver_file, latest_file)
 
 
 buildhistory_get_image_installed() {
Signature · 1 line
1.7.5.4
#2 lore raw

Re: [PATCH 1/1] classes/buildhistory: do not save old packagehistory files by default

Quoted 9 lines · Paul Eggleton

Disable storing package history as version named files unless BUILDHISTORY_KEEP_VERSIONS is set to 1; otherwise the adds of these files that duplicate what is already in git anyway is just noise in the git log.

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

Merged to master, thanks.

Richard