gnu: linux-libre: Update to 4.5, while preserving linux-libre-4.4.

* gnu/packages/linux-libre-x86_64.conf: Rename to ...
* gnu/packages/linux-libre-4.4-x86_64.conf: ... this.
* gnu/packages/linux-libre-i686.conf: Rename to ...
* gnu/packages/linux-libre-4.4-i686.conf: ... this.
* gnu/packages/linux-libre-4.5-i686.conf,
gnu/packages/linux-libre-4.5-x86_64.conf: New files.
* Makefile.am (KCONFIGS): Update accordingly.
* gnu/packages/linux.scm (linux-libre): Update to 4.5.
(linux-libre-4.4): New variable.
This commit is contained in:
Mark H Weaver 2016-03-14 22:30:27 -04:00
parent 4d343a141b
commit 75b314a615
6 changed files with 17297 additions and 6 deletions

View file

@ -173,8 +173,10 @@ dist_noinst_DATA = guix/tests.scm
# Linux-Libre configurations.
KCONFIGS = \
gnu/packages/linux-libre-i686.conf \
gnu/packages/linux-libre-x86_64.conf \
gnu/packages/linux-libre-4.5-i686.conf \
gnu/packages/linux-libre-4.5-x86_64.conf \
gnu/packages/linux-libre-4.4-i686.conf \
gnu/packages/linux-libre-4.4-x86_64.conf \
gnu/packages/linux-libre-4.1-i686.conf \
gnu/packages/linux-libre-4.1-x86_64.conf

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -220,7 +220,7 @@ (define* (kernel-config system #:key variant)
(search-path %load-path file)))
(define-public linux-libre
(let* ((version "4.4.5")
(let* ((version "4.5")
(build-phase
'(lambda* (#:key system inputs #:allow-other-keys #:rest args)
;; Apply the neat patch.
@ -294,7 +294,7 @@ (define-public linux-libre
(uri (linux-libre-urls version))
(sha256
(base32
"19yyw6yssyxr9k5y3whgz2p731mb1pnq3xajpv8g01m13cxs32dd"))))
"0km863vwy557flpygkr869yshpjs1v11ni78p8k9p9nm31ai6yn3"))))
(build-system gnu-build-system)
(supported-systems '("x86_64-linux" "i686-linux"))
(native-inputs `(("perl" ,perl)
@ -303,8 +303,10 @@ (define-public linux-libre
("module-init-tools" ,module-init-tools)
("patch/freedo+gnu" ,%boot-logo-patch)
,@(let ((conf (kernel-config (or (%current-target-system)
(%current-system)))))
,@(let ((conf (kernel-config
(or (%current-target-system)
(%current-system))
#:variant (version-major+minor version))))
(if conf
`(("kconfig" ,conf))
'()))))
@ -326,6 +328,23 @@ (define-public linux-libre
(license license:gpl2)
(home-page "http://www.gnu.org/software/linux-libre/"))))
(define-public linux-libre-4.4
(package
(inherit linux-libre)
(version "4.4.5")
(source (origin
(method url-fetch)
(uri (linux-libre-urls version))
(sha256
(base32
"19yyw6yssyxr9k5y3whgz2p731mb1pnq3xajpv8g01m13cxs32dd"))))
(native-inputs
(let ((conf (kernel-config (or (%current-target-system)
(%current-system))
#:variant "4.4")))
`(,@(alist-delete "kconfig" (package-native-inputs linux-libre))
("kconfig" ,conf))))))
(define-public linux-libre-4.1
(package
(inherit linux-libre)