Skip to content
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

copy_boot/rootfs: if OETMP not set try to use BBPATH to find the images subdir #4

Open
wants to merge 1 commit into
base: dunfell
Choose a base branch
from
Open

copy_boot/rootfs: if OETMP not set try to use BBPATH to find the images subdir #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions scripts/copy_boot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,23 @@ fi
echo "MACHINE: $MACHINE"

if [ -z "$OETMP" ]; then
echo "Working from local directory"
SRC=.
if [[ ! -z "$BBPATH" ]]; then
echo "using BBPATH: $BBPATH"
SRC=${BBPATH}/tmp/deploy/images/${MACHINE}
else
echo "Working from local directory"
SRC=.
fi
else
echo "OETMP: $OETMP"

if [ ! -d ${OETMP}/deploy/images/${MACHINE} ]; then
echo "Directory not found: ${OETMP}/deploy/images/${MACHINE}"
exit 1
fi

SRC=${OETMP}/deploy/images/${MACHINE}
fi

if [ ! -d ${SRC} ]; then
echo "Directory not found: ${SRC}"
exit 1
fi

if [ ! -f ${SRC}/SPL-${MACHINE} ]; then
echo "File not found: ${SRC}/SPL-${MACHINE}"
exit 1
Expand Down
21 changes: 13 additions & 8 deletions scripts/copy_rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,24 @@ else
fi

if [ -z "$OETMP" ]; then
echo -e "Working from local directory"
SRC=.
if [[ ! -z "$BBPATH" ]]; then
echo "using BBPATH: $BBPATH"
SRC=${BBPATH}/tmp/deploy/images/${MACHINE}
else
echo "Working from local directory"
SRC=.
fi
else
echo "OETMP: $OETMP"

if [ ! -d ${OETMP}/deploy/images/${MACHINE} ]; then
echo "Directory not found: ${OETMP}/deploy/images/${MACHINE}"
exit 1
fi

SRC=${OETMP}/deploy/images/${MACHINE}
fi


if [ ! -d ${SRC} ]; then
echo "Directory not found: ${SRC}"
exit 1
fi

if [ ! -d /media/card ]; then
echo "Temporary mount point [/media/card] not found"
exit 1
Expand Down