Skip to content

Commit cc480df

Browse files
Update Makefile
1 parent afb1bab commit cc480df

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ PATCHLEVEL = 4
44
SUBLEVEL = 254 #spoffing of Realme RMX3661, real is .292
55
EXTRAVERSION = "qgki-gc916795b189b"
66

7+
<<<<<<< HEAD
8+
=======
79

10+
>>>>>>> afb1bab7396bfe259287ad7874450fb23119b352
811
# indicate that change "Kbuild: Support nested composite objects" is
912
# present in the kernel so that out-of-tree modules can act upon it
1013
export KERNEL_SUPPORTS_NESTED_COMPOSITES := y
@@ -344,12 +347,9 @@ else # !mixed-build
344347
include scripts/Kbuild.include
345348

346349
# Read KERNELRELEASE from include/config/kernel.release (if it exists)
347-
KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
348-
$(eval KERNELRELEASE := $(shell echo $(KERNELRELEASE) | tr ' ' '-'))
349-
350-
KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
351-
$(eval KERNELVERSION := $(shell echo $(KERNELVERSION) | tr ' ' '-'))
352350

351+
KERNELRELEASE := 5.4.254-qgki-gc916795b189b
352+
KERNELVERSION := 5.4.254
353353
export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
354354

355355
include scripts/subarch.include

0 commit comments

Comments
 (0)