From 41542043be3603c4b3ee5847ed1433f7881f0164 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 6 Apr 2020 17:12:37 +0200 Subject: [PATCH] sys-kernel: bump kernel to 5.4 Change the default Kernel version of Alpha to 5.4, the most latest LTS Kernel tree. Also update patches and kernel configs, so it could build with the new Kernel. --- ...114.ebuild => coreos-kernel-5.4.33.ebuild} | 0 ...14.ebuild => coreos-modules-5.4.33.ebuild} | 0 ...d64_defconfig-4.19 => amd64_defconfig-5.4} | 7 ----- ...m64_defconfig-4.19 => arm64_defconfig-5.4} | 0 .../{commonconfig-4.19 => commonconfig-5.4} | 26 ---------------- .../sys-kernel/coreos-sources/Manifest | 4 +-- ...14.ebuild => coreos-sources-5.4.33.ebuild} | 2 +- ...lative-path-for-KBUILD_SRC-from-CURD.patch | 30 ------------------- ...lative-path-for-KBUILD_SRC-from-CURD.patch | 29 ++++++++++++++++++ ...kefile-Don-t-fail-on-fallthrough-wit.patch | 0 ...d-nf_conntrack_ipv4-compat-module-fo.patch | 0 11 files changed, 32 insertions(+), 66 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/{coreos-kernel-4.19.114.ebuild => coreos-kernel-5.4.33.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/{coreos-modules-4.19.114.ebuild => coreos-modules-5.4.33.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/{amd64_defconfig-4.19 => amd64_defconfig-5.4} (96%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/{arm64_defconfig-4.19 => arm64_defconfig-5.4} (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/{commonconfig-4.19 => commonconfig-5.4} (96%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/{coreos-sources-4.19.114.ebuild => coreos-sources-5.4.33.ebuild} (98%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/{4.19 => 5.4}/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch (100%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/{4.19 => 5.4}/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.114.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.4.33.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-4.19.114.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-kernel/coreos-kernel-5.4.33.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.114.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.4.33.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-4.19.114.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/coreos-modules-5.4.33.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.19 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.4 similarity index 96% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.19 rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.4 index 9296ca3a72..6b84625607 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-4.19 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-5.4 @@ -24,8 +24,6 @@ CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 # CONFIG_X86_INTEL_TSX_MODE_OFF is not set CONFIG_X86_INTEL_TSX_MODE_ON=y CONFIG_KEXEC_FILE=y -CONFIG_KEXEC_VERIFY_SIG=y -CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_CRASH_DUMP=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_CMDLINE_BOOL=y @@ -47,7 +45,6 @@ CONFIG_INTEL_IOMMU=y CONFIG_IRQ_REMAP=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m -CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_HARDLOCKUP_DETECTOR=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y CONFIG_SCHED_TRACER=y @@ -93,7 +90,6 @@ CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_SHA256_SSSE3=m CONFIG_DCDBAS=m CONFIG_DEBUG_BOOT_PARAMS=y -CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_DELL_RBU=m CONFIG_EDAC_AMD64=m CONFIG_EDAC_DECODE_MCE=m @@ -144,9 +140,7 @@ CONFIG_IRQ_REMAP=y CONFIG_ISCSI_IBFT_FIND=y CONFIG_ITCO_VENDOR_SUPPORT=y CONFIG_ITCO_WDT=m -CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_KEXEC_FILE=y -CONFIG_KEXEC_VERIFY_SIG=y CONFIG_KPROBES_ON_FTRACE=y CONFIG_KVM_AMD=m CONFIG_KVM_INTEL=m @@ -222,4 +216,3 @@ CONFIG_XEN_DEBUG_FS=y CONFIG_XEN_MCE_LOG=y CONFIG_XEN_PCIDEV_FRONTEND=m CONFIG_XEN_PVH=y -CONFIG_XEN_SELFBALLOONING=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.19 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.4 similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-4.19 rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/arm64_defconfig-5.4 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.19 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.4 similarity index 96% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.19 rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.4 index 72809bec99..9370a08eea 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-4.19 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.4 @@ -23,7 +23,6 @@ CONFIG_AUDIT=y CONFIG_AUTOFS4_FS=y CONFIG_B44=m # CONFIG_BACKLIGHT_CLASS_DEVICE is not set -CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BCACHE=m CONFIG_BCM87XX_PHY=m CONFIG_BFQ_GROUP_IOSCHED=y @@ -87,7 +86,6 @@ CONFIG_CEPH_FSCACHE=y CONFIG_CEPH_FS=m CONFIG_CEPH_FS_POSIX_ACL=y CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y -CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_CFS_BANDWIDTH=y CONFIG_CGROUP_BPF=y CONFIG_CGROUP_CPUACCT=y @@ -104,7 +102,6 @@ CONFIG_CHELSIO_T3=m CONFIG_CHELSIO_T4=m CONFIG_CHELSIO_T4VF=m CONFIG_CHR_DEV_SG=m -CONFIG_CIFS_ACL=y CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS_FSCACHE=y CONFIG_CIFS=m @@ -176,8 +173,6 @@ CONFIG_EFI=y CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=m CONFIG_EXPERT=y -CONFIG_EXT4_ENCRYPTION=y -CONFIG_EXT4_FS_ENCRYPTION=y CONFIG_EXT4_FS=m CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y @@ -252,18 +247,11 @@ CONFIG_IMA=y CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET_AH=m CONFIG_INET_DIAG=m CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_UDP_DIAG=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET=y CONFIG_INFINIBAND_CXGB3=m CONFIG_INFINIBAND_CXGB4=m @@ -273,10 +261,7 @@ CONFIG_INFINIBAND_IPOIB=m CONFIG_INFINIBAND_ISER=m CONFIG_INFINIBAND=m CONFIG_INFINIBAND_MTHCA=m -CONFIG_INFINIBAND_NES=m CONFIG_INFINIBAND_OCRDMA=m -CONFIG_INFINIBAND_QIB=m -CONFIG_INFINIBAND_RDMAVT=m CONFIG_INFINIBAND_SRP=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INPUT_EVDEV=m @@ -489,7 +474,6 @@ CONFIG_NET_CLS_BPF=m CONFIG_NET_CLS_CGROUP=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_IND=y CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_RSVP6=m CONFIG_NET_CLS_RSVP=m @@ -669,10 +653,6 @@ CONFIG_NF_TABLES_IPV6=y CONFIG_NF_TABLES=m CONFIG_NF_TABLES_NETDEV=y CONFIG_NFT_BRIDGE_REJECT=m -CONFIG_NFT_CHAIN_NAT_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV6=m -CONFIG_NFT_CHAIN_ROUTE_IPV4=m -CONFIG_NFT_CHAIN_ROUTE_IPV6=m CONFIG_NFT_COMPAT=m CONFIG_NFT_COUNTER=m CONFIG_NFT_CT=m @@ -687,16 +667,12 @@ CONFIG_NFT_FWD_NETDEV=m CONFIG_NFT_HASH=m CONFIG_NFT_LIMIT=m CONFIG_NFT_LOG=m -CONFIG_NFT_MASQ_IPV4=m -CONFIG_NFT_MASQ_IPV6=m CONFIG_NFT_MASQ=m CONFIG_NFT_NAT=m CONFIG_NFT_NUMGEN=m CONFIG_NFT_OBJREF=m CONFIG_NFT_QUEUE=m CONFIG_NFT_QUOTA=m -CONFIG_NFT_REDIR_IPV4=m -CONFIG_NFT_REDIR_IPV6=m CONFIG_NFT_REDIR=m CONFIG_NFT_REJECT=m CONFIG_NFT_HASH=m @@ -749,7 +725,6 @@ CONFIG_PROFILING=y CONFIG_QED=m CONFIG_QEDE=m CONFIG_QFMT_V2=m -CONFIG_QLGE=m CONFIG_QED=m CONFIG_QEDE=m CONFIG_QUOTA_NETLINK_INTERFACE=y @@ -763,7 +738,6 @@ CONFIG_RDS=m CONFIG_RDS_RDMA=m CONFIG_RDS_TCP=m CONFIG_REALTEK_PHY=m -CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RTC_CLASS=y CONFIG_RT_GROUP_SCHED=y CONFIG_S2IO=m diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest index 2eb096ae5b..b15298c682 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/Manifest @@ -1,2 +1,2 @@ -DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 -DIST patch-4.19.114.xz 2942712 BLAKE2B a21b1e2bcc241d989bb54f8d417db3b168b3ec5676048bc9f98fca87fbfe67d97c5005a4bbd97eba7c6ec85da4160b1e9c21cd5ff3f39341a67f08de9113bfee SHA512 9e42cf4a20ae74d7bb6d52c9785a24fe334c97328116e1adae8bbed45922064f953b3e925b60d3c754f019f1195e4bc2e8326d222e13bc3057a02b103356b0b1 +DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f +DIST patch-5.4.33.xz 1183968 BLAKE2B 13d79d7fcff0d4cf261b1aec0b3724ecdd76258f3bf26d6d16fbdcd6b5227d48b9952d673435322b244e1a6a884e520f01ca5478431a06f173e14f4e4297a1c0 SHA512 566829f94ccce6ee98fde8338b6fd58792422f1676ed72cad9dcdd2c0e79a7e50408b7b3a967829a96f98717ad39b35d6c9007cdf58c0c22a0d6592bddf354cd diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.114.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.33.ebuild similarity index 98% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.114.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.33.ebuild index 4e78488890..4dc0b5fa28 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-4.19.114.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/coreos-sources-5.4.33.ebuild @@ -8,7 +8,7 @@ ETYPE="sources" # Final releases should be versioned L.M.N, even for N == 0 # Only needed for RCs -K_BASE_VER="4.19" +K_BASE_VER="5.4" inherit kernel-2 EXTRAVERSION="-flatcar" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch deleted file mode 100644 index 533bcc9866..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 448c5c3afc26d38c1f67af42852fc6a4c3ca0a56 Mon Sep 17 00:00:00 2001 -From: Vito Caputo -Date: Wed, 25 Nov 2015 02:59:45 -0800 -Subject: [PATCH 1/3] kbuild: derive relative path for KBUILD_SRC from CURDIR - -This enables relocating source and build trees to different roots, -provided they stay reachable relative to one another. Useful for -builds done within a sandbox where the eventual root is prefixed -by some undesirable path component. ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 1ca0b8f37951..c8a9cdbebcb5 100644 ---- a/Makefile -+++ b/Makefile -@@ -143,7 +143,8 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make - - # Invoke a second make in the output directory, passing relevant variables - sub-make: -- $(Q)$(MAKE) -C $(KBUILD_OUTPUT) KBUILD_SRC=$(CURDIR) \ -+ $(Q)$(MAKE) -C $(KBUILD_OUTPUT) \ -+ KBUILD_SRC=$(shell realpath --relative-to=$(KBUILD_OUTPUT) $(CURDIR)) \ - -f $(CURDIR)/Makefile $(filter-out _all sub-make,$(MAKECMDGOALS)) - - # Leave processing to above invocation of make --- -2.21.0 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch new file mode 100644 index 0000000000..85aeae8fa0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0001-kbuild-derive-relative-path-for-KBUILD_SRC-from-CURD.patch @@ -0,0 +1,29 @@ +From 7cf237ffad0402d65f56dd694285988c519a01e2 Mon Sep 17 00:00:00 2001 +From: Vito Caputo +Date: Wed, 25 Nov 2015 02:59:45 -0800 +Subject: [PATCH 1/3] kbuild: derive relative path for srctree from CURDIR + +This enables relocating source and build trees to different roots, +provided they stay reachable relative to one another. Useful for +builds done within a sandbox where the eventual root is prefixed +by some undesirable path component. +--- + Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 4d29c7370b46..a04c9783adac 100644 +--- a/Makefile ++++ b/Makefile +@@ -143,7 +143,7 @@ $(filter-out _all sub-make $(CURDIR)/Makefile, $(MAKECMDGOALS)) _all: sub-make + endif + + ifneq ($(KBUILD_ABS_SRCTREE),) +-srctree := $(abs_srctree) ++srctree := $(shell realpath --relative-to=$(KBUILD_OUTPUT) $(abs_srctree)) + endif + + objtree := . +-- +2.21.0 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0002-tools-objtool-Makefile-Don-t-fail-on-fallthrough-wit.patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/4.19/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-sources/files/5.4/z0003-net-netfilter-add-nf_conntrack_ipv4-compat-module-fo.patch