Skip to content

Commit e066c56

Browse files
committed
feat: use parallel zstd for rootfs
1 parent dfe2734 commit e066c56

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LNCR_EXE=Devuan.exe
44
DLR=curl
55
DLR_FLAGS=--silent --location
66
BASE_URL=https://jenkins.linuxcontainers.org/view/Images/job/image-devuan/architecture=amd64,release=daedalus,variant=default/lastSuccessfulBuild/artifact/rootfs.tar.xz
7-
LNCR_ZIP_URL!=curl --silent https://api.github.com/repos/yuk7/wsldl/releases | jq --raw-output ".[0].assets[].browser_download_url" | grep --extended-regexp "icons.zip"
7+
LNCR_ZIP_URL=https://github.com/Vinfall/wsldl/releases/download/24041300/icons.zip
88
LNCR_ZIP_EXE=Devuan.exe
99

1010
all: $(OUT_ZIP)
@@ -14,11 +14,11 @@ $(OUT_ZIP): ziproot
1414
@echo -e '\e[1;31mBuilding $(OUT_ZIP)\e[m'
1515
cd ziproot; bsdtar -a -cf ../$(OUT_ZIP) *
1616

17-
ziproot: Launcher.exe rootfs.tar.gz
17+
ziproot: Launcher.exe rootfs.tar.zst
1818
@echo -e '\e[1;31mBuilding ziproot...\e[m'
1919
mkdir ziproot
2020
cp Launcher.exe ziproot/${LNCR_EXE}
21-
cp rootfs.tar.gz ziproot/
21+
cp rootfs.tar.zst ziproot/
2222

2323
exe: Launcher.exe
2424
Launcher.exe: icons.zip
@@ -30,10 +30,10 @@ icons.zip:
3030
@echo -e '\e[1;31mDownloading icons.zip...\e[m'
3131
$(DLR) $(DLR_FLAGS) $(LNCR_ZIP_URL) -o icons.zip
3232

33-
rootfs.tar.gz: rootfs
34-
@echo -e '\e[1;31mBuilding rootfs.tar.xz...\e[m'
35-
cd rootfs; sudo tar -zcpf ../rootfs.tar.gz `sudo ls`
36-
sudo chown `id -un` rootfs.tar.gz
33+
rootfs.tar.zst: rootfs
34+
@echo -e '\e[1;31mBuilding rootfs.tar.zst...\e[m'
35+
cd rootfs; sudo tar --use-compress-program="zstd -T0" -cpf ../rootfs.tar.zst `sudo ls`
36+
sudo chown `id -un` rootfs.tar.zst
3737

3838
rootfs: base.tar.xz
3939
@echo -e '\e[1;31mBuilding rootfs...\e[m'
@@ -50,6 +50,6 @@ clean:
5050
-rm -r ziproot
5151
-rm Launcher.exe
5252
-rm icons.zip
53-
-rm rootfs.tar.gz
53+
-rm rootfs.tar.xz
5454
-sudo rm -r rootfs
5555
-rm base.tar.xz

0 commit comments

Comments
 (0)