Skip to content

Commit 95f251c

Browse files
committed
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
1 parent 83efbe0 commit 95f251c

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ These packages are required:
6464
apt install --no-install-recommends --no-install-suggests \
6565
bc binfmt-support bison build-essential bzip2 ca-certificates cgpt cmake cpio debhelper \
6666
debootstrap device-tree-compiler devscripts file flex g++ gawk gcc gcc-aarch64-linux-gnu \
67-
gcc-arm-none-eabi git gpg gpg-agent kmod libc-dev libncurses-dev libssl-dev make \
67+
gcc-arm-none-eabi git gpg gpg-agent kmod libc-dev libncurses-dev libssl-dev lzip make \
6868
parted patch pbuilder qemu-user-static quilt rsync sudo texinfo u-boot-tools udev \
6969
```
7070

kernel/makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ KERNEL_BUILD_LOG := $(PRAWNOS_BUILD_LOGS)/kernel-log-$(TARGET).txt
1818

1919
KERNEL_LIBRE_CONFIG := $(KERNEL_RESOURCES)/libre-config
2020
KERNEL_LIBRE_URL := https://www.linux-libre.fsfla.org/pub/linux-libre/releases/$(KVER)-gnu/
21-
KERNEL_LIBRE_BASENAME := linux-libre-$(KVER)-gnu.tar.xz
21+
KERNEL_LIBRE_BASENAME := linux-libre-$(KVER)-gnu.tar.lz
2222
KERNEL_LIBRE_TAR := $(PRAWNOS_BUILD_SOURCES)/$(KERNEL_LIBRE_BASENAME)
23-
KERNEL_LIBRE_TAR_SIGNATURE := $(PRAWNOS_BUILD_SOURCES)/$(KERNEL_LIBRE_TAR).sign
2423
KERNEL_LIBRE_TAR_SIGNATURE_BASENAME := $(KERNEL_LIBRE_BASENAME).sign
24+
KERNEL_LIBRE_TAR_SIGNATURE := $(PRAWNOS_BUILD_SOURCES)/$(KERNEL_LIBRE_TAR_SIGNATURE_BASENAME)
2525
KERNEL_LIBRE_TAR_SIGNATURE_TARGET_BASENAME := $(KERNEL_LIBRE_BASENAME)
2626
KERNEL_LIBRE_TAR_SIGNATURE_TARGET := $(PRAWNOS_BUILD_SOURCES)/$(KERNEL_LIBRE_TAR_SIGNATURE_TARGET_BASENAME)
2727
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
3131
BLOBBY_BUILD := 0
3232
KERNEL_BLOBBY_CONFIG := $(KERNEL_RESOURCES)/blobby-config
3333
KERNEL_BLOBBY_URL := https://cdn.kernel.org/pub/linux/kernel/v5.x/
34-
KERNEL_BLOBBY_BASENAME := linux-$(KVER).tar.xz
34+
KERNEL_BLOBBY_BASENAME := linux-$(KVER).tar.lz
3535
KERNEL_BLOBBY_TAR := $(PRAWNOS_BUILD_SOURCES)/$(KERNEL_BLOBBY_BASENAME)
3636
KERNEL_BLOBBY_TAR_SIGNATURE_TARGET_BASENAME := linux-$(KVER).tar
3737
KERNEL_BLOBBY_TAR_SIGNATURE_BASENAME := $(KERNEL_BLOBBY_TAR_SIGNATURE_TARGET_BASENAME).sign
@@ -116,7 +116,7 @@ KERNEL_CONFIG := $(KERNEL_LIBRE_CONFIG)
116116
KERNEL_URL := $(KERNEL_LIBRE_URL)
117117
KERNEL_BASENAME := $(KERNEL_LIBRE_BASENAME)
118118
KERNEL_TAR := $(KERNEL_LIBRE_TAR)
119-
KERNEL_TAR_SIGNATURE := $(KERNEL_LIBRE_TAR_SIGNATURE_BASENAME)
119+
KERNEL_TAR_SIGNATURE := $(KERNEL_LIBRE_TAR_SIGNATURE)
120120
KERNEL_TAR_SIGNATURE_BASENAME := $(KERNEL_LIBRE_TAR_SIGNATURE_BASENAME)
121121
KERNEL_TAR_SIGNATURE_TARGET := $(KERNEL_LIBRE_TAR_SIGNATURE_TARGET)
122122
KERNEL_TAR_SIGNATURE_TARGET_BASENAME := $(KERNEL_LIBRE_TAR_SIGNATURE_TARGET_BASENAME)
@@ -144,13 +144,13 @@ $(KERNEL_EXTRACTED): $(KERNEL_TAR) $(KERNEL_TAR_SIGNATURE)
144144
case $(BLOBBY_BUILD) in \
145145
0) \
146146
gpg --verify $(KERNEL_TAR_SIGNATURE) $(KERNEL_TAR_SIGNATURE_TARGET) && \
147-
tar -xvf $(KERNEL_TAR) -C $(PRAWNOS_BUILD) && \
147+
tar --lzip -xf $(KERNEL_TAR) -C $(PRAWNOS_BUILD) && \
148148
touch $(KERNEL_EXTRACTED) \
149149
;; \
150150
1) \
151151
if [ ! -f $(KERNEL_TAR_SIGNATURE_TARGET) ]; then xz --decompress --keep $(KERNEL_TAR) ; fi ; \
152152
gpg --verify $(KERNEL_TAR_SIGNATURE) $(KERNEL_TAR_SIGNATURE_TARGET) && \
153-
tar -xvf $(KERNEL_TAR_SIGNATURE_TARGET) -C $(PRAWNOS_BUILD) && \
153+
tar -xf $(KERNEL_TAR_SIGNATURE_TARGET) -C $(PRAWNOS_BUILD) && \
154154
touch $(KERNEL_EXTRACTED) \
155155
;; \
156156
*) \

makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ install_dependencies:
122122
apt install --no-install-recommends --no-install-suggests $(AUTO_YES) \
123123
bc binfmt-support bison build-essential bzip2 ca-certificates cgpt cmake cpio debhelper \
124124
debootstrap device-tree-compiler devscripts file flex g++ gawk gcc gcc-aarch64-linux-gnu \
125-
gcc-arm-none-eabi git gpg gpg-agent kmod libc-dev libncurses-dev libssl-dev make \
125+
gcc-arm-none-eabi git gpg gpg-agent kmod libc-dev libncurses-dev libssl-dev lzip make \
126126
parted patch pbuilder qemu-user-static quilt rsync sudo texinfo u-boot-tools udev vboot-kernel-utils wget
127127

128128
.PHONY: install_dependencies_yes

0 commit comments

Comments
 (0)