Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@kiddin9
kiddin9 committed Jun 2, 2023
1 parent 7d7f735 commit e67d7b3
Show file tree
Hide file tree
Showing 19 changed files with 554 additions and 32 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/Openwrt-AutoBuild.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,8 @@ jobs:
- name: Trigger Packages Update
continue-on-error: true
run: |
gitdate=$(curl -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].created_at')
gitdate=$(date -d "$gitdate" +%s)
now=$(date -d "$(date)" +%s)
if [[ $(expr $gitdate + 300) < $now ]]; then
status=$(curl -H "Authorization: token ${{ secrets.REPO_TOKEN }} -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')
if [[ "$status" == "completed" ]]; then
curl -X POST https://api.github.com/repos/kiddin9/openwrt-packages/dispatches \
-H "Accept: application/vnd.github.everest-preview+json" \
-H "Authorization: token ${{ secrets.REPO_TOKEN }}" \
Expand Down
2 changes: 1 addition & 1 deletion devices/armvirt_64/diy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))



sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += perl btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-mbedtls iw -luci-app-attendedsysupgrade -luci-app-gpsysupgrade fdisk lsblk/' target/linux/armvirt/Makefile
sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += -luci-app-attendedsysupgrade -luci-app-gpsysupgrade/' target/linux/armvirt/Makefile


2 changes: 1 addition & 1 deletion devices/armvirt_64/patches/rootfs.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
+define Device/box
+ DEVICE_VENDOR :=
+ DEVICE_MODEL := 电视盒子全系列 / N1
+ DEVICE_PACKAGES :=
+ DEVICE_PACKAGES := perlbase-base btrfs-progs luci-app-amlogic kmod-brcmfmac wpad-basic-mbedtls iw fdisk lsblk
+endef
+TARGET_DEVICES += box
+
Expand Down
5 changes: 0 additions & 5 deletions devices/common/diy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ sed -i "s/192.168.1/10.0.0/" package/feeds/kiddin9/base-files/files/bin/config_g
sed -i "s/192.168.1/10.0.0/" package/base-files/files/bin/config_generate

(
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*,996-fs-ntfs3*,100-update-mtk_wed_h.patch}

svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15
svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/backport-5.15 target/linux/generic/backport-5.15
find target/linux/generic/backport-5.15 -name "[0-9][0-9][0-9]-[a-z][a-z]*" -exec rm -f {} \;
Expand All @@ -51,8 +48,6 @@ curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linu
sed -i "s/CONFIG_WERROR=y/CONFIG_WERROR=n/" target/linux/generic/config-5.15
) &

curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-5.10/613-netfilter_optional_tcp_window_check.patch

sed -i "/BuildPackage,miniupnpd-iptables/d" feeds/packages/net/miniupnpd/Makefile
sed -i 's/Os/O2/g' include/target.mk
sed -i "/mediaurlbase/d" package/feeds/*/luci-theme*/root/etc/uci-defaults/*
Expand Down
2 changes: 1 addition & 1 deletion devices/common/patches/imagebuilder.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG)
mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR)
+ if [[ "$(USER_PROFILE)" =~ (DEVICE_phicomm_k2p|DEVICE_asus_rt-n56u-b1|DEVICE_thunder_timecloud|DEVICE_youku_yk-l2|DEVICE_youhua_wr1200js|DEVICE_oraybox_x3a|DEVICE_netgear_wndr3700-v5|DEVICE_xiaomi_mi-router-4a-gigabit|DEVICE_xiaomi_mi-router-4a-gigabit-v2|DEVICE_xiaomi_mi-router-3g-v2|DEVICE_jcg_y2|DEVICE_glinet_gl-mt300a|DEVICE_glinet_gl-mt750|DEVICE_hiwifi_hc5661|DEVICE_hiwifi_hc5761|DEVICE_hiwifi_hc5861|DEVICE_lenovo_newifi-y1|DEVICE_lenovo_newifi-y1s|DEVICE_xiaomi_miwifi-mini|DEVICE_youku_yk-l1c|DEVICE_jdcloud_luban|DEVICE_zte_e8820v2) || "$(TARGETID)" == "ramips/mt76x8" ]]; then \
+ echo "src/gz openwrt_smflash https://op.supes.top/packages/mipsel_24kc/small_flash" >>$(TOPDIR)/repositories.conf; \
+ echo "src/gz openwrt_smflash https://op.supes.top/packages/small_flash" >>$(TOPDIR)/repositories.conf; \
+ else \
+ sed -i "/smflash/d" $(TOPDIR)/repositories.conf; \
+ fi
Expand Down
5 changes: 3 additions & 2 deletions devices/ipq50xx_arm/diy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ shopt -s extglob

SHELL_FOLDER=$(dirname $(readlink -f "$0"))

rm -rf package/feeds/kiddin9/rtl* feeds/kiddin9/{shortcut-fe,fullconenat-nft} package/kernel/mt76 package/kernel/exfat package/feeds/packages/fuse*
rm -rf package/feeds/kiddin9/rtl* feeds/kiddin9/{shortcut-fe,fullconenat-nft} package/kernel/mt76 package/kernel/exfat package/feeds/packages/fuse* package/feeds/luci/ucode-mod-html package/feeds/luci/rpcd-mod-luci

rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}

Expand All @@ -13,4 +13,5 @@ rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/fe
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/ucode package/utils/ucode
#ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
2 changes: 1 addition & 1 deletion devices/ipq50xx_arm/feeds.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
src-git luci https://github.com/openwrt/luci.git;openwrt-22.03
src-git luci https://github.com/openwrt/luci.git;openwrt-23.05
src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
5 changes: 3 additions & 2 deletions devices/ipq807x_ipq60xx/diy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ rm -rf package/kernel/exfat

rm -rf devices/common/patches/{glinet,fix.patch,iptables.patch,targets.patch,kernel-defaults.patch,disable_flock.patch}

rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl package/feeds/luci/ucode-mod-html package/feeds/luci/rpcd-mod-luci

svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/ucode package/utils/ucode
#ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
2 changes: 1 addition & 1 deletion devices/ipq807x_ipq60xx/feeds.conf
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
src-git luci https://github.com/openwrt/luci.git;openwrt-22.03
src-git luci https://github.com/openwrt/luci.git;openwrt-23.05
src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
src-git gl_feeds_common https://github.com/gl-inet/gl-feeds.git;common
Expand Down
5 changes: 3 additions & 2 deletions devices/mediatek_mt7981/diy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,ta

sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2024-12-06/" package/network/config/netifd/Makefile

rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl package/feeds/luci/ucode-mod-html package/feeds/luci/rpcd-mod-luci

svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/ucode package/utils/ucode
#ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
2 changes: 1 addition & 1 deletion devices/mediatek_mt7981/feeds.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
src-git luci https://github.com/openwrt/luci.git;openwrt-22.03
src-git luci https://github.com/openwrt/luci.git;openwrt-23.05
src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
14 changes: 14 additions & 0 deletions devices/mediatek_mt7981/patches/fix.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,17 @@
],
stdout=PIPE,
stderr=PIPE,

--- a/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
+++ b/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
@@ -581,9 +581,7 @@ <h2><%:Interface Configurations%> - <%=vifname and devname.."@"..vifname or devn
</table>
<h3><%:Access control MAC address list%></h3>
<textarea name="__maclist" id="__maclist" style="width:98%; height: 100px;"><%
- local list = cfgs["AccessControlList"..(vifidx-1)] or ""
- print(table.concat(list:split(";"), "\n"))
- %></textarea>
+ local list = cfgs["AccessControlList"..(vifidx-1)] or "" %><%=table.concat(list:split(";"), "\n")%></textarea>
</fieldset>

<% if string.split(cfgs.WirelessMode,";")[1] == "16" or string.split(cfgs.WirelessMode,";")[1] == "17" or string.split(cfgs.WirelessMode,";")[1] == "18" then %>
5 changes: 3 additions & 2 deletions devices/mediatek_mt7986/diy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2024-12-06/" package/network/conf

rm -rf devices/common/patches/{glinet,fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}

rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
rm -rf toolchain/musl package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl package/feeds/luci/ucode-mod-html package/feeds/luci/rpcd-mod-luci

svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/ucode package/utils/ucode
#ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
2 changes: 1 addition & 1 deletion devices/mediatek_mt7986/feeds.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
src-git luci https://github.com/openwrt/luci.git;openwrt-22.03
src-git luci https://github.com/openwrt/luci.git;openwrt-23.05
src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master
14 changes: 14 additions & 0 deletions devices/mediatek_mt7986/patches/fix.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,17 @@
],
stdout=PIPE,
stderr=PIPE,

--- a/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
+++ b/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
@@ -581,9 +581,7 @@ <h2><%:Interface Configurations%> - <%=vifname and devname.."@"..vifname or devn
</table>
<h3><%:Access control MAC address list%></h3>
<textarea name="__maclist" id="__maclist" style="width:98%; height: 100px;"><%
- local list = cfgs["AccessControlList"..(vifidx-1)] or ""
- print(table.concat(list:split(";"), "\n"))
- %></textarea>
+ local list = cfgs["AccessControlList"..(vifidx-1)] or "" %><%=table.concat(list:split(";"), "\n")%></textarea>
</fieldset>

<% if string.split(cfgs.WirelessMode,";")[1] == "16" or string.split(cfgs.WirelessMode,";")[1] == "17" or string.split(cfgs.WirelessMode,";")[1] == "18" then %>
2 changes: 2 additions & 0 deletions devices/meson_meson8b/.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ CONFIG_TARGET_DEVICE_meson_meson8b_DEVICE_thunder-onecloud=y

CONFIG_TARGET_ROOTFS_SQUASHFS=n
CONFIG_TARGET_ROOTFS_EXT4FS=y

CONFIG_PACKAGE_perf=n
5 changes: 5 additions & 0 deletions devices/meson_meson8b/diy.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,10 @@ shopt -s extglob

SHELL_FOLDER=$(dirname $(readlink -f "$0"))

rm -rf target/linux/generic

svn co https://github.com/openwrt/openwrt/branches/openwrt-22.03/target/linux/generic target/linux/generic
svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/meson target/linux/meson

curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/openwrt-22.03/include/kernel-5.10 -o include/kernel-5.10

Loading

0 comments on commit e67d7b3

Please sign in to comment.