diff options
author | Matthieu Crapet <Matthieu.Crapet@ingenico.com> | 2014-05-06 14:17:50 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-08 13:00:33 +0100 |
commit | 44ba0766d5366bdb589373011c2496cc999af012 (patch) | |
tree | f0a77a31ed3604829ca9bc78449bd41310d48411 /meta | |
parent | 4dd22fe1a01684403249bfd42b7c06f89923c15a (diff) | |
download | poky-44ba0766d5366bdb589373011c2496cc999af012.tar.gz |
dropbear: avoid pipe with sed
Replace:
cat <file> | sed -e xxx
By:
sed -e xxx <file>
+ fix indentation
(From OE-Core rev: e6a25f3377f75d995c996374e155e10ced519dce)
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 5a7be492b7..9fec09e919 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
@@ -46,12 +46,12 @@ CFLAGS += "-DSFTPSERVER_PATH=\\"${libdir}/openssh/sftp-server\\"" | |||
46 | 46 | ||
47 | do_install() { | 47 | do_install() { |
48 | install -d ${D}${sysconfdir} \ | 48 | install -d ${D}${sysconfdir} \ |
49 | ${D}${sysconfdir}/init.d \ | 49 | ${D}${sysconfdir}/init.d \ |
50 | ${D}${sysconfdir}/default \ | 50 | ${D}${sysconfdir}/default \ |
51 | ${D}${sysconfdir}/dropbear \ | 51 | ${D}${sysconfdir}/dropbear \ |
52 | ${D}${bindir} \ | 52 | ${D}${bindir} \ |
53 | ${D}${sbindir} \ | 53 | ${D}${sbindir} \ |
54 | ${D}${localstatedir} | 54 | ${D}${localstatedir} |
55 | 55 | ||
56 | install -m 0755 dropbearmulti ${D}${sbindir}/ | 56 | install -m 0755 dropbearmulti ${D}${sbindir}/ |
57 | ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient | 57 | ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient |
@@ -60,11 +60,11 @@ do_install() { | |||
60 | do | 60 | do |
61 | ln -s ./dropbearmulti ${D}${sbindir}/$i | 61 | ln -s ./dropbearmulti ${D}${sbindir}/$i |
62 | done | 62 | done |
63 | cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \ | 63 | sed -e 's,/etc,${sysconfdir},g' \ |
64 | -e 's,/usr/sbin,${sbindir},g' \ | 64 | -e 's,/usr/sbin,${sbindir},g' \ |
65 | -e 's,/var,${localstatedir},g' \ | 65 | -e 's,/var,${localstatedir},g' \ |
66 | -e 's,/usr/bin,${bindir},g' \ | 66 | -e 's,/usr/bin,${bindir},g' \ |
67 | -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear | 67 | -e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear |
68 | chmod 755 ${D}${sysconfdir}/init.d/dropbear | 68 | chmod 755 ${D}${sysconfdir}/init.d/dropbear |
69 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then | 69 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then |
70 | install -d ${D}${sysconfdir}/pam.d | 70 | install -d ${D}${sysconfdir}/pam.d |
@@ -77,9 +77,9 @@ do_install() { | |||
77 | install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_unitdir}/system | 77 | install -m 0644 ${WORKDIR}/dropbear@.service ${D}${systemd_unitdir}/system |
78 | install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system | 78 | install -m 0644 ${WORKDIR}/dropbear.socket ${D}${systemd_unitdir}/system |
79 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ | 79 | sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ |
80 | -e 's,@BINDIR@,${bindir},g' \ | 80 | -e 's,@BINDIR@,${bindir},g' \ |
81 | -e 's,@SBINDIR@,${sbindir},g' \ | 81 | -e 's,@SBINDIR@,${sbindir},g' \ |
82 | ${D}${systemd_unitdir}/system/dropbear.socket ${D}${systemd_unitdir}/system/*.service | 82 | ${D}${systemd_unitdir}/system/dropbear.socket ${D}${systemd_unitdir}/system/*.service |
83 | } | 83 | } |
84 | 84 | ||
85 | inherit update-alternatives | 85 | inherit update-alternatives |