[Dev] Tizen Toolschain GBS Build Issue
ruix.lv at intel.com
Mon Aug 18 23:28:53 GMT 2014
I just checked latest code of buxton, and found some updates on upstream branch and tizen branch,
but issues still remain to export new version, you can follow these steps to accomplish the upgrading:
1) upstream / tizen branches checking: tizen branch must be based on upstream branch.
rui at rui ~/projects/buxton[tizen*]$ git branch
rui at rui ~/projects/buxton[tizen*]$ git checkout upstream
Branch upstream set up to track remote branch upstream from origin.
Switched to a new branch 'upstream'
rui at rui ~/projects/buxton[upstream*]$ git branch --contains 67cae288fd4ac44aca7f7950bb0942ecf3261d0f
Issue: tizen branch is not based on latest upstream version 3 branch
2) Rebase tizen branch to latest upstream branch.
rui at rui ~/projects/buxton[upstream*]$ git checkout tizen
Switched to branch 'tizen'
Your branch is up-to-date with 'origin/tizen'.
rui at rui ~/projects/buxton[tizen*]$ git rebase upstream
First, rewinding head to replay your work on top of it...
Applying: Add packaging for v1
Applying: Update changelog
Applying: Update to the v2 release
Applying: Update changelog
Applying: Update to v3.0
Applying: Update spec build version
Applying: Update packaging for v3.0
rui at rui ~/projects/buxton[tizen*]$ tig
rui at rui ~/projects/buxton[tizen*]$ git branch --contains 67cae288fd4ac44aca7f7950bb0942ecf3261d0f
3) Tag checking: upstream tag must be created and added in the rebase point of upstream branch and tizen branch while upgrading to new version.
rui at rui ~/projects/buxton[tizen*]$ git tag upstream/3 67cae288fd4ac44aca7f7950bb0942ecf3261d0f -m "tag for version 3"
4) Correct packaging spec version: version in spec file must match the target version.
rui at rui ~/projects/buxton[tizen*]$ vi packaging/buxton.spec
rui at rui ~/projects/buxton[tizen*]$ git diff
diff --git a/packaging/buxton.spec b/packaging/buxton.spec
index a200fbe..f31fada 100644
@@ -1,5 +1,5 @@
Summary: A security-enabled configuration system
rui at rui ~/projects/buxton[tizen*]$ git commit -a
[tizen bed4c16] Update packaging version to 3
1 file changed, 1 insertion(+), 1 deletion(-)
5) Use gbs export to perform local verification.
rui at rui ~/projects/buxton[tizen*]$ gbs ex
info: tracking branch: origin/pristine-tar -> pristine-tar
info: Generating patches from git (upstream/3..HEAD)
pristine-tar: successfully generated /var/tmp/.gbs_export_cl_aXK/buxton-3.tar.xz
info: package files have been exported to:
6) Push local changes to remote Gerrit.
Push tag first:
rui at rui ~/projects/buxton[tizen*]$ git push origin –tags
Push patch for review:
rui at rui ~/projects/buxton[tizen*]$ git push origin HEAD:refs/for/tizen
Submit code to backend build service (OBS):
rui at rui ~/projects/buxton[tizen*]$ gbs submit -m "upgrade packaging version to 3"
info: creating tag: submit/tizen/20140819.230746
info: pushing tag to remote 'origin'
From: Lv, RuiX
Sent: Monday, August 18, 2014 2:24 PM
To: Peters, Brad T; Tizen Dev
Subject: RE: [Dev] Tizen Toolschain GBS Build Issue
The corresponding upstream tag is missing.
Please add the tag by running the command below, submit the tag to remote Gerrit, and then try again.
$ git tag upsteam/3 6b2325bf3d0f7245b528662b69c738d53031fff1 –m “Add tag upstream/3”
From: Dev [mailto:dev-bounces at lists.tizen.org] On Behalf Of Peters, Brad T
Sent: Saturday, August 16, 2014 5:52 AM
To: Tizen Dev
Subject: [Dev] Tizen Toolschain GBS Build Issue
Short version: Incrementing the Build version in the spec is resulting in a
$gbs build -A armv7l
'Failed to export packaging files from git tree' error.
I'm attempting to build and submit a new Buxton (v3) build to tizen.org<http://tizen.org>,
but am running into a mysterious issue I've not seen before.
I've updated source, committed the changes locally, and modified the
packaging/buxton.spec accordingly, to get the project building.
However, when I try to increment the Build version from 2 -> 3, I get:
$ gbs build -A armv7l -P arm --include-all
info: start export source from: /home/bpeters/tmp/buxton-3/buxton ...
error: Invalid upstream treeish upstream/3
error: Generating upstream tarball and/or generating patches failed. GBS tried this as you have upstream branch in you git tree. Fix the problem by either:
1. Update your upstream branch and/or fix the spec file. Also, check the upstream tag format.
2. Remove or rename the upstream branch (change the package to native)
See https://source.tizen.org/documentation/reference/git-build-system/upstream-package for more details.
error: <gbs>Failed to export packaging files from git tree
The recommendations imply I need to fix the upstream branch, but this makes little sense, as I would expect Upstream to be diff'd against the development branch, meaning changing it directly is pointless.
Appreciate any ideas
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the Dev