10 files changed, 38 insertions, 40 deletions
diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph
index 83c05bb5..1bbd97a6 100644
--- a/strata/build-essential/busybox.morph
+++ b/strata/build-essential/busybox.morph
@@ -5,12 +5,14 @@ configure-commands:
 # Busybox's default config has everything enabled.
 - make defconfig KCONFIG_NOTIMESTAMP=1
 
-- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' -i .config
-- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' -i .config
+- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|'
+  -i .config
+- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|'
+  -i .config
 
 # Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin.
-- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config'
-
+- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/''
+  -i .config'
 # We have GAWK, but in GENIVI baseline we want to get rid of it
 # - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config
 
@@ -31,11 +33,16 @@ configure-commands:
 - sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
 
 # General features that we don't need.
-- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not
+  set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/'
+  -i .config
 - sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
 - sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
 - sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
@@ -52,8 +59,10 @@ configure-commands:
 
 # Now turn on some little bits we do need
 - sed -e 's/# CONFIG_BBCONFIG is not set/CONFIG_BBCONFIG=y/' -i .config
-- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/' -i .config
-- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/' -i .config
+- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/'
+  -i .config
+- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/'
+  -i .config
 
 
 build-commands:
@@ -64,7 +73,6 @@ install-commands:
   if [ "$PREFIX" = /usr ]; then PREFIX=; fi &&
     make CONFIG_PREFIX="$DESTDIR$PREFIX" KCONFIG_NOTIMESTAMP=1 install &&
     chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
-
 # Set up man environment variables
 - mkdir -p "$DESTDIR"/etc
 - |
diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.morph
index a9d25ac1..235de323 100644
--- a/strata/build-essential/gcc.morph
+++ b/strata/build-essential/gcc.morph
@@ -15,8 +15,7 @@ products:
   # everything else gcc produces is required for compiling
   # this is the -devel artifact instead of -misc, since it goes in -devel
   # stratum artifacts by default
-  include: [ .* ]
-
+  include: [.*]
 configure-commands:
 - mkdir o
 
@@ -44,7 +43,6 @@ configure-commands:
     `# [2]` --with-system-zlib                                \
     `# [3]` --disable-multilib                                \
             --enable-languages=c,c++,fortran
-
 build-commands:
 - |
   case "$MORPH_ARCH" in
@@ -54,11 +52,8 @@ build-commands:
                 sed -i "s/--target=none/--target=armv7a/" o/Makefile ;;
   esac
   cd o && make
-
 install-commands:
 - cd o && make DESTDIR="$DESTDIR" install
 - ln -s gcc "$DESTDIR/$PREFIX/bin/cc"
-- >
-  for fortran_alias in f77 f90 f95; do
-      ln -s gfortran "$DESTDIR/$PREFIX/bin/$fortran_alias"
-  done
+- "for fortran_alias in f77 f90 f95; do\n    ln -s gfortran \"$DESTDIR/$PREFIX/bin/$fortran_alias\"\
+  \ndone\n"
diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph
index f820547d..5f625b21 100644
--- a/strata/build-essential/glibc.morph
+++ b/strata/build-essential/glibc.morph
@@ -20,6 +20,7 @@ products:
   - (usr/)?lib/libSegFault\.so(\.\d+)*$
 - artifact: glibc-libs
   include:
+  
   # This is processed after bins, so bins can take libSegFault.so
   - (usr/)?lib(32|64)?/lib[^/]*\.so(\.\d+)*$
   - etc/ld.so.conf
@@ -63,7 +64,6 @@ configure-commands:
     --without-cvs \
     --without-selinux \
     --enable-obsolete-rpc
-
 build-commands:
 - cd o && make localtime=UTC
 
diff --git a/strata/build-essential/stage1-gcc.morph b/strata/build-essential/stage1-gcc.morph
index 6418ed6a..1b9a2304 100644
--- a/strata/build-essential/stage1-gcc.morph
+++ b/strata/build-essential/stage1-gcc.morph
@@ -7,7 +7,6 @@ configure-commands:
   sed -i -e '/k prot/a \
   gcc_cv_libc_provides_ssp=yes
   ' gcc/configure
-
 - mkdir o
 
 # Configure flag notes:
@@ -62,7 +61,6 @@ configure-commands:
     `# [5]` --disable-libcilkrts                              \
     `# [5]` --disable-libstdc++-v3                            \
             --enable-languages=c,c++
-
 build-commands:
 - |
   # GCC is not passing the correct host/target flags to GMP's configure
@@ -78,6 +76,5 @@ build-commands:
                 sed -i "s/--target=none/--target=armv7a/" o/Makefile ;;
   esac
   cd o && make
-
 install-commands:
 - cd o && make DESTDIR="$DESTDIR" install
diff --git a/strata/build-essential/stage2-binutils.morph b/strata/build-essential/stage2-binutils.morph
index b07b56a4..e1a175b0 100644
--- a/strata/build-essential/stage2-binutils.morph
+++ b/strata/build-essential/stage2-binutils.morph
@@ -14,7 +14,6 @@ configure-commands:
     --build=$(sh config.guess) \
     --host=$TARGET_STAGE1 \
     --target=$TARGET_STAGE1
-
 build-commands:
 - |
   export STAGE2_SYSROOT="$(dirname $(pwd))"
diff --git a/strata/build-essential/stage2-busybox.morph b/strata/build-essential/stage2-busybox.morph
index 73803f89..030e50ec 100644
--- a/strata/build-essential/stage2-busybox.morph
+++ b/strata/build-essential/stage2-busybox.morph
@@ -8,8 +8,8 @@ configure-commands:
 - make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- KCONFIG_NOTIMESTAMP=1 defconfig
 
 # Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin.
-- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config'
-
+- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/''
+  -i .config'
 # We have GAWK.
 - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config
 
@@ -30,13 +30,19 @@ configure-commands:
 - sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
 
 # General features that we don't need.
-- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not
+  set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/'
+  -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/'
+  -i .config
 - sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/'
+  -i .config
 - sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
 - sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
 - sed -e 's/CONFIG_HALT=y.*/# CONFIG_HALT is not set/' -i .config
@@ -59,7 +65,6 @@ build-commands:
   export CPPFLAGS="--sysroot=$STAGE2_SYSROOT"
   export LDFLAGS="--sysroot=$STAGE2_SYSROOT"
   make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- KCONFIG_NOTIMESTAMP=1
-
 install-commands:
 # We expect to be built with a non-standard prefix in stage 2 (i.e. not
 # /usr). The install will break if prefix is set to /usr.
diff --git a/strata/build-essential/stage2-gcc-fixed-headers.morph b/strata/build-essential/stage2-gcc-fixed-headers.morph
index 10794872..be8bcdd5 100644
--- a/strata/build-essential/stage2-gcc-fixed-headers.morph
+++ b/strata/build-essential/stage2-gcc-fixed-headers.morph
@@ -16,4 +16,3 @@ install-commands:
   mkdir -p "$DESTDIR/$target_libgcc_dir/include-fixed"
   cat "gcc/limitx.h" "gcc/glimits.h" "gcc/limity.h" \
       >"$DESTDIR/$target_libgcc_dir/include-fixed/limits.h"
-
diff --git a/strata/build-essential/stage2-gcc.morph b/strata/build-essential/stage2-gcc.morph
index cd600e18..f46addd1 100644
--- a/strata/build-essential/stage2-gcc.morph
+++ b/strata/build-essential/stage2-gcc.morph
@@ -48,7 +48,6 @@ configure-commands:
             --disable-libgomp                                  \
             --disable-libstdcxx-pch                            \
             --enable-languages=c,c++
-
 build-commands:
 - |
   case "$MORPH_ARCH" in
@@ -59,7 +58,6 @@ build-commands:
   esac
   export STAGE2_SYSROOT="$(dirname $(pwd))"
   cd o && make
-
 install-commands:
 - cd o && make DESTDIR="$DESTDIR" install
 
diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph
index f44d0ebb..6c1e8dd8 100644
--- a/strata/build-essential/stage2-glibc.morph
+++ b/strata/build-essential/stage2-glibc.morph
@@ -26,7 +26,6 @@ configure-commands:
     `# [3]` --disable-profile  --enable-kernel=2.6.25 \
     `# [4]` libc_cv_c_cleanup=yes libc_cv_ctors_header=yes \
             libc_cv_forced_unwind=yes libc_cv_ssp=no
-
 build-commands:
 - cd o && make localtime=UTC
 
@@ -77,7 +76,6 @@ install-commands:
   # The dangling symlink will not make it onto the final system, just
   # like all other bootstrap only components.
   ln -s specs-for-sysroot "$target_specs_dir/specs"
-
 # Install a symlink for the program interpreter (ld.so) so that binaries
 # built in stage 3 before the stage 3 glibc is built can use it.
 # FIXME: get a better way of finding the name of the loader. The lib64
diff --git a/strata/build-essential/stage2-libstdc++.morph b/strata/build-essential/stage2-libstdc++.morph
index 3d89ad85..28eae93d 100644
--- a/strata/build-essential/stage2-libstdc++.morph
+++ b/strata/build-essential/stage2-libstdc++.morph
@@ -28,7 +28,6 @@ configure-commands:
     `# [1]` --disable-libstdcxx-threads                       \
     `# [2]` --disable-libstdcxx-pch                           \
     `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/4.9.2
-
 build-commands:
 - cd o && make