diff --git a/config/functions b/config/functions index e02b9be364..8a741c700c 100644 --- a/config/functions +++ b/config/functions @@ -146,6 +146,11 @@ get_module_dir() { basename $(ls -d $(get_build_dir linux)/.install_pkg/usr/lib/modules/*) } +# get full path to kernel module dir +get_full_module_dir() { + echo "/usr/lib/modules/$(get_module_dir)" +} + # get package's build dir get_build_dir() { local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")" diff --git a/packages/linux-drivers/RTL8188EU/package.mk b/packages/linux-drivers/RTL8188EU/package.mk index d9ecaad289..9652f95089 100644 --- a/packages/linux-drivers/RTL8188EU/package.mk +++ b/packages/linux-drivers/RTL8188EU/package.mk @@ -48,6 +48,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME + cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME } diff --git a/packages/linux-drivers/RTL8192CU/package.mk b/packages/linux-drivers/RTL8192CU/package.mk index 7bdd26cf5e..8ba1a2122f 100644 --- a/packages/linux-drivers/RTL8192CU/package.mk +++ b/packages/linux-drivers/RTL8192CU/package.mk @@ -47,6 +47,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME + cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME } diff --git a/packages/linux-drivers/RTL8192DU/package.mk b/packages/linux-drivers/RTL8192DU/package.mk index 09a54d1f50..a02f838171 100644 --- a/packages/linux-drivers/RTL8192DU/package.mk +++ b/packages/linux-drivers/RTL8192DU/package.mk @@ -47,6 +47,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME + cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME } diff --git a/packages/linux-drivers/RTL8192EU/package.mk b/packages/linux-drivers/RTL8192EU/package.mk index 2958b076c8..615e4d869c 100644 --- a/packages/linux-drivers/RTL8192EU/package.mk +++ b/packages/linux-drivers/RTL8192EU/package.mk @@ -48,6 +48,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME + cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME } diff --git a/packages/linux-drivers/RTL8812AU/package.mk b/packages/linux-drivers/RTL8812AU/package.mk index 4725b346e7..48c6ea2af8 100644 --- a/packages/linux-drivers/RTL8812AU/package.mk +++ b/packages/linux-drivers/RTL8812AU/package.mk @@ -46,6 +46,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME + cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME } diff --git a/packages/linux-drivers/bcm_sta/package.mk b/packages/linux-drivers/bcm_sta/package.mk index ac55c6b9c6..3b34f6878b 100644 --- a/packages/linux-drivers/bcm_sta/package.mk +++ b/packages/linux-drivers/bcm_sta/package.mk @@ -42,6 +42,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/bcm_sta - cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/$(get_full_module_dir)/bcm_sta + cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME } diff --git a/packages/linux-drivers/brcmap6xxx-aml/package.mk b/packages/linux-drivers/brcmap6xxx-aml/package.mk index f0af7b4104..97e2cbc343 100644 --- a/packages/linux-drivers/brcmap6xxx-aml/package.mk +++ b/packages/linux-drivers/brcmap6xxx-aml/package.mk @@ -42,8 +42,8 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/bcmdhd - cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/bcmdhd + mkdir -p $INSTALL/$(get_full_module_dir)/bcmdhd + cp *.ko $INSTALL/$(get_full_module_dir)/bcmdhd mkdir -p $INSTALL/usr/lib/firmware/brcm cp $PKG_DIR/config/config.txt $INSTALL/usr/lib/firmware/brcm diff --git a/packages/linux-drivers/dvbhdhomerun/package.mk b/packages/linux-drivers/dvbhdhomerun/package.mk index a1e94e9065..73d39b77eb 100644 --- a/packages/linux-drivers/dvbhdhomerun/package.mk +++ b/packages/linux-drivers/dvbhdhomerun/package.mk @@ -58,8 +58,8 @@ pre_configure_target() { makeinstall_target() { cd $PKG_BUILD - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/hdhomerun - cp kernel/*.ko $INSTALL/usr/lib/modules/$(get_module_dir)/hdhomerun/ + mkdir -p $INSTALL/$(get_full_module_dir)/hdhomerun + cp kernel/*.ko $INSTALL/$(get_full_module_dir)/hdhomerun/ mkdir -p $INSTALL/usr/bin cp -PR .$TARGET_NAME/userhdhomerun $INSTALL/usr/bin diff --git a/packages/linux-drivers/intel_nuc_led/package.mk b/packages/linux-drivers/intel_nuc_led/package.mk index ff302fe446..5512e0f47b 100644 --- a/packages/linux-drivers/intel_nuc_led/package.mk +++ b/packages/linux-drivers/intel_nuc_led/package.mk @@ -42,6 +42,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME + cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME } diff --git a/packages/linux-drivers/media_build/package.mk b/packages/linux-drivers/media_build/package.mk index 01676fae91..02dc59ec31 100644 --- a/packages/linux-drivers/media_build/package.mk +++ b/packages/linux-drivers/media_build/package.mk @@ -57,6 +57,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/modules/$KERNEL_VER/updates - find $PKG_BUILD/v4l/ -name \*.ko -exec cp {} $INSTALL/usr/lib/modules/$KERNEL_VER/updates \; + mkdir -p $INSTALL/$(get_full_module_dir)/updates + find $PKG_BUILD/v4l/ -name \*.ko -exec cp {} $INSTALL/$(get_full_module_dir)/updates \; } diff --git a/packages/linux-drivers/slice-drivers/package.mk b/packages/linux-drivers/slice-drivers/package.mk index 70e4ef38e3..c703ed9540 100644 --- a/packages/linux-drivers/slice-drivers/package.mk +++ b/packages/linux-drivers/slice-drivers/package.mk @@ -42,6 +42,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME - cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME + cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME } diff --git a/packages/linux-drivers/wetekdvb/package.mk b/packages/linux-drivers/wetekdvb/package.mk index 18f0c001d5..9232285252 100644 --- a/packages/linux-drivers/wetekdvb/package.mk +++ b/packages/linux-drivers/wetekdvb/package.mk @@ -38,11 +38,11 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME if [ $PROJECT = "WeTek_Play_2" ]; then - cp driver/wetekdvb_play2.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME/wetekdvb.ko + cp driver/wetekdvb_play2.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME/wetekdvb.ko else - cp driver/wetekdvb.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME + cp driver/wetekdvb.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME fi mkdir -p $INSTALL/usr/lib/firmware diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 173afce9a0..3b1b62c493 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -247,7 +247,7 @@ makeinstall_init() { mkdir -p $INSTALL/usr/lib/modules for i in $INITRAMFS_MODULES; do - module=`find .install_pkg/usr/lib/modules/$(get_module_dir)/kernel -name $i.ko` + module=`find .install_pkg/$(get_full_module_dir)/kernel -name $i.ko` if [ -n "$module" ]; then echo $i >> $INSTALL/etc/modules cp $module $INSTALL/usr/lib/modules/`basename $module` @@ -257,7 +257,7 @@ makeinstall_init() { if [ "$UVESAFB_SUPPORT" = yes ]; then mkdir -p $INSTALL/usr/lib/modules - uvesafb=`find .install_pkg/usr/lib/modules/$(get_module_dir)/kernel -name uvesafb.ko` + uvesafb=`find .install_pkg/$(get_full_module_dir)/kernel -name uvesafb.ko` cp $uvesafb $INSTALL/usr/lib/modules/`basename $uvesafb` fi } diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk index 6b7512c1cb..00f772f630 100644 --- a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk +++ b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk @@ -67,8 +67,8 @@ makeinstall_target() { # rename to not conflicting with Mesa libGL.so cp -P libGL.so* $INSTALL/usr/lib/libGL_nvidia-legacy.so.1 - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia - ln -sf /var/lib/nvidia.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia/nvidia.ko + mkdir -p $INSTALL/$(get_full_module_dir)/nvidia + ln -sf /var/lib/nvidia.ko $INSTALL/$(get_full_module_dir)/nvidia/nvidia.ko mkdir -p $INSTALL/usr/lib/nvidia-legacy cp kernel/nvidia.ko $INSTALL/usr/lib/nvidia-legacy diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index 2c222a7023..3085475158 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -70,10 +70,10 @@ makeinstall_target() { # rename to not conflicting with Mesa libGL.so cp -P libGL.so.$PKG_VERSION $INSTALL/usr/lib/libGL_nvidia.so.1 - mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia - ln -sf /var/lib/nvidia.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia/nvidia.ko - cp -P kernel/nvidia-uvm.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia - cp -P kernel/nvidia-modeset.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia + mkdir -p $INSTALL/$(get_full_module_dir)/nvidia + ln -sf /var/lib/nvidia.ko $INSTALL/$(get_full_module_dir)/nvidia/nvidia.ko + cp -P kernel/nvidia-uvm.ko $INSTALL/$(get_full_module_dir)/nvidia + cp -P kernel/nvidia-modeset.ko $INSTALL/$(get_full_module_dir)/nvidia mkdir -p $INSTALL/usr/lib/nvidia cp -P kernel/nvidia.ko $INSTALL/usr/lib/nvidia