summaryrefslogtreecommitdiffstats
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
parent18104e12167d04945c3d09e580172a3186ed9efe (diff)
downloadpoky-39b0cfa2bd4ed016d4fd49de7d26a61d8ebb84f8.tar.gz
Rename FEED_URIS -> IPK_FEED_URIS
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5373 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/classes/rootfs_ipk.bbclass2
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/conf/documentation.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index fdedc44e58..2f1290ee59 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -120,7 +120,7 @@ ipk_insert_feed_uris () {
120 120
121 echo "Building from feeds activated!" 121 echo "Building from feeds activated!"
122 122
123 for line in ${FEED_URIS} 123 for line in ${IPK_FEED_URIS}
124 do 124 do
125 # strip leading and trailing spaces/tabs, then split into name and uri 125 # strip leading and trailing spaces/tabs, then split into name and uri
126 line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" 126 line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 3bce6699e4..9d778cb2a4 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -26,7 +26,7 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "131072"
26# Poky is svn based 26# Poky is svn based
27METADATA_REVISION = "${@base_get_metadata_svn_revision(d)}" 27METADATA_REVISION = "${@base_get_metadata_svn_revision(d)}"
28 28
29#FEED_URIS += " \ 29#IPK_FEED_URIS += " \
30# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \ 30# upgrades##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/ \
31#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \ 31#upgrades-${MACHINE}##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/upgrades/${MACHINE} \
32# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \ 32# machine##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/machine/${MACHINE} \
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 6c71bc00c7..0f75b2aa13 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
103 103
104SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1" 104SYSVINIT_ENABLED_GETTYS[doc] = "Specify which VTs should be running a getty, the default is 1"
105 105
106FEED_URIS[doc] = "List of ipkg feed records to put into generated image." 106IPK_FEED_URIS[doc] = "List of ipkg feed records to put into generated image."
107FEED_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." 107FEED_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."
108 108
109# insane bbclass 109# insane bbclass