tools/git-buildpackage.git
8 years agoadd tag debian/0.6.27 debian/0.6.28
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>
8 years agofix spec and control error
Jun Wang [Tue, 8 Mar 2016 11:03:06 +0000 (19:03 +0800)]
fix spec and control error

Change-Id: Ia455b5475e56ff2344cba8ac3d5c47da9e306c29

8 years agofix .gitignore file
Jun Wang [Tue, 8 Mar 2016 10:50:48 +0000 (18:50 +0800)]
fix .gitignore file

Change-Id: I3ff293da5b50301425c327d044d8e7b3b4f81a80

8 years agoMake new tag in devel
Jun Wang [Tue, 8 Mar 2016 10:18:58 +0000 (18:18 +0800)]
Make new tag in devel

Change-Id: Idc6a43b5a475733ad8568d041384319157db9a5c

8 years agoCheck devel branch codes to be good from latest release tizen/0.6.27-20160302
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

8 years agoFix build errors in CentOS7
Jun Wang [Wed, 2 Mar 2016 19:52:52 +0000 (03:52 +0800)]
Fix build errors in CentOS7

Change-Id: I4c690c005d23f4b184a0aa7ee3cf2306ad3cf3ad

8 years agochange version files to match 0.6.27
Jun Wang [Wed, 2 Mar 2016 10:33:22 +0000 (18:33 +0800)]
change version files to match 0.6.27

Change-Id: I6dc3023b4bccffef4f0113229ae0eaf4ddcfc74f

8 years agoupgrade to 0.6.27
Jun Wang [Wed, 2 Mar 2016 09:50:03 +0000 (17:50 +0800)]
upgrade to 0.6.27

Change-Id: I4b29f41472de96278396ed0692e82e214fa9085a

8 years agoupgrade to 0.6.26
Jun Wang [Wed, 2 Mar 2016 09:44:57 +0000 (17:44 +0800)]
upgrade to 0.6.26

Change-Id: Id72b3231c078edd97ea5994b6ccd00ffb7d71162

8 years agochange login user name to jenkins
Jun Wang [Wed, 2 Mar 2016 09:31:13 +0000 (17:31 +0800)]
change login user name to jenkins

Change-Id: I99cb7dd3fb8242dc1542a392dd365a851011d481

8 years agochange to SRC-Nanjing Local server for tests resource
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

8 years agochange to local sources for tests files
Jun Wang [Wed, 2 Mar 2016 08:47:08 +0000 (16:47 +0800)]
change to local sources for tests files

Change-Id: I8cf81926791323039b0b4150931aad3c658ed526

8 years agoFix errors logs when __import__ faild,like "No handlers could be found fo logger"
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

8 years agofix gbp.log error in opensuse
Jun Wang [Wed, 3 Feb 2016 15:40:55 +0000 (23:40 +0800)]
fix gbp.log error in opensuse

Change-Id: I1fc96948cbd8da9a6325b67ab511ae2c6a199c6e

8 years agoUpdate the version to 0.6.26
Jun Wang [Tue, 2 Feb 2016 15:16:52 +0000 (23:16 +0800)]
Update the version to 0.6.26

Change-Id: Ia8f0e526da0ecc9d765614fe5b3daf37c08e9171

8 years agofix build problem on Debian_8
Jun Wang [Fri, 29 Jan 2016 08:30:03 +0000 (16:30 +0800)]
fix build problem on Debian_8

Change-Id: I145928ae1416f7847b4d8e6729c1daf07e2ab757

9 years agolog: don't crash getLogger if getting the root logger
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>
9 years agoTizen release 0.6.22-20150206 tizen/0.6.22-20150206
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>
9 years agoIntroduce submit-bb tool
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>
9 years agoGitRepository.create_tag: add 'annotate' argument
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>
9 years agoGitRepository.create_tag: use GitArgs class
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>
9 years agoIntrocude clone-bb tool
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>
9 years agoIntroduce buildpackage-bb tool
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>
9 years agoIntroduce pq-bb tool
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>
9 years agoIntroduce import-bb tool
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>
9 years agolog: don't initialize handlers in GbpLogger init
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>
9 years agorpm packaging: include python egg-info in -common
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>
9 years agopatchseries: strip numbering when guessing subject from filename
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>
9 years agoUpstreamSource: suppress stderr from tar in _determine_prefix()
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>
9 years agorpm: suppress stderr when unpacking src.rpm
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>
9 years agobuildpackage-rpm: look for remote upstream branches
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>
9 years agorpm tests: use eq_ and ok_ from nose tools
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>
9 years agoTizen: change python-rpm module name to rpm_tizen
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>
9 years agolog: don't propagate to ancestor loggers
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>
9 years agorpm packaging: enable CentOS 7
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>
9 years agoGitRepository/__git_inout: correctly handle input error
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>
9 years agopq-rpm: better error message
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>
9 years agoreadme: we do have manpages for rpm tools
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>
9 years agopackaging: rebase on top of upstream version 0.6.22
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>
9 years agoTizen release 0.6.15-20140828
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>
9 years agoAdd PKGBUILD to support arch linux
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>
9 years agorpm tests: add unit tests for buildpackage-rpm
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>
9 years agobuildpackage-rpm: fix one error message
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>
9 years agobuildpackage-rpm: drop unneeded exception
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>
9 years agobuildpackage-rpm: handle invalid keys in orig prefix
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>
9 years agobuildpackage-rpm: minor refactor
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>
9 years agobuildpackage-rpm: get rid of prepare_export_dir()
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>
9 years agobuildpackage-rpm: remove some outdated/unnecessary exception handling
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>
9 years agobuildpackage-rpm: add '--git-native' option
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>
9 years agobuildpackage-rpm: remove some unused variables
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>
9 years agobuildpackage-rpm: add missing docstrings
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>
9 years agobuildpackage-rpm: remove unused imports
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>
9 years agorpm tests: update component test data
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>
9 years agorpm tests: remove RepoManifest.add_project()
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>
9 years agobuildpackage-rpm: remove too general exception catching
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>
9 years agobuildpackage-rpm: don't crash on invalid vcs format strings
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>
9 years agobuildpackage-rpm: add --git-no-build option
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>
9 years agobuildpackage_rpm: always run cleaner hook
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>
9 years agobuildpackage_rpm: fix crash when running prebuild hook
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>
9 years agobuildpackage_rpm: check submodules from the exported treeish
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>
9 years agobuildpackage-rpm: always create tarball for native packages
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>
9 years agobuildpackage-rpm: fix exit code in case of GitRepositoryError
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>
9 years agorpm-ch: implement --meta-bts option
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>
9 years agorpm-ch: implement --commit-msg option
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>
9 years agorpm-ch: implement --commit option
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>
9 years agobuildpackage-rpm: new 'commitish' keyword for spec vcs tag
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>
9 years agodocs: manpages for the rpm tools
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>
9 years agoTizen release 0.6.12-20140521
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>
9 years agopq-rpm: don't create pq branch when switching
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>
9 years agopackaging: Prepare for next Tizen tools release
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>
9 years agopq-rpm: implement --retain-history option
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>
9 years agopq-rpm: implement --new-packaging-dir cmdline option
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>
9 years agopq-rpm: implement 'convert' subcommand
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>
9 years agobuildpackage-rpm: patch-export from development branch
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>
9 years agoimport-orig-rpm: get archive from spec file
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>
9 years agoimport-orig-rpm: implement automatic downloading
Markus Lehtonen [Thu, 13 Feb 2014 10:41:39 +0000 (12:41 +0200)]
import-orig-rpm: implement automatic downloading

Automatically try to download the archive if the archive filename points
to a remote location.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agoimport-orig-rpm: implement --create-missing-branches option
Markus Lehtonen [Wed, 12 Feb 2014 13:11:30 +0000 (15:11 +0200)]
import-orig-rpm: implement --create-missing-branches option

Create the upstream branch if it does not exist. Use the same option
name that import-srpm has.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agorpm-ch: add unit tests for the command line tool
Markus Lehtonen [Tue, 25 Feb 2014 10:20:24 +0000 (12:20 +0200)]
rpm-ch: add unit tests for the command line tool

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agorpm-ch: implement '--all' option
Markus Lehtonen [Fri, 16 May 2014 11:26:49 +0000 (14:26 +0300)]
rpm-ch: implement '--all' option

If defined, git-rpm-ch uses all commits in the Git history. Also,
'--since' option is omitted.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agorpm-ch: add --message cmdline option
Markus Lehtonen [Wed, 26 Mar 2014 07:01:28 +0000 (09:01 +0200)]
rpm-ch: add --message cmdline option

For giving the text for new changelog entry/entries, skipping git commit
messages entirely.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agorpm-ch: make it possible to commit/tag the changes
Markus Lehtonen [Thu, 6 Feb 2014 09:35:42 +0000 (11:35 +0200)]
rpm-ch: make it possible to commit/tag the changes

Implement '--tag' command line option (and other related options for
signing) for creating and tagging a release. These correspond the
tagging options in git-buildpackage-rpm.

The git-buildpackage-rpm tool does not commit anything to git. However,
in rpm-ch the '--tag' option causes the changelog modifications (and,
all other staged changes) to be committed to git before creating the
tag. This makes it possible to create a release and document the
packaging/release tag name in the rpm changelog.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agoIntroduce git-rpm-ch tool
Markus Lehtonen [Tue, 4 Feb 2014 15:54:36 +0000 (17:54 +0200)]
Introduce git-rpm-ch tool

Initial version of the git-rpm-ch tool which is intended for maintaining
RPM changelogs. Supports both spec files and separate "OBS style"
changelog files.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agorpm: add gbp.rpm.changelog module
Markus Lehtonen [Tue, 4 Feb 2014 15:49:28 +0000 (17:49 +0200)]
rpm: add gbp.rpm.changelog module

This new module contains basic containers and functionality for parsing
and updating rpm changelogs. It is coupled with the rpm packaging policy
class which now has definitions for rpm changelog formatting.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agopq-rpm: add unit tests for the command line tool
Markus Lehtonen [Fri, 27 Sep 2013 08:16:39 +0000 (11:16 +0300)]
pq-rpm: add unit tests for the command line tool

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agorpm-tests: add RepoManifest class
Markus Lehtonen [Wed, 2 Oct 2013 09:35:22 +0000 (12:35 +0300)]
rpm-tests: add RepoManifest class

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agopq-rpm: implement '--import-files' command line option
Markus Lehtonen [Tue, 10 Dec 2013 13:25:32 +0000 (15:25 +0200)]
pq-rpm: implement '--import-files' command line option

For defining the packaging file(s) that will be imported into the
development/patch-queue branch.

By default, the local gbp conf files are imported in order to try to
ensure that gbp sees the same settings on the development/pq branch as
on the packaging branch.

NOTE: This option does not affect the patch files that are imported. The
files defined with this option will appear as new files in one
monolithic commit in the development/patch-queue branch.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agopq-rpm: bigger refactor of the code
Markus Lehtonen [Thu, 19 Sep 2013 13:22:57 +0000 (16:22 +0300)]
pq-rpm: bigger refactor of the code

Support '%(upstreamversion)s' as a replacable string in the pq branch
name.

Eliminate some unneeded branch switches that were only needed for
finding/parsing the spec file. Now, spec file is directly searched from
the git repository (from the 'base' branch) if the command is run when
on the pq branch - except for the 'export' subcommand which always
switches to the base branch.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agopackaging: Prepare for next Tizen tools release
Markus Lehtonen [Mon, 2 Dec 2013 11:01:13 +0000 (13:01 +0200)]
packaging: Prepare for next Tizen tools release

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agopq-rpm: create diff up to the last merge commit
Markus Lehtonen [Thu, 21 Nov 2013 15:25:37 +0000 (17:25 +0200)]
pq-rpm: create diff up to the last merge commit

Before, merge commits broke patch generation, or, (most probably) caused
the generated patches to be unapplicable (similar to how
git-format-patch behaves).

Now, changes up to the last merge commit are squashed into one diff if
merge commits are found in the revision list from which patches are to
be generated. Individual patches (one per commit) are generated from the
last merge commit up to the exported revision.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agopackaging: Release, update changelogs
Markus Lehtonen [Wed, 16 Oct 2013 08:07:10 +0000 (11:07 +0300)]
packaging: Release, update changelogs

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agorpm: support guessing spec file from git treeish
Markus Lehtonen [Fri, 6 Sep 2013 13:07:08 +0000 (16:07 +0300)]
rpm: support guessing spec file from git treeish

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agorpm: change guess_spec() to return SpecFile object
Markus Lehtonen [Fri, 6 Sep 2013 13:43:23 +0000 (16:43 +0300)]
rpm: change guess_spec() to return SpecFile object

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agoGitRepository/get_remote_repos: return URLs, too
Markus Lehtonen [Mon, 3 Dec 2012 08:21:43 +0000 (10:21 +0200)]
GitRepository/get_remote_repos: return URLs, too

In addition to the remote name, return remote URLs. Return value is now
a dict with remote name as the key and a list of URLs as the value. The
first value in the list is the effective fetch URL, the rest of the
values are push URLs.

NOTE! This patch is to be dropped, not going for upstream.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agodebian packaging: change to 1.0 source package format
Markus Lehtonen [Mon, 2 Sep 2013 11:56:57 +0000 (14:56 +0300)]
debian packaging: change to 1.0 source package format

Changes package to be non-native (assuming debian/changelog has version
in correct format).

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agopackaging: Update changelogs
Markus Lehtonen [Mon, 2 Sep 2013 11:46:30 +0000 (14:46 +0300)]
packaging: Update changelogs

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agopackaging: Release, update changelogs
Markus Lehtonen [Thu, 25 Oct 2012 06:35:46 +0000 (09:35 +0300)]
packaging: Release, update changelogs

Add rpm changelog. Start providing proper changelogs for Tizen Tools
releases.

Also, make it easier to track Tizen releases:
- RPM: Add a 'Provides:' tag to the git-buildpackage-rpm subpackage in
  order to be able to track Tizen releases.
- DEB: Change the package to non-native, by adding a corresponding
  release number to the version field in changelog of Debian packaging.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agotests: add tests for git-import-orig-rpm
Markus Lehtonen [Wed, 31 Oct 2012 15:27:58 +0000 (17:27 +0200)]
tests: add tests for git-import-orig-rpm

Basic tests for virtually all features of import-orig-rpm.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agoCentOS compatibility: fix GitRepository.diff
Markus Lehtonen [Fri, 8 Nov 2013 10:37:51 +0000 (12:37 +0200)]
CentOS compatibility: fix GitRepository.diff

Remove the "all" parameter from --ignore-submodules which is not
supported by the old Git version of CentOS 6 (besides, it's the default,
anyway)

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agoCentOS compatibility: disable Debian tools
Markus Lehtonen [Wed, 24 Apr 2013 11:08:19 +0000 (14:08 +0300)]
CentOS compatibility: disable Debian tools

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
9 years agoCentOS compatibility: fix GitRepository._cmd_has_feature()
Markus Lehtonen [Mon, 4 Mar 2013 11:17:24 +0000 (13:17 +0200)]
CentOS compatibility: fix GitRepository._cmd_has_feature()

Make it work in CentOS 6.3 with older git by removing backspace
characters when examining man page section names.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>