saad/minimal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Permanently fixed the ugly looking escaped sysroot string by removing it.

Browse Source
This commit is contained in:
Ivan Davidov 2017-12-08 00:01:07 +02:00
parent 2b95a9de0e
commit 71d99c57c9
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/07_build_busybox.sh
View File

@ -19,7 +19,7 @@ echo "Preparing BusyBox work area. This may take a while."
make distclean -j $NUM_JOBS make distclean -j $NUM_JOBS
# Read the 'USE_PREDEFINED_BUSYBOX_CONFIG' property from '.config' # Read the 'USE_PREDEFINED_BUSYBOX_CONFIG' property from '.config'
USE_PREDEFINED_BUSYBOX_CONFIG="$(grep -i ^USE_PREDEFINED_BUSYBOX_CONFIG $SRC_DIR/.config | cut -f2 -d'=')" USE_PREDEFINED_BUSYBOX_CONFIG=`read_property USE_PREDEFINED_BUSYBOX_CONFIG`
if [ "$USE_PREDEFINED_BUSYBOX_CONFIG" = "true" -a ! -f $SRC_DIR/minimal_config/busybox.config ] ; then if [ "$USE_PREDEFINED_BUSYBOX_CONFIG" = "true" -a ! -f $SRC_DIR/minimal_config/busybox.config ] ; then
echo "Config file $SRC_DIR/minimal_config/busybox.config does not exist." echo "Config file $SRC_DIR/minimal_config/busybox.config does not exist."
@ -36,15 +36,8 @@ else
make defconfig -j $NUM_JOBS make defconfig -j $NUM_JOBS
fi fi
# This variable holds the full path to the glibc installation area as quoted string. # Now we tell BusyBox to use the sysroot area.
# All forward slashes are escaped (/ => \/) in order to keep the 'sed' command stable. sed -i "s|.*CONFIG_SYSROOT.*|CONFIG_SYSROOT=\"$SYSROOT\"|" .config
SYSROOT_ESCAPED=$(echo \"$SYSROOT\" | sed 's|/|\\/|g')
# Now we tell BusyBox to use the glibc prepared area.
sed -i "s/.*CONFIG_SYSROOT.*/CONFIG_SYSROOT=$SYSROOT_ESCAPED/" .config
# Read the 'CFLAGS' property from '.config'
CFLAGS="$(grep -i ^CFLAGS .config | cut -f2 -d'=')"
# Compile busybox with optimization for "parallel jobs" = "number of processors". # Compile busybox with optimization for "parallel jobs" = "number of processors".
echo "Building BusyBox." echo "Building BusyBox."