summaryrefslogtreecommitdiff
path: root/gbp
AgeCommit message (Collapse)AuthorFilesLines
2016-12-28Merge remote-tracking branch 'origin/release-20161231' into HEADdevel-test20161228SoonKyu Park1-1/+9
2016-12-26Adapt git-merge option when git version greater then 2.9Jun Wang1-0/+7
Change-Id: Icd9cb9edc8517095984c0a0f497173e2f068aa20
2016-12-26GitRepository: Fix diff_status() for renames and copiesJiankang Fan1-1/+2
When file has been renamed or copied git places two filepaths in a status line. Previously, we concatenated them (with additional \x00) and put into a single record in results dictionary. This leads to records like: 'libusbg.pc.in\x00libusbgx.pc.in' and result in a exception while trying to invoke git diff on such record: error: Traceback (most recent call last): File "/usr/bin/gbs", line 628, in <module> sys.exit(main(sys.argv)) File "/usr/bin/gbs", line 622, in main return module.main(args) File "/usr/lib/pymodules/python2.7/gitbuildsys/cmd_export.py", line 302, in main export_sources(repo, commit, export_dir, main_spec, args) File "/usr/lib/pymodules/python2.7/gitbuildsys/cmd_export.py", line 222, in export_sources ret = gbp_build(gbp_args) File "/usr/lib/python2.7/dist-packages/gbp/scripts/buildpackage_rpm.py", line 588, in main export_patches(repo, spec, patch_tree, options) File "/usr/lib/python2.7/dist-packages/gbp/scripts/buildpackage_rpm.py", line 283, in export_patches update_patch_series(repo, spec, upstream_tree, export_treeish, options) File "/usr/lib/python2.7/dist-packages/gbp/scripts/pq_rpm.py", line 211, in update_patch_series spec.specdir, options) File "/usr/lib/python2.7/dist-packages/gbp/scripts/pq_rpm.py", line 144, in generate_patches options.patch_export_ignore_path) File "/usr/lib/python2.7/dist-packages/gbp/scripts/common/pq.py", line 290, in format_diff text=True) File "/usr/lib/python2.7/dist-packages/gbp/git/repository.py", line 1813, in diff output, stderr, ret = self._git_inout('diff', options.args) File "/usr/lib/python2.7/dist-packages/gbp/git/repository.py", line 187, in _git_inout capture_stdout): File "/usr/lib/python2.7/dist-packages/gbp/git/repository.py", line 245, in __git_inout cwd=cwd) File "/usr/lib/python2.7/subprocess.py", line 679, in __init__ errread, errwrite) File "/usr/lib/python2.7/subprocess.py", line 1252, in _execute_child raise child_exception TypeError: execv() arg 2 must contain only strings To fix this let's add each filepath as a seprate record as git diff command will understand our intentions perfectly. Change-Id: I4955bf341147d84880fb2aac49b19a290f1465e5 Signed-off-by: Krzysztof Opasiak <k.opasiak@samsung.com>
2016-07-25Handle conflicts from git merge masterdevel_psk_20160727SoonKyu Park12-282/+182
Change-Id: I9dfa02fb546a04f97aade855615ad2843790a2c1
2016-06-11Revert "buildpackage-rpm: always create tarball for native packages"Markus Lehtonen1-1/+1
Fixes: DEVT-215 This reverts commit efc490c4a8da5ce7a0bd1bf4a20009c3a445bb47. Change-Id: I2109f7ff48384a3b1190a73a3471bdc67f6d2427 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2016-05-24Add tar extract patches to solve bad message generated by git(2.7.4) mailinfoyang.zhang1-0/+9
Change-Id: Iaca480434f5f59d9b3cc66e477a9ea9c5c08c276
2016-05-101. Reset to 0.27debian/0.7.4Jun Wang1-10/+0
2. Keep same code with latest release Change-Id: I30588773b0a039c9f5002bf65b5c768a16fb7935
2016-05-10Remove unused functionsJun Wang1-30/+0
Change-Id: I7cfa375f77ccc068fb5107d334e6b5fe1511cda5
2016-03-09Use vendor to publish in srpm unpackJun Wang3-77/+84
Change-Id: I02f5d8cc11a268c7dd075da6e0064d3fedf72721
2016-03-09add compose_version_str functionJun Wang1-1/+30
Change-Id: Id1944627b2ec5cf450c978f77002c72d46206572
2016-03-08Check devel branch codes to be good from latest release tizen/0.6.27-20160302Jun Wang8-204/+98
Change-Id: I87f32c6b28b8835c09004530d7e6e429143dc4bf
2016-02-29Fix errors logs when __import__ faild,like "No handlers could be found fo ↵Jun Wang2-2/+3
logger" Change-Id: I785e402e13879c6010780d3a453ea78956833fe1
2016-02-29fix gbp.log error in opensuseJun Wang1-2/+2
Change-Id: I1fc96948cbd8da9a6325b67ab511ae2c6a199c6e
2015-02-17log: don't crash getLogger if getting the root loggerMarkus Lehtonen1-1/+1
The root logger won't have the gbp-specific default_handlers attribute. Change-Id: I0b81fdfbe70fe16ce3fd226248b83a4f6a17fc7f Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-12-19Introduce submit-bb toolMarkus Lehtonen2-0/+145
This is a Tizen-specific tool for creating and pushing special submit tags. Change-Id: Id014ce2aeced75f6506cd8559adcd787f958e6b4 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-12-19GitRepository.create_tag: add 'annotate' argumentMarkus Lehtonen1-2/+6
For forcing the creation of annotated tags. Causes the an editor to be spawned if no message is given. Change-Id: I8ec7e195cf7ae997606af1d887f04e84a14b2abc Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-12-19GitRepository.create_tag: use GitArgs classMarkus Lehtonen1-7/+7
Change-Id: I8ead4dda504152bde4c35ee0c03d6e3295820fd6 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-12-19Introcude clone-bb toolMarkus Lehtonen3-40/+215
This is a new tool for helping to clone remote per-package Git repositories when working in BitBake-based "full distro" build environment. This is useful in the case that individual packages are actually maintained in per-package Git repositories (like Tizen). That is, the full distro repository that the developer operates in is composed of the packaging meta data from the individual per-package repositories. When willing to contribute to a package the developer would use clone-bb to clone the correct per-package repository and make his changes there. NOTE: clone-bb uses GBP_PACKAGING_REPO variable to determine the remote repository URI. This variable should be defined in the package recipes in order to make clone-bb usable. Change-Id: I95fb3aa907dc78c55e042f16282a139d5ff3ce2a Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-12-19Introduce buildpackage-bb toolMarkus Lehtonen4-8/+553
Initial version of the tool for building BitBake packages from Git. NOTE: The buildpackage-bb tool itself is able to operate even without an initialized BitBake build environment although the build likely fails in this case. However, this makes it possible to export the packaging meta data, for example. Change-Id: I86204e477308da51f71fab76150ede4bd90e4d6e Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-12-19Introduce pq-bb toolMarkus Lehtonen3-9/+835
This is a tool for managing patch-queues for packages maintained in the BitBake packaging format (.bb recipes). Change-Id: I7c2815c05495deb731106fbfea911494ac4984ac Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-12-19Introduce import-bb toolMarkus Lehtonen3-0/+537
This is the first tool in an effort of enabling gbp in the BitBake build environment. Gbp-import-bb is a tool for importing packages from a BitBake-based "combined" distro repository into individual per-package Git repositories. Change-Id: I86e27d8a1817eae30c3f828cea70b06162543000 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-12-18log: don't initialize handlers in GbpLogger initMarkus Lehtonen1-11/+19
Better compatibility with 3rd party modules that have their own logging initializations. Change-Id: Ic91ab54c70537061c3e76dd6317ceeec888fab36 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-12-18patchseries: strip numbering when guessing subject from filenameMarkus Lehtonen1-1/+7
Change-Id: I58c4f8871411dae15d0e0e4246f0eebe65e3967d Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-12-03UpstreamSource: suppress stderr from tar in _determine_prefix()Markus Lehtonen1-1/+1
Change-Id: I3a0e51de2114e2aa9f9a12c41a9ed4c242fa2127 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-12-03rpm: suppress stderr when unpacking src.rpmMarkus Lehtonen1-1/+1
Change-Id: I055e94f905048141268ceb9172b4e10fcb5cdc58 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-21buildpackage-rpm: look for remote upstream branchesMarkus Lehtonen1-1/+11
Consider remote branches, too, while looking for the upstream branch when trying to guess if a package is native or not. Change-Id: I3dbbb49816d1d294d81209ea5ab5870e053fd66a Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14Tizen: change python-rpm module name to rpm_tizenMarkus Lehtonen1-1/+1
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14log: don't propagate to ancestor loggersMarkus Lehtonen1-0/+2
Change-Id: I6548dcfe5ba2f779b9d9244ad1eb88fa92c2180e Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14GitRepository/__git_inout: correctly handle input errorMarkus Lehtonen1-1/+6
Change-Id: I3c9b8851490c05719f77a9519418a98f572d68e3 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14pq-rpm: better error messageMarkus Lehtonen1-1/+1
Change-Id: Iaadc614e9ed5df2e943eed71511559d0b76e0227 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: fix one error messageMarkus Lehtonen1-1/+2
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: drop unneeded exceptionMarkus Lehtonen1-3/+0
We will never get here as parse_spec() always returns GbpError. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: handle invalid keys in orig prefixMarkus Lehtonen1-4/+7
Gracefully handle invalid keys in the --git-orig-prefix format string. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: minor refactorMarkus Lehtonen1-7/+4
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: get rid of prepare_export_dir()Markus Lehtonen1-7/+1
No need to mangle the export directory. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: remove some outdated/unnecessary exception handlingMarkus Lehtonen1-5/+0
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: add '--git-native' optionMarkus Lehtonen2-3/+8
Can be used to explicitly configure a package as native or non-native. Default behavior is still to guess based on the existence of upstream branch. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: remove some unused variablesMarkus Lehtonen1-5/+1
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: add missing docstringsMarkus Lehtonen1-0/+5
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: remove unused importsMarkus Lehtonen1-5/+2
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: remove too general exception catchingMarkus Lehtonen1-3/+0
There should be no reason to catch general Exception here. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: don't crash on invalid vcs format stringsMarkus Lehtonen1-1/+4
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: add --git-no-build optionMarkus Lehtonen1-1/+10
Replaces and deprecates --git-export-only. The new option name is way better in line with the other option names. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage_rpm: always run cleaner hookMarkus Lehtonen1-2/+1
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage_rpm: fix crash when running prebuild hookMarkus Lehtonen1-1/+1
GitRepository.git_dir is not callable. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage_rpm: check submodules from the exported treeishMarkus Lehtonen1-1/+1
And not from the current working copy. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: always create tarball for native packagesMarkus Lehtonen1-1/+1
If the package is native, always (re-)create the source tarball, even if --git-no-create-orig is used. Not creating the tarball does not make much sense (and most probably just causes problems and confusion): for native packages there is no place for external tarball and no patches so we need to always have the correct sources (i.e. the exported revision) in the tarball. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14buildpackage-rpm: fix exit code in case of GitRepositoryErrorMarkus Lehtonen1-1/+1
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14rpm-ch: implement --meta-bts optionMarkus Lehtonen3-8/+14
This gives the user the possibility to define what meta tags (in git commit message) git-rpm-ch recognizes as bug tracking system references. Or, makes it possible to disable bts meta tag tracking altogether. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
2014-11-14rpm-ch: implement --commit-msg optionMarkus Lehtonen1-4/+18
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 13:17:22 +0000