From cee2a41cb17cc82f952b695eff04aced2cdb8805 Mon Sep 17 00:00:00 2001 From: jow Date: Thu, 11 Nov 2010 16:27:12 +0000 Subject: [PATCH] [backfire] merge r23959-r23961 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23962 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package-ipkg.mk | 3 ++- package/base-files/Makefile | 1 + package/busybox/Makefile | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 0ef440d4a..184f53c61 100644 --- 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 e9aaf0cfd..06496bae3 100644 --- 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 e6934a6eb..2833542ca 100644 --- 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 \