From f18643322afc78261d4a72d50aab2149f81b9c8e Mon Sep 17 00:00:00 2001 From: Neil McKee Date: Sat, 21 Jan 2017 07:32:58 -0800 Subject: [PATCH] Xenserver build. --- docker_build/xenserver/build_hsflowd | 3 +-- xenserver-ddk/Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker_build/xenserver/build_hsflowd b/docker_build/xenserver/build_hsflowd index 3e58a398..aea1018c 100755 --- a/docker_build/xenserver/build_hsflowd +++ b/docker_build/xenserver/build_hsflowd @@ -21,8 +21,7 @@ yum -y install xen-libs-devel xen-dom0-libs-devel supp-pack-build echo "building hsflowd" git clone https://github.com/sflow/host-sflow \ && cd host-sflow \ -&& sed --in-place -e 's/PACK_BUILD = $(XENSERVER_BUILD)/PACK_BUILD = docker_ddk/g' xenserver-ddk/Makefile \ -&& make xenserver FEATURES="XEN OVS SYSTEMD DBUS" +&& make xenserver echo "copying result" cp xenserver-ddk/hsflowd-xenserver.iso /packages diff --git a/xenserver-ddk/Makefile b/xenserver-ddk/Makefile index 65632651..bed4db4a 100644 --- a/xenserver-ddk/Makefile +++ b/xenserver-ddk/Makefile @@ -35,7 +35,7 @@ build-iso: build-rpms build-tarball: build-rpms python setup.py "--output=$(dir $(ISO))" --tar "--vendor-code=$(VENDOR_CODE)" "--vendor-name=$(VENDOR_NAME)" "--label=$(LABEL)" "--text=$(TEXT)" "--version=$(PACK_VERSION)" "--build=$(PACK_BUILD)" $(RPM_FILES) -build-rpms: build-srctarballs +build-rpms: rpmbuild -bb --define "version $(RPM_VERSION)" --define "release $(RPM_RELEASE)" $(SPEC) build-srctarballs: