@@ -207,7 +207,7 @@ playbooks/secret.yml:
ifeq (y,$(CONFIG_KDEVOPS_ENABLE_DISTRO_EXTRA_ADDONS))
$(KDEVOPS_EXTRA_ADDON_DEST): .config $(KDEVOPS_EXTRA_ADDON_SOURCE)
- @$(Q)cp $(KDEVOPS_EXTRA_ADDON_SOURCE) $(KDEVOPS_EXTRA_ADDON_DEST)
+ $(Q)cp $(KDEVOPS_EXTRA_ADDON_SOURCE) $(KDEVOPS_EXTRA_ADDON_DEST)
endif
KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_BRING_UP_LATE_DEPS)
@@ -5,7 +5,7 @@ BTRFS_PROGS_SETUP_ARGS += btrfs_progs_build=True
PHONY += btrfs-progs
btrfs-progs: $(KDEVOPS_NODES)
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/btrfs-progs.yml \
--extra-vars=$(BTRFS_PROGS_SETUP_ARGS) $(LIMIT_HOSTS)
@@ -20,7 +20,7 @@ QEMU_BUILD_SETUP_ARGS += qemu_target="ppc64-softmmu"
endif
qemu: $(KDEVOPS_EXTRA_VARS)
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
-e 'ansible_python_interpreter=/usr/bin/python3' \
@@ -28,7 +28,7 @@ qemu: $(KDEVOPS_EXTRA_VARS)
PHONY += qemu
qemu-install: $(KDEVOPS_EXTRA_VARS)
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
-e 'ansible_python_interpreter=/usr/bin/python3' \
@@ -36,7 +36,7 @@ qemu-install: $(KDEVOPS_EXTRA_VARS)
PHONY += qemu-install
qemu-configure: $(KDEVOPS_EXTRA_VARS)
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
-e 'ansible_python_interpreter=/usr/bin/python3' \
@@ -44,7 +44,7 @@ qemu-configure: $(KDEVOPS_EXTRA_VARS)
PHONY += qemu-configure
qemu-build: $(KDEVOPS_EXTRA_VARS)
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
-e 'ansible_python_interpreter=/usr/bin/python3' \
@@ -14,7 +14,7 @@ HYPERVISOR_TUNING_ARGS += hypervisor_tunning_zswap_max_pool_percent=$(ZSWAP_MAX_
endif
kdevops_hypervisor_tunning: $(KDEVOPS_EXTRA_VARS)
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/hypervisor-tuning.yml \
-e 'ansible_python_interpreter=/usr/bin/python3' \
@@ -9,26 +9,26 @@ kdevops_all: kdevops_deps
PHONY := kdevops_all
kdevops_terraform_deps:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/install_terraform.yml \
-e 'ansible_python_interpreter=/usr/bin/python3'
PHONY += kdevops_terraform_deps
kdevops_vagrant_install_vagrant:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant.yml \
-e 'ansible_python_interpreter=/usr/bin/python3'
kdevops_install_libvirt:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_configuration=True" \
-e 'ansible_python_interpreter=/usr/bin/python3'
kdevops_configure_libvirt:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_install=True" \
-e 'running_user=$(USER)' \
@@ -43,7 +43,7 @@ PHONY += kdevops_vagrant_deps
KDEVOPS_VAGRANT_WORK := kdevops_vagrant_deps
kdevops_vagrant_boxes:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant_boxes.yml \
-e 'ansible_python_interpreter=/usr/bin/python3'
@@ -51,7 +51,7 @@ PHONY += kdevops_vagrant_boxes
KDEVOPS_VAGRANT_WORK += kdevops_vagrant_boxes
kdevops_verify_libvirt_user:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "only_verify_user=True" \
-e 'ansible_python_interpreter=/usr/bin/python3'
@@ -60,7 +60,7 @@ PHONY += kdevops_verify_libvirt_user
KDEVOPS_VAGRANT_WORK += kdevops_verify_libvirt_user
kdevops_libvirt_storage_pool_create:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_storage_pool_create.yml \
-e 'ansible_python_interpreter=/usr/bin/python3'
@@ -76,7 +76,7 @@ kdevops-deps: kdevops_deps
PHONY += kdevops-deps
kdevops_terraform_clean:
- @$(Q)if [ -d $(KDEVOPS_TERRAFORM_DIR) ]; then \
+ $(Q)if [ -d $(KDEVOPS_TERRAFORM_DIR) ]; then \
make -C $(KDEVOPS_TERRAFORM_DIR) clean ; \
fi
PHONY += kdevops_terraform_clean
@@ -7,7 +7,7 @@ POSTFIX_SETUP_ARGS += postfix_relay_host_setup=True
POSTFIX_SETUP_ARGS += postfix_relay_host=$(POSTFIX_RELAY_HOST)
kdevops_postfix_setup_relay: $(KDEVOPS_EXTRA_VARS)
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/postfix_relay_host.yml \
-e 'ansible_python_interpreter=/usr/bin/python3' \
@@ -8,13 +8,13 @@ clean: $(clean-subdirs)
PHONY += mrproper
mrproper:
- @$(Q)rm -rf $(CURDIR)/include/config/
- @$(Q)rm -rf $(CURDIR)/include/generated/
- @$(Q)rm -f .config
+ $(Q)rm -rf $(CURDIR)/include/config/
+ $(Q)rm -rf $(CURDIR)/include/generated/
+ $(Q)rm -f .config
version-check: include/config/project.release
- @$(Q)echo Version: $(PROJECTVERSION)
- @$(Q)echo Release: $(PROJECTRELEASE)
+ $(Q)echo Version: $(PROJECTVERSION)
+ $(Q)echo Release: $(PROJECTRELEASE)
PHONY += version-check
PHONY += help
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: copyleft-next-0.3.1
menuconfig-deps:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/install-menuconfig-deps.yml \
-e 'ansible_python_interpreter=/usr/bin/python3' \
@@ -11,39 +11,39 @@ ANSIBLE_EXTRA_ARGS += devconfig_systemd_journal_use_http='True'
endif
journal-client:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-f 30 -i hosts \
--extra-vars '{ kdevops_cli_install: True }' \
--tags vars_simple,journal \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
journal-server:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_journal_remote.yml \
-e 'ansible_python_interpreter=/usr/bin/python3'
journal-restart:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-f 30 -i hosts \
--tags vars_extra,journal-upload-restart \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
journal-status:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-f 30 -i hosts \
--tags vars_extra,journal-status \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
journal-ls:
- @$(Q)./workflows/kdevops/scripts/jounal-ls.sh /var/log/journal/remote/
+ $(Q)./workflows/kdevops/scripts/jounal-ls.sh /var/log/journal/remote/
journal-dump:
- @$(Q)./workflows/kdevops/scripts/jounal-dump.sh /var/log/journal/remote/
+ $(Q)./workflows/kdevops/scripts/jounal-dump.sh /var/log/journal/remote/
journal-ln:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-f 30 -i hosts \
--tags vars_extra,journal_ln \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
@@ -20,20 +20,20 @@ ANSIBLE_EXTRA_ARGS += devconfig_enable_systemd_timesyncd_ntp_google_debian='True
endif
timesyncd-client:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-f 30 -i hosts \
--extra-vars '{ kdevops_cli_install: True }' \
--tags vars_simple,timesyncd \
$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
timesyncd-server:
- @$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_timesyncd.yml \
-e 'ansible_python_interpreter=/usr/bin/python3'
timesyncd-status:
- @$(Q)timedatectl status
+ $(Q)timedatectl status
LOCALHOST_SETUP_WORK += timesyncd-server
@ is controlled with V=1. Silent commants are prefixed with @ which is the default value of $(Q). Replace commands where command is currently silent when used when V=1 and $(Q) is used in the command e.g. "@$(Q)". Signed-off-by: Daniel Gomez <da.gomez@samsung.com> --- Makefile | 2 +- Makefile.btrfs_progs | 2 +- Makefile.build_qemu | 8 ++++---- Makefile.hypervisor-tunings | 2 +- Makefile.kdevops | 16 ++++++++-------- Makefile.postfix | 2 +- scripts/build.Makefile | 10 +++++----- scripts/install-menuconfig-deps.Makefile | 2 +- scripts/journal-server.Makefile | 14 +++++++------- scripts/systemd-timesync.Makefile | 6 +++--- 10 files changed, 32 insertions(+), 32 deletions(-)