From 92ab2ebe7af1f320bd6ce9dedb44930407852568 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Tue, 30 May 2023 23:42:55 +0300 Subject: [PATCH 1/2] In uci-defaults detect a SATA controller and install needed packages --- defaults/51-waveshare | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 defaults/51-waveshare diff --git a/defaults/51-waveshare b/defaults/51-waveshare new file mode 100644 index 0000000..b014711 --- /dev/null +++ b/defaults/51-waveshare @@ -0,0 +1,14 @@ +VERSION=1 + +[ "$(uci -q get defaults.version.waveshare)" -ge "$VERSION" ] && exit + +# save version +/sbin/uci set defaults.version.waveshare="$VERSION" + +sata_device=$(lspci -d ::106) + +[ -z "$device" ] && exit + +opkg update +opkg install kmod-ata-ahci smartmontools hdparm fdisk parted \ + kmod-hwmon-drivetemp btrfs-progs kmod-fs-btrfs cryptsetup -- 2.45.1 From 45a1c1d736f49491df220024ad5301618b546218 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Wed, 7 Jun 2023 18:57:38 +0300 Subject: [PATCH 2/2] Make a separate image for waveshare --- .buildbot/openwrt/build.sh | 12 ++++++++++++ defaults/51-waveshare | 14 -------------- 2 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 defaults/51-waveshare diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh index b2872e4..2bc2cec 100755 --- a/.buildbot/openwrt/build.sh +++ b/.buildbot/openwrt/build.sh @@ -131,6 +131,18 @@ make image PROFILE=${PROFILE} \ mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-dualeth.img.gz mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-dualeth.img.gz +sed -i "s|,i2c_csi_dsi||g" ${BOOTSOURCE}/current.txt + +make image PROFILE=${PROFILE} \ + PACKAGES=" \ + ${PACKAGES} kmod-ata-ahci smartmontools hdparm fdisk parted \ + kmod-hwmon-drivetemp btrfs-progs kmod-fs-btrfs cryptsetup" \ + DISABLED_SERVICES="dropbear" FILES="files" || exit 1 + +mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-waveshare.img.gz +mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-waveshare.img.gz + + cp ${pwd}/overlays/sensing.txt ${BOOTSOURCE}/current.txt cp ${pwd}/overlays/*.dtbo ${OVERLAYSOURCE} cp config.txt ${BOOTCONFIG} diff --git a/defaults/51-waveshare b/defaults/51-waveshare deleted file mode 100644 index b014711..0000000 --- a/defaults/51-waveshare +++ /dev/null @@ -1,14 +0,0 @@ -VERSION=1 - -[ "$(uci -q get defaults.version.waveshare)" -ge "$VERSION" ] && exit - -# save version -/sbin/uci set defaults.version.waveshare="$VERSION" - -sata_device=$(lspci -d ::106) - -[ -z "$device" ] && exit - -opkg update -opkg install kmod-ata-ahci smartmontools hdparm fdisk parted \ - kmod-hwmon-drivetemp btrfs-progs kmod-fs-btrfs cryptsetup -- 2.45.1