Compare commits

...

5 Commits

Author SHA1 Message Date
ed barz 6cfae5a073 refactor 2020-10-28 13:14:50 +01:00
ed barz e687e19429 clean install python first 2020-10-28 13:06:16 +01:00
ed barz e8ddc78249 just run post-install 2020-10-28 13:05:13 +01:00
ed barz 5aac759f77 set-keymap and set-term added to metal target 2020-10-28 13:04:21 +01:00
ed barz 892fdbff8b tiny refactor 2020-10-28 13:02:03 +01:00
1 changed files with 9 additions and 11 deletions

View File

@ -56,8 +56,10 @@ grub:
chroot $(MNTDIR) grub-mkconfig -o /boot/grub/grub.cfg
chroot $(MNTDIR) grub-install $(BOOTLDR)
wifi:
$(call vinstall,NetworkManager elogind)
metal: mnt-drive mnt-system base set-loc set-resolv set-fstab set-root set-keymap set-term grub
python:
$(call vinstall,python3 python3-pip python3-pipenv)
xorg:
$(call vinstall,xorg)
@ -68,23 +70,19 @@ audio:
$(call vinstall,apulse)
$(call vinstall,alsa-plugins-pulseaudio)
metal: mnt-drive mnt-system base set-loc set-resolv set-fstab set-root grub
python:
$(call vinstall,python3 python3-pip python3-pipenv)
wifi:
$(call vinstall,NetworkManager elogind)
tools:
$(call vinstall,base-devel git tcc wget vim-x11 tmux psmisc)
post-install: python tools
post-install: tools
cp post-install.sh $(MNTDIR)/usr/local/bin/
cp first-boot.sh $(MNTDIR)/usr/local/bin/
chmod 755 $(MNTDIR)/usr/local/bin/post-install.sh
chroot $(MNTDIR) ln -s /usr/share/zoneinfo/$(TIMEZN) /etc/localtime
echo $(HSTNM) > $(MNTDIR)/etc/hostname
cp first-boot.sh $(MNTDIR)/usr/local/bin/first-boot.sh
chmod 755 $(MNTDIR)/usr/local/bin/first-boot.sh
run-post-install: post-install
chroot $(MNTDIR) /usr/local/bin/post-install.sh
nuser:
@ -92,7 +90,7 @@ nuser:
chroot $(MNTDIR) passwd $(NUSRNAME)
#chroot $(MNTDIR) dot-install $(NUSRNAME)
laptop: metal wifi xorg audio run-post-install nuser
laptop: metal python xorg audio wifi post-install nuser
archive:
tar -cvpjf void-fs.tar.bz2 \