diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-13 14:25:14 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-05-13 14:25:14 +0000 |
commit | e0f5d65f6573de2349c31d2454ac1841808dad4f (patch) | |
tree | 35e27324960483a40bd5434359bf6d315e9ffd39 | |
parent | c03e4bcb5fcd2a06c9996f5ec157fdfaa745fce8 (diff) | |
parent | 99ee85d443b7ec6710d32184ccb98648240338b9 (diff) | |
download | definitions-e0f5d65f6573de2349c31d2454ac1841808dad4f.tar.gz |
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
-rwxr-xr-x | add-config-files.configure | 27 | ||||
-rw-r--r-- | base-system-armv7-highbank.morph | 3 | ||||
-rw-r--r-- | base-system-armv7-versatile.morph | 3 | ||||
-rw-r--r-- | base-system-x86_32-generic.morph | 3 | ||||
-rw-r--r-- | base-system-x86_64-generic.morph | 3 | ||||
-rw-r--r-- | devel-system-armv7-highbank.morph | 3 | ||||
-rw-r--r-- | devel-system-armv7-versatile.morph | 3 | ||||
-rw-r--r-- | devel-system-x86_32-generic.morph | 3 | ||||
-rw-r--r-- | devel-system-x86_64-generic.morph | 3 | ||||
-rw-r--r-- | genivi-baseline-system-armv7-versatile.morph | 3 | ||||
-rw-r--r-- | genivi-baseline-system-x86_64-generic.morph | 3 | ||||
-rw-r--r-- | genivi-devel-system-armv7-versatile.morph | 3 | ||||
-rw-r--r-- | genivi-devel-system-x86_64-generic.morph | 3 |
13 files changed, 51 insertions, 12 deletions
diff --git a/add-config-files.configure b/add-config-files.configure new file mode 100755 index 00000000..0094cf6b --- /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 d315c466..9d045f83 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 8793850f..ff2aae08 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 be0a5389..3227d4ea 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 19dfc297..3d5c45fa 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 13d3d84e..f9c48ba1 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 7316f394..c887a413 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 fd8c7cc0..c2d22cb2 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 87d45dec..81e948f1 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 5d0f51a2..d4ccba69 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 2b090141..92964277 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 b0fa0551..5e246c1c 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 373c8c11..05d33e0a 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" ] } |