diff --git a/obs-packaging/runtime/debian.rules-template b/obs-packaging/runtime/debian.rules-template index 4a2a02d972..2c9d2cee74 100644 --- a/obs-packaging/runtime/debian.rules-template +++ b/obs-packaging/runtime/debian.rules-template @@ -29,15 +29,13 @@ override_dh_auto_build: cd $(GOPATH)/src/$(IMPORTNAME)/; \ make QEMUPATH=/usr/bin/$(DEFAULT_QEMU) - override_dh_auto_install: mkdir -p debian/$(PKG_NAME) cd $(GOPATH)/src/$(IMPORTNAME)/; \ make install \ - SCRIPTS_DIR=$(shell pwd)/debian/usr/bin \ - DESTTARGET=$(shell pwd)/debian/$(PKG_NAME)/usr/bin/kata-runtime \ - QEMUPATH=/usr/bin/$(DEFAULT_QEMU) \ - DESTCONFIG=$(shell pwd)/debian/$(PKG_NAME)/usr/share/defaults/kata-containers/configuration.toml + DESTDIR=$(shell pwd)/debian/$(PKG_NAME)/ \ + PREFIX=/usr \ + QEMUPATH=/usr/bin/$(DEFAULT_QEMU) - 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 diff --git a/obs-packaging/runtime/kata-runtime.spec-template b/obs-packaging/runtime/kata-runtime.spec-template index 6d4b12f5bb..9a87dc5fc0 100644 --- a/obs-packaging/runtime/kata-runtime.spec-template +++ b/obs-packaging/runtime/kata-runtime.spec-template @@ -86,10 +86,8 @@ export GOPATH=$HOME/rpmbuild/BUILD/go/ cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} make \ - DESTTARGET=%{buildroot}/usr/bin/kata-runtime \ - DESTCONFIG=%{buildroot}/usr/share/defaults/kata-containers/configuration.toml \ - SCRIPTS_DIR=%{buildroot}/usr/bin \ - BASH_COMPLETIONSDIR=%{buildroot}/usr/share/bash-completion/completions/kata-runtime \ + DESTDIR=%{buildroot} \ + PREFIX=/usr \ QEMUPATH=/usr/bin/%{DEFAULT_QEMU} \ install sed -i -e '/^initrd =/d' %{buildroot}/usr/share/defaults/kata-containers/configuration.toml