SolidHal / PrawnOS

Libre Mainline Kernel and Debian for arm laptops
https://www.PrawnOS.com
GNU General Public License v2.0
114 stars 29 forks source link

blobby kernel sources are not available in .lz format #311

Open austin987 opened 1 year ago

austin987 commented 1 year ago

https://github.com/SolidHal/PrawnOS/commit/95f251c53a88d87b323deb30f764e7c152abb2dc switched the blobby kernel to using .lz, but https://cdn.kernel.org/pub/linux/kernel/v5.x/ (aka KERNEL_BLOBBY_URL) doesn't have any archives in .lz format.

austin987 commented 1 year ago

My immediate fix was:

diff --git a/kernel/makefile b/kernel/makefile
index 21b4c1f..0de7b99 100644
--- a/kernel/makefile
+++ b/kernel/makefile
@@ -31,7 +31,7 @@ KERNEL_LIBRE_PUBKEY := $(KERNEL_SHARED_RESOURCES)/linux-libre-signing-key.gpg
 BLOBBY_BUILD := 1
 KERNEL_BLOBBY_CONFIG := $(KERNEL_RESOURCES)/blobby-config
 KERNEL_BLOBBY_URL := https://cdn.kernel.org/pub/linux/kernel/v5.x/
-KERNEL_BLOBBY_BASENAME := linux-$(KVER).tar.lz
+KERNEL_BLOBBY_BASENAME := linux-$(KVER).tar.xz
 KERNEL_BLOBBY_TAR := $(PRAWNOS_BUILD_SOURCES)/$(KERNEL_BLOBBY_BASENAME)
 KERNEL_BLOBBY_TAR_SIGNATURE_TARGET_BASENAME := linux-$(KVER).tar
 KERNEL_BLOBBY_TAR_SIGNATURE_BASENAME := $(KERNEL_BLOBBY_TAR_SIGNATURE_TARGET_BASENAME).sign
@@ -144,7 +144,7 @@ $(KERNEL_EXTRACTED): $(KERNEL_TAR) $(KERNEL_TAR_SIGNATURE)
        case $(BLOBBY_BUILD) in \
                0) \
                        gpg --verify $(KERNEL_TAR_SIGNATURE) $(KERNEL_TAR_SIGNATURE_TARGET) && \
-                       tar --lzip -xf $(KERNEL_TAR) -C $(PRAWNOS_BUILD) && \
+                       tar -xf $(KERNEL_TAR) -C $(PRAWNOS_BUILD) && \
                        touch $(KERNEL_EXTRACTED) \
                        ;; \
                1) \

but wanted to check with you before spending more time on a PR :)