diff options
| -rw-r--r-- | PKGBUILD | 35 | ||||
| -rw-r--r-- | config | 82 |
2 files changed, 49 insertions, 68 deletions
@@ -1,7 +1,7 @@ # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org> pkgbase=linux-kentdobias -_kver=6.1.10.arch1 +_kver=6.1.12.kd1 _zver=2.1.9 pkgver="${_kver}_${_zver}" pkgrel=2 @@ -12,7 +12,6 @@ arch=(x86_64) license=(GPL2) makedepends=( bc libelf pahole cpio perl tar xz gettext - xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick texlive-latexextra git ) options=('!strip') @@ -31,7 +30,7 @@ validpgpkeys=( ) sha256sums=('SKIP' '6b172cdf2eb54e17fcd68f900fab33c1430c5c59848fa46fab83614922fe50f6' - '50b856cca87cb2ca9a2e19d3752df64b9423591264e4f6ad1cca731a526d8c63') + '73a01984e18525288b5ada418878172ae514a1888c0bc3ff2598487e864f3754') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase @@ -40,17 +39,7 @@ export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EP _make='make LLVM=1' prepare() { - cd zfs-${_zver} - ./autogen.sh - KERNEL_LLVM=1 CC=clang ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \ - --libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \ - --with-udevdir=/usr/lib/udev --libexecdir=/usr/lib \ - --enable-systemd --enable-pyzfs \ - --with-zfsexecdir=/usr/lib/zfs --localstatedir=/var \ - --enable-linux-builtin --with-linux=../$_srcname - ./copy-builtin ../$_srcname - - cd ../$_srcname + cd $_srcname echo "Setting version..." scripts/setlocalversion --save-scmversion @@ -68,6 +57,22 @@ prepare() { echo "Setting config..." cp ../config .config + $_make prepare + + cd ../zfs-${_zver} + ./autogen.sh + KERNEL_LLVM=1 CC=clang ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \ + --libdir=/usr/lib --datadir=/usr/share --includedir=/usr/include \ + --with-udevdir=/usr/lib/udev --libexecdir=/usr/lib \ + --enable-systemd --enable-pyzfs \ + --with-zfsexecdir=/usr/lib/zfs --localstatedir=/var \ + --enable-linux-builtin --with-linux=../$_srcname + ./copy-builtin ../$_srcname + + cd ../$_srcname + + echo "Setting config..." + cp ../config .config $_make olddefconfig diff -u ../config .config || : @@ -190,7 +195,7 @@ _package-headers() { ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase" } -pkgname=("$pkgbase" "$pkgbase-headers") +pkgname=("$pkgbase") for _p in "${pkgname[@]}"; do eval "package_$_p() { $(declare -f "_package${_p#$pkgbase}") @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.10-arch1 Kernel Configuration +# Linux/x86 6.1.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="clang version 15.0.7" CONFIG_GCC_VERSION=0 @@ -239,7 +239,6 @@ CONFIG_UTS_NS=y CONFIG_TIME_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y -CONFIG_USER_NS_UNPRIVILEGED=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_CHECKPOINT_RESTORE=y @@ -574,7 +573,7 @@ CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_AC=y CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BUTTON=y -CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_VIDEO=y CONFIG_ACPI_FAN=y # CONFIG_ACPI_TAD is not set CONFIG_ACPI_DOCK=y @@ -952,7 +951,6 @@ CONFIG_EFI_PARTITION=y CONFIG_BLOCK_COMPAT=y CONFIG_BLK_MQ_PCI=y CONFIG_BLK_MQ_VIRTIO=y -CONFIG_BLK_MQ_RDMA=y CONFIG_BLK_PM=y CONFIG_BLOCK_HOLDER_DEPRECATED=y CONFIG_BLK_MQ_STACKING=y @@ -1150,7 +1148,6 @@ CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y # CONFIG_NET_KEY is not set -# CONFIG_SMC is not set CONFIG_XDP_SOCKETS=y # CONFIG_XDP_SOCKETS_DIAG is not set CONFIG_INET=y @@ -1862,7 +1859,6 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8 # NVME Support # # CONFIG_BLK_DEV_NVME is not set -# CONFIG_NVME_RDMA is not set # CONFIG_NVME_FC is not set # CONFIG_NVME_TCP is not set # CONFIG_NVME_TARGET is not set @@ -3812,7 +3808,7 @@ CONFIG_RC_DEVICES=y # CONFIG_RC_ATI_REMOTE is not set # CONFIG_RC_LOOPBACK is not set # CONFIG_RC_XBOX_DVD is not set -CONFIG_CEC_CORE=m +CONFIG_CEC_CORE=y # # CEC support @@ -4486,7 +4482,7 @@ CONFIG_AGP=y # CONFIG_AGP_INTEL is not set # CONFIG_AGP_SIS is not set # CONFIG_AGP_VIA is not set -CONFIG_INTEL_GTT=m +CONFIG_INTEL_GTT=y CONFIG_VGA_SWITCHEROO=y CONFIG_DRM=y CONFIG_DRM_MIPI_DSI=y @@ -4496,14 +4492,14 @@ CONFIG_DRM_KMS_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_LOAD_EDID_FIRMWARE=y -CONFIG_DRM_DISPLAY_HELPER=m +CONFIG_DRM_DISPLAY_HELPER=y CONFIG_DRM_DISPLAY_DP_HELPER=y CONFIG_DRM_DISPLAY_HDCP_HELPER=y CONFIG_DRM_DISPLAY_HDMI_HELPER=y CONFIG_DRM_DP_AUX_CHARDEV=y CONFIG_DRM_DP_CEC=y -CONFIG_DRM_TTM=m -CONFIG_DRM_BUDDY=m +CONFIG_DRM_TTM=y +CONFIG_DRM_BUDDY=y CONFIG_DRM_GEM_SHMEM_HELPER=y # @@ -4523,7 +4519,7 @@ CONFIG_DRM_GEM_SHMEM_HELPER=y # CONFIG_DRM_RADEON is not set # CONFIG_DRM_AMDGPU is not set # CONFIG_DRM_NOUVEAU is not set -CONFIG_DRM_I915=m +CONFIG_DRM_I915=y CONFIG_DRM_I915_FORCE_PROBE="*" CONFIG_DRM_I915_CAPTURE_ERROR=y CONFIG_DRM_I915_COMPRESS_ERROR=y @@ -4705,14 +4701,14 @@ CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y # CONFIG_LOGO is not set # end of Graphics support -CONFIG_SOUND=m +CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_SEQ_DEVICE=m +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_SEQ_DEVICE=y CONFIG_SND_RAWMIDI=m CONFIG_SND_JACK=y CONFIG_SND_JACK_INPUT_DEV=y @@ -4720,7 +4716,7 @@ CONFIG_SND_OSSEMUL=y # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set CONFIG_SND_PCM_TIMER=y -CONFIG_SND_HRTIMER=m +CONFIG_SND_HRTIMER=y CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_MAX_CARDS=32 # CONFIG_SND_SUPPORT_OLD_API is not set @@ -4736,9 +4732,9 @@ CONFIG_SND_CTL_INPUT_VALIDATION=y # CONFIG_SND_JACK_INJECTION_DEBUG is not set CONFIG_SND_VMASTER=y CONFIG_SND_DMA_SGBUF=y -CONFIG_SND_CTL_LED=m -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND_CTL_LED=y +CONFIG_SND_SEQUENCER=y +CONFIG_SND_SEQ_DUMMY=y # CONFIG_SND_SEQUENCER_OSS is not set CONFIG_SND_SEQ_HRTIMER_DEFAULT=y CONFIG_SND_SEQ_MIDI_EVENT=m @@ -4821,19 +4817,19 @@ CONFIG_SND_PCI=y # # HD-Audio # -CONFIG_SND_HDA=m +CONFIG_SND_HDA=y CONFIG_SND_HDA_GENERIC_LEDS=y -CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_INTEL=y CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_PATCH_LOADER=y -CONFIG_SND_HDA_CODEC_REALTEK=m +CONFIG_SND_HDA_CODEC_REALTEK=y # CONFIG_SND_HDA_CODEC_ANALOG is not set # CONFIG_SND_HDA_CODEC_SIGMATEL is not set # CONFIG_SND_HDA_CODEC_VIA is not set -CONFIG_SND_HDA_CODEC_HDMI=m +CONFIG_SND_HDA_CODEC_HDMI=y # CONFIG_SND_HDA_CODEC_CIRRUS is not set # CONFIG_SND_HDA_CODEC_CS8409 is not set # CONFIG_SND_HDA_CODEC_CONEXANT is not set @@ -4841,18 +4837,18 @@ CONFIG_SND_HDA_CODEC_HDMI=m # CONFIG_SND_HDA_CODEC_CA0132 is not set # CONFIG_SND_HDA_CODEC_CMEDIA is not set # CONFIG_SND_HDA_CODEC_SI3054 is not set -CONFIG_SND_HDA_GENERIC=m +CONFIG_SND_HDA_GENERIC=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y # end of HD-Audio -CONFIG_SND_HDA_CORE=m +CONFIG_SND_HDA_CORE=y CONFIG_SND_HDA_COMPONENT=y CONFIG_SND_HDA_I915=y CONFIG_SND_HDA_PREALLOC_SIZE=0 CONFIG_SND_INTEL_NHLT=y -CONFIG_SND_INTEL_DSP_CONFIG=m -CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m +CONFIG_SND_INTEL_DSP_CONFIG=y +CONFIG_SND_INTEL_SOUNDWIRE_ACPI=y CONFIG_SND_SPI=y CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=m @@ -5292,7 +5288,7 @@ CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_PANIC=y # CONFIG_LEDS_TRIGGER_NETDEV is not set # CONFIG_LEDS_TRIGGER_PATTERN is not set -CONFIG_LEDS_TRIGGER_AUDIO=m +CONFIG_LEDS_TRIGGER_AUDIO=y # CONFIG_LEDS_TRIGGER_TTY is not set # @@ -5307,24 +5303,7 @@ CONFIG_A11Y_BRAILLE_CONSOLE=y # CONFIG_SPEAKUP is not set # end of Speakup console speech -CONFIG_INFINIBAND=m -# CONFIG_INFINIBAND_USER_MAD is not set -# CONFIG_INFINIBAND_USER_ACCESS is not set -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y -CONFIG_INFINIBAND_VIRT_DMA=y -# CONFIG_MLX4_INFINIBAND is not set -# CONFIG_INFINIBAND_MTHCA is not set -# CONFIG_INFINIBAND_OCRDMA is not set -# CONFIG_INFINIBAND_RDMAVT is not set -# CONFIG_RDMA_RXE is not set -# CONFIG_RDMA_SIW is not set -# CONFIG_INFINIBAND_IPOIB is not set -# CONFIG_INFINIBAND_SRP is not set -# CONFIG_INFINIBAND_ISER is not set -# CONFIG_INFINIBAND_RTRS_CLIENT is not set -# CONFIG_INFINIBAND_RTRS_SERVER is not set -# CONFIG_INFINIBAND_OPA_VNIC is not set +# CONFIG_INFINIBAND is not set CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EDAC=y @@ -5625,7 +5604,7 @@ CONFIG_SURFACE_PLATFORMS=y # CONFIG_SURFACE_PRO3_BUTTON is not set # CONFIG_SURFACE_AGGREGATOR is not set CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACPI_WMI=m +CONFIG_ACPI_WMI=y # CONFIG_WMI_BMOF is not set # CONFIG_HUAWEI_WMI is not set CONFIG_MXM_WMI=m @@ -6186,7 +6165,6 @@ CONFIG_SUNRPC_GSS=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES=y CONFIG_SUNRPC_DEBUG=y -CONFIG_SUNRPC_XPRT_RDMA=m # CONFIG_CEPH_FS is not set # CONFIG_CIFS is not set # CONFIG_SMB_SERVER is not set @@ -6267,7 +6245,6 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y -CONFIG_SECURITY_INFINIBAND=y CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set @@ -6724,7 +6701,6 @@ CONFIG_CLZ_TAB=y CONFIG_IRQ_POLL=y CONFIG_MPILIB=y CONFIG_SIGNATURE=y -CONFIG_DIMLIB=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y CONFIG_HAVE_GENERIC_VDSO=y |