github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-29 16:57:18 +00:00
Code Issues Projects Releases Wiki Activity

pkgs: runtime: use DESTDIR variable.

Browse Source 
Use DESTDIR to install kata-runtime.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz 2018-06-30 00:29:17 -05:00
parent 2a55deb30d
commit 90c62f8da1
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,15 +29,13 @@ override_dh_auto_build:
cd $(GOPATH)/src/$(IMPORTNAME)/; \ cd $(GOPATH)/src/$(IMPORTNAME)/; \
make QEMUPATH=/usr/bin/$(DEFAULT_QEMU) make QEMUPATH=/usr/bin/$(DEFAULT_QEMU)
override_dh_auto_install: override_dh_auto_install:
mkdir -p debian/$(PKG_NAME) mkdir -p debian/$(PKG_NAME)
cd $(GOPATH)/src/$(IMPORTNAME)/; \ cd $(GOPATH)/src/$(IMPORTNAME)/; \
make install \ make install \
SCRIPTS_DIR=$(shell pwd)/debian/usr/bin \ DESTDIR=$(shell pwd)/debian/$(PKG_NAME)/ \
DESTTARGET=$(shell pwd)/debian/$(PKG_NAME)/usr/bin/kata-runtime \ PREFIX=/usr \
QEMUPATH=/usr/bin/$(DEFAULT_QEMU) \ QEMUPATH=/usr/bin/$(DEFAULT_QEMU)
DESTCONFIG=$(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 sed -i -e '/^initrd =/d' $(shell pwd)/debian/$(PKG_NAME)/usr/share/defaults/kata-containers/configuration.toml

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

@ -86,10 +86,8 @@ export GOPATH=$HOME/rpmbuild/BUILD/go/
cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME}
make \ make \
DESTTARGET=%{buildroot}/usr/bin/kata-runtime \ DESTDIR=%{buildroot} \
DESTCONFIG=%{buildroot}/usr/share/defaults/kata-containers/configuration.toml \ PREFIX=/usr \
SCRIPTS_DIR=%{buildroot}/usr/bin \
BASH_COMPLETIONSDIR=%{buildroot}/usr/share/bash-completion/completions/kata-runtime \
QEMUPATH=/usr/bin/%{DEFAULT_QEMU} \ QEMUPATH=/usr/bin/%{DEFAULT_QEMU} \
install install
sed -i -e '/^initrd =/d' %{buildroot}/usr/share/defaults/kata-containers/configuration.toml sed -i -e '/^initrd =/d' %{buildroot}/usr/share/defaults/kata-containers/configuration.toml