X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/15230af45d228f8311beb6f5216620cbe794a0c9..21ac2748953462cf0ddffc1dc680a4eca0fe5eb3:/include/package.mk diff --git a/include/package.mk b/include/package.mk index f9662978e..c7b2a43d2 100644 --- a/include/package.mk +++ b/include/package.mk @@ -1,123 +1,92 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006,2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -ifneq ($(DUMP),) - all: dumpinfo -else - all: compile -endif + +all: $(if $(DUMP),dumpinfo,compile) + +PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk +include $(INCLUDE_DIR)/package-defaults.mk +include $(INCLUDE_DIR)/package-dumpinfo.mk +include $(INCLUDE_DIR)/package-ipkg.mk -define shvar -V_$(subst .,_,$(subst -,_,$(subst /,_,$(1)))) -endef - -define shexport -$(call shvar,$(1))=$$(call $(1)) -export $(call shvar,$(1)) -endef +STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared +STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured +STAMP_BUILT:=$(PKG_BUILD_DIR)/.built +export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME) define Build/DefaultTargets + ifneq ($(strip $(PKG_SOURCE_URL)),) + download: $(DL_DIR)/$(PKG_SOURCE) + + $(DL_DIR)/$(PKG_SOURCE): + mkdir -p $(DL_DIR) + $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) + + $(STAMP_PREPARED): $(DL_DIR)/$(PKG_SOURCE) + endif + ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) - _INFO:= - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) - _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) - $(PKG_BUILD_DIR)/.prepared: package-clean + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(PKG_FILE_DEPEND)),$(PKG_BUILD_DIR)) + $$(info Forcing package rebuild) + $(STAMP_PREPARED): clean endif endif endif - $(PKG_BUILD_DIR)/.prepared: + $(STAMP_PREPARED): @-rm -rf $(PKG_BUILD_DIR) @mkdir -p $(PKG_BUILD_DIR) - $(call Build/Prepare) + $(Build/Prepare) touch $$@ - $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared - $(call Build/Configure) + $(STAMP_CONFIGURED): $(STAMP_PREPARED) + $(Build/Configure) touch $$@ - $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(call Build/Compile) + $(STAMP_BUILT): $(STAMP_CONFIGURED) + $(Build/Compile) touch $$@ ifdef Build/InstallDev ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed $(PKG_BUILD_DIR)),$(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed) - $(PKG_BUILD_DIR)/.built: package-rebuild + $(STAMP_BUILT): package-rebuild endif - $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built + compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed + $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(STAMP_BUILT) mkdir -p $(STAGING_DIR)/stampfiles - $(call Build/InstallDev) + $(Build/InstallDev) touch $$@ - - compile-targets: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed endif - package-clean: FORCE - $(call Build/Clean) - $(call Build/UninstallDev) - -rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed - package-rebuild: FORCE - @-rm -f $(PKG_BUILD_DIR)/.built + @-rm -f $(STAMP_BUILT) define Build/DefaultTargets endef endef -define Package/Default - CONFIGFILE:= - SECTION:=opt - CATEGORY:=Extra packages - DEPENDS:= - PROVIDES:= - EXTRA_DEPENDS:= - MAINTAINER:=OpenWrt Developers Team - SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) - ifneq ($(PKG_VERSION),) - ifneq ($(PKG_RELEASE),) - VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) - else - VERSION:=$(PKG_VERSION) - endif - else - VERSION:=$(PKG_RELEASE) - endif - PKGARCH:=$(ARCH) - PRIORITY:=optional - DEFAULT:= - MENU:= - SUBMENU:= - SUBMENUDEP:= - TITLE:= - DESCRIPTION:= -endef - -define BuildDescription - ifneq ($(DESCRIPTION),) - DESCRIPTION:=$(TITLE)\\ $(DESCRIPTION) - else - DESCRIPTION:=$(TITLE) - endif -endef - -define BuildIPKGVariable - $(call shexport,Package/$(1)/$(2)) - $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2); -endef - define BuildPackage - $(eval $(call Package/Default)) - $(eval $(call Package/$(1))) - $(eval $(call BuildDescription)) + $(eval $(Package/Default)) + $(eval $(Package/$(1))) + +# Support obsolete DESCRIPTION field +ifndef Package/$(1)/description +define Package/$(1)/description +$(TITLE)$(subst \, +,\ $(DESCRIPTION)) +endef +endif +# $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION, ifeq ($($(FIELD)),) @@ -125,246 +94,35 @@ define BuildPackage endif ) - IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk - IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) - INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list - - ifdef Package/$(1)/install - ifeq ($(CONFIG_PACKAGE_$(1)),y) - install-targets: $$(INFO_$(1)) - endif - - ifneq ($(CONFIG_PACKAGE_$(1)),) - compile-targets: $$(IPKG_$(1)) - else - compile-targets: $(1)-disabled - $(1)-disabled: - @echo "WARNING: skipping $(1) -- package not selected" - endif - endif - - ifeq ($(FORCEREBUILD),y) - $$(IPKG_$(1)): FORCE - endif - - IDEPEND_$(1):=$$(strip $$(DEPENDS)) - - ifneq ($(DUMP),) - DUMPINFO += \ - echo "Package: $(1)"; + $(call shexport,Package/$(1)/description) + $(call shexport,Package/$(1)/config) - ifneq ($(MENU),) - DUMPINFO += \ - echo "Menu: $(MENU)"; - endif - - ifneq ($(SUBMENU),) - DUMPINFO += \ - echo "Submenu: $(SUBMENU)"; - ifneq ($(SUBMENUDEP),) - DUMPINFO += \ - echo "Submenu-Depends: $(SUBMENUDEP)"; - endif - endif - - ifneq ($(DEFAULT),) - DUMPINFO += \ - echo "Default: $(DEFAULT)"; - endif - - $(call shexport,Package/$(1)/description) - - DUMPINFO += \ - if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \ - echo "Version: $(VERSION)"; \ - echo "Depends: $$(IDEPEND_$(1))"; \ - echo "Provides: $(PROVIDES)"; \ - echo "Build-Depends: $(PKG_BUILDDEP)"; \ - echo "Category: $(CATEGORY)"; \ - echo "Title: $(TITLE)"; \ - if isset $(call shvar,Package/$(1)/description); then \ - echo -n "Description: "; \ - getvar $(call shvar,Package/$(1)/description); \ - else \ - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ - fi; - - ifneq ($(URL),) - DUMPINFO += \ - echo; \ - echo "$(URL)"; - endif - - DUMPINFO += \ - echo "@@"; - - $(call shexport,Package/$(1)/config) - DUMPINFO += \ - if isset $(call shvar,Package/$(1)/config); then echo "Config: "; getvar $(call shvar,Package/$(1)/config); fi; \ - echo "@@"; - - endif - - $(eval $(call BuildIPKGVariable,$(1),conffiles)) - $(eval $(call BuildIPKGVariable,$(1),preinst)) - $(eval $(call BuildIPKGVariable,$(1),postinst)) - $(eval $(call BuildIPKGVariable,$(1),prerm)) - $(eval $(call BuildIPKGVariable,$(1),postrm)) - $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH) - mkdir -p $$(IDIR_$(1))/CONTROL - echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control - echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control - ( \ - DEPENDS=; \ - for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ - DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ - done; \ - echo "Depends: $(EXTRA_DEPENDS) $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ - ) - echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control - echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control - echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control - echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control - echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g' | sed -e 's,^[[:space:]]*$$$$, .,g' >> $$(IDIR_$(1))/CONTROL/control - chmod 644 $$(IDIR_$(1))/CONTROL/control - (cd $$(IDIR_$(1))/CONTROL; \ - $($(1)_COMMANDS) \ - ) - - $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control - $(call Package/$(1)/install,$$(IDIR_$(1))) - mkdir -p $(PACKAGE_DIR) - -find $$(IDIR_$(1)) -name CVS | xargs rm -rf - -find $$(IDIR_$(1)) -name .svn | xargs rm -rf - -find $$(IDIR_$(1)) -name '.#*' | xargs rm -f - $(RSTRIP) $$(IDIR_$(1)) - $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) - @[ -f $$(IPKG_$(1)) ] || false - - $$(INFO_$(1)): $$(IPKG_$(1)) - $(IPKG) install $$(IPKG_$(1)) - - $(1)-clean: - rm -f $(PACKAGE_DIR)/$(1)_* - - clean: $(1)-clean - - $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared - -@rm $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null - @touch $$@ - - $$(eval $$(call Build/DefaultTargets,$(1))) - - ifneq ($$(CONFIG_PACKAGE_$(1)),) - 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))) - _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1))) - $(PKG_BUILD_DIR)/.built: package-rebuild - endif - - ifneq ($$(_INFO),) - $$(info Rebuilding $$(_INFO)) - endif - endif - endif - endif + $(Dumpinfo) + $(BuildIPKG) endef -ifneq ($(strip $(PKG_UNPACK)),) - define Build/Prepare/Default - $(PKG_UNPACK) - @if [ -d ./patches -a "$$$$(ls ./patches | wc -l)" -gt 0 ]; then \ - $(PATCH) $(PKG_BUILD_DIR) ./patches; \ - fi - endef -endif - define Build/Prepare $(call Build/Prepare/Default,) endef -define Build/Configure/Default - (cd $(PKG_BUILD_DIR)/$(3); \ - if [ -x configure ]; then \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - CXXFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ - $(2) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - $(DISABLE_NLS) \ - $(1); \ - fi; \ - ) -endef - define Build/Configure $(call Build/Configure/Default,) endef -define Build/Compile/Default - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CROSS="$(TARGET_CROSS)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include " \ - EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \ - ARCH="$(ARCH)" \ - $(1); -endef - define Build/Compile $(call Build/Compile/Default,) endef -ifneq ($(DUMP),) - dumpinfo: FORCE - @$(DUMPINFO) -else - $(PACKAGE_DIR): +$(PACKAGE_DIR): mkdir -p $@ - ifneq ($(strip $(PKG_SOURCE)),) - download: $(DL_DIR)/$(PKG_SOURCE) - - $(DL_DIR)/$(PKG_SOURCE): - mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) - - $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) - endif - - download: - prepare: $(PKG_BUILD_DIR)/.prepared - configure: $(PKG_BUILD_DIR)/.configured - - compile-targets: - compile: compile-targets - - install-targets: - install: install-targets - - clean-targets: - clean: FORCE - @$(MAKE) clean-targets - $(call Build/Clean) - rm -rf $(PKG_BUILD_DIR) -endif +dumpinfo: +download: +prepare: $(STAMP_PREPARED) +configure: $(STAMP_CONFIGURED) +compile: +install: +clean: FORCE + $(Build/UninstallDev) + @rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed + @rm -rf $(PKG_BUILD_DIR)