From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 4 Sep 2010 11:27:24 +0000 (+0200)
Subject: naoki: Files I forgot to commit several time ago.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=646e91b62278fe3da495dc16d06d1ce967d37094;p=ipfire-3.x.git

naoki: Files I forgot to commit several time ago.
---

diff --git a/pkgs/Constants b/pkgs/Constants
index b1adf570a..15a8f8fd7 100644
--- a/pkgs/Constants
+++ b/pkgs/Constants
@@ -5,6 +5,9 @@
 #
 ###############################################################################
 
+PKG_VARIABLES = PKG_BUILD_DEPS PKG_DEPS PKG_DESCRIPTION PKG_FILES PKG_GROUP \
+	PKG_MAINTAINER PKG_LICENSE PKG_REL PKG_SUMMARY PKG_URL PKG_VER
+
 ifeq "$(CHROOT)" "1"
 	BASEDIR = /usr/src
 endif
@@ -17,7 +20,7 @@ DIR_PATCHES = $(DIR_SOURCE)/patches
 DIR_SRC = $(ROOT)/usr/src
 DIR_TMP = /tmp
 DIR_SOURCE = $(CURDIR)
-DIR_PACKAGES = /usr/src/packages
+DIR_PACKAGES = /usr/src/packages/$(PKG_ARCH)
 DIR_TOOLS = $(BASEDIR)/tools
 DIR_LOGS = $(BASEDIR)/logs
 
@@ -39,15 +42,8 @@ DO_EXTRACT = $(DIR_TOOLS)/extractor
 DO_PATCHES = cd $(DIR_APP) && $(DIR_TOOLS)/patch $(foreach patch,$(PKG_PATCHES),$(DIR_PATCHES)/$(patch))
 DO_QUALITY_AGENT = $(DIR_TOOLS)/quality-agent
 
-PKG_DESCRIPTION_$(PKG_NAME_REAL)-devel = Development files of $(THISAPP).
-
-define PKG_FILES_$(PKG_NAME_REAL)-devel
-	/usr/include
-	*/lib/*.so
-endef
-
-PKG_BUILD_DEPS += kernel-headers
-PKG_DEPS += glibc
+PKG_BUILD_DEPS += gcc glibc-devel kernel-headers
+PKG_DEPS +=
 
 CONFIGURE_OPTIONS = --prefix=/usr
 
diff --git a/pkgs/Include b/pkgs/Include
index 50541e4f8..a3d62be3d 100644
--- a/pkgs/Include
+++ b/pkgs/Include
@@ -23,3 +23,4 @@
 include $(PKGROOT)/Constants
 include $(PKGROOT)/Functions
 include $(PKGROOT)/Targets
+include $(PKGROOT)/Templates
diff --git a/pkgs/Targets b/pkgs/Targets
index 95fcb3815..dbb0d2d58 100644
--- a/pkgs/Targets
+++ b/pkgs/Targets
@@ -22,21 +22,14 @@ info:
 	@echo "PKG_REL=\"$(PKG_REL)\""
 	@echo "PKG_SUMMARY=\"$(strip $(PKG_SUMMARY))\""
 	@echo "PKG_URL=\"$(PKG_URL)\""
-	@echo "PKG_TOOLCHAIN_DEPENDENCIES=\"$(PKG_TOOLCHAIN_DEPS)\""
 
 $(OBJECTS):
 	@echo "Object file \"$@\" is required." >&2
 	@exit 1
 
-%.ipk: $(STAGE_DONE)
-	@echo "$(strip $(PKG_FILES_$(patsubst %$(PKG_SUFFIX),%,$@)))" \
-		> $(DIR_TMP)/filelist_$(patsubst %$(PKG_SUFFIX),%,$@)
-	@$(DIR_TOOLS)/compressor $(DIR_PACKAGES)/$@ \
-		--root=$(BUILDROOT) $(if $(PKG_FILES_$(patsubst %$(PKG_SUFFIX),%,$@)), \
-		--regexes=$(DIR_TMP)/filelist_$(patsubst %$(PKG_SUFFIX),%,$@))
-
 .PHONY: package
-package: $(if $(TOOLCHAIN),$(STAGE_DONE),$$(STAGE_PACKAGE_TARGETS))
+package: $(STAGE_DONE)
+	$(foreach package,$(call reverse,$(PKG_PACKAGES)),$(call DO_PACKAGE,$(package)))
 
 .PHONY: shell
 shell: $(OBJECTS)