diff mbox

[2/2] xorriso: Add host variant

Message ID 1458050877-24342-3-git-send-email-benoit.allard@greenbone.net
State Changes Requested
Headers show

Commit Message

Benoît Allard March 15, 2016, 2:07 p.m. UTC
Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
---
 package/Config.in.host         |  1 +
 package/xorriso/Config.in.host | 14 ++++++++++++++
 package/xorriso/xorriso.mk     |  2 ++
 3 files changed, 17 insertions(+)
 create mode 100644 package/xorriso/Config.in.host

Comments

Yann E. MORIN March 15, 2016, 9:35 p.m. UTC | #1
Benoît, All,

On 2016-03-15 15:07 +0100, Benoît Allard spake thusly:
> Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
> ---
>  package/Config.in.host         |  1 +
>  package/xorriso/Config.in.host | 14 ++++++++++++++
>  package/xorriso/xorriso.mk     |  2 ++
>  3 files changed, 17 insertions(+)
>  create mode 100644 package/xorriso/Config.in.host
> 
> diff --git a/package/Config.in.host b/package/Config.in.host
> index 09c98fb..a91612b 100644
> --- a/package/Config.in.host
> +++ b/package/Config.in.host
> @@ -32,6 +32,7 @@ menu "Host utilities"
>  	source "package/uboot-tools/Config.in.host"
>  	source "package/util-linux/Config.in.host"
>  	source "package/vboot-utils/Config.in.host"
> +	source "package/xorriso/Config.in.host"
>  	source "package/zip/Config.in.host"
>  
>  endmenu
> diff --git a/package/xorriso/Config.in.host b/package/xorriso/Config.in.host
> new file mode 100644
> index 0000000..2baa043
> --- /dev/null
> +++ b/package/xorriso/Config.in.host
> @@ -0,0 +1,14 @@
> +config BR2_PACKAGE_HOST_XORRISO
> +	bool "host xorriso"
> +	help
> +	  xorriso copies file objects from POSIX compliant
> +	  filesystems into Rock Ridge enhanced ISO 9660 filesystems
> +	  and allows session-wise manipulation of such filesystems.
> +	  It can load the management information of existing ISO
> +	  images and it writes the session results to optical media
> +	  or to filesystem objects.
> +
> +	  Vice versa xorriso is able to copy file objects out of ISO
> +	  9660 filesystems.
> +
> +	  https://www.gnu.org/software/xorriso

As I already replied in response to your previous iteration, I am
totally fine with xorriso being exposed in the host utilities submenu.

> diff --git a/package/xorriso/xorriso.mk b/package/xorriso/xorriso.mk
> index e8bb5cb..9e9ec8a 100644
> --- a/package/xorriso/xorriso.mk
> +++ b/package/xorriso/xorriso.mk
> @@ -8,6 +8,7 @@ XORRISO_VERSION = 1.4.2
>  XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso
>  XORRISO_LICENSE = GPLv3+
>  XORRISO_LICENSE_FILES = COPYING COPYRIGHT
> +HOST_XORRISO_DEPENDENCIES =

Well, that part I am not so sure. Yes, it does build correectly, but it
is highly dependent on the set of libraries (and their -dev files) being
installed on your host distro.

So, either we set the dependency list to empty, but then we explicitly
disable all optional features:

    HOST_XORRISO_DEPENDENCIES =
    HOST_XORRISO_CONF_OPTS = \
        --disable-libcdio \
        --disable-libreadline \
        --disable-libacl \
        and so on...

or we enable all those for which we do have a host package and for which
it makes sense (probably just acl, zlib and bzip2):

    HOST_XORRISO_DEPENDENCIES = host-acl host-zlib host-bzip2
    HOST_XORRISO_CONF_OPTS = \
        --enable-libacl \
        --enable-zlib \
        --enable-bzip2 \
        --disable-libcdio
        --disable-libreadline \
        ...

Both are equally easy I guess. However, I think the latter is more
interesting.

Regards,
Yann E. MORIN.

>  ifeq ($(BR2_PACKAGE_LIBICONV),y)
>  XORRISO_DEPENDENCIES += libiconv
> @@ -64,3 +65,4 @@ XORRISO_CONF_OPTS += --disable-jtethreads
>  endif
>  
>  $(eval $(autotools-package))
> +$(eval $(host-autotools-package))
> -- 
> 2.1.4
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Benoît Allard March 16, 2016, 8 a.m. UTC | #2
On Tue, 15 Mar 2016 22:35:37 +0100
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> > diff --git a/package/xorriso/xorriso.mk b/package/xorriso/xorriso.mk
> > index e8bb5cb..9e9ec8a 100644
> > --- a/package/xorriso/xorriso.mk
> > +++ b/package/xorriso/xorriso.mk
> > @@ -8,6 +8,7 @@ XORRISO_VERSION = 1.4.2
> >  XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso
> >  XORRISO_LICENSE = GPLv3+
> >  XORRISO_LICENSE_FILES = COPYING COPYRIGHT
> > +HOST_XORRISO_DEPENDENCIES =
> 
> Well, that part I am not so sure. Yes, it does build correectly, but
> it is highly dependent on the set of libraries (and their -dev files)
> being installed on your host distro.
> 
> So, either we set the dependency list to empty, but then we explicitly
> disable all optional features:
> 
>     HOST_XORRISO_DEPENDENCIES =
>     HOST_XORRISO_CONF_OPTS = \
>         --disable-libcdio \
>         --disable-libreadline \
>         --disable-libacl \
>         and so on...
> 
> or we enable all those for which we do have a host package and for
> which it makes sense (probably just acl, zlib and bzip2):
> 
>     HOST_XORRISO_DEPENDENCIES = host-acl host-zlib host-bzip2
>     HOST_XORRISO_CONF_OPTS = \
>         --enable-libacl \
>         --enable-zlib \
>         --enable-bzip2 \
>         --disable-libcdio
>         --disable-libreadline \
>         ...
> 
> Both are equally easy I guess. However, I think the latter is more
> interesting.

That makes sense of course ! I'll repost that patch with these options
and extend the CONF_OPTS with all the necessary disables, hopefully,
the needed features will still be included. I believe it makes sense to
`select` the correct packages in the Config.in.host as well, right ?

Regards,
Ben
diff mbox

Patch

diff --git a/package/Config.in.host b/package/Config.in.host
index 09c98fb..a91612b 100644
--- a/package/Config.in.host
+++ b/package/Config.in.host
@@ -32,6 +32,7 @@  menu "Host utilities"
 	source "package/uboot-tools/Config.in.host"
 	source "package/util-linux/Config.in.host"
 	source "package/vboot-utils/Config.in.host"
+	source "package/xorriso/Config.in.host"
 	source "package/zip/Config.in.host"
 
 endmenu
diff --git a/package/xorriso/Config.in.host b/package/xorriso/Config.in.host
new file mode 100644
index 0000000..2baa043
--- /dev/null
+++ b/package/xorriso/Config.in.host
@@ -0,0 +1,14 @@ 
+config BR2_PACKAGE_HOST_XORRISO
+	bool "host xorriso"
+	help
+	  xorriso copies file objects from POSIX compliant
+	  filesystems into Rock Ridge enhanced ISO 9660 filesystems
+	  and allows session-wise manipulation of such filesystems.
+	  It can load the management information of existing ISO
+	  images and it writes the session results to optical media
+	  or to filesystem objects.
+
+	  Vice versa xorriso is able to copy file objects out of ISO
+	  9660 filesystems.
+
+	  https://www.gnu.org/software/xorriso
diff --git a/package/xorriso/xorriso.mk b/package/xorriso/xorriso.mk
index e8bb5cb..9e9ec8a 100644
--- a/package/xorriso/xorriso.mk
+++ b/package/xorriso/xorriso.mk
@@ -8,6 +8,7 @@  XORRISO_VERSION = 1.4.2
 XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso
 XORRISO_LICENSE = GPLv3+
 XORRISO_LICENSE_FILES = COPYING COPYRIGHT
+HOST_XORRISO_DEPENDENCIES =
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 XORRISO_DEPENDENCIES += libiconv
@@ -64,3 +65,4 @@  XORRISO_CONF_OPTS += --disable-jtethreads
 endif
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))