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

some minor fixes, cleanups, package build abstraction

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9051 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-09-28 01:23:56 +00:00
parent 8a7bbf0505
commit b26d576fd7
5 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/package-ipkg.mk
View File

@ -23,7 +23,7 @@ define BuildIPKGVariable
endef endef
ifeq ($(DUMP),) ifeq ($(DUMP),)
define BuildIPKG define BuildTarget/ipkg
IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk
IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1)
INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
@ -92,9 +92,6 @@ ifeq ($(DUMP),)
$(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(STAMP_PREPARED) $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(STAMP_PREPARED)
-@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null -@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null
@touch $$@ @touch $$@
$$(eval $$(call Build/DefaultTargets,$(1)))
endef endef
$(STAGING_DIR)/etc/ipkg.conf: $(STAGING_DIR)/etc/ipkg.conf:

11
include/package.mk
View File

@ -97,8 +97,15 @@ endif
$(call shexport,Package/$(1)/description) $(call shexport,Package/$(1)/description)
$(call shexport,Package/$(1)/config) $(call shexport,Package/$(1)/config)
$(Dumpinfo) $(if $(DUMP), \
$(BuildIPKG) $(Dumpinfo), \
$(foreach target, \
$(if $(Package/$(1)/targets),$(Package/$(1)/targets), \
$(if $(PKG_TARGETS),$(PKG_TARGETS), ipkg ) \
), $(BuildTarget/$(target)) \
) \
)
$(if $(DUMP),,$(call Build/DefaultTargets,$(1)))
endef endef
# prevent libtool from setting rpath when linking # prevent libtool from setting rpath when linking

4
include/prereq.mk
View File

@ -5,6 +5,9 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
ifneq ($(__prereq_inc),1)
__prereq_inc:=1
prereq: prereq:
if [ -f $(TMP_DIR)/.prereq-error ]; then \ if [ -f $(TMP_DIR)/.prereq-error ]; then \
echo; \ echo; \
@ -15,6 +18,7 @@ prereq:
fi fi
.SILENT: prereq .SILENT: prereq
endif
define Require define Require
export PREREQ_CHECK=1 export PREREQ_CHECK=1

4
include/quilt.mk
View File

@ -5,6 +5,9 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
ifneq ($(__quilt_inc),1)
__quilt_inc:=1
ifeq ($(TARGET_BUILD),1) ifeq ($(TARGET_BUILD),1)
PKG_BUILD_DIR:=$(LINUX_DIR) PKG_BUILD_DIR:=$(LINUX_DIR)
endif endif
@ -134,3 +137,4 @@ refresh: quilt-check
update: quilt-check update: quilt-check
$(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package)) $(if $(KERNEL_BUILD),$(Quilt/Refresh/Kernel),$(Quilt/Refresh/Package))
endif

2
include/target.mk
View File

@ -75,10 +75,12 @@ define Profile
endif endif
endef endef
ifeq ($(DUMP)$(if $(TARGET_BUILD),,1),)
-include $(PLATFORM_DIR)/profiles/*.mk -include $(PLATFORM_DIR)/profiles/*.mk
ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR)) ifneq ($(PLATFORM_DIR),$(PLATFORM_SUBDIR))
-include $(PLATFORM_SUBDIR)/profiles/*.mk -include $(PLATFORM_SUBDIR)/profiles/*.mk
endif endif
endif
$(eval $(call shexport,Target/Description)) $(eval $(call shexport,Target/Description))