mirror of
https://codeberg.org/hako/Rosenthal.git
synced 2025-11-03 19:24:37 +00:00
rosenthal: Remove linux-rosenthal.
* rosenthal/packages/aux-files/config.zen3-dorphine: Delete file. * rosenthal/packages/patches/linux-hardened-xanmod-adaption.patch: Likewise. * rosenthal/packages/patches/linux-libre-deblob-check-omit-error.patch: Likewise. * rosenthal/packages/patches/linux-libre-deblob-keep-needed.patch: Likewise. * rosenthal/packages/linux.scm (deblob-scripts,make-linux-libre-source) (linux-rosenthal-deblob-scripts,linux-hardened-patch-for-xanmod) (linux-rosenthal-source,linux-rosenthal-source-deblobed) (linux-rosenthal): Delete variables.
This commit is contained in:
Hilton Chain
parent
2372c7a34c
commit
2d423a6615
File diff suppressed because it is too large
Load Diff
@ -30,28 +30,9 @@
|
||||
(define computed-origin-method
|
||||
(@@ (guix packages) computed-origin-method))
|
||||
|
||||
(define deblob-scripts
|
||||
(@@ (gnu packages linux) deblob-scripts-6.0))
|
||||
|
||||
(define make-linux-libre-source
|
||||
(@@ (gnu packages linux) make-linux-libre-source))
|
||||
|
||||
(define %upstream-linux-source
|
||||
(@@ (gnu packages linux) %upstream-linux-source))
|
||||
|
||||
(define linux-rosenthal-deblob-scripts
|
||||
(match deblob-scripts
|
||||
((deblob-version (? origin? deblob) (? origin? deblob-check))
|
||||
(list deblob-version
|
||||
(origin
|
||||
(inherit deblob)
|
||||
(file-name "linux-libre-deblob")
|
||||
(patches (list (local-file "patches/linux-libre-deblob-keep-needed.patch"))))
|
||||
(origin
|
||||
(inherit deblob-check)
|
||||
(file-name "linux-libre-deblob-check")
|
||||
(patches (list (local-file "patches/linux-libre-deblob-check-omit-error.patch"))))))))
|
||||
|
||||
(define %cflags
|
||||
(string-append
|
||||
" -flto" " -fpic" " -fpie" " -fvisibility=hidden" " -fwrapv" " -pipe"
|
||||
@ -107,13 +88,6 @@
|
||||
(sha256
|
||||
(base32 "1fhpx9hx2csz8d30l2nl43j865k6gzf5fim0943dhgpa3r9cy83w"))))
|
||||
|
||||
(define linux-hardened-patch-for-xanmod
|
||||
(origin
|
||||
(inherit linux-hardened-patch)
|
||||
(file-name "linux-hardened.patch")
|
||||
(patches
|
||||
(list (local-file "patches/linux-hardened-xanmod-adaption.patch")))))
|
||||
|
||||
(define linux-xanmod-source
|
||||
(origin
|
||||
(inherit (%upstream-linux-source
|
||||
@ -128,19 +102,6 @@
|
||||
(base32 "00ag63lnxw2gijw3b6v29lhrlv480m12954q5zh4jawlz3nk1dw9")))
|
||||
(patches (list linux-hardened-patch))))
|
||||
|
||||
(define linux-rosenthal-source
|
||||
(origin
|
||||
(inherit linux-xanmod-source)
|
||||
(patches
|
||||
(list linux-xanmod-patch
|
||||
linux-hardened-patch-for-xanmod))))
|
||||
|
||||
(define linux-rosenthal-source-deblobed
|
||||
(make-linux-libre-source
|
||||
%linux-version
|
||||
linux-rosenthal-source
|
||||
linux-rosenthal-deblob-scripts))
|
||||
|
||||
(define-public linux-xanmod
|
||||
(let ((base (customize-linux #:name "linux-xanmod"
|
||||
#:linux linux-libre
|
||||
@ -204,22 +165,6 @@ upstream Kernel Self Protection Project changes. Features already provided by
|
||||
SELinux + Yama and archs other than multiarch arm64 / x86_64 aren't in scope.
|
||||
"))))
|
||||
|
||||
(define-public linux-rosenthal
|
||||
(let ((base (customize-linux #:name "linux-rosenthal"
|
||||
#:linux linux-xanmod
|
||||
#:source linux-rosenthal-source-deblobed
|
||||
#:defconfig (local-file "aux-files/config.zen3-dorphine")
|
||||
#:extra-version "rosenthal")))
|
||||
(package
|
||||
(inherit base)
|
||||
(home-page "https://github.com/rakino/rosenthal/")
|
||||
(supported-systems '("x86_64-linux"))
|
||||
(synopsis "Custom Linux kernel")
|
||||
(description
|
||||
"Linux-Rosenthal is a custom Linux kernel based on @code{linux-xanmod}
|
||||
and @code{linux-hardened}. This kernel is partially deblobed, with some files
|
||||
necessary to drive specific hardwares kept."))))
|
||||
|
||||
(define-public kconfig-hardened-check-dev
|
||||
(let* ((base kconfig-hardened-check)
|
||||
(revision "154")
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
diff --git a/linux-hardened.patch b/linux-hardened.patch
|
||||
index 9e4c6a0..e5e0c5a 100644
|
||||
--- a/linux-hardened.patch
|
||||
+++ b/linux-hardened.patch
|
||||
@@ -1545,22 +1545,6 @@ index 205d605cacc5b..26c15bed8f7b4 100644
|
||||
int proc_dointvec_jiffies(struct ctl_table *table, int write,
|
||||
void *buffer, size_t *lenp, loff_t *ppos)
|
||||
{
|
||||
-@@ -1649,6 +1687,15 @@ static struct ctl_table kern_table[] = {
|
||||
- .mode = 0644,
|
||||
- .proc_handler = proc_dointvec,
|
||||
- },
|
||||
-+#ifdef CONFIG_USER_NS
|
||||
-+ {
|
||||
-+ .procname = "unprivileged_userns_clone",
|
||||
-+ .data = &unprivileged_userns_clone,
|
||||
-+ .maxlen = sizeof(int),
|
||||
-+ .mode = 0644,
|
||||
-+ .proc_handler = proc_dointvec,
|
||||
-+ },
|
||||
-+#endif
|
||||
- #ifdef CONFIG_PROC_SYSCTL
|
||||
- {
|
||||
- .procname = "tainted",
|
||||
@@ -2498,6 +2545,7 @@ EXPORT_SYMBOL(proc_douintvec);
|
||||
EXPORT_SYMBOL(proc_dointvec_jiffies);
|
||||
EXPORT_SYMBOL(proc_dointvec_minmax);
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/linux-libre-deblob-check b/linux-libre-deblob-check
|
||||
index d75b6b3..b45aa90 100644
|
||||
--- a/linux-libre-deblob-check
|
||||
+++ b/linux-libre-deblob-check
|
||||
@@ -7978,7 +7978,7 @@ $eormatch /^[;][/][*]end .*[*][/][;]$eornl$/ {
|
||||
for (i = nfilenames; --i > 0;)
|
||||
print filenames[i] " within";
|
||||
print filenames[0];
|
||||
- exit (1);
|
||||
+ exit (0);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,105 +0,0 @@
|
||||
diff --git a/linux-libre-deblob b/linux-libre-deblob
|
||||
index bdee4b5..7ac458b 100644
|
||||
--- a/linux-libre-deblob
|
||||
+++ b/linux-libre-deblob
|
||||
@@ -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
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/mes_v10_1.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/mes_v11_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
|
||||
-clean_blob drivers/gpu/drm/amd/pm/powerplay/smumgr/smumgr.c
|
||||
-reject_firmware drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
|
||||
-clean_blob drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
|
||||
-reject_firmware drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||
-clean_blob drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||
-reject_firmware drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
|
||||
-clean_blob drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
|
||||
-clean_kconfig drivers/gpu/drm/Kconfig DRM_AMDGPU
|
||||
-clean_mk CONFIG_DRM_AMDGPU drivers/gpu/drm/amd/amdgpu/Makefile
|
||||
-
|
||||
announce DRM_AMDGPU_CIK - "Enable amdgpu support for CIK parts"
|
||||
reject_firmware drivers/gpu/drm/amd/amdgpu/cik_sdma.c
|
||||
clean_blob drivers/gpu/drm/amd/amdgpu/cik_sdma.c
|
||||
@@ -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
|
||||
-reject_firmware drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
|
||||
-reject_firmware drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
|
||||
-clean_blob drivers/net/wireless/intel/iwlwifi/iwl-drv.c
|
||||
-clean_blob drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
|
||||
-clean_kconfig drivers/net/wireless/intel/iwlwifi/Kconfig IWLWIFI
|
||||
-clean_mk CONFIG_IWLWIFI drivers/net/wireless/intel/iwlwifi/Makefile
|
||||
-
|
||||
announce IWLDVM - "Intel Wireless WiFi DVM Firmware support"
|
||||
clean_blob drivers/net/wireless/intel/iwlwifi/cfg/1000.c
|
||||
clean_blob drivers/net/wireless/intel/iwlwifi/cfg/2000.c
|
||||
@@ -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
|
||||
-clean_blob drivers/net/wireless/intel/iwlwifi/cfg/9000.c
|
||||
-clean_blob drivers/net/wireless/intel/iwlwifi/cfg/22000.c
|
||||
-clean_kconfig drivers/net/wireless/intel/iwlwifi/Kconfig IWLMVM
|
||||
-clean_mk CONFIG_IWLMVM drivers/net/wireless/intel/iwlwifi/Makefile
|
||||
-
|
||||
announce KS7010 - "KeyStream KS7010 SDIO support"
|
||||
reject_firmware drivers/staging/ks7010/ks7010_sdio.c
|
||||
clean_blob drivers/staging/ks7010/ks7010_sdio.c
|
||||
Loading…
Reference in New Issue
Block a user