openssh: Install header + lib files

GIT PULL Khem Raj 1 participant 2 messages Sep 23, 2022 4 messages not in the archive

Share & tools

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): 32c56887301c5fc58e5c9877c858295de66fc482.1662077634.git.wltu@google.com

A message that is not in the archive (sent off-list or not yet received): CAHwn2Xn80+=miR0ZvM1mLhMLUyMdg3Ja4yt6r5xLikh2uRE87Q@mail.gmail.com

Khem Raj

author

2022-09-23 17:48 UTC #3 lore raw

Quoted 2 lines · Willy Tu

friendly ping (again), but this time with plain text only.

I think it should be done with packageconfig which is at recipe scope and then in your own distro you could enable it via bbappend or via other global knob if you wish so

Secondly lot of these seems to be something that devel package should have already can you check that and ensure we are not double installing the files

Quoted 49 lines

Willy Tu
Quoted 7 lines · Willy Tu
Instal API only if opensshinternals is in DISTRO_FEATURES.
Install the OpenSSH header + lib files for other repo to build using it. For example, https://github.com/google/hiba is dependent on those files to build and this change is needed to meet that requirement.
Review
Quoted 8 lines
https://github.com/openembedded/meta-openembedded/pull/597
Signed-off-by Willy Tu <[email protected]>
---
 meta/recipes-connectivity/openssh/openssh_9.0p1.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
(quoted diff) +0 -0
b/meta/recipes-connectivity/openssh/openssh_9.0p1.bb
meta/recipes-connectivity/openssh/openssh_9.0p1.bb do_install:append () { · line 139
Quoted 7 lines
index b63ea2b137..84da118ca6 100644
meta/recipes-connectivity/openssh/openssh_9.0p1.bb +0 -0
@@ -137,6 +137,17 @@ do_install:append () {
                ${D}${sysconfdir}/init.d/sshd
 
        install -D -m 0755 ${WORKDIR}/sshd_check_keys
${D}${libexecdir}/${BPN}/sshd_check_keys
meta/recipes-connectivity/openssh/openssh_9.0p1.bb do_install:append () { · line 141
Quoted 2 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb +2 -0
+
+       if ${@bb.utils.contains('DISTRO_FEATURES', 'opensshinternals',
'true', 'false', d)}; then
meta/recipes-connectivity/openssh/openssh_9.0p1.bb do_install:append () { · line 145
Quoted 4 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb +4 -0
+               install -d ${D}${includedir}/ssh
+               install -d ${D}${includedir}/ssh/openbsd-compat
+               install -m0644 ${S}/*.h ${D}${includedir}/ssh
+               install -m0644 ${S}/openbsd-compat/*.h
${D}${includedir}/ssh/openbsd-compat
meta/recipes-connectivity/openssh/openssh_9.0p1.bb do_install:append () { · line 149
Quoted 4 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb +4 -0
+
+               install -d ${D}${libdir}
+               install -m0644 ${S}/libssh.a ${D}${libdir}
+               install -m0644 ${S}/openbsd-compat/libopenbsd-compat.a
${D}${libdir}
Quoted 7 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb +1 -1
+       fi
 }
 
 do_install_ptest () {
--
2.37.2.789.g6183377224-goog

A message that is not in the archive (sent off-list or not yet received): CAHwn2XmN4nAADq4YSsdacfE=7ESNbUgAXdC3Fy23o=RV9_L9Nw@mail.gmail.com

Khem Raj

author

2022-09-23 17:54 UTC #5 lore raw

Yes it is and I think you
Might need to subscribe to it

Quoted 79 lines · Willy Tu

ok, sounds good. Thanks.
I'll take a closer look at it to update it.
On a related note, is [email protected] the right email? It is giving me errors when trying to send to that address.
Willy Tu
Quoted 9 lines · Khem Raj
Quoted 2 lines · Willy Tu
friendly ping (again), but this time with plain text only.
I think it should be done with packageconfig which is at recipe scope
and then in your own distro you could enable it via bbappend or via other global knob if you wish so
Quoted 2 lines
Secondly lot of these seems to be something that devel package should
have already can you check that and ensure we are not double installing the files
Quoted 10 lines
Quoted 10 lines
Willy Tu
Quoted 4 lines · Willy Tu
Instal API only if opensshinternals is in DISTRO_FEATURES.
Install the OpenSSH header + lib files for other repo to build using
it.
Quoted 1 line
Quoted 1 line
Quoted 1 line
For example, https://github.com/google/hiba is dependent on those
files
Quoted 10 lines
Quoted 10 lines
Review
Quoted 10 lines
to build and this change is needed to meet that requirement.
https://github.com/openembedded/meta-openembedded/pull/597
Signed-off-by Willy Tu <[email protected]>
---
 meta/recipes-connectivity/openssh/openssh_9.0p1.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
(quoted diff) +0 -0
b/meta/recipes-connectivity/openssh/openssh_9.0p1.bb
Quoted 7 lines
Quoted 7 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb do_install:append () { · line 139
Quoted 7 lines
index b63ea2b137..84da118ca6 100644
meta/recipes-connectivity/openssh/openssh_9.0p1.bb +0 -0
@@ -137,6 +137,17 @@ do_install:append () {
                ${D}${sysconfdir}/init.d/sshd
 
        install -D -m 0755 ${WORKDIR}/sshd_check_keys
${D}${libexecdir}/${BPN}/sshd_check_keys
Quoted 2 lines
Quoted 2 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb do_install:append () { · line 141
Quoted 2 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb +2 -0
+
+       if ${@bb.utils.contains('DISTRO_FEATURES',
'opensshinternals', 'true', 'false', d)}; then
Quoted 4 lines
Quoted 4 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb do_install:append () { · line 145
Quoted 4 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb +4 -0
+               install -d ${D}${includedir}/ssh
+               install -d ${D}${includedir}/ssh/openbsd-compat
+               install -m0644 ${S}/*.h ${D}${includedir}/ssh
+               install -m0644 ${S}/openbsd-compat/*.h
${D}${includedir}/ssh/openbsd-compat
Quoted 4 lines
Quoted 4 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb do_install:append () { · line 149
Quoted 4 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb +4 -0
+
+               install -d ${D}${libdir}
+               install -m0644 ${S}/libssh.a ${D}${libdir}
+               install -m0644
${S}/openbsd-compat/libopenbsd-compat.a ${D}${libdir}
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/recipes-connectivity/openssh/openssh_9.0p1.bb +1 -1
+       fi
 }
 
 do_install_ptest () {
--
2.37.2.789.g6183377224-goog