xorg install

Makefile

@@ -4,47 +4,68 @@ define vinstall
 	export XBPS_ARCH=$(VOID_ARCH) && xbps-install -Suy -R $(VOID_REPO) -r $(MNTDIR) $(1)
 endef
 
-base-fs:
-	$(call vinstall,base-files)
-
-mnt-system:
-	mount --types proc /proc $(MNTDIR)/proc
-	mount --rbind /sys $(MNTDIR)/sys
-	mount --rbind /dev $(MNTDIR)/dev
-	mount --make-rslave $(MNTDIR)/sys
-	mount --make-rslave $(MNTDIR)/dev
-
-umnt-system:
-	umount $(MNTDIR)/proc
-	umount $(MNTDIR)/sys
-	umount $(MNTDIR)/dev
-
 mnt-drive:
 	mount $(DRIVE) $(MNTDIR)
 
-umnt-drive: umnt-system
+mnt-system:
-	umount $(DRIVE)
+	mkdir -p $(MNTDIR)/dev
+	mkdir -p $(MNTDIR)/proc
+	mkdir -p $(MNTDIR)/sys
+	mkdir -p $(MNTDIR)/run
+	mount --rbind /dev $(MNTDIR)/dev
+	mount --rbind /proc $(MNTDIR)/proc
+	mount --rbind /sys $(MNTDIR)/sys
+	mount --rbind /run $(MNTDIR)/run
+	mount --make-rslave $(MNTDIR)/dev
+	mount --make-rslave $(MNTDIR)/proc
+	mount --make-rslave $(MNTDIR)/sys
+	mount --make-rslave $(MNTDIR)/run
 
-base: base-fs mnt-system
+umnt:
+	umount -R $(DRIVE)
+
+base:
 	$(call vinstall,base-system)
 
-base-from-archive:
+set-loc:
-	tar -xpf $(VOID_ARCHIVE) -C $(MNTDIR)
+	echo $(BVLANG) >> $(MNTDIR)/etc/default/libc-locales
-	mount -t proc proc $(MNTDIR)/proc
+	chroot $(MNTDIR) xbps-reconfigure glibc-locales
-	mount -t sysfs sys $(MNTDIR)/sys
-	mount -o bind /dev $(MNTDIR)/dev
-	mount -t devpts pts $(MNTDIR)/dev/pts
 
 set-term:
 	$(call vinstall,st-terminfo)
 
+set-root:
+	chroot $(MNTDIR) chown root:root /
+	chroot $(MNTDIR) chmod 755 /
+	chroot $(MNTDIR) passwd root
+
 set-resolv:
 	cp files/resolv.conf.head $(MNTDIR)/etc/resolv.conf.head
 	cp files/resolv.conf.head $(MNTDIR)/etc/resolv.conf
 
+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
+
+grub:
+	$(call vinstall,grub)
+	mkdir $(MNTDIR)/boot/grub
+	chroot $(MNTDIR) grub-mkconfig -o /boot/grub/grub.cfg
+	chroot $(MNTDIR) grub-install $(BOOTLDR)
+
+wifi:
+	$(call vinstall,NetworkManager)
+
+xorg:
+	$(call vinstall,xorg)
+
+metal: mnt-drive mnt-system base set-loc set-resolv set-fstab set-root grub
+
 tools:
 	$(call vinstall,base-devel git tcc wget vim-x11 tmux)
 
+laptop: metal wifi
+
 archive:
 	tar -cvpjf void-fs.tar.bz2 \
 	--exclude=./dev/* \
@@ -54,22 +75,6 @@ archive:
 	--exclude=./run/* \
 	-C $(MNTDIR) .
 
-set-fstab:
+base-from-archive:
-	cp files/fstab $(MNTDIR)/etc/fstab
+	tar -xpf $(VOID_ARCHIVE) -C $(MNTDIR)
-	echo "$(shell file -s $(DRIVE)|tr ' ' '\n'|grep UUID) / ext4 rw,noatime,discard 0 1" >> $(MNTDIR)/etc/fstab
 
-cp-script:
-	cp scripts/* $(MNTDIR)/usr/local/bin/
-	chmod 755 $(MNTDIR)/usr/local/bin/*
-
-lilo: set-fstab cp-script
-	$(call vinstall,lilo,perl)
-	chroot $(MNTDIR) lilo-conf-mkr.sh $(BOOTLDR)
-
-grub:
-	$(call vinstall,grub)
-	mkdir $(MNTDIR)/boot/grub
-	chroot $(MNTDIR) grub-mkconfig -o /boot/grub/grub.cfg
-	chroot $(MNTDIR) grub-install $(BOOTLDR)
-
-metal: mnt-drive base grub

config.mk

@@ -2,14 +2,15 @@ VOID_ARCH=x86_64
 VOID_REPO="https://alpha.de.repo.voidlinux.org/current"
 VOID_ARCHIVE=void-fs.tar.bz2
 
-DRIVE=/dev/sdb1
+DRIVE=/dev/sde1
-BOOTLDR=/dev/sdb
+BOOTLDR=/dev/sde
 
-MNTDIR=/mnt
+MNTDIR=/mnt/void
 
 TIMEZN=Europe/Paris
 
-LANG=en_US.UTF-8
+BVLANG=en_US.UTF-8
+BVCLOC="en_US.UTF-8 UTF8"
 
 #hostname
 HSTNM=voidpad