diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-05-27 08:22:35 -0400 |
|---|---|---|
| committer | Feng Pan <fpan@redhat.com> | 2017-05-27 10:22:48 -0400 |
| commit | 6e6be5b01b8af5c15641f027b354041874f0ddfa (patch) | |
| tree | 0a75b5d17fb281b7607f3d9506073240f867317c | |
| parent | adf74f577852779302ed77b1d45584af9830c1e2 (diff) | |
Fix dependencies errors in iso verify
Change-Id: I6f169d6d89a0468c6c9208ba448c4da0a6f776ee
Signed-off-by: Feng Pan <fpan@redhat.com>
| -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 |