| Message ID | 20220405085804.7467-1-martin.banov.dev@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v2] image-container-extension: exclude proc sys dev | expand |
05.04.2022 11:58, martin.banov.dev@gmail.com wrote: > From: Martin Banov <mabo@universal-robots.com> > > The patch prevents 'cp' from copying the kernel filesystems > into the docker container. > We had CI issues with 'cp' trying to copy /proc/<pid>/pagemap. > > Signed-off-by: Martin Banov <mabo@universal-robots.com> > Signed-off-by: Daniel Machon <dama@universal-robots.com> > --- > meta/classes/image-container-extension.bbclass | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass > index cdec463..f4e8d41 100644 > --- a/meta/classes/image-container-extension.bbclass > +++ b/meta/classes/image-container-extension.bbclass > @@ -29,9 +29,8 @@ containerize_rootfs() { > "${oci_img_dir}_unpacked" > > # add root filesystem as the flesh of the skeleton > - sudo cp -a "${rootfs}"/* "${oci_img_dir}_unpacked/rootfs/" > - # clean-up temporary files > - sudo find "${oci_img_dir}_unpacked/rootfs/tmp" -mindepth 1 -delete > + sudo cp -axT "${rootfs}" "${oci_img_dir}_unpacked/rootfs/" > + Please remove unnecessary spaces here. > > # pack container image > bbdebug 1 "pack container image" Also this patch fails on 'bitbake -c do_populate_sdk mc:container-amd64-stretch:isar-image-base' if setting SDK_FORMATS = "docker-archive"
diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass index cdec463..f4e8d41 100644 --- a/meta/classes/image-container-extension.bbclass +++ b/meta/classes/image-container-extension.bbclass @@ -29,9 +29,8 @@ containerize_rootfs() { "${oci_img_dir}_unpacked" # add root filesystem as the flesh of the skeleton - sudo cp -a "${rootfs}"/* "${oci_img_dir}_unpacked/rootfs/" - # clean-up temporary files - sudo find "${oci_img_dir}_unpacked/rootfs/tmp" -mindepth 1 -delete + sudo cp -axT "${rootfs}" "${oci_img_dir}_unpacked/rootfs/" + # pack container image bbdebug 1 "pack container image"