Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

linux-postmarketos-asahi: upgrade to 6.17.5-1

Browse source 
Upstream now has a fragment so we no longer need 'device.config', but
there are some bugs with it (reported upstream) so we need to patch it
for now.

pmos.config fragment was also re-sync'd with kconfigcheck.toml

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7224>
This commit is contained in:
Clayton Craft 2025-10-20 22:22:13 -07:00 • committed by The Friendly Merge Bot
parent ae140cb6b8
commit ac433eed9c
No known key found for this signature in database
5 changed files with 89 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

14
device/testing/linux-postmarketos-asahi/APKBUILD
View file

@ -1,6 +1,6 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=linux-postmarketos-asahi
pkgver=6.16.8_p1
pkgver=6.17.5_p1
pkgrel=0
_rel=${pkgver#*_p}
_kver=${pkgver%_p*}
@ -48,7 +48,7 @@ makedepends="
_repository="linux"
source="
$pkgname-$_asahiver.tar.gz::https://github.com/AsahiLinux/linux/archive/refs/tags/asahi-$_asahiver.tar.gz
device.config
asahi.config.patch
misc.config
pmos.config
"
@ -68,7 +68,7 @@ prepare() {
unset LDFLAGS
make ARCH="$_carch" CC="${CC:-gcc}" \
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor" \
"$_defconfig" device.config misc.config pmos.config
"$_defconfig" asahi.config misc.config pmos.config
}
build() {
@ -95,8 +95,8 @@ package() {
}
sha512sums="
bd5d3c29282e1b55d045dad4a894cfa7a7d2ea991a3bdf372323d0df25e0059092439b2987d8ed05e1db17d92319ed613711ee29a3031f70620f63aecadc5c25 linux-postmarketos-asahi-6.16.8-1.tar.gz
860a7fbf519b09c194e79a0c54f827048a6dd4c52d13532d92c5d040743c9af58c2ffa37f36ae66781a919abd49cad766b2e5b8768273b5ec3de66ac59efb682 device.config
e7a651b3780b1cfa68ca65b9e62f77db4273cf5b9162514318c347790d961b4668d0c6eb51604aaaf15a15c9f370fe03b4b977163293af379fda9a08d5f7e73d misc.config
a3ca72c9ecc41684b958aad9a77d99f759ff56664eeac048d5ca715ce946b27ef3b6db6f1b65aa9e616131501afa50b0acda4d0a7c2b880530151cdfa9d236da pmos.config
3cc4af2b8d935b67ef61091f647dc88b884e09cf31505b786b560a970cb5f8d6e54d47f03bbe27cbe8951539baba4db208bfd35cddc6e9474c126442587251b2 linux-postmarketos-asahi-6.17.5-1.tar.gz
28b00587b6bccbfb870e44f1e9fc459b2fa0fad2eb4e39a316b55d8a76907e6420a59190b94fe5410ae1ff50c0b4be7733995f0735a4b25da1fae9e230d33b09 asahi.config.patch
2d4edfd9cdc320ede0913cf25afe95b9db46284efc97b282c61f30f85345eec3da8a063b8941e4c44e6393acbe6bf777ce04b2af85c52f65dbf549dc8864358f misc.config
e384ea875e249f1039ac2ff2bc2bd775cf18a074722dc74a1cca741caca1cd8ed8db4c2b769941b4b8468b42a59e6ca08454321ed99889b275d1ee7955ce864f pmos.config
"

12
device/testing/linux-postmarketos-asahi/asahi.config.patch Normal file
View file

@ -0,0 +1,12 @@
diff --git arch/arm64/configs/asahi.config arch/arm64/configs/asahi.config
index f47b8e762005..6c287b81785c 100644
--- a/arch/arm64/configs/asahi.config
+++ b/arch/arm64/configs/asahi.config
@@ -24,6 +24,7 @@ CONFIG_CHARGER_MACSMC=m
CONFIG_SENSORS_MACSMC_HWMON=m
CONFIG_APPLE_WATCHDOG=m
CONFIG_VIDEO_APPLE_ISP=m
+CONFIG_DRM=y
CONFIG_DRM_ASAHI=m
CONFIG_DRM_ADP=m
CONFIG_DRM_APPLE=m

176
device/testing/linux-postmarketos-asahi/device.config
View file

@ -1,176 +0,0 @@
# FROM: https://github.com/chadmed/asahi-overlay/tree/main/sys-kernel/asahi-kernel/files
# CONFIG_GCC_PLUGINS is not set
CONFIG_APPLE_ADMAC=y
CONFIG_APPLE_AIC=y
CONFIG_APPLE_AOP=y
CONFIG_APPLE_DART=y
CONFIG_APPLE_DOCKCHANNEL=y
CONFIG_APPLE_M1_CPU_PMU=y
CONFIG_APPLE_MAILBOX=y
CONFIG_APPLE_MBOX=y
CONFIG_APPLE_MFI_FASTCHARGE=m
CONFIG_APPLE_PLATFORMS=y
CONFIG_APPLE_PMGR_MISC=y
CONFIG_APPLE_PMGR_PWRSTATE=y
CONFIG_APPLE_RTKIT=y
CONFIG_APPLE_RTKIT_HELPER=y
CONFIG_APPLE_SART=y
CONFIG_APPLE_SEP=y
CONFIG_APPLE_SIO=m
CONFIG_APPLE_SMC=y
CONFIG_APPLE_SMC_RTKIT=y
CONFIG_APPLE_WATCHDOG=y
CONFIG_AQTION=m
CONFIG_ARCH_APPLE=y
# CONFIG_ARCH_ACTIONS is not set
# CONFIG_ARCH_AIROHA is not set
# CONFIG_ARCH_SUNXI is not set
# CONFIG_ARCH_ALPINE is not set
# CONFIG_ARCH_BCM is not set
# CONFIG_ARCH_BCM2835 is not set
# CONFIG_ARCH_BCM_IPROC is not set
# CONFIG_ARCH_BCMBCA is not set
# CONFIG_ARCH_BRCMSTB is not set
# CONFIG_ARCH_BERLIN is not set
# CONFIG_ARCH_BITMAIN is not set
# CONFIG_ARCH_BLAIZE is not set
# CONFIG_ARCH_EXYNOS is not set
# CONFIG_ARCH_SPARX5 is not set
# CONFIG_ARCH_K3 is not set
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_HISI is not set
# CONFIG_ARCH_KEEMBAY is not set
# CONFIG_ARCH_MEDIATEK is not set
# CONFIG_ARCH_MESON is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_NXP is not set
# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_S32 is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_NPCM is not set
# CONFIG_ARCH_PENSANDO is not set
# CONFIG_ARCH_QCOM is not set
# CONFIG_ARCH_REALTEK is not set
# CONFIG_ARCH_RENESAS is not set
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_SEATTLE is not set
# CONFIG_ARCH_INTEL_SOCFPGA is not set
# CONFIG_ARCH_STM32 is not set
# CONFIG_ARCH_SYNQUACER is not set
# CONFIG_ARCH_TEGRA is not set
# CONFIG_ARCH_SPRD is not set
# CONFIG_ARCH_THUNDER is not set
# CONFIG_ARCH_THUNDER2 is not set
# CONFIG_ARCH_UNIPHIER is not set
# CONFIG_ARCH_VEXPRESS is not set
# CONFIG_ARCH_VISCONTI is not set
# CONFIG_ARCH_XGENE is not set
# CONFIG_ARCH_ZYNQMP is not set
# CONFIG_ARM64_4K_PAGES is not set
CONFIG_ARM64_16K_PAGES=y
# CONFIG_ARM64_64K_PAGES is not set
CONFIG_ARM64_ACTLR_STATE=y
CONFIG_ARM64_MEMORY_MODEL_CONTROL=y
CONFIG_ARM_APPLE_CPUIDLE=y
CONFIG_ARM_APPLE_SOC_CPUFREQ=y
CONFIG_BRCMFMAC=m
CONFIG_BRCMFMAC_PCIE=y
CONFIG_BRCMFMAC_PROTO_BCDC=y
CONFIG_BRCMFMAC_PROTO_MSGBUF=y
CONFIG_BRCMFMAC_USB=y
CONFIG_BT=m
CONFIG_BT_BNEP=m
CONFIG_BT_BREDR=y
CONFIG_BT_HCIBCM4377=m
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HIDP=m
CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_RFCOMM=m
CONFIG_CFG80211=m
CONFIG_CHARGER_MACSMC=y
CONFIG_COMMON_CLK_APPLE_NCO=y
CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
CONFIG_DRM=y
CONFIG_DRM_ADP=m
# CONFIG_DRM_AMDGPU is not set
# CONFIG_DRM_AMDGPU_SI is not set
# CONFIG_DRM_AMDGPU_CIK is not set
# CONFIG_DRM_AMDGPU_USERPTR is not set
# CONFIG_DRM_AMDGPU_WERROR is not set
CONFIG_DRM_APPLE=m
CONFIG_DRM_APPLE_AUDIO=y
CONFIG_DRM_ASAHI=m
# CONFIG_DRM_ASAHI_DEBUG_ALLOCATOR is not set
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_GEM_SHMEM_HELPER=y
CONFIG_DRM_SCHED=y
CONFIG_DRM_SIMPLEDRM=y
# CONFIG_DRM_VGEM is not set
CONFIG_ENERGY_MODEL=y
CONFIG_GPIO_MACSMC=y
# CONFIG_HIBERNATION is not set
CONFIG_HID_APPLE=m
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HID_DOCKCHANNEL=m
CONFIG_HID_MAGICMOUSE=m
CONFIG_I2C_APPLE=y
CONFIG_IIO_AOP_SENSOR_ALS=m
CONFIG_IIO_AOP_SENSOR_LAS=m
CONFIG_INPUT_LEDS=y
CONFIG_INPUT_MACSMC_HID=y
CONFIG_LEDS_PWM=y
CONFIG_MFD_APPLE_SPMI_PMU=y
CONFIG_MMC_CQHCI=m
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MOUSE_APPLETOUCH=m
CONFIG_MUX_APPLE_DPXBAR=m
CONFIG_NET_VENDOR_AQUANTIA=y
CONFIG_NET_VENDOR_BROADCOM=y
CONFIG_NVMEM_APPLE_EFUSES=y
CONFIG_NVMEM_APPLE_SPMI=m
CONFIG_NVMEM_SPMI_MFD=y
CONFIG_NVME_APPLE=y
CONFIG_PCIE_APPLE=y
CONFIG_PHY_APPLE_ATC=m
CONFIG_PHY_APPLE_DPTX=m
CONFIG_PINCTRL_APPLE_GPIO=y
CONFIG_POWER_RESET_MACSMC=y
CONFIG_PWM_APPLE=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_RTC_DRV_MACSMC=y
CONFIG_RUST=y
CONFIG_RUST_APPLE_RTKIT=y
# CONFIG_RUST_BUILD_ASSERT_ALLOW is not set
# CONFIG_RUST_DEBUG_ASSERTIONS is not set
CONFIG_RUST_OVERFLOW_CHECKS=y
CONFIG_SENSORS_MACSMC=m
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SND_SOC_APPLE_AOP_AUDIO=m
CONFIG_SND_SOC_APPLE_MACAUDIO=m
CONFIG_SND_SOC_APPLE_MCA=m
CONFIG_SND_SOC_CS42L83=m
CONFIG_SND_SOC_CS42L84=m
CONFIG_SND_SOC_TAS2764=m
CONFIG_SND_SOC_TAS2770=m
CONFIG_SPI_APPLE=y
CONFIG_SPI_HID_APPLE_CORE=y
CONFIG_SPI_HID_APPLE_OF=y
CONFIG_SPMI_APPLE=y
CONFIG_SUSPEND=y
CONFIG_TIGON3=m
CONFIG_TOUCHSCREEN_APPLE_Z2=m
CONFIG_TYPEC_TPS6598X=m
CONFIG_UCLAMP_TASK=y
CONFIG_UCLAMP_TASK_GROUP=y
CONFIG_USB_DWC3=m
CONFIG_USB_DWC3_DUAL_ROLE=y
CONFIG_USB_XHCI_HCD=m
CONFIG_USB_XHCI_PCI_ASMEDIA=y
CONFIG_USB_XHCI_PCI_RENESAS=y
CONFIG_VIDEO_APPLE_ISP=m
CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
CONFIG_WLAN_VENDOR_BROADCOM=y

54
device/testing/linux-postmarketos-asahi/misc.config
View file

@ -6,6 +6,7 @@ CONFIG_PROC_EVENTS=y
CONFIG_USB_SERIAL_PL2303=m
CONFIG_USB_SERIAL_CH341=m
CONFIG_BOOT_PRINTK_DELAY=y
# systemd
CONFIG_BPF_LSM=y
CONFIG_DEBUG_INFO=y
@ -26,3 +27,56 @@ CONFIG_VHOST_TASK=y
CONFIG_VHOST=m
CONFIG_VHOST_MENU=y
CONFIG_VHOST_VSOCK=m
# Disable unused archs / drivers to speed up build
# CONFIG_ARCH_ACTIONS is not set
# CONFIG_ARCH_AIROHA is not set
# CONFIG_ARCH_SUNXI is not set
# CONFIG_ARCH_ALPINE is not set
# CONFIG_ARCH_AXIADO is not set
# CONFIG_ARCH_BCM is not set
# CONFIG_ARCH_BCM2835 is not set
# CONFIG_ARCH_BCM_IPROC is not set
# CONFIG_ARCH_BCMBCA is not set
# CONFIG_ARCH_BRCMSTB is not set
# CONFIG_ARCH_BERLIN is not set
# CONFIG_ARCH_BITMAIN is not set
# CONFIG_ARCH_BLAIZE is not set
# CONFIG_ARCH_CIX is not set
# CONFIG_ARCH_EXYNOS is not set
# CONFIG_ARCH_SPARX5 is not set
# CONFIG_ARCH_K3 is not set
# CONFIG_ARCH_LG1K is not set
# CONFIG_ARCH_HISI is not set
# CONFIG_ARCH_KEEMBAY is not set
# CONFIG_ARCH_MEDIATEK is not set
# CONFIG_ARCH_MESON is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_NXP is not set
# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_S32 is not set
# CONFIG_ARCH_SOPHGO is not set
# CONFIG_ARCH_MA35 is not set
# CONFIG_ARCH_NPCM is not set
# CONFIG_ARCH_PENSANDO is not set
# CONFIG_ARCH_QCOM is not set
# CONFIG_ARCH_REALTEK is not set
# CONFIG_ARCH_RENESAS is not set
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_SEATTLE is not set
# CONFIG_ARCH_INTEL_SOCFPGA is not set
# CONFIG_ARCH_STM32 is not set
# CONFIG_ARCH_SYNQUACER is not set
# CONFIG_ARCH_TEGRA is not set
# CONFIG_ARCH_SPRD is not set
# CONFIG_ARCH_THUNDER is not set
# CONFIG_ARCH_THUNDER2 is not set
# CONFIG_ARCH_UNIPHIER is not set
# CONFIG_ARCH_VEXPRESS is not set
# CONFIG_ARCH_VISCONTI is not set
# CONFIG_ARCH_XGENE is not set
# CONFIG_ARCH_ZYNQMP is not set
# CONFIG_ARM64_4K_PAGES is not set
# CONFIG_DRM_AMDGPU is not set
# CONFIG_DRM_NOUVEAU is not set

27
device/testing/linux-postmarketos-asahi/pmos.config
View file

@ -6,9 +6,9 @@ CONFIG_CGROUPS=y
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_XTS=y
CONFIG_DEVTMPFS=y
CONFIG_DM_CRYPT=m
CONFIG_DM_CRYPT=y
CONFIG_EXT4_FS=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVDEV=m
CONFIG_MD=y
CONFIG_SYSVIPC=y
CONFIG_TMPFS_POSIX_ACL=y
@ -17,7 +17,8 @@ CONFIG_USER_NS=y
CONFIG_VT=y
CONFIG_FW_LOADER_COMPRESS=y
CONFIG_FW_LOADER_COMPRESS_ZSTD=y
CONFIG_NULL_TTY=y
CONFIG_NULL_TTY=m
CONFIG_SYN_COOKIES=y
# Anbox / Waydroid
CONFIG_ANDROID_BINDER_IPC=y
@ -32,6 +33,7 @@ CONFIG_FUSE_FS=m
CONFIG_IP_NF_MANGLE=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XTABLES=m
CONFIG_NETFILTER_XTABLES_LEGACY=y
CONFIG_PSI=y
CONFIG_SQUASHFS=m
CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
@ -47,8 +49,8 @@ CONFIG_VLAN_8021Q=m
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_CBC=m
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CMAC=m
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_ECB=y
CONFIG_CRYPTO_HMAC=y
@ -65,7 +67,7 @@ CONFIG_KEY_DH_OPERATIONS=y
CONFIG_PKCS7_MESSAGE_PARSER=y
CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
CONFIG_X509_CERTIFICATE_PARSER=y
CONFIG_RFKILL=y
CONFIG_RFKILL=m
# nftables
CONFIG_NETFILTER=y
@ -119,6 +121,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
CONFIG_NETFILTER_XT_MATCH_IPVS=m
CONFIG_NETFILTER_XT_MARK=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_MANGLE=m
CONFIG_NF_NAT=m
CONFIG_POSIX_MQUEUE=y
@ -148,7 +151,7 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
CONFIG_IPVLAN=m
CONFIG_MACVLAN=m
CONFIG_DUMMY=m
CONFIG_BLK_DEV_DM=m
CONFIG_BLK_DEV_DM=y
CONFIG_DM_THIN_PROVISIONING=m
CONFIG_OVERLAY_FS=m
@ -183,10 +186,10 @@ CONFIG_NFT_FIB_IPV6=m
CONFIG_NF_CONNTRACK_MARK=y
# File systems
CONFIG_BTRFS_FS=m
CONFIG_BTRFS_FS=y
CONFIG_EXFAT_FS=m
CONFIG_EXT4_FS=y
CONFIG_F2FS_FS=m
CONFIG_F2FS_FS=y
CONFIG_F2FS_FS_COMPRESSION=y
CONFIG_UDF_FS=m
CONFIG_XFS_FS=m
@ -196,7 +199,7 @@ CONFIG_NTFS3_FS=m
CONFIG_BINFMT_MISC=m
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_CIFS=m
CONFIG_LEDS_TRIGGER_TIMER=y
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_NETFILTER_XT_MATCH_MARK=m
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@ -238,6 +241,7 @@ CONFIG_HID_EVISION=m
CONFIG_HID_EZKEY=m
CONFIG_HID_FT260=m
CONFIG_HID_GEMBIRD=m
CONFIG_HID_GENERIC=m
CONFIG_HID_GFRM=m
CONFIG_HID_GLORIOUS=m
CONFIG_HID_GOODIX_SPI=m
@ -333,7 +337,7 @@ CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_HID_ZYDACRON=m
CONFIG_INPUT_JOYSTICK=y
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_UINPUT=y
CONFIG_JOYSTICK_XPAD=m
CONFIG_JOYSTICK_XPAD_FF=y
CONFIG_JOYSTICK_XPAD_LEDS=y
@ -351,6 +355,7 @@ CONFIG_USB_SERIAL_CP210X=m
CONFIG_USB_STORAGE=y
CONFIG_USB_RTL8152=m
CONFIG_USB_USBNET=m
# CONFIG_USB_MASS_STORAGE is not set
# USB Gadget
CONFIG_U_SERIAL_CONSOLE=y