change pldistro-dependent config filenames - create symlinks for onelab for now

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index f1a02bc..19d89e1 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -112,14 +112,14 @@ BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
 
-Source10: kernel-%{kversion}-i586-%{pldistro}.config
-Source11: kernel-%{kversion}-i686-%{pldistro}.config
-Source12: kernel-%{kversion}-x86_64-%{pldistro}.config
+Source10: %{pldistro}-%{kversion}-i586.config
+Source11: %{pldistro}-%{kversion}-i686.config
+Source12: %{pldistro}-%{kversion}-x86_64.config
 %if %{builduml}
-Source20: kernel-%{kversion}-i686-uml-%{pldidstro}.config
+Source20: %{pldistro}-%{kversion}-i686-uml.config
 %endif
 %if %{buildxen}
-Source30: kernel-%{kversion}-i686-xenU-%{pldistro}.config
+Source30: %{pldistro}-%{kversion}-i686-xenU.config
 %endif
 
 # Mainline patches
@@ -365,11 +365,11 @@ BuildKernel() {
 
     # Pick the right config file for the kernel we're building
     if [ -n "$Flavour" ] ; then
-      Config=kernel-%{kversion}-%{_target_cpu}-$Flavour-%{pldistro}.config
+      Config=%{pldistro}-%{kversion}-%{_target_cpu}-$Flavour.config
       DevelDir=/usr/src/kernels/%{KVERREL}-$Flavour-%{_target_cpu}
       DevelLink=/usr/src/kernels/%{KVERREL}$Flavour-%{_target_cpu}
     else
-      Config=kernel-%{kversion}-%{_target_cpu}-%{pldistro}.config
+      Config=%{pldistro}-%{kversion}-%{_target_cpu}.config
       DevelDir=/usr/src/kernels/%{KVERREL}-%{_target_cpu}
       DevelLink=
     fi

diff --git a/onelab-2.6.22-i586.config b/onelab-2.6.22-i586.config
new file mode 120000 (symlink)
index 0000000..d13151d
--- /dev/null
+++ b/onelab-2.6.22-i586.config
@@ -0,0 +1 @@
+planetlab-2.6.22-i586.config
\ No newline at end of file

diff --git a/onelab-2.6.22-i686.config b/onelab-2.6.22-i686.config
new file mode 120000 (symlink)
index 0000000..69a4aa8
--- /dev/null
+++ b/onelab-2.6.22-i686.config
@@ -0,0 +1 @@
+planetlab-2.6.22-i686.config
\ No newline at end of file

diff --git a/onelab-2.6.22-x86_64.config b/onelab-2.6.22-x86_64.config
new file mode 120000 (symlink)
index 0000000..1bd36b8
--- /dev/null
+++ b/onelab-2.6.22-x86_64.config
@@ -0,0 +1 @@
+planetlab-2.6.22-x86_64.config
\ No newline at end of file

diff --git a/kernel-2.6.22-i586-planetlab.config b/planetlab-2.6.22-i586.config
similarity index 100%
rename from kernel-2.6.22-i586-planetlab.config
rename to planetlab-2.6.22-i586.config

diff --git a/kernel-2.6.22-i686-planetlab.config b/planetlab-2.6.22-i686.config
similarity index 100%
rename from kernel-2.6.22-i686-planetlab.config
rename to planetlab-2.6.22-i686.config

diff --git a/kernel-2.6.22-x86_64-planetlab.config b/planetlab-2.6.22-x86_64.config
similarity index 100%
rename from kernel-2.6.22-x86_64-planetlab.config
rename to planetlab-2.6.22-x86_64.config