From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC284C83F22 for ; Thu, 17 Jul 2025 08:49:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3BB6C8D0010; Thu, 17 Jul 2025 04:49:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 344EE8D0011; Thu, 17 Jul 2025 04:49:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20CDC8D0010; Thu, 17 Jul 2025 04:49:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id E5EB18D0011 for ; Thu, 17 Jul 2025 04:49:01 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A8B8FBAA2B for ; Thu, 17 Jul 2025 08:49:01 +0000 (UTC) X-FDA: 83673131682.11.4C44D75 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by imf09.hostedemail.com (Postfix) with ESMTP id BD67D140007 for ; Thu, 17 Jul 2025 08:48:59 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=F1UQYxFL; dkim=pass header.d=linutronix.de header.s=2020e header.b=ejZx2Edt; dmarc=pass (policy=none) header.from=linutronix.de; spf=pass (imf09.hostedemail.com: domain of t-8ch@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=t-8ch@linutronix.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752742140; a=rsa-sha256; cv=none; b=DIKBgzsKZ9Z7zrR6DYmWuHxAEGQskkEKkE5/cnXv2tY3xoIpa+1Aos7dMb2wuqLbKuldTN rFnIFOxq7E7FVPkc4a98apwrru0GxNO2PRlxHglEW0bPXfrQS1GfXaYZ3Hlqdb+bI/tOiq jicYDOdmKlWllqMqOMT2llXaxV1QzeQ= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=F1UQYxFL; dkim=pass header.d=linutronix.de header.s=2020e header.b=ejZx2Edt; dmarc=pass (policy=none) header.from=linutronix.de; spf=pass (imf09.hostedemail.com: domain of t-8ch@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=t-8ch@linutronix.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1752742140; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3coL6itBSAQiKwOZXEjAxfGw4ky2lWtS9inL/ixAlLY=; b=xiUpx+YhMAMF9MMIJCUIEd1uonAkG5t4ck3HG8hc1/pamga0E3yTFSL6iGMc6JLHQOPrns QuuvJx6a0TmWsEV2NgUOwqLfoWKZPfgAp6w7jsaS94+cpPJGA8qKwwdc7+ulEjPjfusm94 YHQelkeeYw0qlT980FRMMBvG7Sr19tE= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1752742138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3coL6itBSAQiKwOZXEjAxfGw4ky2lWtS9inL/ixAlLY=; b=F1UQYxFLM4xqtBPz2jcxDiS0tjJxXXbaK5ry92KcFGkZrYMhcDwnMzbLGiSaKQJlc0JVR5 WOtGizERh75cEMjXTSZxju/Jh397Fejsgz28E9X+P1OAajMabZF5vh+yvxQmB0OhPgMkzt dlpvHkd06JjvU/Bt3KZOjTW6zYVdoQYmbuhV7gKp/8a+iE7RIyHJap/BHDJnw7fcJ1qgGk OtCE9nXGlyzXLTL72A/zd0t9hEJCrKqLODy7otvj09z66zgEjotryz35Y1SfE+niQ04ndO pYBGtAYHUtRBfLyDPnmo209OnCoJG1GFA4jLmkfl4O7+yxbrQENHqDMu1g3FZg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1752742138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3coL6itBSAQiKwOZXEjAxfGw4ky2lWtS9inL/ixAlLY=; b=ejZx2EdtueEVmba6KbH+m9aPZYYWPrL0kWz1728k/DLtzcvoMwUSPs/Xo9GRvHhVkXg2ar kRhnIJhFdtOqRJAA== Date: Thu, 17 Jul 2025 10:48:12 +0200 Subject: [PATCH v5 10/15] kunit: Always descend into kunit directory during build MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20250717-kunit-kselftests-v5-10-442b711cde2e@linutronix.de> References: <20250717-kunit-kselftests-v5-0-442b711cde2e@linutronix.de> In-Reply-To: <20250717-kunit-kselftests-v5-0-442b711cde2e@linutronix.de> To: Masahiro Yamada , Nathan Chancellor , Andrew Morton , Willy Tarreau , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , Brendan Higgins , David Gow , Rae Moar , Shuah Khan , Jonathan Corbet , Nicolas Schier , Kees Cook , Alexander Viro , Christian Brauner , Jan Kara , Christoph Hellwig , Luis Chamberlain Cc: Christophe Leroy , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-doc@vger.kernel.org, workflows@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , Nicolas Schier X-Developer-Signature: v=1; a=ed25519-sha256; t=1752742130; l=1601; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=uYbDX0tuhfBybp4zBtjmC97SEQNiCLwjFQ5JZf0se98=; b=bHyewFwHKAKDKekhXmQwKbW62825yb2xHBgjfNAFCj4wxJ+UUeg7RzKadxfAdhpJsrB5VH68V 5z5qvKPS2cFCc3k0zres0QX9nsS4ZPOjCOOrfIvUwLl+EKtCklHOsQh X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: BD67D140007 X-Stat-Signature: k7p6b69eau4jk5f4xpt5ssomug3qtoh6 X-HE-Tag: 1752742139-774874 X-HE-Meta: U2FsdGVkX18Fw7tZZwcdaATw05dtjpY4v2WBWFhZmAkdP+5B90PvkIv3vyPYiW4xo6lMZnaOLe7u6WW/4f3hHXWRR8/BsA0HeOZZ1cDhFPA6C87tlNRMzpkFk8CeUAaaIn/WMBBAL76aiMzIqXmiDVxfyW5SkEQ4cTZ9SfPN9eHexnVD7Cy51SJRSTjhMq9iPp5ldWp3/JPWV9h4zO1P2UXrHBf9TSaGbzeUrkSoD9ieEG0JBgGssIM7sVVU1NEApxalUmd2cysRR1ZdRicIQMCJWPijOeMgB2J3YR52JhyXphk7e3LDp+5sxIM3/i6s09QIH3PONeoEDuJ1rBAo8WiluKQvTPRbxTXQskOb9KNwWTkU3a53WKktWGsVaG9p4DACw9nyXK3x5tUCpdot791CDOe/eTOnglIstMAuclI0xyH1ysfMTSDvzcIlkn48iqWYdn4vA5LCDvv6MsH6TEorM5BTxIYIy8CZsAKTx3IuJl7Ps3s5YRNAvHzruh6Z7nQ70Lrr5f1PYm6RMsy5126jDih6PHm7bvtXDb2PTZh8ykHNg1ys/21YiP6wb8Nwc2lI5LH1T/71CmZNMNjb88QGdCPVDZPTZBFJlv+YUV2rBYH71th/ZtVoTSbMrzbki8ePleNWVMzncAarzbSl2D7eNT4luq9cCSmgOqhfXaO5HJFHNYOQusG3h+uv1ecVq+noFnIuWTxDawRV3kN7rfSPzHnr5zwl4UQaalbYOyc7/gufKdta78DjVy+uBo4/GffoeYwOBqmV5HMVVjA/RZ31A8FCRmZl0z5KlPLIg9WdNtQecwJJxhuQaTEka7ruT6qGf2U1DqLl7TvLneqZmINw9pSUrQLhiung+HRLcvPEJH44hW3tO7O/xOk4PhTlK/nFCTxTYB80BGcCK3eDnU2AOzk5GoscXdtD3oorwlwQ3yL/5gro+nBiUUs2xyK5itk2fPZnnQJBOWgfAZg O7NiNZx9 oSNGrs4dWdGODuj0dgd9rGeVwtRvogau8UST/CHBfcQbOxlI84wgmqqrzsGOnO6LBymWs02kWCFi1lerqFlPdzPmigqXBaE3rOv+RwcU+NTW3ykwqs82hpKvGm0rIgyw0iuVPETlSQpa7iJTuzEMB0ErR7eFNpNaMlqwLlWVTetPBpqwN3snHRqIRTC7XzI53io01qLgCahe41QxkNY24c69Crc/k92eOyLeZV3jhF+snW/Gykov7xyrMmVjYf8qXS14W6wedEW+MNZHCpRecgcGzKpBEMTmfmIz2vc9ThmwwJWwbOXIjTL696w0QNXBeXtl1w+XGjRMlJlEb6uGRKl2CmoLELcjlsSswCfNfzVrH8kw8CNRwQooLA6gReZAH14u+1CYAjodt6Y7oxaF66643kz18hmnIEaCtjgl7v3J+0fTrQQhVPH9qsx165L6Cu0E6tgy5N8e9qJ3BT0nyS15wyyD1nPyIYRZI3ZTz2iE0TXkcOC/XEUFIIweFOhIbETB+ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: An upcoming change will add 'userprogs' to the kunit subdirectory. For kbuild to properly clean up these build artifacts the subdirectory needs to be always processed. Pushing the special logic for hook.o into the kunit Makefile also makes the logic easier to understand. Signed-off-by: Thomas Weißschuh Reviewed-by: David Gow --- lib/Makefile | 4 ---- lib/kunit/Makefile | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index c38582f187dd81916113319072e5cfef26f26c84..698566135091cc3bf0054f1954b434dc3325364a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -108,11 +108,7 @@ test_fpu-y := test_fpu_glue.o test_fpu_impl.o CFLAGS_test_fpu_impl.o += $(CC_FLAGS_FPU) CFLAGS_REMOVE_test_fpu_impl.o += $(CC_FLAGS_NO_FPU) -# Some KUnit files (hooks.o) need to be built-in even when KUnit is a module, -# so we can't just use obj-$(CONFIG_KUNIT). -ifdef CONFIG_KUNIT obj-y += kunit/ -endif ifeq ($(CONFIG_DEBUG_KOBJECT),y) CFLAGS_kobject.o += -DDEBUG diff --git a/lib/kunit/Makefile b/lib/kunit/Makefile index 5aa51978e456ab3bb60c12071a26cf2bdcb1b508..656f1fa35abcc635e67d5b4cb1bc586b48415ac5 100644 --- a/lib/kunit/Makefile +++ b/lib/kunit/Makefile @@ -17,7 +17,7 @@ kunit-objs += debugfs.o endif # KUnit 'hooks' are built-in even when KUnit is built as a module. -obj-y += hooks.o +obj-$(if $(CONFIG_KUNIT),y) += hooks.o obj-$(CONFIG_KUNIT_TEST) += kunit-test.o obj-$(CONFIG_KUNIT_TEST) += platform-test.o -- 2.50.0