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 8B4F81382C5 for ; Mon, 18 Jan 2021 20:22:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE262E0823; Mon, 18 Jan 2021 20:22:03 +0000 (UTC) Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) (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 C6342E0823 for ; Mon, 18 Jan 2021 20:22:03 +0000 (UTC) Received: by mail-qv1-f43.google.com with SMTP id d11so8098820qvo.11 for ; Mon, 18 Jan 2021 12:22:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nqi/7pDHaIFFMHmLXALAdnD0zoAf+EprPJtD7kM0DKk=; b=uac8Y4FUbPnIZKqFsw9L7pnturkhHcycHawSGb5c0af56JLa4W5ozO51x73NPkG5WJ ieUTaWP78hf6ttuTVs0JeZOIShDjOMw+nwytG3rHO9Ld7BpLNBdMU3TLynzzUrFZNv+D i2dl/wVXw//PvKtBaf7SNuydHU13AweKKHGIkqncUvGRZQZbscFcKk2epVUAn6XGBIYq U/uZ8UMC04zVK3iqAXR7i+nFmqWX7ZIx7qSTtZ7GTplT5aeX5reqCYCsK2Zs43zTubZS GL29s2wnLd4n1gOZ0j7n01P37A6KiX4iaaYqAG3Lg32yuyO3vS96BwAZSpwmF060JSag BOWQ== X-Gm-Message-State: AOAM533uvI4M2x8PblxvyBAhl4euFIxOiQKKrvxu8BXPsxk/L1MukDyI 3taBk5QwZkNqDTiEP36yZd3c6IMLfvw= X-Google-Smtp-Source: ABdhPJzub9QngyHaDXongBfXez5QDg5VDfdXky50h1isi3nJbVv56mYCzA7GBINICYX7NM5lrO8B/Q== X-Received: by 2002:ad4:4f0c:: with SMTP id fb12mr1125028qvb.16.1611001322777; Mon, 18 Jan 2021 12:22:02 -0800 (PST) Received: from localhost ([208.104.103.123]) by smtp.gmail.com with ESMTPSA id j203sm11223446qke.134.2021.01.18.12.22.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 12:22:02 -0800 (PST) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 04/11] targets: Update BINPKG_COMPRESS to new zstd default Date: Mon, 18 Jan 2021 15:21:45 -0500 Message-Id: <20210118202152.374078-4-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210118202152.374078-1-mattst88@gentoo.org> References: <20210118202152.374078-1-mattst88@gentoo.org> 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-Transfer-Encoding: 8bit X-Archives-Salt: 42b0f916-9000-445e-a141-7ba77a216e67 X-Archives-Hash: 9a0ff7d2cb1a4b0408d8820026252adc In portage commit 230595cf600c (Default BINPKG_COMPRESSION to zstd (bug 715108)) the default BINPKG_COMPRESSION setting was changed to zstd. But to retain compatibility with binpkg consumers, the default is unchanged for existing installations, so we need to update our BINPKG_COMPRESSION. Bug: https://bugs.gentoo.org/715108 Signed-off-by: Matt Turner --- targets/stage1/chroot.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh index 1085641e..e5a3e0b0 100755 --- a/targets/stage1/chroot.sh +++ b/targets/stage1/chroot.sh @@ -24,6 +24,9 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)" FEATURES="${FEATURES} nodoc noman noinfo" +sed -i -e 's:BINPKG_COMPRESS="bzip2":BINPKG_COMPRESS="zstd":' \ + /usr/share/portage/config/make.globals + # We need to ensure the base stage3 has USE="bindist" # if BINDIST is set to avoid issues with openssl / openssh [ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf} -- 2.26.2