Compare commits

...
Author SHA1 Message Date
Clayton Craft 6d5d9cba73 DO NOT MERGE: skip CI version check
[ci:skip-vercheck]: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6056#note_463981
2025-01-27 13:25:52 -08:00
Clayton Craft a6afa01456 systemd/gdm: drop install scripts for systemd presets 2025-01-27 13:25:52 -08:00
Clayton Craft b305a092f4 systemd/gnome-keyring: drop install scripts for systemd presets 2025-01-27 13:25:51 -08:00
Clayton Craft 4dd3a688cd systemd/cups: drop install scripts for systemd presets 2025-01-27 13:25:50 -08:00
Clayton Craft 8976287ba9 systemd/networkmanager: drop install scripts for systemd presets 2025-01-27 13:22:16 -08:00
Clayton Craft 22e587b8c4 main/msm-firmware-loader: drop install scripts for systemd presets 2025-01-27 12:33:42 -08:00
Clayton Craft e95c5509b0 systemd/abuild: upgrade to 3.14.1 and add latest -systemd split patch 2025-01-27 12:33:42 -08:00
Alexey Minnekhanov 745fd9d3ec main/postmarketos-install-recommends: new aport (MR 5697)
Simple python script to automate installing of _pmb_recommends
for a specified package.

Signed-off-by: Alexey Minnekhanov <alexeymin@postmarketos.org>
2025-01-27 13:35:07 +03:00
jane400 6005bc9e1e systemd/systemd-services: don't override tinydm completly (MR 6091)
The package was named tinydm instead of tinydm-systemd accidentally.
This will cause tinydm-start-session to vanish after upgrading,
completely breaking booting into any GUI that depends on tinydm.

(only systemd installations are affected)
2025-01-27 13:11:12 +03:00
Stefan Hansson 667d8dd2c8 channels.cfg: mark v24.06 as unsupported
See https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3391
2025-01-25 13:47:12 +01:00
Kaloyan501 391ee56f6e huawei-alice: enable deviceinfo_create_initfs_extra and depend on postmarketos-base-downstream (MR 5989)
[ci:skip-build]: already built successfully in CI
2025-01-25 10:34:08 +01:00
Aster Boese f1787a0c94 main/postmarketos-artwork: fix deprecated imagemagick call (MR 6084)
[ci:skip-build]: already built successfully in CI
2025-01-25 10:01:57 +01:00
Aster Boese ee78363a98 main/postmarketos-artwork: add monochrome logo (MR 6084) 2025-01-25 10:01:36 +01:00
Luca Weiss 79d66bd528 main/postmarketos-ui-lomiri: new aport (MR 4496)
Co-developed-by: Aster Boese <asterboese@mailbox.org>

[ci:skip-build]: already built successfully in CI
2025-01-25 09:30:40 +01:00
Aster Boese da678d4c12 main/deviceinfo-converter: new aport (MR 4496) 2025-01-25 09:30:39 +01:00
Caleb Connolly 4b367a4357 postmarketos-initramfs: prevent busyloop in syslogd (MR 6013)
when stdin is /dev/null (e.g. when console=null is on the kernel
cmdline) syslogd will call read() over and over and never handle the
SIGTERM we send it, pinning a CPU core on every boot.

Hooking up syslogd std I/O to /dev/zero prevents this.

Co-authored-by: Richard Acayan <mailingradian@gmail.com>
Co-authored-by: Clayton Craft <clayton@craftyguy.net>
[ci:skip-build]: already built successfully in CI
2025-01-24 10:21:52 -08:00
Clayton Craft dc3499fa98 linux-valve-jupiter: upgrade to 6.13 (MR 6082)
- depend on diffutils, or else make complains about options not
  supported by busybox diff
- rebased patches

[ci:skip-build]: already built successfully in CI
2025-01-24 08:14:09 -08:00
Clayton Craft d067e117d8 main/bootmac: upgrade to 0.6, support systemd (MR 6050)
This new version includes initial support for systemd (for bluetooth
only atm). udev rules are only installed for openrc systems, bt config
on systemd was replaced by a unit file and using bootmac for wifi has
issues (https://gitlab.postmarketos.org/postmarketOS/bootmac/-/issues/7)

[ci:skip-build]: already built successfully in CI
2025-01-24 08:11:34 -08:00
Clayton Craft 908f7c0fe2 systemd/postmarketos-base-systemd: enable bootmac-bluetooth service by default (MR 6050) 2025-01-24 08:11:31 -08:00
postmarketOS CI 23bb4cf163 linux-next: upgrade to next-20250124 2025-01-24 05:57:04 +00:00
adamthiede 3a8697c128 community/linux-postmarketos-mediatek-mt8173: upgrade to 6.13 (MR 6073) 2025-01-23 20:56:37 -08:00
postmarketOS CI a1eb390c98 linux-next: upgrade to next-20250123 2025-01-23 19:59:45 +00:00
77 changed files with 1180 additions and 312 deletions

No files matched your search

+1 -1
View File
@@ -15,7 +15,7 @@ branch_aports=3.21-stable
mirrordir_alpine=v3.21
[v24.06]
description=Old release (supported until 2025-01-23)
description=Old release (unsupported)
branch_pmaports=v24.06
branch_aports=3.20-stable
mirrordir_alpine=v3.20
@@ -1,7 +1,7 @@
# Maintainer: Adam Thiede <me@adamthiede.com>
# Co-Maintainer: Jenneron <jenneron@protonmail.com>
pkgname=linux-postmarketos-mediatek-mt8173
pkgver=6.12.9
pkgver=6.13
pkgrel=0
pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
arch="aarch64"
@@ -66,7 +66,7 @@ package() {
}
sha512sums="
3538c19b22f1810849e01ad7005f39b0c4e1e2de99f3168bb6a35ad9d51d7ec7b22a8203890e7b073bff83951f930245d5857a86cef80454800136a53047ff37 linux-6.12.9.tar.xz
d442faaff1a9352c36c81ccd01f6d5322a28a6df8f4e735b866611cd127576320e75a6aa3bb731a273f6d48933ad47e305602510b731158abc17dc98b89ac437 config-postmarketos-mediatek-mt8173.aarch64
1137e6440132b0958f89165440e99208f82b204e7245ae69dc9c808df97d13ce8f58136db92407e0e93394fa7f6283ec7a34597c6e92a5b6d9025e0960357957 linux-6.13.tar.xz
676c5f2eb654fb709bf455ba5ef27e19c2c9111b17c61e520e903d914fc84446e2782d0f04d56cd8b31abf0894d1df756beff908d0b50fe183531732f631da98 config-postmarketos-mediatek-mt8173.aarch64
c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849 fix-mmc-order.patch
"
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 6.12.9 Kernel Configuration
# Linux/arm64 6.13.0 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
CONFIG_CC_IS_GCC=y
@@ -524,13 +524,21 @@ CONFIG_ARM64_MTE=y
CONFIG_ARM64_EPAN=y
# end of ARMv8.7 architectural features
CONFIG_AS_HAS_MOPS=y
#
# ARMv8.9 architectural features
#
CONFIG_ARM64_POE=y
CONFIG_ARCH_PKEY_BITS=3
CONFIG_ARM64_HAFT=y
# end of ARMv8.9 architectural features
#
# v9.4 architectural features
#
# end of v9.4 architectural features
CONFIG_ARM64_SVE=y
# CONFIG_ARM64_PSEUDO_NMI is not set
CONFIG_RELOCATABLE=y
@@ -631,6 +639,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
# CPU frequency scaling drivers
#
CONFIG_CPUFREQ_DT=y
# CONFIG_CPUFREQ_VIRT is not set
CONFIG_CPUFREQ_DT_PLATDEV=y
CONFIG_ARM_SCPI_CPUFREQ=y
CONFIG_ARM_MEDIATEK_CPUFREQ=y
@@ -679,7 +688,6 @@ CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_HAVE_IOREMAP_PROT=y
CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y
CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
CONFIG_HAVE_NMI=y
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -774,6 +782,7 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
# CONFIG_LOCK_EVENT_COUNTS is not set
CONFIG_ARCH_HAS_RELR=y
CONFIG_ARCH_HAS_MEM_ENCRYPT=y
CONFIG_ARCH_HAS_CC_PLATFORM=y
CONFIG_HAVE_PREEMPT_DYNAMIC=y
CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y
CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
@@ -781,6 +790,7 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y
CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y
CONFIG_ARCH_HAS_HW_PTE_YOUNG=y
CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG=y
CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=y
#
@@ -1346,6 +1356,7 @@ CONFIG_IP_NF_MANGLE=m
# CONFIG_IP_NF_TARGET_TTL is not set
# CONFIG_IP_NF_RAW is not set
# CONFIG_IP_NF_SECURITY is not set
# CONFIG_IP_NF_ARPTABLES is not set
# CONFIG_IP_NF_ARPFILTER is not set
# end of IP: Netfilter Configuration
@@ -1388,6 +1399,7 @@ CONFIG_IP6_NF_TARGET_MASQUERADE=m
CONFIG_NF_DEFRAG_IPV6=m
# CONFIG_NF_TABLES_BRIDGE is not set
# CONFIG_NF_CONNTRACK_BRIDGE is not set
# CONFIG_BRIDGE_NF_EBTABLES_LEGACY is not set
# CONFIG_BRIDGE_NF_EBTABLES is not set
# CONFIG_IP_DCCP is not set
# CONFIG_IP_SCTP is not set
@@ -1619,10 +1631,8 @@ CONFIG_BT_MTKUART=m
# CONFIG_MCTP is not set
CONFIG_FIB_RULES=y
CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_CORE=y
CONFIG_WEXT_PROC=y
CONFIG_WEXT_PRIV=y
CONFIG_CFG80211=m
# CONFIG_NL80211_TESTMODE is not set
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
@@ -1726,12 +1736,14 @@ CONFIG_PCI_IOV=y
# CONFIG_PCI_NPEM is not set
# CONFIG_PCI_PRI is not set
CONFIG_PCI_PASID=y
# CONFIG_PCIE_TPH is not set
CONFIG_PCI_LABEL=y
# CONFIG_PCI_DYNAMIC_OF_NODES is not set
CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=16
CONFIG_HOTPLUG_PCI=y
# CONFIG_HOTPLUG_PCI_CPCI is not set
# CONFIG_HOTPLUG_PCI_OCTEONEP is not set
# CONFIG_HOTPLUG_PCI_SHPC is not set
#
@@ -2124,6 +2136,7 @@ CONFIG_OF=y
CONFIG_OF_FLATTREE=y
CONFIG_OF_EARLY_FLATTREE=y
CONFIG_OF_KOBJ=y
CONFIG_OF_DYNAMIC=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_IRQ=y
CONFIG_OF_RESERVED_MEM=y
@@ -2202,6 +2215,7 @@ CONFIG_PCI_ENDPOINT_TEST=m
# CONFIG_OPEN_DICE is not set
# CONFIG_VCPU_STALL_DETECTOR is not set
# CONFIG_NSM is not set
# CONFIG_MCHP_LAN966X_PCI is not set
# CONFIG_C2PORT is not set
#
@@ -2210,20 +2224,13 @@ CONFIG_PCI_ENDPOINT_TEST=m
CONFIG_EEPROM_AT24=m
CONFIG_EEPROM_AT25=m
# CONFIG_EEPROM_MAX6875 is not set
CONFIG_EEPROM_93CX6=m
CONFIG_EEPROM_93CX6=y
# CONFIG_EEPROM_93XX46 is not set
# CONFIG_EEPROM_IDT_89HPESX is not set
# CONFIG_EEPROM_EE1004 is not set
# end of EEPROM support
# CONFIG_CB710_CORE is not set
#
# Texas Instruments shared transport line discipline
#
# CONFIG_TI_ST is not set
# end of Texas Instruments shared transport line discipline
# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_LIS3_I2C is not set
# CONFIG_ALTERA_STAPL is not set
@@ -3258,7 +3265,7 @@ CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y
# CONFIG_RMI4_F34 is not set
# CONFIG_RMI4_F3A is not set
CONFIG_RMI4_F3A=y
# CONFIG_RMI4_F54 is not set
# CONFIG_RMI4_F55 is not set
@@ -3560,6 +3567,7 @@ CONFIG_SPI_SPIDEV=m
# CONFIG_SPI_LOOPBACK_TEST is not set
# CONFIG_SPI_TLE62X0 is not set
# CONFIG_SPI_SLAVE is not set
CONFIG_SPI_DYNAMIC=y
CONFIG_SPMI=y
# CONFIG_SPMI_HISI3670 is not set
# CONFIG_SPMI_MTK_PMIF is not set
@@ -3623,6 +3631,7 @@ CONFIG_PINCTRL_MTK=y
CONFIG_PINCTRL_MTK_V2=y
CONFIG_PINCTRL_MTK_MOORE=y
CONFIG_PINCTRL_MTK_PARIS=y
# CONFIG_PINCTRL_AIROHA is not set
CONFIG_PINCTRL_MT2712=y
CONFIG_PINCTRL_MT6765=y
CONFIG_PINCTRL_MT6779=y
@@ -3652,7 +3661,6 @@ CONFIG_GPIOLIB=y
CONFIG_GPIOLIB_FASTPATH_LIMIT=512
CONFIG_OF_GPIO=y
CONFIG_GPIOLIB_IRQCHIP=y
CONFIG_OF_GPIO_MM_GPIOCHIP=y
# CONFIG_DEBUG_GPIO is not set
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CDEV_V1=y
@@ -3674,6 +3682,7 @@ CONFIG_GPIO_DWAPB=y
# CONFIG_GPIO_LOGICVC is not set
CONFIG_GPIO_MB86S7X=y
CONFIG_GPIO_PL061=y
# CONFIG_GPIO_POLARFIRE_SOC is not set
# CONFIG_GPIO_SIFIVE is not set
# CONFIG_GPIO_SYSCON is not set
CONFIG_GPIO_WCD934X=m
@@ -3730,6 +3739,7 @@ CONFIG_GPIO_MAX77620=y
#
# USB GPIO expanders
#
# CONFIG_GPIO_MPSSE is not set
# end of USB GPIO expanders
#
@@ -3869,6 +3879,7 @@ CONFIG_SENSORS_GPIO_FAN=m
# CONFIG_SENSORS_IBMAEM is not set
# CONFIG_SENSORS_IBMPEX is not set
# CONFIG_SENSORS_IIO_HWMON is not set
# CONFIG_SENSORS_ISL28022 is not set
# CONFIG_SENSORS_IT87 is not set
CONFIG_SENSORS_JC42=m
# CONFIG_SENSORS_POWERZ is not set
@@ -3931,6 +3942,7 @@ CONFIG_SENSORS_LM90=m
# CONFIG_SENSORS_NCT6683 is not set
# CONFIG_SENSORS_NCT6775 is not set
# CONFIG_SENSORS_NCT6775_I2C is not set
# CONFIG_SENSORS_NCT7363 is not set
# CONFIG_SENSORS_NCT7802 is not set
# CONFIG_SENSORS_NCT7904 is not set
# CONFIG_SENSORS_NPCM7XX is not set
@@ -4012,6 +4024,7 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
CONFIG_CPU_THERMAL=y
CONFIG_CPU_FREQ_THERMAL=y
# CONFIG_DEVFREQ_THERMAL is not set
# CONFIG_PCIE_THERMAL is not set
CONFIG_THERMAL_EMULATION=y
# CONFIG_THERMAL_MMIO is not set
# CONFIG_MAX77620_THERMAL is not set
@@ -4270,6 +4283,7 @@ CONFIG_REGULATOR_MT6359=y
CONFIG_REGULATOR_MT6360=m
CONFIG_REGULATOR_MT6380=y
CONFIG_REGULATOR_MT6397=y
# CONFIG_REGULATOR_MTK_DVFSRC is not set
CONFIG_REGULATOR_PCA9450=y
CONFIG_REGULATOR_PF8X00=y
CONFIG_REGULATOR_PFUZE100=y
@@ -4546,6 +4560,7 @@ CONFIG_VIDEO_MEDIATEK_VPU=m
#
# Raspberry Pi media platform drivers
#
# CONFIG_VIDEO_RP1_CFE is not set
#
# Renesas media platform drivers
@@ -4813,8 +4828,18 @@ CONFIG_DRM_MIPI_DSI=y
# CONFIG_DRM_DEBUG_MM is not set
CONFIG_DRM_KMS_HELPER=y
# CONFIG_DRM_PANIC is not set
CONFIG_DRM_CLIENT=y
CONFIG_DRM_CLIENT_LIB=y
CONFIG_DRM_CLIENT_SELECTION=y
CONFIG_DRM_CLIENT_SETUP=y
#
# Supported DRM clients
#
CONFIG_DRM_FBDEV_EMULATION=y
CONFIG_DRM_FBDEV_OVERALLOC=100
# end of Supported DRM clients
CONFIG_DRM_LOAD_EDID_FIRMWARE=y
CONFIG_DRM_DISPLAY_DP_AUX_BUS=y
CONFIG_DRM_DISPLAY_HELPER=y
@@ -4931,6 +4956,9 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
# CONFIG_DRM_PANEL_RAYDIUM_RM692E5 is not set
# CONFIG_DRM_PANEL_RAYDIUM_RM69380 is not set
# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
# CONFIG_DRM_PANEL_SAMSUNG_AMS581VF01 is not set
# CONFIG_DRM_PANEL_SAMSUNG_AMS639RQ08 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS427AP24 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
# CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
# CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
@@ -4940,6 +4968,7 @@ CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
# CONFIG_DRM_PANEL_SAMSUNG_S6D27A1 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6D7AA0 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA8 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
@@ -4981,6 +5010,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
# CONFIG_DRM_CHRONTEL_CH7033 is not set
# CONFIG_DRM_CROS_EC_ANX7688 is not set
CONFIG_DRM_DISPLAY_CONNECTOR=y
# CONFIG_DRM_ITE_IT6263 is not set
CONFIG_DRM_ITE_IT6505=y
CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9211 is not set
@@ -5005,6 +5035,7 @@ CONFIG_DRM_THINE_THC63LVD1024=m
# CONFIG_DRM_TOSHIBA_TC358768 is not set
# CONFIG_DRM_TOSHIBA_TC358775 is not set
# CONFIG_DRM_TI_DLPC3433 is not set
# CONFIG_DRM_TI_TDP158 is not set
# CONFIG_DRM_TI_TFP410 is not set
# CONFIG_DRM_TI_SN65DSI83 is not set
CONFIG_DRM_TI_SN65DSI86=m
@@ -5039,6 +5070,7 @@ CONFIG_DRM_MEDIATEK_HDMI=y
# CONFIG_TINYDRM_ILI9486 is not set
# CONFIG_TINYDRM_MI0283QT is not set
# CONFIG_TINYDRM_REPAPER is not set
# CONFIG_TINYDRM_SHARP_MEMORY is not set
# CONFIG_TINYDRM_ST7586 is not set
# CONFIG_TINYDRM_ST7735R is not set
CONFIG_DRM_PL111=m
@@ -5334,6 +5366,12 @@ CONFIG_SND_SOC_FSL_UTILS=m
# CONFIG_SND_SOC_CHV3_I2S is not set
# CONFIG_SND_I2S_HI6210_I2S is not set
#
# SoC Audio for Loongson CPUs
#
# end of SoC Audio for Loongson CPUs
# CONFIG_SND_SOC_IMG is not set
CONFIG_SND_SOC_MEDIATEK=m
# CONFIG_SND_SOC_MT2701 is not set
@@ -5353,6 +5391,7 @@ CONFIG_SND_SOC_MT8183_DA7219_MAX98357A=m
# CONFIG_SND_SOC_MT8192 is not set
# CONFIG_SND_SOC_MT8195 is not set
# CONFIG_SND_SOC_MT8365 is not set
CONFIG_SND_SOC_SDCA_OPTIONAL=y
# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
#
@@ -5372,6 +5411,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_AC97_CODEC is not set
# CONFIG_SND_SOC_ADAU1372_I2C is not set
# CONFIG_SND_SOC_ADAU1372_SPI is not set
# CONFIG_SND_SOC_ADAU1373 is not set
# CONFIG_SND_SOC_ADAU1701 is not set
# CONFIG_SND_SOC_ADAU1761_I2C is not set
# CONFIG_SND_SOC_ADAU1761_SPI is not set
@@ -5393,6 +5433,7 @@ CONFIG_SND_SOC_AK4613=m
# CONFIG_SND_SOC_AW8738 is not set
# CONFIG_SND_SOC_AW88395 is not set
# CONFIG_SND_SOC_AW88261 is not set
# CONFIG_SND_SOC_AW88081 is not set
# CONFIG_SND_SOC_AW87390 is not set
# CONFIG_SND_SOC_AW88399 is not set
# CONFIG_SND_SOC_BD28623 is not set
@@ -5418,6 +5459,7 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m
# CONFIG_SND_SOC_CS42L56 is not set
# CONFIG_SND_SOC_CS42L73 is not set
# CONFIG_SND_SOC_CS42L83 is not set
# CONFIG_SND_SOC_CS42L84 is not set
# CONFIG_SND_SOC_CS4234 is not set
# CONFIG_SND_SOC_CS4265 is not set
# CONFIG_SND_SOC_CS4270 is not set
@@ -5438,6 +5480,7 @@ CONFIG_SND_SOC_ES7134=m
CONFIG_SND_SOC_ES7241=m
# CONFIG_SND_SOC_ES8311 is not set
# CONFIG_SND_SOC_ES8316 is not set
# CONFIG_SND_SOC_ES8323 is not set
# CONFIG_SND_SOC_ES8326 is not set
# CONFIG_SND_SOC_ES8328_I2C is not set
# CONFIG_SND_SOC_ES8328_SPI is not set
@@ -5499,6 +5542,7 @@ CONFIG_SND_SOC_RT5677_SPI=m
# CONFIG_SND_SOC_RT711_SDCA_SDW is not set
# CONFIG_SND_SOC_RT712_SDCA_SDW is not set
# CONFIG_SND_SOC_RT712_SDCA_DMIC_SDW is not set
# CONFIG_SND_SOC_RT721_SDCA_SDW is not set
# CONFIG_SND_SOC_RT722_SDCA_SDW is not set
# CONFIG_SND_SOC_RT715_SDW is not set
# CONFIG_SND_SOC_RT715_SDCA_SDW is not set
@@ -5508,6 +5552,7 @@ CONFIG_SND_SOC_RT5677_SPI=m
CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
CONFIG_SND_SOC_SIMPLE_MUX=m
# CONFIG_SND_SOC_SMA1303 is not set
# CONFIG_SND_SOC_SMA1307 is not set
# CONFIG_SND_SOC_SPDIF is not set
# CONFIG_SND_SOC_SRC4XXX_I2C is not set
# CONFIG_SND_SOC_SSM2305 is not set
@@ -5547,6 +5592,7 @@ CONFIG_SND_SOC_TS3A227E=m
# CONFIG_SND_SOC_TSCS42XX is not set
# CONFIG_SND_SOC_TSCS454 is not set
# CONFIG_SND_SOC_UDA1334 is not set
# CONFIG_SND_SOC_UDA1342 is not set
CONFIG_SND_SOC_WCD_CLASSH=m
CONFIG_SND_SOC_WCD9335=m
CONFIG_SND_SOC_WCD_MBHC=m
@@ -5597,6 +5643,8 @@ CONFIG_SND_SOC_MT6660=m
# CONFIG_SND_SOC_NAU8821 is not set
CONFIG_SND_SOC_NAU8822=m
# CONFIG_SND_SOC_NAU8824 is not set
# CONFIG_SND_SOC_NTP8918 is not set
# CONFIG_SND_SOC_NTP8835 is not set
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SOC_LPASS_MACRO_COMMON=m
CONFIG_SND_SOC_LPASS_WSA_MACRO=m
@@ -5666,6 +5714,7 @@ CONFIG_HID_VIVALDI=m
CONFIG_HID_GT683R=m
CONFIG_HID_KEYTOUCH=m
CONFIG_HID_KYE=m
# CONFIG_HID_KYSONA is not set
CONFIG_HID_UCLOGIC=m
CONFIG_HID_WALTOP=m
CONFIG_HID_VIEWSONIC=m
@@ -6144,6 +6193,7 @@ CONFIG_TYPEC_HD3SS3220=m
# CONFIG_TYPEC_MUX_IT5205 is not set
# CONFIG_TYPEC_MUX_NB7VPQ904M is not set
# CONFIG_TYPEC_MUX_PTN36502 is not set
# CONFIG_TYPEC_MUX_TUSB1046 is not set
# CONFIG_TYPEC_MUX_WCD939X_USBSS is not set
# end of USB Type-C Multiplexer/DeMultiplexer Switch support
@@ -6195,7 +6245,7 @@ CONFIG_MMC_DW_K3=y
# CONFIG_MMC_USHC is not set
# CONFIG_MMC_USDHI6ROL0 is not set
CONFIG_MMC_CQHCI=y
# CONFIG_MMC_HSQ is not set
CONFIG_MMC_HSQ=y
# CONFIG_MMC_TOSHIBA_PCI is not set
CONFIG_MMC_MTK=y
CONFIG_MMC_SDHCI_XENON=y
@@ -6512,6 +6562,7 @@ CONFIG_VFIO_PCI_CORE=y
CONFIG_VFIO_PCI_MMAP=y
CONFIG_VFIO_PCI_INTX=y
CONFIG_VFIO_PCI=y
# CONFIG_VIRTIO_VFIO_PCI is not set
# CONFIG_NVGRACE_GPU_VFIO_PCI is not set
# end of VFIO support for PCI devices
@@ -6575,12 +6626,7 @@ CONFIG_XEN_AUTO_XLATE=y
# CONFIG_GREYBUS is not set
# CONFIG_COMEDI is not set
CONFIG_STAGING=y
# CONFIG_RTLLIB is not set
CONFIG_RTL8723BS=m
CONFIG_R8712U=m
# CONFIG_RTS5208 is not set
# CONFIG_VT6655 is not set
# CONFIG_VT6656 is not set
#
# IIO staging drivers
@@ -6628,13 +6674,13 @@ CONFIG_VIDEO_MAX96712=m
# StarFive media platform drivers
#
# CONFIG_STAGING_MEDIA_DEPRECATED is not set
# CONFIG_LTE_GDM724X is not set
# CONFIG_FB_TFT is not set
# CONFIG_XIL_AXIS_FIFO is not set
# CONFIG_FIELDBUS_DEV is not set
# CONFIG_VME_BUS is not set
# CONFIG_GPIB is not set
# CONFIG_GOLDFISH is not set
CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_OF_HW_PROBER=y
CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=y
CONFIG_CROS_EC_RPMSG=y
@@ -6704,6 +6750,7 @@ CONFIG_COMMON_CLK_MT2712=y
# CONFIG_COMMON_CLK_MT2712_MMSYS is not set
# CONFIG_COMMON_CLK_MT2712_VDECSYS is not set
# CONFIG_COMMON_CLK_MT2712_VENCSYS is not set
# CONFIG_COMMON_CLK_MT6735 is not set
CONFIG_COMMON_CLK_MT6765=y
CONFIG_COMMON_CLK_MT6765_AUDIOSYS=y
# CONFIG_COMMON_CLK_MT6765_CAMSYS is not set
@@ -6953,6 +7000,7 @@ CONFIG_FSL_RCPM=y
#
CONFIG_MTK_CMDQ=y
CONFIG_MTK_DEVAPC=m
CONFIG_MTK_DVFSRC=y
CONFIG_MTK_INFRACFG=y
CONFIG_MTK_PMIC_WRAP=y
CONFIG_MTK_REGULATOR_COUPLER=y
@@ -7138,8 +7186,10 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
# CONFIG_AD7476 is not set
# CONFIG_AD7606_IFACE_PARALLEL is not set
# CONFIG_AD7606_IFACE_SPI is not set
# CONFIG_AD7625 is not set
# CONFIG_AD7766 is not set
# CONFIG_AD7768_1 is not set
# CONFIG_AD7779 is not set
# CONFIG_AD7780 is not set
# CONFIG_AD7791 is not set
# CONFIG_AD7793 is not set
@@ -7153,6 +7203,7 @@ CONFIG_HID_SENSOR_ACCEL_3D=m
# CONFIG_AXP288_ADC is not set
# CONFIG_CC10001_ADC is not set
# CONFIG_ENVELOPE_DETECTOR is not set
# CONFIG_GEHC_PMC_ADC is not set
# CONFIG_HI8435 is not set
# CONFIG_HX711 is not set
# CONFIG_INA2XX_ADC is not set
@@ -7289,6 +7340,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
#
# Digital to analog converters
#
# CONFIG_AD3552R_HS is not set
# CONFIG_AD3552R is not set
# CONFIG_AD5064 is not set
# CONFIG_AD5360 is not set
@@ -7313,6 +7365,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
# CONFIG_AD5791 is not set
# CONFIG_AD7293 is not set
# CONFIG_AD7303 is not set
# CONFIG_AD8460 is not set
# CONFIG_AD8801 is not set
# CONFIG_DPOT_DAC is not set
# CONFIG_DS4424 is not set
@@ -7425,6 +7478,8 @@ CONFIG_HID_SENSOR_HUMIDITY=m
# CONFIG_ADIS16480 is not set
# CONFIG_BMI160_I2C is not set
# CONFIG_BMI160_SPI is not set
# CONFIG_BMI270_I2C is not set
# CONFIG_BMI270_SPI is not set
# CONFIG_BMI323_I2C is not set
# CONFIG_BMI323_SPI is not set
# CONFIG_BOSCH_BNO055_SERIAL is not set
@@ -7436,6 +7491,7 @@ CONFIG_HID_SENSOR_HUMIDITY=m
# CONFIG_INV_ICM42600_SPI is not set
# CONFIG_INV_MPU6050_I2C is not set
# CONFIG_INV_MPU6050_SPI is not set
# CONFIG_SMI240 is not set
CONFIG_IIO_ST_LSM6DSX=m
CONFIG_IIO_ST_LSM6DSX_I2C=m
CONFIG_IIO_ST_LSM6DSX_SPI=m
@@ -7498,6 +7554,7 @@ CONFIG_HID_SENSOR_ALS=m
# CONFIG_US5182D is not set
CONFIG_VCNL4000=m
# CONFIG_VCNL4035 is not set
# CONFIG_VEML3235 is not set
# CONFIG_VEML6030 is not set
# CONFIG_VEML6040 is not set
# CONFIG_VEML6070 is not set
@@ -7513,6 +7570,7 @@ CONFIG_VCNL4000=m
# CONFIG_AK8974 is not set
# CONFIG_AK8975 is not set
# CONFIG_AK09911 is not set
# CONFIG_ALS31300 is not set
# CONFIG_BMC150_MAGN_I2C is not set
# CONFIG_BMC150_MAGN_SPI is not set
# CONFIG_MAG3110 is not set
@@ -7704,6 +7762,7 @@ CONFIG_RESET_SCMI=y
CONFIG_GENERIC_PHY=y
CONFIG_GENERIC_PHY_MIPI_DPHY=y
# CONFIG_PHY_CAN_TRANSCEIVER is not set
# CONFIG_PHY_NXP_PTN3222 is not set
#
# PHY drivers for Broadcom platforms
@@ -7863,7 +7922,6 @@ CONFIG_EXT4_FS_SECURITY=y
CONFIG_JBD2=y
# CONFIG_JBD2_DEBUG is not set
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
CONFIG_XFS_FS=m
CONFIG_XFS_SUPPORT_V4=y
@@ -7881,6 +7939,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set
# CONFIG_BTRFS_ASSERT is not set
# CONFIG_BTRFS_EXPERIMENTAL is not set
# CONFIG_BTRFS_FS_REF_VERIFY is not set
# CONFIG_NILFS2_FS is not set
CONFIG_F2FS_FS=y
@@ -8574,6 +8633,7 @@ CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
CONFIG_SWIOTLB=y
# CONFIG_SWIOTLB_DYNAMIC is not set
CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y
@@ -8627,6 +8687,7 @@ CONFIG_SBITMAP=y
CONFIG_GENERIC_IOREMAP=y
CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
CONFIG_UNION_FIND=y
#
# Kernel hacking
@@ -8701,6 +8762,7 @@ CONFIG_HAVE_KCSAN_COMPILER=y
# CONFIG_NET_DEV_REFCNT_TRACKER is not set
# CONFIG_NET_NS_REFCNT_TRACKER is not set
# CONFIG_DEBUG_NET is not set
# CONFIG_DEBUG_NET_SMALL_RTNL is not set
# end of Networking Debugging
#
@@ -8848,6 +8910,7 @@ CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
CONFIG_FUNCTION_GRAPH_TRACER=y
# CONFIG_FUNCTION_GRAPH_RETVAL is not set
# CONFIG_FUNCTION_GRAPH_RETADDR is not set
CONFIG_DYNAMIC_FTRACE=y
CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y
CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS=y
+3 -3
View File
@@ -1,13 +1,13 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-huawei-alice
pkgdesc="Huawei P8 Lite"
pkgver=1
pkgver=2
pkgrel=0
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
options="!check !archcheck"
depends="postmarketos-base linux-huawei-alice mkbootimg msm-fb-refresher"
depends="postmarketos-base linux-huawei-alice mkbootimg msm-fb-refresher postmarketos-base-downstream"
makedepends="devicepkg-dev"
source="deviceinfo"
@@ -28,5 +28,5 @@ package() {
}
sha512sums="
7e6ef16d5f2e75f9299f88a0223853a12fccaf178803bb3f6d97921982cb316d1dfd4599f190fa26e83fead57d2d1ef4ac1a7549d0d69b24977cd541a1b3e2cc deviceinfo
5430865c8531590622e1adda2828a040694ad03f9cc6959a628aa32c77293d2aea7f6ffccaea3cac28e4c7f20f98e0293977a666ae13108ff2f8c20fdd545d3f deviceinfo
"
@@ -27,3 +27,4 @@ deviceinfo_flash_offset_ramdisk="0x07b88000"
deviceinfo_flash_offset_second="0x00f00000"
deviceinfo_flash_offset_tags="0x02988000"
deviceinfo_flash_pagesize="2048"
deviceinfo_create_initfs_extra="true"
+2 -2
View File
@@ -2,7 +2,7 @@
# Kernel config based on: arch/arm64/configs/defconfig
pkgname=linux-next
pkgver=6.13_git20250122
pkgver=6.13_git20250124
pkgrel=0
_nextver="${pkgver#*_git}"
pkgdesc="Linux next kernel"
@@ -69,7 +69,7 @@ package() {
}
sha512sums="
9cea6d9bec644fe3da76da67da7aab5bedd7bb449e5232db9789f57b1e1a78e7de8c1956dff4ca8a542824d7ec302fa94acaff6e57aaa14bcaf225f8214b5508 linux-next-next-20250122.tar.gz
c03612524f1fd87ffc92a2c83ec401d086964d9a27dd2a568a69a8e4fc6d2f2e116a831a6cdefb38df3efc39f236177fd4cbcce193ddf05db7a87aa1d5723a1a linux-next-next-20250124.tar.gz
8de0a3791ea671528a9fc753071683dfea68ea4f4c22060fc0ca8a4b1b3d76eaa2a3fd40bb013173f0e55da15dde91cf285902779beb35781b6c90f39244ce11 devices.config
eaceb011997e5f19ad8c5e9b4d291ebe264d83953f9b21d5b1a0c479602edb235252657f297b1a59c7a11dd2205d40360197489a3337ba6f8e040ecf2b51f527 pmos.config
"
@@ -1,4 +1,4 @@
From 6139820b0cdd0e5e470d7028c5c30a8e00d51ee9 Mon Sep 17 00:00:00 2001
From 2bae20b39c64fb8d5b1bf041508e94229d8527f8 Mon Sep 17 00:00:00 2001
From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Date: Fri, 4 Mar 2022 21:20:39 +0000
Subject: [PATCH 01/21] ACPICA: Limit error message flood caused by firmware
@@ -113,5 +113,5 @@ index 918aca7c4db4..4a482de2e55d 100644
acpi_os_printf(ACPI_MSG_ERROR);
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 14d9c8a1d8f4efaa02b3679d6ea550e40bf5fb68 Mon Sep 17 00:00:00 2001
From 0aa2d655c2c8dd1b1538ed8ea16e34a8ffd802ed Mon Sep 17 00:00:00 2001
From: "Pierre-Loup A. Griffais" <pgriffais@valvesoftware.com>
Date: Tue, 14 Jun 2022 14:31:18 -0700
Subject: [PATCH 02/21] drivers: video: backlight: Disable backlight
@@ -17,10 +17,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 2 insertions(+)
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index a82934694d05..b9daf4469143 100644
index f699e5827ccb..99e86b983c77 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -162,6 +162,7 @@ static inline void backlight_unregister_fb(struct backlight_device *bd)
@@ -161,6 +161,7 @@ static inline void backlight_unregister_fb(struct backlight_device *bd)
static void backlight_generate_event(struct backlight_device *bd,
enum backlight_update_reason reason)
{
@@ -28,7 +28,7 @@ index a82934694d05..b9daf4469143 100644
char *envp[2];
switch (reason) {
@@ -177,6 +178,7 @@ static void backlight_generate_event(struct backlight_device *bd,
@@ -176,6 +177,7 @@ static void backlight_generate_event(struct backlight_device *bd,
}
envp[1] = NULL;
kobject_uevent_env(&bd->dev.kobj, KOBJ_CHANGE, envp);
@@ -37,5 +37,5 @@ index a82934694d05..b9daf4469143 100644
}
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 1de0de2a4bf099b59c402061d2554d0af215ed5a Mon Sep 17 00:00:00 2001
From f566cb65cbc249efb1f0b41636890974b6c1c453 Mon Sep 17 00:00:00 2001
From: Shreeya Patel <shreeya.patel@collabora.com>
Date: Mon, 17 Jul 2023 14:02:21 +0530
Subject: [PATCH 03/21] iio: light: ltrf216a: Return floating point values
@@ -14,10 +14,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 13 insertions(+), 26 deletions(-)
diff --git a/drivers/iio/light/ltrf216a.c b/drivers/iio/light/ltrf216a.c
index 68dc48420a88..d2914252b99f 100644
index dbec1e7cfeb8..a88f5d5beeb0 100644
--- a/drivers/iio/light/ltrf216a.c
+++ b/drivers/iio/light/ltrf216a.c
@@ -231,32 +231,13 @@ static int ltrf216a_read_data(struct ltrf216a_data *data, u8 addr)
@@ -239,32 +239,13 @@ static int ltrf216a_read_data(struct ltrf216a_data *data, u8 addr)
return get_unaligned_le24(&buf[0]);
}
@@ -36,7 +36,7 @@ index 68dc48420a88..d2914252b99f 100644
-
- ltrf216a_set_power_state(data, false);
-
- lux = greendata * 45 * LTRF216A_WIN_FAC;
- lux = greendata * data->info->lux_multiplier * LTRF216A_WIN_FAC;
-
- return lux;
-}
@@ -52,7 +52,7 @@ index 68dc48420a88..d2914252b99f 100644
switch (mask) {
case IIO_CHAN_INFO_RAW:
@@ -273,12 +254,18 @@ static int ltrf216a_read_raw(struct iio_dev *indio_dev,
@@ -281,12 +262,18 @@ static int ltrf216a_read_raw(struct iio_dev *indio_dev,
return IIO_VAL_INT;
case IIO_CHAN_INFO_PROCESSED:
mutex_lock(&data->lock);
@@ -77,5 +77,5 @@ index 68dc48420a88..d2914252b99f 100644
case IIO_CHAN_INFO_INT_TIME:
mutex_lock(&data->lock);
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 350fcf62fa8d05a12b2de15cb05ba30f3b1a3aec Mon Sep 17 00:00:00 2001
From 688370cf19ee6b29ea39dce2783ae352fb0a9306 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 19 Feb 2022 16:08:36 -0800
Subject: [PATCH 04/21] mfd: Add MFD core driver for Steam Deck
@@ -17,10 +17,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
create mode 100644 drivers/mfd/steamdeck.c
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index bc8be2e593b6..f450294fbd25 100644
index ae23b317a64e..7417c480275a 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -2390,5 +2390,16 @@ config MFD_RSMU_SPI
@@ -2414,5 +2414,16 @@ config MFD_RSMU_SPI
Additional drivers must be enabled in order to use the functionality
of the device.
@@ -38,10 +38,10 @@ index bc8be2e593b6..f450294fbd25 100644
endmenu
endif
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 02b651cd7535..71d992afbadd 100644
index e057d6d6faef..2f9f8a0daf5e 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -288,3 +288,5 @@ obj-$(CONFIG_MFD_ATC260X_I2C) += atc260x-i2c.o
@@ -290,3 +290,5 @@ obj-$(CONFIG_MFD_ATC260X_I2C) += atc260x-i2c.o
obj-$(CONFIG_MFD_RSMU_I2C) += rsmu_i2c.o rsmu_core.o
obj-$(CONFIG_MFD_RSMU_SPI) += rsmu_spi.o rsmu_core.o
@@ -181,5 +181,5 @@ index 000000000000..0e504b3c2796
+MODULE_DESCRIPTION("Steam Deck EC MFD core driver");
+MODULE_LICENSE("GPL");
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From ee049588a04618fe813dc8b7a9206654b7025887 Mon Sep 17 00:00:00 2001
From 9519e1a008106fe265482a841f653a1c9489d6bf Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 19 Feb 2022 16:09:45 -0800
Subject: [PATCH 05/21] hwmon: Add driver for Steam Deck's EC sensors
@@ -15,10 +15,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
create mode 100644 drivers/hwmon/steamdeck-hwmon.c
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index b60fe2e58ad6..9768782bc32a 100644
index dd376602f3f1..825966b9d109 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -2046,6 +2046,17 @@ config SENSORS_SCH5636
@@ -2075,6 +2075,17 @@ config SENSORS_SCH5636
This driver can also be built as a module. If so, the module
will be called sch5636.
@@ -37,17 +37,17 @@ index b60fe2e58ad6..9768782bc32a 100644
tristate "ST Microelectronics STTS751"
depends on I2C
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
index b1c7056c37db..d6bb7810426d 100644
index b827b92f2a78..0a832b0bc8ef 100644
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@ -207,6 +207,7 @@ obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o
@@ -210,6 +210,7 @@ obj-$(CONFIG_SENSORS_SMSC47M1) += smsc47m1.o
obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
obj-$(CONFIG_SENSORS_SPARX5) += sparx5-temp.o
obj-$(CONFIG_SENSORS_SPD5118) += spd5118.o
+obj-$(CONFIG_SENSORS_STEAMDECK) += steamdeck-hwmon.o
obj-$(CONFIG_SENSORS_STTS751) += stts751.o
obj-$(CONFIG_SENSORS_SURFACE_FAN)+= surface_fan.o
obj-$(CONFIG_SENSORS_SY7636A) += sy7636a-hwmon.o
obj-$(CONFIG_SENSORS_SURFACE_TEMP)+= surface_temp.o
diff --git a/drivers/hwmon/steamdeck-hwmon.c b/drivers/hwmon/steamdeck-hwmon.c
new file mode 100644
index 000000000000..fab9e9460bd4
@@ -279,5 +279,5 @@ index 000000000000..fab9e9460bd4
+MODULE_DESCRIPTION("Steam Deck EC sensors driver");
+MODULE_LICENSE("GPL");
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From ff23eb079421458288bf01309df40110550d4eee Mon Sep 17 00:00:00 2001
From 355f8cb16808c0ad64de21eeb5c97d650e1fb57b Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 27 Feb 2022 12:58:05 -0800
Subject: [PATCH 06/21] leds: steamdeck: Add support for Steam Deck LED
@@ -13,10 +13,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
create mode 100644 drivers/leds/leds-steamdeck.c
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 8d9d8da376e4..cac021837b5b 100644
index b784bb74a837..fb3d45acfd9d 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -951,6 +951,13 @@ config LEDS_ACER_A500
@@ -959,6 +959,13 @@ config LEDS_ACER_A500
This option enables support for the Power Button LED of
Acer Iconia Tab A500.
@@ -123,5 +123,5 @@ index 000000000000..686500b8de73
+MODULE_DESCRIPTION("Steam Deck LEDs driver");
+MODULE_LICENSE("GPL");
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From fbeb4255d216bebd4335dcecf26af6ba1eb4d1df Mon Sep 17 00:00:00 2001
From c02fbf2813518341d84b8daadcba22e66dcf1b36 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 27 Feb 2022 14:46:08 -0800
Subject: [PATCH 07/21] extcon: Add driver for Steam Deck
@@ -13,10 +13,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
create mode 100644 drivers/extcon/extcon-steamdeck.c
diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig
index 3da94b382292..88ac6e28689c 100644
index a6f6d467aacf..4adec844c4b4 100644
--- a/drivers/extcon/Kconfig
+++ b/drivers/extcon/Kconfig
@@ -203,4 +203,11 @@ config EXTCON_RTK_TYPE_C
@@ -214,4 +214,11 @@ config EXTCON_RTK_TYPE_C
The DHC (Digital Home Hub) RTD series SoC contains a type c module.
This driver will detect the status of the type-c port.
@@ -29,10 +29,10 @@ index 3da94b382292..88ac6e28689c 100644
+
endif
diff --git a/drivers/extcon/Makefile b/drivers/extcon/Makefile
index f779adb5e4c7..c7f3c908b329 100644
index 0d6d23faf748..5c21eeb0e0cd 100644
--- a/drivers/extcon/Makefile
+++ b/drivers/extcon/Makefile
@@ -25,4 +25,5 @@ obj-$(CONFIG_EXTCON_SM5502) += extcon-sm5502.o
@@ -26,4 +26,5 @@ obj-$(CONFIG_EXTCON_SM5502) += extcon-sm5502.o
obj-$(CONFIG_EXTCON_USB_GPIO) += extcon-usb-gpio.o
obj-$(CONFIG_EXTCON_USBC_CROS_EC) += extcon-usbc-cros-ec.o
obj-$(CONFIG_EXTCON_USBC_TUSB320) += extcon-usbc-tusb320.o
@@ -225,5 +225,5 @@ index 000000000000..74f190adc8ea
+MODULE_DESCRIPTION("Steam Deck extcon driver");
+MODULE_LICENSE("GPL");
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 58b1dec083ca510d0c71059a586ae2c53ff82592 Mon Sep 17 00:00:00 2001
From 8e30a7f0ff74a5b146a33556569f57f23a0438e5 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 15 Jul 2023 12:58:54 -0700
Subject: [PATCH 08/21] hwmon: steamdeck-hwmon: Add support for max battery
@@ -104,5 +104,5 @@ index fab9e9460bd4..9d0a5471b181 100644
dev_err(dev, "Failed to register HWMON device");
return PTR_ERR(hwmon);
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From e129992ce5b743fbcb655a61b241f014f01e6dfe Mon Sep 17 00:00:00 2001
From 7b473c4610aa51b7114307e69a68953efd1dd398 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 24 Sep 2023 15:02:33 -0700
Subject: [PATCH 09/21] mfd: steamdeck: Expose controller board power in sysfs
@@ -49,5 +49,5 @@ index 0e504b3c2796..a60fa7db9141 100644
};
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From c40796fc3ecbd30ec9c13a2e491a665b692c83ac Mon Sep 17 00:00:00 2001
From 30bfb9d3a832dfdaad3087d2ccaeb2b5c352f551 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 00:25:26 -0800
Subject: [PATCH 10/21] x86: implement tsc=directsync for systems without
@@ -15,10 +15,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
4 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 09126bb8cc9f..f2ab4bb2791e 100644
index 3872bc6ec49d..8b74610860ee 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6863,6 +6863,8 @@
@@ -7056,6 +7056,8 @@
This will be suppressed by an earlier tsc=nowatchdog and
can be overridden by a later tsc=nowatchdog. A console
message will flag any such suppression or overriding.
@@ -40,10 +40,10 @@ index 94408a784c8e..530fb2200106 100644
extern bool tsc_async_resets;
#else
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index d4462fb26299..a70616cf0869 100644
index 67aeaba4ba9c..a033dbe591c3 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -47,6 +47,7 @@ static unsigned int __initdata tsc_early_khz;
@@ -48,6 +48,7 @@ static unsigned int __initdata tsc_early_khz;
static DEFINE_STATIC_KEY_FALSE_RO(__use_tsc);
int tsc_clocksource_reliable;
@@ -51,7 +51,7 @@ index d4462fb26299..a70616cf0869 100644
static int __read_mostly tsc_force_recalibrate;
@@ -339,6 +340,8 @@ static int __init tsc_setup(char *str)
@@ -341,6 +342,8 @@ static int __init tsc_setup(char *str)
else
tsc_as_watchdog = 1;
}
@@ -159,5 +159,5 @@ index 4334033658ed..3cc241632221 100644
}
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 566127db62f7c5a344b927a766de4e37174f795e Mon Sep 17 00:00:00 2001
From d3703752d08f5aeee686781a34f865da018e510a Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 11:55:18 -0800
Subject: [PATCH 11/21] x86: touch clocksource watchdog after syncing TSCs
@@ -11,18 +11,18 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 4 insertions(+)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 0c35207320cb..eb8793b04cd1 100644
index b5a8f0891135..6af1092a792c 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -60,6 +60,7 @@
#include <linux/stackprotector.h>
@@ -61,6 +61,7 @@
#include <linux/cpuhotplug.h>
#include <linux/mc146818rtc.h>
#include <linux/acpi.h>
+#include <linux/clocksource.h>
#include <asm/acpi.h>
#include <asm/cacheinfo.h>
@@ -1120,6 +1121,7 @@ void arch_thaw_secondary_cpus_begin(void)
@@ -1122,6 +1123,7 @@ void arch_thaw_secondary_cpus_begin(void)
void arch_thaw_secondary_cpus_end(void)
{
@@ -30,7 +30,7 @@ index 0c35207320cb..eb8793b04cd1 100644
cache_aps_init();
}
@@ -1141,6 +1143,8 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
@@ -1143,6 +1145,8 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
{
pr_debug("Boot done\n");
@@ -40,5 +40,5 @@ index 0c35207320cb..eb8793b04cd1 100644
nmi_selftest();
impress_friends();
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 28afac2af617e11e03150141f8deda6dbabfe4ae Mon Sep 17 00:00:00 2001
From 8e0b79f12869faa9b6d98538fcc0cbeab4bd4a90 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 00:26:20 -0800
Subject: [PATCH 12/21] x86: save/restore TSC counter value during sleep/wake
@@ -78,5 +78,5 @@ index 02d0ba16ae33..0154ef895960 100644
#ifndef CONFIG_64BIT
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 768c89703cb4ab128c76179242ff58c2ba84349b Mon Sep 17 00:00:00 2001
From 79e8a6859838edd3ecc168515668322e848d0946 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 11:58:46 -0800
Subject: [PATCH 13/21] x86: only restore TSC if we have IA32_TSC_ADJUST or
@@ -35,5 +35,5 @@ index 07b7f6e578e8..48a7a0341b81 100644
header->real_magic = 0x12345678;
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 9361949639e0b6a17c71fa4fb03e871018be34a1 Mon Sep 17 00:00:00 2001
From daf65fa92dd0226eaf02ec86b7a886741debe706 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@uplinklabs.net>
Date: Wed, 17 Nov 2021 19:42:32 -0800
Subject: [PATCH 14/21] x86: don't check for random warps if using direct sync
@@ -27,5 +27,5 @@ index 3cc241632221..ad224f7c0d5b 100644
atomic_set(&test_runs, 0);
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 7b1d9786a1a132cc70181d3bf3b4cdea19d7927d Mon Sep 17 00:00:00 2001
From 994bccef72a6bc5a586b9d42c90a5e703d169c1a Mon Sep 17 00:00:00 2001
From: Muhammad Usama Anjum <usama.anjum@collabora.com>
Date: Tue, 6 Jun 2023 16:12:06 +0500
Subject: [PATCH 15/21] x86: revert extra time added to check for tsc wraps
@@ -29,5 +29,5 @@ index ad224f7c0d5b..48b033a588c3 100644
}
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 5e62cc08b8a555d6090a6e1fd00e0bee5e74da57 Mon Sep 17 00:00:00 2001
From f61ffbff5a68a13b0a74c26dc582af04f3f02a88 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Fri, 2 Sep 2022 19:13:12 +0300
Subject: [PATCH 16/21] usb: dwc3: Hardcode jupiter ACPI device as extcon name
@@ -29,5 +29,5 @@ index 052852f80146..fee1c911d308 100644
};
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 4142d218879226afa7dffc82521f25fe698245c7 Mon Sep 17 00:00:00 2001
From f9d8d0e7e1385658a112c441e1eb7ff165f3fbce Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Tue, 18 Jan 2022 08:44:34 -0800
Subject: [PATCH 17/21] usb: dwc3: Bump USB gadget wakeup timeout
@@ -13,10 +13,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 89fc690fdf34..d68bc1650afb 100644
index 31a654c6f15b..99d736aa0194 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2361,7 +2361,7 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc, bool async)
@@ -2409,7 +2409,7 @@ static int __dwc3_gadget_wakeup(struct dwc3 *dwc, bool async)
return 0;
/* poll until Link State changes to ON */
@@ -26,5 +26,5 @@ index 89fc690fdf34..d68bc1650afb 100644
while (retries--) {
reg = dwc3_readl(dwc->regs, DWC3_DSTS);
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 88ef04b0daf0fecec2a9836360dc4c08fd128db4 Mon Sep 17 00:00:00 2001
From 5a20c4f37f84a37ce5122256686479581e31e16e Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sat, 29 Oct 2022 15:25:21 -0700
Subject: [PATCH 18/21] usb: dwc3: Drop "usb-role-swtich" from
@@ -33,5 +33,5 @@ index fee1c911d308..ac6827f4ef89 100644
PROPERTY_ENTRY_STRING("linux,extcon-name", "VLV0100:00"),
{}
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 02d6a2be69db32e90e004abb7d163eb7c77c0e5e Mon Sep 17 00:00:00 2001
From 9b9fd9ebcaefb8a54d70e424392add35fc4de92f Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Sun, 27 Feb 2022 16:34:23 -0800
Subject: [PATCH 19/21] usb: dwc3: Fix "linux,extcon-name"
@@ -23,5 +23,5 @@ index ac6827f4ef89..23d0c29380a7 100644
};
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From a10155ebfafa0da658fe37b5f61f3df14aa77667 Mon Sep 17 00:00:00 2001
From b9570162cbfdaafd576fb3f867c947c626a20cea Mon Sep 17 00:00:00 2001
From: Gabriel Krisman Bertazi <krisman@collabora.com>
Date: Wed, 5 May 2021 22:12:17 -0400
Subject: [PATCH 20/21] pinctrl-amd: Add quirk to timeout irq pin
@@ -27,7 +27,7 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 7f66ec73199a..5763c37e5204 100644
index fff6d4209ad5..d9f266d2b595 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -31,6 +31,7 @@
@@ -66,5 +66,5 @@ index 7f66ec73199a..5763c37e5204 100644
}
--
2.46.0
2.48.1
@@ -1,4 +1,4 @@
From 836cc60357f95c5edfae621d458ec64c79880557 Mon Sep 17 00:00:00 2001
From beffb5e21b03f78dc553112f6a4156a923fe965b Mon Sep 17 00:00:00 2001
From: Andres Rodriguez <andresx7@gmail.com>
Date: Tue, 8 Nov 2022 17:32:25 -0500
Subject: [PATCH 21/21] mmc: core: add safe_trim_quirk attribute
@@ -20,10 +20,10 @@ Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
4 files changed, 7 insertions(+)
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 5b2f7c285461..46b7971d0a33 100644
index 6a23be214543..d8cf810837e8 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -820,6 +820,7 @@ MMC_DEV_ATTR(rel_sectors, "%#x\n", card->ext_csd.rel_sectors);
@@ -806,6 +806,7 @@ MMC_DEV_ATTR(rel_sectors, "%#x\n", card->ext_csd.rel_sectors);
MMC_DEV_ATTR(ocr, "0x%08x\n", card->ocr);
MMC_DEV_ATTR(rca, "0x%04x\n", card->rca);
MMC_DEV_ATTR(cmdq_en, "%d\n", card->ext_csd.cmdq_en);
@@ -31,7 +31,7 @@ index 5b2f7c285461..46b7971d0a33 100644
static ssize_t mmc_fwrev_show(struct device *dev,
struct device_attribute *attr,
@@ -879,6 +880,7 @@ static struct attribute *mmc_std_attrs[] = {
@@ -865,6 +866,7 @@ static struct attribute *mmc_std_attrs[] = {
&dev_attr_rca.attr,
&dev_attr_dsr.attr,
&dev_attr_cmdq_en.attr,
@@ -40,10 +40,10 @@ index 5b2f7c285461..46b7971d0a33 100644
};
ATTRIBUTE_GROUPS(mmc_std);
diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
index cca71867bc4a..6418bfdf849e 100644
index 89b512905be1..20c022419de1 100644
--- a/drivers/mmc/core/quirks.h
+++ b/drivers/mmc/core/quirks.h
@@ -241,4 +241,6 @@ static inline void mmc_fixup_device(struct mmc_card *card,
@@ -254,4 +254,6 @@ static inline void mmc_fixup_device(struct mmc_card *card,
dev_dbg(&card->dev, "calling %ps\n", f->vendor_fixup);
f->vendor_fixup(card, f->data);
}
@@ -51,10 +51,10 @@ index cca71867bc4a..6418bfdf849e 100644
+ card->safe_trim_quirk_version = 1;
}
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 1c8148cdda50..e8b99bbb4b0b 100644
index cc757b850e79..2fe5d6c9fed7 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -714,6 +714,7 @@ MMC_DEV_ATTR(oemid, "0x%04x\n", card->cid.oemid);
@@ -710,6 +710,7 @@ MMC_DEV_ATTR(oemid, "0x%04x\n", card->cid.oemid);
MMC_DEV_ATTR(serial, "0x%08x\n", card->cid.serial);
MMC_DEV_ATTR(ocr, "0x%08x\n", card->ocr);
MMC_DEV_ATTR(rca, "0x%04x\n", card->rca);
@@ -62,7 +62,7 @@ index 1c8148cdda50..e8b99bbb4b0b 100644
static ssize_t mmc_dsr_show(struct device *dev, struct device_attribute *attr,
@@ -776,6 +777,7 @@ static struct attribute *sd_std_attrs[] = {
@@ -772,6 +773,7 @@ static struct attribute *sd_std_attrs[] = {
&dev_attr_ocr.attr,
&dev_attr_rca.attr,
&dev_attr_dsr.attr,
@@ -71,10 +71,10 @@ index 1c8148cdda50..e8b99bbb4b0b 100644
};
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index f34407cc2788..12fdace380f0 100644
index 526fce581657..722812713ec0 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -275,6 +275,7 @@ struct mmc_card {
@@ -309,6 +309,7 @@ struct mmc_card {
unsigned int state; /* (our) card state */
unsigned int quirks; /* card quirks */
unsigned int quirk_max_rate; /* max rate set by quirks */
@@ -83,5 +83,5 @@ index f34407cc2788..12fdace380f0 100644
#define MMC_QUIRK_BLKSZ_FOR_BYTE_MODE (1<<1) /* use func->cur_blksize */
/* for byte mode */
--
2.46.0
2.48.1
+25 -24
View File
@@ -1,7 +1,7 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=linux-valve-jupiter
pkgver=6.11
pkgrel=2
pkgver=6.13
pkgrel=0
pkgdesc="Valve Steam Deck kernel fork"
arch="x86_64"
_flavor="valve-jupiter"
@@ -16,6 +16,7 @@ options="!strip !check !tracedeps
makedepends="
bash
bison
diffutils
elfutils-dev
findutils
flex
@@ -85,27 +86,27 @@ package() {
}
sha512sums="
53fa166da1dda6460402c6a49ba1fb2d5940e4845fa1cd853e6450761d144cbe778b73e4a4724f8a2e3156c4e0ef18a4cc3c029ae9f26a4f881129ba3ec115c1 linux-6.11.tar.gz
5950417dca02f2155c6e528a91e084c59855a66b9094bfd11214cb8bf5602e776c154d76528bf0cf114d333713d685418c577378d69b105e13ebba9dc6f874cc linux-6.13.tar.gz
ca784d9ca8b8b04e54b78f89771d4785952af1491666b04c42e790576cc7c34b5a485dcbe88e0198f74226b40d76dc649faa405ef7afd2beb2a40eddb05be2a2 config-valve-jupiter.x86_64
221d8de25b902d66c5f22fec1da627be7bfe23305d2bbf5bbedb9859748e9614f4ae90339e4a779c725e2683032877e8544234ac22b354cd9f0f0d2490f86be6 0001-ACPICA-Limit-error-message-flood-caused-by-firmware-.patch
2f3f207498feba34eec85deb9962d35ce06d4145088a0cf34480eab30f94de0af27d9befa5061354d241ab0807152166208f7c22e689dcea3fa37d1756fb108e 0002-drivers-video-backlight-Disable-backlight-notificati.patch
289066f4535dbd52d750e90f5a6b573aebebcbdddafb2e50e18f3f0a67148ac2f2372acd2bc2e2bdac4363ead325ea8edfd4c323b4765054741e3a3ce3af2994 0003-iio-light-ltrf216a-Return-floating-point-values.patch
69e52390e1ffe467d9d2a45573756abd6d8a95261dd04e8460d284379787276cc656fb380809082edb3dca5487fa216da5a2ac280483c64946bf8ef9d1b28dac 0004-mfd-Add-MFD-core-driver-for-Steam-Deck.patch
9012c27d1db283caec8a1eaba1102a8bb407a546378be807702395af5f029a62815cfd195daa71be61f65bb3fed4a50bb5bef673bc870ed0465d8a83b8dc03b9 0005-hwmon-Add-driver-for-Steam-Deck-s-EC-sensors.patch
f67f5567ce6afec95128cdaecfef54b1e6e81f9f3128b2c309cd73d094caed4269f976f54e97d4b04df1089c9cf9860ebe804955691612da03703753f9f9b12b 0006-leds-steamdeck-Add-support-for-Steam-Deck-LED.patch
2244509a77361334a682ce177afaed9ffed917dc5ed31092eb898c31fb63d1efb905c89dd733393d30c395950e0fc9579bb7e80b7b3373a8af5ec00ec17f3947 0007-extcon-Add-driver-for-Steam-Deck.patch
c4f08daffdcfec47e6e497027f0e27d344d31a9b7323f577c52fa5eba50d799ba65ac1b22cbb5ec27cb01731a0a1456dd6c09e4637e9350fd2449309f28c425a 0008-hwmon-steamdeck-hwmon-Add-support-for-max-battery-le.patch
1f8e8dbf09307343b3db7b212aabe54c687ca6f0b1120375cfc6bebfa7964b16a1221b0a3e9e273fa8f39a88142180db5213627d622511fa12fbd17f2a1813b2 0009-mfd-steamdeck-Expose-controller-board-power-in-sysfs.patch
14442d9d41799b796fde1bec0978da78214b5b9186a9c73957b650c785470c23212688bd145a937ed4b3f2235eef7a66a1d23faeafafc1a91b4bbc52ff35512f 0010-x86-implement-tsc-directsync-for-systems-without-IA3.patch
7744574db76682314457b8bc798870650ec2536dc5917492c7d14c868e59d69cb36df9e3182d2a7341e47319056c7031ff2a62b7752e2fc962cf8b1506cf3844 0011-x86-touch-clocksource-watchdog-after-syncing-TSCs.patch
a18f0bd308486fe5379e5f9a25bc6b7f8e9271425ddfa23ec2815fd20716e6de1a774dbd5f0a9487a09150a54d0980ccfaed8987848638ee149d2911b58a30d7 0012-x86-save-restore-TSC-counter-value-during-sleep-wake.patch
bfbb8be83c6103e865a13c4718794fda092fea0815ed4170048621038a6300c8650c9333eb753984ee13e96874691edb8238da1fa9aae0533d23f5e7de0a1879 0013-x86-only-restore-TSC-if-we-have-IA32_TSC_ADJUST-or-d.patch
2bb59814f6e095dbef5694a07704b5530f5061a217c53b3a576988b57ae4ca6fee831d50b6116c92b2cb187e488b0123b11b0bc33e5a117d1f9a6da25cc5539f 0014-x86-don-t-check-for-random-warps-if-using-direct-syn.patch
85bce585ac3336c1ebc528f97f5e4d03a56c7ff3d3d1e7a356c0f6218eb143bace1962481640c81aadac7e0e00eddc8e611b7c8886c1238e0fd179cc38513b8c 0015-x86-revert-extra-time-added-to-check-for-tsc-wraps.patch
d6fde7914429f08d7c017c35d9a4176f1a6816303ff2e6b5b7e3128d26c646d9d01d66c1cfc1b634f52d770a4c7b6e3247084049d801e70480eabbd7608e931e 0016-usb-dwc3-Hardcode-jupiter-ACPI-device-as-extcon-name.patch
22aa5766a0ffaf1383a51dd7308cc0bdad7900069ccce218b31e63b2bc229c538315915b05dd912586083dfd2e0418ca3d9e0ea7e8a61b67d78aac60d95c6de3 0017-usb-dwc3-Bump-USB-gadget-wakeup-timeout.patch
7261eb068eb2b886ef9733a6fc1b2b0c6c3a914f219317b9f0e1e314fa378be328dc7d9fe08663cd66c41541ede33ac3346e0f92c32e9bedecf6c2117a2447bc 0018-usb-dwc3-Drop-usb-role-swtich-from-dwc3_pci_mr_prope.patch
b1f6bb73bb5539c4f912ab79d2eaa978e8522a1a1597362c6a22535bd1cc4726222d4ef56c9541f4107e744ac613100eaf763b8fe6afbd12a5383a692d15e905 0019-usb-dwc3-Fix-linux-extcon-name.patch
1d882784f2dd60048570a7e76f02a00c7670bcfaf45cd4fdd96ec308265264482361852c609a97ff24931200df1d7f6268583c89e00aa91ac44c2db013ef87b8 0020-pinctrl-amd-Add-quirk-to-timeout-irq-pin-reconfigura.patch
7702b0beb85c8059f71df26fc9b36ecdf995d49116c7f8dbc642635dcc50dbaaacf6a8de22f3b0b0c7e73800d350c0205eea44a548292a227a6a8d7cba44b06b 0021-mmc-core-add-safe_trim_quirk-attribute.patch
279457c9a2f5889896fc6614ec99b33e3d4d7e62f50893666a83bddded8903932467e8b2b11eefafa8abdcba39f8cd0e29864c12aec620bf10a25b528a0849ff 0001-ACPICA-Limit-error-message-flood-caused-by-firmware-.patch
83640f9bb526115da238b1eab1ba53b8cb08fc5ca17cf4659530dc3a9f7dbc5e09cf43ac6ac8a6536b7f83e4bfd97ccd67fbac9d71a78e98b807e74d83e79061 0002-drivers-video-backlight-Disable-backlight-notificati.patch
1207e9c9100c8695c238ab91f7eece2fbc7421ba0497efade050a7817afd3b9e104440bf909ee4c7395ebe6be1f8fcc7b27a0ab0b19405d5e23cc47f0d864949 0003-iio-light-ltrf216a-Return-floating-point-values.patch
d8d46208a304c6d3d07740df9eb7ac44309df5454bba14d220d372a51f209131e90d9700390daae73fd738751dcfcf04e1382bc90b0b3aa233b2212b31b8a475 0004-mfd-Add-MFD-core-driver-for-Steam-Deck.patch
2ad79ebd6953565ccbadc121f80132bf6a634252068c9e6d53afbf9f1dd045af735885e2fc6399f35dc5c7e3958e61706cc8eefc465f78590190d06a848984be 0005-hwmon-Add-driver-for-Steam-Deck-s-EC-sensors.patch
5f04b178ad43936c993954ddf3cc75db18897dbb129ffb71af5abe3c9477211ab17e0425e357e5e9f1fbfe95b9738d4effb90ada72b437d2ffee7e4fd6378610 0006-leds-steamdeck-Add-support-for-Steam-Deck-LED.patch
bc0bbafa765d504d57a3c0c04be7f927c51894204798519f49f9bf811a2eac9d7d1514cf21910ad1ed66c1096ce99c1dcb4f8a55ab2077b0734fc067a18f1adc 0007-extcon-Add-driver-for-Steam-Deck.patch
2a0252d0603adbdeb4ad26d91eaa96fe7fc06ac611439572f2c52f18d2acc8cb58b19b0c9de62c68ce95c03e88457bc954cdf1c988e2179d1be291a8f897ecea 0008-hwmon-steamdeck-hwmon-Add-support-for-max-battery-le.patch
84f3328b4b7c07d9ccd0f7c9191d09e51c6be93718c765123cc1ea4410a310fec86630d56df2afab1e5dddf2bac8059ad16714473d5ac26f7425f337ea5ca649 0009-mfd-steamdeck-Expose-controller-board-power-in-sysfs.patch
615f52deb7660ad12cf34d3c135857431cd1d76d308303fb152491d7f9dfd42b17212acc24157b400d981129dd6672e2da80ab5f586ff3e4597851ec9f730d78 0010-x86-implement-tsc-directsync-for-systems-without-IA3.patch
53aed4a0e5aa33b01651e897d81c3d89f2b0066f5f81e55748fce8cb2ae1157a4d974af6aa6d1473c13be73030d6bae437417e1ad4b0aa131ac6231931115ca0 0011-x86-touch-clocksource-watchdog-after-syncing-TSCs.patch
23882a2cc2ab298fb3ff2d7361564ce7d1ca88862f7561ce9c4ecdbbd8867c50fa6d9264b3680bac2552ca18b3377aacde9093633654f6b2f373cd2c7bc8146f 0012-x86-save-restore-TSC-counter-value-during-sleep-wake.patch
7f3b45cd0b9fbefdf81c815cd715db7c113ed74654e1358bac921ba72c412ebf652ac45fc43b01feca5fae56d5661469fc55a18e55a02f309a5fe797c7748cc7 0013-x86-only-restore-TSC-if-we-have-IA32_TSC_ADJUST-or-d.patch
8ec1bb0d850c026b4c8064f117558e5c39599902a1c0abec8078966be2eda1655e00a851101fcb550cfdc0954ab3d46729b7c670442ffd5bda6d411caf793718 0014-x86-don-t-check-for-random-warps-if-using-direct-syn.patch
21fdbe446fd036fe362b9bc6c101852b19169bc6b9f1e6267fc30f6bc57d3b4a31dbd332ca1460e70a0858eb81754006764e17571e037d4df75e44a9afa8d7b3 0015-x86-revert-extra-time-added-to-check-for-tsc-wraps.patch
eed5da549bd9bed09611cf88361fcc9993106243b609c65581b7ac04d405dedf3ec0a5f39f2790a882cd2f2f631bdff4d84599faa1d3b28ab9bdf39838c80f1b 0016-usb-dwc3-Hardcode-jupiter-ACPI-device-as-extcon-name.patch
0747b3edffd04561543bcef8eb0dd5798ba45561e6ad0e3c7226102898cd4a628f0bd4268296da1906d03245d8a2f3393250a700e3bd3a62a17bcb888c4faf9d 0017-usb-dwc3-Bump-USB-gadget-wakeup-timeout.patch
c8367ceeb6df3c1e16adc437d9391b1ebbda3226d56e3024d7d88efc1607d69c2e1920893da8cf9977d55593d794674f1cb8be75a67fba14430768ecfed63393 0018-usb-dwc3-Drop-usb-role-swtich-from-dwc3_pci_mr_prope.patch
f35bec00711a5ed0328f2f55123cf1423dfe99fc3cfae38cc2963bf282f7b9150c0a6ff9903cba084b23a1ada0ca3f649e248a0564392fd7bf732e37f0c5e417 0019-usb-dwc3-Fix-linux-extcon-name.patch
d2f8604f6ac7570639d6b59d0cb4f82adf75fd717233199dead881de8e5d485777a832f1f13b28bdadac318b00c89c221bbf8e252207df35b6e9b6579fa1ece3 0020-pinctrl-amd-Add-quirk-to-timeout-irq-pin-reconfigura.patch
d32dd802487c9fefa7a822946289d069f867eb4ce5e3c11805f1c8b6285b4f9062555d0ce33fb4311633a52390e4adeee56e3e69da29bc4868935e3641a54558 0021-mmc-core-add-safe_trim_quirk-attribute.patch
"
@@ -1,66 +0,0 @@
From 0bda547b2d7694ab40e0237ea6ae8a25a237ee50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Thu, 11 Apr 2024 13:57:26 +0200
Subject: [PATCH 1/2] abuild: add systemd splitfunc
Co-authored-by: Caleb Connolly <caleb@postmarketos.org>
---
abuild.in | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/abuild.in b/abuild.in
index 36317d6..74e47f1 100644
--- a/abuild.in
+++ b/abuild.in
@@ -815,6 +815,11 @@ postcheck() {
&& ! is_openrc_pkg "$name"; then
warning "Found OpenRC directory (/etc/conf.d or /etc/init.d) but name doesn't end with -openrc"
fi
+ # look for /usr/lib/systemd
+ if [ -e "$dir"/usr/lib/systemd ] \
+ && ! is_systemd_pkg "$name"; then
+ warning "Found systemd directory (/usr/lib/systemd) but it's not in a systemd package"
+ fi
# look for /usr/share/doc
if [ -e "$dir"/usr/share/doc ] \
&& ! is_doc_pkg "$name"; then
@@ -1371,6 +1376,11 @@ is_openrc_pkg() {
test "${1%-openrc}" != "$1"
}
+# returns true if this is the -systemd package
+is_systemd_pkg() {
+ test "${1%-systemd}" != "$1" || test "systemd" == "$1"
+}
+
# returns true if this is the -bash-completion package
is_bashcomp_pkg() {
test "${1%-bash-completion}" != "$1"
@@ -2143,6 +2153,24 @@ openrc() {
default_openrc
}
+# predefined splitfunc systemd
+default_systemd() {
+ depends="$depends_systemd"
+ pkgdesc="$pkgdesc (systemd files)"
+ install_if="systemd ${subpkgname%-systemd}=$pkgver-r$pkgrel"
+
+ if [ -d lib/systemd ]; then
+ error "Detected /lib/systemd dir, should be installed to /usr/lib/systemd"
+ return 1
+ fi
+
+ amove usr/lib/systemd
+}
+
+systemd() {
+ default_systemd
+}
+
default_devhelp() {
depends=""
pkgdesc="$pkgname - devhelp files"
--
2.45.2
@@ -0,0 +1,72 @@
From df135fd1a709ea27cb36d60f7d992e10170ed838 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Fri, 17 Jan 2025 08:43:57 -0800
Subject: [PATCH 1/4] prepare_metafiles: install scripts in controldir checking
deps
A future patch will make it possible that some scripts are generated
when they are "installed" to the controldir, and in this case they will
not exist yet when script dependencies are checked and added to the
package. By "installing" the scripts sooner, the dependencies for these
generated scripts can be accounted for.
---
abuild.in | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/abuild.in b/abuild.in
index b834e73..83439c5 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1118,6 +1118,20 @@ prepare_metafiles() {
mkdir -p "$controldir"
local builddate="$SOURCE_DATE_EPOCH"
+ local metafiles=".PKGINFO"
+ for i in $install $triggers; do
+ local f=${i%=*}
+ local n=${f%.*}
+ if [ "$n" != "$name" ]; then
+ continue
+ fi
+ script=${f#$name}
+ msg "Adding $script"
+ cp "$startdir/$f" "$controldir/$script" || return 1
+ chmod +x "$controldir/$script"
+ metafiles="$metafiles $script"
+ done
+
# Fix package size on several filesystems
case "$(stat -f -c "%T" .)" in
btrfs|ecryptfs|zfs)
@@ -1176,7 +1190,7 @@ prepare_metafiles() {
for i in $install $triggers; do
local s=${i%=*}
[ "$name" != "${s%.*}" ] && continue
- if head -n 1 "$startdir/$s" | grep -E '^#!\s*/bin/sh' >/dev/null ; then
+ if head -n 1 "$controldir/$s" | grep -E '^#!\s*/bin/sh' >/dev/null ; then
msg "Script found. /bin/sh added as a dependency for $pkg"
deps="$deps /bin/sh"
break
@@ -1227,19 +1241,6 @@ prepare_metafiles() {
echo "install_if = $(echo $install_if)" >> "$pkginfo"
fi
- local metafiles=".PKGINFO"
- for i in $install $triggers; do
- local f=${i%=*}
- local n=${f%.*}
- if [ "$n" != "$name" ]; then
- continue
- fi
- script=${f#$name}
- msg "Adding $script"
- cp "$startdir/$f" "$controldir/$script" || return 1
- chmod +x "$controldir/$script"
- metafiles="$metafiles $script"
- done
printf %s "$metafiles" | tr ' ' '\0' > "$controldir"/.metafiles
}
--
2.48.1
@@ -0,0 +1,254 @@
From 4aecd931f4b911211194c3018d029330d6aed38e Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Tue, 21 Jan 2025 11:50:06 -0800
Subject: [PATCH 2/4] tests: add tests for systemd splitfunc
---
tests/abuild_systemdsplit_test | 110 ++++++++++++++++++
.../systemd_existing_install_scripts/APKBUILD | 32 +++++
...sting-install-scripts-systemd.post-install | 1 +
...isting-install-scripts-systemd.pre-install | 1 +
.../systemd_no_install_scripts/APKBUILD | 27 +++++
tests/testrepo/systemd_pkg/APKBUILD | 24 ++++
6 files changed, 195 insertions(+)
create mode 100755 tests/abuild_systemdsplit_test
create mode 100644 tests/testrepo/systemd_existing_install_scripts/APKBUILD
create mode 100644 tests/testrepo/systemd_existing_install_scripts/sd-existing-install-scripts-systemd.post-install
create mode 100644 tests/testrepo/systemd_existing_install_scripts/sd-existing-install-scripts-systemd.pre-install
create mode 100644 tests/testrepo/systemd_no_install_scripts/APKBUILD
create mode 100644 tests/testrepo/systemd_pkg/APKBUILD
diff --git a/tests/abuild_systemdsplit_test b/tests/abuild_systemdsplit_test
new file mode 100755
index 0000000..2a9f1cb
--- /dev/null
+++ b/tests/abuild_systemdsplit_test
@@ -0,0 +1,110 @@
+#!/usr/bin/env atf-sh
+
+. $(atf_get_srcdir)/test_env.sh
+init_tests \
+ abuild_systemdsplit_pkg \
+ abuild_systemdsplit_no_install_scripts \
+ abuild_systemdsplit_existing_install_scripts
+
+testrepo=$(atf_get_srcdir)/testrepo
+
+export ABUILD_SHAREDIR=$(atf_get_srcdir)/..
+export ABUILD_CONF=/dev/null
+export ABUILD_APK_INDEX_OPTS="--allow-untrusted"
+export REPODEST="$PWD"/packages
+
+init_keys() {
+ cp -ra "$(atf_get_srcdir)"/testdata/.abuild "$PWD"
+}
+
+abuild_systemdsplit_pkg_body() {
+ init_keys
+ cp -ra "$testrepo" .
+ cd testrepo/systemd_pkg
+
+ atf_check -s exit:0 -o ignore \
+ -e not-match:"WARNING" \
+ -e not-match:"fatal" \
+ -e match:"Running split function systemd" \
+ abuild
+
+ arch=$(abuild -A)
+ tar -zxf "$REPODEST"/testrepo/$arch/sd-pkg-systemd-1.0-r0.apk
+
+ if [ ! -f usr/lib/systemd/system/foo.service ]; then
+ atf_fail "usr/lib/systemd/system/*.service should exist"
+ fi
+}
+
+abuild_systemdsplit_no_install_scripts_body() {
+ init_keys
+ cp -ra "$testrepo" .
+ cd testrepo/systemd_no_install_scripts
+
+ atf_check -s exit:0 -o ignore \
+ -e not-match:"WARNING" \
+ -e not-match:"fatal" \
+ -e match:"Adding .post-install" \
+ -e match:"Adding .pre-deinstall" \
+ abuild
+
+ arch=$(abuild -A)
+ tar -zxf "$REPODEST"/testrepo/$arch/sd-no-install-scripts-systemd-1.0-r0.apk
+
+ # post-install
+ if [ ! -f .post-install ]; then
+ atf_fail ".post-install script should exist"
+ fi
+ if ! grep -Eq "systemd_service_post_install system.*foo.service" .post-install; then
+ atf_fail ".post-install script missing preset logic"
+ fi
+
+ # pre-deinstall
+ if [ ! -f .pre-deinstall ]; then
+ atf_fail ".pre-deinstall script should exist"
+ fi
+ if ! grep -Eq "systemd_service_pre_deinstall system.*foo.service" .pre-deinstall; then
+ atf_fail ".pre-deinstall script missing preset logic"
+ fi
+}
+
+abuild_systemdsplit_existing_install_scripts_body() {
+ init_keys
+ cp -ra "$testrepo" .
+ cd testrepo/systemd_existing_install_scripts
+
+ atf_check -s exit:0 -o ignore \
+ -e not-match:"WARNING" \
+ -e not-match:"fatal" \
+ -e match:"Adding .pre-install" \
+ -e match:"Adding .post-install" \
+ -e match:"Adding .pre-deinstall" \
+ abuild
+
+ arch=$(abuild -A)
+ tar -zxf "$REPODEST"/testrepo/$arch/sd-existing-install-scripts-systemd-1.0-r0.apk
+
+ # post-install
+ if [ ! -f .post-install ]; then
+ atf_fail ".post-install script should exist"
+ fi
+ if ! grep -Eq "systemd_service_post_install system.*foo.service" .post-install; then
+ atf_fail ".post-install script missing preset logic"
+ fi
+ if ! grep -Eq "# DO NOT OVERWRITE" .post-install; then
+ atf_fail ".post-install was overwritten by the preset logic"
+ fi
+
+ # pre-deinstall
+ if [ ! -f .pre-deinstall ]; then
+ atf_fail ".pre-deinstall script should exist"
+ fi
+ if ! grep -Eq "systemd_service_pre_deinstall system.*foo.service" .pre-deinstall; then
+ atf_fail ".pre-deinstall script missing preset logic"
+ fi
+
+ # pre-install
+ if ! grep -Eq "# THIS SHOULD EXIST" .pre-install; then
+ atf_fail ".pre-install script was overwritten"
+ fi
+}
diff --git a/tests/testrepo/systemd_existing_install_scripts/APKBUILD b/tests/testrepo/systemd_existing_install_scripts/APKBUILD
new file mode 100644
index 0000000..0f15530
--- /dev/null
+++ b/tests/testrepo/systemd_existing_install_scripts/APKBUILD
@@ -0,0 +1,32 @@
+# Maintainer: postmarketOS <team@postmarketos.org>
+pkgname="sd-existing-install-scripts"
+pkgver="1.0"
+pkgrel=0
+pkgdesc="Dummy test package w/ systemd ([Install] section in service and custom install script)"
+url="https://gitlab.alpinelinux.org/alpine/aports"
+arch="noarch"
+license="MIT"
+subpackages="$pkgname-systemd"
+source=""
+builddir="$srcdir/pkg1-1.0"
+options="!check"
+
+prepare() {
+ mkdir -p "$builddir"
+}
+
+package() {
+ mkdir -p "$pkgdir/usr/lib/systemd/system"
+ cat <<-EOF > "$pkgdir/usr/lib/systemd/system/foo.service"
+ [Service]
+ ExecStart=/usr/bin/foo
+
+ [Install]
+ Wanted-by=default.target
+ EOF
+}
+
+systemd() {
+ default_systemd
+ install="$install $subpkgname.pre-install"
+}
diff --git a/tests/testrepo/systemd_existing_install_scripts/sd-existing-install-scripts-systemd.post-install b/tests/testrepo/systemd_existing_install_scripts/sd-existing-install-scripts-systemd.post-install
new file mode 100644
index 0000000..2931eeb
--- /dev/null
+++ b/tests/testrepo/systemd_existing_install_scripts/sd-existing-install-scripts-systemd.post-install
@@ -0,0 +1 @@
+# DO NOT OVERWRITE
diff --git a/tests/testrepo/systemd_existing_install_scripts/sd-existing-install-scripts-systemd.pre-install b/tests/testrepo/systemd_existing_install_scripts/sd-existing-install-scripts-systemd.pre-install
new file mode 100644
index 0000000..9e66ed7
--- /dev/null
+++ b/tests/testrepo/systemd_existing_install_scripts/sd-existing-install-scripts-systemd.pre-install
@@ -0,0 +1 @@
+# THIS SHOULD EXIST
diff --git a/tests/testrepo/systemd_no_install_scripts/APKBUILD b/tests/testrepo/systemd_no_install_scripts/APKBUILD
new file mode 100644
index 0000000..6af4652
--- /dev/null
+++ b/tests/testrepo/systemd_no_install_scripts/APKBUILD
@@ -0,0 +1,27 @@
+# Maintainer: postmarketOS <team@postmarketos.org>
+pkgname="sd-no-install-scripts"
+pkgver="1.0"
+pkgrel=0
+pkgdesc="Dummy test package w/ systemd support ([Install] section in service)"
+url="https://gitlab.alpinelinux.org/alpine/aports"
+arch="noarch"
+license="MIT"
+subpackages="$pkgname-systemd"
+source=""
+builddir="$srcdir/pkg1-1.0"
+options="!check"
+
+prepare() {
+ mkdir -p "$builddir"
+}
+
+package() {
+ mkdir -p "$pkgdir/usr/lib/systemd/system"
+ cat <<-EOF > "$pkgdir/usr/lib/systemd/system/foo.service"
+ [Service]
+ ExecStart=/usr/bin/foo
+
+ [Install]
+ Wanted-by=default.target
+ EOF
+}
diff --git a/tests/testrepo/systemd_pkg/APKBUILD b/tests/testrepo/systemd_pkg/APKBUILD
new file mode 100644
index 0000000..a5446a9
--- /dev/null
+++ b/tests/testrepo/systemd_pkg/APKBUILD
@@ -0,0 +1,24 @@
+# Maintainer: postmarketOS <team@postmarketos.org>
+pkgname="sd-pkg"
+pkgver="1.0"
+pkgrel=0
+pkgdesc="Dummy test package w/ systemd (no [Install] section in service)"
+url="https://gitlab.alpinelinux.org/alpine/aports"
+arch="noarch"
+license="MIT"
+subpackages="$pkgname-systemd"
+source=""
+builddir="$srcdir/pkg1-1.0"
+options="!check"
+
+prepare() {
+ mkdir -p "$builddir"
+}
+
+package() {
+ mkdir -p "$pkgdir/usr/lib/systemd/system"
+ cat <<-EOF > "$pkgdir/usr/lib/systemd/system/foo.service"
+ [Service]
+ ExecStart=/usr/bin/foo
+ EOF
+}
--
2.48.1
@@ -0,0 +1,192 @@
From cb613d0d1a9dbb687fef3cf0c78adb367ef35188 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Tue, 21 Jan 2025 11:50:43 -0800
Subject: [PATCH 3/4] abuild: add systemd splitfunc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This adds support for splitting systemd-related stuff into a -systemd
subpkg, and installing it by default ***only*** when systemd is
installed.
There's a bit more logic in default_systemd than "normal" because we
want to use systemd "presets" downstream to configure services to start
by default. Using this feature requires running `systemctl preset`
at install time (only!) and cleaning up on de-install, so two install
scripts are generated by default when default_systemd detects it is
packaging sytemd unit files that *could* have presets configured for
them. It's the responsibility of downstream distros and/or users to
provide presets for stuff, abuild is only including the machinery to
*apply* those presets at an appropriate time.
The approach here is very similar to what Fedora and Debian (and
probably others) do.
The install scripts depend on a macro file to implement the actual
logic that calls `systemctl preset` the appropriate way for system vs
user session. The idea is that downstream distros that support systemd
can provide this macro. Or it can be included in aports, or rolled into
abuild (but will make the install scripts a bit longer)
Co-authored-by: Caleb Connolly <caleb@postmarketos.org>
Co-authored-by: jane400 <pmos@j4ne.de>
Co-authored-by: Oliver Smith <ollieparanoid@postmarketos.org>
Co-authored-by: Pablo Correa Gómez <ablocorrea@hotmail.com>
---
abuild.in | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 110 insertions(+), 1 deletion(-)
diff --git a/abuild.in b/abuild.in
index 83439c5..937c3e9 100644
--- a/abuild.in
+++ b/abuild.in
@@ -833,6 +833,11 @@ postcheck() {
&& ! is_openrc_pkg "$name"; then
warning "Found OpenRC directory (/etc/conf.d or /etc/init.d) but name doesn't end with -openrc"
fi
+ # look for /usr/lib/systemd
+ if [ -e "$dir"/usr/lib/systemd ] \
+ && ! is_systemd_pkg "$name"; then
+ warning "Found systemd directory (/usr/lib/systemd) but name doesn't end with -systemd"
+ fi
# look for /usr/share/doc
if [ -e "$dir"/usr/share/doc ] \
&& ! is_doc_pkg "$name"; then
@@ -1105,6 +1110,53 @@ check_depver() {
return 1
}
+prepare_systemd_install_script() {
+ # Generate install scripts for applying presets if the systemd subpkg has
+ # installable unit files. If existing install scripts are found in the pkg, then
+ # merge them.
+
+ local file="$1"
+ local script="$2"
+ if [ -f "$file" ]; then
+ cp "$file" "$controldir/$script" || return 1
+ else
+ touch "$controldir/$script"
+ fi
+
+ # convert e.g. ".post-install" --> "post_install"
+ local type="${script:1}"
+ type="${type//-/_}"
+
+ # Generate/add logic for applying preset(s) to the install script
+ if [ -n "$systemd_system_units" ] || [ -n "$systemd_user_units" ]; then
+ cat <<-EOF >> "$controldir/$script.header"
+ #!/bin/sh -e
+
+ ### auto-generated systemd preset configuration start ###
+ trap "systemd_configure_presets" EXIT
+ _systemd_configure_presets_did_run=false
+
+ systemd_configure_presets() {
+ [[ "$_systemd_configure_presets_did_run" ]] && return
+ if [ ! -f /usr/lib/systemd/systemd-apk-macros.sh ]; then
+ echo "WARNING: unable to apply presets, missing systemd-apk-macros.sh"
+ exit 0
+ fi
+ . /usr/lib/systemd/systemd-apk-macros.sh
+
+ [ -n "$systemd_user_units" ] && systemd_service_$type user $systemd_user_units
+ [ -n "$systemd_system_units" ] && systemd_service_$type system $systemd_system_units
+
+ _systemd_configure_presets_did_run=true
+ }
+ ### auto-generated systemd preset configuration end ###
+ EOF
+
+ cat "$controldir/$script.header" "$controldir/$script" > "$controldir/$script.tmp"
+ mv "$controldir/$script.tmp" "$controldir/$script"
+ fi
+}
+
prepare_metafiles() {
local name=${subpkgname:-$pkgname}
[ -z "${name##* *}" ] && die "package name contains spaces"
@@ -1127,7 +1179,15 @@ prepare_metafiles() {
fi
script=${f#$name}
msg "Adding $script"
- cp "$startdir/$f" "$controldir/$script" || return 1
+ if is_systemd_pkg "$name"; then
+ # special handling for certain install scripts
+ case "$script" in
+ .post-install|.pre-deinstall) prepare_systemd_install_script "$startdir/$f" "$script";;
+ *) cp "$startdir/$f" "$controldir/$script" || return 1 ;;
+ esac
+ else
+ cp "$startdir/$f" "$controldir/$script" || return 1
+ fi
chmod +x "$controldir/$script"
metafiles="$metafiles $script"
done
@@ -1400,6 +1460,13 @@ is_openrc_pkg() {
test "${1%-openrc}" != "$1"
}
+# returns true if this is the -systemd package
+is_systemd_pkg() {
+ # NOTE: remove ' || test "systemd" == "$1"' before upstreaming to Alpine
+ # NOTE: pma!6055 needs to be merged before removing this
+ test "${1%-systemd}" != "$1" || test "systemd" == "$1"
+}
+
# check that noarch is set if needed
archcheck() {
options_has "!archcheck" && return 0
@@ -2133,6 +2200,48 @@ openrc() {
default_openrc
}
+# predefined splitfunc systemd
+default_systemd() {
+ depends="$depends_systemd"
+ pkgdesc="$pkgdesc (systemd files)"
+ install_if="systemd ${subpkgname%-systemd}=$pkgver-r$pkgrel"
+
+ if [ -d lib/systemd ]; then
+ error "Detected /lib/systemd dir, should be installed to /usr/lib/systemd"
+ return 1
+ fi
+
+ amove usr/lib/systemd
+
+ # Find user and system unit files, for use later when generating install scripts
+ # that apply presets
+ systemd_user_units=""
+ if [ -d "$subpkgdir/usr/lib/systemd/user" ]; then
+ for file in $(find "$subpkgdir/usr/lib/systemd/user" -type f); do
+ # Only units with [Install] section
+ grep -q "\[Install\]" "$file" || continue
+ systemd_user_units="$systemd_user_units $(basename "$file") "
+ done
+ fi
+ systemd_system_units=""
+ if [ -d "$subpkgdir/usr/lib/systemd/system" ]; then
+ for file in $(find "$subpkgdir/usr/lib/systemd/system" -type f); do
+ # Only units with [Install] section
+ grep -q "\[Install\]" "$file" || continue
+ systemd_system_units="$systemd_system_units $(basename "$file") "
+ done
+ fi
+ if [ -n "$systemd_system_units" ] || [ -n "$systemd_user_units" ]; then
+ # These install scripts will be created in prepare_systemd_install_script later,
+ # or merged with any existing install script(s) if exists
+ install="$subpkgname.post-install $subpkgname.pre-deinstall"
+ fi
+}
+
+systemd() {
+ default_systemd
+}
+
default_devhelp() {
depends=""
pkgdesc="$pkgname - devhelp files"
--
2.48.1
@@ -1,7 +1,7 @@
From d27596cd67928e4795dc99dbc139b231354c3381 Mon Sep 17 00:00:00 2001
From 3b8ae546bc9f7e911f9dce04f219c621d6220baf Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Fri, 5 Jul 2024 10:38:50 -0700
Subject: [PATCH 2/2] abuild: add warning in -systemd split func about
Subject: [PATCH 4/4] abuild: add warning in -systemd split func about
non-usr-merged birs
---
@@ -9,20 +9,20 @@ Subject: [PATCH 2/2] abuild: add warning in -systemd split func about
1 file changed, 4 insertions(+)
diff --git a/abuild.in b/abuild.in
index 74e47f1..e5f9be0 100644
index 937c3e9..e0a4e63 100644
--- a/abuild.in
+++ b/abuild.in
@@ -2165,6 +2165,10 @@ default_systemd() {
@@ -2211,6 +2211,10 @@ default_systemd() {
return 1
fi
amove usr/lib/systemd
+
+ if [ -d bin ] || [ -d lib ] || [ -d usr/sbin ]; then
+ warning "Files should be installed to /usr/bin or /usr/lib, not /bin, /lib, or /usr/sbin"
+ fi
}
+
amove usr/lib/systemd
systemd() {
# Find user and system unit files, for use later when generating install scripts
--
2.45.2
2.48.1
+12 -8
View File
@@ -4,9 +4,9 @@
# APKBUILDs at once.
pkgname=abuild
pkgver=99993.12.0
_pkgver=3.12.0
pkgrel=4
pkgver=99993.14.1
_pkgver=3.14.1
pkgrel=0
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -27,8 +27,10 @@ options="suid !check" # tests are SLOW in qemu
pkggroups="abuild"
source="
https://gitlab.alpinelinux.org/alpine/abuild/-/archive/$_pkgver/abuild-$_pkgver.tar.gz
0001-abuild-add-systemd-splitfunc.patch
0002-abuild-add-warning-in-systemd-split-func-about-non-u.patch
0001-prepare_metafiles-install-scripts-in-controldir-chec.patch
0002-tests-add-tests-for-systemd-splitfunc.patch
0003-abuild-add-systemd-splitfunc.patch
0004-abuild-add-warning-in-systemd-split-func-about-non-u.patch
"
builddir="$srcdir/$pkgname-$_pkgver"
@@ -104,7 +106,9 @@ _rootbld() {
}
sha512sums="
00fac67aa96a83f33406dde60bd9526bfa5fdff690b84dbe867b6ed197f147b2afafcdfbda900c005e00a64a42bcb98ca425ffc8bf2158b9540cbb67d935577d abuild-3.12.0.tar.gz
52cc5857b3c93bd4595de1d06c3c600b88871c68f7a1ea51e10d720ddd9c8fb7f0f63cd2f4fe280c0d9adaf607de8b858f4add3e46b1a5a28cc6c711359f6c60 0001-abuild-add-systemd-splitfunc.patch
3782341dac814ecbcb7d2b4242d85f03ca2e4bf9eeb3b1e9524b2c434b05c864f5a4b5b8abc4031085e7e943e90780fe07b1e99d4cfadf0695340ad321647cac 0002-abuild-add-warning-in-systemd-split-func-about-non-u.patch
49e243114933f3013884f0014fc8e5f142ff146de3d9ddb62e5ad98689cb1bf2bc8172da0331943f44b106dca4fd6fcdd917f5439e82facbb97eccc0f3459f37 abuild-3.14.1.tar.gz
6d566504df6458bae91b3cb0e270193fbfbdf687d1d81262004c9ce5dacb371ccd7099f730990cd598f3c90b1bad12234fdfaa0e387fe6eb6b2d37c660201b41 0001-prepare_metafiles-install-scripts-in-controldir-chec.patch
86d750862850c30d3ed5aeaf4279992cffbc6b61e2f1a4891d97e9f5b836c8d41cac802a9b91cd36444fd53951a6f8c57ca588234bdd5a41210a1331327af999 0002-tests-add-tests-for-systemd-splitfunc.patch
4734b10fc9d247132a34d17a94dd2707dd94a545c855e052dd4db246b9a287b9dc9a3c6efe3b1bf900ef379cfe2809da1e57f5a5961dfd4bf9066f6b2d3085aa 0003-abuild-add-systemd-splitfunc.patch
895b50380cd178c7d65cb6e77957a2f2367a3637a519e3c33310b1d0ef732953bf1a9d0fb7eda1005d2d4b8ab6a60b5f59c4962d03b46bd27692e504c14661c4 0004-abuild-add-warning-in-systemd-split-func-about-non-u.patch
"
+1 -6
View File
@@ -4,7 +4,7 @@ maintainer="Jane Rachinger <jane400+pmaports@postmarketos.org>"
pkgname=cups
pkgver=99992.4.11
_pkgver=2.4.11
pkgrel=0
pkgrel=1
pkgdesc="The CUPS Printing System"
url="https://github.com/OpenPrinting/cups/"
arch="all"
@@ -97,11 +97,6 @@ package() {
find usr/share/cups/model -name "*.ppd" -exec gzip -n9f {} +
}
systemd() {
install="$subpkgname.post-install $subpkgname.pre-deinstall"
default_systemd
}
dev() {
default_dev
@@ -1,4 +0,0 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_post_install system cups.path cups.socket cups.service
@@ -1,4 +0,0 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_pre_deinstall system cups.path cups.socket cups.service
+1 -6
View File
@@ -3,7 +3,7 @@
pkgname=gdm
pkgver=99947.0
_pkgver=47.0
pkgrel=0
pkgrel=1
pkgdesc="GNOME display manager"
url="https://wiki.gnome.org/Projects/GDM"
# blocked by gnome-shell
@@ -76,11 +76,6 @@ package() {
install -m755 -D "$srcdir/Xsession" "$pkgdir"/etc/gdm
}
systemd() {
install="$subpkgname.post-install $subpkgname.pre-deinstall"
default_systemd
}
sha512sums="
5578b2839ec78ef0b155a6ef6b82384495ef0f3ceb49f4bc7c656bf9dafa95b260148c7fc9b8295b71d4a2d33f6fe6c4a47485cd9eba5c0929f0492ba06e0893 gdm-47.0.tar.xz
c5c57ee93f5a33db154632f0f81fa2e62a48635cfa5e51ada9cc969478df0ce15878446c639c8647c53d439f2eb4173e7fca0069eae31fbdcec541cc5f28cd28 0001-DOWNSTREAM-use-bin-touch-instead-of-usr-bin-touch.patch
@@ -1,4 +0,0 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_post_install system gdm.service
@@ -1,4 +0,0 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_pre_deinstall system gdm.service
+1 -6
View File
@@ -4,7 +4,7 @@
pkgname=gnome-keyring
pkgver=99946.2
_pkgver=46.2
pkgrel=0
pkgrel=1
pkgdesc="GNOME keyring"
url="https://wiki.gnome.org//Projects/GnomeKeyring"
arch="all"
@@ -67,11 +67,6 @@ package() {
make DESTDIR="$pkgdir" install
}
systemd() {
install="$subpkgname.post-install $subpkgname.pre-deinstall"
default_systemd
}
sha512sums="
4229ca0606bdd1b84a3c737288df7f1fc1f8715734e3001964babd882201c3d818deabb3a7662dbf9b67316f03b234de84da3128fb991a500ef8305c2f962ba2 gnome-keyring-46.2.tar.xz
53e04eade3579fe5d65d11d6cde6c5fdffc9f73a3a7f372b1f4dbc7437212e753123c12854d3a5a7a22f3beb1b00604eec0371615ceb0f7024cb38cf35e33065 0001-build-Use-p11_module_configs-as-default-pkcs11-confi.patch
@@ -1,4 +0,0 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_post_install user gnome-keyring-daemon
@@ -1,4 +0,0 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_pre_deinstall user gnome-keyring-daemon
+1 -6
View File
@@ -5,7 +5,7 @@ maintainer="Jane Rachinger <jane400+pmaports@postmarketos.org>"
pkgname=networkmanager
pkgver=9991.50.1
_pkgver=1.50.1
pkgrel=0
pkgrel=1
pkgdesc="Network Management daemon"
url="https://wiki.gnome.org/Projects/NetworkManager"
arch="all"
@@ -232,11 +232,6 @@ _default_plugin() {
amove $_plugindir/libnm*-${subpkgname#"$pkgname"-}.so
}
systemd() {
install="$subpkgname.post-install $subpkgname.pre-deinstall"
default_systemd
}
sha512sums="
8adfe5781db90d7993286e298f6ed87da2387b706269de47e31073c29b78e8bc965cdbbebd8627af2c3e0ec8e2ea807629832853e31a0fa29db7a80eeed8e92d NetworkManager-1.50.1.tar.gz
0f79016bf717dea43830962f524deae8d1cedc274376e40bd912ebe63208c5b1c3b7a5aa14379da19020c587dbd5588df2f0066ca1540070a226983a43e4159b networkmanager.conf
@@ -1,4 +0,0 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_post_install system NetworkManager.service
@@ -1,4 +0,0 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_pre_deinstall system NetworkManager.service
@@ -1,7 +1,7 @@
# Maintainer: Oliver Smith <ollipearanoid@postmarketos.org>
# pmbootstrap installs this, if systemd is selected in "pmbootstrap init".
pkgname=postmarketos-base-systemd
pkgver=18
pkgver=19
pkgrel=0
pkgdesc="Meta package for running postmarketOS with systemd"
url="https://postmarketos.org"
@@ -72,7 +72,7 @@ sha512sums="
fbaa33425e507062a454f11bda48508f261c2144e5c23a20f567dc1cef14ce1dec57f8d934f418f5b6095509757f8503481aba9790a04c8f9f6995e65833d8c9 rootfs-etc-profile.d-99motd.sh
2faac294bb632762e247b850f09ff4b544ccff6c462efd8d4faca71ba30bdfa9c460377a0dc88e92c5dbbe251017d164064a56ac0e0410f224b45d4f5f81866c rootfs-etc-systemd-logind.conf
15423bfda57c90ab62fe69865ca4072a0aeb83bf77d9c278257e346f4da81843d010b41003c91ae9f3fcb1c67447645e7c19078eea2bf11312051e6ad7523ad1 rootfs-usr-share-mkinitfs-files-01-initramfs-base-systemd.files
3a436e715346f1849ded4b1368ce6a8e9d075777d45382ef63709e32711673151e8ebd2f9b2d04013f0fc6691dcec5fa2a252ff1bd551d6840a6e6c7b5f34d47 rootfs-usr-lib-systemd-system-preset-90-base.preset
4beb3b023495f110f6260955caf5bc644848c56e5f03f4b4f6a18cb47e5d3de6591295c023f4c3a03475dca88e6db869a5eaf4ea116d33e51c512e270f5ccb6e rootfs-usr-lib-systemd-system-preset-90-base.preset
aaa5af21270364495573c1e2503f8521fa1ea39ba12742d4edc459284b19dc70f7840daf0225a2e965a4f21ce2c310693e80c2e69d7b8e1b8fe477fa7c26942d rootfs-usr-lib-systemd-user-preset-90-base.preset
605df1f004783d2e0ec5dd99a688bca27502c8c24bc05fb4dc26589b2070b0fbd1cf9bd56e6861d7cda2f8ac8147e7eb040acfd886185c01c8cf9de8b1ce2dcd rootfs-usr-bin-setup-timezone
"
@@ -57,6 +57,7 @@ enable waydroid-sensors.service
# Device specifics:
# TODO: i like the idea of device/soc specific presets, we should move this out of here
enable adsp-audio.service
enable bootmac-bluetooth.service
enable gesture.service
enable gnss-share
enable swclock-offset-boot.service
@@ -6,7 +6,7 @@
# How to add a new service file (5 steps):
pkgname=systemd-services
# 1. bump pkgver
pkgver=37
pkgver=38
pkgrel=0
pkgdesc="Systemd service files"
url="https://postmarketos.org"
@@ -57,7 +57,7 @@ subpackages="
sleep-inhibitor-systemd:_service
syncthing-systemd:_service
tailscale-systemd:_service
tinydm:_service
tinydm-systemd:_service
tqftpserv-systemd:_service
udisks2-systemd:_service
udiskie-systemd:_service
+21 -5
View File
@@ -1,7 +1,7 @@
# Maintainer: Dylan Van Assche <me@dylanvanassche.be>
pkgname=bootmac
pkgver=0.5.0
pkgrel=2
pkgver=0.6.0
pkgrel=0
pkgdesc="Configure MAC addresses at boot"
url="https://gitlab.postmarketos.org/postmarketOS/bootmac"
arch="all"
@@ -9,15 +9,31 @@ license="GPLv3-or-later"
source="https://gitlab.postmarketos.org/postmarketOS/bootmac/-/archive/v$pkgver/bootmac-v$pkgver.tar.gz"
depends="bluez-btmgmt bluez-deprecated"
options="!check"
subpackages="$pkgname-openrc $pkgname-systemd"
builddir="$srcdir/$pkgname-v$pkgver"
package() {
install -Dm644 "$builddir"/bootmac.rules \
"$pkgdir"/usr/lib/udev/rules.d/90-bootmac.rules
install -Dm644 "$builddir"/bootmac-wifi.rules \
"$pkgdir"/usr/lib/udev/rules.d/90-bootmac-wifi.rules
install -Dm644 "$builddir"/bootmac-bluetooth.rules \
"$pkgdir"/usr/lib/udev/rules.d/90-bootmac-bluetooth.rules
install -Dm755 "$builddir"/bootmac \
"$pkgdir"/usr/bin/bootmac
install -Dm644 "$builddir"/bootmac-bluetooth.service \
-t "$pkgdir"/usr/lib/systemd/system/
}
openrc() {
default_openrc
amove usr/lib/udev/rules.d/90-bootmac-bluetooth.rules
amove usr/lib/udev/rules.d/90-bootmac-wifi.rules
}
systemd() {
install="$subpkgname.post-install $subpkgname.pre-deinstall"
default_systemd
}
sha512sums="
32409d0ad978aa92cde061b69071e01bb6de9f7e8d33e4d7f67f2bddc192a8ea710b8c3e01b9618768c3a8b1d297a6fd717fc4dad3c47e7bec508f2d5f198dda bootmac-v0.5.0.tar.gz
164f35b2e008aa0f7b7ad42338e46d8fdac1ec2d4403123b390706437603b1d2060659130a477823734fbda56fa45e9987fb9a2c08cf1e87adebea979e634bbb bootmac-v0.6.0.tar.gz
"
@@ -0,0 +1,4 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_post_install system bootmac-bluetooth.service
@@ -0,0 +1,4 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_pre_deinstall system bootmac-bluetooth.service
+27
View File
@@ -0,0 +1,27 @@
# Maintainer: Aster Boese <asterboese@mailbox.org>
pkgname=deviceinfo-converter
pkgver=0.2.1
pkgrel=0
pkgdesc="Generator for Lomiri deviceinfo files based on postmarketOS deviceinfo"
url="https://codeberg.org/JustSoup321/deviceinfo-converter"
arch="all"
license="GPL-3.0-or-later"
source="$pkgname-$pkgver.tar.gz::https://codeberg.org/JustSoup321/deviceinfo-converter/archive/$pkgver.tar.gz
$pkgname.sh"
makedepends="cargo"
builddir="$srcdir/$pkgname"
options="!check" # no tests
build() {
cargo build --release --locked
}
package() {
install -Dm 755 "$builddir"/target/release/$pkgname -t "$pkgdir/usr/bin"
install -Dm 644 $srcdir/$pkgname.sh "$pkgdir"/etc/profile.d/$pkgname.sh
}
sha512sums="
59409d8187d75da4d09a462692e59cbb8403fbeccae1cc9d4fe2937adf97403ab01a0d16fd2d692ef1afa2771dbc4e13bc199bdb9de9f35be92029344fd0bb84 deviceinfo-converter-0.2.1.tar.gz
95e639d402446352bcb7a8c5b2f353e38697d3e81d814f2f40638ce83f7ccc898d22c436f0fd2599827fdfae2134fce572257f739f42eeb4c628441c27fc3467 deviceinfo-converter.sh
"
@@ -0,0 +1,2 @@
. /usr/share/misc/source_deviceinfo
export DEVICEINFO_DEVICE_NAME="$device_codename"
+1 -6
View File
@@ -1,6 +1,6 @@
pkgname=msm-firmware-loader
pkgver=1.5.0
pkgrel=3
pkgrel=4
pkgdesc="Set of init services to automatically load firmware from device partitions"
url="https://postmarketos.org/"
subpackages="$pkgname-openrc $pkgname-systemd $pkgname-wcnss"
@@ -40,11 +40,6 @@ openrc() {
default_openrc
}
systemd() {
install="$subpkgname.post-install $subpkgname.pre-deinstall"
default_systemd
}
wcnss() {
pkgdesc="Use WiFi/BT firmware from stock firmware partition using $pkgname"
provides="firmware-qcom-msm8916-wcnss=$pkgver-r$pkgrel"
@@ -1,4 +0,0 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_post_install system msm-firmware-loader msm-firmware-loader-unpack
@@ -1,4 +0,0 @@
#!/bin/sh
. /usr/lib/systemd/systemd-apk-macros.sh
systemd_service_pre_deinstall system msm-firmware-loader msm-firmware-loader-unpack
+6 -4
View File
@@ -1,12 +1,12 @@
# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=postmarketos-artwork
pkgver=24.12
pkgrel=0
pkgrel=2
pkgdesc="Meta package for the postmarketOS artwork"
url="https://postmarketos.org/"
arch="noarch"
license="CC-BY-SA-4.0"
_hash="4a2738629df7853f66b7c93d80417ba32d787589"
_hash="822f3607b79b78c23e0565ac55acda05842a8a3f"
source="postmarketos-artwork-$_hash.tar.gz::https://gitlab.postmarketos.org/postmarketOS/artwork/-/archive/$_hash/artwork-$_hash.tar.gz
10_pmOS-wallpaper.gschema.override
postmarketos-gnome.xml
@@ -53,7 +53,7 @@ wallpapers() {
# /usr/share/wallpapers/postmarketos.jpg should always point to the
# current wallpaper so we don't break configs
convert "$subpkgdir"/usr/share/wallpapers/postmarketos/contents/images/1660x1660.png \
magick convert "$subpkgdir"/usr/share/wallpapers/postmarketos/contents/images/1660x1660.png \
-format jpeg \
"$subpkgdir"/usr/share/wallpapers/postmarketos.jpg
}
@@ -105,6 +105,8 @@ icons() {
"$subpkgdir"/usr/share/pixmaps/postmarketos-logo.svg
install -Dm644 "$builddir"/logo/logo-phone.svg \
"$subpkgdir"/usr/share/pixmaps/postmarketos-logo-phone.svg
install -Dm644 "$builddir"/logo/logo_monochrome.svg \
"$subpkgdir"/usr/share/pixmaps/postmarketos-logo-monochrome.svg
}
sounds() {
@@ -120,7 +122,7 @@ sounds() {
}
sha512sums="
9e5fdd480c0a895e98b8962297397f818dc69cbc9ec812c301ce1371b436b65567499edb36992590f8f331d193163aca62291e5c8d0d8eb206f9f05701c02a70 postmarketos-artwork-4a2738629df7853f66b7c93d80417ba32d787589.tar.gz
24b6ddfe4f82c4b2e7a815927da332ac428d56e119b5171c09d17db0c14826d92d3e4835adad5a28f621a92b518599d6d6ac6c3989207bce06481592cb52cdc0 postmarketos-artwork-822f3607b79b78c23e0565ac55acda05842a8a3f.tar.gz
232d969214dff279790ece15d5039746c7f1221d4d53a938c83eae64bf1179173d390531cf7313cd9c0ee23cbf5865bdd64e579563c575aca9079b149b594d67 10_pmOS-wallpaper.gschema.override
e2dff8eed5bebe77c01704c2b3bbfa630f9d65c2b100057996f63f9b588c704655ab672db25d6481a79d78989df671d7016090ee018e399ce15c702b51f9fbee postmarketos-gnome.xml
a2fe87907a0fc6eb2b18305c7f183ac57bae7223d9fdeb992c93947576480c6a2fdb073ea2746407e227531c84aaa0acd0c27abb7fb272bc58433b3a02c260f4 set-plasma-wallpaper.desktop
+2 -2
View File
@@ -1,7 +1,7 @@
# Maintainer: Caleb Connolly <caleb@postmarketos.org>
# Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=postmarketos-initramfs
pkgver=3.7.0
pkgver=3.7.1
pkgrel=0
pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra"
url="https://postmarketos.org"
@@ -109,7 +109,7 @@ sha512sums="
c0233d22858a5901db64e1d2fe1f6d39a2e2cfd1b94a10932483f55fed9461e9b8aa2d73b154b9d99a7a8b49ee02abfbddfe917ce0c6d7576601ba2668589c01 00-initramfs-base.files
d0f35562365756d93066ce45924d17fb347b54095179c3262daa2f073e12743505cd5d9372ad30485915ca754d95a8edba9a74314e7949e0b3cf6978a87d03a5 00-initramfs-extra-base.files
c497ace6f3d183c48722b9e4fd2b6fed21338d68a9e729c1423d3c3de3eaae7366d8dd75a11f78b7072a6795dcc5380c10d8b390738372ede6dc78074ae87a76 init.sh
3a0010dbec4f349f7da64d2cf87b0e1665009bf0361fe4d50b10f1f92caf98f35d077159d7d3577ddb730dc60a7bfbb67fb50fc5f4bc27882d59679e7dc865f0 init_functions.sh
6165a049cf101912a4e1888a11c885ff24e94e9866ec89be66d6da8aae00595c2fabb596859603ef2260b9b2dbe090cc90e0c875cf73978acf59e6ce8c5f8f92 init_functions.sh
2d531177a7310ab95910379b3ab816ab8ba75520e1c11adf295f5ff8247d74553fe3a325c56c66aba4e41e33f0e813b0360c45b847983c1df448d5fb176e02cb init_2nd.sh
5ed5d96c45db0b32b6ff5f5e63b2821e442baf57c3ba587555e2cd92986c65aa13bc73ae591a8b35845e5d30384daf13b76e83961bd7cfe674a81320b34748d9 init_functions_2nd.sh
675e7d5bee39b2df7d322117f8dcaccc274d61beaf4d50ead19bbf2109446d64b1c0aa0c5b4f9846eb6c1c403418f28f6364eff4537ba41120fbfcbc484b7da7 mdev.conf
@@ -47,7 +47,10 @@ setup_log() {
echo on > /proc/sys/kernel/printk_devkmsg
# Spawn syslogd to log to the kernel
syslogd -K
# syslog will try to read from stdin over and over which can pin a cpu when stdin is /dev/null
# By connecting /dev/zero to stdin/stdout/stderr, we make sure that syslogd
# isn't blocked when a console isn't available.
syslogd -K < /dev/zero >/dev/zero 2>&1
local pmsg="/dev/pmsg0"
@@ -0,0 +1,20 @@
# Maintainer: Alexey Minnekhanov <alexeymin@postmarketos.org>
pkgname=postmarketos-install-recommends
pkgver=0.1
pkgrel=0
pkgdesc="Script to quickly install pmb_recommends for a package"
url="https://gitlab.postmarketos.org/postmarketOS/postmarketos-install-recommends"
options="!check" # no tests
depends="git python3"
arch="noarch"
license="GPL-3.0-or-later"
source="https://gitlab.postmarketos.org/postmarketOS/postmarketos-install-recommends/-/archive/$pkgver/postmarketos-install-recommends-0.1.tar.gz"
package() {
install -Dm755 "$builddir/install-recommends.py" \
"$pkgdir/usr/bin/install-recommends"
}
sha512sums="
39c68fc3aff3e47aa4c0a29147370d4c73a38107b05d796a618e12cb124cdd872132fe61359ee9df51d01ecff9e0e8fc1b674a1ad23892374dd2211ed3101a4c postmarketos-install-recommends-0.1.tar.gz
"
@@ -0,0 +1,21 @@
[org.gnome.desktop.background]
picture-uri='file:///usr/share/wallpapers/postmarketos/contents/images/1660x1660.png'
[org.gnome.desktop.interface]
cursor-theme='Yaru'
gtk-theme='Yaru'
icon-theme='Yaru'
[org.gnome.desktop.wm.preferences]
button-layout=''
[org.ayatana.indicator.session]
suppress-logout-menuitem=true
show-desktop-help=false
show-bug-report=false
user-show-menu=false
show-device-info=false
show-distro-help=false
[com.lomiri.Shell.Launcher]
logo-picture-uri='file:///usr/share/lomiri/Launcher/graphics/postmarketos-logo-monochrome.svg'
+132
View File
@@ -0,0 +1,132 @@
# Maintainer: Luca Weiss <luca@lucaweiss.eu>
pkgname=postmarketos-ui-lomiri
pkgver=1
pkgrel=0
pkgdesc="(Wayland) The convergent desktop environment (Experimental)"
url="https://lomiri.com/"
arch="noarch !armhf !riscv64"
license="GPL-3.0-or-later"
depends="
bluez
hfd-service
lomiri
lomiri-indicator-location
lomiri-location-service
lomiri-notifications
lomiri-system-settings
networkmanager
pipewire
polkit
postmarketos-base-ui
postmarketos-base-ui-networkmanager
postmarketos-base-ui-qt-tweaks
postmarketos-base-ui-qt-wayland
postmarketos-base-ui-tinydm
postmarketos-base-ui-wifi
repowerd
sensorfw
superd
tinydm
wireplumber
xwayland
"
_pmb_recommends="
ayatana-indicator-messages
ayatana-indicator-sound
deviceinfo-converter
font-droid-nonlatin
font-noto
font-noto-extra
font-noto-emoji
lomiri-calculator-app
lomiri-docviewer-app
lomiri-filemanager-app
lomiri-sounds
lomiri-weather-app
maliit-keyboard
pipewire-alsa
pipewire-pulse
postmarketos-artwork-wallpapers
ttyescape
xdg-user-dirs
yaru-icon-theme
yaru-theme
"
subpackages="
$pkgname-openrc
"
source="
000-gschema.override
logo.svg
lomiri.desktop
set-xdg-env.sh
start_lomiri.sh
superd/ayatana-indicator-bluetooth.service
superd/ayatana-indicator-datetime.service
superd/ayatana-indicator-messages.service
superd/ayatana-indicator-power.service
superd/ayatana-indicator-session.service
superd/ayatana-indicator-sound.service
superd/lomiri-indicator-location.service
superd/lomiri-indicator-network.service
"
options="!check"
package() {
install -Dm644 "$srcdir"/000-gschema.override \
"$pkgdir"/usr/share/glib-2.0/schemas/000-postmarketos.gschema.override
install -Dm644 "$srcdir"/lomiri.desktop \
"$pkgdir"/usr/share/wayland-sessions/lomiri.desktop
install -Dm755 "$srcdir"/start_lomiri.sh \
"$pkgdir"/usr/bin/start_lomiri
install -Dm755 "$srcdir"/set-xdg-env.sh \
"$pkgdir"/etc/profile.d/set-xdg-env.sh
# Disable setup wizard
mkdir -p "$pkgdir"/etc/skel/.config/lomiri
touch "$pkgdir"/etc/skel/.config/lomiri/wizard-has-run
# Replace the launcher logo
mkdir -p "$pkgdir"/usr/share/lomiri/Launcher/graphics/
# TODO: Replace with logo_monochrome.svg from postmarketos-artwork
install -Dm644 "$srcdir"/logo.svg \
"$pkgdir"/usr/share/lomiri/Launcher/graphics/
}
openrc() {
install_if="$pkgname openrc"
install="$subpkgname.post-install $subpkgname.post-upgrade"
depends="
postmarketos-base-ui-bluez-openrc
polkit-elogind
postmarketos-base-ui-elogind
"
# superd is only needed on OpenRC
mkdir -p "$subpkgdir"/etc/superd/services/
for file in "$srcdir"/*.service; do
filename=$(basename $file)
# Install service
install -Dm644 "$file" \
"$subpkgdir"/usr/share/superd/services/"$filename"
# Enable by default
ln -s /usr/share/superd/services/"$filename" \
"$subpkgdir"/etc/superd/services/"$filename"
done
}
sha512sums="
2d709d90ca0d4b6b35893ad10e7da8c2b61987c27b66de092e5f937fcb9012d75f87e8d199d2ae98865a7d3c7628cea79ebbbaa2dce7a9034e0de619ec588163 000-gschema.override
f3760c336d56073cceffa807f37a353125110b9976b1f420c2cefb741fa840ec44435fd03ef72d5a0fb018bac4d1d53d579aefc62df514a29d0e05465331e462 logo.svg
26d677d1b4e1e4d358e947bce880746b6bad6f7c4700f7e675acf126c5125004d4d6b1508810fa39526fa3a0a2e5547c64cd6d41f1dfeec09a6a549dcbdb97c8 lomiri.desktop
2272a77324d1b04aac5f9ab47f083e5200290ec4281617f553725083f010cb359bbdd3376894cc3b8d30e428355eeedea88f22af98a59986af1b64fb97f4de27 set-xdg-env.sh
a2871258ea90ac03193b734839b3b1e2d92690083853687856466268d868075ef9cae765909de01649cdb99e2ae62ab4f9b11ac3af209ef0e9e7251a48bd0ebb start_lomiri.sh
d1daa16ca8a8e23db5d3cf26de555393e9104904bbe7bafd3c147cc6a0b6ff7b77ae8799b4ad46389d4457d1e331be5d5867821673af0a6063a032345a7cb70e ayatana-indicator-bluetooth.service
bfb29d9940b7f23801dae31ead72d0f5c2a149d89d2e562d6303a865461f81e028c634461fdf6288cf2685c7a374c4a284b1bd991566be370f5f03c0ad550178 ayatana-indicator-datetime.service
6ad5a28e27509296054dfd356a8a3fe54dd836b297c6a3a5fb1d43ab43350e549bc0f3367ba186ea69aa244bb9db80f8189a8257cff2b5bbfa809e82d7125d9e ayatana-indicator-messages.service
2b793f473d7e670951e0fda21b6ac3dd3b62a33e8195f3583c2c1c264f872fbe9edd52b37dfd675a0ab61028c5a247702b17f0e2a06153dc0ee24a6910117a94 ayatana-indicator-power.service
4ab675d03d698c0414b38e7d0a1119d8096f8f22371daa997788893f5a36183b89bf03ce28c63253bf97f4a79c628eb2f1c21cf4823fda00e6f9d008e3e89ad3 ayatana-indicator-session.service
24dc86bc4884739844906b28071ca4d7a153e8c34fbc1105110733a18680115bc84de419c982ad9b38e04b7412c6d7bab997380f185cb6cb1f4544fe8adaee19 ayatana-indicator-sound.service
5ebf604a3966bf61ee9dbc88edf9ea45491b0a4991a0d0f333c1bcb53ebac13f16a34f7328458603ee7a7986034c81f368f23cfd6794ed6e1a15b186af142964 lomiri-indicator-location.service
7b58606410ba852dde9cb94ec5592a2089d8bf4b68bfafc752d84672b2ec2bf884bd8de2ae68c235e5c9d01f6b5dcf719521af37348fd6eca138fcd6713c5dbc lomiri-indicator-network.service
"
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="320" height="320" version="1.1" viewBox="0 0 320 320" xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(-3.1902 0 0 -3.1902 319.51 292.12)" fill="#fff">
<polygon points="29.8 17 29.7 17.5 25.9 27.8 15 26 0 0 65 0 58 8.5 65 17"/>
<g transform="rotate(120 50 28.868)">
<polygon points="29.8 17 29.7 17.5 25.9 27.8 15 26 0 0 65 0 58 8.5 65 17" fill="#fff"/>
</g>
<g transform="rotate(240 50 28.868)">
<polygon points="29.8 17 29.7 17.5 25.9 27.8 15 26 0 0 65 0 58 8.5 65 17" fill="#fff"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 579 B

@@ -0,0 +1,3 @@
[Desktop Entry]
Exec=/usr/bin/dbus-run-session /usr/bin/start_lomiri
Name=Lomiri
@@ -0,0 +1,14 @@
#!/bin/sh
rc-update add bluetooth default
rc-update add elogind default
rc-update add hfd-service default
rc-update add hkdm default
rc-update add networkmanager default
rc-update add polkit default
rc-update add repowerd default
rc-update add sensorfw default
rc-update add sleep-inhibitor default
rc-update add tinydm default
tinydm-set-session -s /usr/share/wayland-sessions/lomiri.desktop
@@ -0,0 +1 @@
postmarketos-ui-lomiri-openrc.post-install
@@ -0,0 +1,11 @@
#!/bin/sh
# Lomiri doesn't set XDG variables automatically, so we do it here.
export XDG_CONFIG_HOME="${HOME}/.config"
export XDG_CACHE_HOME="${HOME}/.cache"
export XDG_DATA_HOME="${HOME}/.local/share"
export XDG_STATE_HOME="${HOME}/.local/state"
export XDG_DATA_DIRS="${HOME}/.local/share/:${HOME}/.local/share/flatpak/exports/share/:/var/lib/flatpak/exports/share/:/usr/local/share/:/usr/share/"
XDG_RUNTIME_DIR="/run/user/$(id -u)"
export XDG_RUNTIME_DIR
@@ -0,0 +1,48 @@
#!/bin/sh
# shellcheck disable=SC1091,SC2154
export MIR_SERVER_CURSOR=null
# Set maliit-keyboard as the input module
export QT_IM_MODULE=maliit
export MALIIT_FORCE_DBUS_CONNECTION=1
# Declare the Lomiri UI Toolkit icon theme
export UITK_ICON_THEME=suru
# logind only sets DISPLAY so we need to set this
export WAYLAND_DISPLAY=wayland-0
# Use logind for session management
export LOMIRI_AS_SYSTEMD_UNIT=1
# Applications require unthrottled touch input
export QML_NO_TOUCH_COMPRESSION=1
# Enable Xwayland
export MIR_SERVER_ENABLE_X11=1
export MIR_SERVER_XWAYLAND_PATH=/usr/bin/Xwayland
# Setup base HOME directories
xdg-user-dirs-update
# Debug environment variables
#export G_MESSAGES_DEBUG=all
#export env QT_LOGGING_RULES='qt.qpa.miral.*=true'
#export env QT_LOGGING_RULES='qt.qpa.miroil.*=true'
#export env QT_LOGGING_RULES='qtmir.*=true'
# Pass required env variables to dbus
dbus-update-activation-environment MALIIT_FORCE_DBUS_CONNECTION=1
dbus-update-activation-environment WAYLAND_DISPLAY
# Device-specific adjustments
. /usr/share/misc/source_deviceinfo
if [ "$deviceinfo_codename" = "qemu-amd64" ]; then
export MIR_MESA_KMS_DISABLE_MODESET_PROBE=1
elif [ "$deviceinfo_codename" = "pine64-pinephone" ]; then
export MIR_MESA_KMS_USE_DRM_DEVICE=card1
export QT_SCALE_FACTOR=2 # TODO: Automatically set this based upon device scaling factor instead of adding it in a per-device adjustment
fi
superd &
# Start Pipewire
/usr/libexec/pipewire-launcher &
lomiri
@@ -0,0 +1,11 @@
[Unit]
Description=Ayatana Indicator Bluetooth Service
PartOf=graphical-session.target
PartOf=ayatana-indicators.target lomiri-indicators.target
[Service]
ExecStart=/usr/libexec/ayatana-indicator-bluetooth/ayatana-indicator-bluetooth-service
Restart=on-failure
[Install]
WantedBy=ayatana-indicators.target lomiri-indicators.target
@@ -0,0 +1,11 @@
[Unit]
Description=Ayatana Indicator DateTime Service
PartOf=graphical-session.target
PartOf=ayatana-indicators.target lomiri-indicators.target
[Service]
ExecStart=/usr/libexec/ayatana-indicator-datetime/ayatana-indicator-datetime-service
Restart=on-failure
[Install]
WantedBy=ayatana-indicators.target lomiri-indicators.target
@@ -0,0 +1,11 @@
[Unit]
Description=Ayatana Indicator Messages Service
PartOf=graphical-session.target
PartOf=ayatana-indicators.target lomiri-indicators.target
[Service]
ExecStart=/usr/libexec/ayatana-indicator-messages/ayatana-indicator-messages-service
Restart=on-failure
[Install]
WantedBy=ayatana-indicators.target lomiri-indicators.target
@@ -0,0 +1,11 @@
[Unit]
Description=Ayatana Indicator Power
PartOf=graphical-session.target
PartOf=ayatana-indicators.target lomiri-indicators.target
[Service]
ExecStart=/usr/libexec/ayatana-indicator-power/ayatana-indicator-power-service
Restart=on-failure
[Install]
WantedBy=ayatana-indicators.target lomiri-indicators.target
@@ -0,0 +1,11 @@
[Unit]
Description=Ayatana Indicator Session Service
PartOf=graphical-session.target
PartOf=ayatana-indicators.target lomiri-indicators.target
[Service]
ExecStart=/usr/libexec/ayatana-indicator-session/ayatana-indicator-session-service
Restart=on-failure
[Install]
WantedBy=ayatana-indicators.target lomiri-indicators.target
@@ -0,0 +1,11 @@
[Unit]
Description=Ayatana Indicator Sound Service
PartOf=graphical-session.target
PartOf=ayatana-indicators.target lomiri-indicators.target
[Service]
ExecStart=/usr/libexec/ayatana-indicator-sound/ayatana-indicator-sound-service
Restart=on-failure
[Install]
WantedBy=ayatana-indicators.target lomiri-indicators.target
@@ -0,0 +1,11 @@
[Unit]
Description=Lomiri Indicator Location Backend
PartOf=graphical-session.target
PartOf=lomiri-indicators.target
[Service]
ExecStart=/usr/libexec/indicator-location/indicator-location-service
Restart=on-failure
[Install]
WantedBy=lomiri-indicators.target
@@ -0,0 +1,14 @@
[Unit]
Description=Indicator Network Backend
PartOf=graphical-session.target
PartOf=ayatana-indicators.target
Wants=lomiri-indicator-network-secret-agent.service
[Service]
BusName=com.lomiri.connectivity1
ExecStart=/usr/libexec/lomiri-indicator-network/lomiri-indicator-network-service
Restart=on-failure
[Install]
Alias=dbus-com.lomiri.connectivity1.service
WantedBy=lomiri-indicators.target