Brought xorriso-dd-target into GNU xorriso

This commit is contained in:
Thomas Schmitt 2019-12-07 18:58:44 +01:00
parent ba505e86c9
commit d315b65d17
4 changed files with 60 additions and 4 deletions

View File

@ -263,6 +263,23 @@ Prefix "mmc:" causes a path to be accepted only if it is a real optical drive
which is accessible by generic SCSI/MMC commands.
xorriso-dd-target
GNU xorriso 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

View File

@ -133,6 +133,22 @@ then
AC_DEFINE([Libburn_os_has_statvfS], [])
fi
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)
dnl Add compiler-specific flags

View File

@ -258,6 +258,14 @@ copy_files \
frontend/grub-mkrescue-sed.sh \
"$lone_dir"/frontend
create_dir "$lone_dir"/xorriso-dd-target
copy_files \
xorriso-dd-target/xorriso-dd-target \
xorriso-dd-target/xorriso-dd-target.texi \
xorriso-dd-target/xorriso-dd-target.info \
xorriso-dd-target/xorriso-dd-target.1 \
"$lone_dir"/xorriso-dd-target
# releng

View File

@ -255,9 +255,12 @@ 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
# Install symbolic links to the xorriso binary
@ -315,13 +318,24 @@ 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
EXTRA_DIST = \
xorriso.pc.in \
@ -346,6 +360,7 @@ EXTRA_DIST = \
frontend/sh_on_named_pipes.sh \
frontend/xorriso_broker.sh \
frontend/grub-mkrescue-sed.sh \
xorriso-dd-target/xorriso-dd-target \
libisofs/aaip-os-dummy.c \
libisofs/aaip-os-linux.c \
libisofs/aaip-os-freebsd.c \