diff options
author | David P <megver83@parabola.nu> | 2020-11-18 21:15:17 -0300 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2020-11-18 21:44:30 -0300 |
commit | 798ea29398af0dcdfe9829654a7311695601cf09 (patch) | |
tree | 2d8a4dd6a17abc2639402916b070904f32a2bbcd /Makefile | |
parent | 3037a454824355c2142f1110f0ac0d4ed6191675 (diff) |
update Makefile, sync with archiso
Imported changes:
3160db0 (HEAD -> master, origin/master, origin/HEAD) Fix evaluation bugs in mkarchiso
96ac5e2 mkarchiso: add xorrisofs options from boot mode specific functions instead of hardcoding them in _build_iso
4dfb473 mkarchiso: validate profile right after reading it
57d510f mkarchiso: general cleanup and simplification
Non-imported changes:
6c39713 Use official archlinux Docker image
Parabola changes:
* remove talkingparabola from Makefile
* adapt imported changes to work with dual ISOs
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -40,12 +40,7 @@ lint: configs/lxde-openrc/airootfs/etc/local.d/etc-pacman.d-gnupg.start \ configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector \ configs/lxde-openrc/airootfs/usr/local/bin/choose-mirror \ - configs/talkingparabola/airootfs/root/.automated_script.sh \ - configs/talkingparabola/airootfs/usr/bin/livecd-alsa-unmuter \ - configs/talkingparabola/airootfs/usr/bin/pick-a-card \ - configs/talkingparabola/airootfs/usr/bin/talk-to-me \ - configs/talkingparabola/airootfs/usr/local/bin/choose-mirror \ - configs/releng/airootfs/usr/local/bin/livecd-sound + configs/releng/airootfs/usr/local/bin/livecd-sound shellcheck -s dash $(HOOKS_FILES) $(SCRIPT_FILES) install: install-program install-examples install-doc |