From 97f06c7f9d934a86f84f6608bcf3c6a1a1132eee Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Apr 2014 11:27:38 +0200 Subject: add qemu host dependency --- scripts/scan-tools.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'scripts') diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index 16b13d4e3..ee8d8a3ff 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -295,6 +295,11 @@ if ! which lzop >/dev/null 2>&1; then host_build_lzop=1 fi +host_build_qemu=0 +if ! which qemu-img >/dev/null 2>&1; then + echo "No qemu found, will build one when required." + host_build_qemu=1 +fi echo "config ADK_HOST_BUILD_TOOLS" > $topdir/target/config/Config.in.prereq printf "\t%s\n" "boolean" >> $topdir/target/config/Config.in.prereq @@ -314,6 +319,7 @@ if [ $host_build_ccache -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_CCAC if [ $host_build_genext2fs -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_GENEXT2FS if ADK_HOST_NEED_GENEXT2FS" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_lzma -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZMA if ADK_HOST_NEED_LZMA" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_lzop -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZOP if ADK_HOST_NEED_LZOP" >> $topdir/target/config/Config.in.prereq ;fi +if [ $host_build_qemu -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_QEMU if ADK_HOST_NEED_QEMU" >> $topdir/target/config/Config.in.prereq ;fi cd $topdir rm -rf tmp -- cgit v1.2.3 From b7d67fbf45f8049064f67d82df7502ced2ecbea7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 3 Apr 2014 21:09:14 +0200 Subject: create a data partition, use mkfs.ext4, simplify tool checks, use echo instead of printf --- scripts/install-rpi.sh | 118 ++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 71 deletions(-) (limited to 'scripts') diff --git a/scripts/install-rpi.sh b/scripts/install-rpi.sh index d104f5431..5d282d29f 100755 --- a/scripts/install-rpi.sh +++ b/scripts/install-rpi.sh @@ -3,125 +3,101 @@ # material, please see the LICENCE file in the top-level directory. if [ $(id -u) -ne 0 ];then - printf "Installation is only possible as root\n" + echo "Installation is only possible as root" exit 1 fi -printf "Checking if parted is installed" -parted=$(which parted) - -if [ ! -z $parted -a -x $parted ];then - printf "...okay\n" -else - printf "...failed\n" - exit 1 -fi - -printf "Checking if sfdisk is installed" -sfdisk=$(which sfdisk) - -if [ ! -z $sfdisk -a -x $sfdisk ];then - printf "...okay\n" -else - printf "...failed\n" - exit 1 -fi - -printf "Checking if mke2fs is installed" -mke2fs=$(which mke2fs) - -if [ ! -z $mke2fs -a -x $mke2fs ];then - printf "...okay\n" -else - printf "...failed\n" - exit 1 -fi +for tool in parted sfdisk mkfs.vfat mkfs.ext4;do + if ! which $tool >/dev/null; then + echo "Checking if $tool is installed... failed" + f=1 + fi +done +[[ $f -eq 1 ]] && exit 1 if [ -z $1 ];then - printf "Please give your SD card device as first parameter\n" + echo "Please give your SD card device as first parameter" exit 1 else if [ -z $2 ];then - printf "Please give your install tar archive as second parameter\n" - exit 2 + echo "Please give your install tar archive as second parameter" + exit 1 fi if [ -f $2 ];then - printf "Installing $2 on $1\n" + echo "Installing $2 on $1" else - printf "$2 is not a file, Exiting\n" + echo "$2 is not a file, exiting" exit 1 fi if [ -b $1 ];then - printf "Using $1 as SD card disk for installation\n" - printf "This will destroy all data on $1, are you sure?\n" - printf "Type "y" to continue\n" + echo "Using $1 as SD card disk for installation" + echo "WARNING: This will destroy all data on $1 - type Yes to continue!" read y - if [ "$y" = "y" ];then + if [ "$y" = "Yes" ];then $sfdisk -l $1 2>&1 |grep 'No medium' if [ $? -eq 0 ];then + echo "No medium found" exit 1 else - printf "Starting with installation\n" + echo "Starting with installation" fi else - printf "Exiting.\n" + echo "Exiting." exit 1 fi else - printf "Sorry $1 is not a block device\n" + echo "Sorry $1 is not a block device" exit 1 fi fi if [ $(mount | grep $1| wc -l) -ne 0 ];then - printf "Block device $1 is in use, please umount first.\n" + echo "Block device $1 is in use, please umount first" exit 1 fi +echo "Wiping existing partitions" +dd if=/dev/zero of=$1 bs=512 count=1 >/dev/null 2>&1 +sync -if [ $($sfdisk -l $1 2>/dev/null|grep Empty|wc -l) -ne 4 ];then - printf "Partitions already exist, should I wipe them?\n" - printf "Type y to continue\n" - read y - if [ $y = "y" ];then - printf "Wiping existing partitions\n" - dd if=/dev/zero of=$1 bs=512 count=1 >/dev/null 2>&1 - else - printf "Exiting.\n" - exit 1 - fi -fi - -printf "Create partition and filesystem for raspberry pi\n" +echo "Create partition and filesystem for raspberry pi" rootpart=${1}2 -$parted -s $1 mklabel msdos +parted -s $1 mklabel msdos sleep 2 -maxsize=$(env LC_ALL=C $parted $1 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') -rootsize=$(($maxsize-16)) +maxsize=$(env LC_ALL=C parted $1 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') +rootsize=$(($maxsize-34)) +datasize=$(($maxsize-2)) -$parted -s $1 unit cyl mkpart primary fat32 -- 0 16 -$parted -s $1 unit cyl mkpart primary ext2 -- 16 $rootsize -$parted -s $1 unit cyl mkpart primary fat32 $rootsize $maxsize -$parted -s $1 set 1 boot on -$sfdisk --change-id $1 3 88 +parted -s $1 unit cyl mkpart primary fat32 -- 0 16 +parted -s $1 unit cyl mkpart primary ext2 -- 16 $rootsize +parted -s $1 unit cyl mkpart primary ext2 $rootsize $datasize +parted -s $1 unit cyl mkpart primary fat32 $datasize $maxsize +parted -s $1 set 1 boot on +sfdisk --change-id $1 4 88 sleep 2 mkfs.vfat ${1}1 -$mke2fs ${1}2 +mkfs.ext4 ${1}2 +mkfs.ext4 ${1}3 sync sleep 2 tmp=$(mktemp -d) -mount -t ext2 ${rootpart} $tmp +mount -t ext4 ${rootpart} $tmp mkdir $tmp/boot +mkdir $tmp/data +mount -t ext4 ${1}3 $tmp/data +mkdir $tmp/data/mpd $tmp/data/xbmc mount -t vfat ${1}1 $tmp/boot -sleep 2 -printf "Extracting install archive\n" +sleep 1 +echo "Extracting install archive" tar -C $tmp -xzpf $2 -printf "Fixing permissions\n" +echo "Fixing permissions" chmod 1777 $tmp/tmp chmod 4755 $tmp/bin/busybox +echo "/dev/mmcblk0p3 /data ext4 rw 0 0" >>$tmp/etc/fstab +umount $tmp/data umount $tmp/boot umount $tmp -printf "Successfully installed.\n" +echo "Successfully installed." exit 0 -- cgit v1.2.3 From 7f512568876ee752191e946fafe4dc9d204727e3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 4 Apr 2014 16:53:44 +0200 Subject: disable huge_file --- scripts/install-rpi.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/install-rpi.sh b/scripts/install-rpi.sh index 5d282d29f..ed85cc53e 100755 --- a/scripts/install-rpi.sh +++ b/scripts/install-rpi.sh @@ -76,9 +76,9 @@ parted -s $1 unit cyl mkpart primary fat32 $datasize $maxsize parted -s $1 set 1 boot on sfdisk --change-id $1 4 88 sleep 2 -mkfs.vfat ${1}1 -mkfs.ext4 ${1}2 -mkfs.ext4 ${1}3 +mkfs.vfat ${1}1 >/dev/null +mkfs.ext4 -q -O ^huge_file ${1}2 +mkfs.ext4 -q -O ^huge_file ${1}3 sync sleep 2 -- cgit v1.2.3 From 04754833a25cd3ea6260661d64cd1aec105e11d3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Apr 2014 06:07:57 +0200 Subject: fix iso building --- scripts/scan-tools.sh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'scripts') diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index ee8d8a3ff..f513b5861 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -271,6 +271,12 @@ if ! which xz >/dev/null 2>&1; then fi # optional +host_build_cdrtools=0 +if ! which mkisofs >/dev/null 2>&1; then + echo "No mkisofs found, will build one when required." + host_build_cdrtools=1 +fi + host_build_ccache=0 if ! which ccache >/dev/null 2>&1; then echo "No ccache found, will build one when required." @@ -316,6 +322,7 @@ if [ $host_build_findutils -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_F if [ $host_build_xz -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_XZ" >> $topdir/target/config/Config.in.prereq ;fi # optional if [ $host_build_ccache -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_CCACHE if ADK_HOST_NEED_CCACHE" >> $topdir/target/config/Config.in.prereq ;fi +if [ $host_build_cdrtools -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_CDRTOOLS if ADK_HOST_NEED_CDRTOOLS" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_genext2fs -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_GENEXT2FS if ADK_HOST_NEED_GENEXT2FS" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_lzma -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZMA if ADK_HOST_NEED_LZMA" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_lzop -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZOP if ADK_HOST_NEED_LZOP" >> $topdir/target/config/Config.in.prereq ;fi -- cgit v1.2.3 From bad4e359ed68e9ade3ddc0e62bb409beb6e18038 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 5 Apr 2014 10:15:04 +0200 Subject: add cmake helper vars --- scripts/toolchain.cmake.in | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 scripts/toolchain.cmake.in (limited to 'scripts') diff --git a/scripts/toolchain.cmake.in b/scripts/toolchain.cmake.in new file mode 100644 index 000000000..150bfcb27 --- /dev/null +++ b/scripts/toolchain.cmake.in @@ -0,0 +1,10 @@ +set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_C_COMPILER @@TARGET_CC@@) +set(CMAKE_CXX_COMPILER @@TARGET_CXX@@) +set(CMAKE_INSTALL_SO_NO_EXE 0) +set(CMAKE_PROGRAM_PATH \"@@STAGING_HOST_DIR@@/usr/bin\") +set(CMAKE_FIND_ROOT_PATH \"@@STAGING_TARGET_DIR@@\") +set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) +set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +set(ENV{PKG_CONFIG_SYSROOT_DIR} \"@@STAGING_TARGET_DIR@@\") -- cgit v1.2.3