diff mbox

util-linux: do not disable non existing directories

Message ID 1413834757-7996-1-git-send-email-ps.report@gmx.net
State Superseded
Headers show

Commit Message

Peter Seiderer Oct. 20, 2014, 7:52 p.m. UTC
Legacy disabled sub directories mount-deprecated and fdisks do not
longer exist in util-linux-2.25.1 source package.

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 package/util-linux/util-linux.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni Oct. 20, 2014, 9:19 p.m. UTC | #1
Dear Peter Seiderer,

On Mon, 20 Oct 2014 21:52:37 +0200, Peter Seiderer wrote:
> Legacy disabled sub directories mount-deprecated and fdisks do not
> longer exist in util-linux-2.25.1 source package.
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
>  package/util-linux/util-linux.mk | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> index ebbab61..7586ab3 100644
> --- a/package/util-linux/util-linux.mk
> +++ b/package/util-linux/util-linux.mk
> @@ -102,9 +102,8 @@ HOST_UTIL_LINUX_CONF_OPTS += \
>  ifeq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES),)
>  define UTIL_LINUX_DISABLE_TOOLS
>  	$(SED) '/schedutils/d' -e '/text-utils/d' -e '/term-utils/d' \
> -		-e '/login-utils/d' -e '/mount-deprecated/d' \
> -		-e '/sys-utils/d' -e '/misc-utils/d' -e '/disk-utils/d' \
> -		-e '/fdisks/d' $(@D)/Makefile.am
> +		-e '/login-utils/d' -e '/sys-utils/d' -e '/misc-utils/d' \
> +		-e '/disk-utils/d' $(@D)/Makefile.am
>  endef
>  UTIL_LINUX_PRE_PATCH_HOOKS += UTIL_LINUX_DISABLE_TOOLS
>  endif

I haven't looked at the details, but can't we use
--disable-all-programs, like we do for the host variant of util-linux ?

Thanks,

Thomas
Peter Seiderer Oct. 20, 2014, 9:30 p.m. UTC | #2
Hello Thomas,

> Gesendet: Montag, 20. Oktober 2014 um 23:19 Uhr
> Von: "Thomas Petazzoni" <thomas.petazzoni@free-electrons.com>
> An: "Peter Seiderer" <ps.report@gmx.net>
> Cc: buildroot@busybox.net
> Betreff: Re: [Buildroot] [PATCH] util-linux: do not disable non existing directories
>
> Dear Peter Seiderer,
> 
> On Mon, 20 Oct 2014 21:52:37 +0200, Peter Seiderer wrote:
> > Legacy disabled sub directories mount-deprecated and fdisks do not
> > longer exist in util-linux-2.25.1 source package.
> > 
> > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> > ---
> >  package/util-linux/util-linux.mk | 5 ++---
> >  1 file changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
> > index ebbab61..7586ab3 100644
> > --- a/package/util-linux/util-linux.mk
> > +++ b/package/util-linux/util-linux.mk
> > @@ -102,9 +102,8 @@ HOST_UTIL_LINUX_CONF_OPTS += \
> >  ifeq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES),)
> >  define UTIL_LINUX_DISABLE_TOOLS
> >  	$(SED) '/schedutils/d' -e '/text-utils/d' -e '/term-utils/d' \
> > -		-e '/login-utils/d' -e '/mount-deprecated/d' \
> > -		-e '/sys-utils/d' -e '/misc-utils/d' -e '/disk-utils/d' \
> > -		-e '/fdisks/d' $(@D)/Makefile.am
> > +		-e '/login-utils/d' -e '/sys-utils/d' -e '/misc-utils/d' \
> > +		-e '/disk-utils/d' $(@D)/Makefile.am
> >  endef
> >  UTIL_LINUX_PRE_PATCH_HOOKS += UTIL_LINUX_DISABLE_TOOLS
> >  endif
> 
> I haven't looked at the details, but can't we use
> --disable-all-programs, like we do for the host variant of util-linux ?

Will take a look at it...., but needs some time... 

Regards,
Peter


> 
> Thanks,
> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
>
diff mbox

Patch

diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index ebbab61..7586ab3 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -102,9 +102,8 @@  HOST_UTIL_LINUX_CONF_OPTS += \
 ifeq ($(BR2_PACKAGE_UTIL_LINUX_BINARIES),)
 define UTIL_LINUX_DISABLE_TOOLS
 	$(SED) '/schedutils/d' -e '/text-utils/d' -e '/term-utils/d' \
-		-e '/login-utils/d' -e '/mount-deprecated/d' \
-		-e '/sys-utils/d' -e '/misc-utils/d' -e '/disk-utils/d' \
-		-e '/fdisks/d' $(@D)/Makefile.am
+		-e '/login-utils/d' -e '/sys-utils/d' -e '/misc-utils/d' \
+		-e '/disk-utils/d' $(@D)/Makefile.am
 endef
 UTIL_LINUX_PRE_PATCH_HOOKS += UTIL_LINUX_DISABLE_TOOLS
 endif