From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9CBBA13826A for ; Thu, 26 May 2016 07:41:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2CEE21C012; Thu, 26 May 2016 07:41:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A44B21C012 for ; Thu, 26 May 2016 07:41:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DFA3433BF54 for ; Thu, 26 May 2016 07:41:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3309ECFE for ; Thu, 26 May 2016 07:41:27 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1464248482.821463492d2793609dfd628dc319d1772ee27bd6.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/features/prefix/, profiles/features/prefix/rpath/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/features/prefix/package.mask profiles/features/prefix/packages profiles/features/prefix/rpath/packages X-VCS-Directories: profiles/features/prefix/rpath/ profiles/features/prefix/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 821463492d2793609dfd628dc319d1772ee27bd6 X-VCS-Branch: master Date: Thu, 26 May 2016 07:41:27 +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: b64ecebf-39f5-482b-a7c3-afbbe7b455db X-Archives-Hash: a42205537b3c27ba9c3ad90f2202d6f8 commit: 821463492d2793609dfd628dc319d1772ee27bd6 Author: Benda Xu gentoo org> AuthorDate: Thu May 26 07:39:57 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Thu May 26 07:41:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82146349 p/f/p/package.mask: sys-apps/baselayout-prefix should only be used in prefix-rpath. profiles/features/prefix/package.mask | 4 ---- profiles/features/prefix/packages | 4 ---- profiles/features/prefix/rpath/packages | 5 +++++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask index cb0e984..9207383 100644 --- a/profiles/features/prefix/package.mask +++ b/profiles/features/prefix/package.mask @@ -13,10 +13,6 @@ # fails to link wrt libiconv =sys-apps/coreutils-8.20 -# Benda Xu (07 Aug 2012) -# mask revision for testing out openrc. bug #415895. -=sys-apps/baselayout-prefix-1.12.14-r1 - # Fabian Groffen (01 Aug 2012) # Causes spurious errors due to considering some small files being # binary, bug #425668, comment #21. diff --git a/profiles/features/prefix/packages b/profiles/features/prefix/packages index 2116bab..5fadbfe 100644 --- a/profiles/features/prefix/packages +++ b/profiles/features/prefix/packages @@ -14,7 +14,6 @@ # This file removes everything from the base profile which is not # necessary/desired in a prefix environment. --*>=sys-apps/baselayout-2 -*net-misc/iputils -*sys-apps/iproute2 -*sys-apps/kbd @@ -23,9 +22,6 @@ -*virtual/modutils -*virtual/shadow -# add back prefix baselayout -*sys-apps/baselayout-prefix - # we don't want this either (as baselayout-prefix provides the functions.sh # file that this was added to ../base/packages for) -*sys-apps/openrc diff --git a/profiles/features/prefix/rpath/packages b/profiles/features/prefix/rpath/packages index 3f6c868..7474427a 100644 --- a/profiles/features/prefix/rpath/packages +++ b/profiles/features/prefix/rpath/packages @@ -5,3 +5,8 @@ # we don't ever will install these, so no need to depend on them -*virtual/libc -*virtual/os-headers + +-*>=sys-apps/baselayout-2 +# add back prefix baselayout +*sys-apps/baselayout-prefix +