diff options
| -rw-r--r-- | build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk | 4 | ||||
| -rw-r--r-- | build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk index 49680f418..df2c23163 100644 --- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk +++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk @@ -7,6 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -OVS_NSH_DPDK_BRANCH?=d0487867be45c6e785f9fb241efd6adef0f0625f +OVS_NSH_DPDK_BRANCH?=master OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs -OVS_NSH_DPDK_CHANGE?= +OVS_NSH_DPDK_CHANGE?=24b1dd4464f6b86d73b15a4b3f0984a2d597750f diff --git a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch index a31c52b95..b90fd1951 100644 --- a/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch +++ b/build/f_repos/patch/fuel-main/0003-repo-mirror-Allow-multi-arch-local-mirrors.patch @@ -35,15 +35,15 @@ diff --git a/mirror/ubuntu/module.mk b/mirror/ubuntu/module.mk index 7a9466e..fe1ada2 100644 --- a/mirror/ubuntu/module.mk +++ b/mirror/ubuntu/module.mk -@@ -81,7 +81,7 @@ $(BUILD_DIR)/mirror/ubuntu/mirror.done: - --root=$(MIRROR_MOS_UBUNTU_ROOT) \ - --dist=$(MIRROR_MOS_UBUNTU_SUITE) \ - --section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \ -- --arch=$(UBUNTU_ARCH) \ -+ --arch=$(shell echo $(UBUNTU_ARCH) | tr ' ' ',') \ - $(LOCAL_MIRROR_UBUNTU)/ - rm -rf $(LOCAL_MIRROR_UBUNTU)/.temp $(LOCAL_MIRROR_UBUNTU)/project - $(ACTION.TOUCH) +@@ -33,7 +33,7 @@ set -ex; ./debmirror --progress --checksums --nocleanup \ + --root=$(MIRROR_MOS_UBUNTU_ROOT) \ + --dist=$(MIRROR_MOS_UBUNTU_SUITE)$1 \ + --section=$(subst $(space),$(comma),$(MIRROR_MOS_UBUNTU_SECTION)) \ +- --arch=$(UBUNTU_ARCH) \ ++ --arch=$(shell echo $(UBUNTU_ARCH) | tr ' ' ',') \ + $(LOCAL_MIRROR_UBUNTU)/ + endef + diff --git a/sandbox.mk b/sandbox.mk index 9d34dc9..e787f43 100644 --- a/sandbox.mk |