diff options
-rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.31.bb | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/meta/recipes-core/coreutils/coreutils_8.31.bb b/meta/recipes-core/coreutils/coreutils_8.31.bb index 2b196b7512..0c8452da98 100644 --- a/meta/recipes-core/coreutils/coreutils_8.31.bb +++ b/meta/recipes-core/coreutils/coreutils_8.31.bb | |||
@@ -59,9 +59,20 @@ base_bindir_progs = "cat chgrp chmod chown cp date dd echo false hostname kill l | |||
59 | 59 | ||
60 | sbindir_progs= "chroot" | 60 | sbindir_progs= "chroot" |
61 | 61 | ||
62 | PACKAGE_BEFORE_PN_class-target += "coreutils-stdbuf" | 62 | # Split stdbuf into its own package, so one can include |
63 | # coreutils-stdbuf without getting the rest of coreutils, but make | ||
64 | # coreutils itself pull in stdbuf, so IMAGE_INSTALL += "coreutils" | ||
65 | # always provides all coreutils | ||
66 | PACKAGE_BEFORE_PN_class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}" | ||
63 | FILES_coreutils-stdbuf = "${bindir}/stdbuf ${libdir}/coreutils/libstdbuf.so" | 67 | FILES_coreutils-stdbuf = "${bindir}/stdbuf ${libdir}/coreutils/libstdbuf.so" |
64 | RDEPENDS_coreutils_class-target += "coreutils-stdbuf" | 68 | RDEPENDS_coreutils_class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}" |
69 | |||
70 | # However, when the single-binary PACKAGECONFIG is used, stdbuf | ||
71 | # functionality is built into the single coreutils binary, so there's | ||
72 | # no point splitting /usr/bin/stdbuf to its own package. Instead, add | ||
73 | # an RPROVIDE so that rdepending on coreutils-stdbuf will work | ||
74 | # regardless of whether single-binary is in effect. | ||
75 | RPROVIDES_coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', 'coreutils-stdbuf', '', d)}" | ||
65 | 76 | ||
66 | # Let aclocal use the relative path for the m4 file rather than the | 77 | # Let aclocal use the relative path for the m4 file rather than the |
67 | # absolute since coreutils has a lot of m4 files, otherwise there might | 78 | # absolute since coreutils has a lot of m4 files, otherwise there might |