diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml index c3c40f026b4d..dac8ae0e21b1 100644 --- a/.github/workflows/Openwrt-AutoBuild.yml +++ b/.github/workflows/Openwrt-AutoBuild.yml @@ -120,12 +120,11 @@ jobs: -H "Authorization: Bearer ${{ secrets.REPO_TOKEN }}" \ -X POST -d '{ "query": "query {repository(owner: \"openwrt\", name: \"openwrt\") {refs(refPrefix: \"refs/tags/\", last: 4, orderBy: {field: TAG_COMMIT_DATE, direction: ASC}) {edges {node {name}}}}}"}' https://api.github.com/graphql) | jq -r '.data.repository.refs.edges[].node.name' | grep v22 | tail -n 1)" git clone $REPO_URL -b $REPO_BRANCH openwrt - [ "${{ env.REPO_BRANCH }}" ] && + if [ "${{ env.REPO_BRANCH }}" ]; then cd openwrt git checkout ${{ env.REPO_BRANCH }} + fi ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt - echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV - echo "$REPO_BRANCH" - name: Load custom configuration run: | diff --git a/devices/common/diy.sh b/devices/common/diy.sh index 4b87e2ef453d..ae8843052b7e 100644 --- a/devices/common/diy.sh +++ b/devices/common/diy.sh @@ -17,11 +17,8 @@ sed -i '/ refresh_config();/d' scripts/feeds sed -i '$a src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master' feeds.conf.default } -rm -rf package/{base-files,network/config/firewall,network/config/firewall4,network/services/dnsmasq,network/services/ppp,system/opkg,libs/mbedtls,firmware/wireless-regdb} - ./scripts/feeds update -a -./scripts/feeds install -a -p kiddin9 -./scripts/feeds install -a +./scripts/feeds install -a -p kiddin9 -f cd feeds/kiddin9; git pull; cd - mv -f feeds/kiddin9/r81* tmp/ @@ -33,7 +30,6 @@ svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/upx tools/up svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/ucl tools/ucl svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.10 target/linux/generic/hack-5.10 rm -rf target/linux/generic/hack-5.10/{220-gc_sections*,781-dsa-register*,780-drivers-net*} -curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/openwrt-22.03/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk ) & sed -i 's?zstd$?zstd ucl upx\n$(curdir)/upx/compile := $(curdir)/ucl/compile?g' tools/Makefile diff --git a/devices/common/kernel_5.15.sh b/devices/common/kernel_5.15.sh index e253ac8ae1b4..d2ec7cf2300a 100644 --- a/devices/common/kernel_5.15.sh +++ b/devices/common/kernel_5.15.sh @@ -16,13 +16,15 @@ sed -i "s?targets/%S/packages?targets/%S/$kernel_v?" include/feeds.mk sh -c "curl -sfL https://github.com/coolsnowwolf/lede/commit/06fcdca1bb9c6de6ccd0450a042349892b372220.patch | patch -d './' -p1 --forward" svn export --force https://github.com/openwrt/packages/trunk/kernel feeds/packages/kernel -svn export --force https://github.com/openwrt/packages/trunk/net/xtables-addons package/feeds/kiddin9/xtables-addons +svn export --force https://github.com/openwrt/packages/trunk/net/xtables-addons packages/net/xtables-addons svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15 rm -rf target/linux/generic/hack-5.15/{220-gc_sections*,781-dsa-register*,780-drivers-net*} +curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/openwrt-22.03/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk echo " CONFIG_TESTING_KERNEL=y CONFIG_PACKAGE_kmod-ipt-coova=n CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common=n -" >> devices/common/.config \ No newline at end of file +CONFIG_PACKAGE_kmod-pf-ring=n +" >> devices/common/.config diff --git a/devices/ipq807x/diy.sh b/devices/ipq807x/diy.sh index 1d907d26296b..3a025e871992 100644 --- a/devices/ipq807x/diy.sh +++ b/devices/ipq807x/diy.sh @@ -4,18 +4,18 @@ shopt -s extglob SHELL_FOLDER=$(dirname $(readlink -f "$0")) bash $SHELL_FOLDER/../common/kernel_5.15.sh -rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k* package/qca package/qat package/kernel +rm -rf package/boot/uboot-envtools package/firmware/ipq-wifi package/firmware/ath11k* package/qca package/qat svn export --force https://github.com/Boos4721/openwrt/trunk/package/boot/uboot-envtools package/boot/uboot-envtools svn export --force https://github.com/Boos4721/openwrt/trunk/package/firmware/ipq-wifi package/firmware/ipq-wifi svn export --force https://github.com/Boos4721/openwrt/trunk/package/firmware/ath11k-board package/firmware/ath11k-board svn export --force https://github.com/Boos4721/openwrt/trunk/package/firmware/ath11k-firmware package/firmware/ath11k-firmware svn export --force https://github.com/Boos4721/openwrt/trunk/package/qca package/qca svn export --force https://github.com/Boos4721/openwrt/trunk/package/qat package/qat -svn export --force https://github.com/Boos4721/openwrt/trunk/package/kernel package/kernel +svn export --force https://github.com/Boos4721/openwrt/trunk/package/kernel/mac80211 package/kernel/mac80211 -rm -rf target/linux/generic target/linux/ipq807x/!(patches-5.15) -svn export --force https://github.com/Boos4721/openwrt/trunk/target/linux/generic target/linux/generic -rm -rf target/linux/generic/hack-5.15/531-debloat_lzma.patch target/linux/generic/hack-5.15/600-bridge_offload.patch +svn co https://github.com/Boos4721/openwrt/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15 +svn co https://github.com/Boos4721/openwrt/trunk/target/linux/generic/pending-5.15 target/linux/generic/pending-5.15 +rm -rf target/linux/ipq807x/!(patches-5.15) svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x target/linux/ipq807x rm -rf target/linux/ipq807x/{.svn,patches-5.15/.svn} svn co https://github.com/Boos4721/openwrt/trunk/target/linux/ipq807x/patches-5.15 target/linux/ipq807x/patches-5.15 diff --git a/devices/ipq807x/patches/modules.patch b/devices/ipq807x/patches/modules.patch new file mode 100644 index 000000000000..6e5f60b2b8ff --- /dev/null +++ b/devices/ipq807x/patches/modules.patch @@ -0,0 +1,90 @@ +--- a/package/kernel/linux/modules/netsupport.mk ++++ b/package/kernel/linux/modules/netsupport.mk +@@ -1347,3 +1347,66 @@ define KernelPackage/wireguard/description + endef + + $(eval $(call KernelPackage,wireguard)) ++ ++define KernelPackage/qrtr ++ SUBMENU:=$(NETWORK_SUPPORT_MENU) ++ TITLE:=Qualcomm IPC Router support ++ HIDDEN:=1 ++ DEPENDS:=@LINUX_5_15 ++ KCONFIG:=CONFIG_QRTR ++ FILES:= \ ++ $(LINUX_DIR)/net/qrtr/qrtr.ko \ ++ $(LINUX_DIR)/net/qrtr/ns.ko ++ AUTOLOAD:=$(call AutoProbe,qrtr) ++endef ++ ++define KernelPackage/qrtr/description ++ Qualcomm IPC Router support ++endef ++ ++$(eval $(call KernelPackage,qrtr)) ++ ++define KernelPackage/qrtr-tun ++ SUBMENU:=$(NETWORK_SUPPORT_MENU) ++ TITLE:=TUN device for Qualcomm IPC Router ++ DEPENDS:=+kmod-qrtr ++ KCONFIG:=CONFIG_QRTR_TUN ++ FILES:= $(LINUX_DIR)/net/qrtr/qrtr-tun.ko ++ AUTOLOAD:=$(call AutoProbe,qrtr-tun) ++endef ++ ++define KernelPackage/qrtr-tun/description ++ TUN device for Qualcomm IPC Router ++endef ++ ++$(eval $(call KernelPackage,qrtr-tun)) ++ ++define KernelPackage/qrtr-smd ++ SUBMENU:=$(NETWORK_SUPPORT_MENU) ++ TITLE:=SMD IPC Router channels ++ DEPENDS:=+kmod-qrtr @TARGET_ipq807x ++ KCONFIG:=CONFIG_QRTR_SMD ++ FILES:= $(LINUX_DIR)/net/qrtr/qrtr-smd.ko ++ AUTOLOAD:=$(call AutoProbe,qrtr-smd) ++endef ++ ++define KernelPackage/qrtr-smd/description ++ SMD IPC Router channels ++endef ++ ++$(eval $(call KernelPackage,qrtr-smd)) ++ ++define KernelPackage/qrtr-mhi ++ SUBMENU:=$(NETWORK_SUPPORT_MENU) ++ TITLE:=MHI IPC Router channels ++ DEPENDS:=+kmod-mhi-bus +kmod-qrtr ++ KCONFIG:=CONFIG_QRTR_MHI ++ FILES:= $(LINUX_DIR)/net/qrtr/qrtr-mhi.ko ++ AUTOLOAD:=$(call AutoProbe,qrtr-mhi) ++endef ++ ++define KernelPackage/qrtr-mhi/description ++ MHI IPC Router channels ++endef ++ ++$(eval $(call KernelPackage,qrtr-mhi)) + +--- a/package/kernel/linux/modules/other.mk ++++ b/package/kernel/linux/modules/other.mk +@@ -1322,3 +1322,17 @@ define KernelPackage/mhi-pci-generic/description + endef + + $(eval $(call KernelPackage,mhi-pci-generic)) ++ ++define KernelPackage/qcom-qmi-helpers ++ SUBMENU:=$(OTHER_MENU) ++ TITLE:=Qualcomm QMI Helpers ++ KCONFIG:=CONFIG_QCOM_QMI_HELPERS ++ FILES:=$(LINUX_DIR)/drivers/soc/qcom/qmi_helpers.ko ++ AUTOLOAD:=$(call AutoProbe,qmi_helpers) ++endef ++ ++define KernelPackage/qcom-qmi-helpers/description ++ Qualcomm QMI Helpers ++endef ++ ++$(eval $(call KernelPackage,qcom-qmi-helpers)) diff --git a/devices/common/patches/video.patch b/devices/rockchip_armv8/patches/video.patch similarity index 100% rename from devices/common/patches/video.patch rename to devices/rockchip_armv8/patches/video.patch diff --git a/devices/x86_64/patches/video.patch b/devices/x86_64/patches/video.patch new file mode 100644 index 000000000000..374d959e4405 --- /dev/null +++ b/devices/x86_64/patches/video.patch @@ -0,0 +1,99 @@ +From d990f23c514708418a2222cfd20dcc3478f9a522 Mon Sep 17 00:00:00 2001 +From: kiddin9 <48883331+kiddin9@users.noreply.github.com> +Date: Mon, 23 May 2022 14:55:01 +0800 +Subject: [PATCH] Update video.mk + +--- + package/kernel/linux/modules/video.mk | 63 +++++++++++++++++++++++++-- + 1 file changed, 59 insertions(+), 4 deletions(-) + +diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk +index 2a306b5f4289..0a759dd0ebcd 100644 +--- a/package/kernel/linux/modules/video.mk ++++ b/package/kernel/linux/modules/video.mk +@@ -220,13 +220,35 @@ endef + + $(eval $(call KernelPackage,fb-tft-ili9486)) + ++define KernelPackage/multimedia-input ++ SUBMENU:=$(VIDEO_MENU) ++ TITLE:=Multimedia input support ++ DEPENDS:=+kmod-input-core ++ KCONFIG:=CONFIG_RC_CORE \ ++ CONFIG_LIRC=y \ ++ CONFIG_RC_DECODERS=y \ ++ CONFIG_RC_DEVICES=y ++ FILES:=$(LINUX_DIR)/drivers/media/rc/rc-core.ko ++ AUTOLOAD:=$(call AutoProbe,rc-core) ++endef ++ ++define KernelPackage/multimedia-input/description ++ Enable multimedia input. ++endef ++ ++$(eval $(call KernelPackage,multimedia-input)) + + define KernelPackage/drm + SUBMENU:=$(VIDEO_MENU) + TITLE:=Direct Rendering Manager (DRM) support + HIDDEN:=1 +- DEPENDS:=+kmod-dma-buf +kmod-i2c-core +PACKAGE_kmod-backlight:kmod-backlight +- KCONFIG:=CONFIG_DRM ++ DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +PACKAGE_kmod-backlight:kmod-backlight ++ KCONFIG:= \ ++ CONFIG_DRM \ ++ CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y \ ++ CONFIG_DRM_FBDEV_EMULATION=y \ ++ CONFIG_DRM_FBDEV_OVERALLOC=100 \ ++ CONFIG_HDMI + FILES:= \ + $(LINUX_DIR)/drivers/gpu/drm/drm.ko \ + $(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko +@@ -300,8 +322,6 @@ define KernelPackage/drm-imx + TITLE:=Freescale i.MX DRM support + DEPENDS:=@TARGET_imx +kmod-drm-kms-helper + KCONFIG:=CONFIG_DRM_IMX \ +- CONFIG_DRM_FBDEV_EMULATION=y \ +- CONFIG_DRM_FBDEV_OVERALLOC=100 \ + CONFIG_IMX_IPUV3_CORE \ + CONFIG_RESET_CONTROLLER=y \ + CONFIG_DRM_IMX_IPUV3 \ +@@ -1028,3 +1048,38 @@ define KernelPackage/video-gspca-konica/description + endef + + $(eval $(call KernelPackage,video-gspca-konica)) ++ ++define KernelPackage/drm-i915 ++ SUBMENU:=$(VIDEO_MENU) ++ TITLE:=Intel GPU drm support ++ DEPENDS:=@TARGET_x86 +kmod-drm-ttm +kmod-drm-kms-helper +i915-firmware ++ KCONFIG:= \ ++ CONFIG_INTEL_GTT=y \ ++ CONFIG_DRM_I915=m \ ++ CONFIG_DRM_I915_CAPTURE_ERROR=y \ ++ CONFIG_DRM_I915_COMPRESS_ERROR=y \ ++ CONFIG_DRM_I915_USERPTR=y \ ++ CONFIG_DRM_I915_GVT=y \ ++ CONFIG_DRM_I915_WERROR=n \ ++ CONFIG_DRM_I915_DEBUG=n \ ++ CONFIG_DRM_I915_DEBUG_MMIO=n \ ++ CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS=n \ ++ CONFIG_DRM_I915_SW_FENCE_CHECK_DAG=n \ ++ CONFIG_DRM_I915_DEBUG_GUC=n \ ++ CONFIG_DRM_I915_SELFTEST=n \ ++ CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS=n \ ++ CONFIG_DRM_I915_DEBUG_VBLANK_EVADE=n \ ++ CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n ++ FILES:=$(LINUX_DIR)/drivers/gpu/drm/i915/i915.ko ++ AUTOLOAD:=$(call AutoProbe,i915) ++endef ++ ++define KernelPackage/drm-i915/description ++ Direct Rendering Manager (DRM) support for "Intel Graphics ++ Media Accelerator" or "HD Graphics" integrated graphics, ++ including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G, ++ G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3, ++ Core i5, Core i7 as well as Atom CPUs with integrated graphics. ++endef ++ ++$(eval $(call KernelPackage,drm-i915))