mirror of
				https://codeberg.org/hako/Rosenthal.git
				synced 2025-11-04 03:34:37 +00:00 
			
		
		
		
	rosenthal: linux-xanmod: Update to 6.0.10.
* rosenthal/packages/linux.scm (%xanmod-version): Update to 6.0.10. (doc-supported?): New variable. (linux-xanmod-source,linux-xanmod): Adjusted accordingly.
This commit is contained in:
		
							parent
							
								
									5478467f96
								
							
						
					
					
						commit
						1f31dedb6f
					
				@ -33,6 +33,9 @@
 | 
			
		||||
(define deblob-scripts
 | 
			
		||||
  (@@ (gnu packages linux) deblob-scripts-6.0))
 | 
			
		||||
 | 
			
		||||
(define doc-supported?
 | 
			
		||||
  (@@ (gnu packages linux) doc-supported?))
 | 
			
		||||
 | 
			
		||||
(define make-linux-libre-source
 | 
			
		||||
  (@@ (gnu packages linux) make-linux-libre-source))
 | 
			
		||||
 | 
			
		||||
@ -61,7 +64,7 @@
 | 
			
		||||
 | 
			
		||||
(define %ldflags "-Wl,-z,defs -Wl,-z,now -Wl,-z,relro -Wl,-pie")
 | 
			
		||||
 | 
			
		||||
(define %xanmod-version "6.0.9")
 | 
			
		||||
(define %xanmod-version "6.0.10")
 | 
			
		||||
(define %xanmod-revision "xanmod1")
 | 
			
		||||
 | 
			
		||||
(define (extract-xanmod-patch version hash)
 | 
			
		||||
@ -94,14 +97,18 @@
 | 
			
		||||
(define linux-xanmod-patch
 | 
			
		||||
  (extract-xanmod-patch
 | 
			
		||||
   (string-append %xanmod-version "-" %xanmod-revision)
 | 
			
		||||
   "0ar9k5bj75s4ac2a1xlm6l5x96jd6v2azpab19cx19hmgg3c3wh2"))
 | 
			
		||||
   "0ypvr7lp9bhlja3zp97vmfxa80144z1kplsrzqdj301xwrmiki37"))
 | 
			
		||||
 | 
			
		||||
(define linux-xanmod-source
 | 
			
		||||
  (origin
 | 
			
		||||
    (inherit (%upstream-linux-source
 | 
			
		||||
              "6.0"
 | 
			
		||||
              (base32 "13kqh7yhifwz5dmd3ky0b3mzbh9r0nmjfp5mxy42drcdafjl692w")))
 | 
			
		||||
    (patches (list linux-xanmod-patch))))
 | 
			
		||||
    (patches
 | 
			
		||||
     (append (list linux-xanmod-patch)
 | 
			
		||||
             (if (doc-supported? %xanmod-version)
 | 
			
		||||
                 (search-patches "linux-libre-infodocs-target.patch")
 | 
			
		||||
                 '())))))
 | 
			
		||||
 | 
			
		||||
(define linux-rosenthal-source
 | 
			
		||||
  (make-linux-libre-source
 | 
			
		||||
@ -125,8 +132,6 @@
 | 
			
		||||
       (substitute-keyword-arguments (package-arguments base)
 | 
			
		||||
         ((#:phases phases)
 | 
			
		||||
          #~(modify-phases #$phases
 | 
			
		||||
              (delete 'build-doc)
 | 
			
		||||
              (delete 'install-doc)
 | 
			
		||||
              (add-before 'configure 'setenv
 | 
			
		||||
                (lambda _
 | 
			
		||||
                  (setenv "LLVM" "1")
 | 
			
		||||
 | 
			
		||||
@ -1,8 +1,8 @@
 | 
			
		||||
diff --git a/linux-libre-deblob-check b/linux-libre-deblob-check
 | 
			
		||||
index 3de0900..e4c7591 100644
 | 
			
		||||
index d75b6b3..b45aa90 100644
 | 
			
		||||
--- a/linux-libre-deblob-check
 | 
			
		||||
+++ b/linux-libre-deblob-check
 | 
			
		||||
@@ -7974,6 +7974,6 @@ $eormatch /^[;][/][*]end .*[*][/][;]$eornl$/ {
 | 
			
		||||
@@ -7978,7 +7978,7 @@ $eormatch /^[;][/][*]end .*[*][/][;]$eornl$/ {
 | 
			
		||||
 	    for (i = nfilenames; --i > 0;)
 | 
			
		||||
 		print filenames[i] " within";
 | 
			
		||||
 	    print filenames[0];
 | 
			
		||||
@ -10,3 +10,4 @@ index 3de0900..e4c7591 100644
 | 
			
		||||
+	    exit (0);
 | 
			
		||||
 	}
 | 
			
		||||
     }
 | 
			
		||||
 
 | 
			
		||||
 | 
			
		||||
@ -5,7 +5,7 @@ index bdee4b5..7ac458b 100644
 | 
			
		||||
@@ -826,68 +826,6 @@ clean_blob drivers/gpu/drm/display/drm_hdcp_helper.c
 | 
			
		||||
 clean_kconfig drivers/gpu/drm/display/Kconfig DRM_DISPLAY_HDCP_HELPER
 | 
			
		||||
 clean_mk CONFIG_DRM_DISPLAY_HDCP_HELPER drivers/gpu/drm/display/Makefile
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
-announce DRM_AMDGPU - "AMD GPU"
 | 
			
		||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
 | 
			
		||||
-clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
 | 
			
		||||
@ -74,7 +74,7 @@ index bdee4b5..7ac458b 100644
 | 
			
		||||
@@ -2145,16 +2083,6 @@ clean_blob drivers/net/wireless/intel/iwlegacy/4965.c
 | 
			
		||||
 clean_kconfig drivers/net/wireless/intel/iwlegacy/Kconfig IWL4965
 | 
			
		||||
 clean_mk CONFIG_IWL4965 drivers/net/wireless/intel/iwlegacy/Makefile
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
-announce IWLWIFI - "Intel Wireless WiFi Next Gen AGN"
 | 
			
		||||
-reject_firmware drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
 | 
			
		||||
-reject_firmware drivers/net/wireless/intel/iwlwifi/iwl-drv.c
 | 
			
		||||
@ -91,7 +91,7 @@ index bdee4b5..7ac458b 100644
 | 
			
		||||
@@ -2163,14 +2091,6 @@ clean_blob drivers/net/wireless/intel/iwlwifi/cfg/6000.c
 | 
			
		||||
 clean_kconfig drivers/net/wireless/intel/iwlwifi/Kconfig IWLDVM
 | 
			
		||||
 clean_mk CONFIG_IWLMVM drivers/net/wireless/intel/iwlwifi/Makefile
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
-announce IWLMVM - "Intel Wireless WiFi MVM Firmware support"
 | 
			
		||||
-clean_blob drivers/net/wireless/intel/iwlwifi/cfg/7000.c
 | 
			
		||||
-clean_blob drivers/net/wireless/intel/iwlwifi/cfg/8000.c
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user