X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8f3f1755d9495631becd3887e87e35ef7c5c8045..75e311e963809952c9d193e15efbc74a23ac8b2f:/include/package.mk

diff --git a/include/package.mk b/include/package.mk
index 43d0663f6..9097d7b0b 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -19,11 +19,14 @@ include $(INCLUDE_DIR)/depends.mk
 STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPEND),)))
 STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured
 STAMP_BUILT:=$(PKG_BUILD_DIR)/.built
+STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_NAME)_installed
 
+include $(INCLUDE_DIR)/download.mk
 include $(INCLUDE_DIR)/quilt.mk
 include $(INCLUDE_DIR)/package-defaults.mk
 include $(INCLUDE_DIR)/package-dumpinfo.mk
 include $(INCLUDE_DIR)/package-ipkg.mk
+include $(INCLUDE_DIR)/package-bin.mk
 
 override MAKEFLAGS=
 export CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
@@ -38,18 +41,18 @@ ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
   endif
 endif
 
+define Download/default
+  FILE:=$(PKG_SOURCE)
+  URL:=$(PKG_SOURCE_URL)
+  SUBDIR:=$(PKG_SOURCE_SUBDIR)
+  PROTO:=$(PKG_SOURCE_PROTO)
+  VERSION:=$(PKG_SOURCE_VERSION)
+  MD5SUM:=$(PKG_MD5SUM)
+endef
 
 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
-
+  $(if $(QUILT),$(Build/Quilt))
+  $(if $(strip $(PKG_SOURCE_URL)),$(call Download,default))
   $(call Build/Autoclean)
 
   $(STAMP_PREPARED):
@@ -64,29 +67,48 @@ define Build/DefaultTargets
 
   $(STAMP_BUILT): $(STAMP_CONFIGURED)
 	$(Build/Compile)
-	$(Build/InstallDev)
+	touch $$@
+
+  $(STAMP_INSTALLED): $(STAMP_BUILT)
+	$(NO_TRACE_MAKE) clean-staging
+	rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
+	mkdir -p $(TMP_DIR)/stage-$(PKG_NAME) $(STAGING_DIR)/packages $(STAGING_DIR_HOST)/packages
+	$(call Build/InstallDev,$(TMP_DIR)/stage-$(PKG_NAME)/target,$(TMP_DIR)/stage-$(PKG_NAME)/host)
+	if [ -d $(TMP_DIR)/stage-$(PKG_NAME)/target ]; then \
+		(cd $(TMP_DIR)/stage-$(PKG_NAME)/target; find > $(STAGING_DIR)/packages/$(PKG_NAME).list); \
+		$(CP) $(TMP_DIR)/stage-$(PKG_NAME)/target/* $(STAGING_DIR)/; \
+	fi
+	if [ -d $(TMP_DIR)/stage-$(PKG_NAME)/host ]; then \
+		(cd $(TMP_DIR)/stage-$(PKG_NAME)/host; find > $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list); \
+		$(CP) $(TMP_DIR)/stage-$(PKG_NAME)/host/* $(STAGING_DIR_HOST)/; \
+	fi
+	rm -rf $(TMP_DIR)/stage-$(PKG_NAME)
 	touch $$@
 
   ifdef Build/InstallDev
-    compile: $(STAMP_BUILT)
+    compile: $(STAMP_INSTALLED)
   endif
 
   define Build/DefaultTargets
   endef
+
+  prepare: $(STAMP_PREPARED)
+  configure: $(STAMP_CONFIGURED)
 endef
 
 define BuildPackage
   $(eval $(Package/Default))
   $(eval $(Package/$(1)))
 
-# <HACK> Support obsolete DESCRIPTION field
+ifdef DESCRIPTION
+$$(error DESCRIPTION:= is obselete, use Package/PKG_NAME/description)
+endif
+
 ifndef Package/$(1)/description
 define Package/$(1)/description
-$(TITLE)$(subst \,
-,\ $(DESCRIPTION))
+	$(TITLE)
 endef
 endif
-# </HACK>
 
   $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION,
     ifeq ($($(FIELD)),)
@@ -97,8 +119,15 @@ endif
   $(call shexport,Package/$(1)/description)
   $(call shexport,Package/$(1)/config)
 
-  $(Dumpinfo)
-  $(BuildIPKG)
+  $(if $(DUMP), \
+    $(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
 
 # prevent libtool from setting rpath when linking
@@ -113,6 +142,14 @@ define libtool_fixup_libdir
 		$(SED) "s,^libdir='/usr/lib',libdir='$(strip $(1))/usr/lib',g"
 endef
 
+define pkg_install_files
+	$(foreach install_file,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_file)`; $(INSTALL_DATA) $(2)/$(install_file) $(3)/`dirname $(install_file)`;)
+endef
+
+define pkg_install_bin
+	$(foreach install_apps,$(1),$(INSTALL_DIR) $(3)/`dirname $(install_apps)`; $(INSTALL_BIN) $(2)/$(install_apps) $(3)/`dirname $(install_apps)`;)
+endef
+
 define Build/Prepare
   $(call Build/Prepare/Default,)
 endef
@@ -127,15 +164,24 @@ endef
 
 $(PACKAGE_DIR):
 	mkdir -p $@
-		
+	
 dumpinfo:
 download:
-prepare: $(STAMP_PREPARED)
-configure: $(STAMP_CONFIGURED)
+prepare:
+configure:
 compile:
 install:
-clean: FORCE
-	$(Build/UninstallDev)
+clean-staging: FORCE
+	rm -f $(STAMP_INSTALLED)
+	for dir in "$(STAGING_DIR)" "$(STAGING_DIR_HOST)"; do (\
+		cd $$dir; \
+		if [ -f packages/$(PKG_NAME).list ]; then \
+			cat packages/$(PKG_NAME).list | xargs -r rm -f 2>/dev/null; \
+		fi; \
+	) done;
+
+clean: clean-staging FORCE
+	$(call Build/UninstallDev,$(STAGING_DIR),$(STAGING_DIR_HOST))
 	$(Build/Clean)
-	@rm -f $(STAGING_DIR)/stamp/.$(PKG_NAME)-installed
-	@rm -rf $(PKG_BUILD_DIR)
+	rm -f $(STAGING_DIR)/packages/$(PKG_NAME).list $(STAGING_DIR_HOST)/packages/$(PKG_NAME).list
+	rm -rf $(PKG_BUILD_DIR)