ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: linux-libre-arm-veyron: Deprecate package.

Browse source 
* gnu/packages/linux (linux-libre-arm-veyron): Mark as deprecated package.
  (kernel-config-veyron): Remove obsolete function.
* gnu/system/examples/asus-c201.tmpl: Update to use linux-libre-arm-generic.
* gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf: Delete file.
* Makefile.am (AUX_FILES): Update accordingly.
This commit is contained in:
Vagrant Cascadian 2020-03-23 02:42:56 +00:00
parent 4ef89d884d
commit 37f8c50cdc
No known key found for this signature in database
GPG key ID: DC518FC87F9716AA
4 changed files with 2 additions and 5056 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -322,7 +322,6 @@ AUX_FILES = \
gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/chromium/master-preferences.json \
gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/emacs/guix-emacs.el \
gnu/packages/aux-files/linux-libre/5.4-arm.conf \ gnu/packages/aux-files/linux-libre/5.4-arm.conf \
gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf \
gnu/packages/aux-files/linux-libre/5.4-arm64.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-i686.conf \
gnu/packages/aux-files/linux-libre/5.4-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.4-x86_64.conf \

5040
gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf
View file

File diff suppressed because it is too large Load diff

15
gnu/packages/linux.scm
View file

@ -566,15 +566,6 @@ (define* (kernel-config arch #:key variant)
(file (string-append "linux-libre/" name))) (file (string-append "linux-libre/" name)))
(search-auxiliary-file file))) (search-auxiliary-file file)))
;; FIXME: merge into kernel-config
(define* (kernel-config-veyron arch #:key variant)
"Return the absolute file name of the Linux-Libre build configuration file
for ARCH and optionally VARIANT, or #f if there is no such configuration."
(let* ((name (string-append (if variant (string-append variant "-") "")
(if (string=? "i386" arch) "i686" arch) "-veyron.conf"))
(file (string-append "linux-libre/" name)))
(search-auxiliary-file file)))
(define %default-extra-linux-options (define %default-extra-linux-options
`(;; Some very mild hardening. `(;; Some very mild hardening.
("CONFIG_SECURITY_DMESG_RESTRICT" . #t) ("CONFIG_SECURITY_DMESG_RESTRICT" . #t)
@ -845,11 +836,7 @@ (define-public linux-libre-4.4
;;; ;;;
(define-public linux-libre-arm-veyron (define-public linux-libre-arm-veyron
(make-linux-libre* linux-libre-version (deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic))
linux-libre-source
'("armhf-linux")
#:configuration-file kernel-config-veyron
#:extra-version "arm-veyron"))
(define-public linux-libre-arm-generic (define-public linux-libre-arm-generic
(make-linux-libre* linux-libre-version (make-linux-libre* linux-libre-version

2
gnu/system/examples/asus-c201.tmpl
View file

@ -18,7 +18,7 @@
;; The ASUS C201PA requires a very particular kernel to boot, ;; The ASUS C201PA requires a very particular kernel to boot,
;; as well as the following arguments. ;; as well as the following arguments.
(kernel linux-libre-arm-veyron) (kernel linux-libre-arm-generic)
(kernel-arguments '("console=tty1")) (kernel-arguments '("console=tty1"))
;; We do not need any special modules for initrd, and the ;; We do not need any special modules for initrd, and the