Skip to content

Commit 35ab3e7

Browse files
committed
kernel: fix
1 parent 2980850 commit 35ab3e7

File tree

7 files changed

+16
-18
lines changed

7 files changed

+16
-18
lines changed

Diff for: .github/workflows/CI.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
local:
6161
strategy:
6262
matrix:
63-
image: ["ubuntu:22.04", "quay.io/centos/centos:stream9"]
63+
image: ["ubuntu:22.04"] #, "quay.io/centos/centos:stream9"]
6464
runs-on: ubuntu-22.04
6565
container:
6666
image: ${{ matrix.image }}

Diff for: deploy/intellabs/kafl/roles/kernel/tasks/install_kernel_CentOS.yml

Whitespace-only changes.

Diff for: deploy/intellabs/kafl/roles/kernel/tasks/install_kernel.yml renamed to deploy/intellabs/kafl/roles/kernel/tasks/install_kernel_Ubuntu.yml

+3-12
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
1-
- name: Install dependencies
2-
ansible.builtin.package:
3-
name:
4-
- linux-base
5-
- kmod
6-
become: true
7-
81
- name: Create temporary directory for downloaded packages
92
ansible.builtin.tempfile:
103
state: directory
114
register: down_dir
125
check_mode: false
136

14-
- name: Download deb packages
7+
- name: Download pre-built packages
158
ansible.builtin.get_url:
169
url: "{{ item }}"
17-
dest: "{{ down_dir.path }}/{{ index }}.deb"
10+
dest: "{{ down_dir.path }}/{{ item }}.deb"
1811
mode: 0644
19-
loop: "{{ kernel_deb_urls }}"
20-
loop_control:
21-
index_var: index
12+
loop: "{{ kernel_urls }}"
2213

2314
- name: Install kAFL kernel
2415
ansible.builtin.shell: dpkg -i "{{ down_dir.path }}"/*.deb

Diff for: deploy/intellabs/kafl/roles/kernel/tasks/main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
- include_vars: "{{ ansible_distribution }}.yml"
2+
13
- name: Import pre_tasks
24
ansible.builtin.import_tasks: pre_tasks.yml
35

46
- name: Install required dependencies
57
ansible.builtin.package:
6-
name:
7-
- build-essential
8-
- dpkg
8+
name: "{{ packages }}"
99
become: true
1010

1111
- name: Create temporary directory
@@ -46,5 +46,5 @@
4646

4747
# check if hardware_check in skip-tags -> to force CI run
4848
- name: Install kernel if needed
49-
ansible.builtin.import_tasks: install_kernel.yml
49+
ansible.builtin.include_tasks: install_kernel_{{ ansible_distribution }}.yml
5050
when: "'update_grub' in ansible_run_tags or 'hardware_check' in ansible_skip_tags or support_test.rc != 0"

Diff for: deploy/intellabs/kafl/roles/kernel/vars/CentOS.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
packages:
2+
kernel_urls:

Diff for: deploy/intellabs/kafl/roles/kernel/vars/Ubuntu.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
packages:
2+
- dpkg
3+
- linux-base
4+
- kmod
5+
kernel_urls:
6+
- 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

Diff for: deploy/intellabs/kafl/roles/qemu/vars/Ubuntu.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
packages:
22
- pkg-config
3-
- build-essential
43
- libglib2.0-dev
54
- libpixman-1-dev
65
- libgtk-3-dev

0 commit comments

Comments
 (0)