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

formatting and trivial cleanup

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6573 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm 2007-03-16 06:12:53 +00:00
parent a1aed6ae61
commit 752d6b39f1
3 changed files with 73 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
include/package-dumpinfo.mk
View File

@ -6,32 +6,33 @@
# #
ifneq ($(DUMP),) ifneq ($(DUMP),)
define Config define Config
preconfig_$$(1) += echo "Preconfig: $(1)"; echo "Preconfig-Type: $(2)"; echo "Preconfig-Default: $(3)"; echo "Preconfig-Label: $(4)"; preconfig_$$(1) += echo "Preconfig: $(1)"; echo "Preconfig-Type: $(2)"; echo "Preconfig-Default: $(3)"; echo "Preconfig-Label: $(4)";
endef endef
define Dumpinfo define Dumpinfo
dumpinfo: dumpinfo-$(1) dumpinfo: dumpinfo-$(1)
dumpinfo-$(1): FORCE .SILENT: dumpinfo-$(1)
@echo "Package: $(1)" ; \ dumpinfo-$(1): FORCE
$(if $(MENU),echo "Menu: $(MENU)";) \ echo "Package: $(1)" ;
$(if $(SUBMENU),echo "Submenu: $(SUBMENU)";) \ $(if $(MENU),echo "Menu: $(MENU)")
$(if $(SUBMENUDEP),echo "Submenu-Depends: $(SUBMENUDEP)";) \ $(if $(SUBMENU),echo "Submenu: $(SUBMENU)")
$(if $(DEFAULT),echo "Default: $(DEFAULT)";) \ $(if $(SUBMENUDEP),echo "Submenu-Depends: $(SUBMENUDEP)")
if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \ $(if $(DEFAULT),echo "Default: $(DEFAULT)")
echo "Version: $(VERSION)"; \ if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi;
echo "Depends: $(DEPENDS)"; \ echo "Version: $(VERSION)"
echo "Provides: $(PROVIDES)"; \ echo "Depends: $(DEPENDS)"
echo "Build-Depends: $(PKG_BUILD_DEPENDS)"; \ echo "Provides: $(PROVIDES)"
echo "Section: $(SECTION)"; \ echo "Build-Depends: $(PKG_BUILD_DEPENDS)"
echo "Category: $(CATEGORY)"; \ echo "Section: $(SECTION)"
echo "Title: $(TITLE)"; \ echo "Category: $(CATEGORY)"
echo "Maintainer: $(MAINTAINER)"; \ echo "Title: $(TITLE)"
echo -n "Description: "; \ echo "Maintainer: $(MAINTAINER)"
getvar $(call shvar,Package/$(1)/description); \ echo -n "Description: "
$(if $(URL),echo;echo "$(URL)";) \ getvar $(call shvar,Package/$(1)/description)
echo "@@" ; \ $(if $(URL),echo;echo "$(URL)")
$$(if $$(Package/$(1)/config),echo "Config: "; getvar $(call shvar,Package/$(1)/config); echo "@@") echo "@@"
$(if $$(preconfig_$(1)),@$$(preconfig_$(1)) echo "") $$(if $$(Package/$(1)/config),echo "Config: "; getvar $(call shvar,Package/$(1)/config); echo "@@")
endef $(if $$(preconfig_$(1)),$$(preconfig_$(1)) echo "")
endef
endif endif

93
include/package-ipkg.mk
View File

@ -11,38 +11,41 @@ define BuildIPKGVariable
endef endef
ifeq ($(DUMP),) ifeq ($(DUMP),)
define BuildIPKG define BuildIPKG
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
ifdef Package/$(1)/install ifdef Package/$(1)/install
ifeq ($(CONFIG_PACKAGE_$(1)),y) ifneq ($(CONFIG_PACKAGE_$(1)),)
install: $$(INFO_$(1)) compile: $$(IPKG_$(1))
ifeq ($(CONFIG_PACKAGE_$(1)),y)
install: $$(INFO_$(1))
endif
ifneq ($(MAKECMDGOALS),prereq)
ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1)))
$(PKG_BUILD_DIR)/.built: package-rebuild
$$(info Rebuilding $(subst $(TOPDIR)/,,$$(IPKG_$(1))))
endif
endif
else
compile: $(1)-disabled
$(1)-disabled:
@echo "WARNING: skipping $(1) -- package not selected"
endif
endif endif
ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER)$(SDK),) IDEPEND_$(1):=$$(strip $$(DEPENDS))
compile: $$(IPKG_$(1))
else
compile: $(1)-disabled
$(1)-disabled:
@echo "WARNING: skipping $(1) -- package not selected"
endif
endif
ifeq ($(FORCEREBUILD),y)
$$(IPKG_$(1)): FORCE
endif
IDEPEND_$(1):=$$(strip $$(DEPENDS))
$(eval $(call BuildIPKGVariable,$(1),conffiles)) $(eval $(call BuildIPKGVariable,$(1),conffiles))
$(eval $(call BuildIPKGVariable,$(1),preinst)) $(eval $(call BuildIPKGVariable,$(1),preinst))
$(eval $(call BuildIPKGVariable,$(1),postinst)) $(eval $(call BuildIPKGVariable,$(1),postinst))
$(eval $(call BuildIPKGVariable,$(1),prerm)) $(eval $(call BuildIPKGVariable,$(1),prerm))
$(eval $(call BuildIPKGVariable,$(1),postrm)) $(eval $(call BuildIPKGVariable,$(1),postrm))
$$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH) $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH)
@rm -f $(PACKAGE_DIR)/$(1)_* @rm -f $(PACKAGE_DIR)/$(1)_*
mkdir -p $$(IDIR_$(1))/CONTROL mkdir -p $$(IDIR_$(1))/CONTROL
echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
@ -52,9 +55,7 @@ define BuildIPKG
for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \
DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
done; \ done; \
echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ echo "Depends: $$$$DEPENDS"; \
)
( \
echo "Source: $(SOURCE)"; \ echo "Source: $(SOURCE)"; \
echo "Section: $(SECTION)"; \ echo "Section: $(SECTION)"; \
echo "Priority: $(PRIORITY)"; \ echo "Priority: $(PRIORITY)"; \
@ -67,41 +68,29 @@ define BuildIPKG
$($(1)_COMMANDS) \ $($(1)_COMMANDS) \
) )
$$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
$(call Package/$(1)/install,$$(IDIR_$(1))) $(call Package/$(1)/install,$$(IDIR_$(1)))
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
-find $$(IDIR_$(1)) -name CVS | xargs rm -rf -find $$(IDIR_$(1)) -name CVS | xargs rm -rf
-find $$(IDIR_$(1)) -name .svn | xargs rm -rf -find $$(IDIR_$(1)) -name .svn | xargs rm -rf
-find $$(IDIR_$(1)) -name '.#*' | xargs rm -f -find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
$(RSTRIP) $$(IDIR_$(1)) $(RSTRIP) $$(IDIR_$(1))
$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
@[ -f $$(IPKG_$(1)) ] || false @[ -f $$(IPKG_$(1)) ] || false
$$(INFO_$(1)): $$(IPKG_$(1)) $$(INFO_$(1)): $$(IPKG_$(1))
$(IPKG) install $$(IPKG_$(1)) $(IPKG) install $$(IPKG_$(1))
$(1)-clean: $(1)-clean:
rm -f $(PACKAGE_DIR)/$(1)_* rm -f $(PACKAGE_DIR)/$(1)_*
clean: $(1)-clean clean: $(1)-clean
$(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.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))) $$(eval $$(call Build/DefaultTargets,$(1)))
ifdef Package/$(1)/install endef
ifneq ($$(CONFIG_PACKAGE_$(1))$(DEVELOPER)$(SDK),)
ifneq ($(MAKECMDGOALS),prereq)
ifneq ($(DUMP),1)
ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1)))
$(PKG_BUILD_DIR)/.built: package-rebuild
$$(info Rebuilding $(subst $(TOPDIR)/,,$$(IPKG_$(1))))
endif
endif
endif
endif
endif
endef
endif endif

9
include/package.mk
View File

@ -21,8 +21,8 @@ define Build/DefaultTargets
download: $(DL_DIR)/$(PKG_SOURCE) download: $(DL_DIR)/$(PKG_SOURCE)
$(DL_DIR)/$(PKG_SOURCE): $(DL_DIR)/$(PKG_SOURCE):
mkdir -p $(DL_DIR) mkdir -p $(DL_DIR)
$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
endif endif
@ -55,12 +55,11 @@ define Build/DefaultTargets
$(PKG_BUILD_DIR)/.built: package-rebuild $(PKG_BUILD_DIR)/.built: package-rebuild
endif endif
compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
$(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
mkdir -p $(STAGING_DIR)/stampfiles mkdir -p $(STAGING_DIR)/stampfiles
$(Build/InstallDev) $(Build/InstallDev)
touch $$@ touch $$@
compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
endif endif
package-rebuild: FORCE package-rebuild: FORCE
@ -74,7 +73,7 @@ define BuildPackage
$(eval $(Package/Default)) $(eval $(Package/Default))
$(eval $(Package/$(1))) $(eval $(Package/$(1)))
# <HACK> Support obsolete DESCRIPTION field> # <HACK> Support obsolete DESCRIPTION field
ifndef Package/$(1)/description ifndef Package/$(1)/description
define Package/$(1)/description define Package/$(1)/description
$(TITLE)$(subst \, $(TITLE)$(subst \,