summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-08-17 20:10:11 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2018-08-17 20:10:11 +0200
commit71fca2f42a6fcbe08ae7e8c7595e83e51c3fc428 (patch)
tree18dd08c02fe9a7ca95eb0a100bfabff4e55626eb /scripts
parent00a29628e2f31da15dc845599f161fe7dbb1dd34 (diff)
downloadkernel-71fca2f42a6fcbe08ae7e8c7595e83e51c3fc428.tar.gz
kernel-71fca2f42a6fcbe08ae7e8c7595e83e51c3fc428.tar.xz
kernel-71fca2f42a6fcbe08ae7e8c7595e83e51c3fc428.zip
vanillaify
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/stable-update.sh21
1 files changed, 17 insertions, 4 deletions
diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh
index a2ab4904a..962c3c4ec 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 origin/${currentbranch%-user-thl-vanilla-fedora} || exit 1
+
if [ $# -lt 1 ]; then
echo "Need a version"
exit 1
@@ -61,7 +66,10 @@ 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
@@ -77,8 +85,13 @@ 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
+
+git diff kernel.spec sources
+sleep 1 || exit 1
+git commit -m "Linux v$1" kernel.spec sources