kernel: Patch file 0016-Add-driver-versions-for-ice-i40e-and-iavf.patch fails to apply

[Alyson Deives Pereira]

Brief Description
When manually applying kernel patch files from kernel-std/patches and kernel-rt/patches into linux source tree, it fails on patch file 0016-Add-driver-versions-for-ice-i40e-and-iavf.patch:

Severity
--------
Provide the severity of the defect.
Minor: <System/Feature is usable with minor issue>
Somehow the build system ignores this error, but I dont know if it applied this patch or just ignored it.

Steps to Reproduce
------------------
- Git clone linux-yocto repo
- Git checkout to a7d960cfa075eb93eef1e04e96940a35d1a49d79 (std) or 0539614ef9daa0949cfe4855234dbe1c9f1da432 (rt)
- Git am patches from 0001 to 0015
- $ git apply --reject <REPO_DIR>/kernel/kernel-std/debian/patches/0016-Add-driver-versions-for-ice-i40e-and-iavf.patch
Checking patch Makefile...
error: while searching for:
        ((c) > 255 ? 255 : (c)))'; \
        echo \#define LINUX_VERSION_MAJOR $(VERSION); \
        echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \
        echo \#define LINUX_VERSION_SUBLEVEL $(SUBLEVEL)
endef

ifneq ($(DISTRIBUTION_OFFICIAL_BUILD),)

error: patch failed: Makefile:1249
Checking patch drivers/net/ethernet/intel/i40e/i40e.h...
Checking patch drivers/net/ethernet/intel/i40e/i40e_ethtool.c...
Checking patch drivers/net/ethernet/intel/i40e/i40e_main.c...
Checking patch drivers/net/ethernet/intel/iavf/iavf.h...
Checking patch drivers/net/ethernet/intel/iavf/iavf_ethtool.c...
Checking patch drivers/net/ethernet/intel/iavf/iavf_main.c...
Checking patch drivers/net/ethernet/intel/ice/ice.h...
Checking patch drivers/net/ethernet/intel/ice/ice_ethtool.c...
Checking patch drivers/net/ethernet/intel/ice/ice_main.c...
Applying patch Makefile with 1 reject...
Hunk #1 applied cleanly.
Rejected hunk #2.
Applied patch drivers/net/ethernet/intel/i40e/i40e.h cleanly.
Applied patch drivers/net/ethernet/intel/i40e/i40e_ethtool.c cleanly.
Applied patch drivers/net/ethernet/intel/i40e/i40e_main.c cleanly.
Applied patch drivers/net/ethernet/intel/iavf/iavf.h cleanly.
Applied patch drivers/net/ethernet/intel/iavf/iavf_ethtool.c cleanly.
Applied patch drivers/net/ethernet/intel/iavf/iavf_main.c cleanly.
Applied patch drivers/net/ethernet/intel/ice/ice.h cleanly.
Applied patch drivers/net/ethernet/intel/ice/ice_ethtool.c cleanly.
Applied patch drivers/net/ethernet/intel/ice/ice_main.c cleanly.

Expected Behavior
------------------
Patch file should be applied

Actual Behavior
----------------
Patch file is not applied

Reproducibility
---------------
Reproducible

Test Activity
-------------
Developer Testing

Workaround
----------
None

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: f/kernel-6.6
Review: https://review.opendev.org/c/starlingx/kernel/+/922146

[OpenStack Infra (hudson-openstack)]

Change abandoned by "Alyson Deives Pereira <email address hidden>" on branch: f/kernel-6.6
Review: https://review.opendev.org/c/starlingx/kernel/+/922146
Reason: The root Makefile from linux-yocto tar.gz file version is different of the repository git version, and this is why the patch application fails.

[Alyson Deives Pereira (adeivesp)]

The root Makefile from linux-yocto tar.gz file version is different of the repository git version, and this is why the patch application fails.