[Buildroot] Various patches

[Buildroot] Various patches

[Gilles Chanteperdrix]

Hi,

as advised in the answers to the "reproducible build" patches, I
have separated the patches that could be submitted upstream and are
not really related to reproducible builds. The patches follow this
e-mail.

They are also available as a git branch here:
https://git.click-hack.org/buildroot.git/log/?h=for-upstream

Regards.

-- 
					    Gilles.
https://click-hack.org

[Buildroot] [PATCH 1/5] wireshark: remove documentation

[Gilles Chanteperdrix]

Remove html and txt documentation from the rootfs as they unlikely to be
needed.

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
---
 package/wireshark/wireshark.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index c7bf6c2..23996a3 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -99,4 +99,10 @@ else
 WIRESHARK_CONF_OPTS += --with-sbc=no
 endif
 
+define WIRESHARK_REMOVE_DOCS
+	find $(TARGET_DIR)/usr/share/wireshark -\( -name '*.txt' -o -name '*.html' -\) -delete
+endef
+
+WIRESHARK_POST_INSTALL_TARGET_HOOKS += WIRESHARK_REMOVE_DOCS
+
 $(eval $(autotools-package))
-- 
2.8.2

[Buildroot] [PATCH 2/5] readline: fix installed libraries permission

[Gilles Chanteperdrix]

In order to avoid strip failing to strip the library.

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
---
 package/readline/0009-avoid-strip-perm-issue.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 package/readline/0009-avoid-strip-perm-issue.patch

diff --git a/package/readline/0009-avoid-strip-perm-issue.patch b/package/readline/0009-avoid-strip-perm-issue.patch
new file mode 100644
index 0000000..8415ca2
--- /dev/null
+++ b/package/readline/0009-avoid-strip-perm-issue.patch
@@ -0,0 +1,11 @@
+--- readline-6.3/support/shlib-install~	2012-07-10 21:58:08.000000000 +0200
++++ readline-6.3/support/shlib-install	2016-02-27 01:19:09.878310797 +0100
+@@ -73,7 +73,7 @@ fi
+ case "$host_os" in
+ hpux*|darwin*|macosx*|linux*|solaris2*)
+ 	if [ -z "$uninstall" ]; then
+-		chmod 555 ${INSTALLDIR}/${LIBNAME}
++		chmod 755 ${INSTALLDIR}/${LIBNAME}
+ 	fi ;;
+ cygwin*|mingw*)
+ 	IMPLIBNAME=`echo ${LIBNAME} \
-- 
2.8.2

[Buildroot] [PATCH 3/5] pkg-download: allow ssh URLs

[Gilles Chanteperdrix]

Use git when such an URL is met.

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
---
 package/pkg-download.mk                            | 2 +-
 package/readline/0009-avoid-strip-perm-issue.patch | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index a0f694d..5f7a155 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -225,7 +225,7 @@ define DOWNLOAD_INNER
 	fi ; \
 	if test -n "$(1)" ; then \
 		case "$($(PKG)_SITE_METHOD)" in \
-			git) $($(3)_GIT) && exit ;; \
+			git|ssh) $($(3)_GIT) && exit ;; \
 			svn) $($(3)_SVN) && exit ;; \
 			cvs) $($(3)_CVS) && exit ;; \
 			bzr) $($(3)_BZR) && exit ;; \
diff --git a/package/readline/0009-avoid-strip-perm-issue.patch b/package/readline/0009-avoid-strip-perm-issue.patch
index 8415ca2..55d5166 100644
--- a/package/readline/0009-avoid-strip-perm-issue.patch
+++ b/package/readline/0009-avoid-strip-perm-issue.patch
@@ -1,3 +1,6 @@
+Avoid libreadline to be installed read-only, as it makes stripping fail.
+
+Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
 --- readline-6.3/support/shlib-install~	2012-07-10 21:58:08.000000000 +0200
 +++ readline-6.3/support/shlib-install	2016-02-27 01:19:09.878310797 +0100
 @@ -73,7 +73,7 @@ fi
-- 
2.8.2

[Buildroot] [PATCH 3/5] pkg-download: allow ssh URLs

[Yann E. MORIN]

Gilles, All,

On 2016-06-14 17:05 +0200, Gilles Chanteperdrix spake thusly:
> Use git when such an URL is met.

What about Hg URLs that can also start with 'ssh://' ?

I guess we should not try to be smart here, and let users specify the
method with the _SITE_METHOD variable.

Regards,
Yann E. MORIN.

> Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> ---
>  package/pkg-download.mk                            | 2 +-
>  package/readline/0009-avoid-strip-perm-issue.patch | 3 +++
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> index a0f694d..5f7a155 100644
> --- a/package/pkg-download.mk
> +++ b/package/pkg-download.mk
> @@ -225,7 +225,7 @@ define DOWNLOAD_INNER
>  	fi ; \
>  	if test -n "$(1)" ; then \
>  		case "$($(PKG)_SITE_METHOD)" in \
> -			git) $($(3)_GIT) && exit ;; \
> +			git|ssh) $($(3)_GIT) && exit ;; \
>  			svn) $($(3)_SVN) && exit ;; \
>  			cvs) $($(3)_CVS) && exit ;; \
>  			bzr) $($(3)_BZR) && exit ;; \
> diff --git a/package/readline/0009-avoid-strip-perm-issue.patch b/package/readline/0009-avoid-strip-perm-issue.patch
> index 8415ca2..55d5166 100644
> --- a/package/readline/0009-avoid-strip-perm-issue.patch
> +++ b/package/readline/0009-avoid-strip-perm-issue.patch
> @@ -1,3 +1,6 @@
> +Avoid libreadline to be installed read-only, as it makes stripping fail.
> +
> +Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
>  --- readline-6.3/support/shlib-install~	2012-07-10 21:58:08.000000000 +0200
>  +++ readline-6.3/support/shlib-install	2016-02-27 01:19:09.878310797 +0100
>  @@ -73,7 +73,7 @@ fi
> -- 
> 2.8.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 3/5] pkg-download: allow ssh URLs

[Gilles Chanteperdrix]

On Tue, Jun 14, 2016 at 10:14:26PM +0200, Yann E. MORIN wrote:
> Gilles, All,
> 
> On 2016-06-14 17:05 +0200, Gilles Chanteperdrix spake thusly:
> > Use git when such an URL is met.
> 
> What about Hg URLs that can also start with 'ssh://' ?
> 
> I guess we should not try to be smart here, and let users specify the
> method with the _SITE_METHOD variable.

Yeah, well, my initial patch proposed git+ssh:// and I was told that
this was deprecated. The conversation lead to a dead-end with nobody
giving me a clear indication of what I should propose.

So, let us go back to my initial need: have a package compiled based
on a git over ssh URL. Now if you tell me that there is a way to do
this without patching pkg-download.mk, I am all ears. I did not find
any help on that in the documentation, do you have some pointers?

-- 
					    Gilles.
https://click-hack.org

[Buildroot] [PATCH 3/5] pkg-download: allow ssh URLs

[Yann E. MORIN]

Gilles, All,

On 2016-06-15 23:29 +0200, Gilles Chanteperdrix spake thusly:
> On Tue, Jun 14, 2016 at 10:14:26PM +0200, Yann E. MORIN wrote:
> > Gilles, All,
> > 
> > On 2016-06-14 17:05 +0200, Gilles Chanteperdrix spake thusly:
> > > Use git when such an URL is met.
> > 
> > What about Hg URLs that can also start with 'ssh://' ?
> > 
> > I guess we should not try to be smart here, and let users specify the
> > method with the _SITE_METHOD variable.
> 
> Yeah, well, my initial patch proposed git+ssh:// and I was told that
> this was deprecated. The conversation lead to a dead-end with nobody
> giving me a clear indication of what I should propose.
> 
> So, let us go back to my initial need: have a package compiled based
> on a git over ssh URL. Now if you tell me that there is a way to do
> this without patching pkg-download.mk, I am all ears. I did not find
> any help on that in the documentation, do you have some pointers?

As far as I understand your requirements, you want to be able to write
either of:

    FOO_SITE = user at machine:path/to/repo.git
or
    FOO_SITE = ssh://user at machine/path/to/rpo.git

You just have to add:

    FOO_SITE_METHOD = git

See the manual, search for _SITE_METHOD: ;-)
    https://buildroot.org/downloads/manual/manual.html#generic-package-reference

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 3/5] pkg-download: allow ssh URLs

[Gilles Chanteperdrix]

On Wed, Jun 15, 2016 at 11:37:11PM +0200, Yann E. MORIN wrote:
> Gilles, All,
> 
> On 2016-06-15 23:29 +0200, Gilles Chanteperdrix spake thusly:
> > On Tue, Jun 14, 2016 at 10:14:26PM +0200, Yann E. MORIN wrote:
> > > Gilles, All,
> > > 
> > > On 2016-06-14 17:05 +0200, Gilles Chanteperdrix spake thusly:
> > > > Use git when such an URL is met.
> > > 
> > > What about Hg URLs that can also start with 'ssh://' ?
> > > 
> > > I guess we should not try to be smart here, and let users specify the
> > > method with the _SITE_METHOD variable.
> > 
> > Yeah, well, my initial patch proposed git+ssh:// and I was told that
> > this was deprecated. The conversation lead to a dead-end with nobody
> > giving me a clear indication of what I should propose.
> > 
> > So, let us go back to my initial need: have a package compiled based
> > on a git over ssh URL. Now if you tell me that there is a way to do
> > this without patching pkg-download.mk, I am all ears. I did not find
> > any help on that in the documentation, do you have some pointers?
> 
> As far as I understand your requirements, you want to be able to write
> either of:
> 
>     FOO_SITE = user at machine:path/to/repo.git
> or
>     FOO_SITE = ssh://user at machine/path/to/rpo.git
> 
> You just have to add:
> 
>     FOO_SITE_METHOD = git
> 
> See the manual, search for _SITE_METHOD: ;-)
>     https://buildroot.org/downloads/manual/manual.html#generic-package-reference

Ok, thanks.

-- 
					    Gilles.
https://click-hack.org

[Buildroot] [PATCH 3/5] pkg-download: allow ssh URLs

[Yann E. MORIN]

Gilles, All,

On 2016-06-16 21:36 +0200, Gilles Chanteperdrix spake thusly:
> On Wed, Jun 15, 2016 at 11:37:11PM +0200, Yann E. MORIN wrote:
> > Gilles, All,
> > 
> > On 2016-06-15 23:29 +0200, Gilles Chanteperdrix spake thusly:
> > > On Tue, Jun 14, 2016 at 10:14:26PM +0200, Yann E. MORIN wrote:
> > > > Gilles, All,
> > > > 
> > > > On 2016-06-14 17:05 +0200, Gilles Chanteperdrix spake thusly:
> > > > > Use git when such an URL is met.
> > > > 
> > > > What about Hg URLs that can also start with 'ssh://' ?
> > > > 
> > > > I guess we should not try to be smart here, and let users specify the
> > > > method with the _SITE_METHOD variable.
> > > 
> > > Yeah, well, my initial patch proposed git+ssh:// and I was told that
> > > this was deprecated. The conversation lead to a dead-end with nobody
> > > giving me a clear indication of what I should propose.
> > > 
> > > So, let us go back to my initial need: have a package compiled based
> > > on a git over ssh URL. Now if you tell me that there is a way to do
> > > this without patching pkg-download.mk, I am all ears. I did not find
> > > any help on that in the documentation, do you have some pointers?
> > 
> > As far as I understand your requirements, you want to be able to write
> > either of:
> > 
> >     FOO_SITE = user at machine:path/to/repo.git
> > or
> >     FOO_SITE = ssh://user at machine/path/to/rpo.git
> > 
> > You just have to add:
> > 
> >     FOO_SITE_METHOD = git
> > 
> > See the manual, search for _SITE_METHOD: ;-)
> >     https://buildroot.org/downloads/manual/manual.html#generic-package-reference
> 
> Ok, thanks.

So, that fits your requirements? Should your patch be dropped, then?

Regards,
Yann E. MORIN.


-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 3/5] pkg-download: allow ssh URLs

[Gilles Chanteperdrix]

On Thu, Jun 16, 2016 at 09:41:25PM +0200, Yann E. MORIN wrote:
> Gilles, All,
> 
> On 2016-06-16 21:36 +0200, Gilles Chanteperdrix spake thusly:
> > On Wed, Jun 15, 2016 at 11:37:11PM +0200, Yann E. MORIN wrote:
> > > Gilles, All,
> > > 
> > > On 2016-06-15 23:29 +0200, Gilles Chanteperdrix spake thusly:
> > > > On Tue, Jun 14, 2016 at 10:14:26PM +0200, Yann E. MORIN wrote:
> > > > > Gilles, All,
> > > > > 
> > > > > On 2016-06-14 17:05 +0200, Gilles Chanteperdrix spake thusly:
> > > > > > Use git when such an URL is met.
> > > > > 
> > > > > What about Hg URLs that can also start with 'ssh://' ?
> > > > > 
> > > > > I guess we should not try to be smart here, and let users specify the
> > > > > method with the _SITE_METHOD variable.
> > > > 
> > > > Yeah, well, my initial patch proposed git+ssh:// and I was told that
> > > > this was deprecated. The conversation lead to a dead-end with nobody
> > > > giving me a clear indication of what I should propose.
> > > > 
> > > > So, let us go back to my initial need: have a package compiled based
> > > > on a git over ssh URL. Now if you tell me that there is a way to do
> > > > this without patching pkg-download.mk, I am all ears. I did not find
> > > > any help on that in the documentation, do you have some pointers?
> > > 
> > > As far as I understand your requirements, you want to be able to write
> > > either of:
> > > 
> > >     FOO_SITE = user at machine:path/to/repo.git
> > > or
> > >     FOO_SITE = ssh://user at machine/path/to/rpo.git
> > > 
> > > You just have to add:
> > > 
> > >     FOO_SITE_METHOD = git
> > > 
> > > See the manual, search for _SITE_METHOD: ;-)
> > >     https://buildroot.org/downloads/manual/manual.html#generic-package-reference
> > 
> > Ok, thanks.
> 
> So, that fits your requirements? Should your patch be dropped, then?

I guess so. I have not tried, but I will take your word for it. Yes,
you can drop the patch.

Regards.

-- 
					    Gilles.
https://click-hack.org

[Buildroot] [PATCH 4/5] grub2: really disable liblzma

[Gilles Chanteperdrix]

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
---
 boot/grub2/grub2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 88a46f4..112a401 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -62,7 +62,7 @@ GRUB2_CONF_OPTS = \
 	--with-platform=$(GRUB2_PLATFORM) \
 	--disable-grub-mkfont \
 	--enable-efiemu=no \
-	--enable-liblzma=no \
+	ac_cv_lib_lzma_lzma_code=no \
 	--enable-device-mapper=no \
 	--enable-libzfs=no \
 	--disable-werror
-- 
2.8.2

[Buildroot] [PATCH 4/5] grub2: really disable liblzma

[Yann E. MORIN]

On 2016-06-14 17:05 +0200, Gilles Chanteperdrix spake thusly:
> Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> ---
>  boot/grub2/grub2.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
> index 88a46f4..112a401 100644
> --- a/boot/grub2/grub2.mk
> +++ b/boot/grub2/grub2.mk
> @@ -62,7 +62,7 @@ GRUB2_CONF_OPTS = \
>  	--with-platform=$(GRUB2_PLATFORM) \
>  	--disable-grub-mkfont \
>  	--enable-efiemu=no \
> -	--enable-liblzma=no \
> +	ac_cv_lib_lzma_lzma_code=no \

It would have been nice to say that --enale-liblzma is not a supported
option to grub2's configure.

Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

>  	--enable-device-mapper=no \
>  	--enable-libzfs=no \
>  	--disable-werror
> -- 
> 2.8.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 5/5] grub2: allow full install (for installer images)

[Gilles Chanteperdrix]

Compile grub2 with the target toolchain in the "full install" case, so
that the generated binaries do not depend on the host toolchain used.

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
---
 boot/grub2/Config.in | 10 ++++++++++
 boot/grub2/grub2.mk  | 34 ++++++++++++++++++++++++----------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in
index 7dc5cae..901d38b 100644
--- a/boot/grub2/Config.in
+++ b/boot/grub2/Config.in
@@ -139,6 +139,14 @@ config BR2_TARGET_GRUB2_X86_64_EFI
 
 endchoice
 
+config BR2_TARGET_FULL_INSTALL
+	bool "full install on target"
+	help
+	  Select this option to install grub on target rather than
+	  generating images.
+
+if !BR2_TARGET_FULL_INSTALL
+
 if BR2_TARGET_GRUB2_I386_PC
 
 config BR2_TARGET_GRUB2_BOOT_PARTITION
@@ -166,4 +174,6 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG
 	  device and other configuration parameters, but however menu
 	  entries cannot be described in this embedded configuration.
 
+endif
+
 endif # BR2_TARGET_GRUB2
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 112a401..e94f524 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -46,6 +46,17 @@ endif
 # bootloader itself; none of these are used to build the native
 # tools.
 
+GRUB2_CONF_OPTS = \
+	--target=$(GRUB2_TARGET) \
+	--with-platform=$(GRUB2_PLATFORM) \
+	--disable-grub-mkfont \
+	--enable-efiemu=no \
+	ac_cv_lib_lzma_lzma_code=no \
+	--enable-device-mapper=no \
+	--enable-libzfs=no \
+	--disable-werror
+
+ifneq ($(BR2_TARGET_FULL_INSTALL),y)
 GRUB2_CONF_ENV = \
 	$(HOST_CONFIGURE_OPTS) \
 	CPP="$(HOSTCC) -E" \
@@ -57,16 +68,6 @@ GRUB2_CONF_ENV = \
 	OBJCOPY="$(TARGET_OBJCOPY)" \
 	STRIP="$(TARGET_STRIP)"
 
-GRUB2_CONF_OPTS = \
-	--target=$(GRUB2_TARGET) \
-	--with-platform=$(GRUB2_PLATFORM) \
-	--disable-grub-mkfont \
-	--enable-efiemu=no \
-	ac_cv_lib_lzma_lzma_code=no \
-	--enable-device-mapper=no \
-	--enable-libzfs=no \
-	--disable-werror
-
 # We don't want all the native tools and Grub2 modules to be installed
 # in the target. So we in fact install everything into the host
 # directory, and the image generation process (below) will use the
@@ -104,4 +105,17 @@ endef
 GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_EFI_STARTUP_NSH
 endif
 
+else
+GRUB2_CONF_ENV = \
+	$(TARGET_CONFIGURE_OPTS) \
+	CPP="$(TARGET_CC) -E" \
+	TARGET_CC="$(TARGET_CC)" \
+	TARGET_CFLAGS="$(TARGET_CFLAGS)" \
+	TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
+	TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
+	NM="$(TARGET_NM)" \
+	OBJCOPY="$(TARGET_OBJCOPY)" \
+	STRIP="$(TARGET_STRIP)"
+endif
+
 $(eval $(autotools-package))
-- 
2.8.2

[Buildroot] Various patches

[Gilles Chanteperdrix]

On Tue, Jun 14, 2016 at 05:04:12PM +0200, Gilles Chanteperdrix wrote:
> Hi,
> 
> as advised in the answers to the "reproducible build" patches, I
> have separated the patches that could be submitted upstream and are
> not really related to reproducible builds. The patches follow this
> e-mail.
> 
> They are also available as a git branch here:
> https://git.click-hack.org/buildroot.git/log/?h=for-upstream

Sorry, two patches are broken. Trying again.

-- 
					    Gilles.
https://click-hack.org

[Buildroot] [PATCH 1/5] wireshark: remove documentation

[Gilles Chanteperdrix]

Remove html and txt documentation from the rootfs as they unlikely to be
needed.

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
---
 package/wireshark/wireshark.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index c7bf6c2..23996a3 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -99,4 +99,10 @@ else
 WIRESHARK_CONF_OPTS += --with-sbc=no
 endif
 
+define WIRESHARK_REMOVE_DOCS
+	find $(TARGET_DIR)/usr/share/wireshark -\( -name '*.txt' -o -name '*.html' -\) -delete
+endef
+
+WIRESHARK_POST_INSTALL_TARGET_HOOKS += WIRESHARK_REMOVE_DOCS
+
 $(eval $(autotools-package))
-- 
2.8.2

[Buildroot] [PATCH 2/5] readline: fix installed libraries permission

[Gilles Chanteperdrix]

In order to avoid strip failing to strip the library.

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
---
 package/readline/0009-avoid-strip-perm-issue.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 package/readline/0009-avoid-strip-perm-issue.patch

diff --git a/package/readline/0009-avoid-strip-perm-issue.patch b/package/readline/0009-avoid-strip-perm-issue.patch
new file mode 100644
index 0000000..55d5166
--- /dev/null
+++ b/package/readline/0009-avoid-strip-perm-issue.patch
@@ -0,0 +1,14 @@
+Avoid libreadline to be installed read-only, as it makes stripping fail.
+
+Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
+--- readline-6.3/support/shlib-install~	2012-07-10 21:58:08.000000000 +0200
++++ readline-6.3/support/shlib-install	2016-02-27 01:19:09.878310797 +0100
+@@ -73,7 +73,7 @@ fi
+ case "$host_os" in
+ hpux*|darwin*|macosx*|linux*|solaris2*)
+ 	if [ -z "$uninstall" ]; then
+-		chmod 555 ${INSTALLDIR}/${LIBNAME}
++		chmod 755 ${INSTALLDIR}/${LIBNAME}
+ 	fi ;;
+ cygwin*|mingw*)
+ 	IMPLIBNAME=`echo ${LIBNAME} \
-- 
2.8.2

[Buildroot] [PATCH 2/5] readline: fix installed libraries permission

[Yann E. MORIN]

Gilles, All,

On 2016-06-14 17:11 +0200, Gilles Chanteperdrix spake thusly:
> In order to avoid strip failing to strip the library.

I just tried to build readline, and the two libraries that are installed
are already 755:

    -rwxr-xr-x 1 ymorin ymorin  33K Jun 14 21:59 target/usr/lib/libhistory.so.6.3*
    -rwxr-xr-x 1 ymorin ymorin 261K Jun 14 21:59 target/usr/lib/libreadline.so.6.3*

And after some inspection, we already fix that in our readline.mk:

    # libraries get installed read only, so strip fails
    define READLINE_INSTALL_FIXUPS_SHARED
        chmod +w $(addprefix $(TARGET_DIR)/usr/lib/,libhistory.so.* libreadline.so.*)
    endef
    READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_INSTALL_FIXUPS_SHARED

Regards,
Yann E. MORIN.

> Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> ---
>  package/readline/0009-avoid-strip-perm-issue.patch | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
>  create mode 100644 package/readline/0009-avoid-strip-perm-issue.patch
> 
> diff --git a/package/readline/0009-avoid-strip-perm-issue.patch b/package/readline/0009-avoid-strip-perm-issue.patch
> new file mode 100644
> index 0000000..55d5166
> --- /dev/null
> +++ b/package/readline/0009-avoid-strip-perm-issue.patch
> @@ -0,0 +1,14 @@
> +Avoid libreadline to be installed read-only, as it makes stripping fail.
> +
> +Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> +--- readline-6.3/support/shlib-install~	2012-07-10 21:58:08.000000000 +0200
> ++++ readline-6.3/support/shlib-install	2016-02-27 01:19:09.878310797 +0100
> +@@ -73,7 +73,7 @@ fi
> + case "$host_os" in
> + hpux*|darwin*|macosx*|linux*|solaris2*)
> + 	if [ -z "$uninstall" ]; then
> +-		chmod 555 ${INSTALLDIR}/${LIBNAME}
> ++		chmod 755 ${INSTALLDIR}/${LIBNAME}
> + 	fi ;;
> + cygwin*|mingw*)
> + 	IMPLIBNAME=`echo ${LIBNAME} \
> -- 
> 2.8.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 2/5] readline: fix installed libraries permission

[Peter Korsgaard]

>>>>> "Gilles" == Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> writes:

 > In order to avoid strip failing to strip the library.
 > Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>

Thanks, but we already have logic in readline.mk to fix this:

ifneq ($(BR2_STATIC_LIBS),y)
# libraries get installed read only, so strip fails
define READLINE_INSTALL_FIXUPS_SHARED
	chmod +w $(addprefix $(TARGET_DIR)/usr/lib/,libhistory.so.* libreadline.so.*)
endef
READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_INSTALL_FIXUPS_SHARED
endif

So why this patch instead? It would be good if we could get rid of both,
have you tried sending it upstream?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/5] readline: fix installed libraries permission

[Gilles Chanteperdrix]

On Tue, Jun 14, 2016 at 10:21:23PM +0200, Peter Korsgaard wrote:
> >>>>> "Gilles" == Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> writes:
> 
>  > In order to avoid strip failing to strip the library.
>  > Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> 
> Thanks, but we already have logic in readline.mk to fix this:

Ok, I guess I made the original patch before you included that patch
in readline.mk.

> 
> ifneq ($(BR2_STATIC_LIBS),y)
> # libraries get installed read only, so strip fails
> define READLINE_INSTALL_FIXUPS_SHARED
> 	chmod +w $(addprefix $(TARGET_DIR)/usr/lib/,libhistory.so.* libreadline.so.*)
> endef
> READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_INSTALL_FIXUPS_SHARED
> endif
> 
> So why this patch instead? It would be good if we could get rid of both,
> have you tried sending it upstream?

No, and I will not.

-- 
					    Gilles.
https://click-hack.org

[Buildroot] [PATCH 2/5] readline: fix installed libraries permission

[Peter Korsgaard]

>>>>> "Gilles" == Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> writes:

Hi,

 > On Tue, Jun 14, 2016 at 10:21:23PM +0200, Peter Korsgaard wrote:
 >> >>>>> "Gilles" == Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> writes:
 >> 
 >> > In order to avoid strip failing to strip the library.
 >> > Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
 >> 
 >> Thanks, but we already have logic in readline.mk to fix this:

 > Ok, I guess I made the original patch before you included that patch
 > in readline.mk.

This patch was added in January. Please base your patches on recent
versions to ensure they still apply / are needed.

 >> So why this patch instead? It would be good if we could get rid of both,
 >> have you tried sending it upstream?

 > No, and I will not.

:/

-- 
Venlig hilsen,
Peter Korsgaard 

[Buildroot] [PATCH 2/5] readline: fix installed libraries permission

[Gilles Chanteperdrix]

On Wed, Jun 15, 2016 at 11:48:43PM +0200, Peter Korsgaard wrote:
> >>>>> "Gilles" == Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> writes:
> 
> Hi,
> 
>  > On Tue, Jun 14, 2016 at 10:21:23PM +0200, Peter Korsgaard wrote:
>  >> >>>>> "Gilles" == Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> writes:
>  >> 
>  >> > In order to avoid strip failing to strip the library.
>  >> > Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
>  >> 
>  >> Thanks, but we already have logic in readline.mk to fix this:
> 
>  > Ok, I guess I made the original patch before you included that patch
>  > in readline.mk.
> 
> This patch was added in January. Please base your patches on recent
> versions to ensure they still apply / are needed.

I worked on these issues starting from the latest release at the
time which was 2015.11.1. I of course rebased the patch on master
(exactly commit 00bd9daf0e75f76c2d15196feb9c7f608668430e, as you can
see using the URL I posted) but I simply missed the fact that
readline.mk had been modified, because the patch applied cleanly.

> 
>  >> So why this patch instead? It would be good if we could get rid of both,
>  >> have you tried sending it upstream?
> 
>  > No, and I will not.
> 
> :/

Well, anyone else can submit it if he is interested. You can even
remove my name and put yours instead, I do not care.

-- 
					    Gilles.
https://click-hack.org

[Buildroot] [PATCH 3/5] pkg-download: allow ssh URLs

[Gilles Chanteperdrix]

Use git when such an URL is met.

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
---
 package/pkg-download.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index a0f694d..5f7a155 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -225,7 +225,7 @@ define DOWNLOAD_INNER
 	fi ; \
 	if test -n "$(1)" ; then \
 		case "$($(PKG)_SITE_METHOD)" in \
-			git) $($(3)_GIT) && exit ;; \
+			git|ssh) $($(3)_GIT) && exit ;; \
 			svn) $($(3)_SVN) && exit ;; \
 			cvs) $($(3)_CVS) && exit ;; \
 			bzr) $($(3)_BZR) && exit ;; \
-- 
2.8.2

[Buildroot] [PATCH 3/5] pkg-download: allow ssh URLs

[Thomas Petazzoni]

Hello,

On Tue, 14 Jun 2016 17:11:17 +0200, Gilles Chanteperdrix wrote:

> diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> index a0f694d..5f7a155 100644
> --- a/package/pkg-download.mk
> +++ b/package/pkg-download.mk
> @@ -225,7 +225,7 @@ define DOWNLOAD_INNER
>  	fi ; \
>  	if test -n "$(1)" ; then \
>  		case "$($(PKG)_SITE_METHOD)" in \
> -			git) $($(3)_GIT) && exit ;; \
> +			git|ssh) $($(3)_GIT) && exit ;; \

There has already been a question from Yann on a previous iteration of
this patch, which hasn't been answered:

"""
What about Hg URLs that can also start with 'ssh://' ?
"""

Indeed, I don't see why a ssh:// URL should necessarily reference a Git
repository. And there's no explanation about this decision in the
commit log.

Thanks,

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

[Buildroot] [PATCH 3/5] pkg-download: allow ssh URLs

[Gilles Chanteperdrix]

On Wed, Jun 15, 2016 at 11:08:08PM +0200, Thomas Petazzoni wrote:
> Hello,
> 
> On Tue, 14 Jun 2016 17:11:17 +0200, Gilles Chanteperdrix wrote:
> 
> > diff --git a/package/pkg-download.mk b/package/pkg-download.mk
> > index a0f694d..5f7a155 100644
> > --- a/package/pkg-download.mk
> > +++ b/package/pkg-download.mk
> > @@ -225,7 +225,7 @@ define DOWNLOAD_INNER
> >  	fi ; \
> >  	if test -n "$(1)" ; then \
> >  		case "$($(PKG)_SITE_METHOD)" in \
> > -			git) $($(3)_GIT) && exit ;; \
> > +			git|ssh) $($(3)_GIT) && exit ;; \
> 
> There has already been a question from Yann on a previous iteration of
> this patch, which hasn't been answered:
> 
> """
> What about Hg URLs that can also start with 'ssh://' ?
> """
> 
> Indeed, I don't see why a ssh:// URL should necessarily reference a Git
> repository. And there's no explanation about this decision in the
> commit log.

See the discussion here:
http://lists.busybox.net/pipermail/buildroot/2016-May/160670.html

-- 
					    Gilles.
https://click-hack.org

[Buildroot] [PATCH 3/5] pkg-download: allow ssh URLs

[Thomas Petazzoni]

Hello,

On Thu, 16 Jun 2016 21:40:24 +0200, Gilles Chanteperdrix wrote:

> > """
> > What about Hg URLs that can also start with 'ssh://' ?
> > """
> > 
> > Indeed, I don't see why a ssh:// URL should necessarily reference a Git
> > repository. And there's no explanation about this decision in the
> > commit log.  
> 
> See the discussion here:
> http://lists.busybox.net/pipermail/buildroot/2016-May/160670.html

I might be missing something, but I don't see anything in this
discussion that gives a justification as to why ssh:// in Buildroot
should always mean "git over ssh" and not potentially "mercurial over
ssh" or "subversion over ssh".

Thanks,

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

[Buildroot] [PATCH 4/5] grub2: really disable liblzma

[Gilles Chanteperdrix]

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
---
 boot/grub2/grub2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 88a46f4..112a401 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -62,7 +62,7 @@ GRUB2_CONF_OPTS = \
 	--with-platform=$(GRUB2_PLATFORM) \
 	--disable-grub-mkfont \
 	--enable-efiemu=no \
-	--enable-liblzma=no \
+	ac_cv_lib_lzma_lzma_code=no \
 	--enable-device-mapper=no \
 	--enable-libzfs=no \
 	--disable-werror
-- 
2.8.2

[Buildroot] [PATCH 4/5] grub2: really disable liblzma

[Yann E. MORIN]

Gilles, All,

Replying to the correct version now. Next time, can you set the version
of the series when sending, please? See:
    https://buildroot.org/downloads/manual/manual.html#_patch_revision_changelog

On 2016-06-14 17:11 +0200, Gilles Chanteperdrix spake thusly:
> Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> ---
>  boot/grub2/grub2.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
> index 88a46f4..112a401 100644
> --- a/boot/grub2/grub2.mk
> +++ b/boot/grub2/grub2.mk
> @@ -62,7 +62,7 @@ GRUB2_CONF_OPTS = \
>  	--with-platform=$(GRUB2_PLATFORM) \
>  	--disable-grub-mkfont \
>  	--enable-efiemu=no \
> -	--enable-liblzma=no \
> +	ac_cv_lib_lzma_lzma_code=no \

It would have been nice to say that --enale-liblzma is not a supported
option to grub2's configure.

Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

>  	--enable-device-mapper=no \
>  	--enable-libzfs=no \
>  	--disable-werror
> -- 
> 2.8.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 4/5] grub2: really disable liblzma

[Thomas Petazzoni]

Hello,

On Tue, 14 Jun 2016 17:11:18 +0200, Gilles Chanteperdrix wrote:
> Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> ---
>  boot/grub2/grub2.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I've applied to master, after extending a bit the commit log, as
suggested by Yann E. Morin.

Thanks!

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

[Buildroot] [PATCH 5/5] grub2: allow full install (for installer images)

[Gilles Chanteperdrix]

Compile grub2 with the target toolchain in the "full install" case, so
that the generated binaries do not depend on the host toolchain used.

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
---
 boot/grub2/Config.in | 10 ++++++++++
 boot/grub2/grub2.mk  | 34 ++++++++++++++++++++++++----------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/boot/grub2/Config.in b/boot/grub2/Config.in
index 7dc5cae..901d38b 100644
--- a/boot/grub2/Config.in
+++ b/boot/grub2/Config.in
@@ -139,6 +139,14 @@ config BR2_TARGET_GRUB2_X86_64_EFI
 
 endchoice
 
+config BR2_TARGET_FULL_INSTALL
+	bool "full install on target"
+	help
+	  Select this option to install grub on target rather than
+	  generating images.
+
+if !BR2_TARGET_FULL_INSTALL
+
 if BR2_TARGET_GRUB2_I386_PC
 
 config BR2_TARGET_GRUB2_BOOT_PARTITION
@@ -166,4 +174,6 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG
 	  device and other configuration parameters, but however menu
 	  entries cannot be described in this embedded configuration.
 
+endif
+
 endif # BR2_TARGET_GRUB2
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index 112a401..e94f524 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -46,6 +46,17 @@ endif
 # bootloader itself; none of these are used to build the native
 # tools.
 
+GRUB2_CONF_OPTS = \
+	--target=$(GRUB2_TARGET) \
+	--with-platform=$(GRUB2_PLATFORM) \
+	--disable-grub-mkfont \
+	--enable-efiemu=no \
+	ac_cv_lib_lzma_lzma_code=no \
+	--enable-device-mapper=no \
+	--enable-libzfs=no \
+	--disable-werror
+
+ifneq ($(BR2_TARGET_FULL_INSTALL),y)
 GRUB2_CONF_ENV = \
 	$(HOST_CONFIGURE_OPTS) \
 	CPP="$(HOSTCC) -E" \
@@ -57,16 +68,6 @@ GRUB2_CONF_ENV = \
 	OBJCOPY="$(TARGET_OBJCOPY)" \
 	STRIP="$(TARGET_STRIP)"
 
-GRUB2_CONF_OPTS = \
-	--target=$(GRUB2_TARGET) \
-	--with-platform=$(GRUB2_PLATFORM) \
-	--disable-grub-mkfont \
-	--enable-efiemu=no \
-	ac_cv_lib_lzma_lzma_code=no \
-	--enable-device-mapper=no \
-	--enable-libzfs=no \
-	--disable-werror
-
 # We don't want all the native tools and Grub2 modules to be installed
 # in the target. So we in fact install everything into the host
 # directory, and the image generation process (below) will use the
@@ -104,4 +105,17 @@ endef
 GRUB2_POST_INSTALL_TARGET_HOOKS += GRUB2_EFI_STARTUP_NSH
 endif
 
+else
+GRUB2_CONF_ENV = \
+	$(TARGET_CONFIGURE_OPTS) \
+	CPP="$(TARGET_CC) -E" \
+	TARGET_CC="$(TARGET_CC)" \
+	TARGET_CFLAGS="$(TARGET_CFLAGS)" \
+	TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
+	TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
+	NM="$(TARGET_NM)" \
+	OBJCOPY="$(TARGET_OBJCOPY)" \
+	STRIP="$(TARGET_STRIP)"
+endif
+
 $(eval $(autotools-package))
-- 
2.8.2

[Buildroot] [PATCH 1/5] wireshark: remove documentation

[Yann E. MORIN]

Gilles, All,

On 2016-06-14 17:11 +0200, Gilles Chanteperdrix spake thusly:
> Remove html and txt documentation from the rootfs as they unlikely to be
> needed.
> 
> Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> ---
>  package/wireshark/wireshark.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index c7bf6c2..23996a3 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -99,4 +99,10 @@ else
>  WIRESHARK_CONF_OPTS += --with-sbc=no
>  endif
>  
> +define WIRESHARK_REMOVE_DOCS
> +	find $(TARGET_DIR)/usr/share/wireshark -\( -name '*.txt' -o -name '*.html' -\) -delete

My busybox' find does not like:

  - '-(' ')-' : it is not POSIX, is not even talked about in the find
    manpage. It's a GNUism.

  - -delete : it is disabled in our default busybox configuration

Regards,
Yann E. MORIN.

> +endef
> +
> +WIRESHARK_POST_INSTALL_TARGET_HOOKS += WIRESHARK_REMOVE_DOCS
> +
>  $(eval $(autotools-package))
> -- 
> 2.8.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/5] wireshark: remove documentation

[Yann E. MORIN]

Gilles, All,

On 2016-06-14 21:33 +0200, Yann E. MORIN spake thusly:
> On 2016-06-14 17:11 +0200, Gilles Chanteperdrix spake thusly:
> > Remove html and txt documentation from the rootfs as they unlikely to be
> > needed.
> > 
> > Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> > ---
> >  package/wireshark/wireshark.mk | 6 ++++++
> >  1 file changed, 6 insertions(+)
> > 
> > diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> > index c7bf6c2..23996a3 100644
> > --- a/package/wireshark/wireshark.mk
> > +++ b/package/wireshark/wireshark.mk
> > @@ -99,4 +99,10 @@ else
> >  WIRESHARK_CONF_OPTS += --with-sbc=no
> >  endif
> >  
> > +define WIRESHARK_REMOVE_DOCS
> > +	find $(TARGET_DIR)/usr/share/wireshark -\( -name '*.txt' -o -name '*.html' -\) -delete
> 
> My busybox' find does not like:
> 
>   - '-(' ')-' : it is not POSIX, is not even talked about in the find
>     manpage. It's a GNUism.
> 
>   - -delete : it is disabled in our default busybox configuration

Grr.. Forget it; this is done at build-time...

Sorry for the noise  (I should not do two things in parallel in two
terminals)...

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/5] wireshark: remove documentation

[Peter Korsgaard]

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > Gilles, All,
 > On 2016-06-14 17:11 +0200, Gilles Chanteperdrix spake thusly:
 >> Remove html and txt documentation from the rootfs as they unlikely to be
 >> needed.
 >> 
 >> Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
 >> ---
 >> package/wireshark/wireshark.mk | 6 ++++++
 >> 1 file changed, 6 insertions(+)
 >> 
 >> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
 >> index c7bf6c2..23996a3 100644
 >> --- a/package/wireshark/wireshark.mk
 >> +++ b/package/wireshark/wireshark.mk
 >> @@ -99,4 +99,10 @@ else
 >> WIRESHARK_CONF_OPTS += --with-sbc=no
 >> endif
 >> 
 >> +define WIRESHARK_REMOVE_DOCS
 >> +	find $(TARGET_DIR)/usr/share/wireshark -\( -name '*.txt' -o -name '*.html' -\) -delete

 > My busybox' find does not like:

 >   - '-(' ')-' : it is not POSIX, is not even talked about in the find
 >     manpage. It's a GNUism.

 >   - -delete : it is disabled in our default busybox configuration

I agree to stick to posix where possible / sensible, but Are you really
*building* on a busybox based system?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/5] wireshark: remove documentation

[Peter Korsgaard]

>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

Hi,

 >> +define WIRESHARK_REMOVE_DOCS
 >> +	find $(TARGET_DIR)/usr/share/wireshark -\( -name '*.txt' -o -name '*.html' -\) -delete

 > My busybox' find does not like:

 >   - '-(' ')-' : it is not POSIX, is not even talked about in the find
 >     manpage. It's a GNUism.

 >   - -delete : it is disabled in our default busybox configuration

With that said, I've changed it to use xargs:

find $(TARGET_DIR)/usr/share/wireshark -name '*.txt' -o '*.html' -print0 \
        | xargs -0 rm -f

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/5] wireshark: remove documentation

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

 > With that said, I've changed it to use xargs:

 > find $(TARGET_DIR)/usr/share/wireshark -name '*.txt' -o '*.html' -print0 \
 >         | xargs -0 rm -f

Ups, I missed a -print0 after -name '*.txt'.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/5] wireshark: remove documentation

[Yann E. MORIN]

Gilles, All,

On 2016-06-14 17:11 +0200, Gilles Chanteperdrix spake thusly:
> Remove html and txt documentation from the rootfs as they unlikely to be
> needed.
> 
> Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> ---
>  package/wireshark/wireshark.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index c7bf6c2..23996a3 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -99,4 +99,10 @@ else
>  WIRESHARK_CONF_OPTS += --with-sbc=no
>  endif
>  
> +define WIRESHARK_REMOVE_DOCS
> +	find $(TARGET_DIR)/usr/share/wireshark -\( -name '*.txt' -o -name '*.html' -\) -delete

The slight change that I'd suggest (not request!) is to not add a dash
in front of the commas, since it is not even talked about in find's
manpage.

Otherwise:

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> +endef
> +
> +WIRESHARK_POST_INSTALL_TARGET_HOOKS += WIRESHARK_REMOVE_DOCS
> +
>  $(eval $(autotools-package))
> -- 
> 2.8.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/5] wireshark: remove documentation

[Peter Korsgaard]

>>>>> "Gilles" == Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> writes:

 > Remove html and txt documentation from the rootfs as they unlikely to be
 > needed.

 > Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>

Committed, thanks.

usr/share/wireshark still contains >5MB of files, mainly xml and similar
text files. Do you know if these are all needed?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/5] wireshark: remove documentation

[Gilles Chanteperdrix]

On Tue, Jun 14, 2016 at 10:12:18PM +0200, Peter Korsgaard wrote:
> >>>>> "Gilles" == Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> writes:
> 
>  > Remove html and txt documentation from the rootfs as they unlikely to be
>  > needed.
> 
>  > Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
> 
> Committed, thanks.
> 
> usr/share/wireshark still contains >5MB of files, mainly xml and similar
> text files. Do you know if these are all needed?

No, no idea. The only problem I had was that the html documentation
made a non reproducible build.

-- 
					    Gilles.
https://click-hack.org