From 6ce21e12aca10c1a3a433e13182ef55718b9afe9 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Wed, 5 Nov 2008 01:47:53 +0000 Subject: [PATCH] Make sure we don't mangle the source_subpath on our stage1 spec svn path=/trunk/; revision=589 --- tools/ChangeLog | 3 +++ tools/catalyst-auto | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/ChangeLog b/tools/ChangeLog index 41819aa4..c6310e3e 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 05 Nov 2008; Andrew Gaffney catalyst-auto: + Make sure we don't mangle the source_subpath on our stage1 spec + 31 Oct 2008; Andrew Gaffney catalyst-auto-x86.conf: Add in x86 stage2/3 for minimal CD diff --git a/tools/catalyst-auto b/tools/catalyst-auto index e3fae5f9..0aea7add 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -149,9 +149,12 @@ for i in $(find -name '*.spec'); do sed -i 's|^version_stamp:.*$|version_stamp: '${DATESTAMP}'|' ${i} sed -i 's|^snapshot:.*$|snapshot: '${DATESTAMP}'|' ${i} - if [ "${old_version_stamp}" = "${old_source_subpath}" ]; then + + # We don't want to mangle the source_subpath for our stage1 spec + if ! grep -q '^target: *stage1$' ${i}; then sed -i 's|^source_subpath: \(.\+-\).\+$|source_subpath: \1'${DATESTAMP}'|' ${i} fi + sed -i '/^livecd\/iso/s|'${old_version_stamp}'|'${DATESTAMP}'|' ${i} kconfig_line=$(grep '^boot/kernel/[^/]\+/config:' ${i})