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:
		
							parent
							
								
									4d343a141b
								
							
						
					
					
						commit
						75b314a615
					
				
					 6 changed files with 17297 additions and 6 deletions
				
			
		| 
						 | 
					@ -173,8 +173,10 @@ dist_noinst_DATA = guix/tests.scm
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Linux-Libre configurations.
 | 
					# Linux-Libre configurations.
 | 
				
			||||||
KCONFIGS =					\
 | 
					KCONFIGS =					\
 | 
				
			||||||
  gnu/packages/linux-libre-i686.conf		\
 | 
					  gnu/packages/linux-libre-4.5-i686.conf	\
 | 
				
			||||||
  gnu/packages/linux-libre-x86_64.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-i686.conf	\
 | 
				
			||||||
  gnu/packages/linux-libre-4.1-x86_64.conf
 | 
					  gnu/packages/linux-libre-4.1-x86_64.conf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										8729
									
								
								gnu/packages/linux-libre-4.5-i686.conf
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										8729
									
								
								gnu/packages/linux-libre-4.5-i686.conf
									
										
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							
							
								
								
									
										8541
									
								
								gnu/packages/linux-libre-4.5-x86_64.conf
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										8541
									
								
								gnu/packages/linux-libre-4.5-x86_64.conf
									
										
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load diff
											
										
									
								
							| 
						 | 
					@ -220,7 +220,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration."
 | 
				
			||||||
    (search-path %load-path file)))
 | 
					    (search-path %load-path file)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public linux-libre
 | 
					(define-public linux-libre
 | 
				
			||||||
  (let* ((version "4.4.5")
 | 
					  (let* ((version "4.5")
 | 
				
			||||||
         (build-phase
 | 
					         (build-phase
 | 
				
			||||||
          '(lambda* (#:key system inputs #:allow-other-keys #:rest args)
 | 
					          '(lambda* (#:key system inputs #:allow-other-keys #:rest args)
 | 
				
			||||||
             ;; Apply the neat patch.
 | 
					             ;; Apply the neat patch.
 | 
				
			||||||
| 
						 | 
					@ -294,7 +294,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration."
 | 
				
			||||||
             (uri (linux-libre-urls version))
 | 
					             (uri (linux-libre-urls version))
 | 
				
			||||||
             (sha256
 | 
					             (sha256
 | 
				
			||||||
              (base32
 | 
					              (base32
 | 
				
			||||||
               "19yyw6yssyxr9k5y3whgz2p731mb1pnq3xajpv8g01m13cxs32dd"))))
 | 
					               "0km863vwy557flpygkr869yshpjs1v11ni78p8k9p9nm31ai6yn3"))))
 | 
				
			||||||
    (build-system gnu-build-system)
 | 
					    (build-system gnu-build-system)
 | 
				
			||||||
    (supported-systems '("x86_64-linux" "i686-linux"))
 | 
					    (supported-systems '("x86_64-linux" "i686-linux"))
 | 
				
			||||||
    (native-inputs `(("perl" ,perl)
 | 
					    (native-inputs `(("perl" ,perl)
 | 
				
			||||||
| 
						 | 
					@ -303,8 +303,10 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration."
 | 
				
			||||||
                     ("module-init-tools" ,module-init-tools)
 | 
					                     ("module-init-tools" ,module-init-tools)
 | 
				
			||||||
                     ("patch/freedo+gnu" ,%boot-logo-patch)
 | 
					                     ("patch/freedo+gnu" ,%boot-logo-patch)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                     ,@(let ((conf (kernel-config (or (%current-target-system)
 | 
					                     ,@(let ((conf (kernel-config
 | 
				
			||||||
                                                      (%current-system)))))
 | 
					                                    (or (%current-target-system)
 | 
				
			||||||
 | 
					                                        (%current-system))
 | 
				
			||||||
 | 
					                                    #:variant (version-major+minor version))))
 | 
				
			||||||
                         (if conf
 | 
					                         (if conf
 | 
				
			||||||
                             `(("kconfig" ,conf))
 | 
					                             `(("kconfig" ,conf))
 | 
				
			||||||
                             '()))))
 | 
					                             '()))))
 | 
				
			||||||
| 
						 | 
					@ -326,6 +328,23 @@ It has been modified to remove all non-free binary blobs.")
 | 
				
			||||||
    (license license:gpl2)
 | 
					    (license license:gpl2)
 | 
				
			||||||
    (home-page "http://www.gnu.org/software/linux-libre/"))))
 | 
					    (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
 | 
					(define-public linux-libre-4.1
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (inherit linux-libre)
 | 
					    (inherit linux-libre)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue