From fa72cb61398bc7e3819d8a07941da2059d8c6dc7 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Mon, 9 Sep 2024 19:35:44 +0200 Subject: [PATCH] Include kmod-thermal package into BPI-R4 images Without that, when CONFIG_ALL_KMODS=y is set, it got an error that kmod-hwmon-pwmfan requires kmod-thermal, but it is not available. --- .github/workflows/bpi-r4-BE14.yaml | 2 +- configs/mediatek/mt7988a/bpi-r4 | 3 +++ configs/mediatek/mt7988a/bpi-r4-optimized | 3 +++ configs/mediatek/mt7988a/bpi-r4-simple | 2 -- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bpi-r4-BE14.yaml b/.github/workflows/bpi-r4-BE14.yaml index f469261..bcde428 100644 --- a/.github/workflows/bpi-r4-BE14.yaml +++ b/.github/workflows/bpi-r4-BE14.yaml @@ -59,7 +59,7 @@ jobs: curl -LO https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/patches/0001-Add-kmod-thermal-for-BPI-R4.patch git apply --check 0001-Add-kmod-thermal-for-BPI-R4.patch git am --keep-cr --signoff < 0001-Add-kmod-thermal-for-BPI-R4.patch - +# # - name: Add OpenWRT remote and update # run: | # git remote add omain https://github.com/openwrt/openwrt diff --git a/configs/mediatek/mt7988a/bpi-r4 b/configs/mediatek/mt7988a/bpi-r4 index d4e683a..d5adb5f 100644 --- a/configs/mediatek/mt7988a/bpi-r4 +++ b/configs/mediatek/mt7988a/bpi-r4 @@ -26,3 +26,6 @@ CONFIG_PACKAGE_blockd=m CONFIG_PACKAGE_mtdev=m CONFIG_PACKAGE_kmod-mtd-rw=y CONFIG_PACKAGE_kmod-veth=y + +# avoid error when: CONFIG_ALL_KMODS=y +CONFIG_PACKAGE_kmod-thermal=y diff --git a/configs/mediatek/mt7988a/bpi-r4-optimized b/configs/mediatek/mt7988a/bpi-r4-optimized index f8dc16f..20828ca 100644 --- a/configs/mediatek/mt7988a/bpi-r4-optimized +++ b/configs/mediatek/mt7988a/bpi-r4-optimized @@ -27,6 +27,9 @@ CONFIG_PACKAGE_mtdev=m CONFIG_PACKAGE_kmod-mtd-rw=y CONFIG_PACKAGE_kmod-veth=y +# avoid error when: CONFIG_ALL_KMODS=y +CONFIG_PACKAGE_kmod-thermal=y + CONFIG_DEVEL=y CONFIG_TARGET_OPTIONS=y CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -mcpu=cortex-a73+crc+crypto+rdma" diff --git a/configs/mediatek/mt7988a/bpi-r4-simple b/configs/mediatek/mt7988a/bpi-r4-simple index 0fb92a0..c2d943c 100644 --- a/configs/mediatek/mt7988a/bpi-r4-simple +++ b/configs/mediatek/mt7988a/bpi-r4-simple @@ -1,7 +1,5 @@ # # curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7988a/bpi-r4 > .config -# later, eg.: -# curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/main-router >> .config # CONFIG_TARGET_mediatek=y