From a09d24d8387d5120d3ad920f4079aec35ad67020 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Fri, 14 Jan 2022 18:58:09 +0100 Subject: [PATCH] linux-surface build --- defaults/main.yml | 2 + .../config/archives/linux-surface.key.chroot | 51 +++++++++++++++++++ .../config/archives/linux-surface.list.chroot | 1 + .../package-lists/linux-surface.list.chroot | 4 ++ tasks/build.yaml | 8 +++ tasks/config.yaml | 13 +++++ 6 files changed, 79 insertions(+) create mode 100644 files/linux-surface/config/archives/linux-surface.key.chroot create mode 100644 files/linux-surface/config/archives/linux-surface.list.chroot create mode 100644 files/linux-surface/config/package-lists/linux-surface.list.chroot diff --git a/defaults/main.yml b/defaults/main.yml index e01eb94..a809c35 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -23,3 +23,5 @@ live_build_desktop: false live_build_iso_publisher: custom live_build_nice_level: 14 + +live_build_linux_surface: false diff --git a/files/linux-surface/config/archives/linux-surface.key.chroot b/files/linux-surface/config/archives/linux-surface.key.chroot new file mode 100644 index 0000000..34c14ca --- /dev/null +++ b/files/linux-surface/config/archives/linux-surface.key.chroot @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +JcYSQaEgtpWZ3OhD14QVf5museDuNdfluQ== +=06Jw +-----END PGP PUBLIC KEY BLOCK----- diff --git a/files/linux-surface/config/archives/linux-surface.list.chroot b/files/linux-surface/config/archives/linux-surface.list.chroot new file mode 100644 index 0000000..2f2d383 --- /dev/null +++ b/files/linux-surface/config/archives/linux-surface.list.chroot @@ -0,0 +1 @@ +deb [arch=amd64] https://pkg.surfacelinux.com/debian release main diff --git a/files/linux-surface/config/package-lists/linux-surface.list.chroot b/files/linux-surface/config/package-lists/linux-surface.list.chroot new file mode 100644 index 0000000..f1f61da --- /dev/null +++ b/files/linux-surface/config/package-lists/linux-surface.list.chroot @@ -0,0 +1,4 @@ +linux-image-surface +linux-headers-surface +iptsd +libwacom-surface diff --git a/tasks/build.yaml b/tasks/build.yaml index c101803..6dad300 100644 --- a/tasks/build.yaml +++ b/tasks/build.yaml @@ -8,6 +8,14 @@ chdir: "{{ live_build_directory }}" register: _lb_bootstrap +- name: install ca-certificates in the chroot + command: + nice -n {{ live_build_nice_level }} + chroot "{{ live_build_directory }}/chroot" apt install -f ca-certificates + args: + chdir: "{{ live_build_directory }}" + register: _lb_chroot + - name: lb chroot (second build stage) command: nice -n {{ live_build_nice_level }} diff --git a/tasks/config.yaml b/tasks/config.yaml index 9e87228..5ff4671 100644 --- a/tasks/config.yaml +++ b/tasks/config.yaml @@ -46,6 +46,13 @@ {% endif %} --iso-publisher "{{ live_build_iso_publisher }}" + + --debootstrap-options "--include=ca-certificates" + + {% if live_build_linux_surface %} + --linux-flavours surface + {% endif %} + args: chdir: "{{ live_build_directory }}" @@ -81,3 +88,9 @@ template: src: config/includes.installer/preseed.cfg.j2 dest: "{{ live_build_directory }}/config/includes.installer/preseed.cfg" + +- name: linux-surface + copy: + src: linux-surface/ + dest: "{{ live_build_directory }}" + when: live_build_linux_surface