From 89dcbe9b298c1c5428abe8fe0fe1a1fddf088286 Mon Sep 17 00:00:00 2001 From: Seung-Woo Kim Date: Mon, 23 Sep 2019 18:00:11 +0900 Subject: [PATCH] scripts: mkbootimg_rpi3.sh: Fix to install modules on non sudo status On sudo status, env variable is possible not to be preserved and it causes failure on modules_install. So fix to install modules on non sudo status and then move the directories and files to image area. Change-Id: Ie1e0ff695caf79b1ce3d25be8a70151a30fbfee0 Signed-off-by: Seung-Woo Kim --- scripts/mkbootimg_rpi3.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/mkbootimg_rpi3.sh b/scripts/mkbootimg_rpi3.sh index 490d7d85298c..ba66dac69848 100755 --- a/scripts/mkbootimg_rpi3.sh +++ b/scripts/mkbootimg_rpi3.sh @@ -62,19 +62,21 @@ sudo umount tmp rm -f modules.img mkdir -p tmp/lib/modules +mkdir -p tmp_modules # Create modules.img dd if=/dev/zero of=modules.img bs=1024 count=20480 mkfs.ext4 -q -F -t ext4 -b 1024 -L modules modules.img sudo mount -o loop modules.img ./tmp/lib/modules if [ -n "$IS_64BIT" ]; then - sudo make modules_install ARCH=arm64 INSTALL_MOD_PATH=./tmp INSTALL_MOD_STRIP=1 CROSS_COMPILE=aarch64-linux-gnu- + make modules_install ARCH=arm64 INSTALL_MOD_PATH=./tmp_modules INSTALL_MOD_STRIP=1 CROSS_COMPILE=aarch64-linux-gnu- else - sudo make modules_install ARCH=arm INSTALL_MOD_PATH=./tmp INSTALL_MOD_STRIP=1 CROSS_COMPILE=arm-linux-gnueabi- + make modules_install ARCH=arm INSTALL_MOD_PATH=./tmp_modules INSTALL_MOD_STRIP=1 CROSS_COMPILE=arm-linux-gnueabi- fi +sudo mv ./tmp_modules/lib/modules/* ./tmp/lib/modules sudo -n chown root:root ./tmp/lib/modules -R sync sudo umount tmp/lib/modules -rm -rf tmp +rm -rf tmp tmp_modules -- 2.34.1