From 8f08a3b489206a2137600941eb45198cf15cecc9 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 28 Nov 2018 16:23:11 +0100 Subject: sota.conf: use usrmerge OSTree needs UsrMove to be implemented, meaning that everything should be in /usr. OpenEmbedded has a distro feature usrmerge which implements exactly that, and makes sure that no package install anything in /bin, /sbin or /lib. Make use of it. Signed-off-by: Stefan Agner --- conf/distro/sota.conf.inc | 2 +- lib/oeqa/selftest/cases/updater.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index ea1ca95..8de9597 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc @@ -4,7 +4,7 @@ # # require conf/distro/sota.conf.inc -DISTRO_FEATURES_append = " sota" +DISTRO_FEATURES_append = " sota usrmerge" DISTRO_FEATURES_NATIVE_append = " sota" INHERIT += " sota" # Prelinking increases the size of downloads and causes build errors diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 7e55d07..92bf6fc 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py @@ -36,6 +36,10 @@ class GeneralTests(OESelftestTestCase): result = get_bb_var('DISTRO_FEATURES').find('sota') self.assertNotEqual(result, -1, 'Feature "sota" not set at DISTRO_FEATURES') + def test_feature_usrmerge(self): + result = get_bb_var('DISTRO_FEATURES').find('usrmerge') + self.assertNotEqual(result, -1, 'Feature "sota" not set at DISTRO_FEATURES') + def test_feature_systemd(self): result = get_bb_var('DISTRO_FEATURES').find('systemd') self.assertNotEqual(result, -1, 'Feature "systemd" not set at DISTRO_FEATURES') -- cgit v1.2.3-54-g00ecf