Merge branch 'testing' of git@linhes.org:linhes_dev into testing

Conflicts:
	build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
	build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks

14 files changed, 71 insertions, 8 deletions

diff --git a/build_tools/bin/check_repo.sh b/build_tools/bin/check_repo.sh
index 9c95d02..5a3c984 100755
--- a/build_tools/bin/check_repo.sh
+++ b/build_tools/bin/check_repo.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 cd  /build_tools/bin
 #extra-testing will do both core and extra -testing
-#check_repo/check_packages.py  --abs-tree=/data/LinHES-PKGBUILD/abs --repos=extra  --repo-dir=/data/pkg_repo/i686
+#check_repo/check_packages.py  --abs-tree=/data/linhes_pkgbuild/abs --repos=core  --repo-dir=/data/pkg_repo/i686
 check_repo/check_packages.py  --abs-tree=/data/linhes_pkgbuild/abs --repos=extra  --repo-dir=/data/pkg_repo/i686
 cd -
diff --git a/build_tools/bin/check_repo/alpm.so b/build_tools/bin/check_repo/alpm.so
index de28cf6..c9f402c 100755
--- a/build_tools/bin/check_repo/alpm.so
+++ b/build_tools/bin/check_repo/alpm.so
diff --git a/build_tools/bin/check_repo/build/lib.linux-i686-2.6/alpm.so b/build_tools/bin/check_repo/build/lib.linux-i686-2.6/alpm.so
deleted file mode 100755
index de28cf6..0000000
--- a/build_tools/bin/check_repo/build/lib.linux-i686-2.6/alpm.so
+++ /dev/null
diff --git a/build_tools/bin/check_repo/build/lib.linux-i686-2.7/alpm.so b/build_tools/bin/check_repo/build/lib.linux-i686-2.7/alpm.so
deleted file mode 100755
index ca29df3..0000000
--- a/build_tools/bin/check_repo/build/lib.linux-i686-2.7/alpm.so
+++ /dev/null
diff --git a/build_tools/bin/repo-cleanup.sh b/build_tools/bin/repo-cleanup.sh
index 9c96933..ed6c140 100755
--- a/build_tools/bin/repo-cleanup.sh
+++ b/build_tools/bin/repo-cleanup.sh
@@ -23,7 +23,7 @@ do
 	if [   $?  = 1 ]
 	then
 		echo "removing file $LINE"
-		mv $REPO/$LINE-i686.pkg.tar.xz /tmp/$currentrepo_dups/
+#		mv $REPO/$LINE-i686.pkg.tar.xz /tmp/$currentrepo_dups/
 	fi	
 done < /tmp/pkglist-$currentrepo
 
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
index 62e79fc..8a8f7cf 100644
--- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
@@ -155,6 +155,7 @@ expect
 curl
 dnsutils
 avahi
+nss-mdns
 
 #Wireless
 b43-fwcutter
@@ -217,7 +218,8 @@ linux-firmware
 
 larch-live
 mkinitcpio-busybox
-windowmaker-crm-git
+#windowmaker-crm-git
+windowmaker
 xcursor-themes
 ceton
 ceton-scripts
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf
index 1d2bb7f..43a275f 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/post_process/rc.conf
@@ -15,7 +15,7 @@
 # CONSOLEMAP: found in /usr/share/kbd/consoletrans
 # USECOLOR: use ANSI color sequences in startup messages
 #
-LOCALE="en_US.utf8"
+LOCALE="en_US.utf-8"
 HARDWARECLOCK="UTC"
 TIMEZONE="US/Central"
 KEYMAP="us"
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/nsswitch.conf b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/nsswitch.conf
new file mode 100644
index 0000000..2c66b68
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/nsswitch.conf
@@ -0,0 +1,19 @@
+# Begin /etc/nsswitch.conf
+
+passwd: files
+group: files
+shadow: files
+
+publickey: files
+
+hosts: files mdns4_minimal dns mdns4
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
+
+# End /etc/nsswitch.conf
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
index 62e79fc..8a8f7cf 100644
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
@@ -155,6 +155,7 @@ expect
 curl
 dnsutils
 avahi
+nss-mdns
 
 #Wireless
 b43-fwcutter
@@ -217,7 +218,8 @@ linux-firmware
 
 larch-live
 mkinitcpio-busybox
-windowmaker-crm-git
+#windowmaker-crm-git
+windowmaker
 xcursor-themes
 ceton
 ceton-scripts
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf
index 1d2bb7f..43a275f 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/post_process/rc.conf
@@ -15,7 +15,7 @@
 # CONSOLEMAP: found in /usr/share/kbd/consoletrans
 # USECOLOR: use ANSI color sequences in startup messages
 #
-LOCALE="en_US.utf8"
+LOCALE="en_US.utf-8"
 HARDWARECLOCK="UTC"
 TIMEZONE="US/Central"
 KEYMAP="us"
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/nsswitch.conf b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/nsswitch.conf
new file mode 100644
index 0000000..2c66b68
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/nsswitch.conf
@@ -0,0 +1,19 @@
+# Begin /etc/nsswitch.conf
+
+passwd: files
+group: files
+shadow: files
+
+publickey: files
+
+hosts: files mdns4_minimal dns mdns4
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
+
+# End /etc/nsswitch.conf
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
index 62e79fc..8a8f7cf 100644
--- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
@@ -155,6 +155,7 @@ expect
 curl
 dnsutils
 avahi
+nss-mdns
 
 #Wireless
 b43-fwcutter
@@ -217,7 +218,8 @@ linux-firmware
 
 larch-live
 mkinitcpio-busybox
-windowmaker-crm-git
+#windowmaker-crm-git
+windowmaker
 xcursor-themes
 ceton
 ceton-scripts
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf
index 1d2bb7f..43a275f 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/post_process/rc.conf
@@ -15,7 +15,7 @@
 # CONSOLEMAP: found in /usr/share/kbd/consoletrans
 # USECOLOR: use ANSI color sequences in startup messages
 #
-LOCALE="en_US.utf8"
+LOCALE="en_US.utf-8"
 HARDWARECLOCK="UTC"
 TIMEZONE="US/Central"
 KEYMAP="us"
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/nsswitch.conf b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/nsswitch.conf
new file mode 100644
index 0000000..2c66b68
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/nsswitch.conf
@@ -0,0 +1,19 @@
+# Begin /etc/nsswitch.conf
+
+passwd: files
+group: files
+shadow: files
+
+publickey: files
+
+hosts: files mdns4_minimal dns mdns4
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+netgroup: files
+
+# End /etc/nsswitch.conf