jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

config/functions: add function get_full_module_dir

Browse Source 
It returns the full module directory path, including /usr/lib/modules.

Use that in package.mk files to simply them and get rid of the
repeatedly added paths.

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2017-09-05 09:17:30 +02:00
parent 157816bac7
commit d101bdfa24
16 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/functions
View File

@ -146,6 +146,11 @@ get_module_dir() {
basename $(ls -d $(get_build_dir linux)/.install_pkg/usr/lib/modules/*) 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 package's build dir
get_build_dir() { get_build_dir() {
local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")" local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")"

4
packages/linux-drivers/RTL8188EU/package.mk
View File

@ -48,6 +48,6 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
} }

4
packages/linux-drivers/RTL8192CU/package.mk
View File

@ -47,6 +47,6 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
} }

4
packages/linux-drivers/RTL8192DU/package.mk
View File

@ -47,6 +47,6 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
} }

4
packages/linux-drivers/RTL8192EU/package.mk
View File

@ -48,6 +48,6 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
} }

4
packages/linux-drivers/RTL8812AU/package.mk
View File

@ -46,6 +46,6 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
} }

4
packages/linux-drivers/bcm_sta/package.mk
View File

@ -42,6 +42,6 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/bcm_sta mkdir -p $INSTALL/$(get_full_module_dir)/bcm_sta
cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
} }

4
packages/linux-drivers/brcmap6xxx-aml/package.mk
View File

@ -42,8 +42,8 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/bcmdhd mkdir -p $INSTALL/$(get_full_module_dir)/bcmdhd
cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/bcmdhd cp *.ko $INSTALL/$(get_full_module_dir)/bcmdhd
mkdir -p $INSTALL/usr/lib/firmware/brcm mkdir -p $INSTALL/usr/lib/firmware/brcm
cp $PKG_DIR/config/config.txt $INSTALL/usr/lib/firmware/brcm cp $PKG_DIR/config/config.txt $INSTALL/usr/lib/firmware/brcm

4
packages/linux-drivers/dvbhdhomerun/package.mk
View File

@ -58,8 +58,8 @@ pre_configure_target() {
makeinstall_target() { makeinstall_target() {
cd $PKG_BUILD cd $PKG_BUILD
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/hdhomerun mkdir -p $INSTALL/$(get_full_module_dir)/hdhomerun
cp kernel/*.ko $INSTALL/usr/lib/modules/$(get_module_dir)/hdhomerun/ cp kernel/*.ko $INSTALL/$(get_full_module_dir)/hdhomerun/
mkdir -p $INSTALL/usr/bin mkdir -p $INSTALL/usr/bin
cp -PR .$TARGET_NAME/userhdhomerun $INSTALL/usr/bin cp -PR .$TARGET_NAME/userhdhomerun $INSTALL/usr/bin

4
packages/linux-drivers/intel_nuc_led/package.mk
View File

@ -42,6 +42,6 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
} }

4
packages/linux-drivers/media_build/package.mk
View File

@ -57,6 +57,6 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/modules/$KERNEL_VER/updates mkdir -p $INSTALL/$(get_full_module_dir)/updates
find $PKG_BUILD/v4l/ -name \*.ko -exec cp {} $INSTALL/usr/lib/modules/$KERNEL_VER/updates \; find $PKG_BUILD/v4l/ -name \*.ko -exec cp {} $INSTALL/$(get_full_module_dir)/updates \;
} }

4
packages/linux-drivers/slice-drivers/package.mk
View File

@ -42,6 +42,6 @@ make_target() {
} }
makeinstall_target() { makeinstall_target() {
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
cp *.ko $INSTALL/usr/lib/modules/$(get_module_dir)/$PKG_NAME cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
} }

6
packages/linux-drivers/wetekdvb/package.mk
View File

@ -38,11 +38,11 @@ make_target() {
} }
makeinstall_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 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 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 fi
mkdir -p $INSTALL/usr/lib/firmware mkdir -p $INSTALL/usr/lib/firmware

4
packages/linux/package.mk
View File

@ -247,7 +247,7 @@ makeinstall_init() {
mkdir -p $INSTALL/usr/lib/modules mkdir -p $INSTALL/usr/lib/modules
for i in $INITRAMFS_MODULES; do 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 if [ -n "$module" ]; then
echo $i >> $INSTALL/etc/modules echo $i >> $INSTALL/etc/modules
cp $module $INSTALL/usr/lib/modules/`basename $module` cp $module $INSTALL/usr/lib/modules/`basename $module`
@ -257,7 +257,7 @@ makeinstall_init() {
if [ "$UVESAFB_SUPPORT" = yes ]; then if [ "$UVESAFB_SUPPORT" = yes ]; then
mkdir -p $INSTALL/usr/lib/modules 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` cp $uvesafb $INSTALL/usr/lib/modules/`basename $uvesafb`
fi fi
} }

4
packages/x11/driver/xf86-video-nvidia-legacy/package.mk
View File

@ -67,8 +67,8 @@ makeinstall_target() {
# rename to not conflicting with Mesa libGL.so # rename to not conflicting with Mesa libGL.so
cp -P libGL.so* $INSTALL/usr/lib/libGL_nvidia-legacy.so.1 cp -P libGL.so* $INSTALL/usr/lib/libGL_nvidia-legacy.so.1
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia mkdir -p $INSTALL/$(get_full_module_dir)/nvidia
ln -sf /var/lib/nvidia.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia/nvidia.ko ln -sf /var/lib/nvidia.ko $INSTALL/$(get_full_module_dir)/nvidia/nvidia.ko
mkdir -p $INSTALL/usr/lib/nvidia-legacy mkdir -p $INSTALL/usr/lib/nvidia-legacy
cp kernel/nvidia.ko $INSTALL/usr/lib/nvidia-legacy cp kernel/nvidia.ko $INSTALL/usr/lib/nvidia-legacy

8
packages/x11/driver/xf86-video-nvidia/package.mk
View File

@ -70,10 +70,10 @@ makeinstall_target() {
# rename to not conflicting with Mesa libGL.so # rename to not conflicting with Mesa libGL.so
cp -P libGL.so.$PKG_VERSION $INSTALL/usr/lib/libGL_nvidia.so.1 cp -P libGL.so.$PKG_VERSION $INSTALL/usr/lib/libGL_nvidia.so.1
mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia mkdir -p $INSTALL/$(get_full_module_dir)/nvidia
ln -sf /var/lib/nvidia.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia/nvidia.ko ln -sf /var/lib/nvidia.ko $INSTALL/$(get_full_module_dir)/nvidia/nvidia.ko
cp -P kernel/nvidia-uvm.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia cp -P kernel/nvidia-uvm.ko $INSTALL/$(get_full_module_dir)/nvidia
cp -P kernel/nvidia-modeset.ko $INSTALL/usr/lib/modules/$(get_module_dir)/nvidia cp -P kernel/nvidia-modeset.ko $INSTALL/$(get_full_module_dir)/nvidia
mkdir -p $INSTALL/usr/lib/nvidia mkdir -p $INSTALL/usr/lib/nvidia
cp -P kernel/nvidia.ko $INSTALL/usr/lib/nvidia cp -P kernel/nvidia.ko $INSTALL/usr/lib/nvidia