From 2f6f116d550a49d4239b0aecbaf4562ef922bab9 Mon Sep 17 00:00:00 2001 From: David P Date: Tue, 2 Feb 2021 00:59:26 -0300 Subject: sync with archiso Imported changes: f0ef2f3 (HEAD -> master, tag: v51, origin/master, origin/HEAD) Add changelog file b588c52 build-host.sh: Style and syntax fixes 428bf47 Add build stage for continuous integration 2a24429 Add continuous integration scripts to linting 0723949 Add scripts for continuous integration f9a7b20 configs/releng: move locale-gen from customize_airootfs.sh to a pacman hook a46c740 config/releng: remove pacman hooks specific to ISO build process from airootfs after they run 767c095 Update my email in AUTHORS dd51457 rm un-used set_image() dupe of check_image() in run_archiso.sh 23c5d52 add vorburger to AUTHORS.rst 0f20a11 Support setting more variables in profiledef.sh and rework the way overrides are applied e7306a3 add cloud-init to baseline 744b8f1 make baseline have working ethernet networking, like releng 94dd194 add SSH server to baseline 221a921 use same airootfs_image_tool_options in baseline as in releng 4f4047a configs/releng: move the mirror uncommenting sed command from customize_airootfs.sh to a pacman hook a2c8dd3 archiso_pxe_common: remove resolv.conf before copy b30d1ca mkarchiso: add version information Signed-off-by: David P --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cbd85dd..b3f9caa 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ lint: $(wildcard configs/*/profiledef.sh) \ configs/releng/airootfs/root/.automated_script.sh \ configs/releng/airootfs/usr/local/bin/choose-mirror \ + configs/releng/airootfs/usr/local/bin/livecd-sound \ configs/releng-openrc/airootfs/root/.automated_script.sh \ configs/releng-openrc/airootfs/etc/local.d/pacman-init.start \ configs/releng-openrc/airootfs/etc/local.d/choose-mirror.start \ @@ -39,8 +40,7 @@ lint: configs/lxde-openrc/airootfs/etc/local.d/choose-mirror.start \ 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/releng/airootfs/usr/local/bin/livecd-sound + configs/lxde-openrc/airootfs/usr/local/bin/choose-mirror shellcheck -s dash $(HOOKS_FILES) $(SCRIPT_FILES) install: install-program install-examples install-doc -- cgit v1.2.2