qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 23:16:16 +02:00
Code

[backfire] merge r23172 and r23175

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23204 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-10-03 19:30:40 +00:00
parent f30b232516
commit ca482bd15a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/package-defaults.mk
View File

@ -23,6 +23,11 @@ define Package/Default
else else
VERSION:=$(PKG_RELEASE) VERSION:=$(PKG_RELEASE)
endif endif
ifneq ($(PKG_FLAGS),)
PKGFLAGS:=$(PKG_FLAGS)
else
PKGFLAGS:=
endif
ifneq ($(ARCH_PACKAGES),) ifneq ($(ARCH_PACKAGES),)
PKGARCH:=$(ARCH_PACKAGES) PKGARCH:=$(ARCH_PACKAGES)
else else

2
include/package-ipkg.mk
View File

@ -98,6 +98,7 @@ ifeq ($(DUMP),)
echo "Provides: $(PROVIDES)"; \ echo "Provides: $(PROVIDES)"; \
echo "Source: $(SOURCE)"; \ echo "Source: $(SOURCE)"; \
echo "Section: $(SECTION)"; \ echo "Section: $(SECTION)"; \
echo "Status: install $(if $(filter hold,$(PKG_FLAGS)),hold,ok) not-installed"; \
echo "Priority: $(PRIORITY)"; \ echo "Priority: $(PRIORITY)"; \
echo "Maintainer: $(MAINTAINER)"; \ echo "Maintainer: $(MAINTAINER)"; \
echo "Architecture: $(PKGARCH)"; \ echo "Architecture: $(PKGARCH)"; \
@ -120,6 +121,7 @@ ifeq ($(DUMP),)
$$(INFO_$(1)): $$(IPKG_$(1)) $$(INFO_$(1)): $$(IPKG_$(1))
@[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp @[ -d $(TARGET_DIR)/tmp ] || mkdir -p $(TARGET_DIR)/tmp
$(OPKG) install $$(IPKG_$(1)) $(OPKG) install $$(IPKG_$(1))
$(if $(PKGFLAGS),for flag in $(PKGFLAGS); do $(OPKG) flag $$$$flag $(1); done)
$(1)-clean: $(1)-clean:
rm -f $(PACKAGE_DIR)/$(1)_* rm -f $(PACKAGE_DIR)/$(1)_*