On Wed, 2022-03-09 at 15:29 +0100, Claudius Heine wrote:
> The 'FILES:${PN}' array is missing the systemd unit dir prefix causing
> them to not be packaged and the build fails with the
> `installed-vs-shipped` error.
>
> This adds the `systemd_system_unitdir` variable in front of every unit
> file added with this class.
>
> Signed-off-by: Claudius Heine <[email protected]>
> ---
> meta/classes/overlayfs.bbclass | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/overlayfs.bbclass b/meta/classes/overlayfs.bbclass
> index 4a860f7308..f525ea6625 100644
> --- a/meta/classes/overlayfs.bbclass
> +++ b/meta/classes/overlayfs.bbclass
> @@ -103,7 +103,8 @@ python () {
> unitList = unitFileList(d)
> for unit in unitList:
> d.appendVar('SYSTEMD_SERVICE:' + d.getVar('PN'), ' ' + unit)
> - d.appendVar('FILES:' + d.getVar('PN'), ' ' + strForBash(unit))
> + d.appendVar('FILES:' + d.getVar('PN'), ' ' +
> + d.getVar('systemd_system_unitdir') + '/' + strForBash(unit))
>
> d.setVar('OVERLAYFS_UNIT_LIST', ' '.join([strForBash(s) for s in
> unitList]))
> }
I have to wonder how this is being tested since this patch injects tabs into a
python function and that triggers warnings about tabs in python code.
That caused selftest failures:
https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/3227
https://autobuilder.yoctoproject.org/typhoon/#/builders/86/builds/3240
https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/3271
I've tweaked the patch to fix the whitespace here and in the other patch but I
notice more patches on the list also with what I suspect are whitespace issues.
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#163007):
https://lists.openembedded.org/g/openembedded-core/message/163007
Mute This Topic: https://lists.openembedded.org/mt/89662850/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
