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 B7B46138334 for ; Fri, 30 Aug 2019 07:32:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E32E7E0833; Fri, 30 Aug 2019 07:32:23 +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 CC1B5E0833 for ; Fri, 30 Aug 2019 07:32:23 +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 5E1A434A671 for ; Fri, 30 Aug 2019 07:32:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 379BB778 for ; Fri, 30 Aug 2019 07:32:18 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1567150243.be327d4e749d3cc8ece772c87843b64d856cbbf0.slyfox@gentoo> Subject: [gentoo-commits] proj/crossdev:master commit in: wrappers/ X-VCS-Repository: proj/crossdev X-VCS-Files: wrappers/emerge-wrapper X-VCS-Directories: wrappers/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: be327d4e749d3cc8ece772c87843b64d856cbbf0 X-VCS-Branch: master Date: Fri, 30 Aug 2019 07:32:18 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 090c0150-6cbf-43e9-9eaf-f1d4d8a738f9 X-Archives-Hash: 73dd8ab20496ba7e16f899597ac097b1 commit: be327d4e749d3cc8ece772c87843b64d856cbbf0 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Aug 30 07:30:43 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Aug 30 07:30:43 2019 +0000 URL: https://gitweb.gentoo.org/proj/crossdev.git/commit/?id=be327d4e wrappers/emerge-wrapper: drop population of profile/package.provided 'profile/package.provided' is created empty for quite a while because wrapper init is called before any cross-* package gets merged. Let's drop that completely and focus on always installing headers and libc into target. Signed-off-by: Sergei Trofimovich gentoo.org> wrappers/emerge-wrapper | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index d084a96..381214e 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -84,16 +84,6 @@ cross_wrap_etc() -e "s:__CBUILD__:${CBUILD}:g" \ "${confs[@]}" - # Try to figure out the libc version & os headers to avoid installing over top of it. - # XXX: Would be nice to use virtual/libc and virtual/os-headers here ... - # TODO: this does not work as crossdev calls --init before any packages are installed - cd "${SYSROOT}/etc/portage" - mkdir -p profile - qlist -ICv "cross-${CHOST}/" | \ - egrep '/(linux-headers|glibc|musl|newlib|uclibc)-' | \ - sed "s:^[^/]*:sys-libs:" \ - > profile/package.provided - return 0 }