package/coreutils: allow building individual binaries
PATCH v2 1/1 package/coreutils: allow building individual binaries
We add configuration option BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES so that coreutils can be built and installed as individual binaries. It can be used if the target file system doesn't support symlinks or symlinks are undesirable.
The approach is modelled after Busybox's similarly named configuration option.
--- package/coreutils/Config.in | 18 ++++++++++++++++++ package/coreutils/coreutils.mk | 8 +++++++- 2 files changed, 25 insertions(+), 1 deletion(-)
package/coreutils/Config.in +18 -0
@@ -19,3 +19,21 @@ comment "coreutils needs a toolchain w/ wchar" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + +if BR2_PACKAGE_COREUTILS + +config BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES + bool "Individual binaries" + depends on !BR2_STATIC_LIBS + help + By default (i.e. with this option disabled), coreutils is + installed as a single binary (Busybox style) called + /usr/bin/coreutils, and all core utilities are symbolic + links to this binary. + + With this option enabled, each utility is a separate binary. + +comment "coreutils individual binaries need a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + +endif
package/coreutils/coreutils.mk +7 -1
@@ -14,8 +14,14 @@ COREUTILS_LICENSE_FILES = COPYING COREUTILS_AUTORECONF = YES COREUTILS_GETTEXTIZE = YES -COREUTILS_CONF_OPTS = --disable-rpath --enable-single-binary=symlinks \ +COREUTILS_CONF_OPTS = \ + --disable-rpath \ $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex) + +ifeq ($(BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIES),) +COREUTILS_CONF_OPTS += --enable-single-binary=symlinks +endif + COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ ac_cv_func_chown_works=yes \ ac_cv_func_euidaccess=no \
Signature · 1 line
2.17.1
PATCH v2 1/1 package/coreutils: allow building individual binaries
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Markus" == Markus Mayer <[email protected]> writes:
We add configuration option
BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIESso that coreutils can be built and installed as individual binaries. It can be used if the target file system doesn't support symlinks or symlinks are undesirable.
Out of interest, what file system is that?
Quoted 2 lines
The approach is modelled after Busybox's similarly named configuration option.
The use case for individual binaries for busybox is afaik mainly for stuff like selinux, where you may want to have different policies for the different applets.
Signature · 1 line
Bye, Peter Korsgaard
PATCH v2 1/1 package/coreutils: allow building individual binaries
Quoted 9 lines · Peter Korsgaard
Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
"Markus" == Markus Mayer <[email protected]> writes:
We add configuration option
BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIESso that coreutils can be built and installed as individual binaries. It can be used if the target file system doesn't support symlinks or symlinks are undesirable.Out of interest, what file system is that?
VFAT -- yeah I know. At least only as a possible install medium not as the rootfs.
Quoted 6 lines
Quoted 2 lines
The approach is modelled after Busybox's similarly named configuration option.
The use case for individual binaries for busybox is afaik mainly for stuff like selinux, where you may want to have different policies for the different applets.
That would certainly be another use case, which could also be listed in the commit message.
Regards,
-Markus
PATCH v2 1/1 package/coreutils: allow building individual binaries
In reply to Markus MayerHello Markus,
Quoted 9 lines · On Wed, 10 Apr 2019 13:17:46 -0700 Markus Mayer <[email protected]> wrote:
We add configuration option
BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIESso that coreutils can be built and installed as individual binaries. It can be used if the target file system doesn't support symlinks or symlinks are undesirable.The approach is modelled after Busybox's similarly named configuration option.
Signed-off-by Markus Mayer <[email protected]>
I tested this, with BR2_ROOTFS_MERGED_USR and got some broken symlinks in /bin. I believe your patch is not sufficient. Indeed, it doesn't take care of the following parts of coreutils.mk:
ifeq ($(BR2_ROOTFS_MERGED_USR),)
define COREUTILS_CLEANUP_BIN
# some things go in /bin rather than /usr/bin
$(foreach f,$(COREUTILS_BIN_PROGS), \
rm -f $(TARGET_DIR)/usr/bin/$(f) && \
ln -sf ../usr/bin/coreutils $(TARGET_DIR)/bin/$(f)
)
endef
COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP_BIN
endifThis probably needs to be changed to move applets from /usr/bin to /bin rather than changing the symlinks.
define COREUTILS_CLEANUP
# link for archaic shells
ln -fs coreutils $(TARGET_DIR)/usr/bin/[
# gnu thinks chroot is in bin, debian thinks it's in sbin
rm -f $(TARGET_DIR)/usr/bin/chroot
ln -sf ../bin/coreutils $(TARGET_DIR)/usr/sbin/chroot
endefThe symlink logic here also needs to be adjusted I guess.
Could you fix this and retest ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/1 package/coreutils: allow building individual binaries
Hi Thomas,
It's been a while, but I had a chance to look at this again.
Quoted 20 lines · Thomas Petazzoni
Quoted 9 lines · On Wed, 10 Apr 2019 13:17:46 -0700 Markus Mayer <[email protected]> wrote:
We add configuration option
BR2_PACKAGE_COREUTILS_INDIVIDUAL_BINARIESso that coreutils can be built and installed as individual binaries. It can be used if the target file system doesn't support symlinks or symlinks are undesirable.The approach is modelled after Busybox's similarly named configuration option.
Signed-off-by Markus Mayer <[email protected]>I tested this, with
BR2_ROOTFS_MERGED_USRand got some broken symlinks in /bin. I believe your patch is not sufficient. Indeed, it doesn't take care of the following parts of coreutils.mk:ifeq ($(BR2_ROOTFS_MERGED_USR),)
defineCOREUTILS_CLEANUP_BIN
Quoted 8 lines
# some things go in /bin rather than /usr/bin
$(foreach f,$(COREUTILS_BIN_PROGS), \
rm -f $(TARGET_DIR)/usr/bin/$(f) && \
ln -sf ../usr/bin/coreutils $(TARGET_DIR)/bin/$(f)
)
endef
COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP_BIN
endifYou are saying above that you tried it *with* BR2_ROOTFS_MERGED_USR and got broken links, but the above seems to be a problem if BR2_ROOTFS_MERGED_USR is *disabled*, because the macro won't be executed if it is enabled.
Quoted 2 lines
This probably needs to be changed to move applets from
/usr/binto /bin rather than changing the symlinks.
I am not sure I am following. Why would we need to move applets from /usr/bin to /bin? Shouldn't we let coreutils install its applets where it sees fit? Or is the idea here that Buildroot wants to install binaries in a different location than coreutils would? If the latter is the case, yes, it would make sense to move the binaries rather than creating symlinks.
Quoted 9 lines
define
COREUTILS_CLEANUP# link for archaic shells ln -fs coreutils $(TARGET_DIR)/usr/bin/[ # gnu thinks chroot is in bin, debian thinks it's in sbin rm -f $(TARGET_DIR)/usr/bin/chroot ln -sf ../bin/coreutils $(TARGET_DIR)/usr/sbin/chroot endefThe symlink logic here also needs to be adjusted I guess.
Yes. Creating a symlink [ -> coreutils definitely won't work if we are using individual binaries. It'll have to point to "test" instead. And the solution for chroot would be similar to the symlinks above where we move the binary instead of creating the link.
Does the proposed solution make sense?
Thanks,
-Markus
Quoted 9 lines
Could you fix this and retest ?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com