From 9ea973d0a3d47ee39e19fdaa1cafaf76a467aca8 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 25 May 2005 19:15:18 +0000 Subject: [PATCH] Added mutex to AUTHORS and added livecd/linuxrc support to embedded, stage4, and livecd-stage2 targets. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@662 d1e1f19c-881f-0410-ab34-b69fee027534 --- AUTHORS | 1 + ChangeLog | 9 ++++++++- examples/livecd-stage2_template.spec | 8 ++++++++ modules/livecd_stage2_target.py | 5 +++-- targets/livecd-stage2/livecd-stage2-controller.sh | 9 +++++++-- targets/stage4/stage4-controller.sh | 8 +++++++- targets/support/kmerge.sh | 5 +++++ 7 files changed, 39 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9fc5f80c..6bb5b0d4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -12,3 +12,4 @@ Guy Martin Mike Frysinger Gustavo Zacarias Robert Paskowitz +David Bryson diff --git a/ChangeLog b/ChangeLog index 5c71a093..9edc8301 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.262 2005/05/20 19:16:47 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.263 2005/05/25 19:15:17 wolf31o2 Exp $ + + 25 May 2005; Chris Gianelloni AUTHORS, + examples/livecd-stage2_template.spec, modules/livecd_stage2_target.py, + targets/livecd-stage2/livecd-stage2-controller.sh, + targets/stage4/stage4-controller.sh, targets/support/kmerge.sh: + Added mutex to AUTHORS and added livecd/linuxrc support to embedded, stage4, + and livecd-stage2 targets. 20 May 2005; Chris Gianelloni AUTHORS, catalyst, files/catalyst.conf: diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec index 26a63157..6752f55f 100644 --- a/examples/livecd-stage2_template.spec +++ b/examples/livecd-stage2_template.spec @@ -126,6 +126,14 @@ livecd/splash_theme: # livecd/gk_mainargs: --lvm2 --dmraid livecd/gk_mainargs: +# This option allows you to specify your own linuxrc script for genkernel to use +# when building your CD. This is not checked for functionality, so it is up to +# you to debug your own script. We do not use one for the official release +# media, so there will not be one listed below. +# example: +# livecd/linuxrc: +livecd/linuxrc: + # This option controls quite a bit of catalyst internals and sets up several # defaults. Each type behaves slightly differently and is explained below. # gentoo-release-minimal - This creates an official minimal InstallCD. diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index 1eb08828..a8d29dd0 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.42 2005/05/03 14:58:52 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.43 2005/05/25 19:15:17 wolf31o2 Exp $ """ Builder class for a LiveCD stage2 build. @@ -22,7 +22,8 @@ class livecd_stage2_target(generic_stage_target): "livecd/motd","livecd/overlay","livecd/modblacklist","livecd/splash_theme",\ "livecd/rcadd","livecd/rcdel","livecd/fsscript","livecd/xinitrc",\ "livecd/root_overlay","livecd/devmanager","livecd/splash_type",\ - "gamecd/conf","livecd/users","portage_overlay","livecd/cdfstype"]) + "gamecd/conf","livecd/users","portage_overlay","livecd/cdfstype",\ + "livecd/linuxrc"]) generic_stage_target.__init__(self,spec,addlargs) if not self.settings.has_key("livecd/type"): diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index c50aafb3..ff81df28 100755 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.9 2005/04/27 17:44:58 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.10 2005/05/25 19:15:17 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -8,10 +8,15 @@ case $1 in kernel) shift export clst_kname="$1" - + # if we have our own linuxrc, copy it in + if [ -n "${clst_livecd_linuxrc}" ] + then + cp -a ${clst_livecd_linuxrc} ${clst_chroot_path}/tmp/linuxrc + fi exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh + rm -f ${clst_chroot_path}/tmp/linuxrc exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh extract_modules ${clst_chroot_path} ${clst_kname} diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh index 324178c5..d927b4ec 100755 --- a/targets/stage4/stage4-controller.sh +++ b/targets/stage4/stage4-controller.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage4/stage4-controller.sh,v 1.4 2005/04/27 17:44:58 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage4/stage4-controller.sh,v 1.5 2005/05/25 19:15:18 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh @@ -14,8 +14,14 @@ case $1 in kernel) shift export clst_kname="$1" + # if we have our own linuxrc, copy it in + if [ -n "${clst_livecd_linuxrc}" ] + then + cp -a ${clst_livecd_linuxrc} ${clst_chroot_path}/tmp/linuxrc + fi exec_in_chroot ${clst_sharedir}/targets/support/pre-kmerge.sh exec_in_chroot ${clst_sharedir}/targets/support/kmerge.sh + rm -f ${clst_chroot_path}/tmp/linuxrc exec_in_chroot ${clst_sharedir}/targets/support/post-kmerge.sh extract_modules ${clst_chroot_path} ${clst_kname} extract_kernel ${clst_chroot_path}/boot ${clst_kname} diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 862d5488..24aeacfb 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -44,6 +44,11 @@ setup_gk_args() { then GK_ARGS="${GK_ARGS} --no-udev" fi + + if [ -n "${clst_livecd_linuxrc}" ] + then + GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc" + fi } genkernel_compile(){ -- 2.26.2