Jun Wang [Tue, 20 Dec 2016 08:05:32 +0000 (16:05 +0800)]
Adapt git-merge option when git version greater then 2.9
Change-Id: Icd9cb9edc8517095984c0a0f497173e2f068aa20
Jiankang Fan [Wed, 28 Sep 2016 02:26:09 +0000 (10:26 +0800)]
GitRepository: Fix diff_status() for renames and copies
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>
SoonKyu Park [Thu, 16 Jun 2016 08:32:15 +0000 (17:32 +0900)]
Handle conflicts from git merge release-
20160531
Change-Id: I1cae90068ab2576d756188e36e112550c7c293de
Jun Wang [Tue, 7 Jun 2016 09:34:47 +0000 (17:34 +0800)]
Disbale test_create_branches unit case
Change-Id: I1802461d5081aa6c14455ec955505cf4e8baf825
Jun Wang [Fri, 27 May 2016 02:51:27 +0000 (10:51 +0800)]
Change .gitmodules to suit HQ gerrit projects
Change-Id: Ib57a6faac63412baad9a65e961d10bfafe28012b
yang.zhang [Tue, 24 May 2016 06:11:25 +0000 (14:11 +0800)]
Add tar extract patches to solve bad message generated by git(2.7.4) mailinfo
Change-Id: Iaca480434f5f59d9b3cc66e477a9ea9c5c08c276
Jun Wang [Wed, 18 May 2016 03:46:57 +0000 (11:46 +0800)]
Due to Ubuntu 16.04 provide git-buildpackage with latest version 0.7.2,
so we need update local version number to 0.7.4(latest) and make sure
gbs has same local codes.
Change-Id: I6791a61abe765a994ef28461f236137a3d979d2a
Jun Wang [Tue, 10 May 2016 07:03:01 +0000 (15:03 +0800)]
1. Reset to 0.27
2. Keep same code with latest release
Change-Id: I30588773b0a039c9f5002bf65b5c768a16fb7935
Jun Wang [Tue, 10 May 2016 14:07:07 +0000 (14:07 +0000)]
Merge "Remove unused functions" into devel
Jun Wang [Tue, 10 May 2016 06:03:50 +0000 (14:03 +0800)]
Remove unused functions
Change-Id: I7cfa375f77ccc068fb5107d334e6b5fe1511cda5
shuai.fu [Tue, 10 May 2016 05:51:00 +0000 (13:51 +0800)]
Add tests/component/rpm/data and tests/component/deb/data
Signed-off-by: shuai.fu <shuai01.fu@samsung.com>
Change-Id: I850ffbab50fa949be56a3e35665e80bc51d06adf
SoonKyu Park [Mon, 11 Apr 2016 04:21:01 +0000 (13:21 +0900)]
Handle conflicts from git merge release-
20160315
SoonKyu Park [Fri, 8 Apr 2016 05:19:55 +0000 (14:19 +0900)]
change testdata's gerrit server IP to review.tizen.org
Change-Id: Ie4a8ad352400f8196cb8bd544a506e5b8ae484b7
Jun Wang [Mon, 21 Mar 2016 16:23:09 +0000 (00:23 +0800)]
1.Change to way to get test data dirctory
2.Fix the error of indent in tests/20_test_rpm.py
3.Change to vendor tag
Change-Id: Ia9520a6c441fa9d34eff76c96a41764f3fb0ba76
Jun Wang [Mon, 21 Mar 2016 11:34:15 +0000 (19:34 +0800)]
Fix 20_test_rpm.py to suit different edition of python.
Change-Id: Ibe03d1614fafb5ceb01af634da90eda8d1426fbd
Jun Wang [Fri, 18 Mar 2016 13:49:38 +0000 (21:49 +0800)]
Modify unit test cases which called 'assert_raises' function
to fix pre-review test bugs on CentOS_6.
Change-Id: Ibb930eb107c18526876fc58428db359f9d31e716
Jun Wang [Wed, 9 Mar 2016 14:43:29 +0000 (22:43 +0800)]
Use vendor to publish in srpm unpack
Change-Id: I02f5d8cc11a268c7dd075da6e0064d3fedf72721
Jun Wang [Wed, 9 Mar 2016 10:44:48 +0000 (18:44 +0800)]
add compose_version_str function
Change-Id: Id1944627b2ec5cf450c978f77002c72d46206572
Jun Wang [Wed, 9 Mar 2016 10:35:44 +0000 (18:35 +0800)]
fix change log date error
Change-Id: Icc99e018aac3b06bb2d16049ca2849e6eab5eeed
Jun Wang [Wed, 9 Mar 2016 09:34:20 +0000 (17:34 +0800)]
change version to 0.6.28 in devel branch
Change-Id: I51379cbfa73533f9c7737ad9ff16107e83129d83
admin [Tue, 8 Mar 2016 12:01:17 +0000 (20:01 +0800)]
add tag debian/0.6.27
Change-Id: I931ab6fa99ad1ee47fec90a8421e1185454da5ae
Signed-off-by: admin <yuhuan.yang@samsung.com>
Jun Wang [Tue, 8 Mar 2016 11:03:06 +0000 (19:03 +0800)]
fix spec and control error
Change-Id: Ia455b5475e56ff2344cba8ac3d5c47da9e306c29
Jun Wang [Tue, 8 Mar 2016 10:50:48 +0000 (18:50 +0800)]
fix .gitignore file
Change-Id: I3ff293da5b50301425c327d044d8e7b3b4f81a80
Jun Wang [Tue, 8 Mar 2016 10:18:58 +0000 (18:18 +0800)]
Make new tag in devel
Change-Id: Idc6a43b5a475733ad8568d041384319157db9a5c
Jun Wang [Tue, 8 Mar 2016 10:00:33 +0000 (18:00 +0800)]
Check devel branch codes to be good from latest release tizen/0.6.27-
20160302
Change-Id: I87f32c6b28b8835c09004530d7e6e429143dc4bf
Jun Wang [Wed, 2 Mar 2016 19:52:52 +0000 (03:52 +0800)]
Fix build errors in CentOS7
Change-Id: I4c690c005d23f4b184a0aa7ee3cf2306ad3cf3ad
Jun Wang [Wed, 2 Mar 2016 10:33:22 +0000 (18:33 +0800)]
change version files to match 0.6.27
Change-Id: I6dc3023b4bccffef4f0113229ae0eaf4ddcfc74f
Jun Wang [Wed, 2 Mar 2016 09:50:03 +0000 (17:50 +0800)]
upgrade to 0.6.27
Change-Id: I4b29f41472de96278396ed0692e82e214fa9085a
Jun Wang [Wed, 2 Mar 2016 09:44:57 +0000 (17:44 +0800)]
upgrade to 0.6.26
Change-Id: Id72b3231c078edd97ea5994b6ccd00ffb7d71162
Jun Wang [Wed, 2 Mar 2016 09:31:13 +0000 (17:31 +0800)]
change login user name to jenkins
Change-Id: I99cb7dd3fb8242dc1542a392dd365a851011d481
Jun Wang [Wed, 2 Mar 2016 09:00:06 +0000 (17:00 +0800)]
change to SRC-Nanjing Local server for tests resource
Change-Id: If618a5f54843f094c4444e4b9505e0de843e29e6
Jun Wang [Wed, 2 Mar 2016 08:47:08 +0000 (16:47 +0800)]
change to local sources for tests files
Change-Id: I8cf81926791323039b0b4150931aad3c658ed526
Jun Wang [Thu, 4 Feb 2016 15:05:20 +0000 (23:05 +0800)]
Fix errors logs when __import__ faild,like "No handlers could be found fo logger"
Change-Id: I785e402e13879c6010780d3a453ea78956833fe1
Jun Wang [Wed, 3 Feb 2016 15:40:55 +0000 (23:40 +0800)]
fix gbp.log error in opensuse
Change-Id: I1fc96948cbd8da9a6325b67ab511ae2c6a199c6e
Jun Wang [Tue, 2 Feb 2016 15:16:52 +0000 (23:16 +0800)]
Update the version to 0.6.26
Change-Id: Ia8f0e526da0ecc9d765614fe5b3daf37c08e9171
Jun Wang [Fri, 29 Jan 2016 08:30:03 +0000 (16:30 +0800)]
fix build problem on Debian_8
Change-Id: I145928ae1416f7847b4d8e6729c1daf07e2ab757
SoonKyu Park [Tue, 21 Jul 2015 06:30:40 +0000 (15:30 +0900)]
Upgrade version to 0.6.25-
20150721
Change-Id: Ie60ce2da01b79fc584240f41dc8047ed79a3886d
SoonKyu Park [Tue, 21 Jul 2015 06:04:59 +0000 (15:04 +0900)]
Document changes and release 0.6.25
Change-Id: I03a3dc5bdb419ca3eaff6993989b260b5ef2e960
Markus Lehtonen [Tue, 3 Mar 2015 14:03:11 +0000 (14:03 +0000)]
Tizen release 0.6.15-
20150303
Change-Id: I631e30aff42fd5acd90b1b3d535a0e38f00aaa12
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 2 Mar 2015 15:38:44 +0000 (17:38 +0200)]
Revert "buildpackage-rpm: always create tarball for native packages"
Fixes: DEVT-215
This reverts commit
efc490c4a8da5ce7a0bd1bf4a20009c3a445bb47.
Change-Id: I2109f7ff48384a3b1190a73a3471bdc67f6d2427
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 3 Mar 2015 15:23:42 +0000 (17:23 +0200)]
debian packaging: fix rpm build deps for Ubuntu 14.10
Dependencies of python-rpm got broken in Ubuntu 14.10 at the update to
rpm v4.11.2-3ubuntu0.1. This change is a work around for that.
Change-Id: I76a912e6e68b83e8e0d667fa881c6f35450c8b2c
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 17 Feb 2015 10:51:34 +0000 (12:51 +0200)]
log: don't crash getLogger if getting the root logger
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>
Markus Lehtonen [Fri, 6 Feb 2015 10:47:50 +0000 (10:47 +0000)]
Tizen release 0.6.22-
20150206
Change-Id: I26238668518048f1684563398f6d097b8c7dbbff
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 16 Dec 2014 17:19:30 +0000 (19:19 +0200)]
Introduce submit-bb tool
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>
Markus Lehtonen [Wed, 17 Dec 2014 15:39:59 +0000 (17:39 +0200)]
GitRepository.create_tag: add 'annotate' argument
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>
Markus Lehtonen [Wed, 17 Dec 2014 15:37:27 +0000 (17:37 +0200)]
GitRepository.create_tag: use GitArgs class
Change-Id: I8ead4dda504152bde4c35ee0c03d6e3295820fd6
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 16 Dec 2014 14:10:10 +0000 (16:10 +0200)]
Introcude clone-bb tool
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>
Markus Lehtonen [Thu, 28 Aug 2014 08:24:58 +0000 (11:24 +0300)]
Introduce buildpackage-bb tool
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>
Markus Lehtonen [Thu, 11 Sep 2014 12:28:48 +0000 (15:28 +0300)]
Introduce pq-bb tool
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>
Markus Lehtonen [Fri, 22 Aug 2014 13:17:49 +0000 (16:17 +0300)]
Introduce import-bb tool
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>
Markus Lehtonen [Thu, 11 Sep 2014 12:25:00 +0000 (15:25 +0300)]
log: don't initialize handlers in GbpLogger init
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>
Markus Lehtonen [Thu, 18 Dec 2014 11:55:08 +0000 (13:55 +0200)]
rpm packaging: include python egg-info in -common
We need this for the Python pkg_resources.
Change-Id: I74c7d466040279b8f34ec357b6947fa2f7c29a15
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 24 Nov 2014 17:12:37 +0000 (19:12 +0200)]
patchseries: strip numbering when guessing subject from filename
Change-Id: I58c4f8871411dae15d0e0e4246f0eebe65e3967d
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 3 Dec 2014 15:37:51 +0000 (17:37 +0200)]
UpstreamSource: suppress stderr from tar in _determine_prefix()
Change-Id: I3a0e51de2114e2aa9f9a12c41a9ed4c242fa2127
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 3 Dec 2014 14:40:46 +0000 (16:40 +0200)]
rpm: suppress stderr when unpacking src.rpm
Change-Id: I055e94f905048141268ceb9172b4e10fcb5cdc58
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 19 Nov 2014 15:19:20 +0000 (17:19 +0200)]
buildpackage-rpm: look for remote upstream branches
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>
Markus Lehtonen [Tue, 18 Nov 2014 14:57:24 +0000 (16:57 +0200)]
rpm tests: use eq_ and ok_ from nose tools
Provides better error messages as is more consistent as eq_ was already
used in some test cases.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 14 Nov 2014 06:30:32 +0000 (08:30 +0200)]
Tizen: change python-rpm module name to rpm_tizen
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 25 Sep 2014 09:02:56 +0000 (12:02 +0300)]
log: don't propagate to ancestor loggers
Change-Id: I6548dcfe5ba2f779b9d9244ad1eb88fa92c2180e
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 12 Sep 2014 13:31:20 +0000 (16:31 +0300)]
rpm packaging: enable CentOS 7
Fix dependencies and enable git-buildpackage(-deb) subpackage for
CentOS 7.
Also fixes one excess dependency for Fedora: no need for dpkg-devel,
dpkg-dev is enough.
Change-Id: I2c3929ae623c9694aa9afcb8a4e3155696179f05
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 12 Sep 2014 12:48:20 +0000 (15:48 +0300)]
GitRepository/__git_inout: correctly handle input error
Change-Id: I3c9b8851490c05719f77a9519418a98f572d68e3
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 4 Sep 2014 12:00:28 +0000 (15:00 +0300)]
pq-rpm: better error message
Change-Id: Iaadc614e9ed5df2e943eed71511559d0b76e0227
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 1 Sep 2014 13:10:52 +0000 (16:10 +0300)]
readme: we do have manpages for rpm tools
Change-Id: Ieeeb5dde264d220d4d457e077325c232bd3ec326
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 14 Nov 2014 12:08:58 +0000 (14:08 +0200)]
packaging: rebase on top of upstream version 0.6.22
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 5 Jun 2014 10:56:16 +0000 (13:56 +0300)]
Tizen release 0.6.15-
20140828
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Junchun Guan [Wed, 16 Jul 2014 03:28:29 +0000 (11:28 +0800)]
Add PKGBUILD to support arch linux
Three split packages: git-buildpackage-{common,rpm,doc}
Signed-off-by: Junchun Guan <junchunx.guan@intel.com>
Markus Lehtonen [Fri, 18 Jul 2014 13:18:58 +0000 (16:18 +0300)]
rpm tests: add unit tests for buildpackage-rpm
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 16 Jul 2014 19:13:29 +0000 (22:13 +0300)]
buildpackage-rpm: fix one error message
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 16 Jul 2014 14:16:48 +0000 (17:16 +0300)]
buildpackage-rpm: drop unneeded exception
We will never get here as parse_spec() always returns GbpError.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 16 Jul 2014 14:15:44 +0000 (17:15 +0300)]
buildpackage-rpm: handle invalid keys in orig prefix
Gracefully handle invalid keys in the --git-orig-prefix format string.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 16 Jul 2014 14:15:03 +0000 (17:15 +0300)]
buildpackage-rpm: minor refactor
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 15 Jul 2014 10:45:06 +0000 (13:45 +0300)]
buildpackage-rpm: get rid of prepare_export_dir()
No need to mangle the export directory.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 14 Jul 2014 07:41:36 +0000 (10:41 +0300)]
buildpackage-rpm: remove some outdated/unnecessary exception handling
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 15 Jul 2014 11:54:44 +0000 (14:54 +0300)]
buildpackage-rpm: add '--git-native' option
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>
Markus Lehtonen [Mon, 21 Jul 2014 12:57:57 +0000 (12:57 +0000)]
buildpackage-rpm: remove some unused variables
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 21 Jul 2014 12:39:12 +0000 (12:39 +0000)]
buildpackage-rpm: add missing docstrings
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 21 Jul 2014 12:29:36 +0000 (12:29 +0000)]
buildpackage-rpm: remove unused imports
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 18 Jul 2014 12:48:29 +0000 (15:48 +0300)]
rpm tests: update component test data
Adds pq/devel branch and .gitignore file to gbp-test package.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 10 Jun 2014 13:20:02 +0000 (16:20 +0300)]
rpm tests: remove RepoManifest.add_project()
This functionality is moved to the rpm testdata submodule.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 11 Jul 2014 12:41:45 +0000 (15:41 +0300)]
buildpackage-rpm: remove too general exception catching
There should be no reason to catch general Exception here.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 11 Jul 2014 12:40:59 +0000 (15:40 +0300)]
buildpackage-rpm: don't crash on invalid vcs format strings
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 11 Jul 2014 12:23:19 +0000 (15:23 +0300)]
buildpackage-rpm: add --git-no-build option
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>
Markus Lehtonen [Mon, 30 Jun 2014 14:46:41 +0000 (17:46 +0300)]
buildpackage_rpm: always run cleaner hook
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 30 Jun 2014 14:12:48 +0000 (17:12 +0300)]
buildpackage_rpm: fix crash when running prebuild hook
GitRepository.git_dir is not callable.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 27 Jun 2014 05:42:33 +0000 (08:42 +0300)]
buildpackage_rpm: check submodules from the exported treeish
And not from the current working copy.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 13 Jun 2014 10:31:48 +0000 (13:31 +0300)]
buildpackage-rpm: always create tarball for native packages
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>
Markus Lehtonen [Thu, 12 Jun 2014 12:42:21 +0000 (15:42 +0300)]
buildpackage-rpm: fix exit code in case of GitRepositoryError
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Fri, 6 Jun 2014 09:40:32 +0000 (12:40 +0300)]
rpm-ch: implement --meta-bts option
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>
Markus Lehtonen [Thu, 5 Jun 2014 14:25:25 +0000 (17:25 +0300)]
rpm-ch: implement --commit-msg option
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 5 Jun 2014 13:37:25 +0000 (16:37 +0300)]
rpm-ch: implement --commit option
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 2 Jun 2014 08:57:34 +0000 (11:57 +0300)]
buildpackage-rpm: new 'commitish' keyword for spec vcs tag
Add a new keyword '%(commitish)s' that can be used in the
--git-spec-vcs-tag option. This will be translated to the sha1 of the
commitish (i.e. tag or commit). That is, if you export a tag you will
get the sha1 of the tag object - not resolving to a commit object unlike
'%(commit)s' does.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 27 May 2014 07:09:36 +0000 (10:09 +0300)]
docs: manpages for the rpm tools
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 19 Mar 2014 13:31:19 +0000 (15:31 +0200)]
Tizen release 0.6.12-
20140521
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Wed, 9 Apr 2014 13:48:45 +0000 (16:48 +0300)]
pq-rpm: don't create pq branch when switching
Pq branch must be created with 'import'.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 7 Nov 2013 11:54:08 +0000 (13:54 +0200)]
packaging: Prepare for next Tizen tools release
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 31 Mar 2014 12:18:34 +0000 (15:18 +0300)]
pq-rpm: implement --retain-history option
With this option defined gbp tries to preserve the history when
converting. That is, for each commit in the old branch create one
corresponding commit in the new orphan packaging branch. This works by
dumping packaging files and updating patches for each commit. However,
empty commits are not generated - these are caused e.g. by changes in
files that are ignored by patch-generation.
NOTE! Only valid for the 'convert' action.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Tue, 11 Feb 2014 08:18:47 +0000 (10:18 +0200)]
pq-rpm: implement --new-packaging-dir cmdline option
Used for setting the packaging directory to be used in the new orphan
packaging branch. Defaults to --packaging-dir so that the gbp.conf files
are more likely to work without modification.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Mon, 10 Feb 2014 08:49:29 +0000 (10:49 +0200)]
pq-rpm: implement 'convert' subcommand
The new subcommand is intended to be a one-time-callable command for
converting a package to use the "orphan-packaging" development model and
git layout (where packaging files are maintained in a separate branch
and code development in another branch).
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 6 Feb 2014 13:24:54 +0000 (15:24 +0200)]
buildpackage-rpm: patch-export from development branch
Adds git-buildpackage-rpm --patch-export support for the 'orphan
packaging' development model (where packaging files and development sources are kept in separate
branches).
New functionality:
1. If patch-export is enabled and gbp detects that the current branch
has a development/patch-queue branch it exports the patches from there,
instead of the tip of the packaging branch.
2. If gbp detects that the current (or exported) branch is a
development/patch-queue branch it automatically enables patch-export
and exports packaging files from the base branch (instead of the
development/patch-queue branch.
Also, add a new '--git-patch-export-rev' command line option with which
the user can explicitly set the treeish from which patches are generated
(i.e. HEAD..<patch-export-rev>)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Markus Lehtonen [Thu, 13 Feb 2014 10:41:39 +0000 (12:41 +0200)]
import-orig-rpm: get archive from spec file
Try to get archive path/filename from spec file if no file name is given
on the command line. This should make version bumps more
straightforward: just update version number in the spec file and run
'git-import-orig-rpm'.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
projects / tools / git-buildpackage.git / log