checking in initial revisions
authorJohn P. Davis <zhen@gentoo.org>
Wed, 15 Oct 2003 05:12:06 +0000 (05:12 +0000)
committerJohn P. Davis <zhen@gentoo.org>
Wed, 15 Oct 2003 05:12:06 +0000 (05:12 +0000)
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@7 d1e1f19c-881f-0410-ab34-b69fee027534

targets/stage1/build.sh [deleted file]
targets/stage1/stage1.sh [new file with mode: 0755]
targets/stage1/stage1strap.sh [new file with mode: 0755]

diff --git a/targets/stage1/build.sh b/targets/stage1/build.sh
deleted file mode 100755 (executable)
index 1c43e0c..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-               
-env-update
-source /etc/profile
-case $1 in
-       build)
-               # now, we fix the default make.profile symlink to be in line with the current profile being used.
-               cd /etc
-               rm -f make.profile
-               ln -sf ../usr/portage/profiles/default-${MAINARCH}-${MAINVERSION} make.profile
-               #emerge --oneshot --nodeps --usepkg --buildpkg ccache || exit 1
-               export ROOT=${2}
-               install -d $ROOT
-               for x in $(/usr/portage/scripts/build.sh ${MAINARCH}-${MAINVERSION})
-               do
-                       echo $x >> /tmp/build.log
-                       USE="-* build" emerge --usepkg --buildpkg --noreplace $x || exit 1
-               done
-       ;;
-
-       clean)
-               export ROOT=${2}
-               #emerge -C ccache
-               keepers="sys-kernel/linux-headers sys-devel/binutils sys-devel/gcc sys-apps/baselayout sys-libs/glibc virtual/glibc virtual/kernel sys-devel/gettext"
-               # set everything to uid 999 (nouser)
-               cd ${ROOT}
-               install -d var/db/pkg2
-               for x in $keepers
-               do
-                       category=${x%%/*}
-                       package=${x##*/}
-                       [ "`ls var/db/pkg/${x}* 2>/dev/null`" = "" ] && continue
-                       install -d var/db/pkg2/${category}
-                       mv var/db/pkg/${category}/${package}* var/db/pkg2/${category}
-               done
-               rm -rf var/db/pkg
-               mv var/db/pkg2 var/db/pkg
-
-               # clean out man, info and doc files
-               rm -rf usr/share/{man,doc,info}/*
-
-               # zap all .pyc and .pyo files
-               find -iname "*.py[co]" -exec rm -f {} \;
-
-               # cleanup all .a files except libgcc.a, *_nonshared.a and /usr/lib/portage/bin/*.a
-               find -iname "*.a" | grep -v 'libgcc.a' | grep -v 'nonshared.a' | grep -v '/usr/lib/portage/bin/' | grep -v 'libgcc_eh.a' | xargs rm -f
-               chroot ${ROOT} /bin/bash << EOF
-               #now, some finishing touches to initialize gcc-config....
-               unset ROOT
-               if [ -e /usr/sbin/gcc-config ]
-               then
-                       mythang=\$( cd /etc/env.d/gcc; ls ${CHOST}-* )
-                       gcc-config \${mythang}; env-update; source /etc/profile
-               fi
-               #fix up profile symlink in chroot
-               cd /etc
-               rm -f make.profile
-               ln -sf ../usr/portage/profiles/default-${MAINARCH}-${MAINVERSION} make.profile
-EOF
-               ;;
-esac
-       
diff --git a/targets/stage1/stage1.sh b/targets/stage1/stage1.sh
new file mode 100755 (executable)
index 0000000..2622003
--- /dev/null
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ "${1}" ]; then
+       ver=${1}
+else
+       ver=x86-1.4
+fi
+
+for x in `cat /usr/portage/profiles/${BUILDTYPE}-${ver}/packages.build`
+do
+       myp=$(grep -E "${x}(-[^[:space:]]*)?[[:space:]]*$" /usr/portage/profiles/${BUILDTYPE}-${ver}/packages | grep -v '^#' | sed -e 's:^\*::' | cat )
+       if [ "$myp" = "" ]
+       then
+               #if not in the system profile, include it anyway
+               echo $x
+       else
+               echo $myp
+       fi
+done
diff --git a/targets/stage1/stage1strap.sh b/targets/stage1/stage1strap.sh
new file mode 100755 (executable)
index 0000000..faaa628
--- /dev/null
@@ -0,0 +1,18 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1strap.sh,v 1.1 2003/10/15 05:12:06 zhen Exp $
+
+cp ${SHAREDIR}/bin/stage1.sh ${CHROOTDIR}/tmp
+cp ${SHAREDIR}/bin/build.sh ${CHROOTDIR}/tmp
+
+#CHOST is for the gcc-config initialization step
+export MAINVERSION MAINARCH CHOST BUILDTYPE
+#get our make.conf instide our new tree
+#good idea because make.conf should be there.
+#also necessary because the "stage1" script runs gcc-config, which
+#uses portage, which requires /etc/make.conf to exist.
+
+makeconf ${CHROOTDIR}/tmp/stage1root
+$CHROOT . /tmp/stage1 build /tmp/stage1root
+[ $? -ne 0 ] && die "Stage 1 build failure"
+