diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-09-19 19:59:29 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-19 06:28:26 -0700 |
| commit | 9d48cb3da696add33315cf129fe60102bd9756c9 (patch) | |
| tree | 99fd88f669eab021f364038bea3459e11534cd74 | |
| parent | 6a1e55083800a680515a21294353b2c89a23b0bb (diff) | |
| download | openembedded-core-9d48cb3da696add33315cf129fe60102bd9756c9.tar.gz openembedded-core-9d48cb3da696add33315cf129fe60102bd9756c9.tar.bz2 openembedded-core-9d48cb3da696add33315cf129fe60102bd9756c9.zip | |
openssh: upgrade 7.8p1 -> 7.8p1+git to support openssl 1.1.x
- Convert from tarball to git repository which support
openssl 1.1.x
- There is no specific minor version that contains the
openssl fix (it was merged to master a few days agao),
rename recipe version to `7.8p1+git'
- Fix regression test binaries missing
In commit `1f7aaf7 openssh: build regression test binaries', it build
regression test binaries, since upstream add two binaries in commits
`c59aca8 Create control sockets in clean temp directories' and
`1acc058 Disable tests where fs perms are incorrect', we should update
do_compile_ptest.
[ptest log]
|/usr/lib/openssh/ptest/regress/test-exec.sh: line 330: /usr/lib/openssh/
ptest/regress/mkdtemp: No such file or directory
[ptest log]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/openssh/openssh_7.8p1+git.bb (renamed from meta/recipes-connectivity/openssh/openssh_7.8p1.bb) | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_7.8p1.bb b/meta/recipes-connectivity/openssh/openssh_7.8p1+git.bb index f4b295f2df..f54dfb5de4 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.8p1.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.8p1+git.bb @@ -8,11 +8,10 @@ SECTION = "console/network" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=429658c6612f3a9b1293782366ab29d8" -# openssl 1.1 patches are proposed at https://github.com/openssh/openssh-portable/pull/48 -DEPENDS = "zlib openssl10" +DEPENDS = "zlib openssl" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ +SRC_URI = "git://github.com/openssh/openssh-portable;branch=master \ file://sshd_config \ file://ssh_config \ file://init \ @@ -29,8 +28,9 @@ SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar PAM_SRC_URI = "file://sshd" -SRC_URI[md5sum] = "ce1d090fa6239fd38eb989d5e983b074" -SRC_URI[sha256sum] = "1a484bb15152c183bb2514e112aa30dd34138c3cfb032eee5490a66c507144ca" +SRCREV = "cce8cbe0ed7d1ba3a575310e0b63c193326ae616" + +S = "${WORKDIR}/git" inherit useradd update-rc.d update-alternatives systemd @@ -80,7 +80,8 @@ do_configure_prepend () { do_compile_ptest() { # skip regress/unittests/ binaries: this will silently skip # unittests in run-ptests which is good because they are so slow. - oe_runmake regress/modpipe regress/setuid-allowed regress/netcat + oe_runmake regress/modpipe regress/setuid-allowed regress/netcat \ + regress/check-perm regress/mkdtemp } do_install_append () { |