From 41542043be3603c4b3ee5847ed1433f7881f0164 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 6 Apr 2020 17:12:37 +0200 Subject: [PATCH 1/3] 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 From 25f179f462cc02fb808819908fc819a652134a9c Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 6 Apr 2020 17:23:58 +0200 Subject: [PATCH 2/3] sys-kernel/coreos-firmware: update to 20191022 Update coreos-firmware to 20191022, to be compatible with Kernel 5.4. Also get ebuild in sync with linux-firmware from upstream Gentoo. --- .../sys-kernel/coreos-firmware/Manifest | 2 +- ...ebuild => coreos-firmware-20191022.ebuild} | 0 .../coreos-firmware-99999999.ebuild | 169 ++++++++++++------ 3 files changed, 113 insertions(+), 58 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/{coreos-firmware-20181001.ebuild => coreos-firmware-20191022.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest index 2a0708e10f..f0a611ac19 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/Manifest @@ -1 +1 @@ -DIST linux-firmware-20181001.tar.gz 158397569 BLAKE2B 2694014f847fb60f5f0c208a479f4cdf0b422ef249735f22f0ef72e0fd385e8ba6737da1b1cf24daf74fd5f28c3c69b96e14850520f16b8a556c7ca734a3557e SHA512 f20b65122381423597cebd5a3018bbe55f0f8697a03b5ae3e7c1c6dd1cddcb1da4f3fddc8e4accb2d780faf1c0e66bed7dda6b1ab1c48d2e0b2435a5a7eb03f7 +DIST linux-firmware-20191022.tar.gz 198935619 BLAKE2B 94d90a8e85af7104f08c398d3df20a88dc4d6f86d638565ab6e45e7fc5dff53e4e56a62a859585438812a1438ea7f7c4e4e47ce4adb22b0adf69439feb5803b4 SHA512 2cc99664c8d0275b670373581d7c6e29699f8b84cd6403949182cc1970c3241e5d9c388c34643630a237d87962b7c8e891445969ca9817ac92a4bbbe74e0dc0d diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20181001.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20191022.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20181001.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-20191022.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild index db62bbb2b8..f64c6fd2a8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-firmware/coreos-firmware-99999999.ebuild @@ -1,71 +1,72 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild,v 1.30 2013/09/05 05:46:37 vapier Exp $ -EAPI=5 +EAPI="6" # Tell linux-info where to find the kernel source/build KERNEL_DIR="${SYSROOT}/usr/src/linux" KBUILD_OUTPUT="${SYSROOT}/var/cache/portage/sys-kernel/coreos-kernel" -inherit linux-info +inherit linux-info savedconfig if [[ ${PV} == 99999999* ]]; then - inherit git-2 + inherit git-r3 SRC_URI="" - EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" - KEYWORDS="" + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" else - GIT_COMMIT="7c81f23ad903f72e87e2102d8f52408305c0f7a2" + GIT_COMMIT="03dcc2219a339ca826f8966a9005d74dd88c8b26" SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> linux-firmware-${PV}.tar.gz" - KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86" fi DESCRIPTION="Linux firmware files" HOMEPAGE="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git" -LICENSE="GPL-1 GPL-2 GPL-3 BSD freedist" -SLOT="0/${PVR}" -IUSE="" +LICENSE="linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+" +SLOT="0" +IUSE="savedconfig" CDEPEND=">=sys-kernel/coreos-modules-4.6.3-r1:=" DEPEND="${CDEPEND} - sys-kernel/coreos-sources" -RDEPEND="${CDEPEND} - !sys-kernel/linux-firmware - !sys-firmware/alsa-firmware[alsa_cards_ca0132] - !sys-firmware/alsa-firmware[alsa_cards_korg1212] - !sys-firmware/alsa-firmware[alsa_cards_maestro3] - !sys-firmware/alsa-firmware[alsa_cards_sb16] - !sys-firmware/alsa-firmware[alsa_cards_ymfpci] - !media-tv/cx18-firmware - ! ${PN}.conf + find * \( \! -type d -and \! -name ${PN}.conf \) >> ${PN}.conf + + if use savedconfig; then + restore_config ${PN}.conf + ebegin "Removing all files not listed in config" + + local file delete_file preserved_file preserved_files=() + + while IFS= read -r file; do + # Ignore comments. + if [[ ${file} != "#"* ]]; then + preserved_files+=("${file}") + fi + done < ${PN}.conf || die + + while IFS= read -d "" -r file; do + delete_file=true + for preserved_file in "${preserved_files[@]}"; do + if [[ "${file}" == "${preserved_file}" ]]; then + delete_file=false + fi + done + + if ${delete_file}; then + rm "${file}" || die + fi + done < <(find * \( \! -type d -and \! -name ${PN}.conf \) -print0 || die) + + eend || die + + # remove empty directories, bug #396073 + find -type d -empty -delete || die + fi - # Prune empty directories - find -type d -empty -delete || die } src_install() { - if [[ -z "$(find -type f)" ]]; then - die "No firmware files found to install." + if use !savedconfig; then + save_config ${PN}.conf fi - + rm ${PN}.conf || die insinto /lib/firmware/ - doins -r . + doins -r * +} + +pkg_preinst() { + if use savedconfig; then + ewarn "USE=savedconfig is active. You must handle file collisions manually." + fi +} + +pkg_postinst() { + elog "If you are only interested in particular firmware files, edit the saved" + elog "configfile and remove those that you do not want." } From 109319b0341641d5d1f0871c78ed5596527e7111 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Mon, 6 Apr 2020 19:18:43 +0200 Subject: [PATCH 3/3] chore(metadata): Regenerate cache --- .../md5-cache/app-admin/flannel-wrapper-0.11.0 | 2 +- .../sys-kernel/coreos-firmware-20181001 | 14 -------------- .../sys-kernel/coreos-firmware-20191022 | 14 ++++++++++++++ .../sys-kernel/coreos-firmware-99999999 | 18 +++++++++--------- .../sys-kernel/coreos-kernel-4.19.114 | 13 ------------- .../md5-cache/sys-kernel/coreos-kernel-5.4.33 | 13 +++++++++++++ ...-modules-4.19.114 => coreos-modules-5.4.33} | 4 ++-- ...-sources-4.19.114 => coreos-sources-5.4.33} | 6 +++--- 8 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20181001 create mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20191022 delete mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-4.19.114 create mode 100644 sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-5.4.33 rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-modules-4.19.114 => coreos-modules-5.4.33} (91%) rename sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/{coreos-sources-4.19.114 => coreos-sources-5.4.33} (86%) diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.11.0 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.11.0 index 32690fe0f9..b981001faa 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.11.0 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/app-admin/flannel-wrapper-0.11.0 @@ -8,4 +8,4 @@ LICENSE=Apache-2.0 RDEPEND=!app-admin/flannel >=app-emulation/rkt-1.9.1[rkt_stage1_fly] SLOT=0 _eclasses_=multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 -_md5_=a937e9bb41fd60521e74ad53b383e36d +_md5_=aeeb6fbd654024997583005bbcc2064f diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20181001 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20181001 deleted file mode 100644 index 575f949336..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20181001 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=install prepare setup unpack -DEPEND=>=sys-kernel/coreos-modules-4.6.3-r1:= sys-kernel/coreos-sources -DESCRIPTION=Linux firmware files -EAPI=5 -HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git -IUSE=kernel_linux -KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 -LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist -RDEPEND=>=sys-kernel/coreos-modules-4.6.3-r1:= !sys-kernel/linux-firmware !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware ! linux-firmware-20181001.tar.gz -_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 -_md5_=47e103abd6f348a5e485e7e6b513af25 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20191022 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20191022 new file mode 100644 index 0000000000..41256e3b0c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-20191022 @@ -0,0 +1,14 @@ +DEFINED_PHASES=install postinst preinst prepare setup unpack +DEPEND=>=sys-kernel/coreos-modules-4.6.3-r1:= sys-kernel/coreos-sources +DESCRIPTION=Linux firmware files +EAPI=6 +HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git +IUSE=savedconfig kernel_linux savedconfig +KEYWORDS=alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 s390 sh sparc x86 +LICENSE=linux-firmware ( BSD ISC MIT no-source-code ) GPL-2 GPL-2+ +RDEPEND=!savedconfig? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware ! linux-firmware-20191022.tar.gz +_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e portability 2b88d3ecc35035a3b8ab628b49cafb0e savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 +_md5_=f070047ea5582d1e919d2a06aee75141 diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-99999999 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-99999999 index 100c1ca9f5..cde871df11 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-99999999 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-firmware-99999999 @@ -1,12 +1,12 @@ -DEFINED_PHASES=install prepare setup unpack -DEPEND=>=sys-kernel/coreos-modules-4.6.3-r1:= sys-kernel/coreos-sources dev-vcs/git +DEFINED_PHASES=install postinst preinst prepare setup unpack +DEPEND=>=sys-kernel/coreos-modules-4.6.3-r1:= sys-kernel/coreos-sources >=dev-vcs/git-1.8.2.1[curl] DESCRIPTION=Linux firmware files -EAPI=5 +EAPI=6 HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git -IUSE=kernel_linux -LICENSE=GPL-1 GPL-2 GPL-3 BSD freedist -RDEPEND=>=sys-kernel/coreos-modules-4.6.3-r1:= !sys-kernel/linux-firmware !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] !media-tv/cx18-firmware !=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-4.19.114 -DESCRIPTION=CoreOS Linux kernel -EAPI=5 -HOMEPAGE=http://www.kernel.org -IUSE=kernel_linux -KEYWORDS=amd64 arm64 -LICENSE=GPL-2 freedist -RDEPEND==sys-kernel/coreos-modules-4.19.114 -RESTRICT=binchecks strip -SLOT=0/4.19.114 -_eclasses_=coreos-kernel bc8272b6395d7213be30d34d93de876d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 -_md5_=5cdef512c2f9ccfa17b2e9552282884d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-5.4.33 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-5.4.33 new file mode 100644 index 0000000000..177bf92878 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-kernel-5.4.33 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare pretend setup unpack +DEPEND==sys-kernel/coreos-modules-5.4.33 app-arch/gzip app-shells/bash coreos-base/coreos-init:= sys-apps/coreutils sys-apps/findutils sys-apps/grep sys-apps/ignition:= sys-apps/less sys-apps/nvme-cli sys-apps/sed sys-apps/shadow sys-apps/systemd[cryptsetup] sys-apps/seismograph sys-apps/util-linux sys-fs/btrfs-progs sys-fs/e2fsprogs sys-fs/mdadm sys-fs/xfsprogs >=sys-kernel/coreos-firmware-20180103-r1:= >=sys-kernel/bootengine-0.0.4:= sys-kernel/dracut virtual/udev amd64? ( sys-firmware/intel-microcode:= ) =sys-kernel/coreos-sources-5.4.33 +DESCRIPTION=CoreOS Linux kernel +EAPI=5 +HOMEPAGE=http://www.kernel.org +IUSE=kernel_linux +KEYWORDS=amd64 arm64 +LICENSE=GPL-2 freedist +RDEPEND==sys-kernel/coreos-modules-5.4.33 +RESTRICT=binchecks strip +SLOT=0/5.4.33 +_eclasses_=coreos-kernel bc8272b6395d7213be30d34d93de876d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 +_md5_=5cdef512c2f9ccfa17b2e9552282884d diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.114 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-5.4.33 similarity index 91% rename from sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.114 rename to sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-5.4.33 index 3ad7425531..a85a09a069 100644 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-4.19.114 +++ b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/sys-kernel/coreos-modules-5.4.33 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack -DEPEND==sys-kernel/coreos-sources-4.19.114 +DEPEND==sys-kernel/coreos-sources-5.4.33 DESCRIPTION=CoreOS Linux kernel modules EAPI=5 HOMEPAGE=http://www.kernel.org @@ -8,6 +8,6 @@ KEYWORDS=amd64 arm64 LICENSE=GPL-2 freedist RDEPEND=!=sys-libs/ncurses-5.2 virtual/libelf ) RESTRICT=binchecks strip -SLOT=4.19.114 -SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.19.114.xz mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz +SLOT=5.4.33 +SRC_URI=mirror://kernel/linux/kernel/v5.x/patch-5.4.33.xz mirror://kernel/linux/kernel/v5.x/linux-5.4.tar.xz _eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 kernel-2 b2fdd65b5edb72d87dedaa82df19553c ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 1d91b03d42ab6308b5f4f6b598ed110e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs 8c7f9d80beedd16f2e5a7f612c609529 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf -_md5_=aeedf13b25aae938b9104a7926f168c5 +_md5_=e50c98248f38dbf63adbe31d561a02fc