Compare commits
1 Commits
v24-250506
...
v24-250404
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef88a850ea |
1
.github/workflows/build.yml
vendored
1
.github/workflows/build.yml
vendored
@@ -249,7 +249,6 @@ jobs:
|
|||||||
rm -f *-preloader*
|
rm -f *-preloader*
|
||||||
rm -f *-bl31-uboot*
|
rm -f *-bl31-uboot*
|
||||||
rm -f *-initramfs-recovery*
|
rm -f *-initramfs-recovery*
|
||||||
rm -f *-bt8-factory.bin
|
|
||||||
|
|
||||||
- name: Upload OUT directory
|
- name: Upload OUT directory
|
||||||
uses: actions/upload-artifact@main
|
uses: actions/upload-artifact@main
|
||||||
|
|||||||
@@ -45,10 +45,6 @@ CONFIG_FEED__alpine_fan_control=m
|
|||||||
#GIT_FEED _amneziawg=https://github.com/lolo6oT/awg-openwrt.git dev-24.10
|
#GIT_FEED _amneziawg=https://github.com/lolo6oT/awg-openwrt.git dev-24.10
|
||||||
CONFIG_FEED__amneziawg=m
|
CONFIG_FEED__amneziawg=m
|
||||||
|
|
||||||
### Zapret
|
|
||||||
#GIT_FEED _zapret=https://github.com/remittor/zapret-openwrt.git
|
|
||||||
CONFIG_FEED__zapret=m
|
|
||||||
|
|
||||||
### ruantiblock
|
### ruantiblock
|
||||||
#GIT_FEED _ruantiblock=https://github.com/gSpotx2f/ruantiblock_openwrt.git
|
#GIT_FEED _ruantiblock=https://github.com/gSpotx2f/ruantiblock_openwrt.git
|
||||||
CONFIG_FEED__ruantiblock=m
|
CONFIG_FEED__ruantiblock=m
|
||||||
|
|||||||
@@ -7,9 +7,3 @@ CONFIG_PACKAGE_luci-app-https-dns-proxy=y
|
|||||||
CONFIG_PACKAGE_luci-i18n-https-dns-proxy-ru=y
|
CONFIG_PACKAGE_luci-i18n-https-dns-proxy-ru=y
|
||||||
|
|
||||||
CONFIG_PACKAGE_igmpproxy=y
|
CONFIG_PACKAGE_igmpproxy=y
|
||||||
|
|
||||||
CONFIG_PACKAGE_zapret=y
|
|
||||||
CONFIG_PACKAGE_zapret-tpws=y
|
|
||||||
CONFIG_PACKAGE_zapret-mdig=y
|
|
||||||
CONFIG_PACKAGE_zapret-ip2net=y
|
|
||||||
CONFIG_PACKAGE_luci-app-zapret=y
|
|
||||||
|
|||||||
@@ -40,4 +40,3 @@ CONFIG_PACKAGE_luci-i18n-ruantiblock-ru=y
|
|||||||
|
|
||||||
CONFIG_PACKAGE_podkop=y
|
CONFIG_PACKAGE_podkop=y
|
||||||
CONFIG_PACKAGE_luci-app-podkop=y
|
CONFIG_PACKAGE_luci-app-podkop=y
|
||||||
CONFIG_PACKAGE_luci-i18n-podkop-ru=y
|
|
||||||
|
|||||||
33
xmake.sh
33
xmake.sh
@@ -127,26 +127,6 @@ function build_target {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
|
|
||||||
if [ -f $PODKOP_MK ]; then
|
|
||||||
sed -i 's/+sing-box / /g' $PODKOP_MK
|
|
||||||
sed -i 's/CONFLICTS:=.*/CONFLICTS:=/g' $PODKOP_MK
|
|
||||||
fi
|
|
||||||
PODKOP_SH=$XDIR/package/feeds/_podkop/podkop/files/usr/bin/podkop
|
|
||||||
if [ -f $PODKOP_SH ] && ! grep -q '(which sing-box)' $PODKOP_SH ; then
|
|
||||||
sed -i '/,\\"dns_configured\\":/i [ -z "$(which sing-box)" ] && status="not installed"' $PODKOP_SH
|
|
||||||
fi
|
|
||||||
|
|
||||||
DROPBEAR_MK=$XDIR/package/network/services/dropbear/Makefile
|
|
||||||
if [ -f $DROPBEAR_MK ]; then
|
|
||||||
sed -i 's/^PKG_RELEASE:=.*/PKG_RELEASE:=0/g' $DROPBEAR_MK
|
|
||||||
sed -i '/,CONFIG_DROPBEAR_MODERN_ONLY,/d' $DROPBEAR_MK
|
|
||||||
sed -i 's/\tCONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
|
|
||||||
sed -i 's/ CONFIG_DROPBEAR_MODERN_ONLY/ /g' $DROPBEAR_MK
|
|
||||||
sed -i 's/DROPBEAR_DH_GROUP14_SHA1,0/ /g' $DROPBEAR_MK
|
|
||||||
sed -i 's/DROPBEAR_SHA1_HMAC,0/ /g' $DROPBEAR_MK
|
|
||||||
fi
|
|
||||||
|
|
||||||
make defconfig
|
make defconfig
|
||||||
|
|
||||||
NSS_DRV_PPPOE_ENABLE=$( get_cfg_opt_flag $CFG NSS_DRV_PPPOE_ENABLE )
|
NSS_DRV_PPPOE_ENABLE=$( get_cfg_opt_flag $CFG NSS_DRV_PPPOE_ENABLE )
|
||||||
@@ -241,19 +221,6 @@ function build_target {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
XPATCHES=$XDIR/patches
|
|
||||||
for incfn in $XPATCHES/*.patch; do
|
|
||||||
[ ! -f "$incfn" ] && continue
|
|
||||||
inc=`patch -p1 -N -r - < "$incfn"`
|
|
||||||
if [ $? != 0 ]; then
|
|
||||||
if ! echo "$inc" | grep -q "patch detected! Skipping patch."; then
|
|
||||||
echo "Patch '$(basename $incfn)' FAILED"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
echo "Patch '$(basename $incfn)' result: OK"
|
|
||||||
done
|
|
||||||
|
|
||||||
OPKG_DIR=$XDIR/files/etc/opkg
|
OPKG_DIR=$XDIR/files/etc/opkg
|
||||||
if [ -d $OPKG_DIR ]; then
|
if [ -d $OPKG_DIR ]; then
|
||||||
rm -rf $OPKG_DIR
|
rm -rf $OPKG_DIR
|
||||||
|
|||||||
Reference in New Issue
Block a user