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 8A4A91392EF for ; Sun, 29 Jun 2014 15:02:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B98AE0B2B; Sun, 29 Jun 2014 15:02:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C1293E0B2B for ; Sun, 29 Jun 2014 15:02:16 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2C6A340237 for ; Sun, 29 Jun 2014 15:02:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 8522219378 for ; Sun, 29 Jun 2014 15:02:14 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1404053932.079273646c9e4fe99f80cedb094b2d0cee7bfa7a.jmbsvicetto@gentoo> Subject: [gentoo-commits] dev/jmbsvicetto:master commit in: sys-kernel/infra-kernel-sources/ X-VCS-Repository: dev/jmbsvicetto X-VCS-Files: sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild X-VCS-Directories: sys-kernel/infra-kernel-sources/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 079273646c9e4fe99f80cedb094b2d0cee7bfa7a X-VCS-Branch: master Date: Sun, 29 Jun 2014 15:02:14 +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: b34c7810-1200-4d28-8ba4-9ae07d53fd57 X-Archives-Hash: 4bf1cba8b774d3c80b88d8ed4d42797e commit: 079273646c9e4fe99f80cedb094b2d0cee7bfa7a Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sun Jun 29 14:58:52 2014 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Sun Jun 29 14:58:52 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=07927364 Calling use at global scope is invalid. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> --- .../infra-kernel-sources-3.15.2.ebuild | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild index 623b2f9..093a408 100644 --- a/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild +++ b/sys-kernel/infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild @@ -10,18 +10,10 @@ KERNEL_NAME="hardened" KERNEL_PV="$PV" KERNEL_REVISION="$PR" INFRA_SUFFIX="infra27" -use amd64 && KARCH="x86_64" -use x86 && KARCH="x86" KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}" KERNEL_PF="${KERNEL_SOURCES}-${KERNEL_PVR}" -KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}" -BINPKG_PVR="${PVR}-${INFRA_SUFFIX}" -BINPKG_KERNEL="${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}.tbz2" -BINPKG_MODULES="${PN/-sources/}-modules-${KARCH}-${BINPKG_PVR}.tbz2" -KERNEL_CONFIG="${FILESDIR}"/${KERNEL_PF}-${KARCH}-${INFRA_SUFFIX}.config - BUILD_DIR="/home/upload-kernel/" DESCRIPTION="Package to build kernel + initramfs for Gentoo infra boxes" @@ -42,6 +34,15 @@ RDEPEND="" S="${WORKDIR}" pkg_setup() { + use amd64 && KARCH="x86_64" + use x86 && KARCH="x86" + + KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}" + BINPKG_PVR="${PVR}-${INFRA_SUFFIX}" + BINPKG_KERNEL="${PN/-sources/}-kernel-${KARCH}-${BINPKG_PVR}.tbz2" + BINPKG_MODULES="${PN/-sources/}-modules-${KARCH}-${BINPKG_PVR}.tbz2" + KERNEL_CONFIG="${FILESDIR}"/${KERNEL_PF}-${KARCH}-${INFRA_SUFFIX}.config + [ -d /usr/src/${KERNEL_DIR} ] || die "kernel dir /usr/src/${KERNEL_DIR} missing" [ -f ${KERNEL_CONFIG} ] || die "${KERNEL_CONFIG} missing" # we need to be using flags that will result in binaries working on all infra systems