[oe-commits] [openembedded-core] 08/16: rootfs: always update the opkg index

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit bce90f48d1cc136fdfdf98b3830f5d99e381271b
Author: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
AuthorDate: Tue Sep 25 15:38:19 2018 +0300

    rootfs: always update the opkg index
    
    The previous logic assumed that if $BUILD_IMAGES_FROM_FEEDS=1 then a
    complete set of ipk feeds from which to build the image is already
    present under $IPK_FEED_URIS at do_rootfs runtime.
    
    $IPK_FEED_URIS usually contains "file://${DEPLOY_DIR_IPK}" which
    renders the above assumption bad because some recipes in the current
    build can contain code like do_install[nostamp] = "1" which will cause
    rebuilds bumping $PR and invalidating the index.
    
    Even when the index is manually re-created before an image build
    ("bitbake package-index"), the nostamp will cause failures because the
    dependency gets rebuilt before do_rootfs in the "bitbake <image>" call.
    
    So make the opkg rootfs index logic the same as for rpm/deb, to always
    update the index in $DEPLOY_DIR_IPK to fix the above nostamp failure.
    
    Feeds outside $DEPLOY_DIR_IPK added to $IPK_FEED_URIS continue to work
    as usual, for eg. by using a http:// URI.
    
    Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu at ni.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/rootfs.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index cdb86f7..67ae281 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -853,9 +853,8 @@ class OpkgRootfs(DpkgOpkgRootfs):
         opkg_pre_process_cmds = self.d.getVar('OPKG_PREPROCESS_COMMANDS')
         opkg_post_process_cmds = self.d.getVar('OPKG_POSTPROCESS_COMMANDS')
 
-        # update PM index files, unless users provide their own feeds
-        if (self.d.getVar('BUILD_IMAGES_FROM_FEEDS') or "") != "1":
-            self.pm.write_index()
+        # update PM index files
+        self.pm.write_index()
 
         execute_pre_post_process(self.d, opkg_pre_process_cmds)
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.