summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-07-26 04:42:06 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-26 04:42:06 +0000
commitd3e33b9c1d87a4cacc457af5c0e8740e15e91b0d (patch)
tree0c7b1471127e5132bccd79676c5c70b2e6f39d70
parent0636e261a937973904916973a80cdc139c1a0769 (diff)
Corrected comments to match changes file names.
-rw-r--r--conf/distro/freeze.conf15
1 files changed, 8 insertions, 7 deletions
diff --git a/conf/distro/freeze.conf b/conf/distro/freeze.conf
index a51e40f8d6..19014f0f1d 100644
--- a/conf/distro/freeze.conf
+++ b/conf/distro/freeze.conf
@@ -1,20 +1,21 @@
# general configuration file for freezing a distribution
#
-# If freeze.conf is included (include distro/freeze.conf) in the
+# If freeze.conf is included (include conf/distro/freeze.conf) in the
# distro conf file it will define BBFILES from the information in
-# ${DISTRO}-bbfiles.conf or ${DISTRO}-package-dirs.conf (whichever
+# ${DISTRO}-bbfiles.conf or ${DISTRO}-packages.conf (whichever
# exists in that order of preference.)
#
# NOTE that these conf files use ${PKGDIR} and therefore that
-# variable must be defined before this file is included.
+# variable must be defined before this file is included, or the
+# definition below (${TOPDIR}/openmebedded) must be correct.
#
-# First pull in the frozen definitions (if they exist) The multiple
-# includes allow the frozen file to be stored alongside local.conf
-# and in the conf/distro directory - the former take precedence over
-# the latter.
PKGDIR ?= "${TOPDIR}/openembedded"
FROZEN_DIR ?= "/non/-existent/-directory/-for/-security"
+# Pull in the frozen definitions (if they exist) The multiple
+# includes allow the frozen file to be stored alongside local.conf
+# and in the conf/distro directory - the former take precedence over
+# the latter.
include conf/distro/${DISTRO}-packages.conf
include conf/${DISTRO}-packages.conf
include ${FROZEN_DIR}/${DISTRO}-packages.conf