Default to src installation, drop deb install

flantel · Jul 19, 2020 · e2195b3 · e2195b3
1 parent 57d3cd0
commit e2195b3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -309,7 +309,7 @@ sudo apt-get install gcc-8 g++-8
 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8
 sudo mkdir /etc/libinput
 cd pixelbook-linux
-./run-ansible.sh -e "kernel_install_type=src"
+./run-ansible.sh
 ```
 
 The script will ask you a couple of questions, after which it will spend ~20 minutes

diff --git a/ansible/roles/eve-kernel/defaults/main.yml b/ansible/roles/eve-kernel/defaults/main.yml
@@ -4,26 +4,11 @@ main_workdir: /opt/eve-linux-setup
 login_user: vagrant # override at command line with local username
 
 # install-kernel.yml
-kernel_install_type: deb
-force_kernel_install: false 
+force_kernel_install: false
 
 eve_kernel_name: "4.4.178chromium-g4245c5e1"
 
-# vars for source build
 eve_kernel_branch: release-R80-12739.B-chromeos-4.4
 eve_kernel_compiled_name: vmlinuz-4.4.205chromium-g3c27733e
 eve_kernel_config_file: eve-R80-12739.B-chromeos-4.4.config
 eve_kernel_workdir: "{{ main_workdir }}/kernel"
-
-# vars for deb package install
-gh_base_url: "https://github.com/yusefnapora/pixelbook-linux/releases/download"
-gh_release: "v0.1"
-gh_deb_base_url: "{{ gh_base_url }}/{{ gh_release }}/"
-kernel_deb_revision: "{{ eve_kernel_name }}"
-kernel_deb_arch: "{{ kernel_deb_revision }}_{{ kernel_deb_revision }}_amd64"
-kernel_image_deb: "{{ gh_deb_base_url }}/linux-image-{{ kernel_deb_arch }}.deb"
-kernel_debug_deb: "{{ gh_deb_base_url }}/linux-image-{{ kernel_deb_revision }}-dbg_{{ kernel_deb_revision }}_amd64.deb"
-kernel_headers_deb: "{{ gh_deb_base_url }}/linux-headers-{{ kernel_deb_arch }}.deb"
-kernel_firmware_deb: "{{ gh_deb_base_url }}/linux-firmware-image-{{ kernel_deb_arch }}.deb"
-kernel_libc_dev_deb: "{{ gh_deb_base_url }}/linux-libc-dev_{{ kernel_deb_revision }}_amd64.deb"
-
diff --git a/ansible/roles/eve-kernel/tasks/kernel-tasks-deb.yml b/ansible/roles/eve-kernel/tasks/kernel-tasks-deb.yml
diff --git a/ansible/roles/eve-kernel/tasks/main.yml b/ansible/roles/eve-kernel/tasks/main.yml
@@ -14,7 +14,7 @@
 
 - name: Install chromium fork of linux kernel
   when: kernel_pre_installed is failed or force_kernel_install
-  include_tasks: "kernel-tasks-{{ kernel_install_type }}.yml"
+  include_tasks: "kernel-tasks-src.yml"
 
 - name: Check if we've set the default kernel already
   become: true