diff --git a/recipes-core/dropbear/dropbear_%.bbappend b/recipes-core/dropbear/dropbear_%.bbappend new file mode 100644 index 0000000..96c4669 --- /dev/null +++ b/recipes-core/dropbear/dropbear_%.bbappend @@ -0,0 +1,2 @@ +# Not provided in our OE packages +DEPENDS_remove = "virtual/crypt" diff --git a/recipes-core/dropbear/dropbear_2022.83.bb b/recipes-core/dropbear/dropbear_2022.83.bb index 0c7a8f4..6d81e89 100644 --- a/recipes-core/dropbear/dropbear_2022.83.bb +++ b/recipes-core/dropbear/dropbear_2022.83.bb @@ -9,8 +9,8 @@ LICENSE = "MIT & BSD-3-Clause & BSD-2-Clause & PD" LIC_FILES_CHKSUM = "file://LICENSE;md5=25cf44512b7bc8966a48b6b1a9b7605f" DEPENDS = "zlib virtual/crypt" -RPROVIDES:${PN} = "ssh sshd" -RCONFLICTS:${PN} = "openssh-sshd openssh" +RPROVIDES_${PN} = "ssh sshd" +RCONFLICTS_${PN} = "openssh-sshd openssh" SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ file://0001-urandom-xauth-changes-to-options.h.patch \ @@ -41,7 +41,7 @@ CVE_PRODUCT = "dropbear_ssh" INITSCRIPT_NAME = "dropbear" INITSCRIPT_PARAMS = "defaults 10" -SYSTEMD_SERVICE:${PN} = "dropbear.socket" +SYSTEMD_SERVICE_${PN} = "dropbear.socket" SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" BINCOMMANDS = "dbclient ssh scp" @@ -58,9 +58,9 @@ PACKAGECONFIG[enable-x11-forwarding] = "" EXTRA_OECONF += "--disable-harden" # musl does not implement wtmp/logwtmp APIs -EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" +EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" -do_configure:append() { +do_configure_append() { echo "/* Dropbear features */" > ${B}/localoptions.h if ${@bb.utils.contains('PACKAGECONFIG', 'enable-x11-forwarding', 'true', 'false', d)}; then echo "#define DROPBEAR_X11FWD 1" >> ${B}/localoptions.h @@ -115,11 +115,11 @@ do_install() { inherit update-alternatives ALTERNATIVE_PRIORITY = "20" -ALTERNATIVE:${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" +ALTERNATIVE_${PN} = "${@bb.utils.filter('BINCOMMANDS', 'scp ssh', d)}" ALTERNATIVE_TARGET = "${sbindir}/dropbearmulti" -pkg_postrm:${PN} () { +pkg_postrm_${PN} () { if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then rm ${sysconfdir}/dropbear/dropbear_rsa_host_key fi @@ -128,6 +128,6 @@ pkg_postrm:${PN} () { fi } -CONFFILES:${PN} = "${sysconfdir}/default/dropbear" +CONFFILES_${PN} = "${sysconfdir}/default/dropbear" -FILES:${PN} += "${bindir}" +FILES_${PN} += "${bindir}"