From 4b3fba7240339863d7563bba3e67df778a18b036 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 13 Feb 2006 22:26:44 +0000 Subject: [PATCH] Fixed generation of grppkgs.txt and kernelpkgs.txt for the Installer. This is 2.0_rc37. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1084 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 +++++++- catalyst | 4 ++-- .../livecd-stage1/livecd-stage1-controller.sh | 10 +++------- targets/support/kmerge.sh | 11 ++++++----- targets/support/livecdfs-update.sh | 18 +++++++++++------- 5 files changed, 29 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 472b23b8..2645d6a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.569 2006/02/10 23:01:21 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.570 2006/02/13 22:26:44 wolf31o2 Exp $ + + 13 Feb 2006; Chris Gianelloni catalyst, + targets/livecd-stage1/livecd-stage1-controller.sh, + targets/support/kmerge.sh, targets/support/livecdfs-update.sh: + Fixed generation of grppkgs.txt and kernelpkgs.txt for the Installer. This + is 2.0_rc37. 10 Feb 2006; Eric Edgar modules/generic_stage_target.py: diff --git a/catalyst b/catalyst index 7e6c2580..d2b17ad0 100755 --- a/catalyst +++ b/catalyst @@ -1,7 +1,7 @@ #!/usr/bin/python -OO # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.144 2006/02/10 15:48:23 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.145 2006/02/13 22:26:44 wolf31o2 Exp $ # Maintained in full by: # Eric Edgar @@ -11,7 +11,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0_rc36" +__version__="2.0_rc37" conf_values={} diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh index 9c2f65d8..32ecea2f 100755 --- a/targets/livecd-stage1/livecd-stage1-controller.sh +++ b/targets/livecd-stage1/livecd-stage1-controller.sh @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-controller.sh,v 1.10 2005/12/16 19:32:31 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-controller.sh,v 1.11 2006/02/13 22:26:44 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh @@ -10,12 +10,8 @@ case $1 in build_packages) shift export clst_packages="$*" - if [ "${clst_livecd_type}" = "gentoo-release-livecd" ] - then - mkdir -p ${clst_chroot_path}/usr/livecd - echo "${clst_packages}" > \ - ${clst_chroot_path}/usr/livecd/grppkgs.txt - fi + mkdir -p ${clst_chroot_path}/usr/livecd + echo "${clst_packages}" > ${clst_chroot_path}/usr/livecd/grppkgs.txt exec_in_chroot \ ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh ;; diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 86dd0fd4..0e6e45bf 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -61,6 +61,12 @@ genkernel_compile(){ #echo ${GK_ARGS} export clst_kernel_merge export clst_initramfs_overlay + # Build our list of kernel packages + if [ "${clst_livecd_type}" = "gentoo-release-livecd" -a "$clst_kernel_merge" != ""] + then + mkdir -p /usr/livecd + echo "${clst_kernel_merge}" > /usr/livecd/kernelpkgs.txt + fi # Build with genkernel using the set options # callback is put here to avoid escaping issues if [ -n "${clst_KERNCACHE}" ] @@ -77,11 +83,6 @@ genkernel_compile(){ then genkernel --callback="emerge ${clst_kernel_merge}" \ ${GK_ARGS} || exit 1 - if [ "${clst_livecd_type}" = "gentoo-release-livecd" ] - then - mkdir -p /usr/livecd - echo "${clst_kernel_merge}" > /usr/livecd/kernelpkgs.txt - fi else genkernel ${GK_ARGS} || exit 1 fi diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index ff3689f7..55cdf1d9 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.36 2006/02/09 15:09:18 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.37 2006/02/13 22:26:44 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -254,12 +254,6 @@ case ${clst_livecd_type} in if [ "${clst_livecd_xsession}" == "gnome" ] then -# gconftool-2 --direct \ -# --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \ -# --type string --set /desktop/gnome/interface/gtk_key_theme Crux -# gconftool-2 --direct \ -# --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \ -# --type string --set /desktop/gnome/interface/gtk_theme Crux gconftool-2 --direct \ --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults \ --type string --set /desktop/gnome/interface/icon_theme Crux @@ -303,5 +297,15 @@ case ${clst_livecd_type} in touch /etc/startx ;; + * ) + if [ -e /usr/livecd/grppkgs.txt ] + then + rm -f /usr/livecd/grppkgs.txt + fi + if [ -e /usr/livecd/kernelpkgs.txt ] + then + rm -f /usr/livecd/kernelpkgs.txt + fi + ;; esac -- 2.26.2