diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-08 11:55:37 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-08-08 11:55:37 +0000 |
| commit | 80296aea845f2c4f269e6a26dd951feea9771602 (patch) | |
| tree | 65863940c6c2dd69e619018e958872ad0e4e8e69 | |
| parent | 6d43023b30937b1744703d64790f0117ac1992eb (diff) | |
| parent | b30cdffc8cd4d62639f8b9ab1caa9f82c5493ac1 (diff) | |
| download | openssh-80296aea845f2c4f269e6a26dd951feea9771602.tar.gz | |
Merge branch 'baserock/richardmaw/S8537/ssh-copy-id' into baserock/morph
Reviewed-by: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
| -rw-r--r-- | openssh.morph | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/openssh.morph b/openssh.morph index ac9d99b5..085c6dfa 100644 --- a/openssh.morph +++ b/openssh.morph @@ -1,22 +1,28 @@ -{ - "name": "openssh", - "kind": "chunk", - "configure-commands": [ - "autoreconf -if", - "OPENSSL_SEEDS_ITSELF=yes ./configure --prefix=\"$PREFIX\" --sysconfdir=/etc/ssh --datadir=\"$PREFIX/share/sshd\" --libexecdir=\"$PREFIX/lib/openssh\" --with-privsep-path=/var/lib/sshd" - ], - "build-commands": [ - "make", - "sed -e \"s|@prefix@|$PREFIX|g\" -e \"s|@STARTUP_SCRIPT_SHELL@|/bin/sh|g\" -e 's|@sysconfdir@|/etc/ssh|g' -e 's|@COMMENT_OUT_ECC@||g' sshd-keygen.in >sshd-keygen", - "sed -e \"s|@prefix@|$PREFIX|g\" opensshd.service.in >opensshd.service" - ], - "install-commands": [ - "make DESTDIR=\"$DESTDIR\" install", - "mkdir -p \"$DESTDIR/$PREFIX/sbin\"", - "chmod go= \"$DESTDIR\"/var/lib/sshd", - "install -m 744 sshd-keygen \"$DESTDIR/$PREFIX/sbin/sshd-keygen\"", - "mkdir -p \"$DESTDIR/lib/systemd/system/multi-user.target.wants\"", - "install -m 644 opensshd.service \"$DESTDIR/lib/systemd/system/opensshd.service\"", - "ln -s ../opensshd.service \"$DESTDIR/lib/systemd/system/multi-user.target.wants/opensshd.service\"" - ] -} +name: openssh +kind: chunk +configure-commands: +- autoreconf -if +- | + OPENSSL_SEEDS_ITSELF=yes ./configure \ + --prefix="$PREFIX" --sysconfdir=/etc/ssh \ + --datadir="$PREFIX/share/sshd" \ + --libexecdir="$PREFIX/lib/openssh" \ + --with-privsep-path=/var/lib/sshd +build-commands: +- make +- | + sed -e 's|@prefix@|$PREFIX|g' \ + -e 's|@STARTUP_SCRIPT_SHELL@|/bin/sh|g' \ + -e 's|@sysconfdir@|/etc/ssh|g' \ + -e 's|@COMMENT_OUT_ECC@||g' \ + sshd-keygen.in >sshd-keygen +- sed -e 's|@prefix@|$PREFIX|g' opensshd.service.in >opensshd.service +install-commands: +- make DESTDIR="$DESTDIR" install +- mkdir -p "$DESTDIR/$PREFIX/sbin" +- chmod go= "$DESTDIR"/var/lib/sshd +- install -m 744 sshd-keygen "$DESTDIR/$PREFIX/sbin/sshd-keygen" +- install -m 755 contrib/ssh-copy-id "$DESTDIR/$PREFIX/bin/ssh-copy-id" +- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants" +- install -m 644 opensshd.service "$DESTDIR/lib/systemd/system/opensshd.service" +- ln -s ../opensshd.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/opensshd.service" |