Merge branch 'add-drop-config-extension' of ssh://git.baserock.org/baserock/baserock/morphs

This fixes a typo in the morphologies, referencing drop-config-files

13 files changed, 51 insertions, 12 deletions

diff --git a/add-config-files.configure b/add-config-files.configure
new file mode 100755
index 0000000..0094cf6
--- /dev/null
+++ b/add-config-files.configure
@@ -0,0 +1,27 @@
+#!/bin/sh
+# Copyright (C) 2013  Codethink Limited
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+# Copy all files located in $SRC_CONFIG_DIR to the image /etc.
+
+
+set -e
+
+if [ "x${SRC_CONFIG_DIR}" != x ]
+then
+    cp -r "$SRC_CONFIG_DIR"/* "$1/etc/" 
+fi
+
diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph
index d315c46..9d045f8 100644
--- a/base-system-armv7-highbank.morph
+++ b/base-system-armv7-highbank.morph
@@ -29,6 +29,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }
diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph
index 8793850..ff2aae0 100644
--- a/base-system-armv7-versatile.morph
+++ b/base-system-armv7-versatile.morph
@@ -29,6 +29,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }
diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph
index be0a538..3227d4e 100644
--- a/base-system-x86_32-generic.morph
+++ b/base-system-x86_32-generic.morph
@@ -29,6 +29,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }
diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph
index 19dfc29..3d5c45f 100644
--- a/base-system-x86_64-generic.morph
+++ b/base-system-x86_64-generic.morph
@@ -29,6 +29,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index 13d3d84..f9c48ba 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -34,6 +34,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index 7316f39..c887a41 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -34,6 +34,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index fd8c7cc..c2d22cb 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -34,6 +34,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 87d45de..81e948f 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -34,6 +34,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph
index 5d0f51a..d4ccba6 100644
--- a/genivi-baseline-system-armv7-versatile.morph
+++ b/genivi-baseline-system-armv7-versatile.morph
@@ -69,6 +69,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
index 2b09014..9296427 100644
--- a/genivi-baseline-system-x86_64-generic.morph
+++ b/genivi-baseline-system-x86_64-generic.morph
@@ -69,6 +69,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }
diff --git a/genivi-devel-system-armv7-versatile.morph b/genivi-devel-system-armv7-versatile.morph
index b0fa055..5e246c1 100644
--- a/genivi-devel-system-armv7-versatile.morph
+++ b/genivi-devel-system-armv7-versatile.morph
@@ -74,6 +74,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }
diff --git a/genivi-devel-system-x86_64-generic.morph b/genivi-devel-system-x86_64-generic.morph
index 373c8c1..05d33e0 100644
--- a/genivi-devel-system-x86_64-generic.morph
+++ b/genivi-devel-system-x86_64-generic.morph
@@ -74,6 +74,7 @@
     ],
     "configuration-extensions": [
         "set-hostname",
-        "ssh"
+        "ssh",
+        "add-config-files"
     ]
 }