Message ID | 20230127135755.79929-26-mathieu.desnoyers@efficios.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp848421wrn; Fri, 27 Jan 2023 06:02:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXuDCchLuj+06xwb9NXhttcuOCA1zUSCuOqmL4KHr33WH3AEij2U6/otJFJWBRMOtF6uNZfm X-Received: by 2002:a17:906:5d1:b0:861:7a02:1046 with SMTP id t17-20020a17090605d100b008617a021046mr38927150ejt.37.1674828170027; Fri, 27 Jan 2023 06:02:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674828170; cv=none; d=google.com; s=arc-20160816; b=H5tJL09a4E/KPXOmDn39WcEU/lxtJaojg4XIHo/d1hF1mqpp9vkd42+cVOWb/Gbnz2 XCDHu6tJVjt6p3aPx4QLuhG68Wk8x4nD7GSZErE1sxxtgychthAC215U0Zug8fwo6l3K LscZGp3q2UIEzB2DLjS1vGWlBUkHnzdD5D4TC8IkkG1aV+QHxBsFIV2ghOaHq4ULpV2i 97ZW/zOlBisJvwCjTBN68etQnhWilVTbB2yS9E6IAYYcCyxS2R2fUpaMlHYMPUbjj0WU thgXnHpaM0uVZJfV5ZPWO3t36wkedSycze4Dm3/Ty3zY2YzaXnpf2yoZ1qjh0EfY9Jbx 3qmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pqF86ssJCgEWFjirbgepgs66Y2pRV8azR+UH4AXMyxE=; b=o0NZzQh2NiQrZO9WwWBn0rMXdDyWkv1RkKJpkVk6kKrV6K18dAR2ukH001BbqVw8fO uFicWOR9VobU55RYu56I7K/mKG8tLt4cemihI5EQTLKTfJ1ugI6c+v1HXBTtuu1HV05u r1awUAiyAKt1k+Ib7s5/lJY+ZwoAYJGhOd/DuTdetATcj3iakubKWBl4JkDuTOUcdB/C 1Ky5Mz2BnkaHNseXrWrG+LO6OQzqPOod1v+sJ2eZaMiAK8ygRBuTIZ+t50zrWm/FeiPX YO87sn/N9kNPJohMNJDfivvHzbmYCQoZJ/TFiglMCLVHrKr4c/lDoHF9Im5x+PR6MtHJ T13g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=MyoTFkvb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=efficios.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m7-20020a170906848700b0086fb8469f4csi5071377ejx.191.2023.01.27.06.02.16; Fri, 27 Jan 2023 06:02:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@efficios.com header.s=smtpout1 header.b=MyoTFkvb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=efficios.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234800AbjA0N7f (ORCPT <rfc822;lekhanya01809@gmail.com> + 99 others); Fri, 27 Jan 2023 08:59:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233867AbjA0N61 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 27 Jan 2023 08:58:27 -0500 Received: from smtpout.efficios.com (smtpout.efficios.com [167.114.26.122]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6011CDE7; Fri, 27 Jan 2023 05:58:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1674827886; bh=G+eF3FqXFX/xd2Tp8up6FJ8ZvO4HTETfOik4EAwTn4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MyoTFkvbD5J97DBzlWDHV5OUvfm/2PieEl5l0yUvk2X3hYYbS6H06c2FPDvK58U9u L3mztiHjst/3fx1yJsY7cvvGIIrURB/ygxWC0kt5Spx4a08uQsGEj/ayMHSDTRC12c 8N6fbPSK/RAacHHz+CEcSjMmVGvLdtnmgMvZ7Gr4A+YMSd4kywfPVBytdwDLBexw7n jeOe6HS84KogvuZwE8e3P4Sdr3wRiepMvwwZQ524Dd9at02202n9aDSV4KkcrgRl/D +Ygj0D1OFyWUCahXWVhrvTjXgLbJKxkkT0Udk3SR4N3vRrXD6mXkbMysT0YyhfvvRK 6L8ms5SmbNA5w== Received: from localhost.localdomain (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4P3K0Z363bzhT9; Fri, 27 Jan 2023 08:58:06 -0500 (EST) From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> To: Shuah Khan <shuah@kernel.org>, linux-kselftest@vger.kernel.org, Ingo Molnar <mingo@redhat.com> Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers <mathieu.desnoyers@efficios.com>, stable@vger.kernel.org Subject: [PATCH 25/34] selftests: seccomp: Fix incorrect kernel headers search path Date: Fri, 27 Jan 2023 08:57:46 -0500 Message-Id: <20230127135755.79929-26-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230127135755.79929-1-mathieu.desnoyers@efficios.com> References: <20230127135755.79929-1-mathieu.desnoyers@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756184623378662957?= X-GMAIL-MSGID: =?utf-8?q?1756184623378662957?= |
Series |
selftests: Fix incorrect kernel headers search path
|
|
Commit Message
Mathieu Desnoyers
Jan. 27, 2023, 1:57 p.m. UTC
Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents
building against kernel headers from the build environment in scenarios
where kernel headers are installed into a specific output directory
(O=...).
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: linux-kselftest@vger.kernel.org
Cc: Ingo Molnar <mingo@redhat.com>
Cc: <stable@vger.kernel.org> [5.18+]
---
tools/testing/selftests/seccomp/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 1/27/23 06:57, Mathieu Desnoyers wrote: > Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents > building against kernel headers from the build environment in scenarios > where kernel headers are installed into a specific output directory > (O=...). > > Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> > Cc: Shuah Khan <shuah@kernel.org> > Cc: linux-kselftest@vger.kernel.org > Cc: Ingo Molnar <mingo@redhat.com> > Cc: <stable@vger.kernel.org> [5.18+] > --- > tools/testing/selftests/seccomp/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/seccomp/Makefile b/tools/testing/selftests/seccomp/Makefile > index f017c382c036..584fba487037 100644 > --- a/tools/testing/selftests/seccomp/Makefile > +++ b/tools/testing/selftests/seccomp/Makefile > @@ -1,5 +1,5 @@ > # SPDX-License-Identifier: GPL-2.0 > -CFLAGS += -Wl,-no-as-needed -Wall -isystem ../../../../usr/include/ > +CFLAGS += -Wl,-no-as-needed -Wall $(KHDR_INCLUDES) > LDFLAGS += -lpthread > LDLIBS += -lcap > Now the right one. Kees, I plan to take this through kselftest unless there are conflicts. In case there are conflicts and you want to take this through yours Acked-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
diff --git a/tools/testing/selftests/seccomp/Makefile b/tools/testing/selftests/seccomp/Makefile index f017c382c036..584fba487037 100644 --- a/tools/testing/selftests/seccomp/Makefile +++ b/tools/testing/selftests/seccomp/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -CFLAGS += -Wl,-no-as-needed -Wall -isystem ../../../../usr/include/ +CFLAGS += -Wl,-no-as-needed -Wall $(KHDR_INCLUDES) LDFLAGS += -lpthread LDLIBS += -lcap