summaryrefslogtreecommitdiffstats
path: root/abs/core/LinHES-config
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core/LinHES-config')
-rw-r--r--abs/core/LinHES-config/PKGBUILD146
-rwxr-xr-xabs/core/LinHES-config/xconfig.sh118
2 files changed, 79 insertions, 185 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 3fa31cd..939a788 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.2
-pkgrel=15
+pkgrel=16
conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config )
pkgdesc="Install and configure your system"
depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted'
@@ -110,7 +110,7 @@ md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
'f88d2fb88339a4bf8ec9217a3fbcdef7'
'8ac1cfd2eca0f641737da0d0aca416a7'
'9ae8d79f620c6d19973c55c32a921874'
- '4620f6f498ef4523398635cb0bd59425'
+ '95526b4d3dec6c9341088fb6511d831a'
'bf32873c56d04c45ff0682f4e345e517'
'e459ed069317bccb20351f037a9df3d2'
'22c5e24bf87ad94ee2244d9016a0eea2'
@@ -122,147 +122,7 @@ md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
'9151c74fcaf18ec4cf5e757cfdbc7017'
'3d1e4a119f38cff0498bf8a67e94e4b3'
'5b41cfc6f4ad5cdbcd28cf980110f135'
- 'ee7c8e1f025ce1527ecfffabafb26806'
- '41b03fb1e0a9d9ae7588e3b813212772'
- 'a9ffe72c3ede99d505fdc97572a7c256'
- 'df43bce1712320508d4eef8449c5d223'
- '65d93f15ac85adf8299552581789a731'
- '4badc3c664c55f87396a473e6c14d4bc'
- '36f5953944f98c50c0212a584996028e'
- 'fe5e31b833cc6707209e9d656b6eb53c'
- 'd328d63eaa4252f3d4888476c79bbff6'
- '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
- '857a831e8627727306208f0e776b1b98'
- 'a7ed97cb1460978c823ff1d7c02b5c90'
- '2596460462cf6c889cf8f95485537b20'
- 'a63ff9ef5250965aeabc74bfa8e43981')
-md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
- '1a4694fcd694b362c339bda781ed0f3e'
- 'e36da536dd651ef182e7642337889e77'
- '985891a43f7c4c983eb2a362162f1a0f'
- 'd7a8cd4a0060399ae22e69f74e04eb07'
- '7a45287a07145fde5aa664583d4f6fba'
- 'f88d2fb88339a4bf8ec9217a3fbcdef7'
- '8ac1cfd2eca0f641737da0d0aca416a7'
- '9ae8d79f620c6d19973c55c32a921874'
- '4620f6f498ef4523398635cb0bd59425'
- 'bf32873c56d04c45ff0682f4e345e517'
- 'e459ed069317bccb20351f037a9df3d2'
- '22c5e24bf87ad94ee2244d9016a0eea2'
- '6aff504ed5e860adc1b7317cd0780900'
- '55fccb1da0417a896b724f7cfc32dd5a'
- 'ab2aa42c2947148c2b1cac0ade6d1d55'
- 'd429b59d3cfb37b0624c6a4a71a7c2c0'
- 'a225143e3df6f56d451c2875e54ddbae'
- '9151c74fcaf18ec4cf5e757cfdbc7017'
- '3d1e4a119f38cff0498bf8a67e94e4b3'
- '5b41cfc6f4ad5cdbcd28cf980110f135'
- 'ee7c8e1f025ce1527ecfffabafb26806'
- '41b03fb1e0a9d9ae7588e3b813212772'
- 'a9ffe72c3ede99d505fdc97572a7c256'
- 'df43bce1712320508d4eef8449c5d223'
- '65d93f15ac85adf8299552581789a731'
- '4badc3c664c55f87396a473e6c14d4bc'
- '36f5953944f98c50c0212a584996028e'
- 'fe5e31b833cc6707209e9d656b6eb53c'
- '5c89f5c9c34b4f6e9b2e2c0e2d83f873'
- '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
- '857a831e8627727306208f0e776b1b98'
- '2f3de6bf907a04dcdcfe4f1418721b60'
- '2596460462cf6c889cf8f95485537b20'
- 'a63ff9ef5250965aeabc74bfa8e43981')
-md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
- '1a4694fcd694b362c339bda781ed0f3e'
- 'e36da536dd651ef182e7642337889e77'
- '985891a43f7c4c983eb2a362162f1a0f'
- 'd7a8cd4a0060399ae22e69f74e04eb07'
- '7a45287a07145fde5aa664583d4f6fba'
- 'f88d2fb88339a4bf8ec9217a3fbcdef7'
- '8ac1cfd2eca0f641737da0d0aca416a7'
- '9ae8d79f620c6d19973c55c32a921874'
- '4620f6f498ef4523398635cb0bd59425'
- 'bf32873c56d04c45ff0682f4e345e517'
- 'e459ed069317bccb20351f037a9df3d2'
- '22c5e24bf87ad94ee2244d9016a0eea2'
- '6aff504ed5e860adc1b7317cd0780900'
- '55fccb1da0417a896b724f7cfc32dd5a'
- 'ab2aa42c2947148c2b1cac0ade6d1d55'
- 'd429b59d3cfb37b0624c6a4a71a7c2c0'
- 'a225143e3df6f56d451c2875e54ddbae'
- '9151c74fcaf18ec4cf5e757cfdbc7017'
- '3d1e4a119f38cff0498bf8a67e94e4b3'
- '5b41cfc6f4ad5cdbcd28cf980110f135'
- 'ee7c8e1f025ce1527ecfffabafb26806'
- '41b03fb1e0a9d9ae7588e3b813212772'
- 'a9ffe72c3ede99d505fdc97572a7c256'
- 'df43bce1712320508d4eef8449c5d223'
- '65d93f15ac85adf8299552581789a731'
- '4badc3c664c55f87396a473e6c14d4bc'
- '36f5953944f98c50c0212a584996028e'
- 'fe5e31b833cc6707209e9d656b6eb53c'
- 'f0988a801216b44c96bf17e24a23e3a9'
- '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
- '857a831e8627727306208f0e776b1b98'
- '2f3de6bf907a04dcdcfe4f1418721b60'
- '2596460462cf6c889cf8f95485537b20'
- 'a63ff9ef5250965aeabc74bfa8e43981')
-md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
- '1a4694fcd694b362c339bda781ed0f3e'
- 'e36da536dd651ef182e7642337889e77'
- '985891a43f7c4c983eb2a362162f1a0f'
- 'd7a8cd4a0060399ae22e69f74e04eb07'
- '7a45287a07145fde5aa664583d4f6fba'
- 'f88d2fb88339a4bf8ec9217a3fbcdef7'
- '8ac1cfd2eca0f641737da0d0aca416a7'
- '9ae8d79f620c6d19973c55c32a921874'
- '4620f6f498ef4523398635cb0bd59425'
- 'bf32873c56d04c45ff0682f4e345e517'
- 'e459ed069317bccb20351f037a9df3d2'
- '22c5e24bf87ad94ee2244d9016a0eea2'
- '6aff504ed5e860adc1b7317cd0780900'
- '55fccb1da0417a896b724f7cfc32dd5a'
- 'ab2aa42c2947148c2b1cac0ade6d1d55'
- 'd429b59d3cfb37b0624c6a4a71a7c2c0'
- 'a225143e3df6f56d451c2875e54ddbae'
- '9151c74fcaf18ec4cf5e757cfdbc7017'
- '3d1e4a119f38cff0498bf8a67e94e4b3'
- '5b41cfc6f4ad5cdbcd28cf980110f135'
- 'ee7c8e1f025ce1527ecfffabafb26806'
- '41b03fb1e0a9d9ae7588e3b813212772'
- 'a9ffe72c3ede99d505fdc97572a7c256'
- 'df43bce1712320508d4eef8449c5d223'
- '65d93f15ac85adf8299552581789a731'
- '4badc3c664c55f87396a473e6c14d4bc'
- '36f5953944f98c50c0212a584996028e'
- 'fe5e31b833cc6707209e9d656b6eb53c'
- 'f0988a801216b44c96bf17e24a23e3a9'
- '23d0e12b7ca1cc6ea6b993c1d7ff20b9'
- '40d1ffb2ae8b14f242063e4121950d80'
- '2f3de6bf907a04dcdcfe4f1418721b60'
- '2596460462cf6c889cf8f95485537b20'
- 'a63ff9ef5250965aeabc74bfa8e43981')
-md5sums=('0f2d8f75fa96f9a1acbdca582560e889'
- '1a4694fcd694b362c339bda781ed0f3e'
- 'e36da536dd651ef182e7642337889e77'
- '985891a43f7c4c983eb2a362162f1a0f'
- 'd7a8cd4a0060399ae22e69f74e04eb07'
- '7a45287a07145fde5aa664583d4f6fba'
- 'f88d2fb88339a4bf8ec9217a3fbcdef7'
- '8ac1cfd2eca0f641737da0d0aca416a7'
- '9ae8d79f620c6d19973c55c32a921874'
- '4620f6f498ef4523398635cb0bd59425'
- 'bf32873c56d04c45ff0682f4e345e517'
- 'e459ed069317bccb20351f037a9df3d2'
- '22c5e24bf87ad94ee2244d9016a0eea2'
- '6aff504ed5e860adc1b7317cd0780900'
- '55fccb1da0417a896b724f7cfc32dd5a'
- 'ab2aa42c2947148c2b1cac0ade6d1d55'
- 'd429b59d3cfb37b0624c6a4a71a7c2c0'
- 'a225143e3df6f56d451c2875e54ddbae'
- '9151c74fcaf18ec4cf5e757cfdbc7017'
- '3d1e4a119f38cff0498bf8a67e94e4b3'
- '5b41cfc6f4ad5cdbcd28cf980110f135'
- '79a670ecbfbebd55c3e89aca9b7cff49'
+ 'da74d6f6d0272881f7724eb642a8ec69'
'41b03fb1e0a9d9ae7588e3b813212772'
'a9ffe72c3ede99d505fdc97572a7c256'
'df43bce1712320508d4eef8449c5d223'
diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh
index 2fad821..fff7f44 100755
--- a/abs/core/LinHES-config/xconfig.sh
+++ b/abs/core/LinHES-config/xconfig.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+#set -x
#SET DISPLAYCARD to force a cardtype
#SET DISPLAYRES to force Xres, ENV takes precendent over cmdline
#displayres=cmdline
@@ -7,6 +8,8 @@ NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf
BASE=""
. /etc/profile
NVIDIA_96XX="$TEMPLATES/xorg/96xx_supported.txt"
+NVIDIA_173="$TEMPLATES/xorg/173_supported.txt"
+NVIDIA_SUPPORTED="$TEMPLATES/xorg/nvidia_supported.txt"
#TEMPLATES="/usr/share/templates"
MYTHHOME=$BASE/home/mythtv
@@ -30,7 +33,7 @@ function Xvalues {
Xcardtype=$VGACARDTYPE
fi
echo "Will use $VGACARDTYPE"
- currentmode=`cat "$BASE/etc/X11/xorg.conf" | grep Modes | awk -Fs '{ print $2 }'`
+ #currentmode=`cat "$BASE/etc/X11/xorg.conf" | grep Modes | awk -Fs '{ print $2 }'`
}
function presetupX {
@@ -93,22 +96,27 @@ function setupAdvancedX {
# echo $ML
case $Xcardtype in
NVIDIA|nVidia|nvidia)
+ nvidia_driver_install
case $Xconnection in
DVI) ConnectedMonitor=DFP ;;
vga) ConnectedMonitor=CRT;;
Auto) ConnectedMonitor=Auto;;
TV) ConnectedMonitor=TV
- echo "Option \"TVStandard\" \"$XTVstandard\"" >>/tmp/options
- echo "Option \"TVOutFormat\" \"$XTVconnection\"" >> /tmp/options
+ nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --tv-standard="$XTVstandard"
+ nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --tv-out-format="$XTVconnection"
+ # echo "Option \"TVStandard\" \"$XTVstandard\"" >>/tmp/options
+ # echo "Option \"TVOutFormat\" \"$XTVconnection\"" >> /tmp/options
;;
+ *) ConnectedMonitor=Auto;;
esac
if [ "$ConnectedMonitor" = Auto ]
then
echo "auto connection"
else
- echo "Option \"ConnectedMonitor\" \"$ConnectedMonitor\"" >> /tmp/options
- echo "Option \"FlatPanelProperties\" \"Scaling = centered, Dithering = enabled\"" >> /tmp/options
- echo "Option \"DigitalVibrance\" \"0\"" >> /tmp/options
+ nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --connected-monitor="$ConnectedMonitor"
+ #echo "Option \"ConnectedMonitor\" \"$ConnectedMonitor\"" >> /tmp/options
+ #echo "Option \"FlatPanelProperties\" \"Scaling = centered, Dithering = enabled\"" >> /tmp/options
+ #echo "Option \"DigitalVibrance\" \"0\"" >> /tmp/options
fi
if [ "$XignoreEDID" = 1 ]
@@ -125,16 +133,16 @@ function setupAdvancedX {
HS="# Hsync edid used "
VR="# Vertrefresh edid used "
fi
- echo "Option \"UseEdidFreqs\" \"$EDIDFREQ\"" >> /tmp/options
- echo "Option \"IgnoreEDID\" \"$EDIDvalue\"" >> /tmp/options
-
-
- sed -e "s/^.*Modes.*$/${ML}/" \
- -e "/INSERT MODELINE/r $TEMPLATES/xorg/modeline.$Xcategory" \
- -e "s/^.*DisplaySize.*$/ $DS/" \
- -e "s/^#.*HorizSync.*$/ $HS/g" \
- -e "s/^#.*VertRefresh.*$/ $VR/g" \
- -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
+# echo "Option \"UseEdidFreqs\" \"$EDIDFREQ\"" >> /tmp/options
+# echo "Option \"IgnoreEDID\" \"$EDIDvalue\"" >> /tmp/options
+#
+#
+# sed -e "s/^.*Modes.*$/${ML}/" \
+# -e "/INSERT MODELINE/r $TEMPLATES/xorg/modeline.$Xcategory" \
+# -e "s/^.*DisplaySize.*$/ $DS/" \
+# -e "s/^#.*HorizSync.*$/ $HS/g" \
+# -e "s/^#.*VertRefresh.*$/ $VR/g" \
+# -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
;;
ati|ATI)
@@ -179,6 +187,57 @@ function setupAdvancedX {
esac
}
+function nvidia_driver_install {
+
+
+ cp "$TEMPLATES/xorg/xorg.conf.nvidia" $BASE/etc/X11/xorg.conf.d/20-automv.conf
+ if [ ${Xres} = Auto ]
+ then
+ nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list="nvidia-auto-select"
+ else
+ nvidia-xconfig -c /etc/X11/xorg.conf.d/20-automv.conf --mode-list=${Xres}
+ fi
+
+ if [ "$TESTMODE" != "test" ]
+ then
+
+
+ grep -qi "$CARDID" "$NVIDIA_SUPPORTED"
+ if [ $? = 0 ]
+ then
+ #install latest drivers
+ echo "installing current nvidia drivers"
+ pacman --noconfirm -Rd libgl > /dev/null 2>&1
+ pacman --noconfirm -R $NVPKGS > /dev/null 2>&1
+ pacman --noconfirm -S nvidia nvidia-utils > /dev/null 2>&1
+ fi
+
+
+ #nvidia check right here
+ grep -qi "$CARDID" "$NVIDIA_96XX"
+ if [ $? = 0 ]
+ then
+ #install 96xx drivers
+ echo "installing nvidia 96xx drivers"
+ pacman --noconfirm -Rd libgl > /dev/null 2>&1
+ pacman --noconfirm -R $NVPKGS > /dev/null 2>&1
+ pacman --noconfirm -S nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1
+ fi
+
+ grep -qi "$CARDID" "$NVIDIA_173"
+ if [ $? = 0 ]
+ then
+ #install latest drivers
+ echo "installing 173 nvidia drivers"
+ pacman --noconfirm -Rd libgl > /dev/null 2>&1
+ pacman --noconfirm -R $NVPKGS > /dev/null 2>&1
+ pacman --noconfirm -S nvidia-173xx nvidia-173xx-utils > /dev/null 2>&1
+ fi
+ fi
+ echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG"
+ rm $BASE/etc/X11/xorg.conf.d/20-nvidia.conf
+}
+
function setupX {
Xvalues
@@ -188,32 +247,7 @@ function setupX {
then
case $VGACARDTYPE in
nVidia)
- if [ ${Xres} = Auto ]
- then
- sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
- else
- sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
- fi
- if [ "$TESTMODE" != "test" ]
- then
- #nvidia check right here
- grep -qi "$CARDID" "$NVIDIA_96XX"
- if [ $? = 0 ]
- then
- #install 96xx drivers
- echo "installing nvidia 96xx drivers"
- pacman --noconfirm -Rd libgl > /dev/null 2>&1
- pacman --noconfirm -R $NVPKGS > /dev/null 2>&1
- pacman --noconfirm -S nvidia-96xx nvidia-96xx-utils > /dev/null 2>&1
- else
- #install latest drivers
- echo "installing current nvidia drivers"
- pacman --noconfirm -Rd libgl > /dev/null 2>&1
- pacman --noconfirm -R $NVPKGS > /dev/null 2>&1
- pacman --noconfirm -S nvidia nvidia-utils > /dev/null 2>&1
- fi
- fi
- echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG"
+ nvidia_driver_install
;;
# VMware)
generated by cgit v0.12 at 2024-11-05 13:33:58 (GMT)