Fixed the 'src' stuff to include the README. Minor script formatting improvements.

This commit is contained in:
Ivan Davidov 2016-05-04 01:38:47 +03:00
parent c61f217835
commit 29b1c3aab7
3 changed files with 8 additions and 9 deletions

View File

@ -34,9 +34,6 @@ else
echo "Generating default BusyBox configuration..." echo "Generating default BusyBox configuration..."
make defconfig make defconfig
# Set the installation folder for BusyBox.
#sed -i "s/.*CONFIG_PREFIX.*/CONFIG_PREFIX=\"..\/busybox_installed\"/" .config
# The 'inetd' applet fails to compile because we use the glibc installation area as # The 'inetd' applet fails to compile because we use the glibc installation area as
# main pointer to the kernel headers (see 05_prepare_glibc.sh) and some headers are # main pointer to the kernel headers (see 05_prepare_glibc.sh) and some headers are
# not resolved. The easiest solution is to ignore this particular applet. # not resolved. The easiest solution is to ignore this particular applet.
@ -47,7 +44,7 @@ fi
# All back slashes are escaped (/ => \/) in order to keep the 'sed' command stable. # All back slashes are escaped (/ => \/) in order to keep the 'sed' command stable.
GLIBC_PREPARED_ESCAPED=$(echo \"$GLIBC_PREPARED\" | sed 's/\//\\\//g') GLIBC_PREPARED_ESCAPED=$(echo \"$GLIBC_PREPARED\" | sed 's/\//\\\//g')
# Now we tell BusyBox to use the glibc installation area. # Now we tell BusyBox to use the glibc prepared area.
sed -i "s/.*CONFIG_SYSROOT.*/CONFIG_SYSROOT=$GLIBC_PREPARED_ESCAPED/" .config sed -i "s/.*CONFIG_SYSROOT.*/CONFIG_SYSROOT=$GLIBC_PREPARED_ESCAPED/" .config
# Compile busybox with optimization for "parallel jobs" = "number of processors". # Compile busybox with optimization for "parallel jobs" = "number of processors".
@ -58,7 +55,9 @@ make \
# Create the symlinks for busybox. The file 'busybox.links' is used for this. # Create the symlinks for busybox. The file 'busybox.links' is used for this.
echo "Generating BusyBox based initramfs area..." echo "Generating BusyBox based initramfs area..."
make CONFIG_PREFIX="../busybox_installed" install make \
CONFIG_PREFIX="../busybox_installed" \
install
cd ../../.. cd ../../..

View File

@ -22,14 +22,14 @@ rm -f linuxrc
# Copy all source files to '/src'. Note that the scripts won't work there. # Copy all source files to '/src'. Note that the scripts won't work there.
cp ../../*.sh src cp ../../*.sh src
cp ../../.config src cp ../../.config src
cp ../../*.txt src cp ../../README src
cp -r ../../08_generate_rootfs src cp -r ../../08_generate_rootfs src
cp -r ../../11_generate_iso src cp -r ../../11_generate_iso src
# Make all files readable and all scripts executable. # Make all files readable and all scripts executable.
chmod -R +rx **/*.sh chmod -R +rx **/*.sh
chmod -R +r **/.config chmod -R +r **/.config
chmod -R +r **/*.txt chmod -R +r **/README
# Copy all necessary 'glibc' libraries to '/lib' BEGIN. # Copy all necessary 'glibc' libraries to '/lib' BEGIN.

View File

@ -41,10 +41,10 @@ cp ../rootfs.cpio.xz ./rootfs.xz
mkdir src mkdir src
cp ../../*.sh src cp ../../*.sh src
cp ../../.config src cp ../../.config src
cp ../../*.txt src cp ../../README src
chmod +rx src/*.sh chmod +rx src/*.sh
chmod +r src/.config chmod +r src/.config
chmod +r src/*.txt chmod +r src/README
# Read the 'OVERLAY_TYPE' property from '.config' # Read the 'OVERLAY_TYPE' property from '.config'
OVERLAY_TYPE="$(grep -i OVERLAY_TYPE $SRC_DIR/.config | cut -f2 -d'=')" OVERLAY_TYPE="$(grep -i OVERLAY_TYPE $SRC_DIR/.config | cut -f2 -d'=')"