66faf21953
Conflicts: target/linux/generic/pending-4.14/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch It looks like you may be committing a merge. If this is not correct, please remove the file .git/MERGE_HEAD and try again. Please enter the commit message for your changes. Lines starting with '' will be ignored, and an empty message aborts the commit. On branch coolsnowwolf-master All conflicts fixed but you are still merging. Changes to be committed: modified: include/kernel-version.mk modified: target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch modified: target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch modified: target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch modified: target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch modified: target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch modified: target/linux/generic/backport-4.14/321-v4.16-netfilter-nf_tables-add-flow-table-netlink-frontend.patch modified: target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch modified: target/linux/generic/backport-4.14/328-v4.16-netfilter-nf_tables-fix-a-typo-in-nf_tables_getflowt.patch modified: target/linux/generic/backport-4.14/330-v4.16-netfilter-nf_tables-remove-flag-field-from-struct-nf.patch modified: target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch modified: target/linux/generic/backport-4.14/332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch modified: target/linux/generic/backport-4.14/334-v4.15-netfilter-nf_tables-fix-potential-NULL-ptr-deref-in-.patch modified: target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch modified: target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch modified: target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch modified: target/linux/generic/backport-4.14/338-v4.16-netfilter-nf_tables-get-rid-of-struct-nft_af_info-ab.patch modified: target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch modified: target/linux/generic/backport-4.14/342-v4.16-netfilter-nf_tables-fix-flowtable-free.patch modified: target/linux/generic/backport-4.14/344-v4.16-netfilter-nf_tables-allocate-handle-and-delete-objec.patch modified: target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch modified: target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch modified: target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch modified: target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch modified: target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch deleted: target/linux/generic/pending-4.14/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch modified: target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch modified: target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch modified: target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch deleted: target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch modified: target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch modified: target/linux/generic/pending-4.19/642-net-8021q-support-hardware-flow-table-offload.patch modified: target/linux/ipq806x/patches-4.14/0067-generic-Mangle-bootloader-s-kernel-arguments.patch modified: target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch modified: target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch modified: target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch deleted: target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch modified: target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch modified: target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch modified: target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch modified: target/linux/x86/patches-4.14/200-pcengines-apu2-reboot.patch modified: target/linux/x86/patches-4.19/200-pcengines-apu2-reboot.patch
43 lines
1.6 KiB
Makefile
Executable File
43 lines
1.6 KiB
Makefile
Executable File
# Use the default kernel version if the Makefile doesn't override it
|
|
|
|
LINUX_RELEASE?=1
|
|
|
|
ifdef CONFIG_TESTING_KERNEL
|
|
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
|
endif
|
|
|
|
LINUX_VERSION-4.9 = .177
|
|
LINUX_VERSION-4.14 = .120
|
|
LINUX_VERSION-4.19 = .44
|
|
|
|
LINUX_KERNEL_HASH-4.9.177 = c73b1e3ebcc35b653f7b673ca151fc67b814bdb27269799fa7cda251827887ee
|
|
LINUX_KERNEL_HASH-4.14.120 = ddb8e86cf65e6f53f782bc46f026823b6b3fc472aa1385b601f22dce2dbccb4c
|
|
LINUX_KERNEL_HASH-4.19.44 = 707642e993775618a5afa039b1058fa49f1c0faada46e8cdcb976241bca6b288
|
|
|
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
|
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
|
|
|
ifneq ($(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),)
|
|
LINUX_VERSION:=$(call sanitize_uri,$(call remove_uri_prefix,$(CONFIG_KERNEL_GIT_CLONE_URI)))
|
|
ifeq ($(call qstrip,$(CONFIG_KERNEL_GIT_REF)),)
|
|
CONFIG_KERNEL_GIT_REF:=HEAD
|
|
endif
|
|
LINUX_VERSION:=$(LINUX_VERSION)-$(call sanitize_uri,$(CONFIG_KERNEL_GIT_REF))
|
|
else
|
|
ifdef KERNEL_PATCHVER
|
|
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))
|
|
endif
|
|
ifdef KERNEL_TESTING_PATCHVER
|
|
LINUX_TESTING_VERSION:=$(KERNEL_TESTING_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_TESTING_PATCHVER)))
|
|
endif
|
|
endif
|
|
|
|
split_version=$(subst ., ,$(1))
|
|
merge_version=$(subst $(space),.,$(1))
|
|
KERNEL_BASE=$(firstword $(subst -, ,$(LINUX_VERSION)))
|
|
KERNEL=$(call merge_version,$(wordlist 1,2,$(call split_version,$(KERNEL_BASE))))
|
|
KERNEL_PATCHVER ?= $(KERNEL)
|
|
|
|
# disable the md5sum check for unknown kernel versions
|
|
LINUX_KERNEL_HASH:=$(LINUX_KERNEL_HASH-$(strip $(LINUX_VERSION)))
|
|
LINUX_KERNEL_HASH?=x
|