From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EACAE1382C5 for ; Sun, 31 May 2020 12:44:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DED3E0905; Sun, 31 May 2020 12:44:23 +0000 (UTC) Received: from rs234.mailgun.us (rs234.mailgun.us [209.61.151.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C536EE0905 for ; Sun, 31 May 2020 12:44:21 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=xxoo.ws; q=dns/txt; s=mx; t=1590929061; h=In-Reply-To: Content-Type: MIME-Version: References: Message-ID: Subject: To: From: Date: Sender; bh=4ayrqxypI/Ef++cbuGHMVlifJH/ADWtJKGFs1PX0Jmw=; b=dcf5rZ4Xtx5QJYEwqXEDGzoEv4N9r5JM6DpUq4T8tpmylHHIj4B3/SAtsGhM5cE5fVKlTBf7 re5eM5gTkUBmbEa5Xft1Le7eVdqgysX9jkW7wF7Ym11b+iHwDsb+xzMATSi996ZyAmCFfSET MrhPVbrW6oymlFucUXgo+9Ew8is= X-Mailgun-Sending-Ip: 209.61.151.234 X-Mailgun-Sid: WyIxYmU3MyIsICJnZW50b28tY2F0YWx5c3RAbGlzdHMuZ2VudG9vLm9yZyIsICJlYTQwNTYiXQ== Received: from mail.0xdc.io (ip-54-37-0.eu [54.37.0.172]) by smtp-out-n09.prod.us-west-2.postgun.com with SMTP id 5ed3a6a237a454afcb64a8e3 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Sun, 31 May 2020 12:44:18 GMT Sender: gentoo.catalyst@xxoo.ws Received: from dysnomia (a.3.5.9.e.9.8.6.5.9.d.d.f.e.1.e.0.a.4.7.9.0.c.0.0.b.8.0.1.0.0.2.ip6.arpa [IPv6:2001:8b0:c09:74a0:e1ef:dd95:689e:953a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.0xdc.io (Postfix) with ESMTPSA id 7CE16102D7B for ; Sun, 31 May 2020 12:49:58 +0000 (UTC) Date: Sun, 31 May 2020 12:44:02 +0000 From: Daniel Cordero To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] [PATCH 2/2] Decompressor uses decompression options Message-ID: <20200531124402.GA1304557@dysnomia.localdomain> References: <20200529190432.1240373-1-gentoo.catalyst@xxoo.ws> <20200529190432.1240373-2-gentoo.catalyst@xxoo.ws> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200529190432.1240373-2-gentoo.catalyst@xxoo.ws> X-Archives-Salt: 2a04381b-fc71-4e6a-b35e-b2dc18639290 X-Archives-Hash: e297dfbfd9344f429a0bfe957dd3f765 On Fri, May 29, 2020 at 07:04:32PM +0000, Daniel Cordero wrote: > > If decompressor != compressor, the options given to the programs may not > be understood, causing runtime errors. > > Allow the compression arguments to be overridden in a specfile. > Compressor can already be configured with compression_mode. > > For decompression, while the decompressor is detected by the file > extension, use the separate decomp_opts so there is no argument > conflicts. > --- > Note: compressor_options can't be empty, as catalyst just drops the key. > > catalyst/base/stagebase.py | 3 ++- > catalyst/defaults.py | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py > index 5a8cd1df..6efcf0d1 100644 > --- a/catalyst/base/stagebase.py > +++ b/catalyst/base/stagebase.py > @@ -48,6 +48,7 @@ class StageBase(TargetBase, ClearBase, GenBase): > "cflags", > "common_flags", > "compression_mode", > + "compressor_options", > "cxxflags", > "decompressor_search_order", > "distcc_hosts", > @@ -677,7 +678,7 @@ class StageBase(TargetBase, ClearBase, GenBase): > source=self.settings["source_path"], > destination=self.settings["chroot_path"], > arch=self.settings["compressor_arch"], > - other_options=self.settings["compressor_options"], > + other_options=self.settings["decomp_opt"], > ) > > display_msg = ( Speaking with some people in #gentoo-releng, this patch will break pixz and lbzip2 decompression during the unpack stage. Will rework. > diff --git a/catalyst/defaults.py b/catalyst/defaults.py > index c153fcc4..fbf406b2 100644 > --- a/catalyst/defaults.py > +++ b/catalyst/defaults.py > @@ -30,7 +30,7 @@ confdefaults = { > "compression_mode": 'lbzip2', > "compressor_arch": None, > "compressor_options": XATTRS_OPTIONS['linux'], > - "decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS['linux'], > + "decomp_opt": XATTRS_OPTIONS['linux'], > "decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER, > "distdir": portage.settings['DISTDIR'], > "icecream": "/var/cache/icecream", > -- > 2.26.2 > >