sysmo-bts
/
meta-sysmocom-bsp
9
1
Fork 0
Code Issues Pull Requests Releases Activity

dropbear: fix build with our OE version 

* Replace : with _
* Remove "virtual/crypt" from depends

Related: SYS#6402
Change-Id: Iebeb013ed2829e5008388eed7f8794eb5ae6dad0
This commit is contained in:
Oliver Smith 2023-05-03 15:31:45 +02:00
parent ce45a5bc79
commit fc7d6d4ae2
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-core/dropbear/dropbear_%.bbappend Normal file
View File

@ -0,0 +1,2 @@
# Not provided in our OE packages
DEPENDS_remove = "virtual/crypt"

18
recipes-core/dropbear/dropbear_2022.83.bb
View File

@ -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}"