portage-overlay/dev-util/catalyst/files/catalyst-fd.patch

   1 diff -urN catalyst-2.0.6-a/modules/generic_stage_target.py catalyst-2.0.6-b/modules/generic_stage_target.py
   2 --- catalyst-2.0.6-a/modules/generic_stage_target.py    2008-05-29 05:30:10.000000000 +0100
   3 +++ catalyst-2.0.6-b/modules/generic_stage_target.py    2009-11-01 10:42:17.000000000 +0000
   4 @@ -426,7 +426,7 @@
   5
   6         def set_snapshot_path(self):
   7                 self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\
   8 -                       "/snapshots/portage-"+self.settings["snapshot"]+".tar.bz2")
   9 +                       "/snapshots/portage-"+self.settings["snapshot"]+".tar.lzma")
  10
  11                 if os.path.exists(self.settings["snapshot_path"]):
  12                         self.settings["snapshot_path_hash"]=\
  13 @@ -684,7 +684,7 @@
  14                                         self.settings["source_path"]+"\nto "+\
  15                                         self.settings["chroot_path"]+\
  16                                                 " (This may take some time) ...\n"
  17 -                               unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+\
  18 +                               unpack_cmd="tar xpf "+self.settings["source_path"]+" --lzma -C "+\
  19                                         self.settings["chroot_path"]
  20                                 error_msg="Tarball extraction of "+\
  21                                         self.settings["source_path"]+" to "+\
  22 @@ -1055,6 +1055,13 @@
  23                         else:
  24                                 myf.write('CXXFLAGS="${CFLAGS}"\n')
  25
  26 +                        myf.write('MAKEOPTS="-j5 --load-average=8"\n')
  27 +                        myf.write('PORTAGE_NICENESS="19"\n')
  28 +                        myf.write('ACCEPT_LICENSE="*"\n')
  29 +                        myf.write('CFLAGS="-Os -mtune=i686 -pipe"\n')
  30 +                        myf.write('CXXFLAGS="-Os -mtune=i686 -pipe"\n')
  31 +                        myf.write('FEATURES="parallel parallel-fetch confcache -collision-protect -protect-owned"\n')
  32 +
  33                         if self.settings.has_key("LDFLAGS"):
  34                                 myf.write("# LDFLAGS is unsupported.  USE AT YOUR OWN RISK!\n")
  35                                 myf.write('LDFLAGS="'+self.settings["LDFLAGS"]+'"\n')
  36 diff -urN catalyst-2.0.6-a/modules/snapshot_target.py catalyst-2.0.6-b/modules/snapshot_target.py
  37 --- catalyst-2.0.6-a/modules/snapshot_target.py 2008-05-29 05:30:11.000000000 +0100
  38 +++ catalyst-2.0.6-b/modules/snapshot_target.py 2009-11-01 10:42:17.000000000 +0000
  39 @@ -17,7 +17,7 @@
  40                 self.settings["target_subpath"]="portage"
  41                 st=self.settings["storedir"]
  42                 self.settings["snapshot_path"]=normpath(st+"/snapshots/portage-"+self.settings["version_stamp"]\
  43 -                       +".tar.bz2")
  44 +                       +".tar.lzma")
  45                 self.settings["tmp_path"]=normpath(st+"/tmp/"+self.settings["target_subpath"])
  46                 if self.settings.has_key("portdir_overlay"):
  47                         print "\nWarning!!!!"
  48 diff -urN catalyst-2.0.6-a/targets/support/chroot-functions.sh catalyst-2.0.6-b/targets/support/chroot-functions.sh
  49 --- catalyst-2.0.6-a/targets/support/chroot-functions.sh        2008-05-29 05:30:09.000000000 +0100
  50 +++ catalyst-2.0.6-b/targets/support/chroot-functions.sh        2009-11-01 10:42:17.000000000 +0000
  51 @@ -126,6 +126,7 @@
  52         else
  53                 clst_myemergeopts="--quiet"
  54         fi
  55 +       clst_myemergeopts="${clst_myemergeopts} --jobs=4 --load-average=8"
  56         if [ -n "${clst_FETCH}" ]
  57         then
  58                 export bootstrap_opts="-f"
  59 diff -urN catalyst-2.0.6-a/targets/support/kmerge.sh catalyst-2.0.6-b/targets/support/kmerge.sh
  60 --- catalyst-2.0.6-a/targets/support/kmerge.sh  2008-05-29 05:30:09.000000000 +0100
  61 +++ catalyst-2.0.6-b/targets/support/kmerge.sh  2009-11-01 10:42:17.000000000 +0000
  62 @@ -99,7 +99,7 @@
  63         fi
  64         if [ "${clst_kernel_merge}" != "" ]
  65         then
  66 -               genkernel --callback="emerge ${gk_callback_opts} ${clst_kernel_merge}" \
  67 +               genkernel --callback="emerge --jobs=4 --load-average=8 ${gk_callback_opts} ${clst_kernel_merge}" \
  68                         ${GK_ARGS} || exit 1
  69         else
  70                 genkernel ${GK_ARGS} || exit 1
  71 diff -urN catalyst-2.0.6-a/targets/support/unmerge.sh catalyst-2.0.6-b/targets/support/unmerge.sh
  72 --- catalyst-2.0.6-a/targets/support/unmerge.sh 2008-05-29 05:30:09.000000000 +0100
  73 +++ catalyst-2.0.6-b/targets/support/unmerge.sh 2009-11-01 12:11:47.000000000 +0000
  74 @@ -2,6 +2,77 @@
  75
  76  source /tmp/chroot-functions.sh
  77
  78 +update_env_settings
  79 +
  80 +DO_EIX=1
  81 +DO_SIZ=0
  82 +DO_LST=0
  83 +
  84 +FILEPATH_PKG='/root/sysresccd-pkg.txt'
  85 +FILEPATH_SIZ='/root/sysresccd-siz.txt'
  86 +FILEPATH_EIX='/root/sysresccd-eix.txt'
  87 +FILEPATH_LST='/root/sysresccd-lst.txt'
  88 +
  89 +# =========================================================================
  90 +# ======================= create the package list =========================
  91 +# =========================================================================
  92 +echo "${clst_packages}" | sed -e "s/ /\n/g" > /root/packages-removed.txt
  93 +equery -q -C list -i | grep -v '^virtual' | grep -v -f /root/packages-removed.txt > ${FILEPATH_PKG}
  94 +
  95 +# -------------------------------------------------------------------------
  96 +if [ -n "(which eix)" ] && [ "${DO_EIX}" = '1' ]
  97 +then
  98 +        echo "---> generating ${FILEPATH_EIX}"
  99 +        /usr/bin/eix-update || echo "eix-update failed"
 100 +        FORMAT='<category>/<name>-<installedversions:VERSION> : <installedversions:FORMAT_INST_USEFLAGS>\n' eix -I -n > /root/eix-temp1.txt
 101 +        cat /root/eix-temp1.txt | grep -v -f /root/packages-removed.txt > /root/eix-temp2.txt
 102 +        cat /root/eix-temp2.txt | grep -v '^virtual' | grep '^[a-z0-9]*-[a-z0-9]*/[a-z0-9]*' > /root/eix-temp3.txt
 103 +        cat /root/eix-temp3.txt | sed -e 's!(!!' -e 's!)!!' -e 's!: $!!g' -e 's! $!!g' > ${FILEPATH_EIX}
 104 +        rm -f /root/eix-temp*.txt
 105 +fi
 106 +
 107 +# -------------------------------------------------------------------------
 108 +if [ -n "(which equery)" ] && [ "${DO_LST}" = '1' ]
 109 +then
 110 +       echo "---> generating ${FILEPATH_LST}"
 111 +       for curpkg in $(cat ${FILEPATH_PKG})
 112 +       do
 113 +               echo "${curpkg}"
 114 +               echo '' >> ${FILEPATH_LST}
 115 +               echo "=========================${curpkg}=========================" >> ${FILEPATH_LST}
 116 +               equery -C files "=${curpkg}" 2>/dev/null | grep '^/' >> ${FILEPATH_LST}
 117 +       done
 118 +fi
 119 +
 120 +# -------------------------------------------------------------------------
 121 +if [ -n "(which equery)" ] && [ "${DO_SIZ}" = '1' ]
 122 +then
 123 +       echo "---> generating ${FILEPATH_SIZ}"
 124 +       for curpkg in $(cat ${FILEPATH_PKG})
 125 +       do
 126 +               pkgfmt=$(echo ${curpkg} | sed -r -e 's!^([A-Za-z0-9-]*)\/([+A-Za-z0-9-]*)-([^-]*)(-r[0-9]){0,2}.*!\1:\2:\3\4 !g')
 127 +               pkgcat=$(echo ${pkgfmt} | cut -d: -f1)
 128 +               pkgnam=$(echo ${pkgfmt} | cut -d: -f2)
 129 +               pkgver=$(echo ${pkgfmt} | cut -d: -f3)
 130 +               sizraw=$(equery -q -C size -b -e ${curpkg} | xargs | sed -r -e 's!.*size\(([0-9]*)\).*!\1!g')
 131 +               sizfmt=$(printf "%0.6d kb" $((sizraw/1024)))
 132 +               output="${sizfmt} --> ${curpkg} --- ${pkgcat}:${pkgnam}:${pkgver}"
 133 +               echo ${output} >> ${FILEPATH_SIZ}
 134 +               echo ${output}
 135 +       done
 136 +fi
 137 +
 138 +# -------------------------------------------------------------------------
 139 +rm -f /root/packages-removed.txt
 140 +# -------------------------------------------------------------------------
 141 +
 142 +# delete the line which contains PORTDIR_OVERLAY in /etc/make.conf (this file is provided with devtools)
 143 +sed -i -e '/PORTDIR_OVERLAY/d' /etc/make.conf
 144 +
 145 +# =========================================================================
 146 +# =========================================================================
 147 +# =========================================================================
 148 +
 149  run_merge -C ${clst_packages}
 150
 151  exit 0