amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: linux-libre: Remove duplicate “linux-libre-arm64-generic@6.12” package.

Browse source 
Fixes a regression in 5c2bcafd28, which
led to having two “linux-libre-arm64-generic@6.12” packages on
aarch64-linux, thus leading to a failure of the “fold-available-packages
with/without cache” in ‘tests/packages.scm’.

* gnu/packages/linux.scm (linux-libre-lts-arm64-generic): Check whether
‘linux-libre-lts-version’ is equal to ‘linux-libre-version’ and, if so,
make it an alias for ‘linux-libre-arm64-generic’.

Change-Id: I01e4d4ff9c66ffe1cb33dd781fba9f7f6b40e93e
This commit is contained in:
Ludovic Courtès 2025-01-24 16:05:08 +01:00
parent 5ec09ac867
commit 9f9e89a8ca
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

60
gnu/packages/linux.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012-2021, 2021-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2012-2021, 2021-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
@ -1268,32 +1268,38 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
(default-extra-linux-options linux-libre-version))))
(define-public linux-libre-lts-arm64-generic
(make-linux-libre* linux-libre-lts-version
linux-libre-lts-gnu-revision
linux-libre-lts-source
'("aarch64-linux")
#:defconfig "defconfig"
#:extra-version "arm64-generic"
#:extra-options
(append
`(;; Provide support for ath9k wireless
("CONFIG_ATH9K_HTC" . m)
;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t)
;; Pinebook display, battery, charger and usb
("CONFIG_DRM_ANALOGIX_ANX6345" . m)
("CONFIG_CHARGER_AXP20X" . m)
("CONFIG_INPUT_AXP20X_PEK" . m)
("CONFIG_CHARGER_AXP20X" . m)
("CONFIG_BATTERY_AXP20X" . m)
("CONFIG_PINCTRL_AXP209" . m)
("CONFIG_AXP20X_POWER" . m)
("CONFIG_AXP20X_ADC" . m)
;; Pinebook PRO battery and sound support
("CONFIG_BATTERY_CW2015" . m)
("CONFIG_CHARGER_GPIO" . m)
("CONFIG_SND_SOC_ES8316" . m))
(default-extra-linux-options linux-libre-lts-version))))
(if (string=? linux-libre-lts-version linux-libre-version)
;; Make it a strict alias so that the user interface does not see two
;; packages with the exact same name and version.
linux-libre-arm64-generic
(make-linux-libre* linux-libre-lts-version
linux-libre-lts-gnu-revision
linux-libre-lts-source
'("aarch64-linux")
#:defconfig "defconfig"
#:extra-version "arm64-generic"
#:extra-options
(append
`( ;; Provide support for ath9k wireless
("CONFIG_ATH9K_HTC" . m)
;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t)
;; Pinebook display, battery, charger and usb
("CONFIG_DRM_ANALOGIX_ANX6345" . m)
("CONFIG_CHARGER_AXP20X" . m)
("CONFIG_INPUT_AXP20X_PEK" . m)
("CONFIG_CHARGER_AXP20X" . m)
("CONFIG_BATTERY_AXP20X" . m)
("CONFIG_PINCTRL_AXP209" . m)
("CONFIG_AXP20X_POWER" . m)
("CONFIG_AXP20X_ADC" . m)
;; Pinebook PRO battery and sound support
("CONFIG_BATTERY_CW2015" . m)
("CONFIG_CHARGER_GPIO" . m)
("CONFIG_SND_SOC_ES8316" . m))
(default-extra-linux-options linux-libre-lts-version)))))
(define-public linux-libre-arm64-generic-5.10
(make-linux-libre* linux-libre-5.10-version