| Message ID | 1436392260-55786-1-git-send-email-ryan.barnett@rockwellcollins.com |
|---|---|
| State | Accepted |
| Headers | show |
Hi Ryan, On Wed, Jul 08, 2015 at 04:51:00PM -0500, Ryan Barnett wrote: > Currently, busybox installs a version of tune2fs in /sbin/ while > e2fsprogs installs at /usr/sbin/. This causes issues if a user is > expecting the to use the full version from a prompt via 'tune2fs' > since busybox's tune2fs will be found first from the default path > search. > > Fix this by removing the busybox version of tune2fs when a user has > selected the option to install tune2fs from e2fsprogs. > > Signed-off-by: Ryan Barnett <ryan.barnett@rockwellcollins.com> Reviewed-by: Baruch Siach <baruch@tkos.co.il> baruch > --- > Changes v1 -> v2: > - add condition depenencies on busybox (suggested by Baruch) > --- > package/e2fsprogs/e2fsprogs.mk | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk > index e0c4ee2..e6a5027 100644 > --- a/package/e2fsprogs/e2fsprogs.mk > +++ b/package/e2fsprogs/e2fsprogs.mk > @@ -36,7 +36,8 @@ ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) > E2FSPROGS_CONF_ENV += LIBS=-lintl > endif > > -E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux > +E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux \ > + $(if $(BR2_PACKAGE_BUSYBOX),busybox) > > E2FSPROGS_MAKE_OPTS = \ > LDCONFIG=true > @@ -102,7 +103,11 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_E2FSCK),y) > E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_E2FSCK_SYMLINKS > endif > > +# Remove busybox tune2fs and e2label since that will take precedence full version > define E2FSPROGS_TARGET_TUNE2FS_SYMLINK > + $(if $(BR2_PACKAGE_BUSYBOX), \ > + rm -f $(TARGET_DIR)/sbin/tune2fs; \ > + rm -f $(TARGET_DIR)/sbin/e2label;) > ln -sf e2label $(TARGET_DIR)/usr/sbin/tune2fs > endef
Dear Ryan Barnett, On Wed, 8 Jul 2015 16:51:00 -0500, Ryan Barnett wrote: > +# Remove busybox tune2fs and e2label since that will take precedence full version > define E2FSPROGS_TARGET_TUNE2FS_SYMLINK > + $(if $(BR2_PACKAGE_BUSYBOX), \ > + rm -f $(TARGET_DIR)/sbin/tune2fs; \ > + rm -f $(TARGET_DIR)/sbin/e2label;) > ln -sf e2label $(TARGET_DIR)/usr/sbin/tune2fs > endef I really didn't like the hijacking of E2FSPROGS_TARGET_TUNE2FS_SYMLINK for the purposes of Busybox related issues, so I've separated the Busybox related handling into a different post install target hook and committed. Please check http://git.buildroot.net/buildroot/commit/?id=aa02829240b2927b2cb379eb904b6f40ff751237 Thanks! Thomas
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index e0c4ee2..e6a5027 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -36,7 +36,8 @@ ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) E2FSPROGS_CONF_ENV += LIBS=-lintl endif -E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux +E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux \ + $(if $(BR2_PACKAGE_BUSYBOX),busybox) E2FSPROGS_MAKE_OPTS = \ LDCONFIG=true @@ -102,7 +103,11 @@ ifeq ($(BR2_PACKAGE_E2FSPROGS_E2FSCK),y) E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_E2FSCK_SYMLINKS endif +# Remove busybox tune2fs and e2label since that will take precedence full version define E2FSPROGS_TARGET_TUNE2FS_SYMLINK + $(if $(BR2_PACKAGE_BUSYBOX), \ + rm -f $(TARGET_DIR)/sbin/tune2fs; \ + rm -f $(TARGET_DIR)/sbin/e2label;) ln -sf e2label $(TARGET_DIR)/usr/sbin/tune2fs endef
Currently, busybox installs a version of tune2fs in /sbin/ while e2fsprogs installs at /usr/sbin/. This causes issues if a user is expecting the to use the full version from a prompt via 'tune2fs' since busybox's tune2fs will be found first from the default path search. Fix this by removing the busybox version of tune2fs when a user has selected the option to install tune2fs from e2fsprogs. Signed-off-by: Ryan Barnett <ryan.barnett@rockwellcollins.com> --- Changes v1 -> v2: - add condition depenencies on busybox (suggested by Baruch) --- package/e2fsprogs/e2fsprogs.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)