naoki: Changed naming of some variables.

diff --git a/naoki/backend.py b/naoki/backend.py
index 3d1675e748960df945e2ac1f9798354bd8e08c34..a17b92a0ea0b627c1ff8a2281812c96febcc4155 100644 (file)
--- a/naoki/backend.py
+++ b/naoki/backend.py
@@ -260,10 +260,6 @@ 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
@@ -337,7 +333,7 @@ class Package(object):
                download(self.info.objects, logger=self.log)
 
        def extract(self, dest):
-               files = [os.path.join(PACKAGESDIR, file) for file in self.info.package_files]
+               files = [os.path.join(PACKAGESDIR, file) for file in self.package_files]
                if not files:
                        return
 

diff --git a/naoki/constants.py b/naoki/constants.py
index 0c80af3c7b9ed4d957ca28b3303392713dee099d..a0dfac7fd060cd3dd82918a7a19d6591f9a1c217 100644 (file)
--- a/naoki/constants.py
+++ b/naoki/constants.py
@@ -102,7 +102,6 @@ class Config(object):
                        "DISTRO_VERSION" : self["distro_version"],
                        "DISTRO_SLOGAN"  : self["distro_slogan"],
                        #
-                       "CFLAGS"         : "-O2 -fomit-frame-pointer",
                        "PARALLELISMFLAGS" : "-j%d" % self["parallelism"],
                }
 

diff --git a/pkgs/Constants b/pkgs/Constants
index 153c28ffe75ba72045be294574702c1fe7304868..93798f139192b843e3852cb7bc3204d55e6fe195 100644 (file)
--- a/pkgs/Constants
+++ b/pkgs/Constants
@@ -31,7 +31,7 @@ OBJECTS = $(PKG_OBJECTS)
 
 PKG_NAME_REAL = $(notdir $(CURDIR))
 PKG_PACKAGES = $(PKG_NAME_REAL)
-PKG_FILES = $(foreach package,$(PKG_PACKAGES),$(call DO_PACKAGE_FILENAME,$(package)))
+PKG_PACKAGES_FILES = $(foreach package,$(PKG_PACKAGES),$(call DO_PACKAGE_FILENAME,$(package)))
 
 PKG_SUFFIX = -$(PKG_VER)-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(PKG_REL).ipk
 

diff --git a/pkgs/Targets b/pkgs/Targets
index 104ea50adf8d9f298ed3148c7ffa09b2f7449215..0f2314ae08dd56e2d2f0ca0a703b84883146308b 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)\""