[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2097/8267] rootfs.py: allow removal of unneeded packages

[Emmanuele Bassi <ebassi src gnome org>]

commit d45a3449bc15de2334860c1964b81a20d876174c
Author: Stephano Cetola <stephano cetola linux intel com>
Date:   Wed Aug 17 16:25:33 2016 -0700

    rootfs.py: allow removal of unneeded packages
    
    Current functionality allows for the removal of certain packages
    based on the read-only image feature. This patch extends this
    functionality by adding the FORCE_RO_REMOVE variable, which will
    remove these packages regardless of any image features.
    
    [ YOCTO #9491 ]
    
    (From OE-Core rev: cfb869ffd4c37c3cc8e6b3eb732c1a7b7cfc3cb0)
    
    Signed-off-by: Stephano Cetola <stephano cetola linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/rootfs.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index ed0bab1..7c620e9 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -253,7 +253,9 @@ class Rootfs(object, metaclass=ABCMeta):
 
         image_rorfs = bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs",
                                         True, False, self.d)
-        if image_rorfs:
+        image_rorfs_force = self.d.getVar('FORCE_RO_REMOVE', True)
+
+        if image_rorfs or image_rorfs_force == "1":
             # Remove components that we don't need if it's a read-only rootfs
             unneeded_pkgs = self.d.getVar("ROOTFS_RO_UNNEEDED", True).split()
             pkgs_installed = image_list_installed_packages(self.d)