From 6dabe9344e3a46f078da82ec1140ed85404534c9 Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 2 Jan 2021 16:25:18 +0100 Subject: [PATCH 1/2] libssh: cleanup --- packages/network/libssh/package.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/network/libssh/package.mk b/packages/network/libssh/package.mk index 978c014c02..23e2201145 100644 --- a/packages/network/libssh/package.mk +++ b/packages/network/libssh/package.mk @@ -21,16 +21,12 @@ PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \ makeinstall_target() { # install static library only mkdir -p $SYSROOT_PREFIX/usr/lib - cp src/libssh.a $SYSROOT_PREFIX/usr/lib + cp $PKG_BUILD/.$TARGET_NAME/src/libssh.a $SYSROOT_PREFIX/usr/lib mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig - cp libssh.pc $SYSROOT_PREFIX/usr/lib/pkgconfig + cp $PKG_BUILD/.$TARGET_NAME/libssh.pc $SYSROOT_PREFIX/usr/lib/pkgconfig mkdir -p $SYSROOT_PREFIX/usr/include/libssh - cp ../include/libssh/callbacks.h $SYSROOT_PREFIX/usr/include/libssh - cp ../include/libssh/legacy.h $SYSROOT_PREFIX/usr/include/libssh - cp ../include/libssh/libssh.h $SYSROOT_PREFIX/usr/include/libssh - cp ../include/libssh/server.h $SYSROOT_PREFIX/usr/include/libssh - cp ../include/libssh/sftp.h $SYSROOT_PREFIX/usr/include/libssh - cp ../include/libssh/ssh2.h $SYSROOT_PREFIX/usr/include/libssh + cp $PKG_BUILD/include/libssh/{callbacks.h,legacy.h,libssh.h,server.h,sftp.h,ssh2.h} \ + $SYSROOT_PREFIX/usr/include/libssh } From 5001b33457d22f3807a67287346be46fd95a5aae Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 2 Jan 2021 18:36:51 +0100 Subject: [PATCH 2/2] libssh: copy version.h to sysroot --- packages/network/libssh/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/network/libssh/package.mk b/packages/network/libssh/package.mk index 23e2201145..621a039110 100644 --- a/packages/network/libssh/package.mk +++ b/packages/network/libssh/package.mk @@ -28,5 +28,6 @@ makeinstall_target() { mkdir -p $SYSROOT_PREFIX/usr/include/libssh cp $PKG_BUILD/include/libssh/{callbacks.h,legacy.h,libssh.h,server.h,sftp.h,ssh2.h} \ + $PKG_BUILD/.$TARGET_NAME/include/libssh/libssh_version.h \ $SYSROOT_PREFIX/usr/include/libssh }