Use the branch name rather than tag for the patchset and configs

The tag had to contain both the version and the release of the package.
This is inconvenient when mass rebuilds are in action: the release is
incremented automatically then.

Using the top of the appropriate branch is safer. It is also possible to
specify any other revision, so this scheme is more flexible as well.
This commit is contained in:
Eugene Shatokhin 2015-07-08 15:21:06 +03:00
parent a6ca9ce2cf
commit d558706bc9

View file

@ -42,6 +42,11 @@
%define kversion %{kernelversion}.%{patchlevel}.%{sublevel} %define kversion %{kernelversion}.%{patchlevel}.%{sublevel}
%define kverrel %{kversion}-%{rpmrel} %define kverrel %{kversion}-%{rpmrel}
# The revision of the patchset and the configs to use. Usually, the name of
# the branch in https://abf.rosalinux.ru/soft/kernel-patches-and-configs/
# git repository.
%define revision v4.1.x
# When we are using a pre/rc patch, the tarball is a sublevel -1 # When we are using a pre/rc patch, the tarball is a sublevel -1
%if %kpatch %if %kpatch
%if %sublevel %if %sublevel
@ -357,7 +362,7 @@ Source53: cpupower.path
# Our patch tarball, # Our patch tarball,
# see https://abf.rosalinux.ru/soft/kernel-patches-and-configs/ # see https://abf.rosalinux.ru/soft/kernel-patches-and-configs/
Source100: https://abf.io/soft/kernel-patches-and-configs/archive/kernel-patches-and-configs-%{kversion}-%{rpmrel}.tar.gz Source100: https://abf.io/soft/kernel-patches-and-configs/archive/kernel-patches-and-configs-%{revision}.tar.gz
# #################################################################### # ####################################################################
# #
# Patches # Patches
@ -1097,7 +1102,7 @@ should use the 'kernel-devel' package instead.
%setup -q -n %top_dir_name -c %setup -q -n %top_dir_name -c
%setup -q -n %top_dir_name -D -T -a100 %setup -q -n %top_dir_name -D -T -a100
%define patches_dir ../kernel-patches-and-configs-%{kversion}-%{rpmrel}/ %define patches_dir ../kernel-patches-and-configs-%{revision}/
cd %src_dir cd %src_dir