diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-16 12:26:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-25 22:45:50 +0100 |
commit | 8d27f1fea95b2b07edaa01970aa3ebd57541e896 (patch) | |
tree | 45933fe90b4a915bf67aa486b60b7e77057cc0a5 /meta/lib | |
parent | 2c363c233324526abc97e6b10dcd84c5b9ad7ace (diff) | |
download | poky-8d27f1fea95b2b07edaa01970aa3ebd57541e896.tar.gz |
selftest/imagefeatures/overlayfs: Always append to DISTRO_FEATURES
Using += unintentionally removes all other entries from DISTRO_FEATURES
if DISTRO_FEATURES was set by ?= such as by poky.conf. This reduces
sstate reusage on the autobuilder. Fix this to speed up builds.
(From OE-Core rev: d3beac233558242ab6895e9ba8536a6df9df8eb3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 124b82c32c4545bb216a8249954817f692f9795a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/imagefeatures.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/overlayfs.py | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py index 6b94ace4eb..6d010b3e3a 100644 --- a/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py | |||
@@ -235,7 +235,7 @@ USERADD_GID_TABLES += "files/static-group" | |||
235 | DISTRO_FEATURES:append = " pam opengl wayland" | 235 | DISTRO_FEATURES:append = " pam opengl wayland" |
236 | 236 | ||
237 | # Switch to systemd | 237 | # Switch to systemd |
238 | DISTRO_FEATURES += "systemd" | 238 | DISTRO_FEATURES:append = " systemd" |
239 | VIRTUAL-RUNTIME_init_manager = "systemd" | 239 | VIRTUAL-RUNTIME_init_manager = "systemd" |
240 | VIRTUAL-RUNTIME_initscripts = "" | 240 | VIRTUAL-RUNTIME_initscripts = "" |
241 | VIRTUAL-RUNTIME_syslog = "" | 241 | VIRTUAL-RUNTIME_syslog = "" |
diff --git a/meta/lib/oeqa/selftest/cases/overlayfs.py b/meta/lib/oeqa/selftest/cases/overlayfs.py index ce1d2f1ec3..96beb8b869 100644 --- a/meta/lib/oeqa/selftest/cases/overlayfs.py +++ b/meta/lib/oeqa/selftest/cases/overlayfs.py | |||
@@ -55,7 +55,7 @@ inherit overlayfs | |||
55 | 55 | ||
56 | config = """ | 56 | config = """ |
57 | IMAGE_INSTALL:append = " overlayfs-user" | 57 | IMAGE_INSTALL:append = " overlayfs-user" |
58 | DISTRO_FEATURES += "systemd overlayfs" | 58 | DISTRO_FEATURES:append = " systemd overlayfs" |
59 | """ | 59 | """ |
60 | 60 | ||
61 | self.write_config(config) | 61 | self.write_config(config) |
@@ -94,7 +94,7 @@ OVERLAYFS_QA_SKIP[mnt-overlay] = "mount-configured" | |||
94 | 94 | ||
95 | config = """ | 95 | config = """ |
96 | IMAGE_INSTALL:append = " overlayfs-user" | 96 | IMAGE_INSTALL:append = " overlayfs-user" |
97 | DISTRO_FEATURES += "systemd overlayfs" | 97 | DISTRO_FEATURES:append = " systemd overlayfs" |
98 | """ | 98 | """ |
99 | 99 | ||
100 | self.write_config(config) | 100 | self.write_config(config) |
@@ -112,7 +112,7 @@ DISTRO_FEATURES += "systemd overlayfs" | |||
112 | 112 | ||
113 | config = """ | 113 | config = """ |
114 | IMAGE_INSTALL:append = " overlayfs-user" | 114 | IMAGE_INSTALL:append = " overlayfs-user" |
115 | DISTRO_FEATURES += "systemd overlayfs" | 115 | DISTRO_FEATURES:append = " systemd overlayfs" |
116 | """ | 116 | """ |
117 | 117 | ||
118 | wrong_machine_config = """ | 118 | wrong_machine_config = """ |
@@ -136,7 +136,7 @@ OVERLAYFS_MOUNT_POINT[usr-share-overlay] = "/usr/share/overlay" | |||
136 | 136 | ||
137 | config = """ | 137 | config = """ |
138 | IMAGE_INSTALL:append = " overlayfs-user systemd-machine-units" | 138 | IMAGE_INSTALL:append = " overlayfs-user systemd-machine-units" |
139 | DISTRO_FEATURES += "systemd overlayfs" | 139 | DISTRO_FEATURES:append = " systemd overlayfs" |
140 | 140 | ||
141 | # Use systemd as init manager | 141 | # Use systemd as init manager |
142 | VIRTUAL-RUNTIME_init_manager = "systemd" | 142 | VIRTUAL-RUNTIME_init_manager = "systemd" |
@@ -271,7 +271,7 @@ class OverlayFSEtcRunTimeTests(OESelftestTestCase): | |||
271 | """ | 271 | """ |
272 | 272 | ||
273 | configBase = """ | 273 | configBase = """ |
274 | DISTRO_FEATURES += "systemd" | 274 | DISTRO_FEATURES:append = " systemd" |
275 | 275 | ||
276 | # Use systemd as init manager | 276 | # Use systemd as init manager |
277 | VIRTUAL-RUNTIME_init_manager = "systemd" | 277 | VIRTUAL-RUNTIME_init_manager = "systemd" |
@@ -313,7 +313,7 @@ OVERLAYFS_ETC_DEVICE = "/dev/mmcblk0p1" | |||
313 | """ | 313 | """ |
314 | 314 | ||
315 | config = """ | 315 | config = """ |
316 | DISTRO_FEATURES += "systemd" | 316 | DISTRO_FEATURES:append = " systemd" |
317 | 317 | ||
318 | # Use systemd as init manager | 318 | # Use systemd as init manager |
319 | VIRTUAL-RUNTIME_init_manager = "systemd" | 319 | VIRTUAL-RUNTIME_init_manager = "systemd" |
@@ -349,7 +349,7 @@ INHERIT += "overlayfs-etc" | |||
349 | """ | 349 | """ |
350 | 350 | ||
351 | config = f""" | 351 | config = f""" |
352 | DISTRO_FEATURES += "systemd" | 352 | DISTRO_FEATURES:append = " systemd" |
353 | 353 | ||
354 | # Use systemd as init manager | 354 | # Use systemd as init manager |
355 | VIRTUAL-RUNTIME_init_manager = "systemd" | 355 | VIRTUAL-RUNTIME_init_manager = "systemd" |
@@ -391,7 +391,7 @@ OVERLAYFS_ETC_DEVICE = "/dev/sda3" | |||
391 | """ | 391 | """ |
392 | 392 | ||
393 | config = """ | 393 | config = """ |
394 | DISTRO_FEATURES += "systemd" | 394 | DISTRO_FEATURES:append = " systemd" |
395 | 395 | ||
396 | # Use systemd as init manager | 396 | # Use systemd as init manager |
397 | VIRTUAL-RUNTIME_init_manager = "systemd" | 397 | VIRTUAL-RUNTIME_init_manager = "systemd" |