[Lunar-commits] r15453 - lunar-iso/branches/lunar-iso-2.6/scripts

[Jaime Buffery]

Author: nestu
Date: 2005-06-23 10:42:17 +0000 (Thu, 23 Jun 2005)
New Revision: 15453

Modified:
   lunar-iso/branches/lunar-iso-2.6/scripts/cachefill
   lunar-iso/branches/lunar-iso-2.6/scripts/rebuild
   lunar-iso/branches/lunar-iso-2.6/scripts/unpack
Log:
Using core.list with the very basic depends for chroot. All sources are still cp'ed to the chroot child install, but only the core.list cache tarballs are cp'ed. These tarballs are compiled before the rest, to create a working basic system in chroot. Fixes damn bloody perl issue, cause one of its depend was mucking everything up.

Modified: lunar-iso/branches/lunar-iso-2.6/scripts/cachefill
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/cachefill	2005-06-23 10:39:33 UTC (rev 15452)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/cachefill	2005-06-23 10:42:17 UTC (rev 15453)
@@ -9,9 +9,8 @@
 
 mkdir -p ${ISO_SOURCE}/{spool,cache}
 
-# unpack all the ISO required var/cache/lunar tarballs
-# in case of file conflict preserve glibc and gcc files first!
-for mod in ${ISO_LUNAR_MODULE} $(cat conf/base.list conf/base.list-$ISO_KSUFFIX conf/extended.list) ; do
+# unpack only the ISO core required var/cache/lunar tarballs
+for mod in ${ISO_LUNAR_MODULE} $(cat conf/core.list) ; do
   CACHE=$mod-$(module_version $mod)-$BUILD.tar.bz2
   if [ ! -f ${ISO_SOURCE}/cache/$CACHE ]; then
     echo "# $mod: $CACHE"
@@ -20,7 +19,7 @@
 done
 
 # fill var/spool/lunar dir
-for mod in $(cat conf/sources.list conf/sources.list-${ISO_KSUFFIX} conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do
+for mod in $(cat conf/core.list conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list conf/sources.list conf/sources.list-${ISO_KSUFFIX}) ; do
   for file in $(lvu sources $mod) ; do
     if [ ! -f ${ISO_SOURCE}/spool/$file ] ; then
       echo -e "# $mod: $file"

Modified: lunar-iso/branches/lunar-iso-2.6/scripts/rebuild
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/rebuild	2005-06-23 10:39:33 UTC (rev 15452)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/rebuild	2005-06-23 10:42:17 UTC (rev 15453)
@@ -17,11 +17,11 @@
 mount -t proc proc $ISO_TARGET/proc
 
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-echo "+          STARTING CONFIGURING MODULES                +"
+echo "+         STARTING CONFIGURE OF CORE MODULES           +"
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 echo ""
 
-for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do
+for mod in $(cat conf/core.list) ; do
   # this will be harmless if all the modules have been lined already
   # that is normally the case, otherwise cachefill would b0rk.
   chroot $ISO_TARGET /sbin/lin --deps $mod
@@ -35,29 +35,47 @@
 chroot $ISO_TARGET rm -rf /var/build/makedev-*
 
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-echo "+          STARTING KERNEL COMPILE                     +"
+echo "+       STARTING COMPILE PHASE OF CORE MODULES         +"
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 echo ""
 
+for mod in $(cat conf/core.list)
+do
+  chroot $ISO_TARGET /sbin/lin -c $mod
+done
+
+echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+echo "+      STARTING CONFIGURE OF THE REST OF MODULES       +"
+echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+echo ""
+
+for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do
+  # this will be harmless if all the modules have been lined already
+  # that is normally the case, otherwise cachefill would b0rk.
+  chroot $ISO_TARGET /sbin/lin --deps $mod
+done
+
+echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+echo "+            STARTING KERNEL COMPILE                   +"
+echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+echo ""
+
 yes '' | chroot $ISO_TARGET lin linux-${ISO_KSUFFIX}
 chroot $ISO_TARGET lin kernel-headers-${ISO_KSUFFIX}
 
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
-echo "+          STARTING COMPILE PHASE OF ALL MODULES       +"
+echo "+      STARTING COMPILE PHASE OF REST OF MODULES       +"
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 echo ""
 
-# perl is notoriously problematic and needs to be built before glibc
-chroot $ISO_TARGET lin perl
-
 for mod in $(cat conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do
   chroot $ISO_TARGET /sbin/lin -c $mod
 done
 
 # openssh installs ssh keys so these are now tracked in the module :^(
-chroot $ISO_TARGET /sbin/lin -c openssh
+#chroot $ISO_TARGET /sbin/lin -c openssh
 # e2fsprogs nabs /etc/mtab
-chroot $ISO_TARGET /sbin/lin -c e2fsprogs
+#chroot $ISO_TARGET /sbin/lin -c e2fsprogs
 
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 echo "+          REBUILD FINISHED                            +"

Modified: lunar-iso/branches/lunar-iso-2.6/scripts/unpack
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/scripts/unpack	2005-06-23 10:39:33 UTC (rev 15452)
+++ lunar-iso/branches/lunar-iso-2.6/scripts/unpack	2005-06-23 10:42:17 UTC (rev 15453)
@@ -19,9 +19,9 @@
 }
 
 
-# unpack all the ISO required var/cache/lunar tarballs
-# in case of file conflict preserve glibc and gcc files first!
-for mods in ${ISO_LUNAR_MODULE} $(cat conf/base.list conf/base.list-$ISO_KSUFFIX conf/extended.list) ; do
+# unpack the core ISO required var/cache/lunar tarballs
+for mods in ${ISO_LUNAR_MODULE} $(cat conf/core.list)
+do
   resurrect $mods
 done
 
@@ -29,7 +29,8 @@
 cp -a /usr/include/{linux,asm} $ISO_TARGET/usr/include/
 
 # fill var/spool/lunar dir
-for mod in $(cat conf/sources.list conf/sources.list-${ISO_KSUFFIX} conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list) ; do
+for mod in $(cat conf/core.list conf/base.list conf/base.list-${ISO_KSUFFIX} conf/extended.list conf/sources.list conf/sources.list-${ISO_KSUFFIX}) ; do
+do
   for file in $(lvu sources $mod) ; do
     echo -n "."
     if [ -f ${ISO_SOURCE}/spool/$file ] ; then