Moves distro_specific to better location

Signed-off-by: Thiago Abdo <tjabdo@inf.ufpr.br>

6 files changed, 32 insertions, 70 deletions

diff --git a/slx-builder/files/distro_specific/distro.yml b/slx-builder/files/distro_specific/distro.yml
deleted file mode 100644
index 412062f..0000000
--- a/slx-builder/files/distro_specific/distro.yml
+++ /dev/null
@@ -1,53 +0,0 @@
----
-- set_fact:
-    pkgnames:
-      - kernel-devel
-      - fuse-devel
-      - jansson-devel
-      - glib2-devel
-      - pixman-devel
-      - libewf-devel
-      - afflib-devel
-      - device-mapper
-      - wget
-      - systemd-networkd
-      - systemd-resolved
-      - kexec-tools
-      - kmod-devel
-  when:
-      - ansible_distribution == "CentOS"
-      - ansible_distribution_major_version|int < 8
-- set_fact:
-    pkgnames:
-      - kernel-devel
-      - fuse-devel
-      - jansson-devel
-      - glib2-devel
-      - pixman-devel
-      - device-mapper
-      - wget
-      - kexec-tools
-      - kmod-devel
-      - http://download-ib01.fedoraproject.org/pub/fedora/linux/releases/29/Everything/x86_64/os/Packages/l/libewf-20140608-12.fc29.x86_64.rpm
-      - http://download-ib01.fedoraproject.org/pub/fedora/linux/releases/29/Everything/x86_64/os/Packages/l/libewf-devel-20140608-12.fc29.x86_64.rpm
-      - http://download-ib01.fedoraproject.org/pub/fedora/linux/updates/29/Everything/x86_64/Packages/a/afflib-3.7.18-2.fc29.x86_64.rpm
-      - http://download-ib01.fedoraproject.org/pub/fedora/linux/updates/29/Everything/x86_64/Packages/a/afflib-devel-3.7.18-2.fc29.x86_64.rpm
-      - elfutils-libelf-devel
-      - python2
-  when:
-      - ansible_distribution == "CentOS"
-      - ansible_distribution_major_version == "8"
-- set_fact:
-    pkgnames:
-      - libfuse-dev
-      - libglib2.0-dev
-      - libpixman-1-dev
-      - libewf-dev
-      - libafflib-dev
-      - libjansson-dev
-      - dmsetup
-      - iputils-arping
-      - kexec-tools
-      - libkmod-dev
-  when:
-      - ansible_distribution == "Ubuntu"
diff --git a/slx-builder/files/distro_specific/dnbd3-fixes.yml b/slx-builder/files/distro_specific/dnbd3-fixes.yml
deleted file mode 100644
index 81cf2d8..0000000
--- a/slx-builder/files/distro_specific/dnbd3-fixes.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: Hack fix dnbd3 blk.h for CentOS kernels with backports
-  replace:
-    dest: "{{ builder_path | dirname }}/modules.d/dnbd3-rootfs/scripts/build.sh"
-    regexp: 'make -j4 dnbd3 dnbd3-client'
-    replace: 'sed -i "s/KERNEL_VERSION.*/KERNEL_VERSION\(3, 10, 0\)/g" blk.h && make -j4 dnbd3 dnbd3-client'
-    backup: yes
-  when:
-    - ansible_distribution == "CentOS"
-    - ansible_distribution_major_version|int < 8
diff --git a/slx-builder/tasks/distro/CentOS-7.yml b/slx-builder/tasks/distro/CentOS-7.yml
new file mode 100644
index 0000000..ec20920
--- /dev/null
+++ b/slx-builder/tasks/distro/CentOS-7.yml
@@ -0,0 +1,28 @@
+---
+- name: CentOS-7 | Install packages
+  yum:
+     name: "{{ packages }}"
+     state: latest
+     update_cache: yes
+  vars:
+     packages:
+       - kernel-devel
+       - fuse-devel
+       - jansson-devel
+       - glib2-devel
+       - pixman-devel
+       - libewf-devel
+       - afflib-devel
+       - device-mapper
+       - wget
+       - systemd-networkd
+       - systemd-resolved
+       - kexec-tools
+       - kmod-devel
+
+- name: CentOS-7 | Hack fix dnbd3 blk.h for CentOS kernels with backports
+  replace:
+    dest: "{{ builder_path | dirname }}/modules.d/dnbd3-rootfs/scripts/build.sh"
+    regexp: 'make -j4 dnbd3 dnbd3-client'
+    replace: 'sed -i "s/KERNEL_VERSION.*/KERNEL_VERSION\(3, 10, 0\)/g" blk.h && make -j4 dnbd3 dnbd3-client'
+    backup: yes
diff --git a/slx-builder/files/distro_specific/CentOS-8.yml b/slx-builder/tasks/distro/CentOS-8.yml
index 08cfe8b..02d3e0e 100644
--- a/slx-builder/files/distro_specific/CentOS-8.yml
+++ b/slx-builder/tasks/distro/CentOS-8.yml
@@ -1,8 +1,5 @@
 ---
-- name: Enable powerTools in CentOS 8
-  command: dnf config-manager --set-enabled PowerTools
-
-- name: CentOS8 | Install packages
+- name: CentOS-8 | Install packages
   yum:
      name: "{{ packages }}"
      state: latest
diff --git a/slx-builder/files/distro_specific/Ubuntu-18.yml b/slx-builder/tasks/distro/Ubuntu-18.yml
index 4e310c8..4e310c8 100644
--- a/slx-builder/files/distro_specific/Ubuntu-18.yml
+++ b/slx-builder/tasks/distro/Ubuntu-18.yml
diff --git a/slx-builder/tasks/install.yml b/slx-builder/tasks/install.yml
index 647f186..fd59310 100644
--- a/slx-builder/tasks/install.yml
+++ b/slx-builder/tasks/install.yml
@@ -32,9 +32,9 @@
 - name: OpenSLX dracut | Get distro specific tasks
   include_tasks: "{{ item }}"
   with_first_found:
-      - "files/distro_specific/{{ ansible_distribution }}-{{ ansible_distribution_version}}.yml"
-      - "files/distro_specific/{{ ansible_distribution }}-{{ ansible_distribution_major_version}}.yml"
-      - "files/distro_specific/{{ ansible_distribution }}.yml"
+      - "tasks/distro/{{ ansible_distribution }}-{{ ansible_distribution_version}}.yml"
+      - "tasks/distro/{{ ansible_distribution }}-{{ ansible_distribution_major_version}}.yml"
+      - "tasks/distro/{{ ansible_distribution }}.yml"
 
 - name: OpenSLX dracut | Initialize repository
   shell: "{{ builder_path }} --init"