Skip to content

"can not find script.sh and version.sh" bugs removed #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
klekkala wants to merge 2 commits into
base: am33x-v4.4
Choose a base branch
from
Open

"can not find script.sh and version.sh" bugs removed #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4fed6f
script.sh and version.sh bugs removed
klekkala Jun 4, 2016
f66c8a9
Further version.sh and system.sh bugs removed
klekkala Jun 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/host_det.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ else
fi

DIR=$PWD
. "${DIR}/version.sh"
. "${DIR}/../version.sh"

if [ -f "${DIR}/.yakbuild" ] ; then
. "${DIR}/recipe.sh"
Expand Down
10 changes: 5 additions & 5 deletions tools/install_kernel.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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:"
Expand Down
4 changes: 2 additions & 2 deletions tools/local_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' )
Expand Down
8 changes: 4 additions & 4 deletions tools/rebuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tools/rebuild_deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down