aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.lock@collabora.co.uk>2015-08-11 09:45:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-14 08:28:51 +0100
commit18e5dcfc610a255e490e4425f11213b8e14c6e00 (patch)
tree130c5cf5bcb8c3587e1b045619fdb703b4d12e98
parent67f025e793f3867c72eedb8b3c1609e3cfe06945 (diff)
downloadopenembedded-core-contrib-18e5dcfc610a255e490e4425f11213b8e14c6e00.tar.gz
openembedded-core-contrib-18e5dcfc610a255e490e4425f11213b8e14c6e00.tar.bz2
openembedded-core-contrib-18e5dcfc610a255e490e4425f11213b8e14c6e00.zip
lib/oe/package_manager: fix opkg feed generation
The insert_feed_uris() method of OpkgPM was creating an initial entry in the feeds list which pointed to the root of the ipk directory, however the on-device package manager can't consume this feed resulting in runtime errors - therefore we remove the code to generate that initial feed uri. Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/package_manager.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 55b8ab0bcd1..2ab1d78bca4 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1343,13 +1343,10 @@ class OpkgPM(PackageManager):
with open(rootfs_config, "w+") as config_file:
uri_iterator = 0
for uri in self.feed_uris.split():
- config_file.write("src/gz url-%d %s/ipk\n" %
- (uri_iterator, uri))
-
for arch in self.pkg_archs.split():
if not os.path.exists(os.path.join(self.deploy_dir, arch)):
continue
- bb.note('Note: adding opkg channel url-%s-%d (%s)' %
+ bb.note('Note: adding opkg feed url-%s-%d (%s)' %
(arch, uri_iterator, uri))
config_file.write("src/gz uri-%s-%d %s/ipk/%s\n" %