diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-01-08 16:25:29 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-11 10:39:08 +0000 |
commit | d94ac527b3a2bf1a8330b676513062bf699fbbe3 (patch) | |
tree | 7ca1443d5c67f7262de672ab65ce2ea5c6655370 | |
parent | eca87bf2b427e98179d09d131306b9ca4047bd4f (diff) | |
download | poky-d94ac527b3a2bf1a8330b676513062bf699fbbe3.tar.gz |
openssh: use tarballs instead of git
This was change to git recently to obtain openssl 1.1 compatible pre-release code
(before 7.9 was out), however tarballs are preferred, and with them upstream version
checks work (openssh uses a weird git tag scheme).
(From OE-Core rev: a921a96e84f4d0b3f3d29a571981de08eb148e15)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssh/openssh_7.9p1.bb (renamed from meta/recipes-connectivity/openssh/openssh_7.9p1+git.bb) | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh_7.9p1+git.bb b/meta/recipes-connectivity/openssh/openssh_7.9p1.bb index d79ffe1971..2a23f64b89 100644 --- a/meta/recipes-connectivity/openssh/openssh_7.9p1+git.bb +++ b/meta/recipes-connectivity/openssh/openssh_7.9p1.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=429658c6612f3a9b1293782366ab29d8" | |||
11 | DEPENDS = "zlib openssl" | 11 | DEPENDS = "zlib openssl" |
12 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 12 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
13 | 13 | ||
14 | SRC_URI = "git://github.com/openssh/openssh-portable;branch=master \ | 14 | SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ |
15 | file://sshd_config \ | 15 | file://sshd_config \ |
16 | file://ssh_config \ | 16 | file://ssh_config \ |
17 | file://init \ | 17 | file://init \ |
@@ -25,13 +25,11 @@ SRC_URI = "git://github.com/openssh/openssh-portable;branch=master \ | |||
25 | file://sshd_check_keys \ | 25 | file://sshd_check_keys \ |
26 | file://add-test-support-for-busybox.patch \ | 26 | file://add-test-support-for-busybox.patch \ |
27 | " | 27 | " |
28 | SRC_URI[md5sum] = "c6af50b7a474d04726a5aa747a5dce8f" | ||
29 | SRC_URI[sha256sum] = "6b4b3ba2253d84ed3771c8050728d597c91cfce898713beb7b64a305b6f11aad" | ||
28 | 30 | ||
29 | PAM_SRC_URI = "file://sshd" | 31 | PAM_SRC_URI = "file://sshd" |
30 | 32 | ||
31 | SRCREV = "aede1c34243a6f7feae2fb2cb686ade5f9be6f3d" | ||
32 | |||
33 | S = "${WORKDIR}/git" | ||
34 | |||
35 | inherit useradd update-rc.d update-alternatives systemd | 33 | inherit useradd update-rc.d update-alternatives systemd |
36 | 34 | ||
37 | USERADD_PACKAGES = "${PN}-sshd" | 35 | USERADD_PACKAGES = "${PN}-sshd" |