Skip to content

Commit

Permalink
kernel: fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Wenzel committed Apr 18, 2024
1 parent 2980850 commit 35ab3e7
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
local:
strategy:
matrix:
image: ["ubuntu:22.04", "quay.io/centos/centos:stream9"]
image: ["ubuntu:22.04"] #, "quay.io/centos/centos:stream9"]
runs-on: ubuntu-22.04
container:
image: ${{ matrix.image }}
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -1,24 +1,15 @@
- name: Install dependencies
ansible.builtin.package:
name:
- linux-base
- kmod
become: true

- name: Create temporary directory for downloaded packages
ansible.builtin.tempfile:
state: directory
register: down_dir
check_mode: false

- name: Download deb packages
- name: Download pre-built packages
ansible.builtin.get_url:
url: "{{ item }}"
dest: "{{ down_dir.path }}/{{ index }}.deb"
dest: "{{ down_dir.path }}/{{ item }}.deb"
mode: 0644
loop: "{{ kernel_deb_urls }}"
loop_control:
index_var: index
loop: "{{ kernel_urls }}"

- name: Install kAFL kernel
ansible.builtin.shell: dpkg -i "{{ down_dir.path }}"/*.deb
Expand Down
8 changes: 4 additions & 4 deletions deploy/intellabs/kafl/roles/kernel/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
- include_vars: "{{ ansible_distribution }}.yml"

- name: Import pre_tasks
ansible.builtin.import_tasks: pre_tasks.yml

- name: Install required dependencies
ansible.builtin.package:
name:
- build-essential
- dpkg
name: "{{ packages }}"
become: true

- name: Create temporary directory
Expand Down Expand Up @@ -46,5 +46,5 @@

# check if hardware_check in skip-tags -> to force CI run
- name: Install kernel if needed
ansible.builtin.import_tasks: install_kernel.yml
ansible.builtin.include_tasks: install_kernel_{{ ansible_distribution }}.yml
when: "'update_grub' in ansible_run_tags or 'hardware_check' in ansible_skip_tags or support_test.rc != 0"
2 changes: 2 additions & 0 deletions deploy/intellabs/kafl/roles/kernel/vars/CentOS.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
packages:
kernel_urls:
6 changes: 6 additions & 0 deletions deploy/intellabs/kafl/roles/kernel/vars/Ubuntu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
packages:
- dpkg
- linux-base
- kmod
kernel_urls:
- https://github.com/IntelLabs/kafl.linux/releases/download/kvm-nyx-v6.0/linux-image-6.0.0-nyx+_6.0.0-nyx+-1_amd64.deb
1 change: 0 additions & 1 deletion deploy/intellabs/kafl/roles/qemu/vars/Ubuntu.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
packages:
- pkg-config
- build-essential
- libglib2.0-dev
- libpixman-1-dev
- libgtk-3-dev

0 comments on commit 35ab3e7

Please sign in to comment.