From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rj1RU-0001lN-S3 for garchives@archives.gentoo.org; Fri, 06 Jan 2012 04:30:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA79421C09D; Fri, 6 Jan 2012 04:29:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AB4BD21C054 for ; Fri, 6 Jan 2012 04:29:55 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 198C51B4017 for ; Fri, 6 Jan 2012 04:29:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 59FAF8004F for ; Fri, 6 Jan 2012 04:29:54 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog gen_determineargs.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: e602f05814db85c107490153efdf7ef7c51a8c58 Date: Fri, 6 Jan 2012 04:29:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: af330e4e-01ff-46a9-b8f2-52c02e8b41ed X-Archives-Hash: 718a2e5ba744b1b1b1240dfe8f11693e commit: e602f05814db85c107490153efdf7ef7c51a8c58 Author: Robin H. Johnson gentoo org> AuthorDate: Fri Jan 6 04:23:14 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Fri Jan 6 04:23:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3De602f058 Fix some defaults otherwise you get an initramfs without any modules! Signed-off-by: Robin H. Johnson gentoo.org> --- ChangeLog | 4 ++++ gen_determineargs.sh | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 817e1b7..36a6026 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ =20 + 06 Jan 2012; Robin H. Johnson gen_determineargs.s= h, + genkernel.conf: + Fix some defaults otherwise you get an initramfs without any modules! + 06 Jan 2012; Robin H. Johnson defaults/busy-confi= g: Awk support in busybox is needed for initramfs setup code (to parse fs= tab). =20 diff --git a/gen_determineargs.sh b/gen_determineargs.sh index b68f048..cd91a27 100755 --- a/gen_determineargs.sh +++ b/gen_determineargs.sh @@ -72,7 +72,7 @@ determine_real_args() { # ------------------ ------------ = ------------ set_config_with_override STRING LOGFILE CMD_LOGFILE set_config_with_override STRING KERNEL_DIR CMD_KERNEL_DIR = "${DEFAULT_KERNEL_SOURCE}" - set_config_with_override BOOL KERNEL_SOURCES CMD_KERNEL_SOURCES + set_config_with_override BOOL KERNEL_SOURCES CMD_KERNEL_SOURCES= "yes" set_config_with_override STRING KNAME CMD_KERNNAME = "genkernel" =20 set_config_with_override STRING MAKEOPTS CMD_MAKEOPTS = "$DEFAULT_MAKEOPTS" @@ -98,8 +98,8 @@ determine_real_args() { set_config_with_override STRING MINKERNPACKAGE CMD_MINKERNPACKAGE set_config_with_override STRING MODULESPACKAGE CMD_MODULESPACKAGE set_config_with_override STRING KERNCACHE CMD_KERNCACHE - set_config_with_override BOOL RAMDISKMODULES CMD_RAMDISKMODULES - set_config_with_override BOOL ALLRAMDISKMODULES CMD_ALLRAMDISKMODU= LES + set_config_with_override BOOL RAMDISKMODULES CMD_RAMDISKMODULES= "yes" + set_config_with_override BOOL ALLRAMDISKMODULES CMD_ALLRAMDISKMODU= LES "no" set_config_with_override STRING INITRAMFS_OVERLAY CMD_INITRAMFS_OVER= LAY set_config_with_override BOOL MOUNTBOOT CMD_MOUNTBOOT set_config_with_override BOOL BUILD_STATIC CMD_STATIC @@ -128,7 +128,7 @@ determine_real_args() { set_config_with_override BOOL KEYMAP CMD_KEYMAP = "yes" set_config_with_override BOOL DOKEYMAPAUTO CMD_DOKEYMAPAUTO set_config_with_override STRING BUSYBOX_CONFIG CMD_BUSYBOX_CONFIG - set_config_with_override BOOL INSTALL CMD_INSTALL + set_config_with_override BOOL INSTALL CMD_INSTALL = "no" =20 BOOTDIR=3D`arch_replace "${BOOTDIR}"` BOOTDIR=3D${BOOTDIR%/} # Remove any trailing slash