summaryrefslogtreecommitdiffstats
path: root/build_tools/clarch/larch/run/jams.larch.patch
diff options
context:
space:
mode:
authorJames Meyer <James.meyer@operamail.com>2008-10-02 03:23:45 (GMT)
committerJames Meyer <James.meyer@operamail.com>2008-10-02 03:23:45 (GMT)
commit618d4ad515a93d1e48934be5846edd71270171ec (patch)
treea22a9294af81215d4a7b1053e5fdb4d746f39d41 /build_tools/clarch/larch/run/jams.larch.patch
downloadlinhes_dev-618d4ad515a93d1e48934be5846edd71270171ec.zip
initital import
Diffstat (limited to 'build_tools/clarch/larch/run/jams.larch.patch')
-rw-r--r--build_tools/clarch/larch/run/jams.larch.patch110
1 files changed, 110 insertions, 0 deletions
diff --git a/build_tools/clarch/larch/run/jams.larch.patch b/build_tools/clarch/larch/run/jams.larch.patch
new file mode 100644
index 0000000..9a96d45
--- /dev/null
+++ b/build_tools/clarch/larch/run/jams.larch.patch
@@ -0,0 +1,110 @@
+Only in run/: cachepacs
+diff -wU4 run.orig/inpacs run/inpacs
+--- run.orig/inpacs 2008-08-10 10:51:15.000000000 +0000
++++ run/inpacs 2008-08-29 02:29:31.000000000 +0000
+@@ -115,9 +115,9 @@
+ VETOFILE=""
+ # Source directory for pacman database directories:
+ DBDIR=""
+ # pacman executable:
+-PACMANX="pacman"
++PACMANX="pacman -f"
+ # pacman configuration file
+ PACMANK="/etc/pacman.conf"
+
+ checkfile ()
+diff -wU4 run.orig/mklarch run/mklarch
+--- run.orig/mklarch 2008-08-10 10:51:15.000000000 +0000
++++ run/mklarch 2008-08-29 02:29:45.000000000 +0000
+@@ -22,9 +22,8 @@
+ #
+ #----------------------------------------------------------------------------
+ # 2008.06.22
+
+-
+ # directory to use for building the CD - the installation root
+ # It must have LOTS of space, ~ 4GB for a 700MB CD
+ INSTLDIR=/home/larchroot
+
+@@ -162,8 +161,9 @@
+ fi
+
+ for fd in $( ls -A ${INSTLDIR} ); do
+ rm -rf ${INSTLDIR}/${fd}
++#lookforme
+ done
+ mkdir -p ${LARCHBUILD}
+
+ ############### Call 'inpacs' to do the installation
+@@ -186,9 +186,8 @@
+ exit 1
+ fi
+ fi
+ INPACSO="${INPACSO} -k pacman.conf"
+-
+ # If necessary add the larch repository to pacman.conf
+ if ! grep '^[larch5]' pacman.conf &>/dev/null; then
+ if [ -d larchrepo ]; then
+ larch5path="file://$( readlink -f larchrepo )"
+@@ -198,14 +197,15 @@
+ sysarch="i686"
+ fi
+ larch5path="${larch5path}/${sysarch}"
+ fi
+- sed "/\[testing\]/ i \
+-[larch5]\n\
+-Server = ${larch5path}\n\
+-#larch5---\n" -i pacman.conf
++ #sed "/\[testing\]/ i \
++ echo "[larch5] " >> pacman.conf
++ echo "Server = ${larch5path}" >> pacman.conf
+ fi
+
++
++
+ if ! which pacman &>/dev/null; then
+ if ! [ -x ${startdir}/pacman ]; then
+ echo "ERROR: Couldn't find pacman executable"
+ exit 1
+@@ -217,17 +217,21 @@
+ if [ $? -ne 0 ]; then exit 1; fi
+
+ # Use build version of pacman.conf in live system, without [larch5] repository.
+ # This can be overwritten by a pacman.conf in the profile's overlay.
++
+ rm -f ${INSTLDIR}/etc/pacman.conf
+-if [ -f pacman.conf.0 ]; then
++if [ -f ${PROFILE}/pacman.conf ]; then
+ # This file should be used in preference to pacman.conf - it is created by
+ # larch-setup on non-Arch systems before commenting out the 'Include' lines.
+- cp pacman.conf.0 ${INSTLDIR}/etc/pacman.conf
++ cp ${PROFILE}/pacman.conf ${INSTLDIR}/etc/pacman.conf
+ else
+ sed '/^\[larch5\]/,/^ *$/ d' <pacman.conf >${INSTLDIR}/etc/pacman.conf
+ fi
+
++cachepacs -a ${PROFILE}/cache_packs $INPACSO -d ${INSTLDIR}
++
++
+ # Generate glibc locales
+ if [ -f ${PROFILE}/locale.gen ]; then
+ echo
+ echo "********** Generating locales **********"
+@@ -247,8 +251,17 @@
+ fi
+
+ echo "// ${APP} finished installation of Arch system"
+ echo "//"
++
++#run script to post-process the new installation
++if [ -f ${PROFILE}/post-process.sh ]
++then
++ ${PROFILE}/post-process.sh ${INSTLDIR} ${PROFILE}
++ echo ${PROFILE}/post-process.sh ${INSTLDIR} ${PROFILE}
++fi
++
++
+ if [ -z "${NOLIVE}" ]; then
+ # Get live CD build functions
+ . ${LARCHDATA}/buildlive
+ mklive