switch to using lzip for linux-libre sources, fix sig getting dumped …

…in repo root the lz sources are available for much longer than the others
SolidHal · Jul 26, 2022 · 95f251c · 95f251c
1 parent 83efbe0
commit 95f251c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ These packages are required:
         apt install --no-install-recommends --no-install-suggests \
         bc binfmt-support bison build-essential bzip2 ca-certificates cgpt cmake cpio debhelper \
         debootstrap device-tree-compiler devscripts file flex g++ gawk gcc gcc-aarch64-linux-gnu \
-        gcc-arm-none-eabi git gpg gpg-agent kmod libc-dev libncurses-dev libssl-dev make \
+        gcc-arm-none-eabi git gpg gpg-agent kmod libc-dev libncurses-dev libssl-dev lzip make \
         parted patch pbuilder qemu-user-static quilt rsync sudo texinfo u-boot-tools udev \
 ```
 

diff --git a/kernel/makefile b/kernel/makefile
@@ -18,10 +18,10 @@ KERNEL_BUILD_LOG := $(PRAWNOS_BUILD_LOGS)/kernel-log-$(TARGET).txt
 
 KERNEL_LIBRE_CONFIG := $(KERNEL_RESOURCES)/libre-config
 KERNEL_LIBRE_URL := https://www.linux-libre.fsfla.org/pub/linux-libre/releases/$(KVER)-gnu/
-KERNEL_LIBRE_BASENAME := linux-libre-$(KVER)-gnu.tar.xz
+KERNEL_LIBRE_BASENAME := linux-libre-$(KVER)-gnu.tar.lz
 KERNEL_LIBRE_TAR := $(PRAWNOS_BUILD_SOURCES)/$(KERNEL_LIBRE_BASENAME)
-KERNEL_LIBRE_TAR_SIGNATURE := $(PRAWNOS_BUILD_SOURCES)/$(KERNEL_LIBRE_TAR).sign
 KERNEL_LIBRE_TAR_SIGNATURE_BASENAME := $(KERNEL_LIBRE_BASENAME).sign
+KERNEL_LIBRE_TAR_SIGNATURE := $(PRAWNOS_BUILD_SOURCES)/$(KERNEL_LIBRE_TAR_SIGNATURE_BASENAME)
 KERNEL_LIBRE_TAR_SIGNATURE_TARGET_BASENAME := $(KERNEL_LIBRE_BASENAME)
 KERNEL_LIBRE_TAR_SIGNATURE_TARGET := $(PRAWNOS_BUILD_SOURCES)/$(KERNEL_LIBRE_TAR_SIGNATURE_TARGET_BASENAME)
 KERNEL_LIBRE_PUBKEY := $(KERNEL_SHARED_RESOURCES)/linux-libre-signing-key.gpg
@@ -31,7 +31,7 @@ KERNEL_LIBRE_PUBKEY := $(KERNEL_SHARED_RESOURCES)/linux-libre-signing-key.gpg
 BLOBBY_BUILD := 0
 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.xz
+KERNEL_BLOBBY_BASENAME := linux-$(KVER).tar.lz
 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
@@ -116,7 +116,7 @@ KERNEL_CONFIG := $(KERNEL_LIBRE_CONFIG)
 KERNEL_URL := $(KERNEL_LIBRE_URL)
 KERNEL_BASENAME := $(KERNEL_LIBRE_BASENAME)
 KERNEL_TAR := $(KERNEL_LIBRE_TAR)
-KERNEL_TAR_SIGNATURE := $(KERNEL_LIBRE_TAR_SIGNATURE_BASENAME)
+KERNEL_TAR_SIGNATURE := $(KERNEL_LIBRE_TAR_SIGNATURE)
 KERNEL_TAR_SIGNATURE_BASENAME := $(KERNEL_LIBRE_TAR_SIGNATURE_BASENAME)
 KERNEL_TAR_SIGNATURE_TARGET := $(KERNEL_LIBRE_TAR_SIGNATURE_TARGET)
 KERNEL_TAR_SIGNATURE_TARGET_BASENAME := $(KERNEL_LIBRE_TAR_SIGNATURE_TARGET_BASENAME)
@@ -144,13 +144,13 @@ $(KERNEL_EXTRACTED): $(KERNEL_TAR) $(KERNEL_TAR_SIGNATURE)
 	case $(BLOBBY_BUILD) in \
 		0) \
 			gpg --verify $(KERNEL_TAR_SIGNATURE) $(KERNEL_TAR_SIGNATURE_TARGET) && \
-			tar -xvf $(KERNEL_TAR) -C $(PRAWNOS_BUILD) && \
+			tar --lzip -xf $(KERNEL_TAR) -C $(PRAWNOS_BUILD) && \
 			touch $(KERNEL_EXTRACTED) \
 			;; \
 		1) \
 			if [ ! -f $(KERNEL_TAR_SIGNATURE_TARGET) ]; then xz --decompress --keep $(KERNEL_TAR) ; fi ; \
 			gpg --verify $(KERNEL_TAR_SIGNATURE) $(KERNEL_TAR_SIGNATURE_TARGET) && \
-			tar -xvf $(KERNEL_TAR_SIGNATURE_TARGET) -C $(PRAWNOS_BUILD) && \
+			tar -xf $(KERNEL_TAR_SIGNATURE_TARGET) -C $(PRAWNOS_BUILD) && \
 			touch $(KERNEL_EXTRACTED) \
 			;; \
 		*) \

diff --git a/makefile b/makefile
@@ -122,7 +122,7 @@ install_dependencies:
 	apt install --no-install-recommends --no-install-suggests $(AUTO_YES) \
     bc binfmt-support bison build-essential bzip2 ca-certificates cgpt cmake cpio debhelper \
     debootstrap device-tree-compiler devscripts file flex g++ gawk gcc gcc-aarch64-linux-gnu \
-    gcc-arm-none-eabi git gpg gpg-agent kmod libc-dev libncurses-dev libssl-dev make \
+    gcc-arm-none-eabi git gpg gpg-agent kmod libc-dev libncurses-dev libssl-dev lzip make \
     parted patch pbuilder qemu-user-static quilt rsync sudo texinfo u-boot-tools udev vboot-kernel-utils wget
 
 .PHONY: install_dependencies_yes