summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/common/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta-phosphor/common/recipes-core')
-rw-r--r--meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service11
-rw-r--r--meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend2
-rw-r--r--meta-phosphor/common/recipes-core/os-release/os-release.bbappend3
3 files changed, 15 insertions, 1 deletions
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service b/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service
new file mode 100644
index 000000000..623f73e42
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/dropbear/dropbear/dropbearkey.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=SSH Key Generation
+ConditionPathExists=|!/etc/dropbear/dropbear_rsa_host_key
+
+[Service]
+Type=oneshot
+ExecStart=@SBINDIR@/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend b/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend
new file mode 100644
index 000000000..36c0dcd12
--- /dev/null
+++ b/meta-phosphor/common/recipes-core/dropbear/dropbear_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://dropbearkey.service"
diff --git a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend b/meta-phosphor/common/recipes-core/os-release/os-release.bbappend
index ba6a7721e..b112c50d9 100644
--- a/meta-phosphor/common/recipes-core/os-release/os-release.bbappend
+++ b/meta-phosphor/common/recipes-core/os-release/os-release.bbappend
@@ -6,7 +6,7 @@ def run_git(d, cmd):
pass
python() {
- version_id = run_git(d, 'tag')
+ version_id = run_git(d, 'describe --abbrev=0')
if version_id:
d.setVar('VERSION_ID', version_id)
@@ -16,3 +16,4 @@ python() {
}
OS_RELEASE_FIELDS_append = " BUILD_ID"
+do_compile[nostamp] = "1"
OpenPOWER on IntegriCloud