From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 20 Mar 2010 13:23:39 +0000 (+0100)
Subject: naoki: Changed naming of some variables.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96765864099cbc227112815e4d12ee2c1df31810;p=ipfire-3.x.git

naoki: Changed naming of some variables.
---

diff --git a/naoki/backend.py b/naoki/backend.py
index 3d1675e74..a17b92a0e 100644
--- 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 0c80af3c7..a0dfac7fd 100644
--- 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 153c28ffe..93798f139 100644
--- 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 104ea50ad..0f2314ae0 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)\""