From e45ccc1dd053e8ab2ba2abb5a61ecbc520d17869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 17 Oct 2022 07:44:06 +0700 Subject: [PATCH] linux5.4: update to 5.4.218. --- srcpkgs/linux5.4/files/i386-dotconfig | 9 +++------ srcpkgs/linux5.4/files/ppc-dotconfig | 15 ++++++++------- srcpkgs/linux5.4/files/ppc64-dotconfig | 10 ++++------ srcpkgs/linux5.4/files/ppc64le-dotconfig | 9 +++------ srcpkgs/linux5.4/files/x86_64-dotconfig | 9 +++------ srcpkgs/linux5.4/template | 16 ++++++++++++---- 6 files changed, 33 insertions(+), 35 deletions(-) diff --git a/srcpkgs/linux5.4/files/i386-dotconfig b/srcpkgs/linux5.4/files/i386-dotconfig index f02921ccb9d..cca637e2c54 100644 --- a/srcpkgs/linux5.4/files/i386-dotconfig +++ b/srcpkgs/linux5.4/files/i386-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 5.4.193 Kernel Configuration +# Linux/i386 5.4.218 Kernel Configuration # # @@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="_1" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y @@ -777,8 +777,6 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_REFCOUNT=y -CONFIG_REFCOUNT_FULL=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set @@ -3909,10 +3907,9 @@ CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m -# end of Character devices - # CONFIG_RANDOM_TRUST_CPU is not set CONFIG_RANDOM_TRUST_BOOTLOADER=y +# end of Character devices # # I2C support diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig index 272515f2ced..a74cd10ca87 100644 --- a/srcpkgs/linux5.4/files/ppc-dotconfig +++ b/srcpkgs/linux5.4/files/ppc-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.4.180 Kernel Configuration +# Linux/powerpc 5.4.218 Kernel Configuration # # @@ -237,10 +237,13 @@ CONFIG_PPC_BOOK3S_6xx=y # CONFIG_40x is not set # CONFIG_44x is not set # CONFIG_E200 is not set -CONFIG_GENERIC_CPU=y +CONFIG_POWERPC_CPU=y # CONFIG_E300C2_CPU is not set # CONFIG_E300C3_CPU is not set # CONFIG_G4_CPU is not set +# CONFIG_TOOLCHAIN_DEFAULT_CPU is not set +CONFIG_TARGET_CPU_BOOL=y +CONFIG_TARGET_CPU="powerpc" CONFIG_PPC_BOOK3S=y CONFIG_PPC_FPU=y CONFIG_ALTIVEC=y @@ -513,7 +516,6 @@ CONFIG_OLD_SIGACTION=y CONFIG_64BIT_TIME=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_HAS_PHYS_TO_DMA=y -# CONFIG_REFCOUNT_FULL is not set # CONFIG_LOCK_EVENT_COUNTS is not set # @@ -1741,6 +1743,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_MAC_FLOPPY=y CONFIG_CDROM=m # CONFIG_PARIDE is not set @@ -2211,6 +2214,7 @@ CONFIG_MACINTOSH_DRIVERS=y CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_ADB_PMU=y +CONFIG_ADB_PMU_EVENT=y CONFIG_ADB_PMU_LED=y # CONFIG_ADB_PMU_LED_DISK is not set CONFIG_PMAC_APM_EMU=m @@ -3048,7 +3052,6 @@ CONFIG_MISDN_W6692=m # CONFIG_MISDN_NETJET is not set CONFIG_MISDN_IPAC=m CONFIG_MISDN_ISAR=m -# CONFIG_NVM is not set # # Input device support @@ -3423,10 +3426,8 @@ CONFIG_IPWIRELESS=m # CONFIG_TCG_TPM is not set CONFIG_DEVPORT=y # CONFIG_XILLYBUS is not set -# end of Character devices - -CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_BOOTLOADER=y +# end of Character devices # # I2C support diff --git a/srcpkgs/linux5.4/files/ppc64-dotconfig b/srcpkgs/linux5.4/files/ppc64-dotconfig index 09957afc087..4238fff5d03 100644 --- a/srcpkgs/linux5.4/files/ppc64-dotconfig +++ b/srcpkgs/linux5.4/files/ppc64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.4.180 Kernel Configuration +# Linux/powerpc 5.4.218 Kernel Configuration # # @@ -675,7 +675,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_64BIT_TIME=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_HAS_PHYS_TO_DMA=y -CONFIG_REFCOUNT_FULL=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_MEM_ENCRYPT=y @@ -2150,6 +2149,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -2637,6 +2637,7 @@ CONFIG_FIREWIRE_NOSY=m CONFIG_MACINTOSH_DRIVERS=y CONFIG_ADB_PMU=y +CONFIG_ADB_PMU_EVENT=y CONFIG_ADB_PMU_LED=y CONFIG_ADB_PMU_LED_DISK=y CONFIG_PMAC_SMU=y @@ -3514,8 +3515,6 @@ CONFIG_IEEE802154_HWSIM=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support @@ -4008,10 +4007,9 @@ CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m -# end of Character devices - # CONFIG_RANDOM_TRUST_CPU is not set CONFIG_RANDOM_TRUST_BOOTLOADER=y +# end of Character devices # # I2C support diff --git a/srcpkgs/linux5.4/files/ppc64le-dotconfig b/srcpkgs/linux5.4/files/ppc64le-dotconfig index 1f2bfd3ac7a..391d316fb91 100644 --- a/srcpkgs/linux5.4/files/ppc64le-dotconfig +++ b/srcpkgs/linux5.4/files/ppc64le-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 5.4.180 Kernel Configuration +# Linux/powerpc 5.4.218 Kernel Configuration # # @@ -604,7 +604,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_64BIT_TIME=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_HAS_PHYS_TO_DMA=y -CONFIG_REFCOUNT_FULL=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_MEM_ENCRYPT=y @@ -2053,6 +2052,7 @@ CONFIG_PARPORT_NOT_PC=y CONFIG_BLK_DEV=y CONFIG_BLK_DEV_NULL_BLK=m CONFIG_BLK_DEV_FD=m +# CONFIG_BLK_DEV_FD_RAWCMD is not set CONFIG_CDROM=m # CONFIG_PARIDE is not set CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m @@ -3363,8 +3363,6 @@ CONFIG_IEEE802154_HWSIM=m # CONFIG_NETDEVSIM is not set CONFIG_NET_FAILOVER=m # CONFIG_ISDN is not set -CONFIG_NVM=y -# CONFIG_NVM_PBLK is not set # # Input device support @@ -3844,10 +3842,9 @@ CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m CONFIG_XILLYBUS_OF=m -# end of Character devices - # CONFIG_RANDOM_TRUST_CPU is not set CONFIG_RANDOM_TRUST_BOOTLOADER=y +# end of Character devices # # I2C support diff --git a/srcpkgs/linux5.4/files/x86_64-dotconfig b/srcpkgs/linux5.4/files/x86_64-dotconfig index a613708a4c4..ce0f81219dc 100644 --- a/srcpkgs/linux5.4/files/x86_64-dotconfig +++ b/srcpkgs/linux5.4/files/x86_64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 5.4.193 Kernel Configuration +# Linux/x86_64 5.4.218 Kernel Configuration # # @@ -21,7 +21,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="_1" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_BUILD_SALT="" CONFIG_HAVE_KERNEL_GZIP=y @@ -804,8 +804,6 @@ CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y CONFIG_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_REFCOUNT=y -CONFIG_REFCOUNT_FULL=y CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y CONFIG_ARCH_USE_MEMREMAP_PROT=y # CONFIG_LOCK_EVENT_COUNTS is not set @@ -3982,10 +3980,9 @@ CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_XILLYBUS=m CONFIG_XILLYBUS_PCIE=m -# end of Character devices - # CONFIG_RANDOM_TRUST_CPU is not set CONFIG_RANDOM_TRUST_BOOTLOADER=y +# end of Character devices # # I2C support diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template index 02322021d22..1fb73395efa 100644 --- a/srcpkgs/linux5.4/template +++ b/srcpkgs/linux5.4/template @@ -1,15 +1,18 @@ # Template file for 'linux5.4' pkgname=linux5.4 -version=5.4.217 +version=5.4.218 revision=1 -wrksrc="linux-${version}" +wrksrc="linux-${version%.*}" short_desc="Linux kernel and modules (${version%.*} series)" maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" -distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=2bb826cdf9b2cfce385fb5d51fc8070fe428e467bd3df4ae2a7eb6f0c0cc2e63 +distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz + https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz" +checksum="bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491 + 0e6d67a2db107fb9b6cdf0272076d80782c8a85311a1cd426a2f4c20c9cda97a" python_version=3 +skip_extraction="patch-${version}.xz" nodebug=yes # -dbg package is generated below manually nostrip=yes @@ -44,6 +47,11 @@ export KBUILD_BUILD_TIMESTAMP=${SOURCE_DATE_EPOCH:-0} export KBUILD_BUILD_USER=voidlinux export KBUILD_BUILD_HOST=voidlinux +pre_patch() { + xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | + patch -sNp1 -F0 +} + do_configure() { # 5.4 misses Documentation/DocBook. We ship the directory from 4.12 here. cp -a $FILESDIR/DocBook -t Documentation