| -rw-r--r-- | README.md | 20 | ||||
| -rw-r--r-- | config/base-aarch64.config | 50 | ||||
| -rw-r--r-- | kernel-surface.spec | 6 | ||||
| m--------- | overlay | 0 | ||||
| -rw-r--r-- | patch-order.txt | 7 |
5 files changed, 37 insertions, 46 deletions
@@ -16,20 +16,20 @@ Used in [Fedora KIWI descriptions, modified by me for Surface Pro 12"](https://s ## Configuration The starting point is `config/base-aarch64.config`: Fedora's own aarch64 -kernel config, taken verbatim from the `config` file. It is vendored rather -than downloaded, so the build depends on no third-party host and a refresh -shows up as a reviewable diff. To refresh it for a newer Fedora, replace -everything below the comment header with: +kernel config, taken verbatim from the `config` file inside +`kernel-core-7.2.0-61.fc45.aarch64.rpm`. It is vendored rather than downloaded, +so the build depends on no third-party host and a refresh shows up as a +reviewable diff. To refresh it for a newer Fedora, replace everything below the +comment header with: ```bash dnf download kernel-core --arch aarch64 -rpm2archive -n - < kernel-core-*.aarch64.rpm | - tar -xO --wildcards '*/modules/*/config' | - wl-copy +rpm2cpio kernel-core-*.aarch64.rpm | cpio -idm './usr/lib/modules/*/config' ``` -If the extraction comes up empty, `rpm -qlp kernel-core-*.aarch64.rpm | grep -config` says whether the package still carries the file at all. +The overlay's ebuild seeds itself from the same Fedora config by way of a +Gentoo-side fork, `projg2/fedora-kernel-config-for-gentoo`. That repository no +longer exists, which is why the base config lives here instead. Three fragments are merged on top with `scripts/kconfig/merge_config.sh`: @@ -62,7 +62,7 @@ matches the ISO (the project README notes Secure Boot is not available for it). ```bash dnf config-manager addrepo --from-repofile=\ - https://f003.backblazeb2.com/file/dist-sayagit-fedora-rpm/fedora/46/kernel-sp12in.repo + https://f003.backblazeb2.com/file/dist-sayagit-fedora-rpm/fedora/45/kernel-sp12in.repo ``` ## Building diff --git a/config/base-aarch64.config b/config/base-aarch64.config index 024cb0e..8ccb3a9 100644 --- a/config/base-aarch64.config +++ b/config/base-aarch64.config @@ -1,6 +1,6 @@ # Fedora's own aarch64 kernel configuration, used as the starting point for # this package. Taken verbatim from the config shipped inside -# kernel-core-7.3.0-0.rc0.260819gbd5f485f3f02.5.fc46.aarch64.rpm: +# kernel-core-7.2.0-61.fc45.aarch64.rpm: # # dnf download kernel-core --arch aarch64 # rpm2cpio kernel-core-*.aarch64.rpm | @@ -12,7 +12,7 @@ # top of it in %prep; do not edit this file by hand. # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 7.3.0-0.rc0.260819gbd5f485f3f02.5.fc46.aarch64 Kernel Configuration +# Linux/arm64 7.2.0-61.fc45.aarch64 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 16.1.1 20260703 (Red Hat 16.1.1-4)" CONFIG_CC_IS_GCC=y @@ -56,7 +56,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_UAPI_HEADER_TEST=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_BUILD_SALT="7.3.0-0.rc0.260819gbd5f485f3f02.5.fc46.aarch64" +CONFIG_BUILD_SALT="7.2.0-61.fc45.aarch64" CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_ZSTD=y # CONFIG_KERNEL_GZIP is not set @@ -147,7 +147,6 @@ CONFIG_ARCH_HAS_PREEMPT_LAZY=y CONFIG_PREEMPT_LAZY=y # CONFIG_PREEMPT_RT is not set CONFIG_PREEMPT_COUNT=y -CONFIG_HAS_SEPARATE_PREEMPT_RESCHED_BITS=y CONFIG_PREEMPTION=y CONFIG_PREEMPT_DYNAMIC=y CONFIG_SCHED_CORE=y @@ -483,7 +482,7 @@ CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y CONFIG_ARM64_ERRATUM_1165522=y CONFIG_ARM64_ERRATUM_1319367=y CONFIG_ARM64_ERRATUM_1530923=y -CONFIG_ARM64_WORKAROUND_REPEAT_TLBI_SYNC=y +CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y CONFIG_ARM64_ERRATUM_2441007=y CONFIG_ARM64_ERRATUM_1286807=y CONFIG_ARM64_ERRATUM_1463225=y @@ -530,7 +529,6 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y CONFIG_QCOM_FALKOR_ERRATUM_E1041=y CONFIG_ARM64_WORKAROUND_DISABLE_CNP=y CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y -CONFIG_NVIDIA_OLYMPUS_1027_ERRATUM=y CONFIG_ROCKCHIP_ERRATUM_3568002=y CONFIG_ROCKCHIP_ERRATUM_3588001=y CONFIG_SOCIONEXT_SYNQUACER_PREITS=y @@ -1082,7 +1080,7 @@ CONFIG_BLK_CGROUP_IOPRIO=y CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_SED_OPAL=y CONFIG_BLK_INLINE_ENCRYPTION=y -CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y +# CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK is not set # # Partition Types @@ -1136,7 +1134,6 @@ CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y CONFIG_QUEUED_SPINLOCKS=y -# CONFIG_QUEUED_SPINLOCKS_TRACE_CONTENDED_RELEASE is not set CONFIG_ARCH_USE_QUEUED_RWLOCKS=y CONFIG_QUEUED_RWLOCKS=y CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y @@ -2578,7 +2575,6 @@ CONFIG_ARM_SCMI_POWER_CONTROL=y CONFIG_ARM_SCPI_PROTOCOL=m CONFIG_ARM_SDE_INTERFACE=y -# CONFIG_ARM_SDEI_NMI is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_DMIID=y CONFIG_DMI_SYSFS=y @@ -2642,8 +2638,6 @@ CONFIG_ARM_PSCI_FW=y # # Qualcomm firmware drivers # -CONFIG_QCOM_PAS=y -# CONFIG_QCOM_PAS_TEE is not set CONFIG_QCOM_SCM=y CONFIG_QCOM_TZMEM=y CONFIG_QCOM_TZMEM_MODE_GENERIC=y @@ -10984,7 +10978,6 @@ CONFIG_MESON_GX_SOCINFO=y # Apple SoC drivers # CONFIG_APPLE_MAILBOX=m -# CONFIG_APPLE_PMGR_MISC is not set CONFIG_APPLE_RTKIT=m CONFIG_APPLE_SART=m CONFIG_APPLE_TUNABLE=m @@ -11035,15 +11028,24 @@ CONFIG_SOC_IMX9=m # end of Enable LiteX SoC Builder specific drivers CONFIG_WPCM450_SOC=m -CONFIG_QCOM_SOC=y + +# +# Qualcomm SoC drivers +# CONFIG_QCOM_AOSS_QMP=m CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_GENI_SE=y +CONFIG_QCOM_GSBI=y CONFIG_QCOM_LLCC=m +CONFIG_QCOM_KRYO_L2_ACCESSORS=y +CONFIG_QCOM_MDT_LOADER=m CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PD_MAPPER=m +CONFIG_QCOM_PDR_HELPERS=m +CONFIG_QCOM_PDR_MSG=m CONFIG_QCOM_PMIC_PDCHARGER_ULOG=m CONFIG_QCOM_PMIC_GLINK=m +CONFIG_QCOM_QMI_HELPERS=m CONFIG_QCOM_RAMP_CTRL=m CONFIG_QCOM_RMTFS_MEM=m CONFIG_QCOM_RPM_MASTER_STATS=m @@ -11059,13 +11061,10 @@ CONFIG_QCOM_STATS=m CONFIG_QCOM_WCNSS_CTRL=m CONFIG_QCOM_APR=m CONFIG_QCOM_ICC_BWMON=m -CONFIG_QCOM_PBS=m CONFIG_QCOM_INLINE_CRYPTO_ENGINE=m -CONFIG_QCOM_KRYO_L2_ACCESSORS=y -CONFIG_QCOM_MDT_LOADER=m -CONFIG_QCOM_PDR_HELPERS=m -CONFIG_QCOM_PDR_MSG=m -CONFIG_QCOM_QMI_HELPERS=m +CONFIG_QCOM_PBS=m +# end of Qualcomm SoC drivers + CONFIG_QCOM_UBWC_CONFIG=m CONFIG_SOC_RENESAS=y CONFIG_ARCH_RCAR_GEN3=y @@ -12594,6 +12593,7 @@ CONFIG_FSCACHE_STATS=y CONFIG_CACHEFILES=m # CONFIG_CACHEFILES_DEBUG is not set # CONFIG_CACHEFILES_ERROR_INJECTION is not set +CONFIG_CACHEFILES_ONDEMAND=y # end of Caches # @@ -12663,6 +12663,7 @@ CONFIG_HFSPLUS_FS=m CONFIG_HFSPLUS_KUNIT_TEST=m # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set CONFIG_JFFS2_FS=m CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y @@ -12702,6 +12703,7 @@ CONFIG_SQUASHFS_ZSTD=y # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_EMBEDDED is not set CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set CONFIG_MINIX_FS=m # CONFIG_OMFS_FS is not set # CONFIG_HPFS_FS is not set @@ -13379,13 +13381,7 @@ CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CRYPTO_LIB_AES=y CONFIG_CRYPTO_LIB_AES_ARCH=y CONFIG_CRYPTO_LIB_AESCFB=y -CONFIG_CRYPTO_LIB_AES_CBC=y CONFIG_CRYPTO_LIB_AES_CBC_MACS=y -CONFIG_CRYPTO_LIB_AES_CCM=y -CONFIG_CRYPTO_LIB_AES_CTR=y -CONFIG_CRYPTO_LIB_AES_ECB=y -CONFIG_CRYPTO_LIB_AES_GCM=y -CONFIG_CRYPTO_LIB_AES_XTS=y CONFIG_CRYPTO_LIB_ARC4=m CONFIG_CRYPTO_LIB_GF128MUL=m CONFIG_CRYPTO_LIB_BLAKE2B=y @@ -13524,7 +13520,7 @@ CONFIG_DIMLIB=y CONFIG_LIBFDT=y CONFIG_OID_REGISTRY=y CONFIG_UCS2_STRING=y -CONFIG_VDSO_DATASTORE=y +CONFIG_HAVE_GENERIC_VDSO=y CONFIG_GENERIC_GETTIMEOFDAY=y CONFIG_VDSO_GETRANDOM=y CONFIG_FONT_SUPPORT=y @@ -14029,8 +14025,6 @@ CONFIG_STACKINIT_KUNIT_TEST=m CONFIG_FORTIFY_KUNIT_TEST=m CONFIG_LONGEST_SYM_KUNIT_TEST=m CONFIG_CRYPTO_LIB_AES_CBC_MACS_KUNIT_TEST=m -CONFIG_CRYPTO_LIB_AES_CCM_KUNIT_TEST=m -CONFIG_CRYPTO_LIB_AES_GCM_KUNIT_TEST=m CONFIG_CRYPTO_LIB_BLAKE2B_KUNIT_TEST=m CONFIG_CRYPTO_LIB_BLAKE2S_KUNIT_TEST=m CONFIG_CRYPTO_LIB_CHACHA20POLY1305_KUNIT_TEST=m diff --git a/kernel-surface.spec b/kernel-surface.spec index e3991df..dc29ae3 100644 --- a/kernel-surface.spec +++ b/kernel-surface.spec @@ -12,7 +12,7 @@ # passes them in with --define, which takes precedence -- so keep the plain # `%%global <name> <value>` shape, which make-sources.sh reads with awk. %if %{undefined upstream_ver} -%global upstream_ver 7.3-rc1 +%global upstream_ver 7.2.3 %endif # Bumped whenever the patch tarball changes without the upstream version moving. @@ -233,9 +233,5 @@ fi %ghost %attr(0644,root,root) /boot/vmlinuz-%{kverrel} %changelog -* Sun Sep 06 2026 Saya Andy 7.3.0-1 -- Moved onto Linux kernel 7.3.0-rc1 -- Updated used Gentoo overlay onto the newest dbb15bd8 commit - * Sun Sep 06 2026 Saya Andy 7.2.3-1 - Initial package: vanilla 7.2.3 with the overlay's Surface Pro 12" patch set diff --git a/overlay b/overlay -Subproject dbb15bd83c1158af92f83c87556a81c207aa658 +Subproject b8ef9b54f09965d7e30ce03b3a70f5a36f4591b diff --git a/patch-order.txt b/patch-order.txt index 1251649..334f847 100644 --- a/patch-order.txt +++ b/patch-order.txt @@ -1,19 +1,20 @@ # Patch directories under the Gentoo overlay's sys-kernel/vanilla-kernel/files, # in application order. # -# This mirrors the loop in vanilla-kernel-7.3_rc1.ebuild's src_prepare(), minus -# rockchip (irrelevant) and gpu (does not exist at the pinned overlay commit). +# This mirrors the loop in vanilla-kernel-7.2.3.ebuild's src_prepare(), minus +# rockchip (irrelevant). There is no phy directory at this overlay commit; the +# CSI-2 D-PHY driver is part of the camera series here. other audio clk pci remoteproc +gpu usb video wifi input el2 -phy camera irq surface |