diff options
| author |   Joshua Lock <joshua.lock@collabora.co.uk> | 2015-08-11 09:45:02 +0100 |
|---|---|---|
| committer | Joshua Lock <joshua.lock@collabora.co.uk> | 2015-09-01 12:36:14 +0100 |
| commit | 886a31054808f40b563b7ff5f402f3f0d115759a (patch) | |
| tree | c41a0d7450b11261caff47c9f65d72aa5bd2b419 /meta/lib | |
| parent | e4cb0bf63b74c3b5c29850452248c8f4ad09bda7 (diff) | |
| download | openembedded-core-contrib-886a31054808f40b563b7ff5f402f3f0d115759a.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 master 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/lib')
| -rw-r--r-- | meta/lib/oe/package_manager.py | 5 |
1 files changed, 1 insertions, 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" % |