[devel-distro] [PATCH] mki-pack-isodata: move from mkisofs to xorriso

[Alexey Gladkov]

On Fri, Aug 21, 2020 at 03:33:26PM +0300, Michael Shigorin wrote:
> ...and drop -T while at that; wasn't really needed
> and posed a problem I forgot already after having
> hastily patched this in-place...

Applied. Thanks!

> ---
>  config-requires.mk.in  | 2 +-
>  doc/README.ru          | 4 ++--
>  tools/mki-pack-isodata | 5 ++++-
>  3 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/config-requires.mk.in b/config-requires.mk.in
> index fd6a8c0..158c087 100644
> --- a/config-requires.mk.in
> +++ b/config-requires.mk.in
> @@ -15,7 +15,7 @@ PACKAGES_REQUIRED_PACK_CPIO		?= cpio
>  PACKAGES_REQUIRED_PACK_YABOOT		?= mkisofs
>  PACKAGES_REQUIRED_PACK_ISOBOOT		?= xorriso
>  PACKAGES_REQUIRED_PACK_EFIONLY_ISOBOOT	?= xorriso
> -PACKAGES_REQUIRED_PACK_ISODATA		?= mkisofs
> +PACKAGES_REQUIRED_PACK_ISODATA		?= xorriso
>  PACKAGES_REQUIRED_PACK_TAR		?= tar
>  PACKAGES_REQUIRED_PACK_GZIP		?= gzip
>  PACKAGES_REQUIRED_PACK_BZIP2		?= bzip2
> diff --git a/doc/README.ru b/doc/README.ru
> index ec17d13..edb4c0d 100644
> --- a/doc/README.ru
> +++ b/doc/README.ru
> @@ -436,8 +436,8 @@ PACKAGES_REQUIRED_INITROOT           = basesystem
>  PACKAGES_REQUIRED_BUILD_PROPAGATOR   = mar propagator glibc-utils
>  PACKAGES_REQUIRED_PACK_CPIO          = cpio
>  PACKAGES_REQUIRED_PACK_YABOOT        = mkisofs
> -PACKAGES_REQUIRED_PACK_ISOBOOT       = mkisofs
> -PACKAGES_REQUIRED_PACK_ISODATA       = mkisofs
> +PACKAGES_REQUIRED_PACK_ISOBOOT       = xorriso
> +PACKAGES_REQUIRED_PACK_ISODATA       = xorriso
>  PACKAGES_REQUIRED_PACK_TAR           = tar
>  PACKAGES_REQUIRED_PACK_GZIP          = gzip
>  PACKAGES_REQUIRED_PACK_BZIP2         = bzip2
> diff --git a/tools/mki-pack-isodata b/tools/mki-pack-isodata
> index 2952445..a99f774 100755
> --- a/tools/mki-pack-isodata
> +++ b/tools/mki-pack-isodata
> @@ -56,7 +56,10 @@ imgdir=/.image
>  	imgdir="/.image/$imgsubdir"
>  
>  rc=0
> -mkisofs -T -J -l -r -U $verbose \
> +xorriso -follow param \
> +	-read_mkisofsrc \
> +	-as mkisofs \
> +	$verbose -J -l -r \
>  	-exclude-list /tmp/.exclude \
>  	"\$imgdir/" || rc=\$?
>  
> -- 
> 2.25.4
> 

-- 
Rgrds, legion