mkisofs is obsolete. Require genisoimage everywhere instead.

This commit is contained in:
Nikita A Menkovich
2011-04-02 11:04:47 +01:00
committed by Richard W.M. Jones
parent bbaea1d03a
commit 5eaffede90
4 changed files with 6 additions and 6 deletions

2
README
View File

@@ -40,7 +40,7 @@ Requirements
- squashfs-tools (mksquashfs only)
- genisoimage / mkisofs
- genisoimage (NOT mkisofs any more)
- hivex >= 1.2.1 (http://libguestfs.org/download)

View File

@@ -270,10 +270,10 @@ else
fi
AC_SUBST([POD2_UTF8_OPTION])
dnl Check for mkisofs.
AC_PATH_PROGS([MKISOFS],[mkisofs],[no],
dnl Check for genisoimage.
AC_PATH_PROGS([GENISOIMAGE],[genisoimage],[no],
[$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
test "x$MKISOFS" = "xno" && AC_MSG_ERROR([mkisofs must be installed])
test "x$GENISOIMAGE" = "xno" && AC_MSG_ERROR([genisoimage must be installed])
dnl Check for optional xmllint.
AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])

2
debian/control vendored
View File

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7), autotools-dev,
libmagic-dev, libncurses5-dev, libpcre3-dev, libxml2-dev,
qemu-system (>= 0.13) | kvm (>= 0.13) | qemu-kvm (>= 0.13) | qemu (>= 0.13),
# XXX how to say we need Linux >= 2.6.36?
mkisofs, pkg-config,
genisoimage, pkg-config,
# when building from git:
automake, autoconf, libtool, ocaml,
# for python bindings:

View File

@@ -101,7 +101,7 @@ images_files = $(images_files_src) $(images_files_build)
test.iso: $(images_files)
rm -f $@ $@-t
mkdir -p directory
$(MKISOFS) -J -r -graft-points \
$(GENISOIMAGE) -J -r -graft-points \
-o $@-t \
$(images_files) /directory=directory
rmdir directory