openssh: make OpenSSL optional
PATCH 1/2 openssh: make OpenSSL optional
From: Max Kellermann <[email protected]>
Without OpenSSL, OpenSSH can still do ed25519, which is enough for many users; and it saves a rather heavy dependency.
Signed-off-by Max Kellermann <[email protected]>
--- meta/recipes-connectivity/openssh/openssh_7.8p1.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
meta/recipes-connectivity/openssh/openssh_7.8p1.bb +5 -2
@@ -8,8 +8,7 @@ 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" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" SRC_URI = "http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \
@@ -71,6 +70,10 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PATH_PASSWD_PROG=${bindir}/passwd" # We don't want to depend on libblockfile CACHED_CONFIGUREVARS += "ac_cv_header_maillock_h=no" +PACKAGECONFIG ??= "openssl" +# openssl 1.1 patches are proposed at https://github.com/openssh/openssh-portable/pull/48 +PACKAGECONFIG[openssl] = ",--without-openssl,openssl10" + do_configure_prepend () { export LD="${CC}" install -m 0644 ${WORKDIR}/sshd_config ${B}/
Signature · 1 line
2.18.0
PATCH 2/2 libsolv: make rpm optional
From: Max Kellermann <[email protected]>
Signed-off-by Max Kellermann <[email protected]>
--- meta/recipes-extended/libsolv/libsolv_0.6.35.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
meta/recipes-extended/libsolv/libsolv_0.6.35.bb +5 -2
@@ -5,7 +5,7 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" -DEPENDS = "expat zlib rpm" +DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git" SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \
@@ -19,7 +19,10 @@ S = "${WORKDIR}/git" inherit cmake -EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON -DENABLE_RPMMD=ON -DENABLE_RPMDB=ON -DENABLE_COMPLEX_DEPS=ON" +PACKAGECONFIG ??= "rpm" +PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" + +EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" PACKAGES =+ "${PN}-tools ${PN}ext"
Signature · 1 line
2.18.0
Re: [PATCH 2/2] [oe-core] libsolv: make rpm optional
These two patches should go to openembedded-core list.
Alex
2018-09-18 11:12 GMT+02:00 Max Kellermann <[email protected]>:
Quoted 40 lines
From: Max Kellermann <[email protected]>
Signed-off-by Max Kellermann <[email protected]>--- meta/recipes-extended/libsolv/libsolv_0.6.35.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)meta/recipes-extended/libsolv/libsolv_0.6.35.bb +5
-3@@ -5,7 +5,7 @@ SECTION = "devel" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" -DEPENDS = "expat zlib rpm" +DEPENDS = "expat zlib" SRC_URI = "git://github.com/openSUSE/libsolv.git" SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \@@ -19,7 +19,10 @@ S = "${WORKDIR}/git" inherit cmake -EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON -DENABLE_RPMMD=ON -DENABLE_RPMDB=ON -DENABLE_COMPLEX_DEPS=ON" +PACKAGECONFIG ??= "rpm" +PACKAGECONFIG[rpm] = "-DENABLE_RPMMD=ON -DENABLE_RPMDB=ON,,rpm" + +EXTRA_OECMAKE = "-DLIB=${baselib} -DMULTI_SEMANTICS=ON -DENABLE_COMPLEX_DEPS=ON" PACKAGES =+ "${PN}-tools ${PN}ext" --2.18.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel