starlingx/kernel
Code Issues Proposed changes

Auto upversioning of kernel and kmods

Browse Source 
when kernel or kmod is modified

The PKG_GITREVCOUNT component of TIS_PATCH_VER
will increment every time that a change is
delivered to $PKG_BASE for the package.
The actual value is the number of commits
since PKG_BASE_SRCREV, and an optional plus 1
if there are uncommitted changes.

Kmods now add OPT_DEP_LIST_FOR_BUILD_TYPE to list
the kernel's source tree as a non-built input
to each kmod.  If the kernel is modified,
the OTHER_GITREVCOUNT component of the
TIS_PATCH_VER will increment. The actual value is
the number of commits since BASE_SRCREV_FOR_PATH,
and an optioanal plus 1 if there are uncommitted
changes.

So a kernel only change will auto increment and
build not only the kernel, but all kmods.

A kmod change will only auto-increment the affected kmod.

If a package is rebased to a new upstream version,
then PKG_BASE_SRCREV, and BASE_SRCREV_FOR_PATH if present,
should be adjusted to drop TIS_PATCH_VER to 1.

Note: BASE_SRCREV_FOR_PATH for a kmod should NOT be modified
if the kernel is rebased to a newer upstream kernel, but
the kmod itself has not rebased at the same time.  Only adjust
BASE_SRCREV_FOR_PATH if the kmod itself has been rebased.
Why?  The kmod's TIS_PATCH_VER would decrement!  Yum
will prefer the older build of the kmod, built against
the old kernel.  The installed kmod and kernel will not match.

Story: 2007750
Task: 39937
Depends-On: https://review.opendev.org/734687
Change-Id: Ie8f840934b4ddfd4c09ea3dc738e4f4032683dfc
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little 2020-06-09 00:35:39 -04:00
parent 23151d4f47
commit b3b85950ae
13 changed files with 71 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel-modules/drbd/centos/build_srpm.data
View File

@ -1,4 +1,9 @@
COPY_LIST="$FILES_BASE/* \
$DISTRO/patches/* \
$CGCS_BASE/downloads/drbd-8.4.11-1.tar.gz"
TIS_PATCH_VER=4
$STX_BASE/downloads/drbd-8.4.11-1.tar.gz"
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
PKG_BASE_SRCREV=4271ab1f4346779e5e1d73ba5f7c27e48d7be12e
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT

7
kernel-modules/intel-e1000e/centos/build_srpm.data
View File

@ -1,4 +1,9 @@
COPY_LIST=" \
$PKG_BASE/files/* \
$STX_BASE/downloads/e1000e-3.6.0.tar.gz"
TIS_PATCH_VER=4
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
PKG_BASE_SRCREV=83ff54f4239c3beeba23f81558fbf0c430233fe2
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1

7
kernel-modules/intel-i40e/centos/build_srpm.data
View File

@ -1,4 +1,9 @@
COPY_LIST=" \
$PKG_BASE/files/* \
$STX_BASE/downloads/i40e-2.10.19.82.tar.gz"
TIS_PATCH_VER=4
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
PKG_BASE_SRCREV=adc347a3e4d6b2eb883f5c879866fa91d19091f6
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1

7
kernel-modules/intel-iavf/centos/build_srpm.data
View File

@ -1,4 +1,9 @@
COPY_LIST=" \
$PKG_BASE/files/* \
$STX_BASE/downloads/iavf-3.7.61.20.tar.gz"
TIS_PATCH_VER=4
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
PKG_BASE_SRCREV=e51acfabf349d27780a3663bfa76887116b1bfee
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1

7
kernel-modules/intel-ixgbe/centos/build_srpm.data
View File

@ -1,4 +1,9 @@
COPY_LIST=" \
$PKG_BASE/files/* \
$STX_BASE/downloads/ixgbe-5.6.5.tar.gz"
TIS_PATCH_VER=4
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
PKG_BASE_SRCREV=04704ebb785074dbb38b65f9d9457b6e8c2a11c6
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1

7
kernel-modules/intel-ixgbevf/centos/build_srpm.data
View File

@ -1,4 +1,9 @@
COPY_LIST=" \
$PKG_BASE/files/* \
$STX_BASE/downloads/ixgbevf-4.6.3.tar.gz"
TIS_PATCH_VER=4
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
PKG_BASE_SRCREV=04704ebb785074dbb38b65f9d9457b6e8c2a11c6
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1

7
kernel-modules/intel-opae-fpga/centos/build_srpm.data
View File

@ -1,4 +1,9 @@
COPY_LIST=" \
$PATCHES_BASE/* \
$STX_BASE/downloads/opae-intel-fpga-driver-2.0.1.tar.gz"
TIS_PATCH_VER=3
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
PKG_BASE_SRCREV=b57a3e6641c2bdf826942df3798df77086d06497
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1

7
kernel-modules/mlnx-ofa_kernel/centos/build_srpm.data
View File

@ -1,3 +1,8 @@
COPY_LIST="$PKG_BASE/files/modules-load.conf"
TIS_PATCH_VER=4
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
PKG_BASE_SRCREV=c3a925b0b8111e9dc958a5934a613f491be71ae3
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+2
BUILD_IS_SLOW=3

7
kernel-modules/qat17/centos/build_srpm.data
View File

@ -2,5 +2,10 @@ COPY_LIST=" \
$PKG_BASE/files/* \
$STX_BASE/downloads/qat1.7.l.4.5.0-00034.tar.gz \
"
TIS_PATCH_VER=4
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
PKG_BASE_SRCREV=3b8696650cb85c558c1b4c6d315c64d57f178527
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1
BUILD_IS_SLOW=3

3
kernel-rt/centos/build_srpm.data
View File

@ -1,4 +1,5 @@
COPY_LIST="files/*"
TIS_PATCH_VER=3
PKG_BASE_SRCREV=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
TIS_PATCH_VER=PKG_GITREVCOUNT+1
BUILD_IS_BIG=21
BUILD_IS_SLOW=16

3
kernel-std/centos/build_srpm.data
View File

@ -1,4 +1,5 @@
COPY_LIST="files/*"
TIS_PATCH_VER=3
PKG_BASE_SRCREV=145ff64b9734e5c45cfd8eb837a04e257b4b9581
TIS_PATCH_VER=PKG_GITREVCOUNT+1
BUILD_IS_BIG=21
BUILD_IS_SLOW=16

7
userspace/mellanox/libibverbs/centos/build_srpm.data
View File

@ -1 +1,6 @@
TIS_PATCH_VER=3
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
PKG_BASE_SRCREV=b23443c0e3fc17fc5b3eb93ede0f979e4c60562a
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1

7
userspace/mellanox/rdma-core/centos/build_srpm.data
View File

@ -1 +1,6 @@
TIS_PATCH_VER=3
OPT_DEP_LIST_FOR_BUILD_TYPE[std]=$GIT_BASE/kernel-std
OPT_DEP_LIST_FOR_BUILD_TYPE[rt]=$GIT_BASE/kernel-rt
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-std]=145ff64b9734e5c45cfd8eb837a04e257b4b9581
BASE_SRCREV_FOR_PATH[$GIT_BASE/kernel-rt]=c0fee2da8ef34aa816ddd76690ed425b2ff94c90
PKG_BASE_SRCREV=b23443c0e3fc17fc5b3eb93ede0f979e4c60562a
TIS_PATCH_VER=PKG_GITREVCOUNT+OTHER_GITREVCOUNT+1