Skip to content

Commit 3a86f2d

Browse files
committed
remove useless dtb/dtbo for edk2
1 parent 30a13a1 commit 3a86f2d

5 files changed

+1
-38
lines changed

.github/workflows/build.yml

-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ jobs:
6262
cp ../networkmanager.yaml .
6363
cp ../customize-chroot-${{ matrix.CODENAME }}.hook.chroot customize-chroot.hook.chroot
6464
cp ../10_linux .
65-
cp ../zz-rk3588-update-dtb-for-edk2 .
6665
chmod +x lb-config.sh
6766
./lb-config.sh
6867
sudo apt -y install qemu-user-static debian-archive-keyring

0001-binary_linux-image-install-dtbs.patch

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
1111
index d1877daf4..6e4b5ee3f 100755
1212
--- a/scripts/build/binary_linux-image
1313
+++ b/scripts/build/binary_linux-image
14-
@@ -62,6 +62,9 @@ mkdir -p "${DESTDIR}"
14+
@@ -62,6 +62,7 @@ mkdir -p "${DESTDIR}"
1515

1616
# Installing linux-image
1717
cp -a chroot/boot/"${LINUX}"-* "${DESTDIR}"
1818
+mkdir -p "${DESTDIR}/dtb" && cp -a chroot/usr/lib/linux-image-*/rockchip "${DESTDIR}/dtb" 2>&1 || Echo_message "Sking installing missing dtbs."
19-
+mkdir -p binary/dtb/base/ && cp -a chroot/usr/lib/linux-image-*/*/*.dtb binary/dtb/base 2>&1 || Echo_message "Sking installing missing dtbs."
20-
+mkdir -p binary/dtb/overlays/ && cp -a chroot/usr/lib/linux-image-*/rockchip/overlay/rockchip-rk3588-panthor-gpu.dtbo binary/dtb/overlays 2>&1 || Echo_message "Sking installing missing panthor dtbo."
2119
cp -a chroot/boot/initrd.img-* "${DESTDIR}" 2>&1 || Echo_message "Skip installing missing initrd."
2220

2321
case "${LB_INITRAMFS}" in

customize-chroot-bookworm.hook.chroot

-23
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,3 @@ then
99
fi
1010

1111
echo "chroot \$CHROOT /usr/bin/ssh-keygen -A" >> /usr/sbin/bootloader-config
12-
13-
cat << EOF > /usr/lib/calamares/modules/calamares-copy-dtbs.sh
14-
#!/bin/bash
15-
set -ex
16-
17-
if ! mountpoint -q /boot/efi; then
18-
mount /boot/efi || exit 1
19-
fi
20-
21-
mkdir -p /boot/efi/base
22-
mkdir -p /boot/efi/overlays
23-
cp /usr/lib/linux-image-*/rockchip/*.dtb /boot/efi/base
24-
cp /usr/lib/linux-image-*/rockchip/rockchip-rk3588-panthor-gpu.dtbo /boot/efi/overlays
25-
EOF
26-
27-
chmod +x /usr/lib/calamares/modules/calamares-copy-dtbs.sh
28-
29-
cat << EOF > /etc/calamares/modules/install-dtb.conf
30-
---
31-
shellprocess:
32-
- filename: "/usr/lib/calamares/modules/calamares-copy-dtbs.sh"
33-
timeout: 30
34-
EOF

lb-config-bookworm.sh

-2
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,3 @@ cp networkmanager.yaml config/includes.chroot_after_packages/etc/netplan
5151
cp customize-chroot.hook.chroot config/hooks/live
5252
mkdir -p config/includes.chroot_after_packages/etc/grub.d/
5353
cp 10_linux config/includes.chroot_after_packages/etc/grub.d/
54-
mkdir -p config/includes.chroot_after_packages/etc/kernel/postinst.d/
55-
cp zz-rk3588-update-dtb-for-edk2 config/includes.chroot_after_packages/etc/kernel/postinst.d/

zz-rk3588-update-dtb-for-edk2

-9
This file was deleted.

0 commit comments

Comments
 (0)