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

Jump to bottom

missing busybox var #28

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

missing busybox var #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd0dc09
missing $busybox var part 1
DeicPro Sep 12, 2016
d159e59
missing $busybox var part 2
DeicPro Sep 12, 2016
81e3794
missing $busybox var part 3
DeicPro Sep 13, 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
3 changes: 2 additions & 1 deletion ARM/mkboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

target=$(pwd)
script="${target}/wrapper"
shebang=$(head -1 "$script")
busybox=$(command -v busybox)
shebang=$($busybox head -1 "$script")
buildit="$@"

# Use an array in case a argument is there too
Expand Down
10 changes: 5 additions & 5 deletions ARM/wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
trap "clean" 2 3 4
workdir=$(pwd)
toolpath=$(readlink -f $0)
tooldir=$(dirname $toolpath)
busybox=$(command -v busybox)
tooldir=$($busybox dirname $toolpath)
mkbootimg=$tooldir/mkbootimg
mkbootfs=$tooldir/mkbootfs
busybox=$(command -v busybox)
od=$tooldir/od
gzip=$tooldir/gzip
lz4=$tooldir/lz4
Expand Down Expand Up @@ -233,10 +233,10 @@ cp -f $1 $tempdir/
cd $tempdir
bootimg=$($busybox basename $1)
# Find BOOT_MAGIC address in dec and hex
boot_magic_addr=$($grep -abo ANDROID! $bootimg | $busybox cut -f 1 -d : | head -1)
boot_magic_addr=$($grep -abo ANDROID! $bootimg | $busybox cut -f 1 -d : | $busybox head -1)
boot_magic=`printf 0x%08x $boot_magic_addr`
# Find standard QCDT address in hex
qcdt_addr=$($grep -abo QCDT $bootimg | $busybox cut -f 1 -d : | head -1)
qcdt_addr=$($grep -abo QCDT $bootimg | $busybox cut -f 1 -d : | $busybox head -1)
if [ ! -z $qcdt_addr ]; then
qcdt_addr=`printf 0x%x $qcdt_addr`
fi
Expand Down Expand Up @@ -380,7 +380,7 @@ print_info

# Properly escape double quotes
# Keep double quotes intact
cmd_line=$(echo $cmd_line | sed -e "s/'/'\\\\''/g; 1s/^/'/; \$s/\$/'/")
cmd_line=$(echo $cmd_line | $busybox sed -e "s/'/'\\\\''/g; 1s/^/'/; \$s/\$/'/")

#write info to img_info,decompression ramdisk.gz

Expand Down