move large files into btrfs subvolume

author: Andrew Cady <d@jerkface.net> 2023-06-25 18:23:08 -0400
committer: Andrew Cady <d@jerkface.net> 2023-06-25 18:23:08 -0400
commit: 2d4e384597040b63b8bc34b8db32a9c4e0f39afc (patch)
tree: faafa1110ee1868466da4e740fb4b1eb60efb8e1
parent: 1dcb9429626603052fe4d307d7deb29c7182f1da (diff)
3 files changed, 27 insertions, 35 deletions
diff --git a/.gitignore b/.gitignore
index e4fbb9c..24fdeeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-Super-UEFIinSecureBoot-Disk_v*.zip
+/_images/
-/*/Super-UEFIinSecureBoot-Disk.img
 /*/BOOTX64.EFI
diff --git a/Makefile b/Makefile
index 987e707..90331e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,32 @@
-ver = 3
+version = 3
 efi_files = BOOTX64.EFI
-zip = Super-UEFIinSecureBoot-Disk_v$(ver).zip
+zip = _images/Super-UEFIinSecureBoot-Disk_v$(version).zip
-img = $(ver)/Super-UEFIinSecureBoot-Disk.img
+img = _images/$(version)/Super-UEFIinSecureBoot-Disk.img
+sum_file = sha256sum.txt
-ver_files = $(addprefix $(ver)/,$(efi_files))
+extracted_efi_files = $(addprefix $(version)/,$(efi_files))
-all: $(ver_files)
+sha256_check_file = grep ' $(1)$$' < $(sum_file) | sha256sum -c
+all: $(extracted_efi_files)
 clean:
-        rm -f $(ver_files)
+        rm -f $(extracted_efi_files)
+image: $(img)
 view: $(zip)
        unzip -v $^
-image: $(img)
+$(version):
-$(ver):
        mkdir $@
+_images/$(version):
-sum_file = sha256sum.txt
+        btrfs subvolume create $@
+$(img): $(zip) | $(dir $(img))
-define sha256_check_file
-        grep ' $(1)$$' < $(sum_file) | sha256sum -c
-endef
-$(img): | $(zip) $(ver)
        $(call sha256_check_file,$(zip))
-        unzip -d $(ver) $(zip)
+        unzip -d $(dir $@) $<
+        touch $(img)
 $(zip):
-        wget -c https://github.com/ValdikSS/Super-UEFIinSecureBoot-Disk/releases/download/$(ver)/$@ -O $@~tmp
+        wget -c https://github.com/ValdikSS/Super-UEFIinSecureBoot-Disk/releases/download/$(version)/$@ -O $@~tmp
        mv $@~tmp $@
+$(extracted_efi_files): $(img) | $(version)
-$(ver_files): $(img) $(ver)
        $(call sha256_check_file,$(img))
-        sudo systemd-run --working-directory $(ver) --wait -P -p PrivateMounts=yes -- \
+        sudo systemd-run --working-directory $(version) --wait -P -p PrivateMounts=yes -- \
                $$PWD/src/extract-part1-files.bash $$PWD/$(img) $(addprefix EFI/BOOT/,$(efi_files))
        $(call sha256_check_file,$@)
diff --git a/sha256sum.txt b/sha256sum.txt
index 0383acc..63275ca 100644
--- a/sha256sum.txt
+++ b/sha256sum.txt
@@ -1,12 +1,12 @@
 e6cb6a3dcbd85954e5123759461198af67658aa425a6186ffc9b57b772f9158f  3-2/BOOTX64.EFI
-ba2d8b89abf467a2ac06dc93a48eac69a086eca8145ca50428cc1f9b8e4a0315  3-2/Super-UEFIinSecureBoot-Disk.img
 e6cb6a3dcbd85954e5123759461198af67658aa425a6186ffc9b57b772f9158f  3-3/BOOTX64.EFI
-22960c778adcd9deb4321bec7a8f4a25effbbdcc9068942a724102a24d328b40  3-3/Super-UEFIinSecureBoot-Disk.img
 62bbc1295c118952b7db11690635f52929dafa384bc1e587f042916b121a6a56  3-4/BOOTX64.EFI
-a94ac8c7a72093398614e8ea0a92fe98fd37fc49a9366a43d5086049d05e6a0a  3-4/Super-UEFIinSecureBoot-Disk.img
 475552c7476ad45e42344eee8b30d44c264d200ac2468428aa86fc8795fb6e34  3/BOOTX64.EFI
-1a06df3ecfd8656fdf0bb5699b84f52b321c976d13801c9790aadf11ca6d14af  3/Super-UEFIinSecureBoot-Disk.img
+ba2d8b89abf467a2ac06dc93a48eac69a086eca8145ca50428cc1f9b8e4a0315  _images/3-2/Super-UEFIinSecureBoot-Disk.img
-72fbec0e5459dc13a264b9e539fc8f068203de5daf9804965f75cfc68ab21675  Super-UEFIinSecureBoot-Disk_v3-2.zip
+22960c778adcd9deb4321bec7a8f4a25effbbdcc9068942a724102a24d328b40  _images/3-3/Super-UEFIinSecureBoot-Disk.img
-793da93c21530be4abb6b745a5d9110bd86ef091e760e9b3d7983e11edabbe4a  Super-UEFIinSecureBoot-Disk_v3-3.zip
+a94ac8c7a72093398614e8ea0a92fe98fd37fc49a9366a43d5086049d05e6a0a  _images/3-4/Super-UEFIinSecureBoot-Disk.img
-9e113856e81d7c800dd4d16d4875cf6bd218f5e779e2643dd904d309bff85842  Super-UEFIinSecureBoot-Disk_v3-4.zip
+1a06df3ecfd8656fdf0bb5699b84f52b321c976d13801c9790aadf11ca6d14af  _images/3/Super-UEFIinSecureBoot-Disk.img
-3743c557ed41b3949fa92294e690834b1945ce25d55a71d009886dc0a13deb18  Super-UEFIinSecureBoot-Disk_v3.zip
+72fbec0e5459dc13a264b9e539fc8f068203de5daf9804965f75cfc68ab21675  _images/Super-UEFIinSecureBoot-Disk_v3-2.zip
+793da93c21530be4abb6b745a5d9110bd86ef091e760e9b3d7983e11edabbe4a  _images/Super-UEFIinSecureBoot-Disk_v3-3.zip
+9e113856e81d7c800dd4d16d4875cf6bd218f5e779e2643dd904d309bff85842  _images/Super-UEFIinSecureBoot-Disk_v3-4.zip
+3743c557ed41b3949fa92294e690834b1945ce25d55a71d009886dc0a13deb18  _images/Super-UEFIinSecureBoot-Disk_v3.zip
author	Andrew Cady <d@jerkface.net>	2023-06-25 18:23:08 -0400
committer	Andrew Cady <d@jerkface.net>	2023-06-25 18:23:08 -0400
commit	2d4e384597040b63b8bc34b8db32a9c4e0f39afc (patch)
tree	faafa1110ee1868466da4e740fb4b1eb60efb8e1
parent	1dcb9429626603052fe4d307d7deb29c7182f1da (diff)

diff --git a/.gitignore b/.gitignore index e4fbb9c..24fdeeb 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,3 +1,2 @@
1	Super-UEFIinSecureBoot-Disk_v*.zip	1	/_images/
2	/*/Super-UEFIinSecureBoot-Disk.img
3	/*/BOOTX64.EFI	2	/*/BOOTX64.EFI


diff --git a/Makefile b/Makefile index 987e707..90331e1 100644 --- a/Makefile +++ b/Makefile
@@ -1,39 +1,32 @@
1	ver = 3	1	version = 3
2	efi_files = BOOTX64.EFI	2	efi_files = BOOTX64.EFI
3	zip = Super-UEFIinSecureBoot-Disk_v$(ver).zip	3	zip = _images/Super-UEFIinSecureBoot-Disk_v$(version).zip
4	img = $(ver)/Super-UEFIinSecureBoot-Disk.img	4	img = _images/$(version)/Super-UEFIinSecureBoot-Disk.img
5		5	sum_file = sha256sum.txt
6	ver_files = $(addprefix $(ver)/,$(efi_files))	6	extracted_efi_files = $(addprefix $(version)/,$(efi_files))
7		7
8	all: $(ver_files)	8	sha256_check_file = grep ' $(1)$$' < $(sum_file) \| sha256sum -c
9		9
		10	all: $(extracted_efi_files)
10	clean:	11	clean:
11	rm -f $(ver_files)	12	rm -f $(extracted_efi_files)
12		13	image: $(img)
13	view: $(zip)	14	view: $(zip)
14	unzip -v $^	15	unzip -v $^
15		16
16	image: $(img)	17	$(version):
17
18	$(ver):
19	mkdir $@	18	mkdir $@
20		19	_images/$(version):
21	sum_file = sha256sum.txt	20	btrfs subvolume create $@
22		21	$(img): $(zip) \| $(dir $(img))
23	define sha256_check_file
24	grep ' $(1)$$' < $(sum_file) \| sha256sum -c
25	endef
26
27	$(img): \| $(zip) $(ver)
28	$(call sha256_check_file,$(zip))	22	$(call sha256_check_file,$(zip))
29	unzip -d $(ver) $(zip)	23	unzip -d $(dir $@) $<
30		24	touch $(img)
31	$(zip):	25	$(zip):
32	wget -c https://github.com/ValdikSS/Super-UEFIinSecureBoot-Disk/releases/download/$(ver)/$@ -O $@~tmp	26	wget -c https://github.com/ValdikSS/Super-UEFIinSecureBoot-Disk/releases/download/$(version)/$@ -O $@~tmp
33	mv $@~tmp $@	27	mv $@~tmp $@
34		28	$(extracted_efi_files): $(img) \| $(version)
35	$(ver_files): $(img) $(ver)
36	$(call sha256_check_file,$(img))	29	$(call sha256_check_file,$(img))
37	sudo systemd-run --working-directory $(ver) --wait -P -p PrivateMounts=yes -- \	30	sudo systemd-run --working-directory $(version) --wait -P -p PrivateMounts=yes -- \
38	$$PWD/src/extract-part1-files.bash $$PWD/$(img) $(addprefix EFI/BOOT/,$(efi_files))	31	$$PWD/src/extract-part1-files.bash $$PWD/$(img) $(addprefix EFI/BOOT/,$(efi_files))
39	$(call sha256_check_file,$@)	32	$(call sha256_check_file,$@)


diff --git a/sha256sum.txt b/sha256sum.txt index 0383acc..63275ca 100644 --- a/sha256sum.txt +++ b/sha256sum.txt
@@ -1,12 +1,12 @@
1	e6cb6a3dcbd85954e5123759461198af67658aa425a6186ffc9b57b772f9158f 3-2/BOOTX64.EFI	1	e6cb6a3dcbd85954e5123759461198af67658aa425a6186ffc9b57b772f9158f 3-2/BOOTX64.EFI
2	ba2d8b89abf467a2ac06dc93a48eac69a086eca8145ca50428cc1f9b8e4a0315 3-2/Super-UEFIinSecureBoot-Disk.img
3	e6cb6a3dcbd85954e5123759461198af67658aa425a6186ffc9b57b772f9158f 3-3/BOOTX64.EFI	2	e6cb6a3dcbd85954e5123759461198af67658aa425a6186ffc9b57b772f9158f 3-3/BOOTX64.EFI
4	22960c778adcd9deb4321bec7a8f4a25effbbdcc9068942a724102a24d328b40 3-3/Super-UEFIinSecureBoot-Disk.img
5	62bbc1295c118952b7db11690635f52929dafa384bc1e587f042916b121a6a56 3-4/BOOTX64.EFI	3	62bbc1295c118952b7db11690635f52929dafa384bc1e587f042916b121a6a56 3-4/BOOTX64.EFI
6	a94ac8c7a72093398614e8ea0a92fe98fd37fc49a9366a43d5086049d05e6a0a 3-4/Super-UEFIinSecureBoot-Disk.img
7	475552c7476ad45e42344eee8b30d44c264d200ac2468428aa86fc8795fb6e34 3/BOOTX64.EFI	4	475552c7476ad45e42344eee8b30d44c264d200ac2468428aa86fc8795fb6e34 3/BOOTX64.EFI
8	1a06df3ecfd8656fdf0bb5699b84f52b321c976d13801c9790aadf11ca6d14af 3/Super-UEFIinSecureBoot-Disk.img	5	ba2d8b89abf467a2ac06dc93a48eac69a086eca8145ca50428cc1f9b8e4a0315 _images/3-2/Super-UEFIinSecureBoot-Disk.img
9	72fbec0e5459dc13a264b9e539fc8f068203de5daf9804965f75cfc68ab21675 Super-UEFIinSecureBoot-Disk_v3-2.zip	6	22960c778adcd9deb4321bec7a8f4a25effbbdcc9068942a724102a24d328b40 _images/3-3/Super-UEFIinSecureBoot-Disk.img
10	793da93c21530be4abb6b745a5d9110bd86ef091e760e9b3d7983e11edabbe4a Super-UEFIinSecureBoot-Disk_v3-3.zip	7	a94ac8c7a72093398614e8ea0a92fe98fd37fc49a9366a43d5086049d05e6a0a _images/3-4/Super-UEFIinSecureBoot-Disk.img
11	9e113856e81d7c800dd4d16d4875cf6bd218f5e779e2643dd904d309bff85842 Super-UEFIinSecureBoot-Disk_v3-4.zip	8	1a06df3ecfd8656fdf0bb5699b84f52b321c976d13801c9790aadf11ca6d14af _images/3/Super-UEFIinSecureBoot-Disk.img
12	3743c557ed41b3949fa92294e690834b1945ce25d55a71d009886dc0a13deb18 Super-UEFIinSecureBoot-Disk_v3.zip	9	72fbec0e5459dc13a264b9e539fc8f068203de5daf9804965f75cfc68ab21675 _images/Super-UEFIinSecureBoot-Disk_v3-2.zip
		10	793da93c21530be4abb6b745a5d9110bd86ef091e760e9b3d7983e11edabbe4a _images/Super-UEFIinSecureBoot-Disk_v3-3.zip
		11	9e113856e81d7c800dd4d16d4875cf6bd218f5e779e2643dd904d309bff85842 _images/Super-UEFIinSecureBoot-Disk_v3-4.zip
		12	3743c557ed41b3949fa92294e690834b1945ce25d55a71d009886dc0a13deb18 _images/Super-UEFIinSecureBoot-Disk_v3.zip