From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.1 Date: Sun, 23 Aug 2020 17:57:35 +0200 From: Alexey Gladkov To: Michael Shigorin Message-ID: <20200823155735.fns3rqtw57wuotuf@comp-core-i7-2640m-0182e6> References: <20200821123326.GB1384@imap.altlinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200821123326.GB1384@imap.altlinux.org> Cc: devel-distro@lists.altlinux.org Subject: Re: [devel-distro] [PATCH] mki-pack-isodata: move from mkisofs to xorriso X-BeenThere: devel-distro@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Distributions development List-Id: Distributions development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Aug 2020 15:57:54 -0000 Archived-At: List-Archive: 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