From d97296528e97cd29556b4ebbd3f8c710bc734969 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 14 Feb 2007 21:19:46 +0000 Subject: [PATCH] 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 for finding the fix. I'm marking this as 3.4.7_pre3 for testing. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@488 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 7 +++++++ genkernel | 2 +- parisc/config.sh | 4 ++-- parisc64/config.sh | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a8e022..cbd1843 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,13 @@ # Copyright 2006-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Feb 2007; Chris Gianelloni 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 + for finding the fix. I'm marking this as 3.4.7_pre3 + for testing. + 14 Feb 2007; Chris Gianelloni generic/initrd.scripts: Adding yet another patch from Fabio Erculiani from diff --git a/genkernel b/genkernel index 890cb25..3a23876 100755 --- 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 0c223fe..cd1c6cb 100644 --- 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 3fdc4b8..2bc68db 100644 --- 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" -- 2.26.2