Compare commits
1 Commits
v24-250415
...
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 *-bl31-uboot*
|
||||
rm -f *-initramfs-recovery*
|
||||
rm -f *-bt8-factory.bin
|
||||
|
||||
- name: Upload OUT directory
|
||||
uses: actions/upload-artifact@main
|
||||
|
||||
@@ -40,4 +40,3 @@ CONFIG_PACKAGE_luci-i18n-ruantiblock-ru=y
|
||||
|
||||
CONFIG_PACKAGE_podkop=y
|
||||
CONFIG_PACKAGE_luci-app-podkop=y
|
||||
CONFIG_PACKAGE_luci-i18n-podkop-ru=y
|
||||
|
||||
34
xmake.sh
34
xmake.sh
@@ -127,25 +127,6 @@ function build_target {
|
||||
fi
|
||||
fi
|
||||
|
||||
PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
|
||||
if [ -f $PODKOP_MK ]; then
|
||||
sed -i 's/+sing-box / /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
|
||||
|
||||
NSS_DRV_PPPOE_ENABLE=$( get_cfg_opt_flag $CFG NSS_DRV_PPPOE_ENABLE )
|
||||
@@ -239,20 +220,7 @@ function build_target {
|
||||
sed -i 's/\$(INSTALL_DIR) \$(1)\/usr\/{bin,sbin}/#\$(INSTALL_DIR) \$(1)\/usr\/__bin_sbin__/g' $NTFS3G
|
||||
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
|
||||
if [ -d $OPKG_DIR ]; then
|
||||
rm -rf $OPKG_DIR
|
||||
|
||||
Reference in New Issue
Block a user