aboriginal: root-filesystem.sh comparison

comparison root-filesystem.sh @ 713:9282f84b31a1

Add NATIVE_TOOLCHAIN=only, to build _just_ the native toolchain (sae set of packages as the cross compiler, only --enable-shared and with uClibc++).

author	Rob Landley <rob@landley.net>
date	Fri, 10 Apr 2009 03:32:41 -0500
parents	20ba34b54140
children	db04bd3c11e0

comparison

equal deleted inserted replaced

-:9d766670154a
+:9282f84b31a1
 mkdir -p "$TOOLS/$i" || dienow
 ln -s "usr/$i" "${NATIVE_ROOT}/$i" || dienow
 done
 fi
-# Copy qemu setup script and so on.
-cp -r "${SOURCES}/native/." "${TOOLS}/" &&
-cp "$SRCDIR"/MANIFEST "${TOOLS}/src" || dienow
-if [ -z "${NATIVE_TOOLSDIR}" ]
-then
-sed -i -e 's@/tools/@/usr/@g' "${TOOLS}/sbin/init.sh" || dienow
-fi
 # Install Linux kernel headers.
 setupfor linux
 # Install Linux kernel headers (for use by uClibc).
 make headers_install -j "$CPUS" ARCH="${KARCH}" INSTALL_HDR_PATH="${TOOLS}" &&
 # Build and install uClibc.  (We could just copy the one from the compiler
 # toolchain, but this is cleaner.)
 setupfor uClibc
 make CROSS="${ARCH}-" KCONFIG_ALLCONFIG="$(getconfig uClibc)" allnoconfig &&
-cp .config "${TOOLS}"/src/config-uClibc || dienow
+cp .config "${WORK}"/config-uClibc || dienow
 # Alas, if we feed install and install_utils to make at the same time with
 # -j > 1, it dies.  Not SMP safe.
 for i in install install_utils
 do
 UCLIBC_LDSO_NAME=ld-uClibc -j $CPUS $i || dienow
 done
 cd ..
 cleanup uClibc
-# Build and install toybox
-setupfor toybox
-make defconfig &&
-if [ -z "$USE_TOYBOX" ]
-then
-make CROSS="${ARCH}-" &&
-cp toybox "$TOOLS/bin" &&
-ln -s toybox "$TOOLS/bin/patch" &&
-ln -s toybox "$TOOLS/bin/oneit" &&
-ln -s toybox "$TOOLS/bin/netcat" &&
-cd ..
-else
-make install_flat PREFIX="${TOOLS}"/bin CROSS="${ARCH}-" &&
-rm "${TOOLS}"/bin/sh &&  # Bash won't install if this exists.
-cd ..
-fi
-cleanup toybox
-# Build and install busybox
-setupfor busybox
-make allyesconfig KCONFIG_ALLCONFIG="${SOURCES}/trimconfig-busybox" &&
-make -j $CPUS CROSS_COMPILE="${ARCH}-" $VERBOSITY &&
-make busybox.links &&
-cp busybox "${TOOLS}/bin"
-[ $? -ne 0 ] && dienow
-for i in $(sed 's@.*/@@' busybox.links)
-do
-ln -s busybox "${TOOLS}/bin/$i" # || dienow
-done
-cd ..
-cleanup busybox
 if [ "$NATIVE_TOOLCHAIN" == "none" ]
 then
 # If we're not installing a compiler, delete the headers, static libs,
 	# and example source code.
 ln -s libuClibc++.a "${TOOLS}"/lib/libstdc++.a &&
 cd ..
 cleanup uClibc++
+fi # End of NATIVE_TOOLCHAIN build
+if [ "$NATIVE_TOOLCHAIN" != "only" ]
+then
+# Copy qemu setup script and so on.
+cp -r "${SOURCES}/native/." "${TOOLS}/" &&
+cp "$SRCDIR"/MANIFEST "${TOOLS}/src" &&
+cp "${WORK}/config-uClibc" "${TOOLS}/src/config-uClibc" || dienow
+if [ -z "${NATIVE_TOOLSDIR}" ]
+then
+sed -i -e 's@/tools/@/usr/@g' "${TOOLS}/sbin/init.sh" || dienow
+fi
+# Build and install toybox
+setupfor toybox
+make defconfig &&
+if [ -z "$USE_TOYBOX" ]
+then
+make CROSS="${ARCH}-" &&
+cp toybox "$TOOLS/bin" &&
+ln -s toybox "$TOOLS/bin/patch" &&
+ln -s toybox "$TOOLS/bin/oneit" &&
+ln -s toybox "$TOOLS/bin/netcat" &&
+cd ..
+else
+make install_flat PREFIX="${TOOLS}"/bin CROSS="${ARCH}-" &&
+cd ..
+fi
+cleanup toybox
+# Build and install busybox
+setupfor busybox
+make allyesconfig KCONFIG_ALLCONFIG="${SOURCES}/trimconfig-busybox" &&
+cp .config "${TOOLS}"/src/config-busybox &&
+make -j $CPUS CROSS_COMPILE="${ARCH}-" $VERBOSITY &&
+make busybox.links &&
+cp busybox "${TOOLS}/bin"
+[ $? -ne 0 ] && dienow
+for i in $(sed 's@.*/@@' busybox.links)
+do
+# Allowed to fail.
+ln -s busybox "${TOOLS}/bin/$i" 2>/dev/null
+done
+cd ..
+cleanup busybox
 # Build and install make
 setupfor make
 CC="${ARCH}-gcc" ./configure --prefix="${TOOLS}" --build="${CROSS_HOST}" \
 --host="${CROSS_TARGET}" &&
 make -j $CPUS install &&
 cd ..
 cleanup make
-# Remove the busybox /bin/sh link so the bash install doesn't get upset.
+# Build and install bash.  (Yes, this is an old version.  It's intentional.)
-rm "$TOOLS"/bin/sh
-# Build and install bash.  (Yes, this is an old version.  I prefer it.)
-# I plan to replace it with toysh anyway.
 setupfor bash
+# Remove existing /bin/sh link (busybox) so the bash install doesn't get upset.
+#rm "$TOOLS"/bin/sh
 # wire around some tests ./configure can't run when cross-compiling.
 cat > config.cache << EOF &&
 ac_cv_func_setvbuf_reversed=no
 bash_cv_sys_named_pipes=yes
 bash_cv_have_mbstate_t=yes
 --without-bash-malloc --disable-readline &&
 # note: doesn't work with -j
 make &&
 make install &&
 # Make bash the default shell.
-ln -s bash "${TOOLS}/bin/sh" &&
+ln -sf bash "${TOOLS}/bin/sh" &&
 cd ..
 cleanup bash
 setupfor distcc
 cleanup distcc
 # Put statically and dynamically linked hello world programs on there for
 # test purposes.
-"${ARCH}-gcc" "${SOURCES}/toys/hello.c" -Os -s -o "${TOOLS}/bin/hello-dynamic"  &&
+"${ARCH}-gcc" "${SOURCES}/toys/hello.c" -Os -s -o "${TOOLS}/bin/hello-dynamic" &&
 "${ARCH}-gcc" "${SOURCES}/toys/hello.c" -Os -s -static -o "${TOOLS}/bin/hello-static"
 [ $? -ne 0 ] && dienow
+fi   # End of NATIVE_TOOLCHAIN != only
 # Delete some unneeded files
 rm -rf "${TOOLS}"/{info,man,libexec/gcc/*/*/install-tools}
-# End of NATIVE_TOOLCHAIN
-fi
 # Clean up and package the result
 "${ARCH}-strip" "${TOOLS}"/{bin/*,sbin/*,libexec/gcc/*/*/*}
 "${ARCH}-strip" --strip-unneeded "${TOOLS}"/lib/*.so
 create_stage_tarball root-filesystem
-if [ ! -z "$NATIVE_RETROFIT_CXX" ]
-then
-[ -z "$NATIVE_TOOLSDIR" ] && SUBDIR=usr || SUBDIR=tools
-(cd "${BUILD}/root-filesystem-$ARCH"/$SUBDIR &&
-tar c c++ lib/*c++* lib/libgcc_s.so* || dienow) |
-(tar xC "${BUILD}/cross-compiler-$ARCH" || dienow)
-create_stage_tarball cross-compiler
-fi
 # Color back to normal
 echo -e "\e[0mBuild complete"

Mercurial > hg > aboriginal

comparison root-filesystem.sh @ 713:9282f84b31a1