diff --git a/Makefile b/Makefile index 41a3516..ee28fba 100644 --- a/Makefile +++ b/Makefile @@ -27,9 +27,6 @@ umnt: base: $(call vinstall,base-system) -base-from-archive: - tar -xpf $(VOID_ARCHIVE) -C $(MNTDIR) - set-term: $(call vinstall,st-terminfo) @@ -45,15 +42,6 @@ set-resolv: tools: $(call vinstall,base-devel git tcc wget vim-x11 tmux) -archive: - tar -cvpjf void-fs.tar.bz2 \ - --exclude=./dev/* \ - --exclude=./proc/* \ - --exclude=./sys/* \ - --exclude=./tmp/* \ - --exclude=./run/* \ - -C $(MNTDIR) . - set-fstab: cp files/fstab $(MNTDIR)/etc/fstab echo "$(shell file -s $(DRIVE)|tr ' ' '\n'|grep UUID) / ext4 rw,noatime,discard 0 1" >> $(MNTDIR)/etc/fstab @@ -70,3 +58,16 @@ wifi: metal: mnt-drive mnt-system base set-resolv set-fstab set-root grub laptop: metal wifi + +archive: + tar -cvpjf void-fs.tar.bz2 \ + --exclude=./dev/* \ + --exclude=./proc/* \ + --exclude=./sys/* \ + --exclude=./tmp/* \ + --exclude=./run/* \ + -C $(MNTDIR) . + +base-from-archive: + tar -xpf $(VOID_ARCHIVE) -C $(MNTDIR) +