From patchwork Sat Mar 15 15:15:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 14018071 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09AF217995E; Sat, 15 Mar 2025 15:15:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742051727; cv=none; b=hpubzHF7WcevpPzcOp79w0L/Njf6icEy2oCTZ0nmII88M4o23eA86+uEF1/KzLDVZgrcLnW6yVXARx6sevoW8UEnI2/kRVRa53M+R8I/WSJasLwIvyIPi/ZdzEdkcrYvzlQN7GcyoRw52bS+wkfIF3NaU8nFm/p2UtqMMtk1Mf0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742051727; c=relaxed/simple; bh=wMDkFlOEMkADkhwlpU4LQIA7ztRZxNdc4osh9N2ewzw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Q7ycBI9nbmseup43Y8SgRpmu8JyaRNkYyHg01181QjNTPV9IHb/dRCmGN9SwHtJZYdNqL+LOgDSOsgEcXMAwGbt2D7BVSkf56BLiv9KovReUqaJankjFDxkSew8kweIUl4nVkFSXS3hCl/jzJOawKsbVHvnmaAa2g8LqSeDEaZ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=se5ntyMM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="se5ntyMM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDA3EC4CEE5; Sat, 15 Mar 2025 15:15:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742051726; bh=wMDkFlOEMkADkhwlpU4LQIA7ztRZxNdc4osh9N2ewzw=; h=From:To:Cc:Subject:Date:From; b=se5ntyMMW7rOeIwJdFwrDz4s0ByDnJdY5V8hy0gv9tk6T2qpLXFR0e4R/aeS/Ge7a gbAL8kt2VRTS+uKiO2CFTifGq6dOZxZYYTTro8sKe2H6ODrAU7dG0wGXM7MtNVm8Nb 8zmOR3KzXHCpoqdLEY3TqGGRVJaw/0383XZDtf0ZkAGSx849CfTuRj13WtRAfcgXZI ukg/CnkNPJEUTZzrdXBTP+AnpXU6vraYO9rTy094K3bvvaWJx6lenjxwyJ0hkGbzj9 cu5doeDVdXUPPEwIfr1q1EQR1A7jJrH3wQV5IP7yU2TOgGprbrzP8keHde1nxifoKV 95q4kAFIFousQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Christian Heusel , Nathan Chancellor , Nicolas Schier , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Subject: [PATCH] kbuild: pacman-pkg: hardcode module installation path Date: Sun, 16 Mar 2025 00:15:20 +0900 Message-ID: <20250315151522.2766939-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 'make pacman-pkg' for architectures with device tree support (i.e., arm, arm64, etc.) shows logs like follows: Installing dtbs... INSTALL /home/masahiro/linux/pacman/linux-upstream/pkg/linux-upstream/usr//lib/modules/6.14.0-rc6+/dtb/actions/s700-cubieboard7.dtb INSTALL /home/masahiro/linux/pacman/linux-upstream/pkg/linux-upstream/usr//lib/modules/6.14.0-rc6+/dtb/actions/s900-bubblegum-96.dtb INSTALL /home/masahiro/linux/pacman/linux-upstream/pkg/linux-upstream/usr//lib/modules/6.14.0-rc6+/dtb/airoha/en7581-evb.dtb ... The double slashes ('//') between 'usr' and 'lib' are somewhat ugly. Let's hardcode the module installation path because the package contents should remain unaffected even if ${MODLIB} is overridden. Please note that scripts/packages/{builddeb,kernel.spec} also hardcode the module installation path. With this change, the log will look better, as follows: Installing dtbs... INSTALL /home/masahiro/linux/pacman/linux-upstream/pkg/linux-upstream/usr/lib/modules/6.14.0-rc6+/dtb/actions/s700-cubieboard7.dtb INSTALL /home/masahiro/linux/pacman/linux-upstream/pkg/linux-upstream/usr/lib/modules/6.14.0-rc6+/dtb/actions/s900-bubblegum-96.dtb INSTALL /home/masahiro/linux/pacman/linux-upstream/pkg/linux-upstream/usr/lib/modules/6.14.0-rc6+/dtb/airoha/en7581-evb.dtb ... Signed-off-by: Masahiro Yamada Acked-by: Thomas Weißschuh Reviewed-by: Nathan Chancellor --- scripts/package/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/package/PKGBUILD b/scripts/package/PKGBUILD index 0cf3a55b05e1..452374d63c24 100644 --- a/scripts/package/PKGBUILD +++ b/scripts/package/PKGBUILD @@ -53,7 +53,7 @@ build() { _package() { pkgdesc="The ${pkgdesc} kernel and modules" - local modulesdir="${pkgdir}/usr/${MODLIB}" + local modulesdir="${pkgdir}/usr/lib/modules/${KERNELRELEASE}" _prologue @@ -81,7 +81,7 @@ _package() { _package-headers() { pkgdesc="Headers and scripts for building modules for the ${pkgdesc} kernel" - local builddir="${pkgdir}/usr/${MODLIB}/build" + local builddir="${pkgdir}/usr/lib/modules/${KERNELRELEASE}/build" _prologue @@ -114,7 +114,7 @@ _package-debug(){ pkgdesc="Non-stripped vmlinux file for the ${pkgdesc} kernel" local debugdir="${pkgdir}/usr/src/debug/${pkgbase}" - local builddir="${pkgdir}/usr/${MODLIB}/build" + local builddir="${pkgdir}/usr/lib/modules/${KERNELRELEASE}/build" _prologue