Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29b88e37 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents bdfebb78 11eaeaf0

build/tools/repopick.py

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ if __name__ == '__main__': 
    for item in mergables:

        args.quiet or print('Applying change number {0}...'.format(item['id']))

        # Check if change is open and exit if it's not, unless -f is specified

        if (item['status'] != 'OPEN' and item['status'] != 'NEW' and item['status'] != 'DRAFT') and not args.query:

        if (item['status'] != 'OPEN' and item['status'] != 'NEW' and item['status'] != 'DRAFT'):

            if args.force:

                print('!! Force-picking a closed change !!\n')

            else:

config/BoardConfigKernel.mk

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
#   TARGET_KERNEL_LLVM_BINUTILS        = Use LLVM binutils, defaults to true

#   TARGET_KERNEL_NO_GCC               = Fully compile the kernel without GCC.

#                                        Defaults to false

#   TARGET_KERNEL_VERSION              = Reported kernel version in top level kernel

#                                        makefile. Can be overriden in device trees

#                                        in the event of prebuilt kernel.

#

#   TARGET_KERNEL_DTBO_PREFIX          = Override path prefix of TARGET_KERNEL_DTBO.

#                                        Defaults to empty
@@ -68,6 +71,7 @@ endif 


KERNEL_VERSION := $(shell grep -s "^VERSION = " $(TARGET_KERNEL_SOURCE)/Makefile | awk '{ print $$3 }')

KERNEL_PATCHLEVEL := $(shell grep -s "^PATCHLEVEL = " $(TARGET_KERNEL_SOURCE)/Makefile | awk '{ print $$3 }')

TARGET_KERNEL_VERSION ?= $(shell echo $(KERNEL_VERSION)"."$(KERNEL_PATCHLEVEL))



# 5.10+ can fully compile without GCC by default

ifeq ($(shell expr $(KERNEL_VERSION) \>= 5), 1)