From 03ae735c8542cf4f66a8dc365c77517db29466af Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 8 Dec 2019 15:18:11 +0100 Subject: [PATCH] Brought xorriso-dd-target into libisoburn --- AUTHORS | 1 + Makefile.am | 24 ++++++++++++++++++++---- README | 20 ++++++++++++++++++++ configure.ac | 17 +++++++++++++++++ 4 files changed, 58 insertions(+), 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index 0547ea18..cdffd007 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,4 @@ Thomas Schmitt Vreixo Formoso Lopes +Nio Wiklund alias sudodus diff --git a/Makefile.am b/Makefile.am index ac3b0559..00f13da0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -180,9 +180,12 @@ xorriso_make_xorriso_1_CFLAGS = xorriso_make_xorriso_1_LDADD = xorriso_make_xorriso_1_SOURCES = xorriso/make_xorriso_1.c -# A Proof-of-concept for frontends +# A Proof-of-concept for frontends, and xorriso-dd-target if on Linux kernel bin_SCRIPTS = \ - frontend/xorriso-tcltk + frontend/xorriso-tcltk \ + $(XORRISO_DD_TARGET) + +EXTRA_SCRIPTS = xorriso-dd-target/xorriso-dd-target ## ========================================================================= ## @@ -242,13 +245,25 @@ man_MANS = \ xorriso/xorriso.1 \ xorriso/xorrisofs.1 \ xorriso/xorrecord.1 \ - xorriso/xorriso-tcltk.1 + xorriso/xorriso-tcltk.1 \ + $(XORRISO_DD_TARGET_MAN) + +EXTRA_MANS = xorriso-dd-target/xorriso-dd-target.1 info_TEXINFOS = \ xorriso/xorriso.texi \ xorriso/xorrisofs.texi \ xorriso/xorrecord.texi \ - xorriso/xorriso-tcltk.texi + xorriso/xorriso-tcltk.texi \ + xorriso-dd-target/xorriso-dd-target.texi + +# xorriso-dd-target.texi is hardcoded for now because of +# Makefile.am: error: texinfo file '@XORRISO_DD_TARGET_TEXI@' has +# unrecognized extension +# $(XORRISO_DD_TARGET_TEXI) +# +# EXTRA_TEXINFOS = xorriso-dd-target/xorriso-dd-target.texi + # To have a file in releng_generated_data. If the directory itself is listed # in Makefile.am EXTRA_DIST, then its .svn subdir gets into the tarball. @@ -270,6 +285,7 @@ EXTRA_DIST = \ frontend/sh_on_named_pipes.sh \ frontend/xorriso_broker.sh \ frontend/grub-mkrescue-sed.sh \ + xorriso-dd-target/xorriso-dd-target \ README \ AUTHORS \ CONTRIBUTORS \ diff --git a/README b/README index 5bf99f06..0aacc53c 100644 --- a/README +++ b/README @@ -250,6 +250,23 @@ Note: xorriso by default prefixes "stdio:" to addresses outside the /dev tree if they do not lead to an optical drive device file. + xorriso-dd-target + +libisoburn comes with a script named + xorriso-dd-target/xorriso-dd-target +which uses the util-linux program lsblk to find suitable hard-disk-like +target devices for copying hard-disk bootable ISO images onto them. Such images +are offered by GNU/Linux distributions for installing their system. + +xorriso-dd-target gets installed only if ./configure detects to run on a +GNU/Linux system. It refuses to start on non-Linux kernels or if program lsblk +is not found in /usr/sbin, /sbin, /usr/bin, /bin. + +For introduction, examples, and details see in the build directory + man xorriso-dd-target/xorriso-dd-target.1 + info xorriso-dd-target/xorriso-dd-target.info + + Testing For automated and manual tests of xorriso's functionality see file @@ -322,3 +339,6 @@ Libburn. By Derek Foreman and Copyright (C) 2002-2006 Derek Foreman and Ben Jansens libisoburn does not stem from their code. +The libisoburn release contains xorriso-dd-target +Copyright (C) 2019 Nio Wiklund alias sudodus, Thomas Schmitt + diff --git a/configure.ac b/configure.ac index 35e9438a..ec869c74 100644 --- a/configure.ac +++ b/configure.ac @@ -134,6 +134,23 @@ dnl Important: Must be performed _after_ TARGET_SHIZZLE dnl LIBBURNIA_SET_PKGCONFIG +dnl xorriso-dd-target is addicted to the Linux kernel and util-linux lsblk +if uname -s | grep '^Linux' >/dev/null +then + XORRISO_DD_TARGET=xorriso-dd-target/xorriso-dd-target + XORRISO_DD_TARGET_MAN=xorriso-dd-target/xorriso-dd-target.1 + XORRISO_DD_TARGET_TEXI=xorriso-dd-target/xorriso-dd-target.texi + echo "enabled installation of xorriso-dd-target/xorriso-dd-target" +else + XORRISO_DD_TARGET= + XORRISO_DD_TARGET_MAN= + XORRISO_DD_TARGET_TEXI= + echo "disabled installation of xorriso-dd-target/xorriso-dd-target" +fi +AC_SUBST(XORRISO_DD_TARGET) +AC_SUBST(XORRISO_DD_TARGET_MAN) +AC_SUBST(XORRISO_DD_TARGET_TEXI) + AC_ARG_ENABLE(libreadline, [ --enable-libreadline Enable use of libreadline by xorriso, default=yes], , enable_libreadline=yes)