summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/create_headers_tarball.sh9
-rwxr-xr-xscripts/generate-git-snapshot.sh2
2 files changed, 9 insertions, 2 deletions
diff --git a/scripts/create_headers_tarball.sh b/scripts/create_headers_tarball.sh
index 5105f790c..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_all
+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
diff --git a/scripts/generate-git-snapshot.sh b/scripts/generate-git-snapshot.sh
index 2ad6a5f06..242200ef6 100755
--- a/scripts/generate-git-snapshot.sh
+++ b/scripts/generate-git-snapshot.sh
@@ -20,7 +20,7 @@ VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed
if [ -z "$VER" ] ;
then
- VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.gz// | sed s/[\(\)]//g)
+ VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz// | sed s/[\(\)]//g)
fi
OLDGIT=$(grep gitrev kernel.spec | head -n1 | sed s/%define\ gitrev\ //)