From patchwork Sun Apr 6 09:29:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 337248 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 3779B1400C0 for ; Sun, 6 Apr 2014 19:29:32 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C649089F42; Sun, 6 Apr 2014 09:29:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zL59fRo2+Ftk; Sun, 6 Apr 2014 09:29:31 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 360528948F; Sun, 6 Apr 2014 09:29:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A02DF1C22FB for ; Sun, 6 Apr 2014 09:29:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9A86D8948F for ; Sun, 6 Apr 2014 09:29:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o-tPUVIKpIHe for ; Sun, 6 Apr 2014 09:29:28 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [212.27.42.5]) by hemlock.osuosl.org (Postfix) with ESMTP id 4DA22893C1 for ; Sun, 6 Apr 2014 09:29:26 +0000 (UTC) Received: from localhost.localdomain (unknown [81.57.22.125]) by smtp5-g21.free.fr (Postfix) with ESMTP id EB580D4802A; Sun, 6 Apr 2014 11:29:21 +0200 (CEST) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 6 Apr 2014 11:29:12 +0200 Message-Id: <1396776553-7064-1-git-send-email-romain.naour@openwide.fr> X-Mailer: git-send-email 1.9.0 Subject: [Buildroot] [PATCH 1/2] util-linux: unshare: include libmount.h to provide missing MS_* defines X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net upstream patch: d754315c54af9cb8222e0a04ed5b2b4b927ed176 Signed-off-by: Romain Naour --- ...util-linux-003-unshare-include-libmount.h.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/util-linux/util-linux-003-unshare-include-libmount.h.patch diff --git a/package/util-linux/util-linux-003-unshare-include-libmount.h.patch b/package/util-linux/util-linux-003-unshare-include-libmount.h.patch new file mode 100644 index 0000000..5ccfe7d --- /dev/null +++ b/package/util-linux/util-linux-003-unshare-include-libmount.h.patch @@ -0,0 +1,44 @@ +From d754315c54af9cb8222e0a04ed5b2b4b927ed176 Mon Sep 17 00:00:00 2001 +From: Ruediger Meier +Date: Mon, 17 Mar 2014 11:48:47 +0100 +Subject: [PATCH 1/1] unshare: include libmount.h to provide missing MS_* + defines + +Since 6728ca10 we are using MS_PRIVATE and MS_REC which are not defined +in some systems's sys/mount.h. + +Signed-off-by: Ruediger Meier +--- + sys-utils/Makemodule.am | 1 + + sys-utils/unshare.c | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am +index 30b5d3e..93a2c8d 100644 +--- a/sys-utils/Makemodule.am ++++ b/sys-utils/Makemodule.am +@@ -296,6 +296,7 @@ usrbin_exec_PROGRAMS += unshare + dist_man_MANS += sys-utils/unshare.1 + unshare_SOURCES = sys-utils/unshare.c + unshare_LDADD = $(LDADD) libcommon.la ++unshare_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) + endif + + if BUILD_NSENTER +diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c +index 91e0ec7..1240293 100644 +--- a/sys-utils/unshare.c ++++ b/sys-utils/unshare.c +@@ -27,6 +27,9 @@ + #include + #include + ++/* we only need some defines missing in sys/mount.h, no libmount linkage */ ++#include ++ + #include "nls.h" + #include "c.h" + #include "closestream.h" +-- +1.9.0 +