*** empty log message ***

2 files changed, 21 insertions, 17 deletions

diff --git a/scripts/autodist.sh b/scripts/autodist.sh
index f68a6116fa03..68b146c195ef 100644
--- a/scripts/autodist.sh
+++ b/scripts/autodist.sh
@@ -17,6 +17,8 @@ ISOROOT="${AUTODISTDIR}/isoroot"
 INITRDROOT="${AUTODISTDIR}/initrdroot"
 [ -z "${BUILDTARBALL}" ] && BUILDTARBALL="build-${TODAY}.tbz2"
 [ -z "${SYSTARBALL}" ] && SYSTARBALL="sys-${TODAY}.tbz2"
+# shouldn't allow CFLAGS to be overridden
+export CFLAGS="-O2 -mcpu=i486 -march=i486"
 
 [ -d "${DISTRODIR}" ] || mkdir -p "${DISTRODIR}"
 
@@ -25,6 +27,9 @@ INITRDROOT="${AUTODISTDIR}/initrdroot"
 [ -z "${SYS_PACKAGES}" ] && SYS_PACKAGES=`ls -1 ${PORTDIR}/files/sys-*.packages | sort | tail -1`
 [ -z "${KERNEL_SRC}" ] && KERNEL_SRC="/usr/src/`readlink /usr/src/linux`"
 [ -z "${KERNEL_VERSION}" ] && KERNEL_VERSION="`echo ${KERNEL_SRC} | sed 's,.*-\([0-9]\.[0-9]\.[0-9]\+\(-ac[0-9]\+\)\?\)$,\1,'`"
+export PORTDIR
+export DISTRODIR
+export AUTODISTDIR
  
 if grep -qs "${AUTODISTDIR}" /proc/mounts
 then
@@ -56,14 +61,25 @@ echo ">>> Cleaning up ${AUTODISTDIR}..."
 rm -rf ${AUTODISTDIR}
 
 echo ">>> Creating ISO directory tree..."
-mkdir -p
-mkdir -v ${ISOROOT}/{doc,gentoo{,/distfiles,/packages{,/All}},isolinux{,/kernels},stuff}
+mkdir -pv ${ISOROOT}/{doc,gentoo{,/distfiles,/packages{,/All}},isolinux{,/kernels},stuff}
 
-echo ">>> Building initrd..."
-mkdir -p "${INITRDROOT}"
+echo ">>> Building initrd packages..."
+mkdir -p ${INITRDROOT}
 ERRQUIT=yes CHECK=no USE=bootcd ROOT="${INITRDROOT}" STEPS="clean unpack compile install qmerge clean" ${PORTDIR}/scripts/autocompile.sh ${ISOINITRD_PACKAGES}
 if [ ${?} != 0 ]
 then
-    echo "Error building initrd, quitting"
+    echo "Error building initrd packages, quitting"
     exit 1
 fi
+echo ">>> Cleaning up ${INITRDROOT}/tmp"
+rm -rf ${INITRDROOT}/tmp/*
+
+echo ">>> Setting up initrd..."
+find ${INITRDROOT}/etc -name "*._cfg_*" exec rm -vf {} \;
+for dir in etc{,/rc.d{,/config,/init.d,/rc{1,2,3,4,5,boot,halt}}.d}
+do
+  cp -v ${PORTDIR}/files/isoinitrd/${dir}/* ${INITRDROOT}/${dir}
+done
+ROOT=${INITRDROOT} rc-update autogen boot force
+ROOT=${INITRDROOT} rc-update autogen normal force
+ROOT=${INITRDROOT} rc-update autogen halt force
diff --git a/scripts/sortpkglist.py b/scripts/sortpkglist.py
index 233fbb237c59..c589046e7476 100644
--- a/scripts/sortpkglist.py
+++ b/scripts/sortpkglist.py
@@ -8,15 +8,3 @@
 import portage
 import sys
 
-digraph = portage.digraph()
-
-if len(sys.argv) != 2:
-	print 'usage: %s packagelist' % sys.argv[0]
-
-try:
-	packagelist = open(sys.argv[1], "r")
-except:
-	sys.stderr.write("could not open %s\n" % sys.argv[1])
-	sys.exit(1)
-
-packages = packagelist.readlines()