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 A628B1382B5 for ; Wed, 15 Jun 2016 08:04:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E285EE09C6; Wed, 15 Jun 2016 08:04:30 +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 40B84E099E for ; Wed, 15 Jun 2016 08:04:28 +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 1C993340739 for ; Wed, 15 Jun 2016 08:04:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C76312422 for ; Wed, 15 Jun 2016 08:04:22 +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: <1465977754.5c43f619d033224faeed673af880bce5510daef2.heroxbd@gentoo> Subject: [gentoo-commits] repo/proj/prefix:rap0 commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 5c43f619d033224faeed673af880bce5510daef2 X-VCS-Branch: rap0 Date: Wed, 15 Jun 2016 08:04:22 +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: dcfe7e80-fa09-4c80-a488-cc94b49ac7b5 X-Archives-Hash: decbf1ffb62e402376bd308a3457f223 commit: 5c43f619d033224faeed673af880bce5510daef2 Author: Benda Xu gentoo org> AuthorDate: Fri Jun 3 08:06:45 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Wed Jun 15 08:02:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5c43f619 scripts/b-p.sh: calculate kernel version and select legacy profiles. scripts/bootstrap-prefix.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 2c76097..b954c0e 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -10,6 +10,8 @@ einfo() { echo "* $*"; } is-rap() { [[ ${BASH_SOURCE} = *rap.sh ]]; } rapx() { is-rap && echo $1 || echo $2; } get_libdir() { portageq envvar LIBDIR_$(portageq envvar ABI) || echo lib; } +kver() { uname -r|cut -d\- -f1|awk -F. '{for (i=1; i<=NF; i++){s+=lshift($i,(4-i)*8)};print s}'; } +profile-legacy() { [[ $(kver) -ge 33955840 ]] || echo /legacy; } # prefer gtar over tar [[ x$(type -t gtar) == "xfile" ]] \ @@ -267,6 +269,7 @@ EOF ln -sf {,"${ROOT}"}/etc/group [[ -f ${ROOT}/etc/resolv.conf ]] || ln -s {,"${ROOT}"}/etc/resolv.conf [[ -f ${ROOT}/etc/hosts ]] || cp {,"${ROOT}"}/etc/hosts + local legacy=$(profile-legacy) fi local linux=$(rapx linux-standalone linux) @@ -296,22 +299,22 @@ EOF profile="prefix/darwin/macos/10.$((rev - 4))/x64" ;; i*86-pc-linux-gnu) - profile="prefix/${linux}/x86" + profile="prefix/${linux}/x86${legacy}" ;; x86_64-pc-linux-gnu) - profile="prefix/${linux}/amd64" + profile="prefix/${linux}/amd64${legacy}" ;; ia64-pc-linux-gnu) - profile="prefix/${linux}/ia64" + profile="prefix/${linux}/ia64${legacy}" ;; powerpc-unknown-linux-gnu) - profile="prefix/${linux}/ppc" + profile="prefix/${linux}/ppc${legacy}" ;; powerpc64-unknown-linux-gnu) - profile="prefix/${linux}/ppc64" + profile="prefix/${linux}/ppc64${legacy}" ;; armv7l-pc-linux-gnu) - profile="prefix/${linux}/arm" + profile="prefix/${linux}/arm${legacy}" ;; sparc-sun-solaris2.9) profile="prefix/sunos/solaris/5.9/sparc"