X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7f14e127691864dc8e5ad615b14cf61421eefb7a..b70c6b1168fca5d832d4b5bbc1a539a26f12d938:/include/package-ipkg.mk diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 8ff0d70d1..2360ac4d4 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 @@ -90,7 +91,6 @@ ifeq ($(DUMP),) $(call Package/$(1)/install,$$(IDIR_$(1))) -find $$(IDIR_$(1)) -name 'CVS' -o -name '.svn' -o -name '.#*' | $(XARGS) rm -rf $(RSTRIP) $$(IDIR_$(1)) - SIZE=`cd $$(IDIR_$(1)); du -bs --exclude=./CONTROL . 2>/dev/null | cut -f1`; \ ( \ echo "Package: $(1)"; \ echo "Version: $(VERSION)"; \ @@ -103,10 +103,11 @@ ifeq ($(DUMP),) echo "Source: $(SOURCE)"; \ echo "Section: $(SECTION)"; \ echo "Status: unknown $(if $(filter hold,$(PKG_FLAGS)),hold,ok) not-installed"; \ + echo "Essential: $(if $(filter essential,$(PKG_FLAGS)),yes,no)"; \ echo "Priority: $(PRIORITY)"; \ echo "Maintainer: $(MAINTAINER)"; \ echo "Architecture: $(PKGARCH)"; \ - echo "Installed-Size: $$$$SIZE"; \ + echo "Installed-Size: 0"; \ 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 @@ -133,7 +134,7 @@ ifeq ($(DUMP),) $$(INFO_$(1)): $$(IPKG_$(1)) @[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp $(OPKG) install $$(IPKG_$(1)) - $(if $(PKGFLAGS),for flag in $(PKGFLAGS); do $(OPKG) flag $$$$flag $(1); done) + $(if $(filter-out essential,$(PKG_FLAGS)),for flag in $(filter-out essential,$(PKG_FLAGS)); do $(OPKG) flag $$$$flag $(1); done) $(1)-clean: rm -f $(PACKAGE_DIR)/$(1)_*