From: Jo-Philipp Wich Date: Fri, 22 Apr 2016 10:02:53 +0000 (+0200) Subject: include: remove unused FeedPackageDir macro arguments X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d9ad55a6091eb5de77095f6217578396fc7a938b;p=openwrt%2Fstaging%2Fyousong.git include: remove unused FeedPackageDir macro arguments Signed-off-by: Jo-Philipp Wich --- diff --git a/include/feeds.mk b/include/feeds.mk index a5ce877967..d0d473983e 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -30,8 +30,6 @@ PKG_CONFIG_DEPENDS += \ $(foreach feed,$(FEEDS_INSTALLED),CONFIG_FEED_$(feed)) # 1: package name -# 2: flags -# 3: section define FeedPackageDir $(strip $(if $(CONFIG_PER_FEED_REPO), \ $(if $(Package/$(1)/subdir), \ diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index a86f401805..eb4c874047 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -88,7 +88,7 @@ _endef=endef ifeq ($(DUMP),) define BuildTarget/ipkg - PDIR_$(1):=$(call FeedPackageDir,$(1),$(PKG_FLAGS),$(SECTION)) + PDIR_$(1):=$(call FeedPackageDir,$(1)) IPKG_$(1):=$$(PDIR_$(1))/$(1)_$(VERSION)_$(PKGARCH).ipk IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1) KEEP_$(1):=$(strip $(call Package/$(1)/conffiles))