X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fpackage-ipkg.mk;h=b8f886bcdacca0bc44d03fd9c2b59ccc9b374227;hb=efdf7f6499de015f6443d5347b1aa771c189bbd1;hp=a86f401805b33927b1ae14781d932812e597e4a9;hpb=5170393f8cae3c5acac61bd6ac6e127f9727cee4;p=librecmc%2Flibrecmc.git diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index a86f401805..b8f886bcda 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -5,7 +5,9 @@ # See /LICENSE for more information. # -include $(INCLUDE_DIR)/feeds.mk +ifndef DUMP + include $(INCLUDE_DIR)/feeds.mk +endif # invoke ipkg-build with some default options IPKG_BUILD:= \ @@ -88,7 +90,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)) @@ -154,7 +156,7 @@ Package: $(1) Version: $(VERSION) $$(call addfield,Depends,$$(Package/$(1)/DEPENDS) )$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS)) -)$$(call addfield,Provides,$(PROVIDES) +)$$(call addfield,Provides,$$(call mergelist,$(PROVIDES)) )$$(call addfield,Source,$(SOURCE) )$$(call addfield,License,$$(PKG_LICENSE) )$$(call addfield,LicenseFiles,$$(PKG_LICENSE_FILES)