Merge branch 'bug/kmod-modules-dep'

Authored By: Ricardo Martins
This commit is contained in:
Tiago Marques 2017-09-28 19:57:10 +01:00
commit 19855db2da
3 changed files with 1 additions and 12 deletions

View File

@ -35,3 +35,4 @@ RUN apt-get install -y git
RUN apt-get install -y g++-multilib RUN apt-get install -y g++-multilib
RUN apt-get install -y cmake RUN apt-get install -y cmake
RUN apt-get install -y file RUN apt-get install -y file
RUN apt-get install -y kmod

View File

@ -128,14 +128,12 @@ build()
$cmd_make \ $cmd_make \
CROSS_COMPILE=$cfg_target_canonical- \ CROSS_COMPILE=$cfg_target_canonical- \
ARCH=$cfg_target_linux \ ARCH=$cfg_target_linux \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
modules || return 1 modules || return 1
if [ "$(basename $cfg_target_linux_kernel)" = 'uImage' ]; then if [ "$(basename $cfg_target_linux_kernel)" = 'uImage' ]; then
$cmd_make \ $cmd_make \
CROSS_COMPILE=$cfg_target_canonical- \ CROSS_COMPILE=$cfg_target_canonical- \
ARCH=$cfg_target_linux \ ARCH=$cfg_target_linux \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
uImage || return 1 uImage || return 1
fi fi
@ -144,7 +142,6 @@ build()
$cmd_make \ $cmd_make \
CROSS_COMPILE=$cfg_target_canonical- \ CROSS_COMPILE=$cfg_target_canonical- \
ARCH=$cfg_target_linux \ ARCH=$cfg_target_linux \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
zImage || return 1 zImage || return 1
fi fi
@ -153,7 +150,6 @@ build()
$cmd_make \ $cmd_make \
CROSS_COMPILE=$cfg_target_canonical- \ CROSS_COMPILE=$cfg_target_canonical- \
ARCH=$cfg_target_linux \ ARCH=$cfg_target_linux \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
dtbs || return 1 dtbs || return 1
fi fi
@ -198,7 +194,6 @@ target_install()
ARCH="$cfg_target_linux" \ ARCH="$cfg_target_linux" \
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \ INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
KBUILD_VERBOSE=1 \ KBUILD_VERBOSE=1 \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
modules_install modules_install
$cmd_make \ $cmd_make \
@ -206,6 +201,5 @@ target_install()
ARCH="$cfg_target_linux" \ ARCH="$cfg_target_linux" \
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \ INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
KBUILD_VERBOSE=1 \ KBUILD_VERBOSE=1 \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
firmware_install firmware_install
} }

View File

@ -129,14 +129,12 @@ build()
$cmd_make \ $cmd_make \
CROSS_COMPILE=$cfg_target_canonical- \ CROSS_COMPILE=$cfg_target_canonical- \
ARCH=$cfg_target_linux \ ARCH=$cfg_target_linux \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
modules || return 1 modules || return 1
if [ "$(basename $cfg_target_linux_kernel)" = 'uImage' ]; then if [ "$(basename $cfg_target_linux_kernel)" = 'uImage' ]; then
$cmd_make \ $cmd_make \
CROSS_COMPILE=$cfg_target_canonical- \ CROSS_COMPILE=$cfg_target_canonical- \
ARCH=$cfg_target_linux \ ARCH=$cfg_target_linux \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
uImage || return 1 uImage || return 1
fi fi
@ -145,7 +143,6 @@ build()
$cmd_make \ $cmd_make \
CROSS_COMPILE=$cfg_target_canonical- \ CROSS_COMPILE=$cfg_target_canonical- \
ARCH=$cfg_target_linux \ ARCH=$cfg_target_linux \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
zImage || return 1 zImage || return 1
fi fi
@ -154,7 +151,6 @@ build()
$cmd_make \ $cmd_make \
CROSS_COMPILE=$cfg_target_canonical- \ CROSS_COMPILE=$cfg_target_canonical- \
ARCH=$cfg_target_linux \ ARCH=$cfg_target_linux \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
dtbs || return 1 dtbs || return 1
fi fi
@ -199,7 +195,6 @@ target_install()
ARCH="$cfg_target_linux" \ ARCH="$cfg_target_linux" \
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \ INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
KBUILD_VERBOSE=1 \ KBUILD_VERBOSE=1 \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
modules_install modules_install
$cmd_make \ $cmd_make \
@ -207,6 +202,5 @@ target_install()
ARCH="$cfg_target_linux" \ ARCH="$cfg_target_linux" \
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \ INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
KBUILD_VERBOSE=1 \ KBUILD_VERBOSE=1 \
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
firmware_install firmware_install
} }