KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

formatting and trivial cleanup

Browse source 
SVN-Revision: 6573
This commit is contained in:
Mike Baker 2007-03-16 06:12:53 +00:00
parent 2c62bddcfe
commit 8dc90ccc11
3 changed files with 73 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
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)
.SILENT: dumpinfo-$(1)
dumpinfo-$(1): FORCE dumpinfo-$(1): FORCE
@echo "Package: $(1)" ; \ echo "Package: $(1)" ;
$(if $(MENU),echo "Menu: $(MENU)";) \ $(if $(MENU),echo "Menu: $(MENU)")
$(if $(SUBMENU),echo "Submenu: $(SUBMENU)";) \ $(if $(SUBMENU),echo "Submenu: $(SUBMENU)")
$(if $(SUBMENUDEP),echo "Submenu-Depends: $(SUBMENUDEP)";) \ $(if $(SUBMENUDEP),echo "Submenu-Depends: $(SUBMENUDEP)")
$(if $(DEFAULT),echo "Default: $(DEFAULT)";) \ $(if $(DEFAULT),echo "Default: $(DEFAULT)")
if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \ if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi;
echo "Version: $(VERSION)"; \ echo "Version: $(VERSION)"
echo "Depends: $(DEPENDS)"; \ echo "Depends: $(DEPENDS)"
echo "Provides: $(PROVIDES)"; \ echo "Provides: $(PROVIDES)"
echo "Build-Depends: $(PKG_BUILD_DEPENDS)"; \ echo "Build-Depends: $(PKG_BUILD_DEPENDS)"
echo "Section: $(SECTION)"; \ echo "Section: $(SECTION)"
echo "Category: $(CATEGORY)"; \ echo "Category: $(CATEGORY)"
echo "Title: $(TITLE)"; \ echo "Title: $(TITLE)"
echo "Maintainer: $(MAINTAINER)"; \ echo "Maintainer: $(MAINTAINER)"
echo -n "Description: "; \ echo -n "Description: "
getvar $(call shvar,Package/$(1)/description); \ getvar $(call shvar,Package/$(1)/description)
$(if $(URL),echo;echo "$(URL)";) \ $(if $(URL),echo;echo "$(URL)")
echo "@@" ; \ echo "@@"
$$(if $$(Package/$(1)/config),echo "Config: "; getvar $(call shvar,Package/$(1)/config); echo "@@") $$(if $$(Package/$(1)/config),echo "Config: "; getvar $(call shvar,Package/$(1)/config); echo "@@")
$(if $$(preconfig_$(1)),@$$(preconfig_$(1)) echo "") $(if $$(preconfig_$(1)),$$(preconfig_$(1)) echo "")
endef endef
endif endif

37
include/package-ipkg.mk
View file

@ -11,18 +11,26 @@ 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
ifneq ($(CONFIG_PACKAGE_$(1)),)
compile: $$(IPKG_$(1))
ifeq ($(CONFIG_PACKAGE_$(1)),y) ifeq ($(CONFIG_PACKAGE_$(1)),y)
install: $$(INFO_$(1)) install: $$(INFO_$(1))
endif endif
ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER)$(SDK),) ifneq ($(MAKECMDGOALS),prereq)
compile: $$(IPKG_$(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
else else
compile: $(1)-disabled compile: $(1)-disabled
$(1)-disabled: $(1)-disabled:
@ -30,13 +38,8 @@ define BuildIPKG
endif endif
endif endif
ifeq ($(FORCEREBUILD),y)
$$(IPKG_$(1)): FORCE
endif
IDEPEND_$(1):=$$(strip $$(DEPENDS)) 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))
@ -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)"; \
@ -91,17 +92,5 @@ define BuildIPKG
$$(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

5
include/package.mk
View file

@ -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 \,