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-connectivity/openssh | |
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-connectivity/openssh')
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_8.6p1.bb | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_8.6p1.bb b/meta/recipes-connectivity/openssh/openssh_8.6p1.bb index e8f041c58c..093214cbfc 100644 --- a/meta/recipes-connectivity/openssh/openssh_8.6p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_8.6p1.bb | |||
@@ -42,13 +42,13 @@ PAM_SRC_URI = "file://sshd" | |||
42 | inherit manpages useradd update-rc.d update-alternatives systemd | 42 | inherit manpages useradd update-rc.d update-alternatives systemd |
43 | 43 | ||
44 | USERADD_PACKAGES = "${PN}-sshd" | 44 | USERADD_PACKAGES = "${PN}-sshd" |
45 | USERADD_PARAM_${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd --shell /bin/false --user-group sshd" | 45 | USERADD_PARAM:${PN}-sshd = "--system --no-create-home --home-dir /var/run/sshd --shell /bin/false --user-group sshd" |
46 | INITSCRIPT_PACKAGES = "${PN}-sshd" | 46 | INITSCRIPT_PACKAGES = "${PN}-sshd" |
47 | INITSCRIPT_NAME_${PN}-sshd = "sshd" | 47 | INITSCRIPT_NAME:${PN}-sshd = "sshd" |
48 | INITSCRIPT_PARAMS_${PN}-sshd = "defaults 9" | 48 | INITSCRIPT_PARAMS:${PN}-sshd = "defaults 9" |
49 | 49 | ||
50 | SYSTEMD_PACKAGES = "${PN}-sshd" | 50 | SYSTEMD_PACKAGES = "${PN}-sshd" |
51 | SYSTEMD_SERVICE_${PN}-sshd = "sshd.socket" | 51 | SYSTEMD_SERVICE:${PN}-sshd = "sshd.socket" |
52 | 52 | ||
53 | inherit autotools-brokensep ptest | 53 | inherit autotools-brokensep ptest |
54 | 54 | ||
@@ -74,7 +74,7 @@ EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ | |||
74 | " | 74 | " |
75 | 75 | ||
76 | # musl doesn't implement wtmp/utmp and logwtmp | 76 | # musl doesn't implement wtmp/utmp and logwtmp |
77 | EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" | 77 | EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" |
78 | 78 | ||
79 | # Since we do not depend on libbsd, we do not want configure to use it | 79 | # Since we do not depend on libbsd, we do not want configure to use it |
80 | # just because it finds libutil.h. But, specifying --disable-libutil | 80 | # just because it finds libutil.h. But, specifying --disable-libutil |
@@ -87,7 +87,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd" | |||
87 | # We don't want to depend on libblockfile | 87 | # We don't want to depend on libblockfile |
88 | CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" | 88 | CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" |
89 | 89 | ||
90 | do_configure_prepend () { | 90 | do_configure:prepend () { |
91 | export LD="${CC}" | 91 | export LD="${CC}" |
92 | install -m 0644 ${WORKDIR}/sshd_config ${B}/ | 92 | install -m 0644 ${WORKDIR}/sshd_config ${B}/ |
93 | install -m 0644 ${WORKDIR}/ssh_config ${B}/ | 93 | install -m 0644 ${WORKDIR}/ssh_config ${B}/ |
@@ -100,7 +100,7 @@ do_compile_ptest() { | |||
100 | regress/check-perm regress/mkdtemp | 100 | regress/check-perm regress/mkdtemp |
101 | } | 101 | } |
102 | 102 | ||
103 | do_install_append () { | 103 | do_install:append () { |
104 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then | 104 | if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then |
105 | install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd | 105 | install -D -m 0644 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd |
106 | sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config | 106 | sed -i -e 's:#UsePAM no:UsePAM yes:' ${D}${sysconfdir}/ssh/sshd_config |
@@ -147,39 +147,39 @@ do_install_ptest () { | |||
147 | cp -r regress ${D}${PTEST_PATH} | 147 | cp -r regress ${D}${PTEST_PATH} |
148 | } | 148 | } |
149 | 149 | ||
150 | ALLOW_EMPTY_${PN} = "1" | 150 | ALLOW_EMPTY:${PN} = "1" |
151 | 151 | ||
152 | PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" | 152 | PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc ${PN}-sftp-server" |
153 | FILES_${PN}-scp = "${bindir}/scp.${BPN}" | 153 | FILES:${PN}-scp = "${bindir}/scp.${BPN}" |
154 | FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" | 154 | FILES:${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" |
155 | FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system" | 155 | FILES:${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd ${systemd_unitdir}/system" |
156 | FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd" | 156 | FILES:${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd ${sysconfdir}/pam.d/sshd" |
157 | FILES_${PN}-sshd += "${libexecdir}/${BPN}/sshd_check_keys" | 157 | FILES:${PN}-sshd += "${libexecdir}/${BPN}/sshd_check_keys" |
158 | FILES_${PN}-sftp = "${bindir}/sftp" | 158 | FILES:${PN}-sftp = "${bindir}/sftp" |
159 | FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" | 159 | FILES:${PN}-sftp-server = "${libexecdir}/sftp-server" |
160 | FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" | 160 | FILES:${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" |
161 | FILES_${PN}-keygen = "${bindir}/ssh-keygen" | 161 | FILES:${PN}-keygen = "${bindir}/ssh-keygen" |
162 | 162 | ||
163 | RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" | 163 | RDEPENDS:${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" |
164 | RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" | 164 | RDEPENDS:${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" |
165 | RRECOMMENDS_${PN}-sshd_append_class-target = "\ | 165 | RRECOMMENDS:${PN}-sshd:append:class-target = "\ |
166 | ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \ | 166 | ${@bb.utils.filter('PACKAGECONFIG', 'rng-tools', d)} \ |
167 | " | 167 | " |
168 | 168 | ||
169 | # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies | 169 | # gdb would make attach-ptrace test pass rather than skip but not worth the build dependencies |
170 | RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" | 170 | RDEPENDS:${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make sed sudo coreutils" |
171 | 171 | ||
172 | RPROVIDES_${PN}-ssh = "ssh" | 172 | RPROVIDES:${PN}-ssh = "ssh" |
173 | RPROVIDES_${PN}-sshd = "sshd" | 173 | RPROVIDES:${PN}-sshd = "sshd" |
174 | 174 | ||
175 | RCONFLICTS_${PN} = "dropbear" | 175 | RCONFLICTS:${PN} = "dropbear" |
176 | RCONFLICTS_${PN}-sshd = "dropbear" | 176 | RCONFLICTS:${PN}-sshd = "dropbear" |
177 | 177 | ||
178 | CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" | 178 | CONFFILES:${PN}-sshd = "${sysconfdir}/ssh/sshd_config" |
179 | CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config" | 179 | CONFFILES:${PN}-ssh = "${sysconfdir}/ssh/ssh_config" |
180 | 180 | ||
181 | ALTERNATIVE_PRIORITY = "90" | 181 | ALTERNATIVE_PRIORITY = "90" |
182 | ALTERNATIVE_${PN}-scp = "scp" | 182 | ALTERNATIVE:${PN}-scp = "scp" |
183 | ALTERNATIVE_${PN}-ssh = "ssh" | 183 | ALTERNATIVE:${PN}-ssh = "ssh" |
184 | 184 | ||
185 | BBCLASSEXTEND += "nativesdk" | 185 | BBCLASSEXTEND += "nativesdk" |