dropbear: fix build with our OE version

* Replace : with _ Related: SYS#6402 Change-Id: Iebeb013ed2829e5008388eed7f8794eb5ae6dad0
dropbear: import from generic-poky
2023-05-03 15:35:57 +02:00 · 2023-05-03 15:30:56 +02:00 · 2023-05-03 15:30:56 +02:00 · 2023-05-03 15:30:56 +02:00
1 changed files with 7 additions and 7 deletions
--- 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"
@ -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}"
Author	SHA1	Message	Date
Oliver Smith	2f97dec64d	dropbear: fix build with our OE version * Replace : with _ Related: SYS#6402 Change-Id: Iebeb013ed2829e5008388eed7f8794eb5ae6dad0	2023-05-03 15:35:57 +02:00
Oliver Smith	1cc3095d99	dropbear: import from generic-poky Prepare to upgrade dropbear by importing it first from: https://gitea.sysmocom.de/sysmo-bts/generic-poky/src/branch/pyro/meta/recipes-core/dropbear Related: SYS#6402 Change-Id: I8e1290373c1ed44c612f9ed50240e6313027f47a	2023-05-03 15:30:56 +02:00
Oliver Smith	7b7e522ccf	recipes-fixes/dropbear: remove Remove this directory to prepare to upgrade dropbear in following patches. The directory made changes to the sysvinit script that was used by pre-201705 systems (SYS#691). 201705 uses systemd services instead. On a side note, all customizations made to the init script had been upstreamed into OE. Related: SYS#6402 Change-Id: Icb65a68091aff43c5c94ba961a650865a2784b65	2023-05-03 15:30:56 +02:00
Oliver Smith	3140454c3c	sftp-server: new package Package OpenSSH's sftp-server program, so we can install it as dependency of dropbear in a future patch. Once sftp-server is installed, the scp tool from OpenSSH can be used with the SFTP protocol, without enabling the legacy flag for the legacy SCP protocol. The sftp-server binary is 126K in size. After packaging this, I realized that we could also have used the openssh-sftp-server package from poky: https://gitea.sysmocom.de/sysmo-bts/generic-poky/src/branch/pyro/meta/recipes-connectivity/openssh But let's use this extra package now, it uses the most recent OpenSSH source and doesn't build the rest of OpenSSH which we don't need. Related: SYS#6403 Change-Id: I376bc31413935f7a560afd916a623228550dc6fe	2023-05-03 15:30:56 +02:00