Mercurial > hg > aboriginal

changeset 501:f4c854520446

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Now that UML is toast, the build no longer needs oneit.
author Rob Landley <rob@landley.net>
date Sat, 29 Nov 2008 20:40:01 -0600
parents 63e8b28ea07f
children 9a36ec9d02f7
files host-tools.sh
diffstat 1 files changed, 6 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/host-tools.sh	Fri Nov 28 15:00:06 2008 -0600
+++ b/host-tools.sh	Sat Nov 29 20:40:01 2008 -0600
@@ -21,19 +21,6 @@
 
 if [ ! -z "$RECORD_COMMANDS" ] && [ ! -f "$BUILD/wrapdir/wrappy" ]
 then
-  # package-mini-native.sh needs oneit.  Until UML goes away, anyway.
-
-  if [ ! -f "${HOSTTOOLS}/toybox" ]
-  then
-    setupfor toybox &&
-    make defconfig &&
-    make &&
-    mv toybox "${HOSTTOOLS}"/oneit &&
-    cd ..
-
-    cleanup toybox
-  fi
-
   echo setup wrapdir
 
   # Build the wrapper and install it into build/wrapdir/wrappy
@@ -94,15 +81,16 @@
   if [ ! -f "${HOSTTOOLS}/toybox" ]
   then
     setupfor toybox &&
-    make defconfig &&
-    make &&
     if [ -z "$USE_TOYBOX" ]
     then
-      cp toybox "$HOSTTOOLS" &&
-      ln -s toybox "$HOSTTOOLS/oneit" &&
-      ln -s toybox "$HOSTTOOLS/patch" &&
+      echo "CONFIG_PATCH=y" > mini.conf &&
+      make allnoconfig KCONFIG_ALLCONFIG=mini.conf &&
+      make &&
+      mv toybox "$HOSTTOOLS"/patch &&
       cd ..
     else
+      make defconfig &&
+      make &&
       make install_flat PREFIX="${HOSTTOOLS}" &&
       cd ..
     fi