kernel: fix

.github/workflows/CI.yml

@@ -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 }}
@@ -93,7 +93,7 @@ jobs:
         run: > 
           make deploy --
           --skip-tags "hardware_check,kvm_device,update_grub"
-          --extra-vars "@parameters.json"
+          --extra-vars "@parameters.json" -vvvv
 
   remote:
     runs-on: ubuntu-20.04

deploy/intellabs/kafl/roles/kernel/tasks/install_kernel.yml → deploy/intellabs/kafl/roles/kernel/tasks/install_kernel_Ubuntu.yml

@@ -1,22 +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 }}/{{ index }}"
     mode: 0644
-  loop: "{{ kernel_deb_urls }}"
+  loop: "{{ kernel_urls }}"
   loop_control:
     index_var: index
 

deploy/intellabs/kafl/roles/kernel/tasks/main.yml

@@ -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
@@ -22,7 +22,7 @@
   check_mode: false
 
 - name: Compile support_test.c
-  ansible.builtin.command: |
+  ansible.builtin.shell: |
     gcc "{{ temp_compile.path }}/support_test.c" -o "{{ temp_compile.path }}/support_test"
   register: compile_result
   changed_when: false
@@ -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"

deploy/intellabs/kafl/roles/kernel/vars/CentOS.yml

@@ -0,0 +1,2 @@
+packages:
+kernel_urls:

deploy/intellabs/kafl/roles/kernel/vars/Ubuntu.yml

@@ -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

deploy/intellabs/kafl/roles/qemu/vars/Ubuntu.yml

@@ -1,6 +1,5 @@
 packages:
   - pkg-config
-  - build-essential
   - libglib2.0-dev
   - libpixman-1-dev
   - libgtk-3-dev