From 21e3bb57ff6fbe5142ad5920430fe02951e343fc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 29 Jan 2019 12:22:29 -0800 Subject: mosh: Upgrade to 1.3.2 Fix building with clang/libc++ while here Signed-off-by: Khem Raj --- .../mosh/mosh/0001-Fix-building-with-libc.patch | 24 +++++++++++ meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb | 46 --------------------- meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb | 48 ++++++++++++++++++++++ 3 files changed, 72 insertions(+), 46 deletions(-) create mode 100644 meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch delete mode 100644 meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb create mode 100644 meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch b/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch new file mode 100644 index 0000000000..100ede17bd --- /dev/null +++ b/meta-oe/recipes-connectivity/mosh/mosh/0001-Fix-building-with-libc.patch @@ -0,0 +1,24 @@ +From efa9e49714b30d7d9128946a2504c93e10d109b5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 29 Jan 2019 12:20:03 -0800 +Subject: [PATCH] Fix building with libc++ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/network/network.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/network/network.cc b/src/network/network.cc +index 26da603..e480853 100644 +--- a/src/network/network.cc ++++ b/src/network/network.cc +@@ -335,7 +335,7 @@ bool Connection::try_bind( const char *addr, int port_low, int port_high ) + } + } + +- if ( bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) { ++ if ( ::bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) { + set_MTU( local_addr.sa.sa_family ); + return true; + } else if ( i == search_high ) { /* last port to search */ diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb deleted file mode 100644 index 9fc8435ee6..0000000000 --- a/meta-oe/recipes-connectivity/mosh/mosh_1.3.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -# NOTE: mosh-server requires a UTF-8 locale, but there's no way to add -# an explicit dependency for this so you need to ensure this is in your -# image yourself when you install mosh-server. - -SUMMARY = "Remote shell supporting roaming and high-latency connections" -DESCRIPTION = "Remote terminal application that allows roaming, supports \ -intermittent connectivity, and provides intelligent local echo and line \ -editing of user keystrokes. Mosh is a replacement for SSH. It's more \ -robust and responsive, especially over Wi-Fi, cellular, and \ -long-distance links." -HOMEPAGE = "http://mosh.mit.edu" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter" - -SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz" -SRC_URI[md5sum] = "d961276995936953bf2d5a794068b076" -SRC_URI[sha256sum] = "320e12f461e55d71566597976bd9440ba6c5265fa68fbf614c6f1c8401f93376" - -inherit autotools pkgconfig - -PACKAGE_BEFORE_PN += "${PN}-server" -FILES_${PN}-server = "${bindir}/mosh-server" - -NEEDED_PERL_MODULES = "\ - perl-module-socket \ - perl-module-getopt-long \ - perl-module-errno \ - perl-module-io-socket-inet \ - perl-module-posix \ -" - -# mosh uses SSH to authenticate and the client uses OpenSSH-specific features -RDEPENDS_${PN} += "openssh-ssh ${NEEDED_PERL_MODULES}" -# The server seemed not to work with dropbear either -RDEPENDS_${PN}-server += "openssh-sshd ${NEEDED_PERL_MODULES}" - -# Fails to build with thumb-1 (qemuarm) -#| {standard input}: Assembler messages: -#| {standard input}:2100: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r4' -#| {standard input}:2101: Error: instruction not supported in Thumb16 mode -- `adcs r5,r5,r5' -#| {standard input}:2102: Error: instruction not supported in Thumb16 mode -- `adcs r6,r6,r6' -#| {standard input}:2103: Error: instruction not supported in Thumb16 mode -- `adcs r7,r7,r7' -#| {standard input}:2104: Error: selected processor does not support Thumb mode `it cs' -ARM_INSTRUCTION_SET = "arm" diff --git a/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb b/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb new file mode 100644 index 0000000000..9c439354d1 --- /dev/null +++ b/meta-oe/recipes-connectivity/mosh/mosh_1.3.2.bb @@ -0,0 +1,48 @@ +# NOTE: mosh-server requires a UTF-8 locale, but there's no way to add +# an explicit dependency for this so you need to ensure this is in your +# image yourself when you install mosh-server. + +SUMMARY = "Remote shell supporting roaming and high-latency connections" +DESCRIPTION = "Remote terminal application that allows roaming, supports \ +intermittent connectivity, and provides intelligent local echo and line \ +editing of user keystrokes. Mosh is a replacement for SSH. It's more \ +robust and responsive, especially over Wi-Fi, cellular, and \ +long-distance links." +HOMEPAGE = "http://mosh.mit.edu" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "protobuf-native protobuf ncurses zlib libio-pty-perl openssl libutempter" + +SRC_URI = "http://mosh.mit.edu/mosh-${PV}.tar.gz \ + file://0001-Fix-building-with-libc.patch \ + " +SRC_URI[md5sum] = "5122f4d2b973ab7c38dcdac8c35cb61e" +SRC_URI[sha256sum] = "da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216" + +inherit autotools pkgconfig + +PACKAGE_BEFORE_PN += "${PN}-server" +FILES_${PN}-server = "${bindir}/mosh-server" + +NEEDED_PERL_MODULES = "\ + perl-module-socket \ + perl-module-getopt-long \ + perl-module-errno \ + perl-module-io-socket-inet \ + perl-module-posix \ +" + +# mosh uses SSH to authenticate and the client uses OpenSSH-specific features +RDEPENDS_${PN} += "openssh-ssh ${NEEDED_PERL_MODULES}" +# The server seemed not to work with dropbear either +RDEPENDS_${PN}-server += "openssh-sshd ${NEEDED_PERL_MODULES}" + +# Fails to build with thumb-1 (qemuarm) +#| {standard input}: Assembler messages: +#| {standard input}:2100: Error: instruction not supported in Thumb16 mode -- `adds r4,r4,r4' +#| {standard input}:2101: Error: instruction not supported in Thumb16 mode -- `adcs r5,r5,r5' +#| {standard input}:2102: Error: instruction not supported in Thumb16 mode -- `adcs r6,r6,r6' +#| {standard input}:2103: Error: instruction not supported in Thumb16 mode -- `adcs r7,r7,r7' +#| {standard input}:2104: Error: selected processor does not support Thumb mode `it cs' +ARM_INSTRUCTION_SET = "arm" -- cgit 1.2.3-korg