summaryrefslogtreecommitdiff
path: root/meta/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-10-01 15:42:55 +0000
committerRichard Purdie <richard@openedhand.com>2008-10-01 15:42:55 +0000
commit39b0cfa2bd4ed016d4fd49de7d26a61d8ebb84f8 (patch)
tree2ed8e3974c35c1233a8ec364540824c9e1009ef6 /meta/conf
parent18104e12167d04945c3d09e580172a3186ed9efe (diff)
downloadopenembedded-core-39b0cfa2bd4ed016d4fd49de7d26a61d8ebb84f8.tar.gz
openembedded-core-39b0cfa2bd4ed016d4fd49de7d26a61d8ebb84f8.tar.bz2
openembedded-core-39b0cfa2bd4ed016d4fd49de7d26a61d8ebb84f8.tar.xz
openembedded-core-39b0cfa2bd4ed016d4fd49de7d26a61d8ebb84f8.zip
Rename FEED_URIS -> IPK_FEED_URIS
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5373 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/conf/documentation.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 3bce6699e..9d778cb2a 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -26,7 +26,7 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
# Poky is svn based
METADATA_REVISION = "${@base_get_metadata_svn_revision(d)}"
-#FEED_URIS += " \
+#IPK_FEED_URIS += " \
# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 6c71bc00c..0f75b2aa1 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -103,7 +103,7 @@ PCMCIA_MANAGER[doc] = "Specify which package(s) to install to handle PCMCIA slot
SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
-FEED_URIS[doc] = "List of ipkg feed records to put into generated image."
+IPK_FEED_URIS[doc] = "List of ipkg feed records to put into generated image."
FEED_DEPLOYDIR_BASE_URI[doc] = "Allow to serve ipk deploy dir as an adhoc feed (bogofeed). Set to base URL of the dir as exported by HTTP. Set of adhoc feed configs will be generated in image."
# insane bbclass