diff options
| -rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 2 | ||||
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 | ||||
| -rw-r--r-- | meta/conf/documentation.conf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index fdedc44e5..2f1290ee5 100644 --- 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 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 |