naoki: Add arch information to package name.

diff --git a/naoki/__init__.py b/naoki/__init__.py
index 40ca83cbcb8b8e58467610680335e42279c0211b..b34839122e86f57c5d2f1f48cc4d9f46a48584f0 100644 (file)
--- 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 0a12b5da200bd4188461b7ea32e4d168994e3950..3d1675e748960df945e2ac1f9798354bd8e08c34 100644 (file)
--- 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 47a9d63db2437858d28e919590dc7abd1941b8ea..153c28ffe75ba72045be294574702c1fe7304868 100644 (file)
--- 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 867de5ad492258a58db51b3d40af571d5ea9c81b..e79a5a0d35f5226611d6560c04ec31e36d79ddb7 100644 (file)
--- 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 0f2314ae08dd56e2d2f0ca0a703b84883146308b..104ea50adf8d9f298ed3148c7ffa09b2f7449215 100644 (file)
--- 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)\""