From 5cb0ef665893ed8230b61c9e84435532fb476716 Mon Sep 17 00:00:00 2001
From: Thorsten Leemhuis <fedora@leemhuis.info>
Date: Sun, 8 Apr 2018 14:47:06 +0200
Subject: modify script for vanilla purposes

---
 scripts/stable-update.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh
index eefd9a96d..cd3595a7c 100755
--- a/scripts/stable-update.sh
+++ b/scripts/stable-update.sh
@@ -13,6 +13,11 @@
 #
 # Args: Stable version to update (e.g. 4.7.7, 4.8.1)
 
+# update orgin
+~/usr/bin/vanilla-kernel-helper.sh masterupdate
+currentbranch=$(git symbolic-ref --short HEAD)
+git merge --no-edit --ff-only origin/${currentbranch%-user-thl-vanilla-fedora} || exit 1
+
 if [ $# -lt 1 ]; then
 	echo "Need a version"
 	exit 1
@@ -44,12 +49,15 @@ fi
 
 grep $1 sources &> /dev/null
 if [ ! $? -eq 0 ]; then
-	fedpkg upload patch-$1.xz
+	# thl is not an allowed uploader, skip this
+	# fedpkg upload patch-$1.xz
+	checksum=$(sha512sum patch-$1.xz)
+	echo "SHA512 (patch-$1.xz) = ${checksum:0:128}" >> sources
 
 	# Cryptic awk: search for the previous patch level (if one exists) and
 	# remove it from the source file
 	awk -v VER=$VERSION.$PATCHLEVEL.$((SUBLEVEL-1)) '$0 !~ VER { print $0; }' < sources > sources.tmp
-	mv sources.tmp sources
+	mv sources.tmp sources	
 fi
 
 # Update the stable level
@@ -60,8 +68,9 @@ awk -v STABLE=$SUBLEVEL '/%define stable_update/ \
 mv kernel.spec.tmp kernel.spec
 
 # Reset the base release for use with rpmdev-bumpspec
-BASERELEASE=`cat kernel.spec | grep "%global baserelease" | cut -d ' ' -f 3 | head -c 1`00
-BASERELEASE=$(($BASERELEASE-1))
+BASERELEASE=`cat kernel.spec | grep "%global baserelease" | cut -d ' ' -f 3 | head -c 1`50
+#BASERELEASE=$(($BASERELEASE-1))
 BASERELEASE=$BASERELEASE perl -p -i -e 's|%global baserelease.*|%global baserelease $ENV{'BASERELEASE'}|' kernel.spec
 
-rpmdev-bumpspec -c "Linux v$1" kernel.spec
+# do not generate changelog: avoids merge conflicts that are not worth the trouble
+# rpmdev-bumpspec -c "Linux v$1" kernel.spec
-- 
cgit