# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1254914174 -3600
# Node ID ebd02353c4d992400dbbcb6c2ba26596486c25b6
# Parent  f2e526e44405f199b9a142e9ba334e53686ca3b8
Added work-around for the QEMU package whilst it's still in an interim location, but we want to release it in a PDK.

(The proper fix would be to move the repository into the right place and update the sources.csv, but time is of the essence!)

diff -r f2e526e44405 -r ebd02353c4d9 common/build.xml
--- a/common/build.xml	Wed Oct 07 11:12:20 2009 +0100
+++ b/common/build.xml	Wed Oct 07 12:16:14 2009 +0100
@@ -452,6 +452,7 @@
 
     <target name="sf-preprocess-package-config">
         <mkdir dir="${sf.common.config.dir}/generated"/>
+	<echo message="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
         <exec executable="perl" dir="${build.drive}/" failonerror="false" output="${build.log.dir}/zipconfig.log">
             <arg value="${sf.common.config.dir}/tools/populateziptemplate.pl"/>
             <arg value="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
diff -r f2e526e44405 -r ebd02353c4d9 common/tools/populateziptemplate.pl
--- a/common/tools/populateziptemplate.pl	Wed Oct 07 11:12:20 2009 +0100
+++ b/common/tools/populateziptemplate.pl	Wed Oct 07 12:16:14 2009 +0100
@@ -72,7 +72,7 @@
 {
 	warn "Warning: Package $package->{dst} does not appear on the local system\n" unless -d $package->{dst};
 	$package->{dst} =~ s{^/}{}g;
-	if ($package->{source} =~ m{/(sfl|oss)/(MCL|FCL)/(sf|utilities)/(([^/]+)/([^/]+))?})
+	if ($package->{source} =~ m{/(sfl|oss)/(MCL|FCL)/(sf|utilities|interim)/(([^/]+)/)?([^/]+)?})
 	{
 		my ($license, $codeline, $thingy, $layer, $packageName) = ($1, $2, $3, $5, $6);
 		# $thingy is the part of the path after the codeline. For
@@ -86,6 +86,19 @@
 			$layer = "tools";
 			$packageName = "utilities";
 		}
+		elsif ($thingy eq "interim")
+		{
+			if ($layer eq "QEMU")
+			{
+				$packageName = $layer;
+				$layer = "os";
+			}
+			else
+			{
+				warn "ERROR: Don't know how to deal with interim package $layer\n";
+				goto MISC_PACKAGE;
+			}
+		}
 		elsif (!defined $packageName)
 		{
 			goto MISC_PACKAGE;