From patchwork Sun Jul 13 18:42:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 4541871 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 86039C0515 for ; Sun, 13 Jul 2014 18:44:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB2A92010F for ; Sun, 13 Jul 2014 18:44:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D24062015E for ; Sun, 13 Jul 2014 18:44:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751601AbaGMSni (ORCPT ); Sun, 13 Jul 2014 14:43:38 -0400 Received: from asavdk4.altibox.net ([109.247.116.15]:60644 "EHLO asavdk4.altibox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751509AbaGMSn2 (ORCPT ); Sun, 13 Jul 2014 14:43:28 -0400 Received: from localhost (localhost [127.0.0.1]) by asavdk4.altibox.net (Postfix) with ESMTP id D15C080094; Sun, 13 Jul 2014 20:43:25 +0200 (CEST) Received: from asavdk4.altibox.net ([127.0.0.1]) by localhost (asavdk4.lysetele.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id xKSLlJBl9_qN; Sun, 13 Jul 2014 20:43:25 +0200 (CEST) Received: from merkur.lyse.net (unknown [188.228.89.252]) by asavdk4.altibox.net (Postfix) with ESMTP id 3441C800A1; Sun, 13 Jul 2014 20:43:25 +0200 (CEST) From: Sam Ravnborg To: Michal Marek , linux-kbuild Cc: lkml , Thierry Reding , Stephen Rothwell , David Herrmann , Jiri Kosina , Sam Ravnborg Subject: [PATCH 3/6] samples: use uapiprogs support for seccomp Date: Sun, 13 Jul 2014 20:42:51 +0200 Message-Id: <1405276974-17323-3-git-send-email-sam@ravnborg.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405276974-17323-1-git-send-email-sam@ravnborg.org> References: <20140713183636.GA17241@ravnborg.org> <1405276974-17323-1-git-send-email-sam@ravnborg.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reduce complexity of seccomp Makefile by introducing use of uapiprogs support. Build testet with i686 only. Signed-off-by: Sam Ravnborg --- samples/Makefile | 2 +- samples/seccomp/Makefile | 48 ++---------------------------------------------- 2 files changed, 3 insertions(+), 47 deletions(-) diff --git a/samples/Makefile b/samples/Makefile index 7c08028..b4d7d66 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -11,5 +11,5 @@ obj-$(CONFIG_SAMPLES) += rpmsg/ obj-$(CONFIG_SAMPLES) += kdb/ # user space programs -obj-$(CONFIG_SAMPLES) += seccomp/ +subdir-$(CONFIG_SAMPLES) += seccomp obj-$(CONFIG_SAMPLES) += hidraw/ diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile index 1b4e4b8..8f11cf4 100644 --- a/samples/seccomp/Makefile +++ b/samples/seccomp/Makefile @@ -1,48 +1,4 @@ -# kbuild trick to avoid linker error. Can be omitted if a module is built. -obj- := dummy.o +uapiprogs-$(CONFIG_SECCOMP_FILTER) := bpf-fancy dropper bpf-direct -hostprogs-$(CONFIG_SECCOMP_FILTER) := bpf-fancy dropper bpf-direct +bpf-fancy-y := bpf-fancy.o bpf-helper.o -HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include -HOSTCFLAGS_bpf-fancy.o += -idirafter $(objtree)/include -HOSTCFLAGS_bpf-helper.o += -I$(objtree)/usr/include -HOSTCFLAGS_bpf-helper.o += -idirafter $(objtree)/include -bpf-fancy-objs := bpf-fancy.o bpf-helper.o - -HOSTCFLAGS_dropper.o += -I$(objtree)/usr/include -HOSTCFLAGS_dropper.o += -idirafter $(objtree)/include -dropper-objs := dropper.o - -HOSTCFLAGS_bpf-direct.o += -I$(objtree)/usr/include -HOSTCFLAGS_bpf-direct.o += -idirafter $(objtree)/include -bpf-direct-objs := bpf-direct.o - -# Try to match the kernel target. -ifndef CROSS_COMPILE -ifndef CONFIG_64BIT - -# s390 has -m31 flag to build 31 bit binaries -ifndef CONFIG_S390 -MFLAG = -m32 -else -MFLAG = -m31 -endif - -HOSTCFLAGS_bpf-direct.o += $(MFLAG) -HOSTCFLAGS_dropper.o += $(MFLAG) -HOSTCFLAGS_bpf-helper.o += $(MFLAG) -HOSTCFLAGS_bpf-fancy.o += $(MFLAG) -HOSTLOADLIBES_bpf-direct += $(MFLAG) -HOSTLOADLIBES_bpf-fancy += $(MFLAG) -HOSTLOADLIBES_dropper += $(MFLAG) -endif -always := $(hostprogs-y) -else -# MIPS system calls are defined based on the -mabi that is passed -# to the toolchain which may or may not be a valid option -# for the host toolchain. So disable tests if target architecture -# is MIPS but the host isn't. -ifndef CONFIG_MIPS -always := $(hostprogs-y) -endif -endif