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 54602139082 for ; Wed, 29 Nov 2017 17:33:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 711F3E085E; Wed, 29 Nov 2017 17:33:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 512C9E085E for ; Wed, 29 Nov 2017 17:33:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2DBD33BE68 for ; Wed, 29 Nov 2017 17:33:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 861CEABD4 for ; Wed, 29 Nov 2017 17:33:11 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1511976704.4295fce1791067d7589b8f7f12cb5270bb86bcca.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/livecd-stage2/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/livecd-stage2/livecd-stage2-controller.sh targets/support/depclean.sh X-VCS-Directories: targets/support/ targets/livecd-stage2/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 4295fce1791067d7589b8f7f12cb5270bb86bcca X-VCS-Branch: master Date: Wed, 29 Nov 2017 17:33:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2b6c1947-0ac7-401c-8682-c4432d6dfafd X-Archives-Hash: 13479644be72eaecb1e481265947682a commit: 4295fce1791067d7589b8f7f12cb5270bb86bcca Author: Ben Kohler gmail com> AuthorDate: Wed Sep 20 13:13:59 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Nov 29 17:31:44 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4295fce1 introduce depclean.sh and add it to livecd-stage2 (first test) targets/livecd-stage2/livecd-stage2-controller.sh | 11 ++++++----- targets/support/depclean.sh | 9 +++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index 10ee98e6..845d6d55 100755 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -186,11 +186,12 @@ case $1 in ${clst_shdir}/support/bootloader-setup.sh $1 ;; - unmerge) - shift - export clst_packages="$*" - exec_in_chroot ${clst_shdir}/support/unmerge.sh - ;; + unmerge) + exec_in_chroot ${clst_shdir}/support/depclean.sh + shift + export clst_packages="$*" + exec_in_chroot ${clst_shdir}/support/unmerge.sh + ;; target_image_setup) shift diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh new file mode 100755 index 00000000..aa66c9fd --- /dev/null +++ b/targets/support/depclean.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +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 --depclean --with-bdeps=n + +exit 0 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 CDD59139082 for ; Wed, 29 Nov 2017 17:34:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34569E085E; Wed, 29 Nov 2017 17:34:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 13A96E085E for ; Wed, 29 Nov 2017 17:34:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E54C33C770 for ; Wed, 29 Nov 2017 17:34:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD6A2ABD4 for ; Wed, 29 Nov 2017 17:34:29 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1511976704.4295fce1791067d7589b8f7f12cb5270bb86bcca.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/livecd-stage2/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/livecd-stage2/livecd-stage2-controller.sh targets/support/depclean.sh X-VCS-Directories: targets/support/ targets/livecd-stage2/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 4295fce1791067d7589b8f7f12cb5270bb86bcca X-VCS-Branch: pending Date: Wed, 29 Nov 2017 17:34:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fc00340e-8dfe-4776-8404-ae9e165cd6a3 X-Archives-Hash: 7e9fa41bfeed02dc9b933a33c87a577d Message-ID: <20171129173429.oaS8A_RNkWEj8fnGM93ou_lpsJ3rK9-txIOnNEIEv2o@z> commit: 4295fce1791067d7589b8f7f12cb5270bb86bcca Author: Ben Kohler gmail com> AuthorDate: Wed Sep 20 13:13:59 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Nov 29 17:31:44 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4295fce1 introduce depclean.sh and add it to livecd-stage2 (first test) targets/livecd-stage2/livecd-stage2-controller.sh | 11 ++++++----- targets/support/depclean.sh | 9 +++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index 10ee98e6..845d6d55 100755 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -186,11 +186,12 @@ case $1 in ${clst_shdir}/support/bootloader-setup.sh $1 ;; - unmerge) - shift - export clst_packages="$*" - exec_in_chroot ${clst_shdir}/support/unmerge.sh - ;; + unmerge) + exec_in_chroot ${clst_shdir}/support/depclean.sh + shift + export clst_packages="$*" + exec_in_chroot ${clst_shdir}/support/unmerge.sh + ;; target_image_setup) shift diff --git a/targets/support/depclean.sh b/targets/support/depclean.sh new file mode 100755 index 00000000..aa66c9fd --- /dev/null +++ b/targets/support/depclean.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +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 --depclean --with-bdeps=n + +exit 0