Skip to content

Commit b8117ee

Browse files
committed
kbuild: pacman-pkg: hardcode module installation path
'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 <[email protected]> Acked-by: Thomas Weißschuh <[email protected]>
1 parent 19b18a0 commit b8117ee

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/package/PKGBUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ build() {
5353
_package() {
5454
pkgdesc="The ${pkgdesc} kernel and modules"
5555

56-
local modulesdir="${pkgdir}/usr/${MODLIB}"
56+
local modulesdir="${pkgdir}/usr/lib/modules/${KERNELRELEASE}"
5757

5858
_prologue
5959

@@ -81,7 +81,7 @@ _package() {
8181
_package-headers() {
8282
pkgdesc="Headers and scripts for building modules for the ${pkgdesc} kernel"
8383

84-
local builddir="${pkgdir}/usr/${MODLIB}/build"
84+
local builddir="${pkgdir}/usr/lib/modules/${KERNELRELEASE}/build"
8585

8686
_prologue
8787

@@ -114,7 +114,7 @@ _package-debug(){
114114
pkgdesc="Non-stripped vmlinux file for the ${pkgdesc} kernel"
115115

116116
local debugdir="${pkgdir}/usr/src/debug/${pkgbase}"
117-
local builddir="${pkgdir}/usr/${MODLIB}/build"
117+
local builddir="${pkgdir}/usr/lib/modules/${KERNELRELEASE}/build"
118118

119119
_prologue
120120

0 commit comments

Comments
 (0)