From 05cdbf38adc5ac4ab113dc6a15deacd6ae0d044d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 7 Mar 2023 15:28:17 +0100 Subject: [PATCH 1/6] add prefix_remove_packages --- ansible/playbooks/roles/compatibility_layer/defaults/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml index d9e657a6..5601fed1 100644 --- a/ansible/playbooks/roles/compatibility_layer/defaults/main.yml +++ b/ansible/playbooks/roles/compatibility_layer/defaults/main.yml @@ -64,6 +64,10 @@ package_sets: prefix_packages: +prefix_remove_packages: + - dev-lang/go + - dev-lang/go-bootstrap + # List of locations that should get a symlink $EPREFIX/$LOCATION -> $LOCATION. # This ensures that things like user/group ids are correct/looked up in the right way in the Prefix environment. symlinks_to_host: From 585739279610ef60c0f4d7bac633dba544988587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 7 Mar 2023 15:29:04 +0100 Subject: [PATCH 2/6] add explanation for prefix_remove_packages --- ansible/playbooks/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/playbooks/README.md b/ansible/playbooks/README.md index daadfd81..2d21fb7f 100644 --- a/ansible/playbooks/README.md +++ b/ansible/playbooks/README.md @@ -55,6 +55,7 @@ Before running the playbook, make sure the following settings are correct, and o | prefix_locales | List of locales to be generated | | package_sets | List of package sets to be installed | | prefix_packages | List of additional packages to be installed | +| prefix_remove_packages | List of packages to be removed after the bootstrap | | symlinks_to_host | List of paths that should get a symlink to the corresponding host path | ### Logging From 5e2dd81efe128dc905620f145ff89fd6b18b6653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 7 Mar 2023 15:29:50 +0100 Subject: [PATCH 3/6] task for cleanup steps --- .../playbooks/roles/compatibility_layer/tasks/cleanup.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 ansible/playbooks/roles/compatibility_layer/tasks/cleanup.yml diff --git a/ansible/playbooks/roles/compatibility_layer/tasks/cleanup.yml b/ansible/playbooks/roles/compatibility_layer/tasks/cleanup.yml new file mode 100644 index 00000000..cc0a93bc --- /dev/null +++ b/ansible/playbooks/roles/compatibility_layer/tasks/cleanup.yml @@ -0,0 +1,7 @@ +# Clean up +--- +- name: Remove redundant packages + community.general.portage: + package: "{{ item }}" + state: absent + with_items: "{{ prefix_remove_packages }}" From 6b4c8a7d27677eb04db229f8c102b20629a1179b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 7 Mar 2023 15:31:03 +0100 Subject: [PATCH 4/6] include the cleanup task --- ansible/playbooks/roles/compatibility_layer/tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/playbooks/roles/compatibility_layer/tasks/main.yml b/ansible/playbooks/roles/compatibility_layer/tasks/main.yml index 2504c77c..6166d152 100644 --- a/ansible/playbooks/roles/compatibility_layer/tasks/main.yml +++ b/ansible/playbooks/roles/compatibility_layer/tasks/main.yml @@ -45,6 +45,9 @@ - name: Create symlinks to host files ansible.builtin.include_tasks: create_host_symlinks.yml + - name: Clean up + ansible.builtin.include_tasks: cleanup.yml + - name: Test the Prefix installation ansible.builtin.include_tasks: test.yml tags: From 4577fa25b70f81742bb9e11430a401f212d5b534 Mon Sep 17 00:00:00 2001 From: trz42 Date: Mon, 3 Apr 2023 10:38:44 +0200 Subject: [PATCH 5/6] Update main.yml missing new line at end of file --- ansible/playbooks/roles/compatibility_layer/tasks/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible/playbooks/roles/compatibility_layer/tasks/main.yml b/ansible/playbooks/roles/compatibility_layer/tasks/main.yml index 28ed22eb..7558a3d1 100644 --- a/ansible/playbooks/roles/compatibility_layer/tasks/main.yml +++ b/ansible/playbooks/roles/compatibility_layer/tasks/main.yml @@ -41,4 +41,5 @@ - name: Test the Prefix installation ansible.builtin.include_tasks: test.yml tags: - - test \ No newline at end of file + - test + From 67359d2cd902bc5bed8553a0767e8252f5b57f11 Mon Sep 17 00:00:00 2001 From: trz42 Date: Mon, 3 Apr 2023 10:44:13 +0200 Subject: [PATCH 6/6] Update main.yml Remove trailing whitespaces. --- ansible/playbooks/roles/compatibility_layer/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/playbooks/roles/compatibility_layer/tasks/main.yml b/ansible/playbooks/roles/compatibility_layer/tasks/main.yml index 7558a3d1..0a93747e 100644 --- a/ansible/playbooks/roles/compatibility_layer/tasks/main.yml +++ b/ansible/playbooks/roles/compatibility_layer/tasks/main.yml @@ -42,4 +42,3 @@ ansible.builtin.include_tasks: test.yml tags: - test -