X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1630b3829de9aa869992aa747c28d65a2fca31c2..3f4c3ffd6689f9aadcb9bd3b366220a318994cc7:/include/package-ipkg.mk?ds=sidebyside diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index f537fb2db..33b9ef835 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -16,6 +16,7 @@ OPKG:= \ --force-depends \ --force-overwrite \ --force-postinstall \ + --force-maintainer \ --add-dest root:/ \ --add-arch all:100 \ --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200 @@ -27,8 +28,10 @@ IPKG_BUILD:= \ IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg define BuildIPKGVariable +ifdef Package/$(1)/$(2) $(call shexport,Package/$(1)/$(2)) - $(1)_COMMANDS += $(SH_FUNC) var2file "$(call shvar,Package/$(1)/$(2))" $(2); + $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2); +endif endef PARENL :=( @@ -110,7 +113,7 @@ ifeq ($(DUMP),) echo -n "Description: "; $(SH_FUNC) getvar $(call shvar,Package/$(1)/description) | sed -e 's,^[[:space:]]*, ,g'; \ ) > $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control - (cd $$(IDIR_$(1))/CONTROL; \ + $(SH_FUNC) (cd $$(IDIR_$(1))/CONTROL; \ $($(1)_COMMANDS) \ )