Skip to content

Commit 4af7213

Browse files
committed
dockerd: remove obsolete patches
Signed-off-by: sbwml <admin@cooluc.com>
1 parent 77839bd commit 4af7213

File tree

4 files changed

+9
-103
lines changed

4 files changed

+9
-103
lines changed

openwrt/patch/docker/0001-dockerd-fix-bridge-network.patch

Lines changed: 0 additions & 35 deletions
This file was deleted.

openwrt/patch/docker/0002-docker-add-buildkit-experimental-support.patch

Lines changed: 0 additions & 53 deletions
This file was deleted.

openwrt/scripts/00-prepare_base.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,7 @@ if [ "$version" = "dev" ] || [ "$version" = "rc2" ]; then
246246
git clone https://$github/sbwml/packages_utils_dockerd feeds/packages/utils/dockerd
247247
git clone https://$github/sbwml/packages_utils_containerd feeds/packages/utils/containerd
248248
git clone https://$github/sbwml/packages_utils_runc feeds/packages/utils/runc
249-
sed -i '/cgroupfs-mount/d' feeds/packages/utils/dockerd/Config.in
250249
fi
251-
sed -i '/sysctl.d/d' feeds/packages/utils/dockerd/Makefile
252-
pushd feeds/packages
253-
curl -s $mirror/openwrt/patch/docker/0001-dockerd-fix-bridge-network.patch | patch -p1
254-
curl -s $mirror/openwrt/patch/docker/0002-docker-add-buildkit-experimental-support.patch | patch -p1
255-
popd
256250

257251
# cgroupfs-mount
258252
# fix unmount hierarchical mount

openwrt/scripts/02-prepare_package.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ git clone https://$github/sbwml/feeds_packages_lang_node-prebuilt feeds/packages
1212
git clone https://$github/sbwml/default-settings package/new/default-settings -b openwrt-24.10
1313

1414
# wwan
15-
git clone https://github.com/sbwml/wwan-packages package/new/wwan
15+
git clone https://$github/sbwml/wwan-packages package/new/wwan --depth=1
1616

1717
# luci-app-filemanager
1818
rm -rf feeds/luci/applications/luci-app-filemanager
1919
git clone https://$github/sbwml/luci-app-filemanager package/new/luci-app-filemanager
2020

2121
# luci-app-airplay2
22-
git clone https://github.com/sbwml/luci-app-airplay2 package/new/airplay2
22+
git clone https://$github/sbwml/luci-app-airplay2 package/new/airplay2
2323

2424
# luci-app-webdav
2525
git clone https://$github/sbwml/luci-app-webdav package/new/luci-app-webdav
@@ -93,36 +93,36 @@ rm -rf feeds/packages/net/aria2
9393
git clone https://$github/sbwml/feeds_packages_net_aria2 -b 22.03 feeds/packages/net/aria2
9494

9595
# airconnect
96-
git clone https://$github/sbwml/luci-app-airconnect package/new/airconnect
96+
git clone https://$github/sbwml/luci-app-airconnect package/new/airconnect --depth=1
9797

9898
# netkit-ftp
9999
git clone https://$github/sbwml/package_new_ftp package/new/ftp
100100

101101
# nethogs
102-
git clone https://github.com/sbwml/package_new_nethogs package/new/nethogs
102+
git clone https://$github/sbwml/package_new_nethogs package/new/nethogs
103103

104104
# SSRP & Passwall
105105
rm -rf feeds/packages/net/{xray-core,v2ray-core,v2ray-geodata,sing-box}
106106
git clone https://$github/sbwml/openwrt_helloworld package/new/helloworld -b v5
107107

108108
# openlist
109-
git clone https://$github/sbwml/luci-app-openlist package/new/openlist
109+
git clone https://$github/sbwml/luci-app-openlist package/new/openlist --depth=1
110110

111111
# netdata
112112
sed -i 's/syslog/none/g' feeds/packages/admin/netdata/files/netdata.conf
113113

114114
# qBittorrent
115-
git clone https://$github/sbwml/luci-app-qbittorrent package/new/qbittorrent
115+
git clone https://$github/sbwml/luci-app-qbittorrent package/new/qbittorrent --depth=1
116116

117117
# unblockneteasemusic
118-
git clone https://$github/UnblockNeteaseMusic/luci-app-unblockneteasemusic package/new/luci-app-unblockneteasemusic
118+
git clone https://$github/UnblockNeteaseMusic/luci-app-unblockneteasemusic package/new/luci-app-unblockneteasemusic --depth=1
119119
sed -i 's/解除网易云音乐播放限制/网易云音乐解锁/g' package/new/luci-app-unblockneteasemusic/root/usr/share/luci/menu.d/luci-app-unblockneteasemusic.json
120120

121121
# Theme
122-
git clone --depth 1 https://$github/sbwml/luci-theme-argon package/new/luci-theme-argon
122+
git clone --depth 1 https://$github/sbwml/luci-theme-argon package/new/luci-theme-argon --depth=1
123123

124124
# Mosdns
125-
git clone https://$github/sbwml/luci-app-mosdns -b v5 package/new/mosdns
125+
git clone https://$github/sbwml/luci-app-mosdns -b v5 package/new/mosdns --depth=1
126126

127127
# OpenAppFilter
128128
git clone https://$github/sbwml/OpenAppFilter --depth=1 package/new/OpenAppFilter

0 commit comments

Comments
 (0)