From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7135916668117581824 X-Received: by 2002:a67:e99a:0:b0:390:1d2a:7fa2 with SMTP id b26-20020a67e99a000000b003901d2a7fa2mr2450160vso.82.1661460070844; Thu, 25 Aug 2022 13:41:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a67:c912:0:b0:390:8f30:3770 with SMTP id w18-20020a67c912000000b003908f303770ls519127vsk.7.-pod-prod-gmail; Thu, 25 Aug 2022 13:41:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR5TSxTzvpk93+3EHfSs7GSjfbn2tft+Jd7m1Cz88U/9vrZoieLidpJSXh9TYqojH18HIBht X-Received: by 2002:a67:fd55:0:b0:390:66fd:d7d7 with SMTP id g21-20020a67fd55000000b0039066fdd7d7mr2338201vsr.53.1661460070220; Thu, 25 Aug 2022 13:41:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1661460070; cv=pass; d=google.com; s=arc-20160816; b=LEPBdepUKo2IsnGRQq/38wCkf+YEZIS4aroKBzcbXXY5CWieT232lfzvzJjC4bUivZ o0uw8QWxtXo7O6OprwPfDOnunpvXFRb+tfw9rXwWDMWshvH1o0zPCW/3354b3vys+xIJ N4FTYYsHvQVq1tWMkAuWQhvGgmpP8y22dAcpfbqfABWBvQcN15e51j6T381fjLgxHJDl wTwnutwK/amqp/NPglj/QOtUSHHD0sPsy8Cf39yqXvecGVjoEPuOXX6nAi54hc0JO3wB p88t+giLTXmjLEg2zqW5bbGRjfzkkkKwnR1Uyn3BzilFoAtsM+9CFcvsN7mtabqMJ123 7ihw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=UbzErhZW28s3mK93uQAVEqCSIpKf48tZWnCrMIQRxOk=; b=ZaLmPHX+e5kM9NDBdpXs+4v9iPcRJyJr02s12eY2cuF+/f7QtUPboJ5QI5G/aAuNhv /rrCO3m9fSCgK2saIW4wFO5JfNYsOWNAHN0qGdaswERJirELlJ245UsT/b8OC/3/CVxb eq/9T2FgqqSyLo5yGzVbGuJKhXzzFVOGZoEtMuxbuDF184auTn1ayKCSQvC0DdOarIOI uyQ9NRYgzUwvXWcCN/nDyGJOfb81uM78Pi7gj/UXkVCE/4Pc3GS7Dvc7uCUBZlq0Wcxl 097IDYQ9OHqXLtI69keC7LN6cKm4o9gtAhFYQgqfwXJUkn+hSNojthmwEagl9vX6GzmF AKVQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LJ2y4Wx+; arc=pass (i=1); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.1.81 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10081.outbound.protection.outlook.com. [40.107.1.81]) by gmr-mx.google.com with ESMTPS id ba12-20020a056130040c00b0039e116d4009si69282uab.0.2022.08.25.13.41.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Aug 2022 13:41:10 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.1.81 as permitted sender) client-ip=40.107.1.81; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LJ2y4Wx+; arc=pass (i=1); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.1.81 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bLRYtqccLjI0LUlU7W3XA2Hl2gh1/q41oTXWGawg2zzWZEc05HiUdO3bUnuGfYxFvgtT4/eO7u2pFGg7YA700oWNZ+1uRlRYzjE26qXv85c0iaDvuk2ZPT6DeyTBpSyrksK7PDF0k2DIL4Wyw32ClUTOpF+DHNHTIXGYKjrmKQde2Dcp/4tJf/9blUxcbzCVUR6lCt6ohN9vHeukPgmnp/+WMqBgK66o53UG5GMxhhSynW+ADYFqKSSxep7+Q1YZIUpgwA0+yoh3E8g30xz2x5/xivyEA1TRzPWhbgeNTdexwq2hHEcPHoaYADwKfLNxrYZD/rkBzH/hRA2cwRCc3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UbzErhZW28s3mK93uQAVEqCSIpKf48tZWnCrMIQRxOk=; b=NAzQSFpLKRm2DGQQ9qZefxe+o0wWZSD2YtYNtT+dZsXh1hBU5lFsJzUuu5pw08kLLP9YbHuymAYtktFUZ4j3dyPuPzCe9ZI1TYVfUDjqnIVgkvDRh/9vpfgW0UtCZt/8ZGPsgyK/AdLSCAfPvbGTxDMjgYs/Y/d5wB8/eMXyUbhv4TylXy4bCXvhipC1yefG6riwgDzrIjy1CGBVxswuiVK/XH4cq6+zjJQ6egOH85ZOpvuM/WBA6mYUcWDDksxgWlQZvRZ9GZiwmV/pbruJXt/3khReXfE9b0614i3JMLOkNXRA4dBXS52XVnidsQDl/8KDTi7BIJthUgZ3zQ2dww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is 194.138.21.74) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=fail (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UbzErhZW28s3mK93uQAVEqCSIpKf48tZWnCrMIQRxOk=; b=LJ2y4Wx+oliJwth8HOZ+VKp6AESSbtTTtzm044p/fozZqxRNOi/MmLxnhvoQLtefekaAARahrH50VuJWIypSlF41cLTVAKwn2EhBBoKAnsserurE7tmS7v2Knwkiz+MSs20EmoeAMHj1u/Pt7Yc04i3mF5orvyMVy2rN8fCg1SBhOySAMVV06h1bJL7iOQw8Hzyf5FtiItQIXb7SaB25W1vKok/7DX1fSI8CvGzmRLzeJI0Oos2Uk/XjrV1vv5nPSQRTlFI2XxA64qAOJrehLLNLA6ZQmRXcnL2+Z4Ja0KP9aSOkCnSKtz/birmc+iYVEdxKPMZMi0mBspcGkRuWjQ== Received: from FR3P281CA0029.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::22) by GV2PR10MB7056.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:d0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Thu, 25 Aug 2022 20:41:06 +0000 Received: from VE1EUR01FT094.eop-EUR01.prod.protection.outlook.com (2603:10a6:d10:1c:cafe::9e) by FR3P281CA0029.outlook.office365.com (2603:10a6:d10:1c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.4 via Frontend Transport; Thu, 25 Aug 2022 20:41:06 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 194.138.21.74) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=fail action=none header.from=siemens.com; Received-SPF: Fail (protection.outlook.com: domain of siemens.com does not designate 194.138.21.74 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.74; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.74) by VE1EUR01FT094.mail.protection.outlook.com (10.152.3.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15 via Frontend Transport; Thu, 25 Aug 2022 20:41:05 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC8VQA.ad011.siemens.net (194.138.21.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.9; Thu, 25 Aug 2022 22:41:05 +0200 Received: from localhost.localdomain (139.22.41.253) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.9; Thu, 25 Aug 2022 22:41:04 +0200 From: Henning Schild To: isar-users CC: Henning Schild , Pingfang Liao Subject: [PATCH] linux-module: make sure out-of-tree modules win over built-in Date: Thu, 25 Aug 2022 22:40:52 +0200 Message-ID: <20220825204052.9151-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [139.22.41.253] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--9.268300-8.000000 X-TMASE-MatchedRID: AzQB5DSfejPlrBUldX2ZMUKLHhgm+q8+AIk5eA63C/mJUlmL3Uj0mOqh uTPUDQDtgS9jJPs0ndFQCsmfAegbdDc85+A6C1Ty6ZbECCN8N+snITjASO+40PFCD/XOqpSb2gp +A6golzZjjMm9SMavFXIozGa69omdrdoLblq9S5o28JDwRE8Tw72A/FG4DgnvLjsmuOashGLXof +XRfBH28LlYljmBfZco8WMkQWv6iXBcIE78YqRWo6HM5rqDwqtJyf4AP1B0tAFS/7Ccz9E5UNYf qq9ISTZcSY6E4tkyPmjNEHDWsInZEMMprcbiest X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--9.268300-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 4BF66272273FEDDC1AB8829E705ACDEA1083B42C0DC3235511CA3000CBB2BE1A2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8e41ff1-791a-4912-29f8-08da86da21fc X-MS-TrafficTypeDiagnostic: GV2PR10MB7056:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vjyEAwygIKl+WIWRcCQxdS2KTxa92vxqw5MArOVtn37FfM2CMj0oyoGcxORulu19hqGxkzuw3DZ1UBR5abMbjG8nEuD8xeJx/LSBIubMLvBHRQ+LPD1Q2a29bzilTz41nx+YE9iKRlqnGz1EPsddS1gATXYwDccmEmz3ofc5DaJLnUKNXn+teeVBHtKNSLBXUkmLhmbsR1uqd3FPjanOrue7sI6gN5maasJn8zh8xfafzNUgfRRl4RKOVizTUalMa1uTlxorGDpzdLV+u+4mTacW/gWZkEseEoTAsFIguHd9fnHmwIVpqSzGlJSdncj/kboK9rwL1pzt4BlyzKog6iTZDaux2eoh7w2t+qCrw3G8ruuo1//qbTdePyAnlW7gf1yfQ/2StP/MshaYARU1ZcL9shUKLH0bC8Ru3bdglFC4KEHudeUYm3jfVe81ZHAtq0vcr+wSno8p9bZS2J9I/gbGn/+OHOhTG6jJt+nseMWQjZATqkJ9DY8b/HfbWSyWMy15fnv2efCjIb6JHCOXdKFCjZLeAtzTFNFLRmaPQKJLCIcD49G6OQOo0Mi+7PAc5DM/vAs9WTVYSbfUvhIzhVRPrMNISb/7i4T+uW9z1KiFnJOXsULgEvdwajlAJveYzbLMarFBGDpFea4FCT7pDUi/mYDm/d04L940wK02kCGNIJ+NQq8es5I0wfGaVw0mdiuzIEBBDL+Vb1d4Q2lMAHbrUA2CIHVIDMtzwXPCAzhjqnWghoPeJl/D0YkX//xofq+iOSKmTmeFmDcDHtBN/w== X-Forefront-Antispam-Report: CIP:194.138.21.74;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230016)(4636009)(39860400002)(376002)(346002)(396003)(136003)(46966006)(40470700004)(36840700001)(356005)(83380400001)(7636003)(82960400001)(7596003)(36860700001)(82740400003)(40460700003)(70206006)(54906003)(8676002)(4326008)(82310400005)(70586007)(6916009)(316002)(2906002)(40480700001)(44832011)(8936002)(5660300002)(26005)(16526019)(47076005)(336012)(1076003)(2616005)(956004)(186003)(6666004)(41300700001)(107886003)(478600001)(86362001)(36756003);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Aug 2022 20:41:05.7044 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e8e41ff1-791a-4912-29f8-08da86da21fc X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.74];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT094.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR10MB7056 X-TUID: 3Kd/KyCi4hQ5 If we built an out of tree module that happens to be already part of the kernel, we want to make sure depmod prefers the external one. In order to do so simply include a config file into every module package, by default using the kernels default INSTALL_MOD_DIR which is "extra". Should there be multiple modules using different such directories, all recipes should set INSTALL_MOD_DIR listing them all in the desired order. That interface for multiple such very special modules is not nice but since they are pretty special it might be just good enough. Reported-by: Pingfang Liao Signed-off-by: Henning Schild --- meta/recipes-kernel/linux-module/files/debian/rules.tmpl | 1 + meta/recipes-kernel/linux-module/module.inc | 3 +++ 2 files changed, 4 insertions(+) diff --git a/meta/recipes-kernel/linux-module/files/debian/rules.tmpl b/meta/recipes-kernel/linux-module/files/debian/rules.tmpl index d3bd7dc30f21..abd3c88fac7e 100755 --- a/meta/recipes-kernel/linux-module/files/debian/rules.tmpl +++ b/meta/recipes-kernel/linux-module/files/debian/rules.tmpl @@ -55,6 +55,7 @@ override_dh_auto_build: override_dh_auto_install: $(MAKE) -C $(KDIR) M=$(PWD) INSTALL_MOD_PATH=$(PWD)/debian/${PN} modules_install + install -D -m 0644 $(PWD)/debian/${PN}.conf $(PWD)/debian/${PN}/usr/lib/depmod.d/${PN}.conf %: CFLAGS= LDFLAGS= dh $@ --parallel diff --git a/meta/recipes-kernel/linux-module/module.inc b/meta/recipes-kernel/linux-module/module.inc index b20ec32ae20a..475e7aef05ea 100644 --- a/meta/recipes-kernel/linux-module/module.inc +++ b/meta/recipes-kernel/linux-module/module.inc @@ -29,9 +29,12 @@ TEMPLATE_FILES = "debian/control.tmpl \ debian/rules.tmpl" TEMPLATE_VARS += "KERNEL_NAME KERNEL_TYPE KERNEL_IMAGE_PKG KERNEL_HEADERS_PKG DEBIAN_BUILD_DEPENDS PN" +INSTALL_MOD_DIR ?= "extra" + do_prepare_build() { cp -r ${WORKDIR}/debian ${S}/ + echo "search ${INSTALL_MOD_DIR} built-in" > ${S}/debian/${PN}.conf for module in ${AUTOLOAD}; do echo "echo $module >> /etc/modules" >> ${S}/debian/postinst done -- 2.35.1