diff options
| -rw-r--r-- | kernel.spec | 20 | ||||
| -rwxr-xr-x | scripts/stable-update.sh | 23 |
2 files changed, 33 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index 72389bedf..6adc7e142 100644 --- a/kernel.spec +++ b/kernel.spec @@ -25,6 +25,8 @@ Summary: The Linux kernel %endif # define buildid .local +%define packager Thorsten Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories +%define buildid .vanilla.knurd.1 # baserelease defines which build revision of this kernel version we're # building. We used to call this fedora_build, but the magical name @@ -42,7 +44,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 300 +%global baserelease 350 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -89,7 +91,7 @@ Summary: The Linux kernel # kernel PAE (only valid for i686 (PAE) and ARM (lpae)) %define with_pae %{?_without_pae: 0} %{?!_without_pae: 1} # kernel-debug -%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1} +%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} # kernel-headers %define with_headers %{?_without_headers: 0} %{?!_without_headers: 1} %define with_cross_headers %{?_without_cross_headers: 0} %{?!_without_cross_headers: 1} @@ -114,7 +116,7 @@ Summary: The Linux kernel %define with_cross %{?_with_cross: 1} %{?!_with_cross: 0} # # build a release kernel on rawhide -%define with_release %{?_with_release: 1} %{?!_with_release: 0} +%define with_release %{?_without_release: 0} %{?!_without_release: 1} # verbose build, i.e. no silent rules and V=1 %define with_verbose %{?_with_verbose: 1} %{?!_with_verbose: 0} @@ -137,7 +139,7 @@ Summary: The Linux kernel %endif # Want to build a vanilla kernel build without any non-upstream patches? -%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} +%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} # pkg_release is what we'll fill in for the rpm Release: field %if 0%{?released_kernel} @@ -180,7 +182,7 @@ Summary: The Linux kernel %endif %if %{nopatches} -%define variant -vanilla +#define variant -vanilla %endif %if !%{debugbuildsenabled} @@ -2490,6 +2492,14 @@ fi - Linux v4.16 - Disable debugging options. +* Sat Oct 20 2012 Thorsten Leemhuis <fedora@leemhuis.info> +- add buildid ".vanilla.knurd.1" +- switch defines to build + - a vanilla kernel without debuging + - no debug kernel and no debuginfo packages, to big to handle for me right now +- disable the variant macro as that adds "-vanilla" to %%name, which confuses + fedpkg and prevents installonly handling of packages in yum + ### # The following Emacs magic makes C-c C-e use UTC dates. # Local Variables: diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh index a2ab4904a..de29b00c0 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,12 +66,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 @@ -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 |