profile-sync: testing->release

12 files changed, 72 insertions, 20 deletions

diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks
index 21c6359..5d93a37 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks
@@ -71,7 +71,7 @@ xf86-video-mga
 xf86-video-neomagic
 xf86-video-nv
 xf86-video-openchrome
-xf86-video-radeonhd
+#xf86-video-radeonhd
 xf86-video-rendition
 xf86-video-s3
 xf86-video-s3virge
@@ -142,9 +142,8 @@ pkgconfig
 taglib
 #portmap
 ivtv-utils
-#disabled due to conflicts with linux-firmware
 
-#dvb-firmware
+dvb-firmware
 dbus-python
 
 #MythVantage Installer deps
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/locale.py b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/locale.py
new file mode 100644
index 0000000..70cfcbd
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/locale.py
@@ -0,0 +1,23 @@
+def genlocale():
+    #logging.info("Generating locales")
+    locale_list=[ "en_US ISO-8859-1", "en_US.UTF-8 UTF-8" , "de_DE.UTF-8", "da_DK.utf8", "en_DK.utf8", "it_IT.utf8", "de_DE.UTF-8"]
+    #locale_list=['UTF-8', 'en_US ISO-8859-1']
+
+    localefile="/etc/locale.gen" 
+    f = open(localefile)
+    lines = f.readlines()
+    f.close()
+
+    f = open(localefile,'w')
+    
+    for line in lines:
+        outline = line
+        for locale in locale_list:
+            #print locale, line
+            if locale in line:
+                outline = line.replace('#','')
+        f.write(outline)
+
+    f.close
+
+genlocale()
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh
index 4b91959..63d52eb 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/modify_chroot.sh
@@ -15,3 +15,8 @@ cp -f /.post_process/menu.lst /boot/grub/menu.lst
 
 cp -f /etc/skel/.bash* /root/
 rm -f /etc/ssh/ssh_host*key*
+python2 /.post_process/locale.py
+echo "generating locales"
+/usr/sbin/locale-gen
+
+
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf
index 391c913..1d2bb7f 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/post_process/rc.conf
@@ -67,5 +67,5 @@ HOSTNAME=`cat /etc/hostname`
 #The following is only used on the install. After the first boot everything is set from /etc/net.
 
 #DAEMONS=(syslog-ng network netfs crond)
-DAEMONS=(fbsplash !syslog-ng !hotplug !pcmcia !network !mysqld !dbus !avahi-daemon)
+DAEMONS=(fbsplash !syslog-ng !hotplug !pcmcia !network !mysqld dbus avahi-daemon)
 # End of file
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/locale.gen b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/locale.gen
deleted file mode 100644
index 3bceedc..0000000
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/locale.gen
+++ /dev/null
@@ -1,6 +0,0 @@
-# locales for larch (/etc/locale.gen)
-
-en_US.UTF-8  UTF-8
-en_GB.UTF-8  UTF-8
-de_DE.UTF-8  UTF-8
-
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/root/startx b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/root/startx
index 9274703..579614d 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/root/startx
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/root/startx
@@ -25,4 +25,9 @@ then
     rm /root/.vnc/xstartup
     ln -s /root/LinHES-install.sh /root/.vnc/xstartup
     vncserver
+    echo "The VNC server password is:  mythvantage"
+    echo "Please connect to one of these ip's"
+    echo "-------------------------------------------"
+    ip addr show |grep "inet" |grep -v inet6|cut  -d\/ -f1
+    echo "-------------------------------------------"
 fi
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
index 21c6359..5d93a37 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
@@ -71,7 +71,7 @@ xf86-video-mga
 xf86-video-neomagic
 xf86-video-nv
 xf86-video-openchrome
-xf86-video-radeonhd
+#xf86-video-radeonhd
 xf86-video-rendition
 xf86-video-s3
 xf86-video-s3virge
@@ -142,9 +142,8 @@ pkgconfig
 taglib
 #portmap
 ivtv-utils
-#disabled due to conflicts with linux-firmware
 
-#dvb-firmware
+dvb-firmware
 dbus-python
 
 #MythVantage Installer deps
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/locale.py b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/locale.py
new file mode 100644
index 0000000..70cfcbd
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/locale.py
@@ -0,0 +1,23 @@
+def genlocale():
+    #logging.info("Generating locales")
+    locale_list=[ "en_US ISO-8859-1", "en_US.UTF-8 UTF-8" , "de_DE.UTF-8", "da_DK.utf8", "en_DK.utf8", "it_IT.utf8", "de_DE.UTF-8"]
+    #locale_list=['UTF-8', 'en_US ISO-8859-1']
+
+    localefile="/etc/locale.gen" 
+    f = open(localefile)
+    lines = f.readlines()
+    f.close()
+
+    f = open(localefile,'w')
+    
+    for line in lines:
+        outline = line
+        for locale in locale_list:
+            #print locale, line
+            if locale in line:
+                outline = line.replace('#','')
+        f.write(outline)
+
+    f.close
+
+genlocale()
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh
index 4b91959..63d52eb 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/modify_chroot.sh
@@ -15,3 +15,8 @@ cp -f /.post_process/menu.lst /boot/grub/menu.lst
 
 cp -f /etc/skel/.bash* /root/
 rm -f /etc/ssh/ssh_host*key*
+python2 /.post_process/locale.py
+echo "generating locales"
+/usr/sbin/locale-gen
+
+
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf
index 391c913..1d2bb7f 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/post_process/rc.conf
@@ -67,5 +67,5 @@ HOSTNAME=`cat /etc/hostname`
 #The following is only used on the install. After the first boot everything is set from /etc/net.
 
 #DAEMONS=(syslog-ng network netfs crond)
-DAEMONS=(fbsplash !syslog-ng !hotplug !pcmcia !network !mysqld !dbus !avahi-daemon)
+DAEMONS=(fbsplash !syslog-ng !hotplug !pcmcia !network !mysqld dbus avahi-daemon)
 # End of file
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/locale.gen b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/locale.gen
deleted file mode 100644
index 3bceedc..0000000
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/locale.gen
+++ /dev/null
@@ -1,6 +0,0 @@
-# locales for larch (/etc/locale.gen)
-
-en_US.UTF-8  UTF-8
-en_GB.UTF-8  UTF-8
-de_DE.UTF-8  UTF-8
-
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/root/startx b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/root/startx
index 9274703..579614d 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/root/startx
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/root/startx
@@ -25,4 +25,9 @@ then
     rm /root/.vnc/xstartup
     ln -s /root/LinHES-install.sh /root/.vnc/xstartup
     vncserver
+    echo "The VNC server password is:  mythvantage"
+    echo "Please connect to one of these ip's"
+    echo "-------------------------------------------"
+    ip addr show |grep "inet" |grep -v inet6|cut  -d\/ -f1
+    echo "-------------------------------------------"
 fi