From f9cc227e5b29b61fd5f24060fdf4578cf9fef49c Mon Sep 17 00:00:00 2001 From: Daniel Farrell Date: Wed, 29 Jun 2016 18:23:51 -0400 Subject: [PATCH] Remove flag to build all RPMs We now have many 10s of RPMs defined in build_vars, so it would be a horrible idea to build all of them. Remove that option. Change-Id: I844fecbd176434d2f32674004d48b6590499c448 Signed-off-by: Daniel Farrell --- rpm/README.markdown | 6 +----- rpm/build.py | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/rpm/README.markdown b/rpm/README.markdown index 544d1b5..0ec0947 100644 --- a/rpm/README.markdown +++ b/rpm/README.markdown @@ -139,18 +139,16 @@ build worked as expected. They can be installed in the Vagrant build box or another sandbox, then inspected. The `build.py` helper script can build a set of SRPMs/RPMs based on provided -version arguments or all defined builds. +version arguments. ``` [vagrant@localhost ~]$ /vagrant/build.py -h usage: build.py [-h] [-v [major minor patch rpm [major minor patch rpm ...]]] - [-a] optional arguments: -h, --help show this help message and exit -v [major minor patch rpm [major minor patch rpm ...]], --version [major minor patch rpm [major minor patch rpm ...]] RPM version(s) to build - -a, --all Build all RPMs ``` The `-v`/`--version` flag accepts a version number. Any build that matches @@ -164,8 +162,6 @@ To only build a single RPM definition, provide enough version info to make the match unique. For example, `build.py -v 2 4 0 1` could only match one definition (Helium SR4, 2.4.0-1). -To build all RPMs defined in `build_vars.yaml`, use `build.py -a`. - The `build.py` script uses the `cache/cache.py` script to handled downloading and caching the artifacts required for the requested builds. Artifacts are cached in the `packaging/rpm/cache/` directory. diff --git a/rpm/build.py b/rpm/build.py index c5d2842..e872d1c 100755 --- a/rpm/build.py +++ b/rpm/build.py @@ -102,8 +102,6 @@ if __name__ == "__main__": parser.add_argument("-v", "--version", action="append", metavar="major minor patch rpm", nargs="*", help="RPM version(s) to build") - parser.add_argument("-a", "--all", action="store_true", - help="Build all RPMs") # Print help if no arguments are given if len(sys.argv) == 1: @@ -115,9 +113,7 @@ if __name__ == "__main__": # Build list of RPM builds to perform builds = [] - if args.all: - builds = build_vars["builds"] - else: + if args.version: # Build a list of requested versions as dicts of version components versions = [] version_keys = ["version_major", "version_minor", "version_patch", -- 2.36.6