From d71b781cedf2a9b95d96454e647a0e82957ba53a Mon Sep 17 00:00:00 2001 From: Dorian Stoll Date: Mon, 15 Feb 2021 10:39:38 +0100 Subject: [PATCH] Update to 5.10.16 Signed-off-by: Dorian Stoll --- .github/workflows/arch.yml | 4 +- .github/workflows/debian.yml | 2 +- pkg/arch/kernel/PKGBUILD | 6 +-- pkg/arch/kernel/config | 42 ++++++++++++++----- pkg/fedora/kernel-surface/kernel-surface.spec | 4 +- 5 files changed, 39 insertions(+), 19 deletions(-) diff --git a/.github/workflows/arch.yml b/.github/workflows/arch.yml index 6b4341cf5..aaaa439e8 100644 --- a/.github/workflows/arch.yml +++ b/.github/workflows/arch.yml @@ -12,7 +12,7 @@ jobs: build: name: Build Kernel runs-on: ubuntu-latest - container: archlinux + container: qzed/archlinux steps: - name: Checkout code uses: actions/checkout@v2 @@ -96,7 +96,7 @@ jobs: name: Update package repository needs: [release] runs-on: ubuntu-latest - container: archlinux + container: qzed/archlinux steps: - name: Install dependencies run: | diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 80418c708..184bb2c97 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -7,7 +7,7 @@ name: Debian env: GPG_KEY_ID: 56C464BAAC421453 - KERNEL_VERSION: 5.10.13 + KERNEL_VERSION: 5.10.16 KERNEL_REVISION: 1 LOCALVERSION: -surface MAINLINE_REPO: git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack diff --git a/pkg/arch/kernel/PKGBUILD b/pkg/arch/kernel/PKGBUILD index 5d0512da8..f3f400d5f 100644 --- a/pkg/arch/kernel/PKGBUILD +++ b/pkg/arch/kernel/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan Alexander Steffens (heftig) pkgbase=linux-surface -pkgver=5.10.13.arch1 +pkgver=5.10.16.arch1 pkgrel=1 pkgdesc='Linux' _shortver=${pkgver%.*} @@ -43,8 +43,8 @@ validpgpkeys=( '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman 'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig) ) -sha256sums=('5b4c6fe538ea3de0e12a1048d781d7076c190129e9866091c207f8a843a0137f' - '458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a' +sha256sums=('8d2c3d8fc7b382c3db6b8bacbc7785e164150b952e706350f2a5a88d42939cb4' + '47a5c0cbe4f75e77fe64953b516a6a9f277c1dfb812e31edf5cb25feb1b3819a' '1ad719eb0d2eea4e364894b71199ee694c23b44269d1e5e9f4fc341fdf09b991' '8cd2b019aac6d3807a5cdcbbbe0aad81e63193ff3e8dffd7a79d4a1421b858f6' '4ce28ed4c0387a44c7f0cf8a28d8b17cbc9a9be037d5d1b2a4cba07bc2a76712' diff --git a/pkg/arch/kernel/config b/pkg/arch/kernel/config index 70c17a550..bf6a4452b 100644 --- a/pkg/arch/kernel/config +++ b/pkg/arch/kernel/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.4-arch1 Kernel Configuration +# Linux/x86 5.10.13-arch1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -2914,7 +2914,7 @@ CONFIG_B53_SRAB_DRIVER=m CONFIG_B53_SERDES=m CONFIG_NET_DSA_BCM_SF2=m CONFIG_NET_DSA_LOOP=m -CONFIG_NET_DSA_LANTIQ_GSWIP=m +# CONFIG_NET_DSA_LANTIQ_GSWIP is not set CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m @@ -3309,7 +3309,7 @@ CONFIG_AT803X_PHY=m CONFIG_QSEMI_PHY=m CONFIG_REALTEK_PHY=m CONFIG_RENESAS_PHY=m -CONFIG_ROCKCHIP_PHY=m +# CONFIG_ROCKCHIP_PHY is not set CONFIG_SMSC_PHY=m CONFIG_STE10XP=m CONFIG_TERANETICS_PHY=m @@ -3832,7 +3832,7 @@ CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_MTK_PMIC=m CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y +CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ALPS=y CONFIG_MOUSE_PS2_BYD=y CONFIG_MOUSE_PS2_LOGIPS2PP=y @@ -4157,7 +4157,7 @@ CONFIG_SERIAL_UARTLITE_NR_UARTS=1 CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_LANTIQ=m +# CONFIG_SERIAL_LANTIQ is not set CONFIG_SERIAL_SCCNXP=m CONFIG_SERIAL_SC16IS7XX_CORE=m CONFIG_SERIAL_SC16IS7XX=m @@ -4397,11 +4397,11 @@ CONFIG_SPI_DLN2=m CONFIG_SPI_NXP_FLEXSPI=m CONFIG_SPI_GPIO=m CONFIG_SPI_LM70_LLP=m -CONFIG_SPI_LANTIQ_SSC=m +# CONFIG_SPI_LANTIQ_SSC is not set CONFIG_SPI_OC_TINY=m CONFIG_SPI_PXA2XX=m CONFIG_SPI_PXA2XX_PCI=m -CONFIG_SPI_ROCKCHIP=m +# CONFIG_SPI_ROCKCHIP is not set CONFIG_SPI_SC18IS602=m CONFIG_SPI_SIFIVE=m CONFIG_SPI_MXIC=m @@ -5360,7 +5360,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_RADIO_SUPPORT=y # CONFIG_MEDIA_SDR_SUPPORT is not set CONFIG_MEDIA_PLATFORM_SUPPORT=y -# CONFIG_MEDIA_TEST_SUPPORT is not set +CONFIG_MEDIA_TEST_SUPPORT=y # end of Media device types CONFIG_VIDEO_DEV=m @@ -5388,6 +5388,11 @@ CONFIG_VIDEOBUF_VMALLOC=m # Media controller options # CONFIG_MEDIA_CONTROLLER_DVB=y +CONFIG_MEDIA_CONTROLLER_REQUEST_API=y + +# +# Please notice that the enabled Media controller Request API is EXPERIMENTAL +# # end of Media controller options # @@ -5683,6 +5688,7 @@ CONFIG_VIDEO_SAA7146_VV=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y # CONFIG_SMS_SIANO_DEBUGFS is not set +CONFIG_VIDEO_V4L2_TPG=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_CAFE_CCIC=m CONFIG_VIDEO_CADENCE=y @@ -5697,6 +5703,15 @@ CONFIG_DVB_PLATFORM_DRIVERS=y # MMC/SDIO DVB adapters # CONFIG_SMS_SDIO_DRV=m +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIMC=m +CONFIG_VIDEO_VIVID=m +CONFIG_VIDEO_VIVID_CEC=y +CONFIG_VIDEO_VIVID_MAX_DEVS=64 +CONFIG_VIDEO_VIM2M=m +CONFIG_VIDEO_VICODEC=m +CONFIG_DVB_TEST_DRIVERS=y +CONFIG_DVB_VIDTV=m # # FireWire (IEEE 1394) Adapters @@ -6034,6 +6049,11 @@ CONFIG_DVB_HELENE=m # CONFIG_DVB_CXD2099=m CONFIG_DVB_SP2=m + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m # end of Media ancillary drivers # @@ -9367,7 +9387,8 @@ CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_HASH=y CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y # CONFIG_SECURITY_APPARMOR_DEBUG is not set -# CONFIG_SECURITY_LOADPIN is not set +CONFIG_SECURITY_LOADPIN=y +CONFIG_SECURITY_LOADPIN_ENFORCE=y CONFIG_SECURITY_YAMA=y CONFIG_SECURITY_SAFESETID=y CONFIG_SECURITY_LOCKDOWN_LSM=y @@ -9382,7 +9403,7 @@ CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y # CONFIG_DEFAULT_SECURITY_TOMOYO is not set # CONFIG_DEFAULT_SECURITY_APPARMOR is not set CONFIG_DEFAULT_SECURITY_DAC=y -CONFIG_LSM="lockdown,yama" +CONFIG_LSM="lockdown,yama,bpf" # # Kernel hardening options @@ -9753,7 +9774,6 @@ CONFIG_NEED_SG_DMA_LENGTH=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y -CONFIG_DMA_VIRT_OPS=y CONFIG_SWIOTLB=y CONFIG_DMA_COHERENT_POOL=y CONFIG_DMA_CMA=y diff --git a/pkg/fedora/kernel-surface/kernel-surface.spec b/pkg/fedora/kernel-surface/kernel-surface.spec index 14ba2307f..6ef9a11b8 100755 --- a/pkg/fedora/kernel-surface/kernel-surface.spec +++ b/pkg/fedora/kernel-surface/kernel-surface.spec @@ -2,8 +2,8 @@ # Definitions to configure the kernel we want to build # -%global kernel_tag_fc33 kernel-5.10.13-200.fc33 -%global kernel_tag_fc32 kernel-5.10.13-100.fc32 +%global kernel_tag_fc33 kernel-5.10.16-200.fc33 +%global kernel_tag_fc32 kernel-5.10.16-100.fc32 %global kernel_release_fc33 1 %global kernel_release_fc32 1