From f4fed6f3a1c8c5d71c32cd784ff98a35d35dd646 Mon Sep 17 00:00:00 2001 From: kiran4399 Date: Sat, 4 Jun 2016 15:09:21 +0530 Subject: [PATCH 1/2] script.sh and version.sh bugs removed --- tools/install_kernel.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/install_kernel.sh b/tools/install_kernel.sh index d8d0793e67..2ba12ebceb 100755 --- a/tools/install_kernel.sh +++ b/tools/install_kernel.sh @@ -25,7 +25,7 @@ unset MMC DIR=$PWD -. "${DIR}/version.sh" +. "${DIR}/../version.sh" mmc_write_rootfs () { echo "Installing ${KERNEL_UTS}-modules.tar.gz to ${partition}" @@ -293,11 +293,11 @@ check_mmc () { fi } -if [ -f "${DIR}/system.sh" ] ; then - . "${DIR}/system.sh" +if [ -f "${DIR}/../system.sh" ] ; then + . "${DIR}/../system.sh" - if [ -f "${DIR}/KERNEL/arch/arm/boot/zImage" ] ; then - KERNEL_UTS=$(cat "${DIR}/KERNEL/include/generated/utsrelease.h" | awk '{print $3}' | sed 's/\"//g' ) + if [ -f "${DIR}/../KERNEL/arch/arm/boot/zImage" ] ; then + KERNEL_UTS=$(cat "${DIR}/../KERNEL/include/generated/utsrelease.h" | awk '{print $3}' | sed 's/\"//g' ) if [ "x${MMC}" = "x" ] ; then echo "-----------------------------" echo "lsblk:" From f66c8a9a58313c232a1af7e726b80fe2f73fdf59 Mon Sep 17 00:00:00 2001 From: kiran4399 Date: Sat, 4 Jun 2016 15:16:06 +0530 Subject: [PATCH 2/2] Further version.sh and system.sh bugs removed --- tools/host_det.sh | 2 +- tools/local_install.sh | 4 ++-- tools/rebuild.sh | 8 ++++---- tools/rebuild_deb.sh | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/host_det.sh b/tools/host_det.sh index dab982860d..7d64057ad5 100755 --- a/tools/host_det.sh +++ b/tools/host_det.sh @@ -496,7 +496,7 @@ else fi DIR=$PWD -. "${DIR}/version.sh" +. "${DIR}/../version.sh" if [ -f "${DIR}/.yakbuild" ] ; then . "${DIR}/recipe.sh" diff --git a/tools/local_install.sh b/tools/local_install.sh index 4b5a2bd859..511789ddd1 100755 --- a/tools/local_install.sh +++ b/tools/local_install.sh @@ -123,8 +123,8 @@ mmc_write_boot () { fi } -if [ -f "${DIR}/system.sh" ] ; then - . "${DIR}/system.sh" +if [ -f "${DIR}/../system.sh" ] ; then + . "${DIR}/../system.sh" if [ -f "${DIR}/KERNEL/arch/arm/boot/zImage" ] ; then KERNEL_UTS=$(cat "${DIR}/KERNEL/include/generated/utsrelease.h" | awk '{print $3}' | sed 's/\"//g' ) diff --git a/tools/rebuild.sh b/tools/rebuild.sh index c4289a4442..5db7b50817 100755 --- a/tools/rebuild.sh +++ b/tools/rebuild.sh @@ -185,13 +185,13 @@ fi /bin/sh -e "${DIR}/tools/host_det.sh" || { exit 1 ; } -if [ ! -f "${DIR}/system.sh" ] ; then - cp -v "${DIR}/system.sh.sample" "${DIR}/system.sh" +if [ ! -f "${DIR}/../system.sh" ] ; then + cp -v "${DIR}/../system.sh.sample" "${DIR}/../system.sh" fi unset CC unset LINUX_GIT -. "${DIR}/system.sh" +. "${DIR}/../system.sh" if [ -f "${DIR}/.yakbuild" ] ; then . "${DIR}/recipe.sh" fi @@ -203,7 +203,7 @@ if [ -f /usr/bin/ccache ] ; then CC="ccache ${CC}" fi -. "${DIR}/version.sh" +. "${DIR}/../version.sh" export LINUX_GIT unset FULL_REBUILD diff --git a/tools/rebuild_deb.sh b/tools/rebuild_deb.sh index 33ef5014bd..3782c7bb27 100755 --- a/tools/rebuild_deb.sh +++ b/tools/rebuild_deb.sh @@ -104,13 +104,13 @@ fi /bin/sh -e "${DIR}/tools/host_det.sh" || { exit 1 ; } -if [ ! -f "${DIR}/system.sh" ] ; then - cp -v "${DIR}/system.sh.sample" "${DIR}/system.sh" +if [ ! -f "${DIR}/../system.sh" ] ; then + cp -v "${DIR}/../system.sh.sample" "${DIR}/../system.sh" fi unset CC unset LINUX_GIT -. "${DIR}/system.sh" +. "${DIR}/../system.sh" if [ -f "${DIR}/.yakbuild" ] ; then . "${DIR}/recipe.sh" fi @@ -122,7 +122,7 @@ if [ -f /usr/bin/ccache ] ; then CC="ccache ${CC}" fi -. "${DIR}/version.sh" +. "${DIR}/../version.sh" export LINUX_GIT unset FULL_REBUILD