diff options
-rw-r--r-- | recipes-extended/images/container-base.bb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/recipes-extended/images/container-base.bb b/recipes-extended/images/container-base.bb index 434239a8..acce0411 100644 --- a/recipes-extended/images/container-base.bb +++ b/recipes-extended/images/container-base.bb | |||
@@ -18,8 +18,20 @@ IMAGE_INSTALL = " \ | |||
18 | base-files \ | 18 | base-files \ |
19 | base-passwd \ | 19 | base-passwd \ |
20 | netbase \ | 20 | netbase \ |
21 | ${CONTAINER_SHELL} \ | ||
21 | " | 22 | " |
22 | 23 | ||
24 | # If the following is configured in local.conf (or the distro): | ||
25 | # PACKAGE_EXTRA_ARCHS_append = " container-dummy-provides" | ||
26 | # | ||
27 | # it has been explicitly # indicated that we don't want or need a shell, so we'll | ||
28 | # add the dummy provides. | ||
29 | # | ||
30 | # This is required, since there are postinstall scripts in base-files and base-passwd | ||
31 | # that reference /bin/sh and we'll get a rootfs error if there's no shell or no dummy | ||
32 | # provider. | ||
33 | CONTAINER_SHELL ?= "${@bb.utils.contains('PACKAGE_EXTRA_ARCHS', 'container-dummy-provides', 'container-dummy-provides', 'busybox', d)}" | ||
34 | |||
23 | # Allow build with or without a specific kernel | 35 | # Allow build with or without a specific kernel |
24 | IMAGE_CONTAINER_NO_DUMMY = "1" | 36 | IMAGE_CONTAINER_NO_DUMMY = "1" |
25 | 37 | ||