github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-10 12:22:36 +00:00
Code Issues Projects Releases Wiki Activity

pkgs: runtime: spec fix qemu path

Browse Source 
QEMUCMD is used to identify the defauly hypervisor on kata.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz 2019-01-23 12:05:43 -06:00
parent 6e2677c456
commit 4f02627d30
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
obs-packaging/runtime/debian.rules-template
View File

@ -28,7 +28,7 @@ override_dh_auto_build:
ln -s /usr/src/packages/BUILD /usr/src/packages/BUILD/go/src/$(IMPORTNAME) ln -s /usr/src/packages/BUILD /usr/src/packages/BUILD/go/src/$(IMPORTNAME)
cd $(GOPATH)/src/$(IMPORTNAME)/; \ cd $(GOPATH)/src/$(IMPORTNAME)/; \
make \ make \
QEMUPATH=/usr/bin/$(DEFAULT_QEMU) \ QEMUCMD=$(DEFAULT_QEMU) \
COMMIT=@HASH@ \ COMMIT=@HASH@ \
SKIP_GO_VERSION_CHECK=1 SKIP_GO_VERSION_CHECK=1
@ -40,7 +40,7 @@ override_dh_auto_install:
DESTDIR=$(shell pwd)/debian/$(PKG_NAME)/ \ DESTDIR=$(shell pwd)/debian/$(PKG_NAME)/ \
PREFIX=/usr \ PREFIX=/usr \
COMMIT=@HASH@ \ COMMIT=@HASH@ \
QEMUPATH=/usr/bin/$(DEFAULT_QEMU) \ QEMUCMD=$(DEFAULT_QEMU) \
SKIP_GO_VERSION_CHECK=1 SKIP_GO_VERSION_CHECK=1
sed -i -e '/^initrd =/d' $(shell pwd)/debian/$(PKG_NAME)/usr/share/defaults/kata-containers/configuration.toml sed -i -e '/^initrd =/d' $(shell pwd)/debian/$(PKG_NAME)/usr/share/defaults/kata-containers/configuration.toml

4
obs-packaging/runtime/kata-runtime.spec-template
View File

@ -66,7 +66,7 @@ mkdir -p $HOME/rpmbuild/BUILD/go/src/%{DOMAIN}/%{ORG}
ln -s $HOME/rpmbuild/BUILD/kata-runtime-%{version} $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} ln -s $HOME/rpmbuild/BUILD/kata-runtime-%{version} $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME}
cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME}
make \ make \
QEMUPATH=/usr/bin/%{DEFAULT_QEMU} \ QEMUCMD=%{DEFAULT_QEMU} \
COMMIT=@HASH@ \ COMMIT=@HASH@ \
SKIP_GO_VERSION_CHECK=1 SKIP_GO_VERSION_CHECK=1
@ -85,7 +85,7 @@ cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME}
make \ make \
DESTDIR=%{buildroot} \ DESTDIR=%{buildroot} \
PREFIX=/usr \ PREFIX=/usr \
QEMUPATH=/usr/bin/%{DEFAULT_QEMU} \ QEMUCMD=%{DEFAULT_QEMU} \
COMMIT=@HASH@ \ COMMIT=@HASH@ \
SKIP_GO_VERSION_CHECK=1 \ SKIP_GO_VERSION_CHECK=1 \
install install