From ca482bd15acb05575778aed98c3dd97d80ef59c7 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 3 Oct 2010 19:30:40 +0000
Subject: [PATCH] [backfire] merge r23172 and r23175

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23204 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/package-defaults.mk | 5 +++++
 include/package-ipkg.mk     | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/include/package-defaults.mk b/include/package-defaults.mk
index 1d2918152..ef51710b9 100644
--- a/include/package-defaults.mk
+++ b/include/package-defaults.mk
@@ -23,6 +23,11 @@ define Package/Default
   else
     VERSION:=$(PKG_RELEASE)
   endif
+  ifneq ($(PKG_FLAGS),)
+    PKGFLAGS:=$(PKG_FLAGS)
+  else
+    PKGFLAGS:=
+  endif
   ifneq ($(ARCH_PACKAGES),)
     PKGARCH:=$(ARCH_PACKAGES)
   else
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 2a274032a..65fb50da9 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -98,6 +98,7 @@ ifeq ($(DUMP),)
 		echo "Provides: $(PROVIDES)"; \
 		echo "Source: $(SOURCE)"; \
 		echo "Section: $(SECTION)"; \
+		echo "Status: install $(if $(filter hold,$(PKG_FLAGS)),hold,ok) not-installed"; \
 		echo "Priority: $(PRIORITY)"; \
 		echo "Maintainer: $(MAINTAINER)"; \
 		echo "Architecture: $(PKGARCH)"; \
@@ -120,6 +121,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)
 
     $(1)-clean:
 	rm -f $(PACKAGE_DIR)/$(1)_*