Moved the MAKEOPTS check to the top of the file for parisc, so it matches other archi...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@488 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 8a8e022af1447e80b2c926fb20ea44a8ab43c7c8..cbd1843e6189c935521e28cfe6bb11e7c61d6cb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org> genkernel,
+  parisc/config.sh, parisc64/config.sh:
+  Moved the MAKEOPTS check to the top of the file for parisc, so it matches
+  other architectures. This fixes bug #165494. Thanks to Andrew Gaffney
+  <agaffney@gentoo.org> for finding the fix. I'm marking this as 3.4.7_pre3
+  for testing.
+
   14 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   generic/initrd.scripts:
   Adding yet another patch from Fabio Erculiani <lxnay@lxnaydesign.net> from

diff --git a/genkernel b/genkernel
index 890cb25c143415d5493aa800d8e1784fa729ab27..3a238763f28f5a3dbdabd89d395e9f849bcc7d05 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.4.7_pre2'
+GK_V='3.4.7_pre3'
 
 TMPDIR='/var/tmp/genkernel'
 TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$

diff --git a/parisc/config.sh b/parisc/config.sh
index 0c223fe5129eec9cce913dfeda1b7a4ed27c1178..cd1c6cb903c98f43308aa93fee53057cd3168d93 100644 (file)
--- a/parisc/config.sh
+++ b/parisc/config.sh
@@ -7,6 +7,8 @@ KERNEL_BINARY="vmlinux"
 
 USE_DIETLIBC=0
 
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
+
 BOOTSPLASH=0
 
 KERNEL_MAKE=make
@@ -22,5 +24,3 @@ UTILS_LD=ld
 
 COMPRESS_INITRD=yes
 
-[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
-

diff --git a/parisc64/config.sh b/parisc64/config.sh
index 3fdc4b8ab1fd2256ae575d44e2031c6473b51324..2bc68dbbce3db9d177faa099b2c35a27322fa0bf 100644 (file)
--- a/parisc64/config.sh
+++ b/parisc64/config.sh
@@ -7,6 +7,8 @@ KERNEL_BINARY="vmlinux"
 
 USE_DIETLIBC=0
 
+[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"
+
 BOOTSPLASH=0
 
 KERNEL_MAKE=make
@@ -21,5 +23,3 @@ UTILS_AS=as
 UTILS_LD=ld
 
 COMPRESS_INITRD=yes
-
-[ -z "${MAKEOPTS}" ] && MAKEOPTS="-j2"