From patchwork Wed Aug 7 16:43:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 170763 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp7381706ile; Wed, 7 Aug 2019 09:43:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqxC3H/LObqZfGlerlNRU1cqwSlRM1kG8RmfnSZ8+TyGZAREIpjrhpk2xgpe5YswNNyQY0TV X-Received: by 2002:a17:90a:d791:: with SMTP id z17mr794228pju.40.1565196226380; Wed, 07 Aug 2019 09:43:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565196226; cv=none; d=google.com; s=arc-20160816; b=c40ncHAQiiagRdlGcyjKGhWtIiu7UMvKKyEh+mCNopMS3YPazMWHEXzYZcbUj4KYn6 9V0aDKftuKjxwZCs+UfoIJYr9vrCF1UNP4w8NsnICd4iSXW1Gm6P4V6c7WDPx15uHYQZ fiDn0u3bIZPVSK4CpRf0qyS2XSaKRIi4x5mQN6AXLTn51hwkeFg4y5XAflCm/ke8WBXv vEBXl6uGUv4jfI2oJjSeg7q5vf0lQwN1IAz0ONH0QZ40ZFUDycJPFUiKNdyX+rmbjaGQ SZbeAymDVM8GdWhxrxaPHocDQVMYt1lWHLHfJjMWRMtTLUYzha/RDa6C3meJjqH3hX3F us/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=8QvTetJJ4UNbjSaXW/W4HSeJv7wcDTLm1k1BJrRXZdg=; b=0qZIXTSt9j4tMsceB20rnYkTEh94TXytU2Q7fHi1YY78rho4yC5Zk81AW51aO7EM9V 8KR/t4alte0IhW2dhs7XDxhPO4bsKmj38o/du5leTETyNMGC2X5tklf51JXfwQ+fQb7s UR7OoAG4qeFd1nl7IwsNIhqm50BgdMRKis1S6Avd3tw/2Pkm2spGuHDcbVMOc8Be1Tk4 YGPS9aP/KsakFa7Q4kBnOkk6XCimr/E5TYUcfL6CucG69uM18UfB/POtWJtDn9HvWz5j oJgKyxXZWmNdz6R1sGX+JWi3JGpjxBh7IG7KGUn+k3kP6KiME1Xh9u+g+IbXqfcWhEhv 6iuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jtd1Nv9W; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a3si46787842pfb.171.2019.08.07.09.43.45; Wed, 07 Aug 2019 09:43:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jtd1Nv9W; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id ABA3F7F340; Wed, 7 Aug 2019 16:43:37 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mail.openembedded.org (Postfix) with ESMTP id 967007F37C for ; Wed, 7 Aug 2019 16:43:31 +0000 (UTC) Received: by mail-pl1-f171.google.com with SMTP id ay6so41682973plb.9 for ; Wed, 07 Aug 2019 09:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pxYpAfofj6oj+Pza2kT9Ibds9yE3iB86mSMHnDENSEE=; b=jtd1Nv9WXa1XPnhmhs3hokZQ3q4CTT7ZsLnfz8PLLJhnQVOy8NQ7hCaKkc3WywDXj0 7IxGQGmWbMOOEWXpq4szmFcJTLG9rwfW92wmPnk2ZCq5clI4DLMe5nDc+GhCnuSOq9Jt IGLRLJVJVubF+nTAcLO0Hc/S2s9EzBlNOf8mEk8FGsmG0nRnNfNm7p+PBYAVp7zfon7h YUWV9FvHrnvmjWM7H4POCw3DaT6VR/hUag1jUyIVUaMKZvQxV0pjeNY3SJXwmJu0Zyt4 bTqV/Z2owTVadyc+LZ9y9UqsOBJ7Qoj8vinph0D2iAi26mKd5g+8+2u2n1Se7uoRQRXb 1tkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pxYpAfofj6oj+Pza2kT9Ibds9yE3iB86mSMHnDENSEE=; b=dBoKFQv38FUunR4Qe8O/zNRZBr/65hr9JNCLl76yE4jXflL/fImtFQQ/tfxU/8YrFK kpb0w4TKQZ/cuu8QnraWFIhf3EgFb1+ykSaBCWoGSnx9PSS6G0jYdo5PAczSpk1z+eow a39y4ZAMD0L9sq2SRSU3mhu9FJjsS8ocrdRiPx3Db3KkZirP+o8WuNDc2GK5z59RVoiV 6fiMab28GJjzJW7TBxkgQUEPGdAmOJ2qVnlnfYxMs/LVmWuvKigFkvgbpoAqqjNJSjrr BriUhKoc8bxxfxvCnOu8w+E1bHHjIoge0Sj3odY+Rgagh8ILyWp/0/WoZytx8Ly0Nriz mP0g== X-Gm-Message-State: APjAAAV/2NQqgq1hLW+O1ZsCL9wsjcqVE7JncIRAEC7ymalAbKhL6Tsm F7zLtX86eiuN9CyRZXcmXmcaOhVOs6k= X-Received: by 2002:aa7:8711:: with SMTP id b17mr10416285pfo.234.1565196211997; Wed, 07 Aug 2019 09:43:31 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id o11sm168735060pfh.114.2019.08.07.09.43.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 09:43:31 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 7 Aug 2019 09:43:19 -0700 Message-Id: <20190807164321.44571-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [oe] [meta-python][PATCH 1/3] python-grpcio: Use gettid API from glibc 2.30+ X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-grpcio.inc | 1 + .../python/python-grpcio/gettid.patch | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-grpcio/gettid.patch -- 2.22.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-python/recipes-devtools/python/python-grpcio.inc b/meta-python/recipes-devtools/python/python-grpcio.inc index fd341f5de7..7d3675c455 100644 --- a/meta-python/recipes-devtools/python/python-grpcio.inc +++ b/meta-python/recipes-devtools/python/python-grpcio.inc @@ -9,6 +9,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/python-grpcio:" SRC_URI_append_class-target = " file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \ file://ppc-boringssl-support.patch \ file://riscv64_support.patch \ + file://gettid.patch \ " RDEPENDS_${PN} = "${PYTHON_PN}-protobuf \ diff --git a/meta-python/recipes-devtools/python/python-grpcio/gettid.patch b/meta-python/recipes-devtools/python/python-grpcio/gettid.patch new file mode 100644 index 0000000000..fb15cf7f96 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-grpcio/gettid.patch @@ -0,0 +1,26 @@ +use glibc provided gettid API for glibc 2.30+ + +glibc 2.30 introduced this function see [1] +so it's best to detect it +and provide fallback only if it's not present + +[1] https://sourceware.org/bugzilla/show_bug.cgi?id=6399 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/src/core/lib/gpr/log_linux.cc ++++ b/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,13 @@ + #include + #include + ++#if defined(__GLIBC__) ++#if !__GLIBC_PREREQ(2,29) + static long gettid(void) { return syscall(__NR_gettid); } ++#endif ++#else ++static long gettid(void) { return syscall(__NR_gettid); } ++#endif + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { From patchwork Wed Aug 7 16:43:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 170764 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp7382308ile; Wed, 7 Aug 2019 09:44:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqyYu9Pxw/mtoFw212M7Kpd2UtI6N/9x8V89RpgvJewjns6OYslUS3HbAFSibPlEdVfPorwS X-Received: by 2002:a63:6d6:: with SMTP id 205mr8742851pgg.262.1565196258984; Wed, 07 Aug 2019 09:44:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565196258; cv=none; d=google.com; s=arc-20160816; b=U/1RhLI4bkr3fLAyn5Bg/EMJKy0JBCwl5ABTEjqZkqEy6tmPHfYzTT214BL+7ugIii 8HG8GMfjFl+CWEZxhK1r/Ljd88kmotELjokBr9rAy1OgxnmCklG3RXwMfQzfw6XaHGze eEQJviu8LRLXdZGVhKZOQrn10Lsu1uYM5oLYuC7PYlLzjGruGhXVz/HGCQse+e/d3Bj3 qz04VuVEfivfvRzjMdoM6XO24Ysxt/pbRfsrWoDnv7OW7N76IUkOMmmYA+JytJFgyrKo zg2h28xnpurCIJHdQM6gB9qcn0UmMI9jFevNs71ggCf1HXdTdNcCAwsFNxCarTbbWeOD iYAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=MX4QsUxwF8crMHEAjOramV2isnzBdxRrCN805apFXcM=; b=BXLrogN3UrHKj/pgmlwG29Et7LyzPWyC98u+bfWL7K2oTn/ycNc6SOfQzVBb/Yo+DN t0U1OSJa72zVkJ70a6/RiYqOX3R3JY1e1aMIuXdsOSlYyxCsWqJUtwHgTqJEwO1NgiZb KCLmn38MCqjMYh/LqoUS5HUK4k3fKVlu8G36Vi4Gk9Gc83BggyDlIq0ko8kYmpSWux1A Abiby/4AbE5zNRdFFqdNA/uchOZrgtNX4r9SxUDOS5VSftD9XFrUTu00H57lsdZdxwhW SAchiHMeRTGBvQHU3Npo793sbNewA86SmIR9piIy2RqbQarlfzZAXAC9e2X0kGDodYu+ U60A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lqDz4to4; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id r19si51869635pfh.50.2019.08.07.09.44.18; Wed, 07 Aug 2019 09:44:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lqDz4to4; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 731847F3A7; Wed, 7 Aug 2019 16:44:15 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mail.openembedded.org (Postfix) with ESMTP id 4382B7F37C for ; Wed, 7 Aug 2019 16:43:32 +0000 (UTC) Received: by mail-pl1-f176.google.com with SMTP id b7so41690749pls.6 for ; Wed, 07 Aug 2019 09:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G8hjmfIMzuxHdiRZo65l5A32TDgCyzT8qWHGteQEpDo=; b=lqDz4to4aC1U1Tla0PM473q4xvavAzFDypPvxOWsVDoQe1evyyFUqHXnryzcI5CbXH 5IWNu6Xw1bdP854iq7vGJodZStT3Mz8oV2q6OkEhSRTBA5TRZlGMEkUUoQm1FxqxSpNm FdTJn1kCvWSD5lEnbLcIu/U2C2nQKXIydFSVjzuZHHKclObtcIbPo6k9XxFXEQcZJBDl mjnAY0OeEkxx+D1keDFf8K1wsP9UBpf833I8/wuxqboMLRY43RRYDRnvtyNaOcuAncbk 6ZWlNCaNPxtQEtEll+Szxk9f9h9G+qY+fgFMatwkzCZ0n7QBG68SIDqJMYO5RUL7gOHk vxrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G8hjmfIMzuxHdiRZo65l5A32TDgCyzT8qWHGteQEpDo=; b=uipfyHYNLDE0g3/FH2YQsNtPgPJCGscHBzt/jNnQ4/UEPhVQEsvimzFrYOqEWjlbWs B5NkO1c+pAwPzxaMJ3Orm27xBP9ol+VRzaCldTckd+8XyUkWqBtu+RjxiZNNDsRY3wZw bJu0LQ7F76Cl5cHfCykCpHQz0Gp4Ez5vRp3w1JCd8MoxoSFoAUkAmZ8pSPLUCmsH2Gx2 2P4TFVp7zcyvE7GxoltKQhzVPa7y4qRoXGT3a7+6cKWroSTpsHoRF5vcfAOAO4h41MkB OANW2+kZTY8hPXVQjvQd9z1PdWiBrI1rS1dJFL3Jxq+RhXnpZ31XrnnPgHdp+OqD1B36 34oQ== X-Gm-Message-State: APjAAAWYO5IFehXdI8eQi5EgLxLpU5j3uYTPKLkp01J4JmOLzYgCOF2r UAw5plKdOezJDZVGkISuG5impytSnug= X-Received: by 2002:a17:902:7407:: with SMTP id g7mr9129649pll.214.1565196212704; Wed, 07 Aug 2019 09:43:32 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id o11sm168735060pfh.114.2019.08.07.09.43.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 09:43:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 7 Aug 2019 09:43:20 -0700 Message-Id: <20190807164321.44571-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190807164321.44571-1-raj.khem@gmail.com> References: <20190807164321.44571-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-networking][PATCH 2/3] grpc: Update to 1.22.0 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Fix build with glibc 2.30 Forward port patches Add versioiniing to grpcpp_channelz plugin Signed-off-by: Khem Raj --- ...ix-grpc_cpp_plugin-path-during-cross.patch | 32 ++--------- ...Fix-libraries-installation-for-Linux.patch | 44 ++++++++------- ...01-Define-gettid-only-for-glibc-2.30.patch | 53 +++++++++++++++++++ .../grpc/{grpc_1.14.1.bb => grpc_1.22.0.bb} | 8 +-- 4 files changed, 86 insertions(+), 51 deletions(-) create mode 100644 meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch rename meta-networking/recipes-devtools/grpc/{grpc_1.14.1.bb => grpc_1.22.0.bb} (86%) -- 2.22.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch index 54e0b99a46..6cad533964 100644 --- a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch +++ b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch @@ -1,8 +1,7 @@ From 6d606f1101c1a172fb6d738d6f1865aa61849e68 Mon Sep 17 00:00:00 2001 From: Alexey Firago Date: Fri, 20 Oct 2017 00:04:19 +0300 -Subject: [PATCH] CMakeLists.txt: Fix grpc_cpp_plugin path during - cross-compiling or native build +Subject: [PATCH] CMakeLists.txt: Fix grpc_cpp_plugin path during cross-compiling or native build Signed-off-by: Alexey Firago Signed-off-by: Hiram Lew @@ -12,11 +11,9 @@ Signed-off-by: Jan Kaisrlik templates/CMakeLists.txt.template | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a59fd81..cd90424 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -160,6 +160,13 @@ function(protobuf_generate_grpc_cpp) +@@ -193,6 +193,13 @@ function(protobuf_generate_grpc_cpp) return() endif() @@ -30,20 +27,9 @@ index a59fd81..cd90424 100644 set(_protobuf_include_path -I . -I ${_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR}) foreach(FIL ${ARGN}) get_filename_component(ABS_FIL ${FIL} ABSOLUTE) -@@ -177,7 +184,7 @@ function(protobuf_generate_grpc_cpp) - COMMAND ${_gRPC_PROTOBUF_PROTOC_EXECUTABLE} - ARGS --grpc_out=generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} - --cpp_out=${_gRPC_PROTO_GENS_DIR} -- --plugin=protoc-gen-grpc=$ -+ --plugin=protoc-gen-grpc=${gRPC_CPP_PLUGIN} - ${_protobuf_include_path} - ${REL_FIL} - DEPENDS ${ABS_FIL} ${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin -diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template -index de13d02..b22bd5c 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template -@@ -209,6 +209,13 @@ +@@ -233,6 +233,13 @@ return() endif() @@ -57,15 +43,3 @@ index de13d02..b22bd5c 100644 set(_protobuf_include_path -I . -I <%text>${_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR}) foreach(FIL <%text>${ARGN}) get_filename_component(ABS_FIL <%text>${FIL} ABSOLUTE) -@@ -226,7 +233,7 @@ - COMMAND <%text>${_gRPC_PROTOBUF_PROTOC_EXECUTABLE} - ARGS --grpc_out=<%text>generate_mock_code=true:${_gRPC_PROTO_GENS_DIR} - --cpp_out=<%text>${_gRPC_PROTO_GENS_DIR} -- --plugin=protoc-gen-grpc=$ -+ --plugin=protoc-gen-grpc=${gRPC_CPP_PLUGIN} - <%text>${_protobuf_include_path} - <%text>${REL_FIL} - DEPENDS <%text>${ABS_FIL} <%text>${_gRPC_PROTOBUF_PROTOC} grpc_cpp_plugin --- -2.7.4 - diff --git a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch index 459dc45a41..3282b5413e 100644 --- a/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch +++ b/meta-networking/recipes-devtools/grpc/grpc/0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch @@ -7,16 +7,13 @@ Subject: [PATCH] CMakeLists.txt: Fix libraries installation for Linux Signed-off-by: Alexey Firago -%% original patch: 0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch --- CMakeLists.txt | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a59fd818e3..5066f44a32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -30,6 +30,15 @@ set(PACKAGE_TARNAME "${PACKAGE_NAME}-${PACKAGE_VERSION}") +@@ -30,6 +30,15 @@ set(PACKAGE_TARNAME "${PACKAGE_NAME}-$ set(PACKAGE_BUGREPORT "https://github.com/grpc/grpc/issues/") project(${PACKAGE_NAME} C CXX) @@ -32,7 +29,7 @@ index a59fd818e3..5066f44a32 100644 set(gRPC_INSTALL_BINDIR "bin" CACHE STRING "Installation directory for executables") set(gRPC_INSTALL_LIBDIR "lib" CACHE STRING "Installation directory for libraries") set(gRPC_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for headers") -@@ -702,6 +711,10 @@ if(WIN32 AND MSVC) +@@ -769,6 +778,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -43,7 +40,7 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(address_sorting PUBLIC $ $ -@@ -825,6 +838,10 @@ if(WIN32 AND MSVC) +@@ -903,6 +916,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -54,7 +51,7 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(gpr PUBLIC $ $ -@@ -1259,6 +1276,10 @@ if(WIN32 AND MSVC) +@@ -1333,6 +1350,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -65,7 +62,7 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(grpc PUBLIC $ $ -@@ -1633,6 +1654,10 @@ if(WIN32 AND MSVC) +@@ -1731,6 +1752,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -76,7 +73,7 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(grpc_cronet PUBLIC $ $ -@@ -2575,6 +2600,10 @@ if(WIN32 AND MSVC) +@@ -2744,6 +2769,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -87,7 +84,7 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(grpc_unsecure PUBLIC $ $ -@@ -2791,6 +2820,10 @@ if(WIN32 AND MSVC) +@@ -3083,6 +3112,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -98,7 +95,7 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(grpc++ PUBLIC $ $ -@@ -3357,6 +3390,10 @@ if(WIN32 AND MSVC) +@@ -3703,6 +3736,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -109,7 +106,7 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(grpc++_cronet PUBLIC $ $ -@@ -3630,6 +3667,11 @@ protobuf_generate_grpc_cpp( +@@ -4013,6 +4050,11 @@ protobuf_generate_grpc_cpp( src/proto/grpc/status/status.proto ) @@ -121,7 +118,7 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(grpc++_error_details PUBLIC $ $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -3762,6 +3804,11 @@ protobuf_generate_grpc_cpp( +@@ -4147,6 +4189,11 @@ protobuf_generate_grpc_cpp( src/proto/grpc/reflection/v1alpha/reflection.proto ) @@ -133,7 +130,7 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(grpc++_reflection PUBLIC $ $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} -@@ -4265,6 +4312,10 @@ if(WIN32 AND MSVC) +@@ -4704,6 +4751,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -144,7 +141,7 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(grpc++_unsecure PUBLIC $ $ -@@ -4649,6 +4700,10 @@ if(WIN32 AND MSVC) +@@ -5124,6 +5175,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -155,7 +152,19 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(grpc_plugin_support PUBLIC $ $ -@@ -5184,6 +5239,10 @@ if(WIN32 AND MSVC) +@@ -5190,6 +5245,11 @@ protobuf_generate_grpc_cpp( + src/proto/grpc/channelz/channelz.proto + ) + ++if(_gRPC_PLATFORM_LINUX) ++ set_property(TARGET grpcpp_channelz PROPERTY VERSION ${CPP_VERSION}) ++ set_property(TARGET grpcpp_channelz PROPERTY SOVERSION ${CPP_VERSION_MAJOR}) ++endif() ++ + target_include_directories(grpcpp_channelz + PUBLIC $ $ + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} +@@ -5728,6 +5788,10 @@ if(WIN32 AND MSVC) endif() endif() @@ -166,6 +175,3 @@ index a59fd818e3..5066f44a32 100644 target_include_directories(grpc_csharp_ext PUBLIC $ $ --- -2.17.1 - diff --git a/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch b/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch new file mode 100644 index 0000000000..c6afff2d23 --- /dev/null +++ b/meta-networking/recipes-devtools/grpc/grpc/0001-Define-gettid-only-for-glibc-2.30.patch @@ -0,0 +1,53 @@ +From c27261a8bc1e45ff7d7a585c79b2b871d47217e4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 26 Jul 2019 18:56:26 -0700 +Subject: [PATCH] Define gettid() only for glibc < 2.30 + +glibc 2.30 has added this API, so let us use that when possible + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/core/lib/gpr/log_linux.cc | 4 ++++ + src/core/lib/iomgr/ev_epollex_linux.cc | 7 +++++-- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 561276f0c2..25a74864a1 100644 +--- a/src/core/lib/gpr/log_linux.cc ++++ b/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,11 @@ + #include + #include + ++#if defined(__GLIBC__) && (__GLIBC_MINOR__ >= 29) ++#include ++#else + static long gettid(void) { return syscall(__NR_gettid); } ++#endif + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc +index 08116b3ab5..d3d3025111 100644 +--- a/src/core/lib/iomgr/ev_epollex_linux.cc ++++ b/src/core/lib/iomgr/ev_epollex_linux.cc +@@ -1101,10 +1101,13 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, + gpr_atm_no_barrier_fetch_add(&pollset->worker_count, -1); + } + +-#ifndef NDEBUG ++#if !defined(DEBUG) ++#if defined(__GLIBC__) && (__GLIBC_MINOR__ >= 29) ++#include ++#else + static long gettid(void) { return syscall(__NR_gettid); } + #endif +- ++#endif + /* pollset->mu lock must be held by the caller before calling this. + The function pollset_work() may temporarily release the lock (pollset->po.mu) + during the course of its execution but it will always re-acquire the lock and +-- +2.22.0 + diff --git a/meta-networking/recipes-devtools/grpc/grpc_1.14.1.bb b/meta-networking/recipes-devtools/grpc/grpc_1.22.0.bb similarity index 86% rename from meta-networking/recipes-devtools/grpc/grpc_1.14.1.bb rename to meta-networking/recipes-devtools/grpc/grpc_1.22.0.bb index 0550866e5b..a80c574cc9 100644 --- a/meta-networking/recipes-devtools/grpc/grpc_1.14.1.bb +++ b/meta-networking/recipes-devtools/grpc/grpc_1.22.0.bb @@ -11,12 +11,14 @@ DEPENDS_append_class-target = " googletest grpc-native " DEPENDS_append_class-nativesdk = " grpc-native " S = "${WORKDIR}/git" -SRCREV = "d8020cb6daa87f1a3bb3b0c299bc081c4a3de1e8" -BRANCH = "v1.14.x" +SRCREV = "08fd59f039c7cf62614ab7741b3f34527af103c7" +BRANCH = "v1.22.x" SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;branch=${BRANCH} \ file://0001-CMakeLists.txt-Fix-libraries-installation-for-Linux.patch \ " -SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch" +SRC_URI_append_class-target = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch \ + file://0001-Define-gettid-only-for-glibc-2.30.patch \ + " SRC_URI_append_class-nativesdk = " file://0001-CMakeLists.txt-Fix-grpc_cpp_plugin-path-during-cross.patch" # Fixes build with older compilers 4.8 especially on ubuntu 14.04 From patchwork Wed Aug 7 16:43:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 170765 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp7382442ile; Wed, 7 Aug 2019 09:44:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqyeTiUOKGGZVeZ13bvu5OsPPHSGCnQL1Hh27q/NKVFjFN2zcGg1WfOgr+ADPgqwvscNARXN X-Received: by 2002:a63:460c:: with SMTP id t12mr8433116pga.69.1565196266440; Wed, 07 Aug 2019 09:44:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565196266; cv=none; d=google.com; s=arc-20160816; b=h3/8XLNXuxquazvCclfDYv6DsbB7YVokSGUdR39F4wGSzZGaFL+X5XQRcw5/iZm5qR cifCWLNbbqV80Ok3Yt6ieaf8+q03++ASWMHmOFI1K7WZFD28pCBLZj8dtOOpcYNdyWKY Q1CvCGQWzJhjpQzB/AmzTFZm99CvxiazBV7vd4Fta8UJVOdmn78LuteInPquZsOuFYzd xoQKuMu8goNF8IGV/fTvTGX5lF6104jsPaGKnJTAb/TrYeH8TaUO4Ze5TjUogwlLIeVL +q9b2zGl5XUtuEaeWQh7Tzqant5y/HWFkn0A9EChJ+UIfgKQJVy+9JrMNkqUZJb6DHeE nfsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=yUYG5KSsLjjiuTErY2Z8CGkczZESF5Vobtswr9DydqQ=; b=jcYxU3HCNBSpVpkUKW9Ob42j7dxYKyykLeJpIotc0KggBhuoT33nOtouH/2d35mfOx CXh5lvXdjvIzIM+9UaIZE4MvCyM4CxeS9KcBphN3Zfk7HukOLEm4fAiMwaCLXqOdi96h Qw61KPCByQ3BRrbrGMOkcvC+LNE3yBouKqflQ/tfLxJiqELaMXzS6phpJPuJlqUwVFrL a/MAZv9ftM2MgVO762XsJMmP7f/vy1nutilbGYowEXNHGSXzpjT8vkqJGa4UnTUZZo69 X1re/q51KvwCaL3y+s+2rzlnn+7wnGCRdLQa8wJhHToh+rlK/+PsZ2QcfAhWuN/p/ZyT njJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=p4uq9O6K; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a9si50879957pfn.104.2019.08.07.09.44.26; Wed, 07 Aug 2019 09:44:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=p4uq9O6K; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 08E027F3C3; Wed, 7 Aug 2019 16:44:21 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by mail.openembedded.org (Postfix) with ESMTP id E87DD7F3A2 for ; Wed, 7 Aug 2019 16:43:32 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id y8so41649304plr.12 for ; Wed, 07 Aug 2019 09:43:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e5ISdWTtvtQHrK+bUPHKlCDYbYPNxjH5wSNND0tJDuM=; b=p4uq9O6KkC++oMRhrWI8xUOcP4FhkqnJyZFQ9rwS/CfmwNqSWQaTic5hDmwXu7oMi0 DXaptMFifuLZzepJEV3Y5c2vkp4BL7Tyi2tjHvn+wQOuuvabdQ8ArjoHEAY/V8mfEa8x jZUR0AYYJdT+b9nmWFID/Spd9/XG8INpS/7Kn71ehB474JDupk+3DgPcTkKqCDgFeoF6 iA50ZAATq8yYurFmMQEj0GtBBxTOIqV/1F8pGhdF6YWavfM59xJoLIo5g8X3rSCLvzAo aVYP/dIHGG3ik2yYCL6XasfMhfJmo+bb9iS5vo/crTgx3t5NvT3Ysw4A9Z3RSFwLVgRD blcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e5ISdWTtvtQHrK+bUPHKlCDYbYPNxjH5wSNND0tJDuM=; b=DAHaudHpQjm9eUxNkktpcX7nHtK9Ixn+GCHF20E3tmF59Y2ww6ZxuiDBxeFCGy3cUE /xmeQ2C/XLKKWaUx++vLP22xev+xO9sBxsJiqbU3lAA30KG3is88LKsTaK5zWb+UJW9D 1USAIjGNRotk0rSSxx0NhD+FSB5ZDqKJi8HAvkkfgvyrLdUmdvGSGsX90GoB3mnvFWU2 ommA8g4JPqnJbbx+2gtzIx8kt+iGU4CmpZB/P22/Vl054aAJO4MnIpN16Ad+EK4Z38iW wQJENI/8c68uGBkDDbq57vjtNRXK2FEC2yoAO/cbOB1E5lXgkiIXExKjTlEf19J9GRZF 0rqA== X-Gm-Message-State: APjAAAXmba3/FPHmFc2MYIOJLSKOmwvVRwrBrnxMdrcUKu0AQ8wU8OQc Gv+aOoJ1mn9/L5SDYtx6Dk8cFdHnYZM= X-Received: by 2002:a63:ff03:: with SMTP id k3mr8697603pgi.40.1565196213448; Wed, 07 Aug 2019 09:43:33 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id o11sm168735060pfh.114.2019.08.07.09.43.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 07 Aug 2019 09:43:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 7 Aug 2019 09:43:21 -0700 Message-Id: <20190807164321.44571-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190807164321.44571-1-raj.khem@gmail.com> References: <20190807164321.44571-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 3/3] android-tools: Fix build with glibc 2.30 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...t-define-gettid-if-glibc-2.30-is-use.patch | 52 +++++++++++++++++++ .../android-tools/android-tools_5.1.1.r37.bb | 1 + 2 files changed, 53 insertions(+) create mode 100644 meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch diff --git a/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch b/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch new file mode 100644 index 0000000000..8524517cb6 --- /dev/null +++ b/meta-oe/recipes-devtools/android-tools/android-tools/libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch @@ -0,0 +1,52 @@ +From f4f9d24860e1b5cd4f6a014f3fda7cd33ebe5be7 Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach +Date: Sat, 27 Jul 2019 08:20:20 -0700 +Subject: [PATCH] libselinux: Do not define gettid() if glibc >= 2.30 is used +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since version 2.30 glibc implements gettid() system call wrapper, see +https://sourceware.org/bugzilla/show_bug.cgi?id=6399 + +Fixes: +cc -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -I../include -D_GNU_SOURCE -DNO_ANDROID_BACKEND -c -o procattr.o procattr.c +procattr.c:28:14: error: static declaration of ‘gettid’ follows non-static declaration + 28 | static pid_t gettid(void) + | ^~~~~~ +In file included from /usr/include/unistd.h:1170, + from procattr.c:2: +/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of ‘gettid’ was here + 34 | extern __pid_t gettid (void) __THROW; + | ^~~~~~ + +Signed-off-by: Petr Lautrbach +Acked-by: Stephen Smalley +Signed-off-by: Khem Raj +--- + src/procattr.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +--- a/src/procattr.c ++++ b/src/procattr.c +@@ -8,7 +8,19 @@ + #include "selinux_internal.h" + #include "policy.h" + +-#ifndef __BIONIC__ ++/* Bionic and glibc >= 2.30 declare gettid() system call wrapper in unistd.h and ++ * has a definition for it */ ++#ifdef __BIONIC__ ++ #define OVERRIDE_GETTID 0 ++#elif !defined(__GLIBC_PREREQ) ++ #define OVERRIDE_GETTID 1 ++#elif !__GLIBC_PREREQ(2,29) ++ #define OVERRIDE_GETTID 1 ++#else ++ #define OVERRIDE_GETTID 0 ++#endif ++ ++#if OVERRIDE_GETTID + static pid_t gettid(void) + { + return syscall(__NR_gettid); diff --git a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index e09cd829d7..d84fcaecc9 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -41,6 +41,7 @@ SRC_URI = " \ file://extras/0001-ext4_utils-remove-selinux-extensions.patch;patchdir=system/extras \ file://extras/0002-ext4_utils-add-o-argument-to-preserve-ownership.patch;patchdir=system/extras \ file://libselinux/0001-Remove-bionic-specific-calls.patch;patchdir=external/libselinux \ + file://libselinux/0001-libselinux-Do-not-define-gettid-if-glibc-2.30-is-use.patch;patchdir=external/libselinux \ file://android-tools-adbd.service \ file://gitignore \ file://adb.mk;subdir=${BPN} \