From patchwork Thu Dec 16 23:24:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 1638 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0091C433EF for ; Thu, 16 Dec 2021 23:25:01 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web11.1907.1639697101342655496 for ; Thu, 16 Dec 2021 15:25:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=br+HHEQv; spf=pass (domain: gmail.com, ip: 209.85.210.181, mailfrom: raj.khem@gmail.com) Received: by mail-pf1-f181.google.com with SMTP id k26so640502pfp.10 for ; Thu, 16 Dec 2021 15:25:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J9X5al5FbocUBabKmeS0GpuiXqzo5LbBtcqvisP2cP8=; b=br+HHEQvltYSM4MxBHQPD1zDkPHqXVVkGizrpZ1yQfvi7qlQulXQmtDPgrlgoECpKi PTvZK+1RehcsNAYuIJes+7KXr8jLqhgS7/gQyyNB0tXrLvJvh9FEo12+UFrLdhhhC08B TBQiZo4TKuZ4S2yhLjReQ4A8xfGCIqRx0dRc6GVvUIS5vX5PMV3G6MW1CJq4Yc5kMafw J9kHAtcC+44O4VAX4YrXmXmOipiTqBx960PPQJfVqPHZV2/5o4n74THm1NoDMrFMqVGa Rw/PR7dxJlE33PSsU/pO7Jz5X/xLaAEL1Op131k3j5EdVgVksWFNHfXNVQmkDaspAfW4 GpVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=J9X5al5FbocUBabKmeS0GpuiXqzo5LbBtcqvisP2cP8=; b=lTC94Ad2GDmoIYzh3gNtINie/YSaaKR6dlTY2QJAKSkmrIGZ90R3wEtadFqfvq7xqh o38e0UcbUh8XKiKe/FDztL4vP+2IJ8CPTYsGy75vvqIzTYER2PjntDJRSvYY6D4/B8QN dKkb6TX9Ymrscv+9U8SRh0dx5UebN5AqhiGKZIQaNbpdDDjCoQTjqG4koFxq+UXgSE8e 2d+fTENWFnsFL/Iv1UzGviTDtx15XsmDXNQgKK9xO+QEkBdcpmccjE+MzKprSfIqGJPe vwJ6NscOv81iKr/utpWouQkCJulDOBmvvROxnBmgl1cEjs0ANJqI6uNFumMKUErNE/Ld eM8g== X-Gm-Message-State: AOAM531pppjNDFydBf9qYfzQ4cP66/3X68kaTKGVT0QHR4lMiq3bRhGA MIe8DBzLXOCGR07Haviq8P8hCak/76I= X-Google-Smtp-Source: ABdhPJx9ZE685u9giWRpvpYhPU/om/NnefXXWlXArGmpkOXye1mgWoYSWk6BpAc2JVjKc/TYA9dLeQ== X-Received: by 2002:a05:6a00:248b:b0:49f:9d7f:84e2 with SMTP id c11-20020a056a00248b00b0049f9d7f84e2mr135173pfv.40.1639697100419; Thu, 16 Dec 2021 15:25:00 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2b9d]) by smtp.gmail.com with ESMTPSA id oj11sm9959595pjb.46.2021.12.16.15.24.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 15:24:59 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [PATCH 1/2] [meta-oe]inotify-tools: Fix build on musl Date: Thu, 16 Dec 2021 15:24:56 -0800 Message-Id: <20211216232457.1080201-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 Dec 2021 23:25:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94412 Signed-off-by: Khem Raj --- ...fytools-Include-limit.h-for-PATH_MAX.patch | 29 ++++++++++++++ ...Bridge-differences-between-musl-glib.patch | 40 +++++++++++++++++++ .../inotify-tools/inotify-tools_3.21.9.6.bb | 5 ++- 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch create mode 100644 meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch new file mode 100644 index 0000000000..f30a62d594 --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch @@ -0,0 +1,29 @@ +From 1e37cc3aa674c4b052f0655fef59a910fd7325cb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 16 Dec 2021 14:53:25 -0800 +Subject: [PATCH 1/2] libinotifytools: Include limit.h for PATH_MAX + +musl builds fail since the required header which defines PATH_MAX is +missing, its perhaps included indirectly via glibc based systems + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/153] +Signed-off-by: Khem Raj +--- + libinotifytools/src/inotifytools.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c +index 8bdfdb6..902eac2 100644 +--- a/libinotifytools/src/inotifytools.c ++++ b/libinotifytools/src/inotifytools.c +@@ -17,6 +17,7 @@ + #include "inotifytools_p.h" + #include "stats.h" + ++#include + #include + #include + #include +-- +2.34.1 + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch new file mode 100644 index 0000000000..931244830c --- /dev/null +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch @@ -0,0 +1,40 @@ +From 6c3ce01a281a9aa661494d24a862219fc9e2b460 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 16 Dec 2021 14:57:55 -0800 +Subject: [PATCH 2/2] libinotifytools: Bridge differences between + musl/glibc/kernel fnotify.h + +System detects to use sys/fnotify.h and then assumes glibc's definitions +but musl has definitions of its own. perhaps portable thing would be to +use linux/fnotify.h interface directly on linux irrespective of libc + +See the differences discussion here [1] + +[1] https://inbox.vuxu.org/musl/20191112220151.GC27331@x230/T/#ma8700992467200c8792e0fa8508eae656b81aeba + +Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/154] +Signed-off-by: Khem Raj +--- + libinotifytools/src/inotifytools.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c +index 902eac2..2b96395 100644 +--- a/libinotifytools/src/inotifytools.c ++++ b/libinotifytools/src/inotifytools.c +@@ -55,6 +55,12 @@ struct fanotify_event_fid { + struct fanotify_event_info_fid info; + struct file_handle handle; + }; ++ ++#ifndef __GLIBC__ ++#define val __val ++#define __kernel_fsid_t fsid_t ++#endif ++ + #endif + + /** +-- +2.34.1 + diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.21.9.6.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_3.21.9.6.bb index e3a4e6350e..89c3a00b71 100644 --- a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.21.9.6.bb +++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_3.21.9.6.bb @@ -7,7 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" SRCREV = "8f8fcdffb7e80928bea6c1fccd3527a9f5d8fe77" -SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https" +SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \ + file://0001-libinotifytools-Include-limit.h-for-PATH_MAX.patch \ + file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \ + " S = "${WORKDIR}/git" From patchwork Thu Dec 16 23:24:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 1637 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7A6BC433F5 for ; Thu, 16 Dec 2021 23:25:02 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web10.1847.1639697102211343283 for ; Thu, 16 Dec 2021 15:25:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=hJCxLPMr; spf=pass (domain: gmail.com, ip: 209.85.216.50, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f50.google.com with SMTP id j6-20020a17090a588600b001a78a5ce46aso4083809pji.0 for ; Thu, 16 Dec 2021 15:25:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TQtvPvzE/dhnfe5/EbytFSAt4soLqJkNnz68MDdqhck=; b=hJCxLPMr9n0dRACPlrIw/RUNf0q5O+5FB+TpTMlJgfnUb8J9+1Rg2QQHS/x4UqkwAD BY4dzdsyeLpeSTnJW2kme2DM6veaCP/RJSGkId85xz0zms/4QSu9ai08aTrOYz1LLNcu 0YhhRp8Fbztp7Owtpk647lCUFdvo9vUBBzug+D8v+JnAPmwN7ExMIJGDWNGJ+8841vt6 d6Xe8vEfjxFN61kbiwqNxKmXTzBI184XZCbcNtVTgsLiOhUWWhleDy6X+oFIXffLbxbh oJF01/cQ5a+XfGJZpTRF+2qrCRyeIq/OJe0IAfW73d/8gzyd/fKxUjZQsLGEyJVHyBqq V+kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TQtvPvzE/dhnfe5/EbytFSAt4soLqJkNnz68MDdqhck=; b=p53lzgWgtp8njEviEbTfWH8GmMhFVVdTzqcaLUbCftxBWmavGdNpOdF1JW3Hdnpwd1 B5jnCJzw1+hTtpOf0yhSHPoBuN/MOtX5UR/3b3t//bfAzXyd9Mwb6zMRgodCg+a8L6DG NksivocOhsR6nrNfxopRmbuNX1MJ1N7Nc3MOfX++WKFeLFWpMy2WvtOQCm+wjgWmbeEG lUKk0X3u5oQWzZRYeJmSM1Dpz4Jb9U77YOmFUuCUyjNmAf2aiGfMo+mmoRo0sEOTuWeF 1PuW/fL/HdbaZI0DVxjPFsIutF/qlE+YNvHnsqBteg+nfZFSSNzn/w9SY3NUEnQWqE1n D2lg== X-Gm-Message-State: AOAM53004OQbhBdcof05OHFRIIpoSKKGgaf8OXIPhSi4XdJr9bJc9dCu SeXLUZiq1Tg7/HdT/Bx6Q+8yRXVYpsY= X-Google-Smtp-Source: ABdhPJxvIXUfTR7aIntw4Ny7RwEWVpgtetUsNFdlpw0Twhv6GxR1P6vNYQ2L/R0SB9LOdfKEaTGafQ== X-Received: by 2002:a17:902:7c8a:b0:143:bb4a:7bb3 with SMTP id y10-20020a1709027c8a00b00143bb4a7bb3mr322317pll.46.1639697101365; Thu, 16 Dec 2021 15:25:01 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::2b9d]) by smtp.gmail.com with ESMTPSA id oj11sm9959595pjb.46.2021.12.16.15.25.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 15:25:00 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj , Oleksandr Kravchuk Subject: [meta-oe][PATCH 2/2] libkcapi: Fix build with musl Date: Thu, 16 Dec 2021 15:24:57 -0800 Message-Id: <20211216232457.1080201-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211216232457.1080201-1-raj.khem@gmail.com> References: <20211216232457.1080201-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 16 Dec 2021 23:25:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94413 Signed-off-by: Khem Raj Cc: Oleksandr Kravchuk --- ...Adjust-for-musl-msghdr-struct-compat.patch | 81 +++++++++++++++++++ .../recipes-crypto/libkcapi/libkcapi_1.3.1.bb | 4 +- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch b/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch new file mode 100644 index 0000000000..687eb359cf --- /dev/null +++ b/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch @@ -0,0 +1,81 @@ +From d54e532821d40f8094a49742831d32ec7e76caed Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 16 Dec 2021 15:18:21 -0800 +Subject: [PATCH] kcapi-kernel-if: Adjust for musl msghdr struct compatibility + +musl sticks to POSIX and defines msg_iovlen and msg_controllen as int +and socklen_t types respectively whereas glibc and kernel mark them as +size_t which is them assumed as such in the code here as well, Make the +needed conversions to get it going on musl/linux also see [1] for more +info + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=7168790763cdeb794df52be6e3b39fbb021c5a64 + +Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/131] +Signed-off-by: Khem Raj +--- + lib/kcapi-kernel-if.c | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +diff --git a/lib/kcapi-kernel-if.c b/lib/kcapi-kernel-if.c +index 739841e..e5d15d4 100644 +--- a/lib/kcapi-kernel-if.c ++++ b/lib/kcapi-kernel-if.c +@@ -168,10 +168,14 @@ ssize_t _kcapi_common_send_meta(struct kcapi_handle *handle, + } + + msg.msg_control = buffer_p; +- msg.msg_controllen = bufferlen; + msg.msg_iov = iov; ++#ifdef __GLIBC__ + msg.msg_iovlen = iovlen; +- ++ msg.msg_controllen = bufferlen; ++#else ++ msg.msg_iovlen = (int)iovlen; ++ msg.msg_controllen = (socklen_t)bufferlen; ++#endif + /* encrypt/decrypt operation */ + header = CMSG_FIRSTHDR(&msg); + if (!header) { +@@ -193,7 +197,11 @@ ssize_t _kcapi_common_send_meta(struct kcapi_handle *handle, + } + header->cmsg_level = SOL_ALG; + header->cmsg_type = ALG_SET_IV; ++#ifdef __GLIBC__ + header->cmsg_len = iv_msg_size; ++#else ++ header->cmsg_len = (socklen_t)iv_msg_size; ++#endif + alg_iv = (void*)CMSG_DATA(header); + alg_iv->ivlen = tfm->info.ivsize; + memcpy(alg_iv->iv, handle->cipher.iv, tfm->info.ivsize); +@@ -244,8 +252,11 @@ ssize_t _kcapi_common_send_data(struct kcapi_handle *handle, + msg.msg_controllen = 0; + msg.msg_flags = 0; + msg.msg_iov = iov; ++#ifdef __GLIBC__ + msg.msg_iovlen = iovlen; +- ++#else ++ msg.msg_iovlen = (int)iovlen; ++#endif + ret = sendmsg(*_kcapi_get_opfd(handle), &msg, (int)flags); + if (ret < 0) + ret = -errno; +@@ -542,8 +553,11 @@ ssize_t _kcapi_common_recv_data(struct kcapi_handle *handle, + msg.msg_controllen = 0; + msg.msg_flags = 0; + msg.msg_iov = iov; ++#ifdef __GLIBC__ + msg.msg_iovlen = iovlen; +- ++#else ++ msg.msg_iovlen = (int)iovlen; ++#endif + ret = recvmsg(*_kcapi_get_opfd(handle), &msg, 0); + if (ret < 0) + ret = -errno; +-- +2.34.1 + diff --git a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb index f10d684701..1bd587f0bc 100644 --- a/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb +++ b/meta-oe/recipes-crypto/libkcapi/libkcapi_1.3.1.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=80c467906eb826339c7f09e61808ed23" S = "${WORKDIR}/git" SRCREV = "2936ecd060c299157ac880650ba2c9fd94d27bb1" -SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https" +SRC_URI = "git://github.com/smuellerDD/libkcapi.git;branch=master;protocol=https \ + file://0001-kcapi-kernel-if-Adjust-for-musl-msghdr-struct-compat.patch \ + " inherit autotools