Merge branch 'master' into core-updates

This commit is contained in:
Leo Famulari 2016-11-02 20:03:35 -04:00
commit b3cc0dce08
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
25 changed files with 493 additions and 91 deletions

View file

@ -325,14 +325,14 @@ It has been modified to remove all non-free binary blobs.")
(define %intel-compatible-systems '("x86_64-linux" "i686-linux"))
(define-public linux-libre
(make-linux-libre "4.8.5"
"124sf2jvckn0afy1zfyaqgr1679qsx3fnylw1wpl7p5298hwyf9m"
(make-linux-libre "4.8.6"
"07h618x13yyp3lnf77px4v60pdcz7il0fa7p466wa5gp3h0yhvmi"
%intel-compatible-systems
#:configuration-file kernel-config))
(define-public linux-libre-4.4
(make-linux-libre "4.4.28"
"1yn74vci0bygn5bi9mcgx1zz8xw9m3jb6j260wqsgkv1hbksa2yp"
(make-linux-libre "4.4.30"
"16jjcjfbf3s4mrifk6v7kmnm8l7yywispfap98wcv6gw6mv9sxdx"
%intel-compatible-systems
#:configuration-file kernel-config))
@ -343,8 +343,8 @@ It has been modified to remove all non-free binary blobs.")
#:configuration-file kernel-config))
;; Avoid rebuilding kernel variants when there is a minor version bump.
(define %linux-libre-version "4.8.5")
(define %linux-libre-hash "124sf2jvckn0afy1zfyaqgr1679qsx3fnylw1wpl7p5298hwyf9m")
(define %linux-libre-version "4.8.6")
(define %linux-libre-hash "07h618x13yyp3lnf77px4v60pdcz7il0fa7p466wa5gp3h0yhvmi")
(define-public linux-libre-arm-generic
(make-linux-libre %linux-libre-version
@ -922,7 +922,7 @@ packet filter.")
(define-public iproute
(package
(name "iproute2")
(version "4.4.0")
(version "4.8.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -930,12 +930,14 @@ packet filter.")
version ".tar.xz"))
(sha256
(base32
"05351m4m0whsivlblvs3m0nz5q9v6r06ik80z27gf6ca51kw74dw"))))
"12dk5hn1zlraqk2p0z8dv2xgsz0x9v8l3vcvf51fzj0v8b45j2d3"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ; no test suite
#:make-flags (let ((out (assoc-ref %outputs "out")))
(list "DESTDIR="
(string-append "BASH_COMPDIR=" out
"/etc/bash_completion.d")
(string-append "LIBDIR=" out "/lib")
(string-append "SBINDIR=" out "/sbin")
(string-append "CONFDIR=" out "/etc")