[PATCH 01/13] qemu: rename the build_qemu component to qemu

From: Daniel Gomez <[email protected]>

Rename the QEMU-build component from build_qemu to qemu so the role
name agrees with the qemu_* variables and the qemu make targets it
already exposes (qemu, qemu-build, qemu-configure, qemu-install). The
role moves to playbooks/roles/qemu, the playbook to playbooks/qemu.yml,
and the make fragment to its canonical home scripts/qemu.Makefile, with
the top-level include and a MAINTAINERS entry updated.

The role-local build_qemu_now fact becomes qemu_build_now. The Kconfig
symbols stay QEMU_BUILD* for now, so defconfigs are unaffected.

Generated-by: Claude AI
Signed-off-by: Daniel Gomez <[email protected]>
---
 MAINTAINERS                                        |  9 +++++++++
 Makefile                                           |  2 +-
 playbooks/{build_qemu.yml => qemu.yml}             |  2 +-
 playbooks/roles/{build_qemu => qemu}/README.md     |  8 ++++----
 .../roles/{build_qemu => qemu}/defaults/main.yml   |  0
 .../tasks/install-deps/debian/main.yml             |  0
 .../tasks/install-deps/fedora/main.yml             |  0
 .../tasks/install-deps/main.yml                    |  0
 .../tasks/install-deps/redhat/main.yml             |  0
 .../tasks/install-deps/suse/main.yml               |  0
 .../roles/{build_qemu => qemu}/tasks/main.yml      | 22 +++++++++++-----------
 Makefile.build_qemu => scripts/qemu.Makefile       |  8 ++++----
 12 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 12acaca7..1064f8ee 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -183,6 +183,15 @@ F:	scripts/nixosfi_ssh_key_name.py
 F:	scripts/update_ssh_config_nixosfi.py
 N:	nixosfi
 
+QEMU
+M:	Daniel Gomez <[email protected]>
+L:	[email protected]
+S:	Maintained
+T:	git https://github.com/linux-kdevops/kdevops.git
+F:	playbooks/qemu.yml
+F:	playbooks/roles/qemu/
+F:	scripts/qemu.Makefile
+
 QEMU SYSTEM UNITS (QSU)
 M:	Daniel Gomez <[email protected]>
 L:	[email protected]
diff --git a/Makefile b/Makefile
index 314ad884..a6f4f8ca 100644
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ include scripts/install-rcloud-deps.Makefile
 include Makefile.btrfs_progs
 
 ifeq (y,$(CONFIG_QEMU_BUILD))
-include Makefile.build_qemu
+include scripts/qemu.Makefile
 endif # CONFIG_QEMU_BUILD
 
 ifeq (y,$(CONFIG_SETUP_POSTFIX_EMAIL_RELAY))
diff --git a/playbooks/build_qemu.yml b/playbooks/qemu.yml
similarity index 82%
rename from playbooks/build_qemu.yml
rename to playbooks/qemu.yml
index bca028fe..f361b2fe 100644
--- a/playbooks/build_qemu.yml
+++ b/playbooks/qemu.yml
@@ -3,4 +3,4 @@
 - name: Build and install QEMU
   hosts: localhost
   roles:
-    - role: build_qemu
+    - role: qemu
diff --git a/playbooks/roles/build_qemu/README.md b/playbooks/roles/qemu/README.md
similarity index 84%
rename from playbooks/roles/build_qemu/README.md
rename to playbooks/roles/qemu/README.md
index babcd953..f439bdca 100644
--- a/playbooks/roles/build_qemu/README.md
+++ b/playbooks/roles/qemu/README.md
@@ -1,7 +1,7 @@
-build_qemu
-==========
+qemu
+====
 
-The Ansible build-qemu role lets you get and build QEMU from source.
+The Ansible qemu role lets you get and build QEMU from source.
 This may be desirable if QEMU offers a feature which is not yet upstream,
 which is typically the case for new hardware features.
 
@@ -34,7 +34,7 @@ Below is an example playbook, say a bootlinux.yml file:
 ---
 - hosts: localhost
   roles:
-    - role: build_qemu
+    - role: qemu
 ```
 
 License
diff --git a/playbooks/roles/build_qemu/defaults/main.yml b/playbooks/roles/qemu/defaults/main.yml
similarity index 100%
rename from playbooks/roles/build_qemu/defaults/main.yml
rename to playbooks/roles/qemu/defaults/main.yml
diff --git a/playbooks/roles/build_qemu/tasks/install-deps/debian/main.yml b/playbooks/roles/qemu/tasks/install-deps/debian/main.yml
similarity index 100%
rename from playbooks/roles/build_qemu/tasks/install-deps/debian/main.yml
rename to playbooks/roles/qemu/tasks/install-deps/debian/main.yml
diff --git a/playbooks/roles/build_qemu/tasks/install-deps/fedora/main.yml b/playbooks/roles/qemu/tasks/install-deps/fedora/main.yml
similarity index 100%
rename from playbooks/roles/build_qemu/tasks/install-deps/fedora/main.yml
rename to playbooks/roles/qemu/tasks/install-deps/fedora/main.yml
diff --git a/playbooks/roles/build_qemu/tasks/install-deps/main.yml b/playbooks/roles/qemu/tasks/install-deps/main.yml
similarity index 100%
rename from playbooks/roles/build_qemu/tasks/install-deps/main.yml
rename to playbooks/roles/qemu/tasks/install-deps/main.yml
diff --git a/playbooks/roles/build_qemu/tasks/install-deps/redhat/main.yml b/playbooks/roles/qemu/tasks/install-deps/redhat/main.yml
similarity index 100%
rename from playbooks/roles/build_qemu/tasks/install-deps/redhat/main.yml
rename to playbooks/roles/qemu/tasks/install-deps/redhat/main.yml
diff --git a/playbooks/roles/build_qemu/tasks/install-deps/suse/main.yml b/playbooks/roles/qemu/tasks/install-deps/suse/main.yml
similarity index 100%
rename from playbooks/roles/build_qemu/tasks/install-deps/suse/main.yml
rename to playbooks/roles/qemu/tasks/install-deps/suse/main.yml
diff --git a/playbooks/roles/build_qemu/tasks/main.yml b/playbooks/roles/qemu/tasks/main.yml
similarity index 88%
rename from playbooks/roles/build_qemu/tasks/main.yml
rename to playbooks/roles/qemu/tasks/main.yml
index 53223fe8..94d5f023 100644
--- a/playbooks/roles/build_qemu/tasks/main.yml
+++ b/playbooks/roles/qemu/tasks/main.yml
@@ -29,12 +29,12 @@
 
 - name: Assume we won't build QEMU first
   ansible.builtin.set_fact:
-    build_qemu_now: false
+    qemu_build_now: false
   tags: vars
 
 - name: Annotate when we are building QEMU
   ansible.builtin.set_fact:
-    build_qemu_now: true
+    qemu_build_now: true
   when:
     - qemu_build|bool
     - qemu_force_install_if_present|bool or (qemu_present.stat is not defined)
@@ -46,9 +46,9 @@
     state: directory
   tags: ["qemu", "build-deps"]
   when:
-    - build_qemu_now|bool
+    - qemu_build_now|bool
 
-- name: Git clone QEMU using {{ qemu_git }} on {{ qemu_data }}
+- name: Git fetch QEMU using {{ qemu_git }} on {{ qemu_data }}
   environment:
     GIT_SSL_NO_VERIFY: true
   ansible.builtin.git:
@@ -56,7 +56,7 @@
     dest: "{{ qemu_data }}"
     version: "{{ qemu_version }}"
   when:
-    - build_qemu_now|bool
+    - qemu_build_now|bool
 
 - name: Nuke old build directory
   ansible.builtin.file:
@@ -64,7 +64,7 @@
     state: absent
   tags: ["qemu", "build-deps"]
   when:
-    - build_qemu_now|bool
+    - qemu_build_now|bool
 
 - name: Disable downloads
   ansible.builtin.command: "meson subprojects download"
@@ -72,7 +72,7 @@
   args:
     chdir: "{{ qemu_data }}"
   when:
-    - build_qemu_now|bool
+    - qemu_build_now|bool
 
 - name: Run configure for QEMU
   ansible.builtin.command: "./configure --target-list={{ qemu_target }} --disable-download"
@@ -80,14 +80,14 @@
   args:
     chdir: "{{ qemu_data }}"
   when:
-    - build_qemu_now|bool
+    - qemu_build_now|bool
 
 - name: Get nproc
   ansible.builtin.command: "{{ num_jobs }}"
   tags: ["qemu", "configure", "build"]
   register: nproc
   when:
-    - build_qemu_now|bool
+    - qemu_build_now|bool
 
 - name: Build QEMU
   community.general.make:
@@ -95,7 +95,7 @@
     jobs: "{{ nproc.stdout }}"
   tags: ["qemu", "build"]
   when:
-    - build_qemu_now|bool
+    - qemu_build_now|bool
 
 - name: Install QEMU
   become: true
@@ -106,4 +106,4 @@
     chdir: "{{ qemu_data }}"
   tags: ["qemu", "install"]
   when:
-    - build_qemu_now|bool
+    - qemu_build_now|bool
diff --git a/Makefile.build_qemu b/scripts/qemu.Makefile
similarity index 90%
rename from Makefile.build_qemu
rename to scripts/qemu.Makefile
index 44a5c24e..09442818 100644
--- a/Makefile.build_qemu
+++ b/scripts/qemu.Makefile
@@ -21,25 +21,25 @@ endif
 
 qemu: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook \
-		$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
+		$(KDEVOPS_PLAYBOOKS_DIR)/qemu.yml \
 		--extra-vars=@./extra_vars.yaml
 PHONY += qemu
 
 qemu-install: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook \
-		$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
+		$(KDEVOPS_PLAYBOOKS_DIR)/qemu.yml \
 		--extra-vars=@./extra_vars.yaml --tags vars,install
 PHONY += qemu-install
 
 qemu-configure: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook \
-		$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
+		$(KDEVOPS_PLAYBOOKS_DIR)/qemu.yml \
 		--extra-vars=@./extra_vars.yaml --tags vars,configure
 PHONY += qemu-configure
 
 qemu-build: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook \
-		$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
+		$(KDEVOPS_PLAYBOOKS_DIR)/qemu.yml \
 		--extra-vars=@./extra_vars.yaml --tags vars,build
 PHONY += qemu-build
 

-- 
2.54.0