From patchwork Fri Jul 14 18:34:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 107817 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp1311346obm; Fri, 14 Jul 2017 11:35:22 -0700 (PDT) X-Received: by 10.99.67.68 with SMTP id q65mr15825466pga.260.1500057321921; Fri, 14 Jul 2017 11:35:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500057321; cv=none; d=google.com; s=arc-20160816; b=Ndwh4IlX/F/zmjYOT0VmaXPgrX0mFREE1otXBIAi3xWsI9La1g1K+S3ZGTKXhiAGwP mhjRX7bh0rRlROF9v40fgqCn9gNXqom6v5xtog+2RKQWoQEeskFYZo0+o7c/EoibaEuo dQLvI0fawI9jv1bPAKu04WIgqRfC3hU+XahmCCeEPOsiqVrsGsXi2c55yjUEujxSaDAA 8qdppu7re9Yi5qj8n3rnCGn6nIWrOrDUjEc7FOb7x8MS3fGtPhlCa8mmDJYJBqd/LNOX mI5UeUQVwbbeiIvRXBv/Fsvo2Ofrn5ZrVsirm5FBsexuMA23Rh21gCrvqf++3A3n3UnC gu2g== 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=CmspmwjBWhQn4rXsQe9XyMq60qzYOcLHTYv1cHBTdQo=; b=l0hzMMr1GeQWznO5zDUphjuhaL4SeUZT+7MIC44M8BqTXLGgQTwmfLAcjpcl/xdl+W fFpYR/a2Vidlz1Ea1cjFJe3IzbVjQSzxCViMT30G8vh4uDlGAfhWEj7IpGMBOaQjgqgE 5+C2AYzorRu2vjxxUTrTtO1CziXbjaCd7vt3Dq6BqHuraZGrIcGguBQ8TIlayPfKB8pU 9dVyIoPlKBPvsu4i2jFASEEIwVN6U7Z4yDQKScpL+zAA1gCRscOViylCR5WHj8VC+OO9 BQiNg52c1uWadVjZD56k6T0DBDUxHq9rZHQUrXy4VGzMXed19luK1cxjQR3UU6xB5AB6 c0sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=iNfvwMEN; 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 k64si6959147pge.371.2017.07.14.11.35.21; Fri, 14 Jul 2017 11:35:21 -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.b=iNfvwMEN; 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 8954078225; Fri, 14 Jul 2017 18:35:09 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by mail.openembedded.org (Postfix) with ESMTP id 53A2872F60 for ; Fri, 14 Jul 2017 18:35:06 +0000 (UTC) Received: by mail-pg0-f49.google.com with SMTP id k14so49585567pgr.0 for ; Fri, 14 Jul 2017 11:35:08 -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=nHzMmUaKnNjwiRNU9LD3vu7LBIB5jGj96wz+OBTCuoo=; b=iNfvwMEN7lykK9Ti3z6fMxzd+5I2y3aEIOpEb5/lxa+Q50kVK7SZ2pjmbL2qALjWP7 LVLW8jHFbt8btJF0b6cX+BKnZj9f+MDPeQjMUdOcVIOh5GFAs4huXFWZo/VayVJlq2+6 zJHU7D/yKJETcPNwd0DqQDo91ooG6vQtShiI/WF1ukXvcVTwFdPyhoHb1GTGTguY1vm3 lloWB/Fo2LDbWAS0ZT2qUQnAUZeXssBvZR1voZnNR5x1ZjLiSkulF+ad4jV77cP5IjfJ QYEwMDEAYbreGlXejVsA2szsclwXxGsQ5ZDuPXyDpVZxzGkrDm8vnjgH5i6EgtRzr9vI GXfw== 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=nHzMmUaKnNjwiRNU9LD3vu7LBIB5jGj96wz+OBTCuoo=; b=AJMKM2wBuI36mnzaVmMo99X4wym4mZSXOlQUMXar+D/EohkzKfF0QR0PUoTfEQLW1P rXypzTK566GH5d0PZ1QlzKsDyD/2fHMhOBSn5w6pSPhyUE/0MJDUElgeJX80DSqLo9oc SRVpT1E+xksDxpXMkqk4FD4dSsiQeseazwugPf/UdDqRLE+9qkLuVzLicSGg2MAvbYeF b9PC6Fkcedier4+jhJhgisOtIJ/hy4rMFaMMhqvefx7UiNnsgR4JpY65Y/lt6AFtwGxl lHnmKbUtCZXyKtGCt7aMBOuwTGBqsPt7vyTokwumSiRSeGxYGGULD49dk7goSiKk2qao dciw== X-Gm-Message-State: AIVw111MmC7zfV4X4qojyV57lyT5+//9B1Zr4UJsw25JzDC8Lkyu3tlt 7j3PAOrxIp8R0V0V X-Received: by 10.98.223.141 with SMTP id d13mr6653169pfl.179.1500057307908; Fri, 14 Jul 2017 11:35:07 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id 70sm18639581pft.104.2017.07.14.11.35.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 11:35:06 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 14 Jul 2017 11:34:51 -0700 Message-Id: <20170714183456.22548-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [oe] [meta-filesystems][PATCH 1/6] unionfs-fuse: 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 --- ...1-unionfs-Define-IOCPARM_LEN-if-undefined.patch | 62 ++++++++++++++++++++++ .../unionfs-fuse/unionfs-fuse_2.0.bb | 3 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch b/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch new file mode 100644 index 000000000..8f991cd3f --- /dev/null +++ b/meta-filesystems/recipes-filesystems/unionfs-fuse/files/0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch @@ -0,0 +1,62 @@ +From 10411fa8658621822ae394160daffaced4a4cd7f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 23:07:29 -0700 +Subject: [PATCH] unionfs: Define IOCPARM_LEN if undefined + +musl does not have sysctl.h which defines this +for glibc + +Signed-off-by: Khem Raj +--- + src/unionfs.c | 8 -------- + src/unionfs.h | 15 +++++++++++++++ + 2 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/src/unionfs.c b/src/unionfs.c +index a34d34e..51684a7 100644 +--- a/src/unionfs.c ++++ b/src/unionfs.c +@@ -21,14 +21,6 @@ + #include "opts.h" + #include "usyslog.h" + +-#ifndef _IOC_SIZE +-#ifdef IOCPARM_LEN +-#define _IOC_SIZE(x) IOCPARM_LEN(x) +-#else +-#error "No mechanism for determining ioctl length found." +-#endif +-#endif +- + static struct fuse_opt unionfs_opts[] = { + FUSE_OPT_KEY("chroot=%s,", KEY_CHROOT), + FUSE_OPT_KEY("cow", KEY_COW), +diff --git a/src/unionfs.h b/src/unionfs.h +index 8f5e0bf..b02de5a 100644 +--- a/src/unionfs.h ++++ b/src/unionfs.h +@@ -17,6 +17,21 @@ + #define FUSE_META_FILE ".fuse_hidden" + #define FUSE_META_LENGTH 12 + ++#ifndef IOCPARM_MASK ++#define IOCPARM_MASK 0x1FFF ++#endif ++#ifndef IOCPARM_LEN ++#define IOCPARM_LEN(a) (((a) >> 16) & IOCPARM_MASK) ++#endif ++ ++#ifndef _IOC_SIZE ++#ifdef IOCPARM_LEN ++#define _IOC_SIZE(x) IOCPARM_LEN(x) ++#else ++#error "No mechanism for determining ioctl length found." ++#endif ++#endif ++ + // file access protection mask + #define S_PROT_MASK (S_ISUID| S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO) + +-- +2.13.2 + diff --git a/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb b/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb index b89d8db15..6bedf16b0 100644 --- a/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb +++ b/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_2.0.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://src/unionfs.c;beginline=3;endline=8;md5=30fa8de70fd8a SRC_URI = "git://github.com/rpodgorny/${BPN}.git;branch=master \ file://0001-support-cross-compiling.patch \ -" + file://0001-unionfs-Define-IOCPARM_LEN-if-undefined.patch \ + " SRCREV = "c8d23a9a75f1a62988593671839e8a168a79f3e5" DEPENDS = "fuse" From patchwork Fri Jul 14 18:34:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 107818 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp1312224obm; Fri, 14 Jul 2017 11:36:12 -0700 (PDT) X-Received: by 10.84.136.70 with SMTP id 64mr17291331plk.50.1500057372610; Fri, 14 Jul 2017 11:36:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500057372; cv=none; d=google.com; s=arc-20160816; b=FhtI+u9r2s4/73/pKii2ewi91nm1LBA1itzfGZmAfdqMZC0iNyQyHOC0+bygk5SS8s SjF74dqI6HsNhg2cwtnljw1U1RVEJZLN2YRpHjajdNpu2D0nhhLAhf/EDXNzRxGLU7Jp rYbC9eREpULMa/oDaHH/Abd11L6L5fa/R6avBzWVeSovoUOZhvJ6kbxU+GPeOa9HCfuj uipA6AWqeavO59JRZjD2DScTNMR0U/Eq3c7JP9T4L+s+g0Lb8JCGLRutl+jqwJ+dWdpQ nwb8nub2N7dpR3ZmYeNNeMTSWTObQZo1hqRtoLkxmjvIozIEnbDyh99h8UFz97r2DlKE 3wLA== 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=ov+qTJwKI+XtENcd1sgYraFa6VJnOl+vhBUudeyACa8=; b=YouHX9iGSxH5cpXXZPzWAW0o3tRtC0D5UuSABcTnCL2QaBPZ8bKEpqjm9HDLvq5UNz JdOgy0iWoH4msqiG+yGxzHbMKJcdol1lvTGSSR1Um0m+eR5XwO6OuOLBoA1drjI4fpLH rgG5qFxluPQ6LfnFh1wxFWDK/MSWcTA+n9DbaGR4fXUO9RQg3P/tJPPLtlg+gqFWfIZY 4NO6cBwttE0JL63kRZtb17IxXpnzMJ5bAygSse8eaU/rNlldj0eLJ8XPA7r769yw1INP 3JoGSYUwYeq4ZiUWSAIzcNpPIdykFcwK5xfUts/jB9EeGLCpp8Tmz2f1QN0Ci2Lnc86W 9s2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=FSo9EHze; 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 a6si7122107pgc.316.2017.07.14.11.36.12; Fri, 14 Jul 2017 11:36:12 -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.b=FSo9EHze; 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 7E9D778238; Fri, 14 Jul 2017 18:36:09 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f50.google.com (mail-pg0-f50.google.com [74.125.83.50]) by mail.openembedded.org (Postfix) with ESMTP id E0C7778225 for ; Fri, 14 Jul 2017 18:35:08 +0000 (UTC) Received: by mail-pg0-f50.google.com with SMTP id t186so49585343pgb.1 for ; Fri, 14 Jul 2017 11:35:10 -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=RaEHEEaKdSkfHOf5safLGa24f6oHS1ZbOhQXV7mmoro=; b=FSo9EHzeo1PZpU+KN45JHgEKJ5uPziplRJunaptDueNyL9uOLoa2dsIoudQFwsDTTO Cc6b1k8nLkQq1m0RAIgny+VCarSa7ASsFUUExWCDHdlLC62+EnmsHZLz0tno9FTvJhxN Dn7OqcuifBvLHWBt3qhGKau7QhrVaE8MxzrcfQG7Ig1SkahODcpz5sVH4fCbniVVL1no 2fqVt3SnFaqxZgDbMupUBgjkcE3gCm/DTezpOPyyvsVyOPos0E+Xdoz9EUDTrrn/f0CO hhb05OD58kFbXhs8U/5b6/UNFX+PQNfgnQb0ooqIJCTqsayAnFF0uI524n2V/eavPk+Y gv+w== 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=RaEHEEaKdSkfHOf5safLGa24f6oHS1ZbOhQXV7mmoro=; b=dRg3MxftrjCWoDpAI2yUt3dIQVJXRqqWMzzCChQIL0Dc2p9dMJ8KZFZEB7ZmNAZc4H rd88pNCV5INxzVZBpJxI/EEGAjuXiMyJeCWX5njbIng+nQg5jAYyCveEwE7udEtl0nPA Y3gj+qHZXMGlF+5Ons+lS4i6nqRU25Sdl/hfz0hfggFv5lVg+3hhACqKdBgiQoPQpUe3 F7bkB5gr7ronL4ZhH2JHvXHv2eqb0TWcGhUH4wK8oaahz65WSPUvBWGQrm05N37SW2Eg 9c27FGwVZgotjMi1l+itJxmC/CGuncRRmDFCZOzMT7SMWLfzzwFKUuRs5zQkyw7ziC2M r4xA== X-Gm-Message-State: AIVw110hcEQjqHTz0KTJAuTVGY8h/FFk8bSwSlrpWE3TSJnX0uv7bgIX ph3yvUaGS3zIFYzs X-Received: by 10.98.73.65 with SMTP id w62mr6667566pfa.61.1500057309343; Fri, 14 Jul 2017 11:35:09 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::7028]) by smtp.gmail.com with ESMTPSA id 70sm18639581pft.104.2017.07.14.11.35.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 11:35:08 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 14 Jul 2017 11:34:52 -0700 Message-Id: <20170714183456.22548-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170714183456.22548-1-raj.khem@gmail.com> References: <20170714183456.22548-1-raj.khem@gmail.com> Subject: [oe] [meta-filesystems][PATCH 2/6] xfsdump: 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 --- .../files/0001-Include-fcntl.h-for-O_EXCL.patch | 28 +++++ .../0002-Replace-__uint32_t-with-uint32_t.patch | 122 +++++++++++++++++++++ .../0003-replace-use-of-SIGCLD-with-SIGCHLD.patch | 40 +++++++ .../files/0004-include-limit.h-for-PATH_MAX.patch | 29 +++++ ...-types.h-for-u_int32_t-in-attr-attributes.patch | 27 +++++ .../recipes-utils/xfsdump/xfsdump_3.1.6.bb | 9 +- 6 files changed, 253 insertions(+), 2 deletions(-) create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch create mode 100644 meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch -- 2.13.3 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch b/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch new file mode 100644 index 000000000..660468d73 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsdump/files/0001-Include-fcntl.h-for-O_EXCL.patch @@ -0,0 +1,28 @@ +From 8cf48da5f645dd7bbb1ccbeab5bb0964f40f17f7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 23:18:47 -0700 +Subject: [PATCH 1/5] Include fcntl.h for O_EXCL + +Fix +error: 'O_CREAT' undeclared (first use in this function) + +Signed-off-by: Khem Raj +--- + invutil/invidx.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/invutil/invidx.c b/invutil/invidx.c +index 67efdf7..325a9a1 100644 +--- a/invutil/invidx.c ++++ b/invutil/invidx.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include "types.h" + #include "mlog.h" +-- +2.13.2 + diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch b/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch new file mode 100644 index 000000000..ed3e0a9e9 --- /dev/null +++ b/meta-filesystems/recipes-utils/xfsdump/files/0002-Replace-__uint32_t-with-uint32_t.patch @@ -0,0 +1,122 @@ +From f76d2142905f0e5bd830d5d576c235af1171c6ac Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 13 Jul 2017 23:23:31 -0700 +Subject: [PATCH 2/5] Replace __uint32_t with uint32_t + +Signed-off-by: Khem Raj +--- + common/content_inode.h | 4 ++-- + doc/xfsdump.html | 8 ++++---- + inventory/inv_oref.h | 2 +- + inventory/inv_priv.h | 4 ++-- + inventory/inventory.h | 2 +- + 5 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/common/content_inode.h b/common/content_inode.h +index a69a9a0..6936e05 100644 +--- a/common/content_inode.h ++++ b/common/content_inode.h +@@ -191,10 +191,10 @@ typedef struct bstat bstat_t; + * and using two 16bit values to hold new 32bit projid was choosen + * to retain compatibility with "old" filesystems). + */ +-static inline __uint32_t ++static inline uint32_t + bstat_projid(struct bstat *bs) + { +- return (__uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo; ++ return (uint32_t)bs->bs_projid_hi << 16 | bs->bs_projid_lo; + } + + +diff --git a/doc/xfsdump.html b/doc/xfsdump.html +index 9c6722e..f85128f 100644 +--- a/doc/xfsdump.html ++++ b/doc/xfsdump.html +@@ -1935,7 +1935,7 @@ The files are constructed like so: + 
+ typedef struct invt_counter {
+     INVT_COUNTER_FIELDS
+-        __uint32_t    ic_vernum;/* on disk version number for posterity */\
++        uint32_t    ic_vernum;/* on disk version number for posterity */\
+         u_int         ic_curnum;/* number of sessions/invindices recorded \
+                                    so far */                              \
+         u_int         ic_maxnum;/* maximum number of sessions/inv_indices \
+@@ -1975,7 +1975,7 @@ typedef struct invt_fstab {
+ 
+ typedef struct invt_counter {
+     INVT_COUNTER_FIELDS
+-        __uint32_t    ic_vernum;/* on disk version number for posterity */\
++        uint32_t    ic_vernum;/* on disk version number for posterity */\
+         u_int         ic_curnum;/* number of sessions/invindices recorded \
+                                    so far */                              \
+         u_int         ic_maxnum;/* maximum number of sessions/inv_indices \
+@@ -2012,7 +2012,7 @@ typedef struct invt_entry {
+ 
+ typedef struct invt_sescounter {
+     INVT_COUNTER_FIELDS
+-        __uint32_t    ic_vernum;/* on disk version number for posterity */\
++        uint32_t    ic_vernum;/* on disk version number for posterity */\
+         u_int         ic_curnum;/* number of sessions/invindices recorded \
+                                    so far */                              \
+         u_int         ic_maxnum;/* maximum number of sessions/inv_indices \
+@@ -2034,7 +2034,7 @@ typedef struct invt_seshdr {
+     off64_t    sh_streams_off; /* offset to start of the set of
+                                   stream hdrs */
+     time_t     sh_time;        /* time of the dump */
+-    __uint32_t sh_flag;        /* for misc flags */
++    uint32_t sh_flag;        /* for misc flags */
+     u_char     sh_level;       /* dump level */
+     u_char     sh_pruned;      /* pruned by invutil flag */
+     char       sh_padding[22];
+diff --git a/inventory/inv_oref.h b/inventory/inv_oref.h
+index e16684d..38303a4 100644
+--- a/inventory/inv_oref.h
++++ b/inventory/inv_oref.h
+@@ -46,7 +46,7 @@
+ 
+ 
+ 
+-typedef __uint32_t	invt_objtype_t;
++typedef uint32_t	invt_objtype_t;
+ 
+ #define INVT_LOCKED		0x0001
+ 
+diff --git a/inventory/inv_priv.h b/inventory/inv_priv.h
+index 1690271..364ffbc 100644
+--- a/inventory/inv_priv.h
++++ b/inventory/inv_priv.h
+@@ -120,7 +120,7 @@ typedef struct invt_seshdr {
+ 	off64_t		sh_streams_off; /* offset to start of the set of 
+ 					   stream hdrs */
+ 	time32_t	sh_time;        /* time of the dump */
+-	__uint32_t	sh_flag;        /* for misc flags */
++	uint32_t	sh_flag;        /* for misc flags */
+ 	u_char		sh_level;       /* dump level */
+ 	u_char		sh_pruned;      /* pruned by invutil flag */
+ 	char		sh_padding[22];
+@@ -184,7 +184,7 @@ typedef struct invt_entry {
+ 
+ /* Cheap Inheritance, and an attempt to avoid a nested type */
+ #define INVT_COUNTER_FIELDS  \
+-        __uint32_t    ic_vernum;/* on disk version number for posterity */\
++        uint32_t    ic_vernum;/* on disk version number for posterity */\
+ 	uint	      ic_curnum;/* number of sessions/invindices recorded \
+ 				   so far */				  \
+ 	uint	      ic_maxnum;/* maximum number of sessions/inv_indices \
+diff --git a/inventory/inventory.h b/inventory/inventory.h
+index 134b9ba..c1d7403 100644
+--- a/inventory/inventory.h
++++ b/inventory/inventory.h
+@@ -43,7 +43,7 @@
+ /* length of labels, mntpts, etc */
+ #define INV_STRLEN              GLOBAL_HDR_STRING_SZ
+ 
+-typedef __uint32_t		inv_version_t;
++typedef uint32_t		inv_version_t;
+ 
+ /* This is the general inventory version. 
+  */
+-- 
+2.13.2
+
diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch b/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch
new file mode 100644
index 000000000..31303d8fa
--- /dev/null
+++ b/meta-filesystems/recipes-utils/xfsdump/files/0003-replace-use-of-SIGCLD-with-SIGCHLD.patch
@@ -0,0 +1,40 @@
+From fcc0cf15a309947103a0695b8a1f4865b820eb5c Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Thu, 13 Jul 2017 23:26:03 -0700
+Subject: [PATCH 3/5] replace use of SIGCLD with SIGCHLD
+
+Signed-off-by: Khem Raj 
+---
+ common/main.c    | 2 +-
+ doc/xfsdump.html | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/common/main.c b/common/main.c
+index 3848499..faa66ee 100644
+--- a/common/main.c
++++ b/common/main.c
+@@ -2225,7 +2225,7 @@ static sig_printmap_t sig_printmap[ ] = {
+ 	{SIGTERM,	"SIGTERM"},
+ 	{SIGUSR1,	"SIGUSR1"},
+ 	{SIGUSR2,	"SIGUSR2"},
+-	{SIGCLD,	"SIGCLD"},
++	{SIGCHLD,	"SIGCHLD"},
+ 	{SIGPWR,	"SIGPWR"},
+ 	{SIGURG,	"SIGURG"},
+ 	{SIGPOLL,	"SIGPOLL"},
+diff --git a/doc/xfsdump.html b/doc/xfsdump.html
+index f85128f..d96f037 100644
+--- a/doc/xfsdump.html
++++ b/doc/xfsdump.html
+@@ -334,7 +334,7 @@ the ring buffer. It ignores signals and does not terminate until it
+ receives a RING_OP_DIE message. It then exits 0.
+ 

+ The main process sleeps waiting for any of its children to die
+-(ie. waiting for a SIGCLD). All children that it cares about (stream
++(ie. waiting for a SIGCHLD). All children that it cares about (stream
+ managers and ring buffer slaves) are registered through the child
+ manager abstraction. When a child dies wait status and other info is
+ stored with its entry in the child manager. main() ignores the deaths
+-- 
+2.13.2
+
diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch b/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch
new file mode 100644
index 000000000..62ea15b86
--- /dev/null
+++ b/meta-filesystems/recipes-utils/xfsdump/files/0004-include-limit.h-for-PATH_MAX.patch
@@ -0,0 +1,29 @@
+From 98c7d96f0f2c6eddf60aa4a1a08d7d4467645930 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Thu, 13 Jul 2017 23:28:10 -0700
+Subject: [PATCH 4/5] include limit.h for PATH_MAX
+
+fixed
+var.c:42:12: error: 'PATH_MAX' undeclared (first use in this function); did you mean 'RAND_MAX'?
+  char path[PATH_MAX];`
+
+Signed-off-by: Khem Raj 
+---
+ dump/var.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dump/var.c b/dump/var.c
+index 645caab..8156d37 100644
+--- a/dump/var.c
++++ b/dump/var.c
+@@ -16,6 +16,7 @@
+  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.13.2
+
diff --git a/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch b/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch
new file mode 100644
index 000000000..fb6e467c9
--- /dev/null
+++ b/meta-filesystems/recipes-utils/xfsdump/files/0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch
@@ -0,0 +1,27 @@
+From d95f494de1aa8123c74170ffebaed8ea89649da2 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Thu, 13 Jul 2017 23:33:44 -0700
+Subject: [PATCH 5/5] include sys/types.h for u_int32_t in attr/attributes.h
+
+error: unknown type name 'u_int32_t'
+
+Signed-off-by: Khem Raj 
+---
+ restore/content.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/restore/content.c b/restore/content.c
+index 7c4a81f..1d5de1b 100644
+--- a/restore/content.c
++++ b/restore/content.c
+@@ -24,6 +24,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.13.2
+
diff --git a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb
index ecc746829..d1033cff1 100644
--- a/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb
+++ b/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.6.bb
@@ -11,8 +11,13 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=15c832894d10ddd00dfcf57bee490ecc"
 DEPENDS = "xfsprogs attr"
 
 SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${BPN}-${PV}.tar.gz \
-    file://remove-install-as-user.patch \
-"
+           file://remove-install-as-user.patch \
+           file://0001-Include-fcntl.h-for-O_EXCL.patch \
+           file://0002-Replace-__uint32_t-with-uint32_t.patch \
+           file://0003-replace-use-of-SIGCLD-with-SIGCHLD.patch \
+           file://0004-include-limit.h-for-PATH_MAX.patch \
+           file://0005-include-sys-types.h-for-u_int32_t-in-attr-attributes.patch \
+           "
 SRC_URI[md5sum] = "50353cd4f4b435685955363e6044f4d1"
 SRC_URI[sha256sum] = "7f78c11ca527477d90e5e62b0778f3ad96f2b71c19173044e9aca9515fff42d0"
 

From patchwork Fri Jul 14 18:34:53 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Khem Raj 
X-Patchwork-Id: 107819
Delivered-To: patch@linaro.org
Received: by 10.182.45.195 with SMTP id p3csp1312384obm;
 Fri, 14 Jul 2017 11:36:22 -0700 (PDT)
X-Received: by 10.84.217.30 with SMTP id o30mr17080677pli.184.1500057382643; 
 Fri, 14 Jul 2017 11:36:22 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1500057382; cv=none;
 d=google.com; s=arc-20160816;
 b=zDWZ1iSXiQVvLJWzRX559mdts9R7ag/o2gVqPO9s7ve/uHHRfEuOibrAWSTIMZLlN6
 YpfPP5HqzWKzcWCiXA9K4tbJAYVwHr6r+xPdOflYobMnl0OcQd3lfYxhO1TJWVwSt3fq
 wly09b/pBmgNEZxx3gHmoqiJNS2r/1wyrLH7R+gmT1TuNwQdeOa7ulfFxjqod53N/iAe
 G67QRCXjnQm+ZhOrR0oJ+TX+1RfQc+rrmsEZzqXqDh/5ZRfmaWgXNFDwCEOAkdKkjW2t
 mjBvmBrLVIjxq/IdgHhFicxM7ruHY7RQk87fsvQ9GRqai0qW1mIyUVq/dnLW6JA79Kb1
 Wtbw==
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=fZ+S1KuprB6XCqsH1ibpzm6Wmwmrvgnvt1RWL1ZLjN0=;
 b=BAdpftqO61jj9LwhT0Sbb4qS4+JvCpKIYYIttCmviW0j++SQMwBqlJOl9u6czJ33wB
 Q5AEXBc7Xy5oce7mbTOscmSHgyoNFnJS65CJOfD8f+tfOjTJDjkzVbPRoFoHIirf3VeE
 XhYJE3fGY42Q+G2X3e5XTT/dF7dFFYeRV9adLHY+1E3h5vVBm07gZ9SjI61DnZsPgVb1
 I9L532TJpCENPQZ18bf2kxOi7ioplj4r5P9sa/mxD3a448SZCA0qei6zabDx91dPbfH9
 0ajwtYYPYwRlHhQmPKorfR+byvsCdJEjVvTnGv5H0WZY4616HQ1k5Y+rVFCVDYrLkVXW
 XZdg==
ARC-Authentication-Results: i=1; mx.google.com;
 dkim=neutral (body hash did not verify) header.i=@gmail.com
 header.b=JVPc12v6; 
 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 g2si7107513plm.611.2017.07.14.11.36.22;
 Fri, 14 Jul 2017 11:36:22 -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.b=JVPc12v6; 
 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 48CF678230;
 Fri, 14 Jul 2017 18:36:20 +0000 (UTC)
X-Original-To: openembedded-devel@lists.openembedded.org
Delivered-To: openembedded-devel@lists.openembedded.org
Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com
 [209.85.192.196])
 by mail.openembedded.org (Postfix) with ESMTP id D5DBD7822C
 for ;
 Fri, 14 Jul 2017 18:35:09 +0000 (UTC)
Received: by mail-pf0-f196.google.com with SMTP id z6so11828976pfk.3
 for ;
 Fri, 14 Jul 2017 11:35:11 -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=GMtE9YmiUcbvjoELTLqHnw17PYILm+V0CjdlYjvZn9Y=;
 b=JVPc12v6QifEl1SFvlrLYDY8b9gOOtFL/zIxMhVWBNM6pnK/Wp95J70I6S4KzNdpXf
 7jGgfCTBb/KysVn6eE5cty4SP0kX+U4x5E5UY6Z15GsqX7GySkpQCii3zxeqg2m1NU7V
 BzyPckwpsGu9y8L/jwPZTVNAbxJ1tumAAPgCRgbPM0DAtmcUHi/ydhJEN3WZWJakaMMk
 QCNaZF95mmPu8N1VHARley3Sn8CviJ/ovpLVjTk7EYNOQGP7Bg28Xw4zLFNp2AuIHkDj
 1XRMor2UXoTIxSP3UQsWQdl7th2FMdO2cfvAS+Q43RVF+LczZvrPqIXXAJxvLq1tKDcJ
 X2YA==
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=GMtE9YmiUcbvjoELTLqHnw17PYILm+V0CjdlYjvZn9Y=;
 b=KGuu3u4oJDaxiaDw+C+AyZpJORdRDADy50b+sEE1LNSasMfaGn5KhEmV/E13PzANSe
 Iydu1iCoT3sURwr33ggmriIUw1wv9Mc8rsY69lxHYLJZM/SY5MhVKPCsXdnLLhgYI899
 fHYOZkl2jf1b9/j0WThQcirp/jnSgVNRLre2pUqp2szSgM1hZTXx8VbhxsvKu6Ohx1WH
 hMAH+nTp63wVLFkjt/B+TSwo6eMdLFFmLGw2rnhkdBdzL2GYVp0fX7cn+CpMoyfYQ6Qt
 uoArUiAgJ0Kupw2Ql0KApJZ/bEO7l0hGdRDwaRt9eh2YN5XKdakelIHCUIwQKAKg29zS
 zo6w==
X-Gm-Message-State: AIVw111wKBUeJMeuO3k1oRjfVrGACdf4ridupgBux5JUcvoAug8mNGrO
 bAOcO6kSZ0hd7Y0f
X-Received: by 10.98.11.4 with SMTP id t4mr6796925pfi.104.1500057310720;
 Fri, 14 Jul 2017 11:35:10 -0700 (PDT)
Received: from localhost.localdomain ([2601:646:8882:b8c::7028])
 by smtp.gmail.com with ESMTPSA id
 70sm18639581pft.104.2017.07.14.11.35.09
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 14 Jul 2017 11:35:09 -0700 (PDT)
From: Khem Raj 
To: openembedded-devel@lists.openembedded.org
Date: Fri, 14 Jul 2017 11:34:53 -0700
Message-Id: <20170714183456.22548-3-raj.khem@gmail.com>
X-Mailer: git-send-email 2.13.3
In-Reply-To: <20170714183456.22548-1-raj.khem@gmail.com>
References: <20170714183456.22548-1-raj.khem@gmail.com>
Subject: [oe] [meta-oe][PATCH 3/6] nmon: Upgrade to 16g
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

Fix build with musl while here.

Signed-off-by: Khem Raj 
---
 .../0001-lmon16g.c-Adjust-system-headers.patch     | 46 ++++++++++++++++++++++
 .../nmon/{nmon_13g.bb => nmon_16g.bb}              | 14 ++++---
 2 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch
 rename meta-oe/recipes-support/nmon/{nmon_13g.bb => nmon_16g.bb} (62%)

-- 
2.13.3

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

diff --git a/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch b/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch
new file mode 100644
index 000000000..e8debe56a
--- /dev/null
+++ b/meta-oe/recipes-support/nmon/nmon/0001-lmon16g.c-Adjust-system-headers.patch
@@ -0,0 +1,46 @@
+From d977b5170027926eb97ab9742ddc51d2a5555a34 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Fri, 14 Jul 2017 10:06:49 -0700
+Subject: [PATCH] lmon16g.c: Adjust system headers
+
+fstab.h is unused
+errno.h is in /usr/include
+defines from sys/cdefs.h is used
+
+Signed-off-by: Khem Raj 
+---
+ lmon16g.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lmon16g.c b/lmon16g.c
+index cb27e09..d2a11c5 100644
+--- a/lmon16g.c
++++ b/lmon16g.c
+@@ -63,7 +63,7 @@ static char *SccsId = "nmon " VERSION;
+ #include 
+ #include 
+ #include 
+-#include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -71,6 +71,7 @@ static char *SccsId = "nmon " VERSION;
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ /* Windows moved here so they can be cleared when the screen mode changes */
+ WINDOW *padwelcome = NULL;
+@@ -576,7 +577,6 @@ struct procsinfo {
+ int isroot = 0;
+ 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.13.3
+
diff --git a/meta-oe/recipes-support/nmon/nmon_13g.bb b/meta-oe/recipes-support/nmon/nmon_16g.bb
similarity index 62%
rename from meta-oe/recipes-support/nmon/nmon_13g.bb
rename to meta-oe/recipes-support/nmon/nmon_16g.bb
index 1f7518972..6232f8626 100644
--- a/meta-oe/recipes-support/nmon/nmon_13g.bb
+++ b/meta-oe/recipes-support/nmon/nmon_16g.bb
@@ -4,14 +4,14 @@ SECTION = "console/utils"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/Documentation.txt;md5=dbb13658cf55d687c4f2ff771a696d4a"
 DEPENDS = "ncurses"
-PR = "r2"
+DEPENDS_append_libc-musl = " bsd-headers"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon13g.c;name=lmon \
+SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \
            ${SOURCEFORGE_MIRROR}/nmon/Documentation.txt;name=doc \
+           file://0001-lmon16g.c-Adjust-system-headers.patch \
 "
-
-SRC_URI[lmon.md5sum] = "b1b8e6c0123ad232394991f2d4f40494"
-SRC_URI[lmon.sha256sum] = "456ab2a342b31d1a352d0d940af5962fa65a12ae8757ff73e6e73210832ae8b5"
+SRC_URI[lmon.md5sum] = "246ccfc74d5af55d992601fc4d3d4a72"
+SRC_URI[lmon.sha256sum] = "da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688"
 SRC_URI[doc.md5sum] = "dbb13658cf55d687c4f2ff771a696d4a"
 SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278"
 
@@ -19,8 +19,10 @@ CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM"
 LDFLAGS += "-ltinfo -lncursesw"
 ASNEEDED_pn-nmon = ""
 
+S = "${WORKDIR}"
+
 do_compile() {
-    ${CC} ${CFLAGS} ${LDFLAGS} ${WORKDIR}/lmon13g.c -o nmon
+    ${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon
 }
 
 do_install() {

From patchwork Fri Jul 14 18:34:54 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Khem Raj 
X-Patchwork-Id: 107820
Delivered-To: patch@linaro.org
Received: by 10.182.45.195 with SMTP id p3csp1312494obm;
 Fri, 14 Jul 2017 11:36:30 -0700 (PDT)
X-Received: by 10.84.176.100 with SMTP id u91mr17132638plb.182.1500057390103; 
 Fri, 14 Jul 2017 11:36:30 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1500057390; cv=none;
 d=google.com; s=arc-20160816;
 b=kV4i8JbekOdYYD9s2ZiCKLBftC4EjtjqHoczdilA9SEeHoD6XTW5UchI4Dty+H35T3
 zYZPv5cHLRsFM2Pmidq4o+SiCJdK++Mky2mFQyDxUEU1lzIXNcPg6NiVrwbkIwaa0ub+
 EFaK35ojugrO+BT6dGXQ0qF1E0Homvy0HMo8P9t9v5MYDUS9Ha9S6KKp07SYoP+QetOa
 NL9gbmEtc62zb96wPigRw9Qqq9HvRhxaT3V7702Yd3AMVOq5cvcqHpgJ/MDVELuyeAaX
 C7iPclJTr/ugY62t0T3QQDmzNPhnntiTtyh1sAeuUw21Q59CGwdjD1sIUTOcchw/FtK3
 pm3A==
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=vuVWNwNlDO5Qg6JBdORQP/xv+iLXfaDTzjvoe4ujs/w=;
 b=m4OubOG/lbEOealEJRjNzUYY9ewLwosvgG4UGBaRsHQ69Ol1RTd7/oVX1fDiwGP4eT
 /P5PGXMPxFlAJyHsz6WXkQWDe4BMo4hOrO5/Y0+4CmNRl3b8pI94SX967e7bVp+ETLrh
 c93tQMG9wo/fHKgMr9e6U4+8yfWr0mZqsAWMXQRLo+1MXwuLGQvWObTpakE2tkgvhRIz
 mxpCHOiv5BUkYANeMDuUWxU4426H1gCB0h2qz6bx0jf2+UEX313sOuh/bkK+T5CRhD4Q
 uIMHEYfLFGZY8yPKBQzf1zdJpwlRerzLLLpmsrb2UOmQcj8gV7toEDNPJm/eqq88ixCw
 Fd/g==
ARC-Authentication-Results: i=1; mx.google.com;
 dkim=neutral (body hash did not verify) header.i=@gmail.com
 header.b=iJaEIw4q; 
 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
 k33si1463258pld.163.2017.07.14.11.36.29; 
 Fri, 14 Jul 2017 11:36:30 -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.b=iJaEIw4q; 
 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 6239378244;
 Fri, 14 Jul 2017 18:36:21 +0000 (UTC)
X-Original-To: openembedded-devel@lists.openembedded.org
Delivered-To: openembedded-devel@lists.openembedded.org
Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65])
 by mail.openembedded.org (Postfix) with ESMTP id 8A52278220
 for ;
 Fri, 14 Jul 2017 18:35:11 +0000 (UTC)
Received: by mail-pg0-f65.google.com with SMTP id y129so11464604pgy.3
 for ;
 Fri, 14 Jul 2017 11:35:13 -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=vo7R5F2Q8eSNDgI8m2rLMrkRzxSHGhMhsRa1Zh19sAo=;
 b=iJaEIw4qNHY7WO1vrie0YqrpwXawM6Gar1G2Mctny5e0Nxi8Eyr254s+yxyqRExncP
 g9bWS9Z/0AQgTOdfEPpjYMhVh/C2K5hBUFzEk04IehgETq758teGl0WyRU1PhFNJc0K+
 9vnxFVBdSaSnW2Liol/4e7f/je8DpyM8uOEoG9hHMMlT/51Gk9gWBNYPO2FUCHs++AmZ
 TeN5h89uE8SsO4gBXYyq1JBxH7IZbuQTRkjBP31KrkVo/GMnJR6poTa5MsatSsb1FsJw
 49gxypLZsZwZK3HEs2Nbcdjn81t5EjrtW8A8taTSOOI/DOJRjza8WvCAmSnEmFfmy50d
 XykQ==
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=vo7R5F2Q8eSNDgI8m2rLMrkRzxSHGhMhsRa1Zh19sAo=;
 b=LaaEf8TSkZf0+o9qJGxgNcVcfQo6YHOr/ygUeaA0akBLuee/d7+nXKMoElV/u6PItA
 Bste2ZpQkvVUHorxtTmeTRsCN6DOnvgWkH+eUfqWIXww8Jc6xqFWyMM2q11XbvjogSMU
 5lPNSW3HMgzkqLi6FnlWrPTN4wuH/msKpgrzUQ0rwCNQ5SLCQ/3u5qT8clz/uvGHJGmL
 HIAiIxz3S2dqclnWVJWH9o5soqhtqIRaH0etpEWc5d6r8zXketExGTcQGznZRr1q9uUr
 blsafRsYYM2SVs8dObATs+qhrhxjw2ofM2WdI3Gv5Vndx7ub10BvHwkTIdNWh/YAKD58
 ElNQ==
X-Gm-Message-State: AIVw111pP1hIryBDhWg2UmIlJZpr94uFVFbcuIIZ6G7+zeI/oW5iNfVo
 Iv8FGDEIQCe17ZYR
X-Received: by 10.98.81.1 with SMTP id f1mr6588878pfb.94.1500057312374;
 Fri, 14 Jul 2017 11:35:12 -0700 (PDT)
Received: from localhost.localdomain ([2601:646:8882:b8c::7028])
 by smtp.gmail.com with ESMTPSA id
 70sm18639581pft.104.2017.07.14.11.35.10
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 14 Jul 2017 11:35:11 -0700 (PDT)
From: Khem Raj 
To: openembedded-devel@lists.openembedded.org
Date: Fri, 14 Jul 2017 11:34:54 -0700
Message-Id: <20170714183456.22548-4-raj.khem@gmail.com>
X-Mailer: git-send-email 2.13.3
In-Reply-To: <20170714183456.22548-1-raj.khem@gmail.com>
References: <20170714183456.22548-1-raj.khem@gmail.com>
Subject: [oe] [meta-gnome][PATCH 4/6] metacity: 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 
---
 ...1-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch | 31 ++++++++++++++++++++++
 .../recipes-gnome/metacity/metacity_2.34.13.bb     |  5 +++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch

-- 
2.13.3

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch
new file mode 100644
index 000000000..3d2b9c7d2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/metacity/metacity/0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch
@@ -0,0 +1,31 @@
+From 57493928f16c6bfd054c063c511201e295128539 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Fri, 14 Jul 2017 10:26:31 -0700
+Subject: [PATCH] ui: Replace __USE_XOPEN with _GNU_SOURCE
+
+Defining _GNU_SOURCE defines _XOPEN_SOURCE too which inturn defined __USE_XOPEN
+which is internal define for glibc
+
+additionally it becomes portable across musl and glibc
+
+Signed-off-by: Khem Raj 
+---
+ src/ui/theme.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ui/theme.c b/src/ui/theme.c
+index 84b57a0..6209b51 100644
+--- a/src/ui/theme.c
++++ b/src/ui/theme.c
+@@ -60,7 +60,7 @@
+ #include 
+ #include 
+ #include 
+-#define __USE_XOPEN
++#define _GNU_SOURCE
+ #include 
+ 
+ #define GDK_COLOR_RGBA(color)                                           \
+-- 
+2.13.3
+
diff --git a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
index 662c90db8..537414d9d 100644
--- a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
+++ b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb
@@ -13,7 +13,10 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 GNOME_COMPRESS_TYPE = "xz"
 
-SRC_URI += "file://remove-yelp-help-rules-var.patch"
+SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
+           file://remove-yelp-help-rules-var.patch \
+           file://0001-ui-Replace-__USE_XOPEN-with-_GNU_SOURCE.patch \
+           "
 SRC_URI[archive.md5sum] = "6d89b71672d4fa49fc87f83d610d0ef6"
 SRC_URI[archive.sha256sum] = "8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075"
 

From patchwork Fri Jul 14 18:34:55 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Khem Raj 
X-Patchwork-Id: 107821
Delivered-To: patch@linaro.org
Received: by 10.182.45.195 with SMTP id p3csp1312594obm;
 Fri, 14 Jul 2017 11:36:37 -0700 (PDT)
X-Received: by 10.84.218.206 with SMTP id g14mr17787981plm.290.1500057397492; 
 Fri, 14 Jul 2017 11:36:37 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1500057397; cv=none;
 d=google.com; s=arc-20160816;
 b=pJWymX2wScvqitUM087g4zvMA2NfwtJ6dkgde4bR4gmXzhYxP2EyMrL3mhhd2ZDq2j
 mP0ro8IyjjAk5IBNQB0Sp+aHzvugeZuTYGW9FBxIgdU7S3UZ8k/Kw/PO3JR3pCdju88o
 +rJhs0Hgkf1ikfbaE/nNTtKuf7avmWvTKWBm+fcp0l0cET41VFvGja69H7gkW0x9gKfN
 4BX9/ETBzia0osln08CG+J7cUA8bB5B+IspL+Que4FFZtpgkn6XbWtXwHBDIARE7bGgG
 a0r9L/AsmQN8jngLqHj0lxX/cZZczAStdONdUoh33ddHv5TEJgAKKwr+o3Q3dFH2Tn7f
 EOAA==
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=XOJJUji/wNJLWQKHKHrOIxsOo/MsBozs58/N9O9Ld/U=;
 b=e0UUV6syf7xqRYJNGFDlKo+q63Su2eao5n2BRQEahWL04trlJQHJH8UkvsjkztJzxt
 63MrLySgpSNbQN7ldYR/nByVCc1L6Zr1a2IE8zE0EpeK4li+NVgO1vB/HxMJGaMBnonh
 Xit6YX6RuDODhWapIwqFsOqWJoDu+LtOU5gGoPU1v4c8W8Vyj9qhKgw58puI9wIsn9MX
 zLLqUEiudN5DZ69BzhTkExbUHg3sDs805al/w7lMKwvGHJUSTP+qzdtCpZTe0QFWevv9
 ewWEs68HXamLaWYUnHBCHyoNSSxZp2DJdEaumqjK1moKlQaihg0kR73AvfXR65YXtrBP
 5UGw==
ARC-Authentication-Results: i=1; mx.google.com;
 dkim=neutral (body hash did not verify) header.i=@gmail.com
 header.b=doZs6hdR; 
 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 d6si7046251pgu.103.2017.07.14.11.36.37;
 Fri, 14 Jul 2017 11:36:37 -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.b=doZs6hdR; 
 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 7B5D27824D;
 Fri, 14 Jul 2017 18:36:22 +0000 (UTC)
X-Original-To: openembedded-devel@lists.openembedded.org
Delivered-To: openembedded-devel@lists.openembedded.org
Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com
 [209.85.192.195])
 by mail.openembedded.org (Postfix) with ESMTP id 5BFC978220
 for ;
 Fri, 14 Jul 2017 18:35:12 +0000 (UTC)
Received: by mail-pf0-f195.google.com with SMTP id e199so11818812pfh.0
 for ;
 Fri, 14 Jul 2017 11:35:14 -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=7BYFKh/PHmd+2OqNkHE2iZXLQsRmJR7MpD4xkvo+ThM=;
 b=doZs6hdR/1hjp9EBgz37JEpOEPFKQE+DkXXbgwDF2fyd5upZ0mgFFSqIj/Z/VxJpll
 ggpLDeLPRL5O8MslPf4dvjWkCprtFnCGAcHJEgYZXeUfMnMUPymLUaJ0mKEFse/CWPr7
 bOFo+0stgQf6LGqs7Sea0SMbz/6mJ12Nh4vETLTjwCFnRzIgpEkRyIEJdKuSiENcBgxF
 4KMCa6jFsUDIRr5NmZj/cfuaQ1ecQBwccm5ceNWeflpdMq3TRC3Gm7/Fi7zaMTRaOLvT
 /OqIxzPqssWzinCKzFfh4JEqE8cIAbZBwR3tzt2Vb7zb9M2yab3UdXhQEjwBpchC1eNv
 E2fg==
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=7BYFKh/PHmd+2OqNkHE2iZXLQsRmJR7MpD4xkvo+ThM=;
 b=QZmRRaXZ5x7XyGW9a17067Pqpab5vdUdLC0421DmOWBoGn3YtjwzbBnbuHT7qH6X5B
 x55AmxwyOiQmHaAjnFKQjiwx8qnVpqCStVVTYj7Pfq3MmPt79hnbvuBAPgCZWV05cWcD
 d1ecADJmx/n7s5j5K3g1098YL9ZtWERhpiIka/nqaiB4AZWOlYBqriKpqqgcHIiyN3te
 XpWtR4YHpMUwJDG1iEO8xdCwnj5R9dOjkYbygglcZabXf0hzRIhKzmvZPRtL6Ljaz9al
 mOMIAkT7M4/vCPFbtL585ql30E93EHezcqkvLG2XrhqGdNKfkB/SwC+j2kaXIUof6j0I
 G8Cw==
X-Gm-Message-State: AIVw110XINpyqVp9BRTMFqWCSPqCXT2nbSMPJayxIyraqSU+8UQ6n/yk
 Rfz/5TN5HcUQXyju
X-Received: by 10.99.39.69 with SMTP id n66mr16379561pgn.94.1500057314052;
 Fri, 14 Jul 2017 11:35:14 -0700 (PDT)
Received: from localhost.localdomain ([2601:646:8882:b8c::7028])
 by smtp.gmail.com with ESMTPSA id
 70sm18639581pft.104.2017.07.14.11.35.12
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 14 Jul 2017 11:35:13 -0700 (PDT)
From: Khem Raj 
To: openembedded-devel@lists.openembedded.org
Date: Fri, 14 Jul 2017 11:34:55 -0700
Message-Id: <20170714183456.22548-5-raj.khem@gmail.com>
X-Mailer: git-send-email 2.13.3
In-Reply-To: <20170714183456.22548-1-raj.khem@gmail.com>
References: <20170714183456.22548-1-raj.khem@gmail.com>
Subject: [oe] [meta-webserver][PATCH 5/6] monkey: Link in libexecinfo on 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

Needed for backtrace() APIs

Signed-off-by: Khem Raj 
---
 meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

-- 
2.13.3

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb
index be8ed37b9..02d4040dd 100644
--- a/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb
+++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.6.bb
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
 
 SECTION = "net"
 
+DEPENDS_append_libc-musl = " libexecinfo"
+
 SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \
            file://monkey.service \
            file://monkey.init"
@@ -24,7 +26,13 @@ EXTRA_OECONF = "--plugdir=${libdir}/monkey/ \
                 --disable-plugins=mbedtls \
                 --debug \
                 --malloc-libc"
+
+EXTRA_OEMAKE += "LIBS='${LIBS}'"
+
 DISABLE_STATIC = ""
+CLEANBROKEN = "1"
+
+LIBS_append_libc-musl = " -lexecinfo"
 
 inherit autotools-brokensep pkgconfig update-rc.d systemd
 

From patchwork Fri Jul 14 18:34:56 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Khem Raj 
X-Patchwork-Id: 107822
Delivered-To: patch@linaro.org
Received: by 10.182.45.195 with SMTP id p3csp1312729obm;
 Fri, 14 Jul 2017 11:36:45 -0700 (PDT)
X-Received: by 10.84.214.22 with SMTP id h22mr17087326pli.277.1500057405647; 
 Fri, 14 Jul 2017 11:36:45 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1500057405; cv=none;
 d=google.com; s=arc-20160816;
 b=SURk7sBxsJKBWE8usW8PSxQoFEgE245GFgdqbC4LPYtXRuV4MF+kMbXHHljTcIcPmZ
 3Ndeqia3shc6/9mluUqohNa3wBUv2wn5K1DgJNAe0gW51DfcfkdxeWeKZzV8UeWLyvUY
 0s5M/jHtUy4YRFJRh3nLnuMzFC6Pg+J3qJhxgZWUIPXG10W+DtsoT9deWo/6MDrc/eUA
 OZLtp+qrE0v4Zr9ec69/wYffE2pGRW0JQrtVDHreewOLJ8A29fKFf3YCLLtC9atXXWb2
 x8u9mZjJT3PnNVOfydTxj72rrKryO/qkrNvQQoh135SXmi1oCLcASsjlWKTFCa5wWufj
 Kpkw==
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=JPizHFplHrQetI4q7naVf2A+zuZ5WQwlNh6MuJs9PwA=;
 b=PG/D3KD1DaYQUHZ/e0VElrkDC8EPtVYifrDn4CZNOgzzJDfYdfLuJw3N9fMEPZjOH3
 dcbL8JKtqtVzjYOvFnF0nCEM4ebDwxt7auuQ3soYylq98jOmacUVrlOt9rYF7zpTzPPG
 e+GAJ2wovnpNPUIKi+qVcWJyIcbXnL6TCQvs6VrWle8m+T5f4TP7sRYuBtFzuWlgrg//
 2dmeZ5fMK5dsZc/eO94T8FHietaA5VTqpQnK/1Bp+Cqk0nxSEEngDIS+2G4nTGDEbdon
 Q3ayTySDJd0PS+7CUysEXPp43y7NdYRCsPbuQFmVApzPFBckjjWa81srR8HavsDwJqSI
 2bPQ==
ARC-Authentication-Results: i=1; mx.google.com;
 dkim=neutral (body hash did not verify) header.i=@gmail.com
 header.b=fkYIch7y; 
 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 o12si7464544plg.5.2017.07.14.11.36.45; 
 Fri, 14 Jul 2017 11:36:45 -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.b=fkYIch7y; 
 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 9424F78251;
 Fri, 14 Jul 2017 18:36:23 +0000 (UTC)
X-Original-To: openembedded-devel@lists.openembedded.org
Delivered-To: openembedded-devel@lists.openembedded.org
Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com
 [209.85.192.196])
 by mail.openembedded.org (Postfix) with ESMTP id 4523178233
 for ;
 Fri, 14 Jul 2017 18:35:14 +0000 (UTC)
Received: by mail-pf0-f196.google.com with SMTP id z6so11829239pfk.3
 for ;
 Fri, 14 Jul 2017 11:35:16 -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=NDLVWdHJwuLJUpjdBSuCkOLzxGj1Td0nItGnIAOOMwg=;
 b=fkYIch7yI3rgYrji2pXh4cGRrlgp+TdjWgoLxOCG4QtLDUd09fVE7eu6cOpHfS1SjZ
 cny/teptBd/dDACPIMCmrfgoG1GJSZnQSihzMA2Ji/XjfwwoBENXuMmZuNH6owATslCF
 2mb9yUa2HYqM+OSoNJx0nDD+x4OZNYhbfbOLL/sXQeu7xeZVisRs/klNdDat2FoIDzOT
 adhlYfn90A+wfBFZIqlQpEgkPvy+8KvCzTekrWbbDXAceR+l6Ao9yRAipj8rrn46FgBB
 jhzn3E8j5jn7S6EKm9A3M/yFUhEPpuJdpgCnqrTMQ6fDqA5YUnNdS19XpItxOdEosiEt
 Nt+g==
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=NDLVWdHJwuLJUpjdBSuCkOLzxGj1Td0nItGnIAOOMwg=;
 b=iir3SXnLTBEajCS3cJ8xjU5aQx5jx88m01HEfunBSRjCGLKW1osBmtcfpnDcOKfYCK
 Qaq1lRejQtwHU8zapS5+Ucbfb21nKi38GBcY3WOCfZ1k8dT48j+xwwZOLBPD2XQK3p6m
 8AZmqKOk0+vMwdFhOpV9GJK/APcCQzhxE7PrEJKC9y8ThYLv5cSONCuB8qGGnDAyhGtG
 nmJpINsy/cdKlQFAdHShzVDGItTnF9TsTN7zWC+1eSOtIx/N8ZQ/MC70Cxx1uCml8h5F
 5ZLDhVK0O+6Mbm7dskHEm5PwPrXMiz4bWUjfujop5bvFgf9gXf3YxBF8yU4e9yFlWX8N
 xWtA==
X-Gm-Message-State: AIVw112XN7ynScJnXf6riWwrP5bk5SefjFTYJ7PmVpemOu6ClkmPp6O8
 61gh/3fMtSqmlkiW
X-Received: by 10.99.148.26 with SMTP id m26mr6839129pge.222.1500057315413; 
 Fri, 14 Jul 2017 11:35:15 -0700 (PDT)
Received: from localhost.localdomain ([2601:646:8882:b8c::7028])
 by smtp.gmail.com with ESMTPSA id
 70sm18639581pft.104.2017.07.14.11.35.14
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 14 Jul 2017 11:35:14 -0700 (PDT)
From: Khem Raj 
To: openembedded-devel@lists.openembedded.org
Date: Fri, 14 Jul 2017 11:34:56 -0700
Message-Id: <20170714183456.22548-6-raj.khem@gmail.com>
X-Mailer: git-send-email 2.13.3
In-Reply-To: <20170714183456.22548-1-raj.khem@gmail.com>
References: <20170714183456.22548-1-raj.khem@gmail.com>
Subject: [oe] [meta-filesystems][PATCH 6/6] aufs-util: Upgrade to 4.4 release
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

- Download aufs_type.h instead of housing a local copy
- Build uses paste utility from coreutils-native
- Replace hardcoded strip command with STRIP env varible
  helps in cross compiling

Signed-off-by: Khem Raj 
---
 .../recipes-utils/aufs-util/aufs-util/aufs_type.h  | 419 ---------------------
 .../recipes-utils/aufs-util/aufs-util_git.bb       |  17 +-
 2 files changed, 10 insertions(+), 426 deletions(-)
 delete mode 100644 meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs_type.h

-- 
2.13.3

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs_type.h b/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs_type.h
deleted file mode 100644
index c948033a4..000000000
--- a/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs_type.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- * Copyright (C) 2005-2015 Junjiro R. Okajima
- *
- * This program, aufs is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see .
- */
-
-#ifndef __AUFS_TYPE_H__
-#define __AUFS_TYPE_H__
-
-#define AUFS_NAME	"aufs"
-
-#ifdef __KERNEL__
-/*
- * define it before including all other headers.
- * sched.h may use pr_* macros before defining "current", so define the
- * no-current version first, and re-define later.
- */
-#define pr_fmt(fmt)	AUFS_NAME " %s:%d: " fmt, __func__, __LINE__
-#include 
-#undef pr_fmt
-#define pr_fmt(fmt) \
-		AUFS_NAME " %s:%d:%.*s[%d]: " fmt, __func__, __LINE__, \
-		(int)sizeof(current->comm), current->comm, current->pid
-#else
-#include 
-#include 
-#endif /* __KERNEL__ */
-
-#include 
-
-#define AUFS_VERSION	"3.18-20150406"
-
-/* todo? move this to linux-2.6.19/include/magic.h */
-#define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
-
-/* ---------------------------------------------------------------------- */
-
-#ifdef CONFIG_AUFS_BRANCH_MAX_127
-typedef int8_t aufs_bindex_t;
-#define AUFS_BRANCH_MAX 127
-#else
-typedef int16_t aufs_bindex_t;
-#ifdef CONFIG_AUFS_BRANCH_MAX_511
-#define AUFS_BRANCH_MAX 511
-#elif defined(CONFIG_AUFS_BRANCH_MAX_1023)
-#define AUFS_BRANCH_MAX 1023
-#elif defined(CONFIG_AUFS_BRANCH_MAX_32767)
-#define AUFS_BRANCH_MAX 32767
-#endif
-#endif
-
-#ifdef __KERNEL__
-#ifndef AUFS_BRANCH_MAX
-#error unknown CONFIG_AUFS_BRANCH_MAX value
-#endif
-#endif /* __KERNEL__ */
-
-/* ---------------------------------------------------------------------- */
-
-#define AUFS_FSTYPE		AUFS_NAME
-
-#define AUFS_ROOT_INO		2
-#define AUFS_FIRST_INO		11
-
-#define AUFS_WH_PFX		".wh."
-#define AUFS_WH_PFX_LEN		((int)sizeof(AUFS_WH_PFX) - 1)
-#define AUFS_WH_TMP_LEN		4
-/* a limit for rmdir/rename a dir and copyup */
-#define AUFS_MAX_NAMELEN	(NAME_MAX \
-				- AUFS_WH_PFX_LEN * 2	/* doubly whiteouted */\
-				- 1			/* dot */\
-				- AUFS_WH_TMP_LEN)	/* hex */
-#define AUFS_XINO_FNAME		"." AUFS_NAME ".xino"
-#define AUFS_XINO_DEFPATH	"/tmp/" AUFS_XINO_FNAME
-#define AUFS_XINO_DEF_SEC	30 /* seconds */
-#define AUFS_XINO_DEF_TRUNC	45 /* percentage */
-#define AUFS_DIRWH_DEF		3
-#define AUFS_RDCACHE_DEF	10 /* seconds */
-#define AUFS_RDCACHE_MAX	3600 /* seconds */
-#define AUFS_RDBLK_DEF		512 /* bytes */
-#define AUFS_RDHASH_DEF		32
-#define AUFS_WKQ_NAME		AUFS_NAME "d"
-#define AUFS_MFS_DEF_SEC	30 /* seconds */
-#define AUFS_MFS_MAX_SEC	3600 /* seconds */
-#define AUFS_FHSM_CACHE_DEF_SEC	30 /* seconds */
-#define AUFS_PLINK_WARN		50 /* number of plinks in a single bucket */
-
-/* pseudo-link maintenace under /proc */
-#define AUFS_PLINK_MAINT_NAME	"plink_maint"
-#define AUFS_PLINK_MAINT_DIR	"fs/" AUFS_NAME
-#define AUFS_PLINK_MAINT_PATH	AUFS_PLINK_MAINT_DIR "/" AUFS_PLINK_MAINT_NAME
-
-#define AUFS_DIROPQ_NAME	AUFS_WH_PFX ".opq" /* whiteouted doubly */
-#define AUFS_WH_DIROPQ		AUFS_WH_PFX AUFS_DIROPQ_NAME
-
-#define AUFS_BASE_NAME		AUFS_WH_PFX AUFS_NAME
-#define AUFS_PLINKDIR_NAME	AUFS_WH_PFX "plnk"
-#define AUFS_ORPHDIR_NAME	AUFS_WH_PFX "orph"
-
-/* doubly whiteouted */
-#define AUFS_WH_BASE		AUFS_WH_PFX AUFS_BASE_NAME
-#define AUFS_WH_PLINKDIR	AUFS_WH_PFX AUFS_PLINKDIR_NAME
-#define AUFS_WH_ORPHDIR		AUFS_WH_PFX AUFS_ORPHDIR_NAME
-
-/* branch permissions and attributes */
-#define AUFS_BRPERM_RW		"rw"
-#define AUFS_BRPERM_RO		"ro"
-#define AUFS_BRPERM_RR		"rr"
-#define AUFS_BRATTR_COO_REG	"coo_reg"
-#define AUFS_BRATTR_COO_ALL	"coo_all"
-#define AUFS_BRATTR_FHSM	"fhsm"
-#define AUFS_BRATTR_UNPIN	"unpin"
-#define AUFS_BRATTR_ICEX	"icex"
-#define AUFS_BRATTR_ICEX_SEC	"icexsec"
-#define AUFS_BRATTR_ICEX_SYS	"icexsys"
-#define AUFS_BRATTR_ICEX_TR	"icextr"
-#define AUFS_BRATTR_ICEX_USR	"icexusr"
-#define AUFS_BRATTR_ICEX_OTH	"icexoth"
-#define AUFS_BRRATTR_WH		"wh"
-#define AUFS_BRWATTR_NLWH	"nolwh"
-#define AUFS_BRWATTR_MOO	"moo"
-
-#define AuBrPerm_RW		1		/* writable, hardlinkable wh */
-#define AuBrPerm_RO		(1 << 1)	/* readonly */
-#define AuBrPerm_RR		(1 << 2)	/* natively readonly */
-#define AuBrPerm_Mask		(AuBrPerm_RW | AuBrPerm_RO | AuBrPerm_RR)
-
-#define AuBrAttr_COO_REG	(1 << 3)	/* copy-up on open */
-#define AuBrAttr_COO_ALL	(1 << 4)
-#define AuBrAttr_COO_Mask	(AuBrAttr_COO_REG | AuBrAttr_COO_ALL)
-
-#define AuBrAttr_FHSM		(1 << 5)	/* file-based hsm */
-#define AuBrAttr_UNPIN		(1 << 6)	/* rename-able top dir of
-						   branch. meaningless since
-						   linux-3.18-rc1 */
-
-/* ignore error in copying XATTR */
-#define AuBrAttr_ICEX_SEC	(1 << 7)
-#define AuBrAttr_ICEX_SYS	(1 << 8)
-#define AuBrAttr_ICEX_TR	(1 << 9)
-#define AuBrAttr_ICEX_USR	(1 << 10)
-#define AuBrAttr_ICEX_OTH	(1 << 11)
-#define AuBrAttr_ICEX		(AuBrAttr_ICEX_SEC	\
-				 | AuBrAttr_ICEX_SYS	\
-				 | AuBrAttr_ICEX_TR	\
-				 | AuBrAttr_ICEX_USR	\
-				 | AuBrAttr_ICEX_OTH)
-
-#define AuBrRAttr_WH		(1 << 12)	/* whiteout-able */
-#define AuBrRAttr_Mask		AuBrRAttr_WH
-
-#define AuBrWAttr_NoLinkWH	(1 << 13)	/* un-hardlinkable whiteouts */
-#define AuBrWAttr_MOO		(1 << 14)	/* move-up on open */
-#define AuBrWAttr_Mask		(AuBrWAttr_NoLinkWH | AuBrWAttr_MOO)
-
-#define AuBrAttr_CMOO_Mask	(AuBrAttr_COO_Mask | AuBrWAttr_MOO)
-
-/* #warning test userspace */
-#ifdef __KERNEL__
-#ifndef CONFIG_AUFS_FHSM
-#undef AuBrAttr_FHSM
-#define AuBrAttr_FHSM		0
-#endif
-#ifndef CONFIG_AUFS_XATTR
-#undef	AuBrAttr_ICEX
-#define AuBrAttr_ICEX		0
-#undef	AuBrAttr_ICEX_SEC
-#define AuBrAttr_ICEX_SEC	0
-#undef	AuBrAttr_ICEX_SYS
-#define AuBrAttr_ICEX_SYS	0
-#undef	AuBrAttr_ICEX_TR
-#define AuBrAttr_ICEX_TR	0
-#undef	AuBrAttr_ICEX_USR
-#define AuBrAttr_ICEX_USR	0
-#undef	AuBrAttr_ICEX_OTH
-#define AuBrAttr_ICEX_OTH	0
-#endif
-#endif
-
-/* the longest combination */
-/* AUFS_BRATTR_ICEX and AUFS_BRATTR_ICEX_TR don't affect here */
-#define AuBrPermStrSz	sizeof(AUFS_BRPERM_RW			\
-			       "+" AUFS_BRATTR_COO_REG		\
-			       "+" AUFS_BRATTR_FHSM		\
-			       "+" AUFS_BRATTR_UNPIN		\
-			       "+" AUFS_BRATTR_ICEX_SEC		\
-			       "+" AUFS_BRATTR_ICEX_SYS		\
-			       "+" AUFS_BRATTR_ICEX_USR		\
-			       "+" AUFS_BRATTR_ICEX_OTH		\
-			       "+" AUFS_BRWATTR_NLWH)
-
-typedef struct {
-	char a[AuBrPermStrSz];
-} au_br_perm_str_t;
-
-static inline int au_br_writable(int brperm)
-{
-	return brperm & AuBrPerm_RW;
-}
-
-static inline int au_br_whable(int brperm)
-{
-	return brperm & (AuBrPerm_RW | AuBrRAttr_WH);
-}
-
-static inline int au_br_wh_linkable(int brperm)
-{
-	return !(brperm & AuBrWAttr_NoLinkWH);
-}
-
-static inline int au_br_cmoo(int brperm)
-{
-	return brperm & AuBrAttr_CMOO_Mask;
-}
-
-static inline int au_br_fhsm(int brperm)
-{
-	return brperm & AuBrAttr_FHSM;
-}
-
-/* ---------------------------------------------------------------------- */
-
-/* ioctl */
-enum {
-	/* readdir in userspace */
-	AuCtl_RDU,
-	AuCtl_RDU_INO,
-
-	AuCtl_WBR_FD,	/* pathconf wrapper */
-	AuCtl_IBUSY,	/* busy inode */
-	AuCtl_MVDOWN,	/* move-down */
-	AuCtl_BR,	/* info about branches */
-	AuCtl_FHSM_FD	/* connection for fhsm */
-};
-
-/* borrowed from linux/include/linux/kernel.h */
-#ifndef ALIGN
-#define ALIGN(x, a)		__ALIGN_MASK(x, (typeof(x))(a)-1)
-#define __ALIGN_MASK(x, mask)	(((x)+(mask))&~(mask))
-#endif
-
-/* borrowed from linux/include/linux/compiler-gcc3.h */
-#ifndef __aligned
-#define __aligned(x)			__attribute__((aligned(x)))
-#endif
-
-#ifdef __KERNEL__
-#ifndef __packed
-#define __packed			__attribute__((packed))
-#endif
-#endif
-
-struct au_rdu_cookie {
-	uint64_t	h_pos;
-	int16_t		bindex;
-	uint8_t		flags;
-	uint8_t		pad;
-	uint32_t	generation;
-} __aligned(8);
-
-struct au_rdu_ent {
-	uint64_t	ino;
-	int16_t		bindex;
-	uint8_t		type;
-	uint8_t		nlen;
-	uint8_t		wh;
-	char		name[0];
-} __aligned(8);
-
-static inline int au_rdu_len(int nlen)
-{
-	/* include the terminating NULL */
-	return ALIGN(sizeof(struct au_rdu_ent) + nlen + 1,
-		     sizeof(uint64_t));
-}
-
-union au_rdu_ent_ul {
-	struct au_rdu_ent	*e;
-	uint64_t			ul;
-};
-
-enum {
-	AufsCtlRduV_SZ,
-	AufsCtlRduV_End
-};
-
-struct aufs_rdu {
-	/* input */
-	union {
-		uint64_t	sz;	/* AuCtl_RDU */
-		uint64_t	nent;	/* AuCtl_RDU_INO */
-	};
-	union au_rdu_ent_ul	ent;
-	uint16_t		verify[AufsCtlRduV_End];
-
-	/* input/output */
-	uint32_t		blk;
-
-	/* output */
-	union au_rdu_ent_ul	tail;
-	/* number of entries which were added in a single call */
-	uint64_t		rent;
-	uint8_t			full;
-	uint8_t			shwh;
-
-	struct au_rdu_cookie	cookie;
-} __aligned(8);
-
-/* ---------------------------------------------------------------------- */
-
-struct aufs_wbr_fd {
-	uint32_t	oflags;
-	int16_t		brid;
-} __aligned(8);
-
-/* ---------------------------------------------------------------------- */
-
-struct aufs_ibusy {
-	uint64_t	ino, h_ino;
-	int16_t		bindex;
-} __aligned(8);
-
-/* ---------------------------------------------------------------------- */
-
-/* error code for move-down */
-/* the actual message strings are implemented in aufs-util.git */
-enum {
-	EAU_MVDOWN_OPAQUE = 1,
-	EAU_MVDOWN_WHITEOUT,
-	EAU_MVDOWN_UPPER,
-	EAU_MVDOWN_BOTTOM,
-	EAU_MVDOWN_NOUPPER,
-	EAU_MVDOWN_NOLOWERBR,
-	EAU_Last
-};
-
-/* flags for move-down */
-#define AUFS_MVDOWN_DMSG	1
-#define AUFS_MVDOWN_OWLOWER	(1 << 1)	/* overwrite lower */
-#define AUFS_MVDOWN_KUPPER	(1 << 2)	/* keep upper */
-#define AUFS_MVDOWN_ROLOWER	(1 << 3)	/* do even if lower is RO */
-#define AUFS_MVDOWN_ROLOWER_R	(1 << 4)	/* did on lower RO */
-#define AUFS_MVDOWN_ROUPPER	(1 << 5)	/* do even if upper is RO */
-#define AUFS_MVDOWN_ROUPPER_R	(1 << 6)	/* did on upper RO */
-#define AUFS_MVDOWN_BRID_UPPER	(1 << 7)	/* upper brid */
-#define AUFS_MVDOWN_BRID_LOWER	(1 << 8)	/* lower brid */
-#define AUFS_MVDOWN_FHSM_LOWER	(1 << 9)	/* find fhsm attr for lower */
-#define AUFS_MVDOWN_STFS	(1 << 10)	/* req. stfs */
-#define AUFS_MVDOWN_STFS_FAILED	(1 << 11)	/* output: stfs is unusable */
-#define AUFS_MVDOWN_BOTTOM	(1 << 12)	/* output: no more lowers */
-
-/* index for move-down */
-enum {
-	AUFS_MVDOWN_UPPER,
-	AUFS_MVDOWN_LOWER,
-	AUFS_MVDOWN_NARRAY
-};
-
-/*
- * additional info of move-down
- * number of free blocks and inodes.
- * subset of struct kstatfs, but smaller and always 64bit.
- */
-struct aufs_stfs {
-	uint64_t	f_blocks;
-	uint64_t	f_bavail;
-	uint64_t	f_files;
-	uint64_t	f_ffree;
-};
-
-struct aufs_stbr {
-	int16_t			brid;	/* optional input */
-	int16_t			bindex;	/* output */
-	struct aufs_stfs	stfs;	/* output when AUFS_MVDOWN_STFS set */
-} __aligned(8);
-
-struct aufs_mvdown {
-	uint32_t		flags;			/* input/output */
-	struct aufs_stbr	stbr[AUFS_MVDOWN_NARRAY]; /* input/output */
-	int8_t			au_errno;		/* output */
-} __aligned(8);
-
-/* ---------------------------------------------------------------------- */
-
-union aufs_brinfo {
-	/* PATH_MAX may differ between kernel-space and user-space */
-	char	_spacer[4096];
-	struct {
-		int16_t	id;
-		int	perm;
-		char	path[0];
-	};
-} __aligned(8);
-
-/* ---------------------------------------------------------------------- */
-
-#define AuCtlType		'A'
-#define AUFS_CTL_RDU		_IOWR(AuCtlType, AuCtl_RDU, struct aufs_rdu)
-#define AUFS_CTL_RDU_INO	_IOWR(AuCtlType, AuCtl_RDU_INO, struct aufs_rdu)
-#define AUFS_CTL_WBR_FD		_IOW(AuCtlType, AuCtl_WBR_FD, \
-				     struct aufs_wbr_fd)
-#define AUFS_CTL_IBUSY		_IOWR(AuCtlType, AuCtl_IBUSY, struct aufs_ibusy)
-#define AUFS_CTL_MVDOWN		_IOWR(AuCtlType, AuCtl_MVDOWN, \
-				      struct aufs_mvdown)
-#define AUFS_CTL_BRINFO		_IOW(AuCtlType, AuCtl_BR, union aufs_brinfo)
-#define AUFS_CTL_FHSM_FD	_IOW(AuCtlType, AuCtl_FHSM_FD, int)
-
-#endif /* __AUFS_TYPE_H__ */
diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
index 1e8677574..66f560c37 100644
--- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
+++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb
@@ -4,37 +4,40 @@ HOMEPAGE = "http://aufs.sourceforge.net/"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
 
-DEPENDS = "aufs-util-native"
+DEPENDS = "coreutils-native aufs-util-native"
 DEPENDS_class-native = ""
 
-SRCREV = "bdfcc0dcfc6113146e928f85145dbd2cf9b0e080"
-SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs3.18 \
+SRCREV = "89afb1806c3d2eed8db2666ae254b77518ae3ceb"
+SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.4 \
+           https://raw.githubusercontent.com/sfjro/aufs4-linux/aufs4.4/include/uapi/linux/aufs_type.h;name=aufs_type \
            file://aufs-util-don-t-strip-executables.patch \
            file://aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch \
-           file://aufs_type.h \
 "
+SRC_URI[aufs_type.md5sum] = "f7b4a255dcb55fe7b0967f5f59b44f19"
+SRC_URI[aufs_type.sha256sum] = "85bc8e4c1a94a7d526c382e4b047b4256cab8c4a65fc0396291707ad9a327a18"
 
-PV = "3.14+git${SRCPV}"
+PV = "4.4+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
 export HOSTCC = "${BUILD_CC}"
-
 do_configure_prepend() {
    # Replace sbin,bin paths with bitbake environment
    sed -i -e 's;install_sbin: Tgt = ${DESTDIR}/sbin;install_sbin: Tgt = ${DESTDIR}/${base_sbindir};' \
           -e 's;install_ubin: Tgt = ${DESTDIR}/usr/sbin;install_sbin: Tgt = ${DESTDIR}/${bindir};' \
 	  ${S}/Makefile
+   sed -i -e 's;strip -R;${STRIP} -R;' ${S}/libau/Makefile
 }
 
 do_configure_append () {
     install -d ${S}/include/linux/
     cp ${WORKDIR}/aufs_type.h ${S}/include/linux/
+    sed -i -e 's;__user;;' ${S}/include/linux/aufs_type.h
 }
 
 do_configure_append_class-target () {
     for i in ver c2sh c2tmac; do
-        cp ${STAGING_BINDIR_NATIVE}/aufs-util-*/$i ${B}
+        cp ${STAGING_BINDIR_NATIVE}/aufs-util-${PV}/$i ${B}
     done
 }