Allow model specific multi-layout configuration.

Previously it wasn't possible to customize 2nd, 3rd and 4th layout
based on model. Also rename the configuration files and scripts to
reflect added model column.

Signed-off-by: Tomas Hanak <ext-tomas.3.hanak@nokia.com>
Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com>

5 files changed, 34 insertions, 34 deletions

diff --git a/rules/bin/Makefile.am b/rules/bin/Makefile.am
index b9785b10..99077804 100644
--- a/rules/bin/Makefile.am
+++ b/rules/bin/Makefile.am
@@ -1,6 +1,6 @@
 transform_scripts= \
-ln_s.sh \
-lnv_s.sh \
+mln_s.sh \
+mlnvn_s.sh \
 ml_s.sh \
 mlv_s.sh \
 ml1_s.sh \
diff --git a/rules/bin/ln_s.sh b/rules/bin/ln_s.sh
deleted file mode 100755
index 07ac2f08..00000000
--- a/rules/bin/ln_s.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-variant=$1
-
-INDIR=$2
-OUTFILE=base.l${variant}_s.part
-
-> $OUTFILE
-
-awk '{ 
-  if (index($2, "(") == 0) {
-    printf "  %s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2; 
-  } else {
-    printf "  %s		=	+%s:'${variant}'\n", $1, $2; 
-  }
-}' < $INDIR/layoutsMapping.lst >> $OUTFILE
-
-awk '{ 
-  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
deleted file mode 100755
index fc0d4202..00000000
--- a/rules/bin/lnv_s.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-variant=$1
-
-INDIR=$2
-OUTFILE=base.l${variant}v${variant}_s.part
-
-> $OUTFILE
-
-awk '{ 
-  printf "  %s		%s	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4; 
-}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/rules/bin/mln_s.sh b/rules/bin/mln_s.sh
new file mode 100755
index 00000000..67fd8a06
--- /dev/null
+++ b/rules/bin/mln_s.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+variant=$1
+
+INDIR=$2
+OUTFILE=base.ml${variant}_s.part
+
+> $OUTFILE
+
+awk '{
+  if (index($2, "(") == 0) {
+    printf "  *		%s		=	+%s%%(v['${variant}']):'${variant}'\n", $1, $2;
+  } else {
+    printf "  *		%s		=	+%s:'${variant}'\n", $1, $2;
+  }
+}' < $INDIR/layoutsMapping.lst >> $OUTFILE
+
+awk '{
+  printf "  *		%s(%s)	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4;
+}' < $INDIR/variantsMapping.lst >> $OUTFILE
diff --git a/rules/bin/mlnvn_s.sh b/rules/bin/mlnvn_s.sh
new file mode 100755
index 00000000..1a5f40f2
--- /dev/null
+++ b/rules/bin/mlnvn_s.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+variant=$1
+
+INDIR=$2
+OUTFILE=base.ml${variant}v${variant}_s.part
+
+> $OUTFILE
+
+awk '{
+  printf "  *		%s		%s	=	+%s(%s):'${variant}'\n", $1, $2, $3, $4;
+}' < $INDIR/variantsMapping.lst >> $OUTFILE