diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-28 02:25:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-28 02:25:48 +0000 |
| commit | 36e93077409a1ac320a971fb4db5e95e3c5c0353 (patch) | |
| tree | 39dfc91fc32160d3c127be96688bbe6c81a1a509 /build | |
| parent | 742be8f455b9526fd32fc903aedc2608c90ead93 (diff) | |
| parent | 6e6be5b01b8af5c15641f027b354041874f0ddfa (diff) | |
Merge "Fix dependencies errors in iso verify" into stable/danube
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile | 4 | ||||
| -rw-r--r-- | build/rpm_specs/opnfv-apex-common.spec | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/build/Makefile b/build/Makefile index ed983256..d44978e8 100644 --- a/build/Makefile +++ b/build/Makefile @@ -329,9 +329,7 @@ iso: iso-clean images rpms $(CENTISO) @ln $(RPMUDR) $(BUILD_DIR)/centos/Packages @ln $(RPMODL) $(BUILD_DIR)/centos/Packages # add packages to the centos packages - cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch openstack-tripleo jq python34 python34-libs python34-yaml python34-setuptools ipxe-roms-qemu - cd $(BUILD_DIR)/centos/Packages && curl -O https://radez.fedorapeople.org/python34-markupsafe-0.23-9.el7.centos.x86_64.rpm - cd $(BUILD_DIR)/centos/Packages && curl -O https://radez.fedorapeople.org/python3-jinja2-2.8-5.el7.centos.noarch.rpm + cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch openstack-tripleo jq oniguruma python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe cd $(BUILD_DIR)/centos/Packages && curl -O http://artifacts.opnfv.org/apex/dependencies/python3-ipmi-0.3.0-1.noarch.rpm # regenerate yum repo data @echo "Generating new yum metadata" diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 71de9378..d08ab615 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -11,7 +11,7 @@ Source0: opnfv-apex-common.tar.gz BuildArch: noarch BuildRequires: python-docutils python34-devel Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools -Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 python3-ipmi +Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python34-jinja2 python3-ipmi Requires: ipxe-roms-qemu >= 20160127-1 %description |