xmake: Fix build podkop (remove conflicts)
This commit is contained in:
1
xmake.sh
1
xmake.sh
@@ -130,6 +130,7 @@ function build_target {
|
|||||||
PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
|
PODKOP_MK=$XDIR/package/feeds/_podkop/podkop/Makefile
|
||||||
if [ -f $PODKOP_MK ]; then
|
if [ -f $PODKOP_MK ]; then
|
||||||
sed -i 's/+sing-box / /g' $PODKOP_MK
|
sed -i 's/+sing-box / /g' $PODKOP_MK
|
||||||
|
sed -i 's/CONFLICTS:=.*/CONFLICTS:=/g' $PODKOP_MK
|
||||||
fi
|
fi
|
||||||
PODKOP_SH=$XDIR/package/feeds/_podkop/podkop/files/usr/bin/podkop
|
PODKOP_SH=$XDIR/package/feeds/_podkop/podkop/files/usr/bin/podkop
|
||||||
if [ -f $PODKOP_SH ] && ! grep -q '(which sing-box)' $PODKOP_SH ; then
|
if [ -f $PODKOP_SH ] && ! grep -q '(which sing-box)' $PODKOP_SH ; then
|
||||||
|
|||||||
Reference in New Issue
Block a user