public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Pagano (mpagano)" <mpagano@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass
Date: Fri, 27 Feb 2015 23:44:41 +0000 (UTC)	[thread overview]
Message-ID: <20150227234441.D09CF12B21@oystercatcher.gentoo.org> (raw)

mpagano     15/02/27 23:44:41

  Modified:             ChangeLog kernel-2.eclass
  Log:
  Cleanup how we determine base linux tarball.

Revision  Changes    Path
1.1557               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1557&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1557&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1556&r2=1.1557

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1556
retrieving revision 1.1557
diff -u -r1.1556 -r1.1557
--- ChangeLog	26 Feb 2015 20:41:10 -0000	1.1556
+++ ChangeLog	27 Feb 2015 23:44:41 -0000	1.1557
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1556 2015/02/26 20:41:10 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1557 2015/02/27 23:44:41 mpagano Exp $
+
+  27 Feb 2015; Mike Pagano <mpagano@gentoo.org> kernel-2.eclass:
+  Cleanup how we determine base linux tarball.
 
   26 Feb 2015; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
   mozconfig-v5.31.eclass, +mozconfig-v5.36.eclass:



1.300                eclass/kernel-2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.300&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.300&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.299&r2=1.300

Index: kernel-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- kernel-2.eclass	23 Feb 2015 12:42:40 -0000	1.299
+++ kernel-2.eclass	27 Feb 2015 23:44:41 -0000	1.300
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.299 2015/02/23 12:42:40 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.300 2015/02/27 23:44:41 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -371,15 +371,12 @@
 			UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.xz ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.xz"
 		fi
 	else
+		KV_PATCH_ARR=(${KV_PATCH//\./ })
+
+		# the different majorminor versions have different patch start versions
+		OKV_DICT=(["2"]="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" ["3"]="2.6.39" ["4"]="3.19")
 		if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then
-			if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then
-				OKV="2.6.39"
-			elif [[ ${KV_MAJOR}${KV_PATCH} -eq 40 ]]; then
-				OKV="3.19"
-			else
-				KV_PATCH_ARR=(${KV_PATCH//\./ })
-				OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))"
-			fi
+			OKV=${OKV_DICT["${KV_MAJOR}"]}
 			KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz
 						${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
 			UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz"
@@ -392,14 +389,7 @@
 		fi
 
 		if [[ ${RELEASETYPE} == -rc-git ]]; then
-			if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then
-				OKV="2.6.39"
-			elif [[ ${KV_MAJOR}${KV_PATCH} -eq 40 ]]; then
-				OKV="2.19"
-			else
-				KV_PATCH_ARR=(${KV_PATCH//\./ })
-				OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))"
-			fi
+			OKV=${OKV_DICT["${KV_MAJOR}"]}
 			KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.xz
 						${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.xz
 						${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
@@ -409,8 +399,7 @@
 
 
 	fi
-
-
+	
 	debug-print-kernel2-variables
 
 	handle_genpatches





             reply	other threads:[~2015-02-27 23:44 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-27 23:44 Mike Pagano (mpagano) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-07-19 15:46 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass Mike Pagano (mpagano)
2015-06-27 17:41 Mike Pagano (mpagano)
2015-06-27 17:27 Mike Pagano (mpagano)
2015-06-27 15:36 Mike Pagano (mpagano)
2015-06-27  0:50 Mike Pagano (mpagano)
2015-06-26 22:32 Mike Pagano (mpagano)
2015-05-30 16:09 Mike Pagano (mpagano)
2015-05-14 19:26 Mike Pagano (mpagano)
2015-04-29  0:07 Mike Pagano (mpagano)
2015-04-27 18:59 Mike Pagano (mpagano)
2015-03-20  0:13 Mike Pagano (mpagano)
2015-02-23 12:42 Mike Pagano (mpagano)
2014-11-28 17:40 Mike Pagano (mpagano)
2014-04-21  0:08 Mike Pagano (mpagano)
2014-04-14 20:21 Tom Wijsman (tomwij)
2014-01-18 14:53 Mike Gilbert (floppym)
2014-01-17 19:05 Mike Pagano (mpagano)
2014-01-17 18:14 Mike Pagano (mpagano)
2013-11-18 13:19 Tom Wijsman (tomwij)
2013-11-02 12:58 Tom Wijsman (tomwij)
2013-09-05 17:04 Tom Wijsman (tomwij)
2013-07-31 21:18 Julian Ospald (hasufell)
2013-07-15 14:04 Samuli Suominen (ssuominen)
2013-04-29 22:14 Tom Wijsman (tomwij)
2013-04-17 20:59 Tom Wijsman (tomwij)
2013-04-17 13:52 Tom Wijsman (tomwij)
2013-03-20 16:45 Tom Wijsman (tomwij)
2013-03-20  7:55 Tom Wijsman (tomwij)
2013-03-09 21:05 Tom Wijsman (tomwij)
2013-03-05 19:52 Mike Pagano (mpagano)
2012-06-24 17:52 Mike Pagano (mpagano)
2012-06-06 17:00 Mike Pagano (mpagano)
2012-03-17  0:02 Mike Pagano (mpagano)
2011-12-28 13:38 Stratos Psomadakis (psomas)
2011-11-08  1:05 Mike Pagano (mpagano)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150227234441.D09CF12B21@oystercatcher.gentoo.org \
    --to=mpagano@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox