From fe373ece81c151f958209883ff54d29f949be86f Mon Sep 17 00:00:00 2001 From: sose Date: Wed, 30 Sep 2020 01:31:43 +0000 Subject: [PATCH 1/6] Update 'readme.md' --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index e714c99..4f78ebd 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,7 @@ # lb-config -[![Build Status](https://drone.tilde.club/api/badges/tildelinux/lb-config/status.svg)](https://drone.tilde.club/tildelinux/lb-config) +[![Build Status](https://drone.tildelinux.org/api/badges/tildelinux/lb-config/status.svg)](https://drone.tildelinux.org/tildelinux/lb-config) -latest successfuly built image [here](https://drone.tilde.club/builds/tildelinux) +latest successfuly built image [here](https://drone.tildelinux.org/builds/tildelinux) live-build chroot and config files for tildelinux From a8ee0cd2f6a687f73121021b4b07321d4864d768 Mon Sep 17 00:00:00 2001 From: sose Date: Tue, 2 Feb 2021 22:53:35 -0800 Subject: [PATCH 2/6] uefi support --- .drone.yml | 2 ++ sluefi.sh | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100755 sluefi.sh diff --git a/.drone.yml b/.drone.yml index fe27fc9..edabbb7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -72,10 +72,12 @@ steps: - apt-get update - apt-get install -y live-build - apt-get install -y git + - apt-get install -y syslinux-efi - lb config - rm -r config - git clone --recurse-submodules -b testing https://tildegit.org/tildelinux/lb-config config - lb build + - config/sluefi.sh live-image-amd64.img - mv live-image-amd64.img /tl-builds/testing/tildelinux-testing.img - name: build_img_nopersist image: debian:buster diff --git a/sluefi.sh b/sluefi.sh new file mode 100755 index 0000000..eb8e315 --- /dev/null +++ b/sluefi.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# sluefi.sh - adds a syslinux efi bootloader to a live-build image + +[ "$(whoami)" != "root" ] && echo "You must be root to use this script." && exit + +image_name="$1" +[ -z $image_name ] && echo "Specify a disk image." && exit +! [ -f "$image_name" ] && echo "$image_name is not a file." && exit + +echo "Adding EFI support to $image_name..." + +loop_device="$(losetup --show -f -P $image_name)" +esp="$(mktemp -d)" + +mount -o loop "$loop_device"p1 "$esp" +mkdir -p "$esp/EFI/BOOT" +cp "/usr/lib/SYSLINUX.EFI/efi64/syslinux.efi" "$esp/EFI/BOOT/BOOTX64.efi" +cp "$esp/syslinux/"*.cfg "$esp/EFI/BOOT" +cp "$esp/syslinux/splash.png" "$esp/EFI/BOOT" +cp "/usr/lib/syslinux/modules/efi64/"* "$esp/EFI/BOOT" +echo "Done." +umount "$esp" +rmdir "$esp" +losetup -d "$loop_device" From 3fb9bc3d90136cfaeee5572666cb181242ce292f Mon Sep 17 00:00:00 2001 From: sose Date: Wed, 3 Feb 2021 13:55:09 -0800 Subject: [PATCH 3/6] removed old uefi solution --- .drone.yml | 2 -- sluefi.sh | 24 ------------------------ 2 files changed, 26 deletions(-) delete mode 100755 sluefi.sh diff --git a/.drone.yml b/.drone.yml index edabbb7..fe27fc9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -72,12 +72,10 @@ steps: - apt-get update - apt-get install -y live-build - apt-get install -y git - - apt-get install -y syslinux-efi - lb config - rm -r config - git clone --recurse-submodules -b testing https://tildegit.org/tildelinux/lb-config config - lb build - - config/sluefi.sh live-image-amd64.img - mv live-image-amd64.img /tl-builds/testing/tildelinux-testing.img - name: build_img_nopersist image: debian:buster diff --git a/sluefi.sh b/sluefi.sh deleted file mode 100755 index eb8e315..0000000 --- a/sluefi.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# sluefi.sh - adds a syslinux efi bootloader to a live-build image - -[ "$(whoami)" != "root" ] && echo "You must be root to use this script." && exit - -image_name="$1" -[ -z $image_name ] && echo "Specify a disk image." && exit -! [ -f "$image_name" ] && echo "$image_name is not a file." && exit - -echo "Adding EFI support to $image_name..." - -loop_device="$(losetup --show -f -P $image_name)" -esp="$(mktemp -d)" - -mount -o loop "$loop_device"p1 "$esp" -mkdir -p "$esp/EFI/BOOT" -cp "/usr/lib/SYSLINUX.EFI/efi64/syslinux.efi" "$esp/EFI/BOOT/BOOTX64.efi" -cp "$esp/syslinux/"*.cfg "$esp/EFI/BOOT" -cp "$esp/syslinux/splash.png" "$esp/EFI/BOOT" -cp "/usr/lib/syslinux/modules/efi64/"* "$esp/EFI/BOOT" -echo "Done." -umount "$esp" -rmdir "$esp" -losetup -d "$loop_device" From ff315fb8075061a637eae8e14e97da09ce34f11d Mon Sep 17 00:00:00 2001 From: sose Date: Wed, 3 Feb 2021 13:55:36 -0800 Subject: [PATCH 4/6] added functional syslinux uefi hook --- hooks/live/0060-configure-syslinux-efi.hook.binary | 7 +++++++ readme.md | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100755 hooks/live/0060-configure-syslinux-efi.hook.binary diff --git a/hooks/live/0060-configure-syslinux-efi.hook.binary b/hooks/live/0060-configure-syslinux-efi.hook.binary new file mode 100755 index 0000000..50939aa --- /dev/null +++ b/hooks/live/0060-configure-syslinux-efi.hook.binary @@ -0,0 +1,7 @@ +#!/bin/sh +echo "Configuring Syslinux EFI bootloader..." +mkdir -p "EFI/BOOT" +cp "/usr/lib/SYSLINUX.EFI/efi64/syslinux.efi" "EFI/BOOT/BOOTX64.efi" +cp "/usr/lib/syslinux/modules/efi64/"* "EFI/BOOT" +cp "syslinux/"*.cfg "EFI/BOOT" +cp "syslinux/splash.png" "EFI/BOOT" diff --git a/readme.md b/readme.md index 4f78ebd..bc1ad3e 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ live-build chroot and config files for tildelinux this is where the magic happens ## manual building -1. `sudo apt install live-build` +1. `sudo apt install live-build syslinux` 2. `mkdir tildelinux && cd tildelinux` 3. `lb config` 4. `rm -r config` From f531e6c6f86eb32f6db9692ba34b8b9d65849648 Mon Sep 17 00:00:00 2001 From: sose Date: Wed, 3 Feb 2021 22:26:35 +0000 Subject: [PATCH 5/6] fixed package name --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index bc1ad3e..91ca276 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ live-build chroot and config files for tildelinux this is where the magic happens ## manual building -1. `sudo apt install live-build syslinux` +1. `sudo apt install live-build syslinux-efi` 2. `mkdir tildelinux && cd tildelinux` 3. `lb config` 4. `rm -r config` From df71f3906d2adb3f657122582d469a91e6ed51ee Mon Sep 17 00:00:00 2001 From: sose Date: Wed, 3 Feb 2021 16:35:59 -0800 Subject: [PATCH 6/6] install syslinux-efi in drone environment --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index fe27fc9..7a18eec 100644 --- a/.drone.yml +++ b/.drone.yml @@ -71,6 +71,7 @@ steps: commands: - apt-get update - apt-get install -y live-build + - apt-get install -y syslinux-efi - apt-get install -y git - lb config - rm -r config @@ -90,6 +91,7 @@ steps: commands: - apt-get update - apt-get install -y live-build + - apt-get install -y syslinux-efi - apt-get install -y git - lb clean - cd config