From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 20 Mar 2010 09:57:40 +0000 (+0100)
Subject: naoki: Add arch information to package name.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4677ce9eba457bfeb426ab8d54abd284223a0abc;p=ipfire-3.x.git

naoki: Add arch information to package name.
---

diff --git a/naoki/__init__.py b/naoki/__init__.py
index 40ca83cbc..b34839122 100644
--- a/naoki/__init__.py
+++ b/naoki/__init__.py
@@ -122,7 +122,8 @@ Release       : %(release)s
 Maintainer    : %(maintainer)s
 License       : %(license)s
 
-Files         : %(objects)s
+Files         : %(files)s
+Objects       : %(objects)s
 Patches       : %(patches)s
 --------------------------------------------------------------------------------\
 """)
diff --git a/naoki/backend.py b/naoki/backend.py
index 0a12b5da2..3d1675e74 100644
--- a/naoki/backend.py
+++ b/naoki/backend.py
@@ -167,6 +167,8 @@ class PackageInfo(object):
 		self._name = name
 		self.repo = repo
 
+		self.arch = arches.current["name"]
+
 	#def __cmp__(self, other):
 	#	return cmp(self.name, other.name)
 
@@ -187,7 +189,10 @@ class PackageInfo(object):
 	def fetch(self):
 		env = os.environ.copy()
 		env.update(config.environment)
-		env["PKGROOT"] = PKGSDIR
+		env.update({
+			"PKG_ARCH" : self.arch,
+			"PKGROOT" : PKGSDIR,
+		})
 		output = util.do("make -f %s" % self.filename, shell=True,
 			cwd=os.path.join(PKGSDIR, self.repo.name, self.name), returnOutput=1, env=env)
 
@@ -214,6 +219,7 @@ class PackageInfo(object):
 			"description" : self.description,
 			"filename"    : self.filename,
 			"fingerprint" : self.fingerprint,
+			"files"       : self.files,
 			"group"       : self.group,
 			"license"     : self.license,
 			"maintainer"  : self.maintainer,
@@ -254,6 +260,10 @@ class PackageInfo(object):
 		return os.path.join(PKGSDIR, self.repo.name, self.name,
 			os.path.basename(self.name)) + ".nm"
 
+	@property
+	def files(self):
+		return self._data.get("PKG_FILES").split(" ")
+
 	@property
 	def fingerprint(self):
 		return "%d" % os.stat(self.filename).st_mtime
diff --git a/pkgs/Constants b/pkgs/Constants
index 47a9d63db..153c28ffe 100644
--- a/pkgs/Constants
+++ b/pkgs/Constants
@@ -31,10 +31,9 @@ OBJECTS = $(PKG_OBJECTS)
 
 PKG_NAME_REAL = $(notdir $(CURDIR))
 PKG_PACKAGES = $(PKG_NAME_REAL)
-PKG_PACKAGES_FILES = $(foreach package,$(PKG_PACKAGES),$(call DO_PACKAGE_FILENAME,$(package)))
+PKG_FILES = $(foreach package,$(PKG_PACKAGES),$(call DO_PACKAGE_FILENAME,$(package)))
 
-DO_PACKAGE_FILENAME = $(1)$(PKG_SUFFIX)
-PKG_SUFFIX = -$(PKG_VER)-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_REL).ipk
+PKG_SUFFIX = -$(PKG_VER)-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(PKG_REL).ipk
 
 DO_EXTRACT = $(DIR_TOOLS)/extractor
 DO_PATCHES = cd $(DIR_APP) && $(DIR_TOOLS)/patch $(foreach patch,$(PKG_PATCHES),$(DIR_PATCHES)/$(patch))
diff --git a/pkgs/Functions b/pkgs/Functions
index 867de5ad4..e79a5a0d3 100644
--- a/pkgs/Functions
+++ b/pkgs/Functions
@@ -7,6 +7,8 @@
 
 include $(PKGROOT)/gmsl
 
+DO_PACKAGE_FILENAME = $(1)$(PKG_SUFFIX)
+
 define DO_FILELIST
 	@echo "# Filelist dump"
 	@cd $(BUILDROOT) && find -ls
diff --git a/pkgs/Targets b/pkgs/Targets
index 0f2314ae0..104ea50ad 100644
--- a/pkgs/Targets
+++ b/pkgs/Targets
@@ -10,13 +10,13 @@ info:
 	@echo "PKG_BUILD_DEPENDENCIES=\"$(PKG_BUILD_DEPS)\""
 	@echo "PKG_DEPENDENCIES=\"$(PKG_DEPS)\""
 	@echo "PKG_DESCRIPTION=\"$(strip $(PKG_DESCRIPTION))\""
+	@echo "PKG_FILES=\"$(PKG_FILES)\""
 	@echo "PKG_GROUP=\"$(PKG_GROUP)\""
 	@echo "PKG_LICENSE=\"$(PKG_LICENSE)\""
 	@echo "PKG_MAINTAINER=\"$(PKG_MAINTAINER)\""
 	@echo "PKG_NAME=\"$(PKG_NAME_REAL)\""
 	@echo "PKG_OBJECTS=\"$(strip $(OBJECTS))\""
 	@echo "PKG_PACKAGES=\"$(PKG_PACKAGES)\""
-	@echo "PKG_PACKAGES_FILES=\"$(PKG_PACKAGES_FILES)\""
 	@echo "PKG_PATCHES=\"$(PKG_PATCHES)\""
 	@echo "PKG_VER=\"$(PKG_VER)\""
 	@echo "PKG_REL=\"$(PKG_REL)\""