summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild_tools/bin/kmsync.sh2
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/addedpacks5
-rw-r--r--build_tools/clarch/larch/profiles/i686-testing-local/cache_packs2
-rwxr-xr-xbuild_tools/clarch/larch/profiles/i686-testing-local/pacman.conf5
-rwxr-xr-xbuild_tools/go.sh3
-rw-r--r--templates/pacman.conf.chroot4
6 files changed, 16 insertions, 5 deletions
diff --git a/build_tools/bin/kmsync.sh b/build_tools/bin/kmsync.sh
index 6506b56..4308786 100755
--- a/build_tools/bin/kmsync.sh
+++ b/build_tools/bin/kmsync.sh
@@ -26,7 +26,7 @@ function sync_dirs {
echo "________________________________________________________"
#first bring down new changes from knoppmyth.net
- unison km-down -terse -logfile /tmp/unison-down.log -auto -batch -numericids ssh://reposync@knoppmyth.net/$REMOTE $LOCAL
+ unison km-down -logfile /tmp/unison-down.log -auto -batch -numericids ssh://reposync@knoppmyth.net/$REMOTE $LOCAL
if [ ! $? = 0 ]
then
echo "#######################################################"
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
index 6668d64..0dfef17 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks
@@ -52,6 +52,7 @@ xterm
xorg-fonts-100dpi
xorg-fonts-75dpi
xorg-res-utils
+ttf-ms-fonts
#xorg-video-drivers
xf86-video-amd
@@ -168,3 +169,7 @@ zd1211-firmware
live-installer
etcnet
runit
+
+#---
+tweaker
+
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs
index b95e6f4..9f5096b 100644
--- a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs
@@ -1 +1,3 @@
mythdb-initial
+nvidia
+nvidia-utils
diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/pacman.conf b/build_tools/clarch/larch/profiles/i686-testing-local/pacman.conf
index f27a2a6..617c4d1 100755
--- a/build_tools/clarch/larch/profiles/i686-testing-local/pacman.conf
+++ b/build_tools/clarch/larch/profiles/i686-testing-local/pacman.conf
@@ -36,7 +36,10 @@ CacheDir = /data/var/cache/pacman/pkg
#
[core-testing]
Server = file:///data/pkg_repo/i686/core-testing
-#Server = http://localmirror/repo/r6-testing/
+
+[extra-testing]
+Server = file:///data/pkg_repo/i686/extra-testing
+
########################ARCH DEFAULTS#############
diff --git a/build_tools/go.sh b/build_tools/go.sh
index b776ee1..ccdfa94 100755
--- a/build_tools/go.sh
+++ b/build_tools/go.sh
@@ -1,8 +1,9 @@
#!/bin/bash
+. /etc/makepkg.conf
clear
cd clarch || exit 1
declare -a menuarray
-menuarray=( ` ls larch/profiles/`)
+menuarray=( `ls larch/profiles/ |grep $CARCH`)
echo ${array1[@]}
element_count=${#menuarray[*]}
diff --git a/templates/pacman.conf.chroot b/templates/pacman.conf.chroot
index 7059fbc..e8cadc4 100644
--- a/templates/pacman.conf.chroot
+++ b/templates/pacman.conf.chroot
@@ -44,10 +44,10 @@ Server = http://knoppmyth.net/repo/REPLACEME/$repo
Server = http://knoppmyth.net/repo/REPLACEME/$repo
#[core-testing]
-Server = http://knoppmyth.net/repo/REPLACEME/$repo
+#Server = http://knoppmyth.net/repo/REPLACEME/$repo
#[extra-testing]
-Server = http://knoppmyth.net/repo/REPLACEME/$repo
+#Server = http://knoppmyth.net/repo/REPLACEME/$repo