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 C76C413877A for ; Sun, 29 Jun 2014 15:50:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBC2EE08D3; Sun, 29 Jun 2014 15:50: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 54ADCE08D3 for ; Sun, 29 Jun 2014 15:50:17 +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 174F1340008 for ; Sun, 29 Jun 2014 15:50:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 999DC19381 for ; Sun, 29 Jun 2014 15:50: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: <1404056806.c533623ce820740f52170469e126038982d0b3be.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: c533623ce820740f52170469e126038982d0b3be X-VCS-Branch: master Date: Sun, 29 Jun 2014 15:50: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: e20fcd93-1c18-4642-a5f3-5fc60817e829 X-Archives-Hash: 9e831b486c2c8b8979e4841d808cf876 commit: c533623ce820740f52170469e126038982d0b3be Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sun Jun 29 15:46:46 2014 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Sun Jun 29 15:46:46 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/jmbsvicetto.git;a=commit;h=c533623c Add suport for non-rX kernel versions. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> --- .../infra-kernel-sources/infra-kernel-sources-3.15.2.ebuild | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 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 093a408..01460d3 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 @@ -8,10 +8,16 @@ inherit flag-o-matic KERNEL_SOURCES="hardened-sources" KERNEL_NAME="hardened" KERNEL_PV="$PV" -KERNEL_REVISION="$PR" INFRA_SUFFIX="infra27" -KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}" +if [[ ${PR} != r0 ]]; then + KERNEL_REVISION="$PR" + KERNEL_PVR="${KERNEL_PV}-${KERNEL_REVISION}" + KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}-${KERNEL_REVISION}" +else + KERNEL_PVR="${KERNEL_PV}" + KERNEL_DIR="linux-${KERNEL_PV}-${KERNEL_NAME}" +fi KERNEL_PF="${KERNEL_SOURCES}-${KERNEL_PVR}" BUILD_DIR="/home/upload-kernel/" @@ -37,7 +43,6 @@ 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"