From patchwork Thu Aug 31 23:26:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111455 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp216388qge; Thu, 31 Aug 2017 16:27:06 -0700 (PDT) X-Received: by 10.99.109.70 with SMTP id i67mr106158pgc.365.1504222026599; Thu, 31 Aug 2017 16:27:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504222026; cv=none; d=google.com; s=arc-20160816; b=VMEl6bwDmo6t9bqecw9kHo8U5YGrRTIixZkLDXRHZffCYPlTWDuyofOy0gD2C7F/B1 /u4vTA3WHefq3pPF/y+llkKYpDx3BqE0E3Onme5pzTwD4T9JGOzObIeey412EKd9cDgh Dl0cYtkzF6ob2DL8v6THASvLzR/bWVwGX/8gDgFyqWS53wGF+bMdkIJKdtvnShfSWTed uWtkzpu1w1NEz+aevH9sWcQ/t/oEnEMH2RVcq+DIHLvnxJ3aena0hIoz6uaCNcUM+L5c /W/J2OiUmbzNv1l8rhZU/AZ6EI0m2dxtDlg5e8JYxPvRn7JevTbmfmpQdfwpqJ4+N09A ceIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=EbIZuCYBju5x6pIRYVsWB1OJTwmWkPfr+yDAybNDivc=; b=aR1K+IZUr1lQUoInrCk6STMIid6kGWBYAFFk5LV4Ob17P4YnEOz6uYa/vqQzTt5weR HpIum3+SmPLLXBfXRkmYH+HShVWQsUnKx5EFslD+Qfwga1G7apE7Gw2D3QpWGQez13s7 1qtgxSEMK4hgH6ayVnZpaoiVGD5X7NO9nC3CXBHQwrz/pv4zdLsjNcKopFuWi34U1JIy DgPB7b78OM2LwfKN71jbodzCXbldt/NCJwhAG/dfL/3qPI4xdgECPvHOuu3AzwqucEtN YUWpKVBoLb3A9sfl95kKdMOo8T2zsfuXMQA5m2gZH1oy8kreuzf+2xBvhDig+YLzbBvO fAOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ohX288+y; 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=NONE 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 p64si659667pfa.396.2017.08.31.16.27.05; Thu, 31 Aug 2017 16:27:06 -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=ohX288+y; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3F31578474; Thu, 31 Aug 2017 23:27:02 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by mail.openembedded.org (Postfix) with ESMTP id 1148378449 for ; Thu, 31 Aug 2017 23:27:00 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id r133so655780pgr.2 for ; Thu, 31 Aug 2017 16:27:02 -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; bh=vrsOLPSsjzzLrY5vOur8UJStj6znfVEuDBr690di4Xo=; b=ohX288+ydEAk9eh75s0/NhPlDKfvtgcOUTCz6qWrW+ovrSfhCuBkm8YRgdVBzEg9B0 nZfIb4Gu7bPUgXU9cZaFb3nFZk+RbrRUlYifqTg9NdEs9VNCfLQ1TRZZQDbWBMi7qMBW DkxVXJBF3yZctZqeyTbTofWs/RG4j6rRz1RQKAvPXtkk130cbsk0THlAhxNeq4K/QT2o zUXIGpjdPJPSpPjR+O8DVC4mDsW0/I0sYseMGobXTuem1K/f/yEc9GCMjcAkLVWxQsVS OVlqLrbjIi7b+ngi5oiw8VP06AtpAhmHtb3lt83SmifjWPjy3xqbWis+5mH3oV4nGWzZ TZAw== 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; bh=vrsOLPSsjzzLrY5vOur8UJStj6znfVEuDBr690di4Xo=; b=QZTFSKTJ4utok7D7x/aiPPI+GhCjPdZFXSpCMwVURhjoKBsMEZCxOG+wI5YmRnby+v rY6Ytv+Z4zPATdIFHAw1C3K4IkixN0grJP+wudtfVZ3jIpSWRqr/3NVaH7y01uLNk6W/ 0LGqhQWf2xC/VvTo74fnldv67qjcXM6OOp4D1OH6/FGoShGfxjbBtvQ/oO1FZeiYPkuF vRjrS/Ac6e3l0oP+ehOICWY7mHmENk4dB+CFQ5au0dzqteWnTc2p/Me7ACRkZjPMBJsj DeobQ8Xx9kTjS3NU7t8wLMDJjHx93Css3S8Nyb1LHIeTpTi7VCSuBAzxNSq+lES+CMFb SR4w== X-Gm-Message-State: AHPjjUhP12LGYKCbWyOlFMLcOHhl21EF4M6ur+aeJGM/ujKDPx/o9Iag TbNWLhTVDzhGoiVV X-Google-Smtp-Source: ADKCNb6IfA2xk0VwkoeXh9EQfA4CM8v6P3srOZ2frCrm5veOJbe9Ws9xHcCq9s6+j5Jy0MXeLnVW6g== X-Received: by 10.98.158.12 with SMTP id s12mr123629pfd.246.1504222021818; Thu, 31 Aug 2017 16:27:01 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::2e06]) by smtp.gmail.com with ESMTPSA id 16sm888569pge.33.2017.08.31.16.27.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 16:27:01 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 31 Aug 2017 16:26:42 -0700 Message-Id: <20170831232645.6125-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [oe] [meta-networking][PATCH 1/4] ndisc6: Fix build with clang and update to latest on git 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: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Change recipe to git Pass PERL variable to configure Add patches to fix VLAIS Signed-off-by: Khem Raj --- .../0001-replace-VLAIS-with-malloc-free-pair.patch | 124 +++++++++++++++++++++ .../ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch | 30 +++++ .../ndisc6/{ndisc6_1.0.3.bb => ndisc6_git.bb} | 21 ++-- 3 files changed, 168 insertions(+), 7 deletions(-) create mode 100644 meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch create mode 100644 meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch rename meta-networking/recipes-support/ndisc6/{ndisc6_1.0.3.bb => ndisc6_git.bb} (87%) -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch new file mode 100644 index 000000000..dc58b5b79 --- /dev/null +++ b/meta-networking/recipes-support/ndisc6/ndisc6/0001-replace-VLAIS-with-malloc-free-pair.patch @@ -0,0 +1,124 @@ +From 3a7d5396e633e6c02a4583be7faf3d79d0d33748 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 Aug 2017 11:14:41 -0700 +Subject: [PATCH 1/2] replace VLAIS with malloc/free pair + +Makes it compatible with non-gnu compilers + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/trace-icmp.c | 7 +++++-- + src/trace-tcp.c | 14 ++++++++++---- + src/trace-udp.c | 7 +++++-- + 3 files changed, 20 insertions(+), 8 deletions(-) + +diff --git a/src/trace-icmp.c b/src/trace-icmp.c +index 842938e..c76cb54 100644 +--- a/src/trace-icmp.c ++++ b/src/trace-icmp.c +@@ -43,16 +43,19 @@ send_echo_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct icmp6_hdr ih; +- uint8_t payload[plen - sizeof (struct icmp6_hdr)]; ++ uint8_t *payload; + } packet; + memset (&packet, 0, plen); ++ packet.payload = malloc(plen - sizeof (struct icmp6_hdr)); + + packet.ih.icmp6_type = ICMP6_ECHO_REQUEST; + packet.ih.icmp6_id = htons (getpid ()); + packet.ih.icmp6_seq = htons ((ttl << 8) | (n & 0xff)); + (void)port; + +- return send_payload (fd, &packet.ih, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet.ih, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +diff --git a/src/trace-tcp.c b/src/trace-tcp.c +index 940f918..62d22ff 100644 +--- a/src/trace-tcp.c ++++ b/src/trace-tcp.c +@@ -54,10 +54,11 @@ send_syn_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct tcphdr th; +- uint8_t payload[plen - sizeof (struct tcphdr)]; ++ uint8_t *payload; + } packet; + + memset (&packet, 0, sizeof (packet)); ++ packet.payload = malloc(plen - sizeof (struct tcphdr)); + packet.th.th_sport = sport; + packet.th.th_dport = port; + packet.th.th_seq = htonl ((ttl << 24) | (n << 16) | (uint16_t)getpid ()); +@@ -65,7 +66,9 @@ send_syn_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + packet.th.th_flags = TH_SYN | (ecn ? (TH_ECE | TH_CWR) : 0); + packet.th.th_win = htons (TCP_WINDOW); + +- return send_payload (fd, &packet, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +@@ -131,10 +134,11 @@ send_ack_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct tcphdr th; +- uint8_t payload[plen - sizeof (struct tcphdr)]; ++ uint8_t *payload; + } packet; + + memset (&packet, 0, sizeof (packet)); ++ packet.payload = malloc(plen - sizeof (struct tcphdr)); + packet.th.th_sport = sport; + packet.th.th_dport = port; + packet.th.th_ack = htonl ((ttl << 24) | (n << 16) | (uint16_t)getpid ()); +@@ -142,7 +146,9 @@ send_ack_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + packet.th.th_flags = TH_ACK; + packet.th.th_win = htons (TCP_WINDOW); + +- return send_payload (fd, &packet, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +diff --git a/src/trace-udp.c b/src/trace-udp.c +index 4adde6b..a6cbb07 100644 +--- a/src/trace-udp.c ++++ b/src/trace-udp.c +@@ -46,9 +46,10 @@ send_udp_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + struct + { + struct udphdr uh; +- uint8_t payload[plen - sizeof (struct udphdr)]; ++ uint8_t *payload; + } packet; + memset (&packet, 0, plen); ++ packet.payload = malloc(plen - sizeof (struct udphdr)); + + (void)n; + packet.uh.uh_sport = sport; +@@ -61,7 +62,9 @@ send_udp_probe (int fd, unsigned ttl, unsigned n, size_t plen, uint16_t port) + /*if (plen > sizeof (struct udphdr)) + packet.payload[0] = (uint8_t)ttl;*/ + +- return send_payload (fd, &packet, plen, ttl); ++ ssize_t ret = send_payload (fd, &packet, plen, ttl); ++ free(packet.payload); ++ return ret; + } + + +-- +2.14.1 + diff --git a/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch b/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch new file mode 100644 index 000000000..3cc2ba80c --- /dev/null +++ b/meta-networking/recipes-support/ndisc6/ndisc6/0002-Do-not-undef-_GNU_SOURCE.patch @@ -0,0 +1,30 @@ +From 2a50154fbce38fd36be7e14f5cd4a8b03c65c72f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 31 Aug 2017 11:15:37 -0700 +Subject: [PATCH 2/2] Do not undef _GNU_SOURCE + +There are functions from tcp.h which are under _GNU_SOURCE +in musl + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/trace-tcp.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/trace-tcp.c b/src/trace-tcp.c +index 62d22ff..380008e 100644 +--- a/src/trace-tcp.c ++++ b/src/trace-tcp.c +@@ -21,7 +21,6 @@ + # include + #endif + +-#undef _GNU_SOURCE + #define _DEFAULT_SOURCE 1 + + #include +-- +2.14.1 + diff --git a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.3.bb b/meta-networking/recipes-support/ndisc6/ndisc6_git.bb similarity index 87% rename from meta-networking/recipes-support/ndisc6/ndisc6_1.0.3.bb rename to meta-networking/recipes-support/ndisc6/ndisc6_git.bb index 6bc0531b9..1ff2df731 100644 --- a/meta-networking/recipes-support/ndisc6/ndisc6_1.0.3.bb +++ b/meta-networking/recipes-support/ndisc6/ndisc6_git.bb @@ -10,15 +10,27 @@ RDEPENDS_${PN}-tcptraceroute6 = "${PN}-rltraceroute6" RDEPENDS_${PN}-tracert6 = "${PN}-rltraceroute6" RDEPENDS_${PN}-misc += "perl" -SRC_URI = "http://www.remlab.net/files/ndisc6/ndisc6-${PV}.tar.bz2 \ -" +PV = "1.0.4+git${SRCPV}" +SRCREV = "4c794b5512d23c649def1f94a684225dcbb6ac3e" +SRC_URI = "git://git.remlab.net/git/ndisc6.git \ + file://0001-replace-VLAIS-with-malloc-free-pair.patch \ + file://0002-Do-not-undef-_GNU_SOURCE.patch \ + " SRC_URI[md5sum] = "21afdaa3a5a5c1ce50eb7f2b7d795989" SRC_URI[sha256sum] = "0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +S = "${WORKDIR}/git" + inherit autotools gettext +EXTRA_OECONF += "PERL=${USRBINPATH}/perl" + +do_configure_prepend() { + ${S}/autogen.sh +} + ALLOW_EMPTY_${PN} = "1" # Split into seperate packages since we normal don't want them all @@ -49,11 +61,6 @@ or IPv4." DESCRITPION_${PN}-rdnssd = "Daemon to autoconfigure the list of DNS \ servers through slateless IPv6 autoconfiguration." -# We do not run perl during the build, but only use it on the target. -do_configure_prepend() { - export PERL="/usr/bin/perl" -} - do_install_append () { rm -rf ${D}${localstatedir} # Enable SUID bit for applications that need it From patchwork Thu Aug 31 23:26:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111456 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp216538qge; Thu, 31 Aug 2017 16:27:17 -0700 (PDT) X-Received: by 10.98.217.72 with SMTP id s69mr140558pfg.100.1504222037640; Thu, 31 Aug 2017 16:27:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504222037; cv=none; d=google.com; s=arc-20160816; b=w6sV0iywahnsZ+Kfdn3N6Zxz234EFDxJijIU5975q1UkC+bE3S2RmjFVcIw3xaAesN rd7FutUFOphpgReTwFSKi3BfgkAG5v+/SGPa0CqJzSNAG6tn6ngh88f80OzjzDcDGwo/ BEuk7uTxCVMTp2xUfGH7pctKVTwIF3++a6LoUJ12AXGyqy3tq+1xV+GaX0V7KTWat9Q7 /le234AuV2ppmF9mZ6hfNUGgZqShzYO59UTuN7MJiY6XPofq1qCOFnDf6yRYPrQVK4Uf hERD+bW3hKuIPCA1o4uhJX7cRh6gL3hl7H83jcqUAAUtEsbO9O96ikLGeN3IPDgNPBU4 ITOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=JoHkOBfeSumUaq1caarg+GmKzYUb08kMGZnbQYEplsE=; b=ZiDz2JdG+msMONPdwwFM05ZD3YOzD1RPM4+TjI6LUT4a99NUkS43TrRyeaZ1x0CPNj LItfn/0QgDctQW1G62BerTrJKqkR7fAh2U6FSIZNswanuJAAaiTHfLHGPXjwHTFmOmwU HTjXcWjCfNYckqjeJOPW7C6rEuJ1wa/d2RrrIRnhnF6LpS4E0RlR1Rt/2Df2hOR69EQt b9WeyPclz6z2aTixSgBmcMkvtkduX/XPrEmTb2N134sDDSxNyF0KqFgHfpqSNEICpz1F CEStGJMY6h6ULmJOMRe1yNyryoF2gldJRf2nnnK7n4/HKj4o7/w7HABo1nplCRZDzyVG TcrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=D51zFWxL; 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=NONE 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 x6si658962pfk.462.2017.08.31.16.27.17; Thu, 31 Aug 2017 16:27:17 -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=D51zFWxL; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A47017848E; Thu, 31 Aug 2017 23:27:13 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f181.google.com (mail-pf0-f181.google.com [209.85.192.181]) by mail.openembedded.org (Postfix) with ESMTP id 3D56B78468 for ; Thu, 31 Aug 2017 23:27:01 +0000 (UTC) Received: by mail-pf0-f181.google.com with SMTP id g13so3101530pfm.2 for ; Thu, 31 Aug 2017 16:27:03 -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; bh=7KAC/aOqJRgAbVuPQ0OkLKMrVvu77g8N/fvDZoDEFUY=; b=D51zFWxLxPZ9Cx48hZSZcjpxyxlrn4GOzIjjXIisrnlUsU1XEF6kY7jhzBJ52dPE9v hdm9jK77p2MqvFmpOY1TvrlBReTCgazgvEiEfe6Yd6i3A+9EuRwzq4pzEPj2efUX8RLP iKEnxVUVJtxSqAWG64q7I7ZqCYjdJ6TTp+9Jll3nykivhA8TBl070H7z5VzPbe9TMBRd GSgPix/zsjGj3Nx7cygO+V/vwAQ9wgv1lpJ6Rxzp9BPB5Q4OWy7m9wLRq/9OxGfnEkoC frcyuqBiySnGlUAmTcdD9X0UoL6Mys4YA2RQ/GBfXzkE2zZaXhJdndbCouF2xi/c/1MT 5bUg== 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; bh=7KAC/aOqJRgAbVuPQ0OkLKMrVvu77g8N/fvDZoDEFUY=; b=CVDmJzwEL1ouVxxRlFueBUeYCmw+uO5dGqW85zn5l/bfjYdMpj8h7hNIzJ9+06w5eT rh4zeeNVdGZWpuo9xILfCsO2st6e2O1JEQjzr3+xd0YYsLbRm+l09+vpDpmT/tHmizuq galq8VhzERrcSpZIarv01Die6cJRTxABOqKHmREBLSlRy3eetBFRraxpRJrQL6eWRN8u KUkSg4oRB2bwRHi3o3j6A5xVxXOQiaDRcwzlcTdbi2KlOwyGTbdB2x7mprCpK69cR048 SpG0uPh/olNyI1sdDZmsDEgDNeZUuBmH/4ug4jK3r7gZCx8jJSiGTui0Mp1wyHOgyRs8 iKYw== X-Gm-Message-State: AHPjjUipWWb9et3ugot2TxEYEwGeaflPPZBtgM28mu+LZnEFYkFE3nbC f50n2HgPxBy6hjW9 X-Google-Smtp-Source: ADKCNb5qzx1ZtP4kP3fOvWF0QlmgeU8uIegeAIK/cnu+Ofr4DWRshEaMGzTd8y0TwTsNoLjwUSgmFQ== X-Received: by 10.98.204.27 with SMTP id a27mr148068pfg.58.1504222022965; Thu, 31 Aug 2017 16:27:02 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::2e06]) by smtp.gmail.com with ESMTPSA id 16sm888569pge.33.2017.08.31.16.27.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 16:27:02 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 31 Aug 2017 16:26:43 -0700 Message-Id: <20170831232645.6125-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170831232645.6125-1-raj.khem@gmail.com> References: <20170831232645.6125-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH V2 2/4] ntop: Fix build with musl 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: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org move away from .inc file, when its included in single recipe helps with devtool workflow too. Signed-off-by: Khem Raj --- meta-networking/recipes-support/ntop/ntop.inc | 131 -------------------- .../ntop/ntop/0001-nDPI-Include-sys-types.h.patch | 26 ++++ .../recipes-support/ntop/ntop/support-arm64.patch | 28 ----- meta-networking/recipes-support/ntop/ntop_5.0.1.bb | 135 ++++++++++++++++++++- 4 files changed, 160 insertions(+), 160 deletions(-) delete mode 100644 meta-networking/recipes-support/ntop/ntop.inc create mode 100644 meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch delete mode 100644 meta-networking/recipes-support/ntop/ntop/support-arm64.patch -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/ntop/ntop.inc b/meta-networking/recipes-support/ntop/ntop.inc deleted file mode 100644 index b96433425..000000000 --- a/meta-networking/recipes-support/ntop/ntop.inc +++ /dev/null @@ -1,131 +0,0 @@ -SUMMARY = "ntop is network top" -DESCRIPTION = "ntop is a network traffic probe that shows the network usage, \ -similar to what the popular top Unix command does." - -SECTION = "console/network" - -LICENSE = "GPLv2+ & GPLv3 & OpenSSL" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE-OpenSSL.txt;md5=a409f902e447ddd889cffa0c70e7c7c2 \ - " - -SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tar.gz \ - file://ntop_configure_in.patch \ - file://ntop_init.patch \ - file://ntop_webInterface.patch \ - file://ntop_configure_in_net_snmp_config_exist.patch \ - file://ntop.service \ - file://use-static-inline.patch \ - file://support-arm64.patch \ - " - -inherit autotools-brokensep useradd pythonnative pkgconfig systemd - -DEPENDS = "geoip rrdtool python zlib libpcap gdbm" - -PACKAGECONFIG ??= "openssl snmp plugins" -PACKAGECONFIG[openssl] = "--with-ssl, --without-ssl, openssl, openssl" -PACKAGECONFIG[snmp] = "--enable-snmp=yes NETSNMP=${STAGING_BINDIR_CROSS}/net-snmp-config, \ ---disable-snmp,net-snmp," -PACKAGECONFIG[plugins] = "--enable-plugins=yes, --disable-plugins, ," - -EXTRA_OECONF += "ac_cv_file_aclocal_m4=yes ac_cv_file_depcomp=no" - -do_configure() { - cp ${STAGING_DATADIR_NATIVE}/aclocal/libtool.m4 libtool.m4.in - cat acinclude.m4.in acinclude.m4.ntop libtool.m4.in > acinclude.m4 - cp 3rd_party/* ./ - - # config nDPI - cd nDPI - ./configure ${CONFIGUREOPTS} --with-pic - cd .. - - sed -i -e 's:^CFG_DBFILE_DIR=$localstatedir/ntop:CFG_DBFILE_DIR=$localstatedir/lib/ntop:' ${S}/configure.in - - # fix the CFLAGS, CPPFLAGS, LDFLAGS, remove the host include - sed -i \ - -e 's:\(^CFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ - -e 's:\(^CPPFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ - -e 's:\(^LDFLAGS="\$.*\) -L/usr/local/lib -L/opt/local/lib":\1":' \ - ${S}/configure.in - - # replace the DISTRO RELEASE in configure.in which are host's - # with our release, although those doesn't affect functionality - sed -i -e \ - '/DEFINEOS="LINUX"/{N;s/DISTRO=.*/DISTRO="${DISTRO}"/;N;s/RELEASE=.*/RELEASE="${DISTRO_VERSION}"/;}' \ - ${S}/configure.in - - # osName in original configure.in should be ${TARGET_SYS} - # which will show in ntop's "show configuration" - sed -i -e \ - 's:^osName=.*:osName=${TARGET_SYS}:' \ - ${S}/configure.in - - # rename configureextra to configureextra_rename to avoid - # configure.in to guess host OS and pull in more configure, non needed - # which will cause some cross-compiling failure on specific host - # e.g. SUSE(SLED...) - test ! -f configureextra || mv -f configureextra configureextra_rename - - # make sure configure finds python includdirs/libs with these envs - export BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - STAGING_LIBDIR=${STAGING_LIBDIR} - - autotools_do_configure -} - -do_compile_prepend() { - cd nDPI - oe_runmake - cd .. -} - -do_install_append() { - # remove the empty dirs - rm -rf ${D}${libdir}/plugins - - install -D -m 0755 ${S}/packages/RedHat/ntop.init \ - ${D}${sysconfdir}/init.d/ntop - install -D -m 0644 ${S}/packages/RedHat/ntop.conf.sample \ - ${D}${sysconfdir}/ntop.conf - - # change ntop dir in ntop.conf - # don't use the -P as the ntop.init didn't support it - sed -i -e "s:^--db-file-path /usr/share/ntop:--db-file-path /var/lib/ntop:" \ - -e "s:^#? -P /var/ntop:#? -P /var/lib/ntop:" \ - ${D}${sysconfdir}/ntop.conf - - # For systemd - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0755 ${S}/packages/RedHat/ntop.init ${D}${libexecdir}/ntop-helper - install -D -m 0644 ${WORKDIR}/ntop.service ${D}${systemd_system_unitdir}/ntop.service - sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${systemd_system_unitdir}/ntop.service - fi - - # Fix host-user-contaminated issue - chown -R root:root ${D} - - chown -R ntop.ntop ${D}${datadir}/ntop - chown -R ntop:ntop ${D}${localstatedir}/lib/ntop -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-M -g ntop -r -d ${localstatedir}/lib/ntop \ --s /usr/sbin/nologin -c 'ntop' ntop" -GROUPADD_PARAM_${PN} = "-r ntop" - -SYSTEMD_SERVICE_${PN} = "ntop.service" -SYSTEMD_AUTO_ENABLE = "disable" - -FILES_${PN}_append = "${libdir}/ntop/plugins ${libdir}/libntop-*.so \ - ${libdir}/libntopreport-*.so ${libdir}/lib*-${PV}.so" -FILES_${PN}-dev = "${includedir} ${libdir}/libntop.so \ - ${libdir}/libntopreport.so \ - ${libdir}/libnetflowPlugin.so ${libdir}/libsflowPlugin.so \ - ${libdir}/librrdPlugin.so \ - ${libdir}/*.a ${libdir}/libntopreport.a ${libdir}/*.la" - diff --git a/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch b/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch new file mode 100644 index 000000000..81ffeec21 --- /dev/null +++ b/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch @@ -0,0 +1,26 @@ +From 6543f3e2d5fe214e2fc6c050289bf1ae73b18724 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Aug 2017 13:56:24 -0700 +Subject: [PATCH] nDPI: Include sys/types.h + +Needed for uint_t types + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + nDPI/src/include/ipq_api.h | 1 + + 1 file changed, 1 insertion(+) + +Index: ntop-5.0.1/nDPI/src/include/ipq_api.h +=================================================================== +--- ntop-5.0.1.orig/nDPI/src/include/ipq_api.h ++++ ntop-5.0.1/nDPI/src/include/ipq_api.h +@@ -24,6 +24,7 @@ + #ifndef __IPOQUE_API_INCLUDE_FILE__ + #define __IPOQUE_API_INCLUDE_FILE__ + ++#include + + #if defined(HAVE_NTOP) && defined(WIN32) + #include diff --git a/meta-networking/recipes-support/ntop/ntop/support-arm64.patch b/meta-networking/recipes-support/ntop/ntop/support-arm64.patch deleted file mode 100644 index 0b1e8afbc..000000000 --- a/meta-networking/recipes-support/ntop/ntop/support-arm64.patch +++ /dev/null @@ -1,28 +0,0 @@ -Add support for arm64 - -Upstream-Status: Inappropriate [no longer maintained] - -Signed-off-by: Yue Tao - -diff --git a/nDPI/config.sub.old b/nDPI/config.sub -index c2d1257..e4347ac 100755 ---- a/nDPI/config.sub.old -+++ b/nDPI/config.sub -@@ -249,7 +249,7 @@ case $basic_machine in - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 | aarch64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -@@ -331,7 +331,7 @@ case $basic_machine in - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | aarch64-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ diff --git a/meta-networking/recipes-support/ntop/ntop_5.0.1.bb b/meta-networking/recipes-support/ntop/ntop_5.0.1.bb index 77b5e436f..298fbec61 100644 --- a/meta-networking/recipes-support/ntop/ntop_5.0.1.bb +++ b/meta-networking/recipes-support/ntop/ntop_5.0.1.bb @@ -1,4 +1,137 @@ -include ntop.inc +SUMMARY = "ntop is network top" +DESCRIPTION = "ntop is a network traffic probe that shows the network usage, \ +similar to what the popular top Unix command does." +SECTION = "console/network" + +LICENSE = "GPLv2+ & GPLv3 & OpenSSL" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE-OpenSSL.txt;md5=a409f902e447ddd889cffa0c70e7c7c2 \ + " + +SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tar.gz \ + file://ntop_configure_in.patch \ + file://ntop_init.patch \ + file://ntop_webInterface.patch \ + file://ntop_configure_in_net_snmp_config_exist.patch \ + file://ntop.service \ + file://use-static-inline.patch \ + file://0001-nDPI-Include-sys-types.h.patch \ + " SRC_URI[md5sum] = "01710b6925a8a5ffe1a41b8b512ebd69" SRC_URI[sha256sum] = "7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8" + +inherit autotools-brokensep useradd pythonnative pkgconfig systemd + +DEPENDS = "geoip rrdtool python zlib libpcap gdbm" + +PACKAGECONFIG ??= "openssl snmp plugins" +PACKAGECONFIG[openssl] = "--with-ssl, --without-ssl, openssl, openssl" +PACKAGECONFIG[snmp] = "--enable-snmp=yes NETSNMP=${STAGING_BINDIR_CROSS}/net-snmp-config, \ +--disable-snmp,net-snmp," +PACKAGECONFIG[plugins] = "--enable-plugins=yes, --disable-plugins, ," + +EXTRA_OECONF += "ac_cv_file_aclocal_m4=yes ac_cv_file_depcomp=no" + +do_configure() { + cp ${STAGING_DATADIR_NATIVE}/aclocal/libtool.m4 libtool.m4.in + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/nDPI + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/nDPI + cat acinclude.m4.in acinclude.m4.ntop libtool.m4.in > acinclude.m4 + cp 3rd_party/* ./ + + # config nDPI + cd nDPI + ./configure ${CONFIGUREOPTS} --with-pic + cd .. + + sed -i -e 's:^CFG_DBFILE_DIR=$localstatedir/ntop:CFG_DBFILE_DIR=$localstatedir/lib/ntop:' ${S}/configure.in + + # fix the CFLAGS, CPPFLAGS, LDFLAGS, remove the host include + sed -i \ + -e 's:\(^CFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ + -e 's:\(^CPPFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ + -e 's:\(^LDFLAGS="\$.*\) -L/usr/local/lib -L/opt/local/lib":\1":' \ + ${S}/configure.in + + # replace the DISTRO RELEASE in configure.in which are host's + # with our release, although those doesn't affect functionality + sed -i -e \ + '/DEFINEOS="LINUX"/{N;s/DISTRO=.*/DISTRO="${DISTRO}"/;N;s/RELEASE=.*/RELEASE="${DISTRO_VERSION}"/;}' \ + ${S}/configure.in + + # osName in original configure.in should be ${TARGET_SYS} + # which will show in ntop's "show configuration" + sed -i -e \ + 's:^osName=.*:osName=${TARGET_SYS}:' \ + ${S}/configure.in + + # rename configureextra to configureextra_rename to avoid + # configure.in to guess host OS and pull in more configure, non needed + # which will cause some cross-compiling failure on specific host + # e.g. SUSE(SLED...) + test ! -f configureextra || mv -f configureextra configureextra_rename + + # make sure configure finds python includdirs/libs with these envs + export BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} + + autotools_do_configure +} + +do_compile_prepend() { + cd nDPI + oe_runmake + cd .. +} + +do_install_append() { + # remove the empty dirs + rm -rf ${D}${libdir}/plugins + + install -D -m 0755 ${S}/packages/RedHat/ntop.init \ + ${D}${sysconfdir}/init.d/ntop + install -D -m 0644 ${S}/packages/RedHat/ntop.conf.sample \ + ${D}${sysconfdir}/ntop.conf + + # change ntop dir in ntop.conf + # don't use the -P as the ntop.init didn't support it + sed -i -e "s:^--db-file-path /usr/share/ntop:--db-file-path /var/lib/ntop:" \ + -e "s:^#? -P /var/ntop:#? -P /var/lib/ntop:" \ + ${D}${sysconfdir}/ntop.conf + + # For systemd + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -D -m 0755 ${S}/packages/RedHat/ntop.init ${D}${libexecdir}/ntop-helper + install -D -m 0644 ${WORKDIR}/ntop.service ${D}${systemd_system_unitdir}/ntop.service + sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${systemd_system_unitdir}/ntop.service + fi + + # Fix host-user-contaminated issue + chown -R root:root ${D} + + chown -R ntop.ntop ${D}${datadir}/ntop + chown -R ntop:ntop ${D}${localstatedir}/lib/ntop +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "-M -g ntop -r -d ${localstatedir}/lib/ntop \ +-s /usr/sbin/nologin -c 'ntop' ntop" +GROUPADD_PARAM_${PN} = "-r ntop" + +SYSTEMD_SERVICE_${PN} = "ntop.service" +SYSTEMD_AUTO_ENABLE = "disable" + +FILES_${PN}_append = "${libdir}/ntop/plugins ${libdir}/libntop-*.so \ + ${libdir}/libntopreport-*.so ${libdir}/lib*-${PV}.so" +FILES_${PN}-dev = "${includedir} ${libdir}/libntop.so \ + ${libdir}/libntopreport.so \ + ${libdir}/libnetflowPlugin.so ${libdir}/libsflowPlugin.so \ + ${libdir}/librrdPlugin.so \ + ${libdir}/*.a ${libdir}/libntopreport.a ${libdir}/*.la" + From patchwork Thu Aug 31 23:26:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111457 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp216724qge; Thu, 31 Aug 2017 16:27:27 -0700 (PDT) X-Received: by 10.99.55.22 with SMTP id e22mr129249pga.101.1504222047802; Thu, 31 Aug 2017 16:27:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504222047; cv=none; d=google.com; s=arc-20160816; b=PYICfDT5KU9g3uG7BTYAhtHRMjO6sPe9dH/PLEKGhWcSw+rgXiFiMYGsAlSrHpKygU 5bCj6nYG5EfNyg5ASaSmbGoqNEJ7z0pPztupTipo0EO2zoQSB3fypcGyvuzxGGiuPMM7 jmNSDWVB7p8i284z/AUBGSOBSGBnaJyiQu4JmZJPHvsK7HT3Mh/sEdMBvzg2YOtxZawE 9mWMexecOvh/VWTgj22e0GziJuCYrkgSum5sXDvz5c6RD4lxrZnu3iaJ1YS7oGtdwU/6 Lb2dCFP9fRTEfFh4/Lhk81SLRdiUNdAUBC/oKriRzjR1unJbdrBoOwiYl40m5HrB2D+W L1CA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Jwqp3DOnKgu40W9s0ZLQYNNybDO05DX6NAoCgRpMwu0=; b=vIe/pAyVeDT679MMGRtWBDQ+vRD+Itb2qytEHjfwcyb+tawGv0zDeW5kqMHTyvPGzu CveAgXiElHh2aWD+jY99s7NDucV40Zdd+xHAZMgxLolcXgi+bXccBIvZlNK0EIzDhVXU yBjdjI1MwPwkfu8FAHstu4fr9HiPVzHLriTwGYhMF7orTlAx+yzjgvGiqEl3i3m7/6qL b2lb/e4b0l0cUfCOv5MgnQ15fCkLsVTUvVtJ6CnnWUnp0HvyiAsUVs2pW1QqNRNV8BJA bUjMexa3tvHrR33tlW0m5sDZ1BvFY6epGHIYOQpnjClf7s9jY+SGY8Ph59crOdW0PI7R +2cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=j3m6S8l5; 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=NONE 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 j12si634550pgf.717.2017.08.31.16.27.27; Thu, 31 Aug 2017 16:27:27 -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=j3m6S8l5; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id EF6427848B; Thu, 31 Aug 2017 23:27:17 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id 55A257847A for ; Thu, 31 Aug 2017 23:27:02 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id t193so647859pgc.4 for ; Thu, 31 Aug 2017 16:27:04 -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; bh=tWvBmZlr632Z1bHtKZn2nOQEL8WzCjOp3gAoOMqEqGU=; b=j3m6S8l5PAKnQkkba3mQuFj1fcPJhmYTUSDbyngQu8k0Vzng5Me7XNcb78maJomS/g gQEwo7XMCecMd0EJZn1Zi+mi/54JJDlod1RSdpDv+653h+xCwnQIFQHLBCaE053ldI4G mBejkUKojafcfQV232RQaUkEbijJAmQOXFlQ3WhzypEC5wNfBJInAD/4fKWiwH7qVabf yaBm86070GF+laB1GhEEgyPZLq1rFcPe8Ek0Nn8sq+f0pAQpZNxcUkk4d8GfJ+cmpjEf NBiQK01FqeGRzCMMX+TxoeZXlEFtMTMQSnOxq0jjVhWhjg6dJ/gTJs/RUc77vzQEJjrr qRgw== 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; bh=tWvBmZlr632Z1bHtKZn2nOQEL8WzCjOp3gAoOMqEqGU=; b=pKF4V47h3nBq7EBGJBIAQgAkv3J6iQBIhY6AMOWxMrXzIZ7OyysDnKsupmCyHzp6OC ULFtszdkXcnCF0AhfKxngCW2NpOAfEjXApWCPYXigmZeMc2DikUlz+dLkreZDjSvj2dw XBCPPRklcSmd9lIDYJQ6keCOFdn+PGu+PSkqpfq8ezxYozRMXqFdApsHT5LXne54vSKV YdeDUTcHGt3SwWwYHr0T3XRUxxQr3oWB+BfEbW5dYVD+6R0zG6rEg1aOQRo5wAheGWhr xmSrG5c6iw5vXY8zVF0CKHsefT0OF+qWj8MldCK8fWEHNVpODyvd3h0EOl6tFOukCh9y +SiQ== X-Gm-Message-State: AHPjjUgbTxvCelFtd/6Y8Atu7ekxG30gb2rVTY/YLT9iLcnb6qvubJmA NcCybhL9VW/CuNF3 X-Google-Smtp-Source: ADKCNb6mq2QKEzLu1xQVV+qnaXZBAHyunzBWuu1lGYjjPwgi9K9FTrsph/kO32i4zFiIMnr9i3g5UA== X-Received: by 10.84.232.133 with SMTP id i5mr100443plk.239.1504222024214; Thu, 31 Aug 2017 16:27:04 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::2e06]) by smtp.gmail.com with ESMTPSA id 16sm888569pge.33.2017.08.31.16.27.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 16:27:03 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 31 Aug 2017 16:26:44 -0700 Message-Id: <20170831232645.6125-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170831232645.6125-1-raj.khem@gmail.com> References: <20170831232645.6125-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH V2 3/4] netkit-rwho: Fix build with musl 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: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...001-Add-missing-include-path-to-I-options.patch | 46 ++++++++++++++ .../0002-Fix-build-issues-found-with-musl.patch | 71 ++++++++++++++++++++++ .../recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb | 4 +- 3 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch create mode 100644 meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch new file mode 100644 index 000000000..b1325b317 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch @@ -0,0 +1,46 @@ +From 55ab6f1389261edff5f4c942bc3b0d8e695856d7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Aug 2017 18:11:33 -0700 +Subject: [PATCH 1/2] Add missing include path to -I options + +Fixes errors like +| rwho.c:52:10: fatal error: 'protocols/rwhod.h' file not found +| #include +| ^~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + rwho/Makefile | 1 + + rwhod/Makefile | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/rwho/Makefile b/rwho/Makefile +index 6f86388..67b28d4 100644 +--- a/rwho/Makefile ++++ b/rwho/Makefile +@@ -6,6 +6,7 @@ include ../MRULES + rwho: rwho.o + $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ + ++CFLAGS += -I../include + rwho.o: ../version.h + + install: rwho +diff --git a/rwhod/Makefile b/rwhod/Makefile +index 772b641..9034218 100644 +--- a/rwhod/Makefile ++++ b/rwhod/Makefile +@@ -7,6 +7,8 @@ ifneq ($(USE_GLIBC),1) + CFLAGS += -D_GNU_SOURCE + endif + ++CFLAGS += -I../include ++ + OBJS = rwhod.o + + rwhod: $(OBJS) +-- +2.14.1 + diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch new file mode 100644 index 000000000..717b4d73f --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch @@ -0,0 +1,71 @@ +From 2108213242638fa355f662382f55495d91301858 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Aug 2017 18:13:17 -0700 +Subject: [PATCH 2/2] Fix build issues found with musl + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + ruptime/ruptime.c | 1 + + rwho/rwho.c | 1 + + rwhod/rwhod.c | 5 +++-- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/ruptime/ruptime.c b/ruptime/ruptime.c +index 1d4f7b6..f1f043c 100644 +--- a/ruptime/ruptime.c ++++ b/ruptime/ruptime.c +@@ -53,6 +53,7 @@ char ruptime_rcsid[] = + #include + #include + #include ++#include + + struct hs { + char hs_hostname[MAXHOSTNAMELEN]; +diff --git a/rwho/rwho.c b/rwho/rwho.c +index 63919ac..71aec9e 100644 +--- a/rwho/rwho.c ++++ b/rwho/rwho.c +@@ -49,6 +49,7 @@ char rcsid[] = "$Id: rwho.c,v 1.7 1999/08/01 20:44:18 dholland Exp $"; + #include + #include + #include ++#include + #include + + #include "../version.h" +diff --git a/rwhod/rwhod.c b/rwhod/rwhod.c +index 54498d0..40cabcf 100644 +--- a/rwhod/rwhod.c ++++ b/rwhod/rwhod.c +@@ -76,6 +76,7 @@ char rcsid[] = + #include + #include + #include ++#include + + #include "../version.h" + +@@ -102,7 +103,7 @@ struct nlist nl[] = { + static void broadcaster(void); + static int configure(int s); + static int verify(const char *name); +-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) ++#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)) + static int getloadavg(double ptr[3], int n); + #endif + +@@ -549,7 +550,7 @@ sendpacket(struct whod *wd) + } + } + +-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) ++#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)) + /* + * Taken from: + * +-- +2.14.1 + diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb index 04baa4286..5685f03d6 100644 --- a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb @@ -8,7 +8,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}.orig.tar.gz;nam ${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}-13.debian.tar.gz;name=patch13 \ file://rwhod \ file://rwhod.default \ -" + file://0001-Add-missing-include-path-to-I-options.patch \ + file://0002-Fix-build-issues-found-with-musl.patch \ + " SRC_URI[archive.md5sum] = "0f71620d45d472f89134ba0d74242e75" SRC_URI[archive.sha256sum] = "0409e2ce4bfdb2dacb2c193d0fedfc49bb975cb057c5c6b0ffcca603a1188da7" SRC_URI[patch13.md5sum] = "82ed5a3c6b0bbf00b36508b9787963b9" From patchwork Thu Aug 31 23:26:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111458 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp216856qge; Thu, 31 Aug 2017 16:27:37 -0700 (PDT) X-Received: by 10.84.224.7 with SMTP id r7mr98806plj.273.1504222056957; Thu, 31 Aug 2017 16:27:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504222056; cv=none; d=google.com; s=arc-20160816; b=mK5IWvdTgaSIGMVQiI/ImfdpskTWqZX1fMZL2gZGZ9UbaIUo9ezZaV4q0EfnfOvjei UB9zgOOaMSPqklAeuaqsL3TVew5XhSynJYKMmKoSQaZtu2N1aWq+HQIdpTgofk520mTW LknqmgN/V1NAMSXfHmgePXDxurOHlo3z+ow3JgjHCZttUgu5N2CPTBDsMcBaUSki7TCE Qh+OBy5/9tj8qkHZSuW4bWDN0x9fPS+lAY5+mpx//gKOF/XPgsSRTchG8BMbx9kNLI/G 8J9LCsNUgTVTgjKfCBQvS7Su7//nWLpOiDA2btiHvXyJGUZUnbYoEfZ8IAZ6WwzlE70b pqzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=AKyyv5zoalUDLvyAp6RyX9toN9s9XZY71VQjf1Tm63I=; b=Tyme9sxgZvNIpftTVP/Meti96agrnvfNSrMJ110MU8FSMdS84c34Vl3B+6AdOHUDw9 qlcUzTZ9umwjAVjankE3sSRMXy5HtssimVNAtKWdAuvvfx/FWIB1S0Qfp+akqbNt6ncj 4fpVIsnsGTHMJY8H+vr0k7VqqJeu0Q2lEx5wvQEuz/qoym2qZho1Hqj4+vCeXAs4TafW OxLohTogu/dG9wtkPZK/kRdJnN76SU+KlCcTGWcuFS3Vf+DjnFvMWffkRZC/tP0zEP5z 2pP0nAMAr+cgT6YfJN9PBDllrEzZM+n0ko1TFEeQ2wObwAjOUlcxQRqiJPv+Q7Had3TF Pi5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cJ0ykqAa; 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=NONE 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 b13si680378pgn.125.2017.08.31.16.27.36; Thu, 31 Aug 2017 16:27:36 -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=cJ0ykqAa; 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=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0C09F7849B; Thu, 31 Aug 2017 23:27:19 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by mail.openembedded.org (Postfix) with ESMTP id 5D99078486 for ; Thu, 31 Aug 2017 23:27:04 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id v22so630139pfk.1 for ; Thu, 31 Aug 2017 16:27:05 -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; bh=XsWDi1nz7rII/ZI79TIv+sRRD4BcYlx0+xeFPAkWU68=; b=cJ0ykqAa7T4YK54rXjXmtAJkCcbXE423duC6EKbXOEaBCikFH+brYiWqG5AL8CDrrk 5sszbUV8hn6eWdwxyGrgw7kyWTO510XPEAUgwunKOVMrucqHe98w1d0XdROg6wjsgAtC 927jb/dsyk0RVTIcPdoO3aqu8Ek3KZiW+GQA09s14fSY2LMmis0xUZRDsJYpH4q8ivdE jiH4s4f3PzrqkgFkuZWH5UHf+w8KIVmh0OQVTQwDVOoivOXUlFuhqmHm6Zkvo5hTV4YM sfEaNftzGzYD2nYb9wdbEWkATMCKVo28FUel/utyBQrePruopAZHkADxkWRWEnTKaZni 470w== 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; bh=XsWDi1nz7rII/ZI79TIv+sRRD4BcYlx0+xeFPAkWU68=; b=p0856luTZ4ETUm+l7JPAOLpISA6QnFBjIHjxNphd7nNYu1v7mnVkFCphnid+rLn1y8 Gc8uhFpAyj5nVJfQsZIz0irY7Zw3dqTaGNH2VARlTE++h16+zqNvUClksZj41t2xJefj Tr6DQFA4mvJVe8ihDQ9aTSPUdhLKsyUygUxDDnmTsmM41vb9K9HQwUOtVFO+k9+xdmt6 yWhKG2s4MaJ8BNoZF1EAy2wDCZ4N1InXbcsRMdmSXDKKzkN2HLdDG9jO2uQszPdULRZB 1frRbZRpZJrWkrXxpZPFPra4wYcfDdg6Auo1F6182Jv8GB+/lHK5kcE8auDotKbzVAkI CNKA== X-Gm-Message-State: AHPjjUj6ovhjldLD2GJqio53fYdSvLIm8USdJa2h4APO8Zjlgygvw7zb dCU6R33m2xyJwbOD X-Google-Smtp-Source: ADKCNb7NIqcXpWkivV2iSnSqOdeYUaXzT+mRz0T0Yo/Tr2XNAlE4wY9+bJOSvBykqt6pOX/8r0MNNA== X-Received: by 10.84.193.131 with SMTP id f3mr143852pld.88.1504222025492; Thu, 31 Aug 2017 16:27:05 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::2e06]) by smtp.gmail.com with ESMTPSA id 16sm888569pge.33.2017.08.31.16.27.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Aug 2017 16:27:04 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Thu, 31 Aug 2017 16:26:45 -0700 Message-Id: <20170831232645.6125-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170831232645.6125-1-raj.khem@gmail.com> References: <20170831232645.6125-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH V2 4/4] netkit-tftp: Fix build with musl 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: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../0001-tftp-Include-missing-fcntl.h.patch | 27 ++++++++++++++++++++++ .../recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb | 7 +++--- 2 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch b/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch new file mode 100644 index 000000000..78936907f --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch @@ -0,0 +1,27 @@ +From fa57e161fc953264a75d50a787cb83983e60acc7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Aug 2017 18:30:02 -0700 +Subject: [PATCH] tftp: Include missing fcntl.h + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + tftp/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tftp/main.c b/tftp/main.c +index 8c54843..5c9b698 100644 +--- a/tftp/main.c ++++ b/tftp/main.c +@@ -63,6 +63,7 @@ char main_rcsid[] = + #include + #include + #include ++#include + + #include "tftpsubs.h" /* for mysignal() */ + +-- +2.14.1 + diff --git a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb b/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb index 67a541d25..92c13e850 100644 --- a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb @@ -6,9 +6,10 @@ DEPENDS = "tcp-wrappers" LIC_FILES_CHKSUM = "file://tftp/tftp.c;beginline=2;endline=3;md5=84d2cfe1e60863a7d82648734ba4d30c" SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.orig.tar.gz;name=archive \ - ${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}-18.diff.gz;name=patch18 \ - file://tftp.conf \ -" + ${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}-18.diff.gz;name=patch18 \ + file://tftp.conf \ + file://0001-tftp-Include-missing-fcntl.h.patch \ + " SRC_URI[archive.md5sum] = "b7262c798e2ff50e29c2ff50dfd8d6a8" SRC_URI[archive.sha256sum] = "3a43c0010d4e61f412563fd83769d4667d8b8e82903526d21cb9205fe55ad14d"