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 026281382C5 for ; Sat, 16 May 2020 06:53:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26327E09A6; Sat, 16 May 2020 06:53:38 +0000 (UTC) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) (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 1EEC7E09A6 for ; Sat, 16 May 2020 06:53:38 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id q16so1856992plr.2 for ; Fri, 15 May 2020 23:53:38 -0700 (PDT) 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=bpVgCeNK4ldXSY5e5xvBDdt8VVciHALAmRYSnxmuo0k=; b=t4PUBBPe3bMALrNhrQXlK36k2STpuTZXY/rxf2puLCcYWZlIpg3ptQ8pLQdZnFWxZn Jzu9VDdpUcsiDtbuuRRWDzFG+aRZg5IIhDFuiFRjYj2V3S4inn92oBnugVXD8YLIjmia sGObyV9zbEw4e7+92Cc8SI83za24VvUQcJ/I0ywoVcmEYcWl9HuXNBOiV3KMm1gplSOz z5LkktsLfVEfKwpbOLZPUqRAk0tpgfMAB6cXRBddN/X+cpzU4+EdpfVium722uhmTbcw lPvoQmU8Ke8JA9IZmle/QssgbClY2FAw23U7cHJYtBbxK5Pu3CrVcc9420mu+tWcOFsZ CDhQ== X-Gm-Message-State: AOAM530doeRTEpILlGWlRTFMq4NH6SUHuZyh9pWU3/n+6UNyXd7Wz7xn MXeZ6ryOzx7kQYcUpoH6JVOQDiQa X-Google-Smtp-Source: ABdhPJzVAlzSShBfMAtWjInYtk8Yvnp/C3rOgan23ppnzphXNMNdWf6ZvMV0jlyeBTF1tNoPlW7+rA== X-Received: by 2002:a17:90a:2949:: with SMTP id x9mr6842277pjf.99.1589612016863; Fri, 15 May 2020 23:53:36 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id n23sm3059892pjq.18.2020.05.15.23.53.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 23:53:36 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 8/9] catalyst: Remove remnants of options="preserve_libs" Date: Fri, 15 May 2020 23:53:16 -0700 Message-Id: <20200516065317.2678080-8-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200516065317.2678080-1-mattst88@gentoo.org> References: <20200516065317.2678080-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: 6753e47f-63de-4f42-9293-04845ef26c91 X-Archives-Hash: 76d3623399b9dd77599f691f176e82c9 This option has been broken since commit e3114e65ffda (Some options cleanup, unifying their use, reducing redundancy.) in 2013 which was first in catalyst 3.0.0. I think the feature was a kludge, and that if or when we find the need for something similar that we instead just run emerge @preserved-rebuild instead. Signed-off-by: Matt Turner --- etc/catalyst.conf | 2 -- targets/support/depclean.sh | 2 -- targets/support/unmerge.sh | 2 -- 3 files changed, 6 deletions(-) diff --git a/etc/catalyst.conf b/etc/catalyst.conf index 5aa2b3fb..f64fe971 100644 --- a/etc/catalyst.conf +++ b/etc/catalyst.conf @@ -38,8 +38,6 @@ envscript="/etc/catalyst/catalystrc" # build stops in livecd-stage2) # pkgcache = keeps a tbz2 of every built package (useful if your build stops # prematurely) -# preserve_libs = enables portage to preserve used libs when unmerging packages -# (used on installcd-stage2 and stage4 targets) # seedcache = use the build output of a previous target if it exists to speed up # the copy # sticky-config = enables the code that will keep any internal 'catalyst_use' flags diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh index 56f9a669..f99134e0 100755 --- a/targets/support/depclean.sh +++ b/targets/support/depclean.sh @@ -2,8 +2,6 @@ source /tmp/chroot-functions.sh -# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them. -[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs" if [ "${clst_livecd_depclean}" = "keepbdeps" ]; then run_merge --depclean --with-bdeps=y else diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh index 0c0c0374..9f112735 100755 --- a/targets/support/unmerge.sh +++ b/targets/support/unmerge.sh @@ -2,8 +2,6 @@ source /tmp/chroot-functions.sh -# If the user enabled PRESERVE_LIBS in options, tell portage to preserve them. -[ -n "${clst_PRESERVE_LIBS}" ] && FEATURES="${clst_myfeatures} preserve-libs" run_merge -C ${clst_packages} exit 0 -- 2.26.2