[backfire] merge r23959-r23961

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23962 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 0ef440d4a6080447d7514eadb34002bf7c155a70..184f53c61a9ab81ff3b1863ed2f5924db58a7afe 100644 (file)
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -100,6 +100,7 @@ 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)"; \
@@ -136,7 +137,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)_*

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index e9aaf0cfdefd8b68dd4d6baf39b445c1d12757d7..06496bae366c932cde3e8150bfc9cb2f7b558565 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -164,6 +164,7 @@ ifneq ($(TARGET_avr32)$(TARGET_coldfire),)
   DEPENDS:=+libgcc
 endif
   URL:=$(LIBC_URL)
+  PKG_FLAGS:=hold essential
 endef
 
 

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index e6934a6eb12176907daf7f8e4fd48cb0340cd1b1..2833542ca9973b28a62f85bd4c6f3fc1699af288 100644 (file)
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=busybox
 PKG_VERSION:=1.15.3
 PKG_RELEASE:=2
+PKG_FLAGS:=essential
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads \