From 0be73fee39dad71d2efb34abaddfa6f66c772dbd Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 21 Aug 2018 13:52:53 +0200 Subject: renamed 'dracut-initramfs-builder' to 'slx-builder' same with the playbook including this role --- build-dracut-initramfs.yml | 5 ---- dracut-initramfs-builder/meta/main.yml | 4 --- dracut-initramfs-builder/tasks/distro.yml | 32 ------------------------ dracut-initramfs-builder/tasks/dnbd3-fixes.yml | 17 ------------- dracut-initramfs-builder/tasks/main.yml | 34 -------------------------- dracut-initramfs-builder/vars/main.yml | 2 -- slx-builder.yml | 5 ++++ slx-builder/meta/main.yml | 4 +++ slx-builder/tasks/distro.yml | 32 ++++++++++++++++++++++++ slx-builder/tasks/dnbd3-fixes.yml | 17 +++++++++++++ slx-builder/tasks/main.yml | 34 ++++++++++++++++++++++++++ slx-builder/vars/main.yml | 2 ++ 12 files changed, 94 insertions(+), 94 deletions(-) delete mode 100644 build-dracut-initramfs.yml delete mode 100644 dracut-initramfs-builder/meta/main.yml delete mode 100644 dracut-initramfs-builder/tasks/distro.yml delete mode 100644 dracut-initramfs-builder/tasks/dnbd3-fixes.yml delete mode 100644 dracut-initramfs-builder/tasks/main.yml delete mode 100644 dracut-initramfs-builder/vars/main.yml create mode 100644 slx-builder.yml create mode 100644 slx-builder/meta/main.yml create mode 100644 slx-builder/tasks/distro.yml create mode 100644 slx-builder/tasks/dnbd3-fixes.yml create mode 100644 slx-builder/tasks/main.yml create mode 100644 slx-builder/vars/main.yml diff --git a/build-dracut-initramfs.yml b/build-dracut-initramfs.yml deleted file mode 100644 index 7d940d5..0000000 --- a/build-dracut-initramfs.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: "all" - gather_facts: yes - roles: - - { role: "dracut-initramfs-builder" } diff --git a/dracut-initramfs-builder/meta/main.yml b/dracut-initramfs-builder/meta/main.yml deleted file mode 100644 index bfd43d5..0000000 --- a/dracut-initramfs-builder/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: - - { role: setup-dev-tools } - - { role: disable-selinux, when: ansible_os_family == 'RedHat' } diff --git a/dracut-initramfs-builder/tasks/distro.yml b/dracut-initramfs-builder/tasks/distro.yml deleted file mode 100644 index 2cc6f0c..0000000 --- a/dracut-initramfs-builder/tasks/distro.yml +++ /dev/null @@ -1,32 +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" -- 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/dracut-initramfs-builder/tasks/dnbd3-fixes.yml b/dracut-initramfs-builder/tasks/dnbd3-fixes.yml deleted file mode 100644 index e9bd6dd..0000000 --- a/dracut-initramfs-builder/tasks/dnbd3-fixes.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- name: Hack fix dnbd3 blk.c for Ubuntu newer kernels - replace: - dest: "{{ gittarget }}/builder/modules.d/dnbd3-rootfs/scripts/build.sh" - regexp: 'make -j4 dnbd3 dnbd3-client' - replace: 'sed -i "s/backing_dev_info.ra_pages/backing_dev_info->ra_pages/g" blk.c && make -j4 dnbd3 dnbd3-client' - backup: yes - when: - - ansible_distribution == "Ubuntu" -- name: Hack fix dnbd3 blk.h for CentOS kernels with backports - replace: - dest: "{{ gittarget }}/builder/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" diff --git a/dracut-initramfs-builder/tasks/main.yml b/dracut-initramfs-builder/tasks/main.yml deleted file mode 100644 index fe64b37..0000000 --- a/dracut-initramfs-builder/tasks/main.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -- include: tasks/distro.yml - -- name: Install dependencies for OpenSLX dracut module - package: name={{ item }} state=installed - with_items: "{{ pkgnames }}" - -- name: Checkout repository of OpenSLX dracut module - git: - repo: "{{ gitsource }}" - dest: "{{ gittarget }}" - depth: 1 - -- include: tasks/dnbd3-fixes.yml - -- name: Build initramfs with dracut - shell: "{{ gittarget }}/builder/build-initramfs.sh -s -d -p {{ gittarget }}/initramfs - --add 'kexec-reboot'" - args: - creates: "{{ gittarget }}/initramfs" - -- name: Fetch built initramfs and kernel (+ hack for weird /@ prefix of BOOT_IMAGE) - fetch: - src: "{{ item }}" - dest: "{{ playbook_dir }}/boot_files/" - fail_on_missing: yes - flat: yes - with_items: - - "{{ gittarget }}/initramfs" - - "{{ ansible_cmdline.BOOT_IMAGE | regex_replace('^/@(/boot/.*)+$', '\\1') }}" - -- name: Cleanup - file: - path: "{{ gittarget }}" - state: absent diff --git a/dracut-initramfs-builder/vars/main.yml b/dracut-initramfs-builder/vars/main.yml deleted file mode 100644 index e8f7c48..0000000 --- a/dracut-initramfs-builder/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -gitsource: "git://git.openslx.org/openslx-ng/systemd-init" -gittarget: "/opt/systemd-init" diff --git a/slx-builder.yml b/slx-builder.yml new file mode 100644 index 0000000..4b572ec --- /dev/null +++ b/slx-builder.yml @@ -0,0 +1,5 @@ +--- +- hosts: "all" + gather_facts: yes + roles: + - { role: "slx-builder" } diff --git a/slx-builder/meta/main.yml b/slx-builder/meta/main.yml new file mode 100644 index 0000000..bfd43d5 --- /dev/null +++ b/slx-builder/meta/main.yml @@ -0,0 +1,4 @@ +--- +dependencies: + - { role: setup-dev-tools } + - { role: disable-selinux, when: ansible_os_family == 'RedHat' } diff --git a/slx-builder/tasks/distro.yml b/slx-builder/tasks/distro.yml new file mode 100644 index 0000000..2cc6f0c --- /dev/null +++ b/slx-builder/tasks/distro.yml @@ -0,0 +1,32 @@ +--- +- 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" +- 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/tasks/dnbd3-fixes.yml b/slx-builder/tasks/dnbd3-fixes.yml new file mode 100644 index 0000000..e9bd6dd --- /dev/null +++ b/slx-builder/tasks/dnbd3-fixes.yml @@ -0,0 +1,17 @@ +--- +- name: Hack fix dnbd3 blk.c for Ubuntu newer kernels + replace: + dest: "{{ gittarget }}/builder/modules.d/dnbd3-rootfs/scripts/build.sh" + regexp: 'make -j4 dnbd3 dnbd3-client' + replace: 'sed -i "s/backing_dev_info.ra_pages/backing_dev_info->ra_pages/g" blk.c && make -j4 dnbd3 dnbd3-client' + backup: yes + when: + - ansible_distribution == "Ubuntu" +- name: Hack fix dnbd3 blk.h for CentOS kernels with backports + replace: + dest: "{{ gittarget }}/builder/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" diff --git a/slx-builder/tasks/main.yml b/slx-builder/tasks/main.yml new file mode 100644 index 0000000..fe64b37 --- /dev/null +++ b/slx-builder/tasks/main.yml @@ -0,0 +1,34 @@ +--- +- include: tasks/distro.yml + +- name: Install dependencies for OpenSLX dracut module + package: name={{ item }} state=installed + with_items: "{{ pkgnames }}" + +- name: Checkout repository of OpenSLX dracut module + git: + repo: "{{ gitsource }}" + dest: "{{ gittarget }}" + depth: 1 + +- include: tasks/dnbd3-fixes.yml + +- name: Build initramfs with dracut + shell: "{{ gittarget }}/builder/build-initramfs.sh -s -d -p {{ gittarget }}/initramfs - --add 'kexec-reboot'" + args: + creates: "{{ gittarget }}/initramfs" + +- name: Fetch built initramfs and kernel (+ hack for weird /@ prefix of BOOT_IMAGE) + fetch: + src: "{{ item }}" + dest: "{{ playbook_dir }}/boot_files/" + fail_on_missing: yes + flat: yes + with_items: + - "{{ gittarget }}/initramfs" + - "{{ ansible_cmdline.BOOT_IMAGE | regex_replace('^/@(/boot/.*)+$', '\\1') }}" + +- name: Cleanup + file: + path: "{{ gittarget }}" + state: absent diff --git a/slx-builder/vars/main.yml b/slx-builder/vars/main.yml new file mode 100644 index 0000000..e8f7c48 --- /dev/null +++ b/slx-builder/vars/main.yml @@ -0,0 +1,2 @@ +gitsource: "git://git.openslx.org/openslx-ng/systemd-init" +gittarget: "/opt/systemd-init" -- cgit v1.2.3-55-g7522