summaryrefslogtreecommitdiffstats
path: root/meta
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:30:33 +0100
commitc8b7f09f20c61f5e3049ffa83fc2c49eb25fe699 (patch)
tree9d15337e066f92f36263ec31f51e9667a20fcb6c /meta
parentd7581dee119a935957d3cfa18450006a97f0a567 (diff)
downloadpoky-c8b7f09f20c61f5e3049ffa83fc2c49eb25fe699.tar.gz
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. (From OE-Core rev: 18e5dcfc610a255e490e4425f11213b8e14c6e00) 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>
Diffstat (limited to 'meta')
-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 55b8ab0bcd..2ab1d78bca 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1343,13 +1343,10 @@ class OpkgPM(PackageManager):
1343 with open(rootfs_config, "w+") as config_file: 1343 with open(rootfs_config, "w+") as config_file:
1344 uri_iterator = 0 1344 uri_iterator = 0
1345 for uri in self.feed_uris.split(): 1345 for uri in self.feed_uris.split():
1346 config_file.write("src/gz url-%d %s/ipk\n" %
1347 (uri_iterator, uri))
1348
1349 for arch in self.pkg_archs.split(): 1346 for arch in self.pkg_archs.split():
1350 if not os.path.exists(os.path.join(self.deploy_dir, arch)): 1347 if not os.path.exists(os.path.join(self.deploy_dir, arch)):
1351 continue 1348 continue
1352 bb.note('Note: adding opkg channel url-%s-%d (%s)' % 1349 bb.note('Note: adding opkg feed url-%s-%d (%s)' %
1353 (arch, uri_iterator, uri)) 1350 (arch, uri_iterator, uri))
1354 1351
1355 config_file.write("src/gz uri-%s-%d %s/ipk/%s\n" % 1352 config_file.write("src/gz uri-%s-%d %s/ipk/%s\n" %