diff --git a/obs-packaging/ksm-throttler/debian.rules-template b/obs-packaging/ksm-throttler/debian.rules-template index 61d07f00fb..c4dc9a7b59 100644 --- a/obs-packaging/ksm-throttler/debian.rules-template +++ b/obs-packaging/ksm-throttler/debian.rules-template @@ -23,13 +23,15 @@ override_dh_auto_build: tar xzf /usr/src/packages/SOURCES/go$(GO_VERSION).linux-@GO_ARCH@.tar.gz -C /tmp/local ln -s /usr/src/packages/BUILD /usr/src/packages/BUILD/go/src/$(IMPORTNAME) cd $(GOPATH)/src/$(IMPORTNAME); \ - make TARGET=kata-ksm-throttler - + make \ + COMMIT=@HASH@ \ + TARGET=kata-ksm-throttler override_dh_auto_install: mkdir -p debian/$(PROJECT) cd $(GOPATH)/src/$(IMPORTNAME); \ make install \ + COMMIT=@HASH@ \ DESTDIR=$(shell pwd)/debian/kata-ksm-throttler \ TARGET=kata-ksm-throttler diff --git a/obs-packaging/ksm-throttler/kata-ksm-throttler.spec-template b/obs-packaging/ksm-throttler/kata-ksm-throttler.spec-template index fe8dfc309a..d1a6752e8f 100644 --- a/obs-packaging/ksm-throttler/kata-ksm-throttler.spec-template +++ b/obs-packaging/ksm-throttler/kata-ksm-throttler.spec-template @@ -58,6 +58,7 @@ mkdir -p $HOME/rpmbuild/BUILD/go/src/%{DOMAIN}/%{ORG} ln -s $HOME/rpmbuild/BUILD/kata-ksm-throttler-%{version} $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} make \ + COMMIT=@HASH@ \ TARGET=kata-ksm-throttler \ LIBEXECDIR=%{LIBEXECDIR} @@ -68,6 +69,7 @@ export GOPATH=$HOME/rpmbuild/BUILD/go/ cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} make install \ + COMMIT=@HASH@ \ TARGET=kata-ksm-throttler \ DESTDIR=%{buildroot} \ LIBEXECDIR=%{LIBEXECDIR} diff --git a/obs-packaging/proxy/debian.rules-template b/obs-packaging/proxy/debian.rules-template index c21602a675..32892cbebe 100644 --- a/obs-packaging/proxy/debian.rules-template +++ b/obs-packaging/proxy/debian.rules-template @@ -16,8 +16,8 @@ override_dh_auto_build: mkdir -p /usr/src/packages/BUILD/go/src/github.com/kata-containers/ tar xzf /usr/src/packages/SOURCES/go$(GO_VERSION).linux-@GO_ARCH@.tar.gz -C /usr/src/packages/BUILD/local/ ln -s /usr/src/packages/BUILD/ /usr/src/packages/BUILD/go/src/github.com/kata-containers/proxy - cd $(GOPATH)/src/github.com/kata-containers/proxy && make + cd $(GOPATH)/src/github.com/kata-containers/proxy && make COMMIT=@HASH@ override_dh_auto_install: mkdir debian/kata-proxy - make install LIBEXECDIR=$(shell pwd)/debian/kata-proxy/usr/libexec + make install LIBEXECDIR=$(shell pwd)/debian/kata-proxy/usr/libexec COMMIT=@HASH@ diff --git a/obs-packaging/proxy/kata-proxy.spec-template b/obs-packaging/proxy/kata-proxy.spec-template index 34742dcb7c..8986b47923 100644 --- a/obs-packaging/proxy/kata-proxy.spec-template +++ b/obs-packaging/proxy/kata-proxy.spec-template @@ -66,14 +66,14 @@ export GOPATH=$HOME/rpmbuild/BUILD/go/ mkdir -p $HOME/rpmbuild/BUILD/go/src/%{DOMAIN}/%{ORG} ln -s %{_builddir}/%{name}-%{version} $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} -make +make COMMIT=@HASH@ %clean echo "Clean build root" rm -rf %{buildroot} %install -make install LIBEXECDIR=%{buildroot}%{LIBEXECDIR} +make install LIBEXECDIR=%{buildroot}%{LIBEXECDIR} COMMIT=@HASH@ %files %defattr(-,root,root,-) diff --git a/obs-packaging/runtime/debian.rules-template b/obs-packaging/runtime/debian.rules-template index 2c9d2cee74..a7b0be48c7 100644 --- a/obs-packaging/runtime/debian.rules-template +++ b/obs-packaging/runtime/debian.rules-template @@ -27,7 +27,7 @@ override_dh_auto_build: tar xzf /usr/src/packages/SOURCES/go$(GO_VERSION).linux-@GO_ARCH@.tar.gz -C /usr/src/packages/BUILD/local ln -s /usr/src/packages/BUILD /usr/src/packages/BUILD/go/src/$(IMPORTNAME) cd $(GOPATH)/src/$(IMPORTNAME)/; \ - make QEMUPATH=/usr/bin/$(DEFAULT_QEMU) + make QEMUPATH=/usr/bin/$(DEFAULT_QEMU) COMMIT=@HASH@ override_dh_auto_install: mkdir -p debian/$(PKG_NAME) @@ -36,6 +36,7 @@ override_dh_auto_install: make install \ DESTDIR=$(shell pwd)/debian/$(PKG_NAME)/ \ PREFIX=/usr \ + COMMIT=@HASH@ \ QEMUPATH=/usr/bin/$(DEFAULT_QEMU) 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 9a87dc5fc0..9d676e7ece 100644 --- a/obs-packaging/runtime/kata-runtime.spec-template +++ b/obs-packaging/runtime/kata-runtime.spec-template @@ -71,7 +71,7 @@ export GOPATH=$HOME/rpmbuild/BUILD/go/ mkdir -p $HOME/rpmbuild/BUILD/go/src/%{DOMAIN}/%{ORG} ln -s $HOME/rpmbuild/BUILD/kata-runtime-%{version} $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} -make QEMUPATH=/usr/bin/%{DEFAULT_QEMU} +make QEMUPATH=/usr/bin/%{DEFAULT_QEMU} COMMIT=@HASH@ %check export http_proxy=http://127.0.0.1:9/ @@ -89,6 +89,7 @@ make \ DESTDIR=%{buildroot} \ PREFIX=/usr \ QEMUPATH=/usr/bin/%{DEFAULT_QEMU} \ + COMMIT=@HASH@ \ install sed -i -e '/^initrd =/d' %{buildroot}/usr/share/defaults/kata-containers/configuration.toml diff --git a/obs-packaging/shim/debian.rules-template b/obs-packaging/shim/debian.rules-template index ae8f7909dd..dfea7abbe1 100644 --- a/obs-packaging/shim/debian.rules-template +++ b/obs-packaging/shim/debian.rules-template @@ -14,8 +14,8 @@ override_dh_auto_build: mkdir -p /usr/src/packages/BUILD/go/src/github.com/kata-containers/ tar xzf /usr/src/packages/SOURCES/go$(GO_VERSION).linux-@GO_ARCH@.tar.gz -C /usr/src/packages/BUILD/local/ ln -s /usr/src/packages/BUILD/ /usr/src/packages/BUILD/go/src/github.com/kata-containers/shim - cd $(GOPATH)/src/github.com/kata-containers/shim && make + cd $(GOPATH)/src/github.com/kata-containers/shim && make COMMIT=@HASH@ override_dh_auto_install: mkdir -p debian/kata-shim - make install LIBEXECDIR=$(shell pwd)/debian/kata-shim/usr/libexec + make install LIBEXECDIR=$(shell pwd)/debian/kata-shim/usr/libexec COMMIT=@HASH@ diff --git a/obs-packaging/shim/kata-shim.spec-template b/obs-packaging/shim/kata-shim.spec-template index 59da009f84..4237d7a404 100644 --- a/obs-packaging/shim/kata-shim.spec-template +++ b/obs-packaging/shim/kata-shim.spec-template @@ -58,7 +58,7 @@ export GOPATH=$HOME/rpmbuild/BUILD/go/ mkdir -p $HOME/rpmbuild/BUILD/go/src/%{DOMAIN}/%{ORG} ln -s %{_builddir}/%{name}-%{version} $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} cd $HOME/rpmbuild/BUILD/go/src/%{IMPORTNAME} -make +make COMMIT=@HASH@ %check export http_proxy=http://127.0.0.1:9/ @@ -70,7 +70,7 @@ export GOROOT=$HOME/rpmbuild/BUILD/local/go export PATH=$PATH:$HOME/rpmbuild/BUILD/local/go/bin export GOPATH=$HOME/rpmbuild/BUILD/go/ -make install LIBEXECDIR=%{buildroot}%{LIBEXECDIR} +make install LIBEXECDIR=%{buildroot}%{LIBEXECDIR} COMMIT=@HASH@ %files %defattr(-,root,root,-)