From ba1a4dc6269716b7a0af34357431153f8dc02781 Mon Sep 17 00:00:00 2001
From: Tomas Hanak <ext-tomas.3.hanak@nokia.com>
Date: Wed, 16 Dec 2009 14:06:18 +0200
Subject: [PATCH] Allow model specific multi-layout configuration.

Currently it's not possible to customize 2nd, 3rd and 4th layout based
on model.

Signed-off-by: Tomas Hanak <ext-tomas.3.hanak@nokia.com>
Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>
---
 rules/HDR            |   12 ++++++------
 rules/base.l2_s.part |    4 +++-
 rules/base.l3_s.part |    4 +++-
 rules/base.l4_s.part |    4 +++-
 rules/bin/ln_s.sh    |    6 +++---
 rules/bin/lnv_s.sh   |    2 +-
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/rules/HDR b/rules/HDR
index 717fdea..3f3919d 100644
--- a/rules/HDR
+++ b/rules/HDR
@@ -8,12 +8,12 @@
 ! model		layout				=	symbols
 ! model		layout[1]			=	symbols
 ! model		layout[1]	variant[1]	=	symbols
-! layout[2]	=	symbols
-! layout[3]	=	symbols
-! layout[4]	=	symbols
-! layout[2]	variant[2]	=	symbols
-! layout[3]	variant[3]	=	symbols
-! layout[4]	variant[4]	=	symbols
+! model		layout[2]	=	symbols
+! model		layout[3]	=	symbols
+! model		layout[4]	=	symbols
+! model		layout[2]	variant[2]	=	symbols
+! model		layout[3]	variant[3]	=	symbols
+! model		layout[4]	variant[4]	=	symbols
 ! model		=	symbols
 ! model		layout		=	compat
 ! model		layout[1]	=	compat
diff --git a/rules/base.l2_s.part b/rules/base.l2_s.part
index 03a7aaf..27f9975 100644
--- a/rules/base.l2_s.part
+++ b/rules/base.l2_s.part
@@ -1 +1,3 @@
-  *		=	+%l[2]%(v[2]):2
+  nokiarx51	cz(qwerty)	=	+nokia_vndr/rx-51(cz_qwerty):2
+  nokiarx51	*		=	+nokia_vndr/rx-51(%l[2]%_v[2]):2
+  *		*		=	+%l[2]%(v[2]):2
diff --git a/rules/base.l3_s.part b/rules/base.l3_s.part
index 0947c11..6077525 100644
--- a/rules/base.l3_s.part
+++ b/rules/base.l3_s.part
@@ -1 +1,3 @@
-  *		=	+%l[3]%(v[3]):3
+  nokiarx51	cz(qwerty)	=	+nokia_vndr/rx-51(cz_qwerty):3
+  nokiarx51	*		=	+nokia_vndr/rx-51(%l[3]%_v[3]):3
+  *		*		=	+%l[3]%(v[3]):3
diff --git a/rules/base.l4_s.part b/rules/base.l4_s.part
index 23ccc22..8d92f39 100644
--- a/rules/base.l4_s.part
+++ b/rules/base.l4_s.part
@@ -1 +1,3 @@
-  *		=	+%l[4]%(v[4]):4
+  nokiarx51	cz(qwerty)	=	+nokia_vndr/rx-51(cz_qwerty):4
+  nokiarx51	*		=	+nokia_vndr/rx-51(%l[4]%_v[4]):4
+  *		*		=	+%l[4]%(v[4]):4
diff --git a/rules/bin/ln_s.sh b/rules/bin/ln_s.sh
index 07ac2f0..4acff67 100755
--- a/rules/bin/ln_s.sh
+++ b/rules/bin/ln_s.sh
@@ -9,12 +9,12 @@ OUTFILE=base.l${variant}_s.part
 
 awk '{ 
   if (index($2, "(") == 0) {
-    printf "  %s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2; 
+    printf "  *		%s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2; 
   } else {
-    printf "  %s		=	+%s:'${variant}'\n", $1, $2; 
+    printf "  *		%s		=	+%s:'${variant}'\n", $1, $2; 
   }
 }' < $INDIR/layoutsMapping.lst >> $OUTFILE
 
 awk '{ 
-  printf "  %s(%s)	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4; 
+  printf "  *		%s(%s)	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4; 
 }' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/rules/bin/lnv_s.sh b/rules/bin/lnv_s.sh
index fc0d420..e2c6124 100755
--- a/rules/bin/lnv_s.sh
+++ b/rules/bin/lnv_s.sh
@@ -8,5 +8,5 @@ OUTFILE=base.l${variant}v${variant}_s.part
 > $OUTFILE
 
 awk '{ 
-  printf "  %s		%s	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4; 
+  printf "  *		%s		%s	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4; 
 }' < $INDIR/variantsMapping.lst >> $OUTFILE
-- 
1.6.0.4