Rename FEED_URIS -> IPK_FEED_URIS

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5373 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index fdedc44e582db3bc2d62f972ce32d973dbd43ceb..2f1290ee591ecb8b4b8bc02fd41b06891458bc39 100644 (file)
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -120,7 +120,7 @@ ipk_insert_feed_uris () {
 
         echo "Building from feeds activated!"
 
-        for line in ${FEED_URIS}
+        for line in ${IPK_FEED_URIS}
         do
                 # strip leading and trailing spaces/tabs, then split into name and uri
                 line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 3bce6699e413007e97832de493465052f2925257..9d778cb2a486e403f5250f8d0d20ae151c7ec8dc 100644 (file)
--- 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 6c71bc00c71920ee9e63f44bc5ebbad2f99b4589..0f75b2aa13e87264260df6516fe289490ca5f80c 100644 (file)
--- 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