From d08dc81f200f3c91793f90d462a8a22e4b33063f Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 7 Mar 2007 01:26:46 +0000 Subject: [PATCH] Removed the livecd/unmerge section from the LiveCD builds since it isn't nececssary, at all, and newer portage versions recreate /var/db on unmerge and not just on merge, causing problems with how we were doing the LiveCD's /var/db rearranging. svn path=/trunk/; revision=263 --- specs/2007.0/ChangeLog | 10 +++++++++- specs/2007.0/alpha/livecd-stage2-gnome.spec | 3 --- specs/2007.0/amd64/livecd-stage2-gnome.spec | 3 --- specs/2007.0/ppc/ppc32/livecd-stage2-gnome.spec | 3 --- specs/2007.0/x86/i686/livecd-stage2-gnome.spec | 3 --- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/specs/2007.0/ChangeLog b/specs/2007.0/ChangeLog index ec7c0d0b..117f9d05 100644 --- a/specs/2007.0/ChangeLog +++ b/specs/2007.0/ChangeLog @@ -1,5 +1,13 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.27 2007-02-24 17:34:41 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.0/ChangeLog,v 1.28 2007-03-07 01:26:46 wolf31o2 Exp $ + + 07 Mar 2007; Chris Gianelloni + alpha/livecd-stage2-gnome.spec, amd64/livecd-stage2-gnome.spec, + ppc/ppc32/livecd-stage2-gnome.spec, x86/i686/livecd-stage2-gnome.spec: + Removed the livecd/unmerge section from the LiveCD builds since it isn't + nececssary, at all, and newer portage versions recreate /var/db on unmerge + and not just on merge, causing problems with how we were doing the LiveCD's + /var/db rearranging. 24 Feb 2007; Chris Gianelloni amd64/stage1.spec: Changed amd64 seed to be 2006.1 instead of 2006.0. diff --git a/specs/2007.0/alpha/livecd-stage2-gnome.spec b/specs/2007.0/alpha/livecd-stage2-gnome.spec index dc262c77..8fdca27f 100644 --- a/specs/2007.0/alpha/livecd-stage2-gnome.spec +++ b/specs/2007.0/alpha/livecd-stage2-gnome.spec @@ -36,9 +36,6 @@ boot/kernel/gentoo/packages: media-sound/alsa-utils sys-fs/cryptsetup-luks -livecd/unmerge: - sys-kernel/gentoo-sources - livecd/empty: /var/tmp /var/empty diff --git a/specs/2007.0/amd64/livecd-stage2-gnome.spec b/specs/2007.0/amd64/livecd-stage2-gnome.spec index 7ba20052..47b94ab4 100644 --- a/specs/2007.0/amd64/livecd-stage2-gnome.spec +++ b/specs/2007.0/amd64/livecd-stage2-gnome.spec @@ -51,9 +51,6 @@ boot/kernel/gentoo/packages: sys-apps/pcmciautils sys-fs/cryptsetup-luks -livecd/unmerge: - sys-kernel/gentoo-sources - livecd/empty: /var/tmp /var/empty diff --git a/specs/2007.0/ppc/ppc32/livecd-stage2-gnome.spec b/specs/2007.0/ppc/ppc32/livecd-stage2-gnome.spec index f178b52f..c9f85012 100644 --- a/specs/2007.0/ppc/ppc32/livecd-stage2-gnome.spec +++ b/specs/2007.0/ppc/ppc32/livecd-stage2-gnome.spec @@ -66,9 +66,6 @@ boot/kernel/pegasos/gk_kernargs: --no-initrdmodules --genzimage # net-dialup/fritzcapi # net-dialup/fcdsl -livecd/unmerge: - gentoo-sources - livecd/empty: /var/tmp /var/empty diff --git a/specs/2007.0/x86/i686/livecd-stage2-gnome.spec b/specs/2007.0/x86/i686/livecd-stage2-gnome.spec index 638fa3c6..a6409ea0 100644 --- a/specs/2007.0/x86/i686/livecd-stage2-gnome.spec +++ b/specs/2007.0/x86/i686/livecd-stage2-gnome.spec @@ -50,9 +50,6 @@ boot/kernel/gentoo/packages: sys-apps/pcmciautils sys-fs/cryptsetup-luks -livecd/unmerge: - sys-kernel/gentoo-sources - livecd/empty: /var/tmp /var/empty