diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2015-11-26 16:58:05 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2015-11-27 13:49:04 +0200 |
| commit | 09a446db2ffb101b1eac23c4f343b30682f55b9e (patch) | |
| tree | 4b8f3481b29ab892cf38138c838b5c3c55df39b1 /gbp-test2.data/Remove-imported-patches.patch | |
| parent | 1bf5c3ff0475e617fafbdec91c256ffb2647b02e (diff) | |
Simpler branch and tag naming in test repos
Removes the cumbersome srcdata/... prefixes from the branch and tag
names. Also, renames pristine_tar branches to pristine-tar as this
re-naming hack is not needed, anymore.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp-test2.data/Remove-imported-patches.patch')
| -rw-r--r-- | gbp-test2.data/Remove-imported-patches.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gbp-test2.data/Remove-imported-patches.patch b/gbp-test2.data/Remove-imported-patches.patch index cd91ca0..e41295c 100644 --- a/gbp-test2.data/Remove-imported-patches.patch +++ b/gbp-test2.data/Remove-imported-patches.patch @@ -15,15 +15,15 @@ Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> delete mode 100644 packaging/my3.patch diff --git a/.gbp.conf b/.gbp.conf -index 885f9bb..4af2c49 100644 +index 6c8e847..52a1267 100644 --- a/.gbp.conf +++ b/.gbp.conf -@@ -5,6 +5,7 @@ packaging-tag = srcdata/gbp-test2/release/%(version)s - upstream-branch = srcdata/gbp-test2/upstream - upstream-tag = srcdata/gbp-test2/upstream/%(upstreamversion)s +@@ -6,6 +6,7 @@ upstream-branch = upstream + upstream-tag = upstream/%(upstreamversion)s + packaging-tag-msg = %(vendor)s release %(version)s packaging-dir = packaging +patch-export = True - patch-export-ignore-path = ^(packaging/.*|\.gbp.conf) + patch-ignore-path = ^(packaging/.*|\.gbp.conf) spec-file = packaging/gbp-test2.spec diff --git a/packaging/gbp-test2.spec b/packaging/gbp-test2.spec |