From 51aa9130f741919c208db663d2385fe43ad215e1 Mon Sep 17 00:00:00 2001 From: Goetz Goerisch Date: Sat, 21 Sep 2024 20:00:33 +0000 Subject: [PATCH 1/3] CI: update actions/labeler to v5 * Version 5 of this action updated the runtime to Node.js 20. All scripts are now run with Node.js 20 instead of Node.js 16 and are affected by any breaking changes between Node.js 16 and 20. * adapt the labeler configuration to the new format Follow-up to #16251 this was reverted with b870c16534c05ddc94149c6ff56976d8de8a353f Link: https://github.com/openwrt/openwrt/pull/16451 Signed-off-by: Goetz Goerisch Link: https://github.com/openwrt/openwrt/pull/16451 Signed-off-by: Robert Marko --- .github/labeler.yml | 260 +++++++++++++++++++++++----------- .github/workflows/labeler.yml | 4 +- 2 files changed, 177 insertions(+), 87 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 3030d17009..8ef3088678 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,137 +1,227 @@ # target/* "target/airoha": - - "target/linux/airoha/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/airoha/**" "target/apm821xx": - - "target/linux/apm821xx/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/apm821xx/**" "target/archs38": - - "target/linux/archs38/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/archs38/**" "target/armsr": - - "target/linux/armsr/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/armsr/**" "target/at91": - - "target/linux/at91/**" - - "package/boot/at91bootstrap/**" - - "package/boot/uboot-at91/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/at91/**" + - "package/boot/at91bootstrap/**" + - "package/boot/uboot-at91/**" "target/ath79": - - "target/linux/ath79/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/ath79/**" "target/bcm27xx": - - "target/linux/bcm27xx/**" - - "package/kernel/bcm27xx-gpu-fw/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/bcm27xx/**" + - "package/kernel/bcm27xx-gpu-fw/**" "target/bcm47xx": - - "target/linux/bcm47xx/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/bcm47xx/**" "target/bcm4908": - - "target/linux/bcm4908/**" - - "package/boot/uboot-bcm4908/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/bcm4908/**" + - "package/boot/uboot-bcm4908/**" "target/bcm53xx": - - "target/linux/bcm53xx/**" - - "package/boot/uboot-bcm53xx/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/bcm53xx/**" + - "package/boot/uboot-bcm53xx/**" "target/bcm63xx": - - "target/linux/bcm63xx/**" - - "package/kernel/bcm63xx-cfe/**" - - "package/boot/arm-trusted-firmware-bcm63xx/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/bcm63xx/**" + - "package/kernel/bcm63xx-cfe/**" + - "package/boot/arm-trusted-firmware-bcm63xx/**" "target/bmips": - - "target/linux/bmips/**" - - "package/boot/uboot-bmips/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/bmips/**" + - "package/boot/uboot-bmips/**" "target/d1": - - "target/linux/d1/**" - - "package/boot/uboot-d1/**" - - "package/boot/opensbi/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/d1/**" + - "package/boot/uboot-d1/**" + - "package/boot/opensbi/**" "target/gemini": - - "target/linux/gemini/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/gemini/**" "target/imx": - - "target/linux/imx/**" - - "package/boot/imx-bootlets/**" - - "package/boot/uboot-imx/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/imx/**" + - "package/boot/imx-bootlets/**" + - "package/boot/uboot-imx/**" "target/ipq40xx": - - "target/linux/ipq40xx/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/ipq40xx/**" "target/ipq806x": - - "target/linux/ipq806x/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/ipq806x/**" "target/qualcommax": - - "target/linux/qualcommax/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/qualcommax/**" "target/kirkwood": - - "target/linux/kirkwood/**" - - "package/boot/uboot-kirkwood/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/kirkwood/**" + - "package/boot/uboot-kirkwood/**" "target/lantiq": - - "target/linux/lantiq/**" - - "package/kernel/lantiq/**" - - "package/firmware/lantiq/**" - - "package/boot/uboot-lantiq/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/lantiq/**" + - "package/kernel/lantiq/**" + - "package/firmware/lantiq/**" + - "package/boot/uboot-lantiq/**" "target/layerscape": - - "target/linux/layerscape/**" - - "package/firmware/layerscape/**" - - "package/boot/tfa-layerscape/**" - - "package/boot/uboot-layerscape/**" - - "package/network/utils/layerscape/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/layerscape/**" + - "package/firmware/layerscape/**" + - "package/boot/tfa-layerscape/**" + - "package/boot/uboot-layerscape/**" + - "package/network/utils/layerscape/**" "target/malta": - - "target/linux/malta/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/malta/**" "target/mediatek": - - "target/linux/mediatek/**" - - "package/boot/arm-trusted-firmware-mediatek/**" - - "package/boot/uboot-mediatek/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/mediatek/**" + - "package/boot/arm-trusted-firmware-mediatek/**" + - "package/boot/uboot-mediatek/**" "target/mpc85xx": - - "target/linux/mpc85xx/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/mpc85xx/**" "target/mvebu": - - "target/linux/mvebu/**" - - "package/boot/arm-trusted-firmware-mvebu/**" - - "package/boot/uboot-mvebu/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/mvebu/**" + - "package/boot/arm-trusted-firmware-mvebu/**" + - "package/boot/uboot-mvebu/**" "target/mxs": - - "target/linux/mxs/**" - - "package/boot/uboot-mxs/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/mxs/**" + - "package/boot/uboot-mxs/**" "target/octeon": - - "target/linux/octeon/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/octeon/**" "target/omap": - - "target/linux/omap/**" - - "package/boot/uboot-omap/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/omap/**" + - "package/boot/uboot-omap/**" "target/pistachio": - - "target/linux/pistachio/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/pistachio/**" "target/qoriq": - - "target/linux/qoriq/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/qoriq/**" "target/ramips": - - "target/linux/ramips/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/ramips/**" "target/realtek": - - "target/linux/realtek/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/realtek/**" "target/rockchip": - - "target/linux/rockchip/**" - - "package/boot/arm-trusted-firmware-rockchip/**" - - "package/boot/uboot-rockchip/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/rockchip/**" + - "package/boot/arm-trusted-firmware-rockchip/**" + - "package/boot/uboot-rockchip/**" "target/sifiveu": - - "target/linux/sifiveu/**" - - "package/boot/uboot-sifiveu/**" - - "package/boot/opensbi/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/sifiveu/**" + - "package/boot/uboot-sifiveu/**" + - "package/boot/opensbi/**" "target/sunxi": - - "target/linux/sunxi/**" - - "package/boot/arm-trusted-firmware-sunxi/**" - - "package/boot/uboot-sunxi/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/sunxi/**" + - "package/boot/arm-trusted-firmware-sunxi/**" + - "package/boot/uboot-sunxi/**" "target/tegra": - - "target/linux/tegra/**" - - "package/boot/uboot-tegra/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/tegra/**" + - "package/boot/uboot-tegra/**" "target/uml": - - "target/linux/uml/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/uml/**" "target/x86": - - "target/linux/x86/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/x86/**" "target/zynq": - - "target/linux/zynq/**" - - "package/boot/uboot-zynq/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/zynq/**" + - "package/boot/uboot-zynq/**" # target/imagebuilder "target/imagebuilder": - - "target/imagebuilder/**" +- changed-files: + - any-glob-to-any-file: + - "target/imagebuilder/**" # kernel "kernel": - - "target/linux/generic/**" - - "target/linux/**/config-*" - - "target/linux/**/patches-*" - - "target/linux/**/files/**" - - "package/kernel/linux/**" +- changed-files: + - any-glob-to-any-file: + - "target/linux/generic/**" + - "target/linux/**/config-*" + - "target/linux/**/patches-*" + - "target/linux/**/files/**" + - "package/kernel/linux/**" # core packages "core packages": - - "package/**" +- changed-files: + - any-glob-to-any-file: + - "package/**" # build/scripts/tools "build/scripts/tools": - - "include/**" - - "scripts/**" - - "tools/**" +- changed-files: + - any-glob-to-any-file: + - "include/**" + - "scripts/**" + - "tools/**" # toolchain "toolchain": - - "toolchain/**" +- changed-files: + - any-glob-to-any-file: + - "toolchain/**" # GitHub/CI "GitHub/CI": - - ".github/**" +- changed-files: + - any-glob-to-any-file: + - ".github/**" diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 5f82b88a50..ba35e8e1dd 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -14,7 +14,7 @@ jobs: name: Pull Request Labeler runs-on: ubuntu-latest steps: - - uses: actions/labeler@v4 + - uses: actions/labeler@v5 with: repo-token: '${{ secrets.GITHUB_TOKEN }}' @@ -25,7 +25,7 @@ jobs: echo "release-tag=$(echo ${{ github.base_ref }} | sed 's/openwrt-/release\//')" >> $GITHUB_OUTPUT fi - - uses: buildsville/add-remove-label@v2.0.0 + - uses: buildsville/add-remove-label@v2.0.1 if: ${{ steps.check-branch.outputs.release-tag }} with: token: ${{secrets.GITHUB_TOKEN}} From bffcc3c775629a24dae2a1bcbde998a66f4d83db Mon Sep 17 00:00:00 2001 From: Janusz Dziedzic Date: Tue, 24 Sep 2024 12:21:52 +0200 Subject: [PATCH 2/3] mac80211: ath12k: add PCI_SUPPORT dependency Always depend on PCI and don't build on platforms without PCI. Signed-off-by: Janusz Dziedzic Link: https://github.com/openwrt/openwrt/pull/16475 Signed-off-by: Robert Marko --- package/kernel/mac80211/ath.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index f56fd7a961..eecaef4588 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -360,7 +360,7 @@ define KernelPackage/ath12k $(call KernelPackage/mac80211/Default) TITLE:=Qualcomm 802.11be wireless chipset support URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath12k - DEPENDS+= +kmod-ath +@DRIVER_11AC_SUPPORT +@DRIVER_11AX_SUPPORT \ + DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11AC_SUPPORT +@DRIVER_11AX_SUPPORT \ +kmod-crypto-michael-mic +kmod-qrtr-mhi \ +kmod-qcom-qmi-helpers FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath12k/ath12k.ko From d84fecfaf2f140786ad4dd971c69660b1deae942 Mon Sep 17 00:00:00 2001 From: Pawel Dembicki Date: Tue, 24 Sep 2024 09:05:11 +0200 Subject: [PATCH 3/3] tfa-layerscape: fix fiptool's build Platform specified fiptool files was moved before lf-6.6.23-2.0.0 bump. But PLAT_FIPTOOL_HELPER_MK still pointed to old location. This cause problems with ls-ddr-phy build. This patch fix PLAT_FIPTOOL_HELPER_MK path. Fixes: 0ec659bd2b7e ("tfa-layerscape: Bump to lf-6.6.23-2.0.0") Signed-off-by: Pawel Dembicki Link: https://github.com/openwrt/openwrt/pull/16472 Signed-off-by: Robert Marko --- package/boot/tfa-layerscape/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/boot/tfa-layerscape/Makefile b/package/boot/tfa-layerscape/Makefile index c97dd997ff..7304df55c7 100644 --- a/package/boot/tfa-layerscape/Makefile +++ b/package/boot/tfa-layerscape/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tfa-layerscape PKG_VERSION:=6.6.23.2.0.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/nxp-qoriq/atf @@ -25,7 +25,7 @@ HOST_CFLAGS += -Wall -Werror -pedantic -std=c99 define Host/Compile $(MAKE) -C \ $(HOST_BUILD_DIR)/tools/fiptool \ - PLAT_FIPTOOL_HELPER_MK="$(HOST_BUILD_DIR)/tools/nxp/plat_fiptool/plat_fiptool.mk" \ + PLAT_FIPTOOL_HELPER_MK="$(HOST_BUILD_DIR)/tools/fiptool/plat_fiptool/nxp/plat_fiptool.mk" \ CFLAGS="$(HOST_CFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ HOSTCCFLAGS="$(HOST_CFLAGS)"