diff options
author | Feng Pan <fpan@redhat.com> | 2017-05-21 11:33:22 -0400 |
---|---|---|
committer | Feng Pan <fpan@redhat.com> | 2017-05-21 11:33:22 -0400 |
commit | 7e83d33f7c431016f47b973f357f5a8a912cc7aa (patch) | |
tree | d2f5f271d16e1f99114f77583bfc92119a0657ba | |
parent | 0ea79ccda01ea235ea3171273e8ee02dfc4ab2a9 (diff) |
Fix dependencies errors in iso verify
Change-Id: I6f169d6d89a0468c6c9208ba448c4da0a6f776ee
Signed-off-by: Feng Pan <fpan@redhat.com>
-rw-r--r-- | build/Makefile | 2 | ||||
-rw-r--r-- | build/rpm_specs/opnfv-apex-common.spec | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/Makefile b/build/Makefile index 38f46fd5..51cb3e47 100644 --- a/build/Makefile +++ b/build/Makefile @@ -271,7 +271,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 jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe + cd $(BUILD_DIR)/centos/Packages && yumdownloader openvswitch jq python34 python34-libs python34-PyYAML python34-setuptools ipxe-roms-qemu python34-jinja2 python34-markupsafe python2-virtualbmc python-pbr python-prettytable python-pyghmi python-crypto 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 05fbbbd3..c8fcdb7c 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: opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools libvirt-python -Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 python3-ipmi python2-virtualbmc +Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python34-jinja2 python3-ipmi python2-virtualbmc Requires: ipxe-roms-qemu >= 20160127-1 %description |