tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: Remove linux-libre 5.4.

Browse Source 
gnu/packages/linux.scm (linux-libre-5.4-version, linux-libre-5.4-gnu-revision,
deblob-scripts-5.4, linux-libre-5.4-pristine-source, linux-libre-5.4-source,
linux-libre-headers-5.4, linux-libre-5.4, linux-libre-headers-5.4,
linux-libre-arm-generic-5.4, linux-libre-arm64-generic-5.4): Remove variables.
* gnu/packages/patches/linux-libre-support-for-Pinebook-Pro.patch: Delete
file.
* gnu/local.mk [dist_patch_DATA]: Deregister patch.
* gnu/packages/aux-files/linux-libre/5.4-arm.conf,
gnu/packages/aux-files/linux-libre/5.4-arm64.conf,
gnu/packages/aux-files/linux-libre/5.4-i686.conf,
gnu/packages/aux-files/linux-libre/5.4-x86_64.conf: Delete files.
* Makefile.am [AUX_FILES]: Deregister them.
* gnu/packages/android.scm (adb)[native-inputs]: Use linux-libre-headers-5.15.
* gnu/packages/vpn.scm (wireguard-linux-compat): Remove variable.
* gnu/tests/base.scm (%test-linux-libre-5.4): Remove variable.
This commit is contained in:
Vagrant Cascadian
2026-02-24 15:53:26 -08:00
parent 53bb5afabe
commit 2126b510ce
11 changed files with 1 additions and 40598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@@ -481,10 +481,6 @@ AUX_FILES = \
gnu/packages/aux-files/linux-libre/5.10-arm64.conf \
gnu/packages/aux-files/linux-libre/5.10-i686.conf \
gnu/packages/aux-files/linux-libre/5.10-x86_64.conf \
gnu/packages/aux-files/linux-libre/5.4-arm.conf \
gnu/packages/aux-files/linux-libre/5.4-arm64.conf \
gnu/packages/aux-files/linux-libre/5.4-i686.conf \
gnu/packages/aux-files/linux-libre/5.4-x86_64.conf \
gnu/packages/aux-files/ovmf/51-edk2-ovmf-2m-raw-x64-nosb.json \
gnu/packages/aux-files/pack-audit.c \
gnu/packages/aux-files/python/sanity-check.py \

1
gnu/local.mk
View File

@@ -1842,7 +1842,6 @@ dist_patch_DATA = \
%D%/packages/patches/linphone-desktop-ispell.patch \
%D%/packages/patches/linphone-desktop-qtkeychain.patch \
%D%/packages/patches/linux-libre-infodocs-target.patch \
%D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \
%D%/packages/patches/linux-libre-arm64-mnt-reform-revert-phy-rockchip-samsung.patch \
%D%/packages/patches/linux-libre-arm64-mnt-reform-revert-rk-samsung-hdptx.patch \
%D%/packages/patches/linux-libre-arm64-mnt-reform-revert-vop2-display-modes.patch \

2
gnu/packages/android.scm
View File

@@ -426,7 +426,7 @@ various Android core host applications.")
(lambda* (#:key inputs outputs #:allow-other-keys)
(install-file "diagnose_usb.h" (string-append (assoc-ref outputs "out") "/include"))
#t)))))
(native-inputs (list linux-libre-headers-5.4 gcc-11))
(native-inputs (list linux-libre-headers-5.15 gcc-11))
(inputs
(list android-libbase android-libcutils android-liblog openssl))
(home-page "https://developer.android.com/studio/command-line/adb.html")

9385
gnu/packages/aux-files/linux-libre/5.4-arm.conf
View File

File diff suppressed because it is too large Load Diff

9353
gnu/packages/aux-files/linux-libre/5.4-arm64.conf
View File

File diff suppressed because it is too large Load Diff

10321
gnu/packages/aux-files/linux-libre/5.4-i686.conf
View File

File diff suppressed because it is too large Load Diff

10276
gnu/packages/aux-files/linux-libre/5.4-x86_64.conf
View File

File diff suppressed because it is too large Load Diff

63
gnu/packages/linux.scm
View File

@@ -639,21 +639,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(%upstream-linux-source version hash)
deblob-scripts-5.10)))
(define-public linux-libre-5.4-version "5.4.302")
(define-public linux-libre-5.4-gnu-revision "gnu1")
(define deblob-scripts-5.4
(linux-libre-deblob-scripts
linux-libre-5.4-version
linux-libre-5.4-gnu-revision
(base32 "168ysrpcbfhm6s71l9w8ibjq2frjmiaixc2wbsq86gx2zw6zyb5p")
(base32 "0l7pwhgw9laxfypcpqlz411x3hybcw2269abh3lpcw96bgv5m1k2")))
(define-public linux-libre-5.4-pristine-source
(let ((version linux-libre-5.4-version)
(hash (base32 "0ga2q6lf6xvb7pb6kn2prgywsvsavb4kwygsn37xd91ay43k4smf")))
(make-linux-libre-source version
(%upstream-linux-source version hash)
deblob-scripts-5.4)))
(define %boot-logo-patch
;; Linux-Libre boot logo featuring Freedo and a gnu.
(origin
@@ -720,15 +705,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
(list %boot-logo-patch
%linux-libre-arm-export-__sync_icache_dcache-patch)))
(define-public linux-libre-5.4-source
(source-with-patches linux-libre-5.4-pristine-source
(list %boot-logo-patch
%linux-libre-arm-export-__sync_icache_dcache-patch
;; Pinebook Pro patch from linux-next,
;; can be dropped for linux-libre 5.7
(search-patch
"linux-libre-support-for-Pinebook-Pro.patch"))))
;;;
;;; Kernel headers.
@@ -848,11 +824,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS."
linux-libre-5.10-gnu-revision
linux-libre-5.10-source))
(define-public linux-libre-headers-5.4
(make-linux-libre-headers* linux-libre-5.4-version
linux-libre-5.4-gnu-revision
linux-libre-5.4-source))
;; The following package is used in the early bootstrap, and thus must be kept
;; stable and with minimal build requirements.
(define-public linux-libre-headers-6.12.17
@@ -1252,14 +1223,6 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
"aarch64-linux" "powerpc64le-linux" "riscv64-linux")
#:configuration-file kernel-config))
(define-public linux-libre-5.4
(make-linux-libre* linux-libre-5.4-version
linux-libre-5.4-gnu-revision
linux-libre-5.4-source
'("x86_64-linux" "i686-linux" "armhf-linux"
"aarch64-linux" "powerpc64le-linux" "riscv64-linux")
#:configuration-file kernel-config))
;; Linux-Libre-LTS points to the *newest* released long-term support version of
;; Linux-Libre.
;; Reference: <https://www.kernel.org/category/releases.html>
@@ -1320,19 +1283,6 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
("CONFIG_RTC_DRV_RK808" . #t))
(default-extra-linux-options linux-libre-5.10-version))))
(define-public linux-libre-arm-generic-5.4
(make-linux-libre* linux-libre-5.4-version
linux-libre-5.4-gnu-revision
linux-libre-5.4-source
'("armhf-linux")
#:defconfig "multi_v7_defconfig"
#:extra-version "arm-generic"
#:extra-options
(append
`(;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t))
(default-extra-linux-options linux-libre-5.4-version))))
(define-public linux-libre-arm-omap2plus
(make-linux-libre* linux-libre-version
linux-libre-gnu-revision
@@ -1433,19 +1383,6 @@ Linux kernel. It has been modified to remove all non-free binary blobs.")
("CONFIG_SND_SOC_ES8316" . m))
(default-extra-linux-options linux-libre-5.10-version))))
(define-public linux-libre-arm64-generic-5.4
(make-linux-libre* linux-libre-5.4-version
linux-libre-5.4-gnu-revision
linux-libre-5.4-source
'("aarch64-linux")
#:defconfig "defconfig"
#:extra-version "arm64-generic"
#:extra-options
(append
`(;; needed to fix the RTC on rockchip platforms
("CONFIG_RTC_DRV_RK808" . #t))
(default-extra-linux-options linux-libre-5.4-version))))
(define-public linux-libre-arm64-honeycomb
;; Kernel for use on the HoneyComb LX2 boards:
;; <https://shop.solid-run.com/product/SRCFTXE000IV13/>.

1135
gnu/packages/patches/linux-libre-support-for-Pinebook-Pro.patch
View File

File diff suppressed because it is too large Load Diff

55
gnu/packages/vpn.scm
View File

@@ -1320,61 +1320,6 @@ The peer-to-peer VPN implements a Layer 2 (Ethernet) network between the peers
;; 3-clause BSD license.
(license license:bsd-3)))
(define-public wireguard-linux-compat
(package
(name "wireguard-linux-compat")
(version "1.0.20201221")
(source (origin
(method url-fetch)
(uri (string-append "https://git.zx2c4.com/wireguard-linux-compat/"
"snapshot/wireguard-linux-compat-" version
".tar.xz"))
(sha256
(base32
"0ci13in0fqq32n5qamch4qhjgbdq86ygrgmfhc9szsh2nsl8jlkf"))))
(build-system linux-module-build-system)
(outputs '("out"
"kernel-patch"))
(arguments
`(#:linux ,linux-libre-5.4 ; mustn't have WG built-in
#:tests? #f ; no test suite
#:modules ((guix build linux-module-build-system)
(guix build utils)
(ice-9 popen)
(ice-9 textual-ports))
#:phases
(modify-phases %standard-phases
(add-before 'build 'change-directory
(lambda _
(chdir "./src")
#t))
(add-after 'build 'build-patch
(lambda* (#:key outputs #:allow-other-keys)
(let* ((patch-builder "../kernel-tree-scripts/create-patch.sh")
(port (open-input-pipe patch-builder))
(str (get-string-all port)))
(close-pipe port)
(call-with-output-file "wireguard.patch"
(lambda (port)
(format port "~a" str))))
#t))
(add-after 'install 'install-patch
(lambda* (#:key outputs #:allow-other-keys)
(install-file "wireguard.patch"
(assoc-ref %outputs "kernel-patch"))
#t))
;; So that 'install-license-files' works...
(add-before 'install-license-files 'reset-cwd
(lambda _
(chdir "..")
#t)))))
(home-page "https://git.zx2c4.com/wireguard-linux-compat/")
(synopsis "WireGuard kernel module for Linux 3.10 through 5.5")
(description "This package contains an out-of-tree kernel patch and
a loadable module adding WireGuard to Linux kernel versions 3.10 through 5.5.
WireGuard was added to Linux 5.6.")
(license license:gpl2)))
(define-public wireguard-tools
(package
(name "wireguard-tools")

4
gnu/tests/base.scm
View File

@@ -56,7 +56,6 @@
%test-basic-os
%test-linux-libre-5.15
%test-linux-libre-5.10
%test-linux-libre-5.4
%test-halt
%test-root-unmount
%test-cleanup
@@ -679,9 +678,6 @@ test \"$BASHRC_D_OK\" = yes"))
(define %test-linux-libre-5.10
(test-basic-os linux-libre-5.10))
(define %test-linux-libre-5.4
(test-basic-os linux-libre-5.4))
;;;
;;; Halt.