diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-core/dropbear/dropbear.inc | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear.inc')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index ed3ef3384a..b5f3778abe 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
@@ -9,8 +9,8 @@ LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" | |||
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=25cf44512b7bc8966a48b6b1a9b7605f" | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=25cf44512b7bc8966a48b6b1a9b7605f" |
10 | 10 | ||
11 | DEPENDS = "zlib virtual/crypt" | 11 | DEPENDS = "zlib virtual/crypt" |
12 | RPROVIDES_${PN} = "ssh sshd" | 12 | RPROVIDES:${PN} = "ssh sshd" |
13 | RCONFLICTS_${PN} = "openssh-sshd openssh" | 13 | RCONFLICTS:${PN} = "openssh-sshd openssh" |
14 | 14 | ||
15 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 15 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
16 | 16 | ||
@@ -33,7 +33,7 @@ PAM_PLUGINS = "libpam-runtime \ | |||
33 | pam-plugin-permit \ | 33 | pam-plugin-permit \ |
34 | pam-plugin-unix \ | 34 | pam-plugin-unix \ |
35 | " | 35 | " |
36 | RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" | 36 | RDEPENDS:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" |
37 | 37 | ||
38 | inherit autotools update-rc.d systemd | 38 | inherit autotools update-rc.d systemd |
39 | 39 | ||
@@ -42,7 +42,7 @@ CVE_PRODUCT = "dropbear_ssh" | |||
42 | INITSCRIPT_NAME = "dropbear" | 42 | INITSCRIPT_NAME = "dropbear" |
43 | INITSCRIPT_PARAMS = "defaults 10" | 43 | INITSCRIPT_PARAMS = "defaults 10" |
44 | 44 | ||
45 | SYSTEMD_SERVICE_${PN} = "dropbear.socket" | 45 | SYSTEMD_SERVICE:${PN} = "dropbear.socket" |
46 | 46 | ||
47 | SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" | 47 | SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" |
48 | BINCOMMANDS = "dbclient ssh scp" | 48 | BINCOMMANDS = "dbclient ssh scp" |
@@ -60,7 +60,7 @@ EXTRA_OECONF += "\ | |||
60 | EXTRA_OECONF += "--disable-harden" | 60 | EXTRA_OECONF += "--disable-harden" |
61 | 61 | ||
62 | # musl does not implement wtmp/logwtmp APIs | 62 | # musl does not implement wtmp/logwtmp APIs |
63 | EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" | 63 | EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" |
64 | 64 | ||
65 | do_install() { | 65 | do_install() { |
66 | install -d ${D}${sysconfdir} \ | 66 | install -d ${D}${sysconfdir} \ |
@@ -110,11 +110,11 @@ do_install() { | |||
110 | inherit update-alternatives | 110 | inherit update-alternatives |
111 | 111 | ||
112 | ALTERNATIVE_PRIORITY = "20" | 112 | ALTERNATIVE_PRIORITY = "20" |
113 | ALTERNATIVE_${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" | 113 | ALTERNATIVE:${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" |
114 | 114 | ||
115 | ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" | 115 | ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" |
116 | 116 | ||
117 | pkg_postrm_append_${PN} () { | 117 | pkg_postrm:append_${PN} () { |
118 | if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then | 118 | if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then |
119 | rm ${sysconfdir}/dropbear/dropbear_rsa_host_key | 119 | rm ${sysconfdir}/dropbear/dropbear_rsa_host_key |
120 | fi | 120 | fi |
@@ -123,4 +123,4 @@ pkg_postrm_append_${PN} () { | |||
123 | fi | 123 | fi |
124 | } | 124 | } |
125 | 125 | ||
126 | FILES_${PN} += "${bindir}" | 126 | FILES:${PN} += "${bindir}" |