From 932464d8506cc6278d2480270454801dc231ae6e Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@redhat.com>
Date: Thu, 18 Jul 2019 11:54:09 -0400
Subject: [PATCH] Actually fix headers scripts to account for all archs

---
 scripts/create_headers_tarball.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/create_headers_tarball.sh b/scripts/create_headers_tarball.sh
index 1c388381b..5ec563f8e 100755
--- a/scripts/create_headers_tarball.sh
+++ b/scripts/create_headers_tarball.sh
@@ -44,7 +44,14 @@ ARCH_LIST="arm arm64 powerpc s390 x86"
 headers_dir=$(mktemp -d)
 trap 'rm -rf "$headers_dir"' SIGHUP SIGINT SIGTERM EXIT
 
-make HDR_ARCH_LIST="$ARCH_LIST" INSTALL_HDR_PATH=$headers_dir headers_install
+archs=${ARCH_LIST:-$(ls arch)}
+echo $archs
+
+# Upstream rmeoved the headers_install_all target so do it manually
+for arch in $archs; do
+	mkdir $headers_dir/arch-$arch
+	make ARCH=$arch INSTALL_HDR_PATH=$headers_dir/arch-$arch KBUILD_HEADERS=install headers_install
+done
 find $headers_dir \
 	\( -name .install -o -name .check -o \
 	-name ..install.cmd -o -name ..check.cmd \) | xargs rm -f