diff options
author | Vivien Didelot <vdidelot@pbsc.com> | 2021-03-01 11:53:24 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-06 22:39:03 +0000 |
commit | 67763ccd1c69c91d853149165793d56ffef5d23c (patch) | |
tree | ec3b34b0719134639433b005ea72bf27174d473e | |
parent | 530babd3f8465dcd67fa443245e253281d1b4163 (diff) | |
download | poky-67763ccd1c69c91d853149165793d56ffef5d23c.tar.gz |
systemd-container: recommend tar
If systemd is configured with importd, "machinectl import-*" can be
used to add container trees under /var/lib/machines.
But "machinectl import-tar" makes use of "tar --numeric-owner" which
is not supported by the busybox binary, as shown below:
# machinectl import-tar /tmp/container.tar.xz
Enqueued transfer job 1. Press C-c to continue download in background.
Importing '/tmp/container.tar.xz', saving as 'container'.
Imported 0%.
tar: unrecognized option '--numeric-owner'
BusyBox v1.31.1 () multi-call binary.
Usage: tar c|x|t [-ZzJjahmvokO] [-f TARFILE] [-C DIR] [-T FILE] [-X FILE] [FILE]...
Failed to decode and write: Broken pipe
Exiting.
To fix this, recommend the standard tar package.
Cc: Chen Qi <Qi.Chen@windriver.com>
(From OE-Core rev: 801658f0161270c76829a123a4f531ca5a1f73db)
Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/systemd/systemd_247.3.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd_247.3.bb b/meta/recipes-core/systemd/systemd_247.3.bb index 1aac754cfc..3454085e5f 100644 --- a/meta/recipes-core/systemd/systemd_247.3.bb +++ b/meta/recipes-core/systemd/systemd_247.3.bb | |||
@@ -484,10 +484,12 @@ FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.c | |||
484 | ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \ | 484 | ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \ |
485 | " | 485 | " |
486 | 486 | ||
487 | # "machinectl import-tar" uses "tar --numeric-owner", not supported by busybox. | ||
487 | RRECOMMENDS_${PN}-container += "\ | 488 | RRECOMMENDS_${PN}-container += "\ |
488 | ${PN}-journal-gatewayd \ | 489 | ${PN}-journal-gatewayd \ |
489 | ${PN}-journal-remote \ | 490 | ${PN}-journal-remote \ |
490 | ${PN}-journal-upload \ | 491 | ${PN}-journal-upload \ |
492 | tar \ | ||
491 | " | 493 | " |
492 | 494 | ||
493 | FILES_${PN}-extra-utils = "\ | 495 | FILES_${PN}-extra-utils = "\ |