aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-07-18 16:05:29 +0300
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2014-07-21 11:55:32 +0300
commit2c413c87e674e63bbd02ffaaacce22d5370bf82e (patch)
tree21fe6b09859f0b44500f19323a1c9ce80ba4385d
parenta3cadd3afaec7fce38077ab7518363e1f60cf35c (diff)
Add dummy binary RPMs
Reference RPMs for buildpackage testing. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
-rwxr-xr-xbootstrap.py14
-rw-r--r--rpm/gbp-test-1.0-1.noarch.rpmbin0 -> 3391 bytes
-rw-r--r--rpm/gbp-test-1.1-1.noarch.rpmbin0 -> 3387 bytes
-rw-r--r--rpm/gbp-test-1.1-2.noarch.rpmbin0 -> 3657 bytes
-rw-r--r--rpm/gbp-test-native-1.0-1.noarch.rpmbin0 -> 3028 bytes
-rw-r--r--rpm/gbp-test-native2-2.0-0.noarch.rpmbin0 -> 2166 bytes
-rw-r--r--rpm/gbp-test2-2.0-0.noarch.rpmbin0 -> 2965 bytes
-rw-r--r--rpm/gbp-test2-2.0-1.noarch.rpmbin0 -> 2965 bytes
8 files changed, 10 insertions, 4 deletions
diff --git a/bootstrap.py b/bootstrap.py
index 4ba61cf..9d86b79 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -109,8 +109,9 @@ def do_build(tag, builddir, silent_build=False):
"""Run git-buildpackage-rpm"""
gbp_opts = ['--git-ignore-new','--git-export=%s' % tag,
'--git-export-dir=%s' % builddir, '--git-ignore-branch']
- ret, out, _err = run_cmd('git-buildpackage-rpm', gbp_opts, True,
- silent_build)
+ rpmbuild_opts = ['-ba', '--target=noarch']
+ ret, out, _err = run_cmd('git-buildpackage-rpm', gbp_opts + rpmbuild_opts,
+ True, silent_build)
if ret:
for line in out:
print line
@@ -148,12 +149,17 @@ def build_test_pkg(pkg_name, branch, outdir, silent_build=False):
# Create subdirs
orig_dir = '%s/%s' % (outdir, 'orig')
- if not os.path.isdir(orig_dir):
- os.mkdir(orig_dir)
+ rpm_dir = '%s/%s' % (outdir, 'rpm')
+ for path in (orig_dir, rpm_dir):
+ if not os.path.isdir(path):
+ os.mkdir(path)
for fname in glob('%s/SRPMS/*rpm' % builddir):
LOG.debug('Copying %s -> %s', fname, outdir)
shutil.copy(fname, outdir)
+ for fname in glob('%s/RPMS/*/*rpm' % builddir):
+ LOG.debug('Copying %s -> %s', fname, rpm_dir)
+ shutil.copy(fname, rpm_dir)
for fname in os.listdir('%s/SOURCES' % builddir):
if (fnmatch(fname, 'gbp*tar.gz') or fnmatch(fname, 'gbp*tar.bz2') or
fnmatch(fname, 'gbp*zip')):
diff --git a/rpm/gbp-test-1.0-1.noarch.rpm b/rpm/gbp-test-1.0-1.noarch.rpm
new file mode 100644
index 0000000..45b2a3d
--- /dev/null
+++ b/rpm/gbp-test-1.0-1.noarch.rpm
Binary files differ
diff --git a/rpm/gbp-test-1.1-1.noarch.rpm b/rpm/gbp-test-1.1-1.noarch.rpm
new file mode 100644
index 0000000..435c1c3
--- /dev/null
+++ b/rpm/gbp-test-1.1-1.noarch.rpm
Binary files differ
diff --git a/rpm/gbp-test-1.1-2.noarch.rpm b/rpm/gbp-test-1.1-2.noarch.rpm
new file mode 100644
index 0000000..e19dc04
--- /dev/null
+++ b/rpm/gbp-test-1.1-2.noarch.rpm
Binary files differ
diff --git a/rpm/gbp-test-native-1.0-1.noarch.rpm b/rpm/gbp-test-native-1.0-1.noarch.rpm
new file mode 100644
index 0000000..14ebba6
--- /dev/null
+++ b/rpm/gbp-test-native-1.0-1.noarch.rpm
Binary files differ
diff --git a/rpm/gbp-test-native2-2.0-0.noarch.rpm b/rpm/gbp-test-native2-2.0-0.noarch.rpm
new file mode 100644
index 0000000..752c94a
--- /dev/null
+++ b/rpm/gbp-test-native2-2.0-0.noarch.rpm
Binary files differ
diff --git a/rpm/gbp-test2-2.0-0.noarch.rpm b/rpm/gbp-test2-2.0-0.noarch.rpm
new file mode 100644
index 0000000..97cf265
--- /dev/null
+++ b/rpm/gbp-test2-2.0-0.noarch.rpm
Binary files differ
diff --git a/rpm/gbp-test2-2.0-1.noarch.rpm b/rpm/gbp-test2-2.0-1.noarch.rpm
new file mode 100644
index 0000000..4b1a3cc
--- /dev/null
+++ b/rpm/gbp-test2-2.0-1.noarch.rpm
Binary files differ