From baab91ee8cccbdebe272001a0a364a417fd36668 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 11 Aug 2015 09:45:02 +0100 Subject: 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 master rev: 18e5dcfc610a255e490e4425f11213b8e14c6e00) (From OE-Core rev: 886a31054808f40b563b7ff5f402f3f0d115759a) Signed-off-by: Joshua Lock Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 0460415699..5dff6b3db6 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -1341,13 +1341,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" % -- cgit v1.2.3-54-g00ecf