From d94396a4ea89018f6e1e0a95f52e6dc5803c267f Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 26 Sep 2018 22:16:37 +0800 Subject: [PATCH] fix sqm error whenn intall feeds --- include/toplevel.mk | 1 - scripts/feeds | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/toplevel.mk b/include/toplevel.mk index 9746a029c..b57dcd854 100644 --- a/include/toplevel.mk +++ b/include/toplevel.mk @@ -82,7 +82,6 @@ _ignore = $(foreach p,$(IGNORE_PACKAGES),--ignore $(p)) prepare-tmpinfo: FORCE @+$(MAKE) -r -s staging_dir/host/.prereq-build $(PREP_MK) mkdir -p tmp/info - sed -i 's/DEPENDS:= lua luci-base /DEPENDS:=/g' $(TOPDIR)/feeds/packages/net/sqm-scripts/Makefile $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPTH=5 SCAN_EXTRA="" $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1" for type in package target; do \ diff --git a/scripts/feeds b/scripts/feeds index 304ef6cba..eb87971d0 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -622,6 +622,8 @@ sub install { my %opts; my $feed; my $ret = 0; + + system("sed -i 's/DEPENDS:= lua luci-base /DEPENDS:=/g' feeds/packages/net/sqm-scripts/Makefile"); getopts('ap:d:fh', \%opts);