From c395aa9ccbe540fd026dcb8934712d5c3466c916 Mon Sep 17 00:00:00 2001
From: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
Date: Fri, 31 Aug 2018 14:35:13 -0500
Subject: [PATCH 1/3] obs: proxy: use DESTDIR variable.

Proxy respository now honor DESTDIR variable.

Fixes: #172

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
---
 obs-packaging/proxy/debian.rules-template    | 2 +-
 obs-packaging/proxy/kata-proxy.spec-template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/obs-packaging/proxy/debian.rules-template b/obs-packaging/proxy/debian.rules-template
index 32892cbebe..4642549123 100644
--- a/obs-packaging/proxy/debian.rules-template
+++ b/obs-packaging/proxy/debian.rules-template
@@ -20,4 +20,4 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	mkdir debian/kata-proxy
-	make install LIBEXECDIR=$(shell pwd)/debian/kata-proxy/usr/libexec COMMIT=@HASH@
+	make install DESTDIR=$(shell pwd)/debian/kata-proxy COMMIT=@HASH@
diff --git a/obs-packaging/proxy/kata-proxy.spec-template b/obs-packaging/proxy/kata-proxy.spec-template
index 1b4b6560c2..12c2376560 100644
--- a/obs-packaging/proxy/kata-proxy.spec-template
+++ b/obs-packaging/proxy/kata-proxy.spec-template
@@ -69,7 +69,7 @@ echo "Clean build root"
 rm -rf %{buildroot}
 
 %install
-make install LIBEXECDIR=%{buildroot}%{LIBEXECDIR} COMMIT=@HASH@
+make install DESTDIR=%{buildroot} COMMIT=@HASH@
 
 %files
 %defattr(-,root,root,-)

From 9a14155bcdb888823efbab60122081512de5a0fc Mon Sep 17 00:00:00 2001
From: Eric Ernst <eric.ernst@intel.com>
Date: Fri, 31 Aug 2018 14:56:02 -0700
Subject: [PATCH 2/3] release: fix release note automation version info

Make sure we checkout the new_version tag before grabbing version
information from the runtime repository.

Fixes: #174.

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
---
 release/runtime-release-notes.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/release/runtime-release-notes.sh b/release/runtime-release-notes.sh
index 028c4e884b..8a83c1f529 100755
--- a/release/runtime-release-notes.sh
+++ b/release/runtime-release-notes.sh
@@ -143,6 +143,7 @@ main() {
 		echo "new-release not provided"
 		usage 1
 	fi
+	git checkout -q ${new_release}
 	get_release_info
 	print_release_notes
 	popd >>/dev/null

From 64509a5a2119d6c4da36af266e60ec803358a4eb Mon Sep 17 00:00:00 2001
From: Eric Ernst <eric.ernst@intel.com>
Date: Fri, 31 Aug 2018 15:40:19 -0700
Subject: [PATCH 3/3] release: notes: add shortlog for reach repo

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
---
 release/runtime-release-notes.sh | 39 ++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/release/runtime-release-notes.sh b/release/runtime-release-notes.sh
index 8a83c1f529..3ca542ac29 100755
--- a/release/runtime-release-notes.sh
+++ b/release/runtime-release-notes.sh
@@ -41,6 +41,13 @@ EOT
 	exit "${return_code}"
 }
 
+repos=(
+	"agent"
+	"proxy"
+	"runtime"
+	"shim"
+)
+
 get_release_info() {
 
 	docker_version=$(get_from_kata_deps "externals.docker.version" "${new_release}")
@@ -60,20 +67,13 @@ get_release_info() {
 	kata_kernel_config_version="${new_release}-kernel-config"
 	kata_kernel_config_version="${new_release}-kernel-config"
 
-	runtime_version=$(cat "./VERSION")
+	runtime_version=${new_release}
 }
 
 changes() {
-	echo "## Changes"
 	echo "**FIXME - massage this section by hand to produce a summary please**"
-	git log --merges "${previous_release}".."${new_release}" | awk '/Merge pull/{getline; getline;print }' |
-		while read -r pr; do
-			echo "- ${pr}"
-		done
 
-	echo ""
-
-	echo "## Shortlog"
+	echo "### Shortlog"
 	for cr in $(git log --merges "${previous_release}".."${new_release}" | grep 'Merge:' | awk '{print $2".."$3}'); do
 		git log --oneline "$cr"
 	done
@@ -83,15 +83,30 @@ print_release_notes() {
 	cat <<EOT
 # Release ${runtime_version}
 
+EOT
+
+	for repo in "${repos[@]}"; do
+		git clone -q "https://github.com/${project}/${repo}.git" "${tmp_dir}/${repo}"
+		pushd "${tmp_dir}/${repo}" >>/dev/null
+
+		cat <<EOT
+## ${repo} Changes
 $(changes)
 
+EOT
+		popd >>/dev/null
+		rm -rf "${tmp_dir}/${repo}"
+	done
+
+	cat <<EOT
+
 ## Compatibility with Docker
 Kata Containers ${runtime_version} is compatible with Docker ${docker_version}
 
 ## Compatibility with CRI-O
 Kata Containers ${runtime_version} is compatible with CRI-O ${crio_version}
 
-## Compatibility with cri-contaienrd
+## Compatibility with cri-containerd
 Kata Containers ${runtime_version} is compatible with cri-contaienrd ${cri_containerd_version}
 
 ## OCI Runtime Specification
@@ -133,8 +148,6 @@ EOT
 main() {
 	previous_release=${1:-}
 	new_release=${2:-}
-	git clone -q "https://github.com/${project}/runtime.git" "${tmp_dir}/runtime"
-	pushd "${tmp_dir}/runtime" >>/dev/null
 	if [ -z "${previous_release}" ]; then
 		echo "previous-release not provided"
 		usage 1
@@ -143,10 +156,8 @@ main() {
 		echo "new-release not provided"
 		usage 1
 	fi
-	git checkout -q ${new_release}
 	get_release_info
 	print_release_notes
-	popd >>/dev/null
 }
 
 main "$@"