From e922a79a620e1cb6545bea152ca7454a3e823caf Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 21 Oct 2013 19:43:07 -0500 Subject: ceton_infinitv: update udev rules and add script. --- abs/core/ceton_infinitv/98-ctn91xx.rules | 2 +- abs/core/ceton_infinitv/PKGBUILD | 25 +++++++++++++++---------- abs/core/ceton_infinitv/ifctn.sh | 2 ++ 3 files changed, 18 insertions(+), 11 deletions(-) mode change 100644 => 100755 abs/core/ceton_infinitv/98-ctn91xx.rules mode change 100644 => 100755 abs/core/ceton_infinitv/PKGBUILD create mode 100755 abs/core/ceton_infinitv/ifctn.sh diff --git a/abs/core/ceton_infinitv/98-ctn91xx.rules b/abs/core/ceton_infinitv/98-ctn91xx.rules old mode 100644 new mode 100755 index c690c4b..dc91d36 --- a/abs/core/ceton_infinitv/98-ctn91xx.rules +++ b/abs/core/ceton_infinitv/98-ctn91xx.rules @@ -1 +1 @@ -KERNEL=="ctn91xx_*", MODE="0666",OWNER="root",GROUP="root" SYMLINK+="ceton/%k" +KERNEL=="ctn91xx_*", MODE="0666",OWNER="root",GROUP="root" SYMLINK+="ceton/%k", RUN+="/usr/LH/bin/ifctn.sh" diff --git a/abs/core/ceton_infinitv/PKGBUILD b/abs/core/ceton_infinitv/PKGBUILD old mode 100644 new mode 100755 index 08956ff..758a344 --- a/abs/core/ceton_infinitv/PKGBUILD +++ b/abs/core/ceton_infinitv/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ceton_infinitv _kernver=3.6.7-1-ARCH pkgver=2012_1116_1219 -pkgrel=1 +pkgrel=2 usb_pkgver=0.1.0 pkgdesc="Drivers for Ceton InfiniTV4 - pci/usb " arch=('i686' 'x86_64') @@ -15,30 +15,35 @@ install=ceton.install source=("http://cetoncorp.com/downloads/ceton_infinitv_linux_driver_$pkgver.tar.gz" "98-ctn91xx.rules" "http://cetoncorp.com/downloads/infinitv-usbd-$usb_pkgver.tar.gz" - "ceton_usb_init.sh" + "ceton_usb_init.sh" "ifctn.sh" "ceton_usb_udev.rules" "http://cetoncorp.com/downloads/reset_network.py" ) build() { cd $startdir/src/ceton_infinitv_linux_driver make KERNEL_VERSION=$_kernver - install -Dm755 ctn91xx.ko ${pkgdir}/lib/modules/$_kernver/extra/ctn91xx.ko - install -Dm755 $srcdir/98-ctn91xx.rules $pkgdir/etc/udev/rules.d/98-ctn91xx.rules - #usb support - cp $srcdir/ceton_usb_udev.rules $pkgdir/etc/udev/rules.d/ cd $startdir/src/infinitv-usbd-$usb_pkgver LDFLAGS="/usr/lib/libgthread-2.0.so" ./configure --prefix=/usr make make DESTDIR=${pkgdir} install - mkdir -p $pkgdir/usr/LH/bin - install -Dm755 $srcdir/ceton_usb_init.sh $pkgdir/usr/LH/bin/ - install -m755 $srcdir/reset_network.py $pkgdir/usr/bin/infinitv_reset_network.py +} + +package() { + install -Dm755 ${srcdir}/ceton_infinitv_linux_driver/ctn91xx.ko ${pkgdir}/lib/modules/$_kernver/extra/ctn91xx.ko + install -Dm755 ${srcdir}/98-ctn91xx.rules ${pkgdir}/etc/udev/rules.d/98-ctn91xx.rules + #usb support + cp ${srcdir}/ceton_usb_udev.rules ${pkgdir}/etc/udev/rules.d/ + mkdir -p ${pkgdir}/usr/LH/bin + install -Dm755 ${srcdir}/ceton_usb_init.sh ${pkgdir}/usr/LH/bin/ + install -Dm755 ${srcdir}/ifctn.sh ${pkgdir}/usr/LH/bin/ + install -m755 ${srcdir}/reset_network.py ${pkgdir}/usr/bin/infinitv_reset_network.py } md5sums=('7c56167bfa89d228bf170962bc42ac01' - '554f2c1bcc5d7169659f0ad3d8a513a5' + '104092cdb5bfc54ddc53f768bff7937d' 'b5db78e2b9cccd65d6ea4c88dd028ace' '9f95a08bdd8c2a9e8d62e7daf52a90f6' + '3fc4c4981d2dab54b297f17564b7729f' '8da7dd477d7d47f03e85be4d6476e183' 'e48d82ff70b05a74aaace9cdcb6875db') diff --git a/abs/core/ceton_infinitv/ifctn.sh b/abs/core/ceton_infinitv/ifctn.sh new file mode 100755 index 0000000..7d7265d --- /dev/null +++ b/abs/core/ceton_infinitv/ifctn.sh @@ -0,0 +1,2 @@ +#!/bin/bash +/sbin/ifconfig ctn0 192.168.200.254 netmask 255.255.255.0 up -- cgit v0.12 From 9191514503acd4795994f7bd0b1bfd230bc103c8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 22 Oct 2013 09:29:13 -0500 Subject: linhes-scripts: remove old unneeded upgrade scripts. --- abs/core/linhes-scripts/PKGBUILD | 12 +- .../linhes-scripts/update_schema_021_to_022.sh | 21 --- abs/core/linhes-scripts/upgrade_linhes.sh | 25 --- abs/core/linhes-scripts/upgrade_linhes_script.sh | 176 --------------------- abs/core/linhes-scripts/upgrade_screen_rc | 9 -- abs/core/linhes-scripts/upgrade_to_0.22.sh | 94 ----------- 6 files changed, 1 insertion(+), 336 deletions(-) delete mode 100644 abs/core/linhes-scripts/update_schema_021_to_022.sh delete mode 100755 abs/core/linhes-scripts/upgrade_linhes.sh delete mode 100644 abs/core/linhes-scripts/upgrade_linhes_script.sh delete mode 100644 abs/core/linhes-scripts/upgrade_screen_rc delete mode 100644 abs/core/linhes-scripts/upgrade_to_0.22.sh diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index c5849c0..78a1472 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=57 +pkgrel=58 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -26,8 +26,6 @@ limit-mythcommflag.sh vdpau-detector screenshooter.sh run-limit-mythcommflag -update_schema_021_to_022.sh -upgrade_linhes.sh remove_php_mythvideo.sh removecommercials.sh system-cleanup.sh @@ -35,17 +33,13 @@ myth2fuze dct700-cc.sh qip7100-cc.sh dtheme.sh -upgrade_screen_rc -upgrade_linhes_script.sh LinHES-osd ) package() { cd ${srcdir} install -d ${pkgdir}/usr/LH/bin - install -d ${pkgdir}/usr/LH/etc install -D -m755 myth2* *.sh *.pl vdpau* run-* pause_* LinHES* ${pkgdir}/usr/LH/bin/ - install -D -m755 upgrade_screen_rc ${pkgdir}/usr/LH/etc/ mkdir -p ${pkgdir}/etc/sv/pause-mythcommflag/supervise cp run-pause-mythcommflag ${pkgdir}/etc/sv/pause-mythcommflag/run mkdir -p ${pkgdir}/etc/sv/limit-mythcommflag/supervise @@ -69,8 +63,6 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f' '3d0adf26280cde55a0c47188fff34826' 'b2c3dd48a4abb976eda2d5fbf22a173a' 'b527b01d119d3bc33b8fa69bdf1082bb' - '65629302a4d2c3adf88cdf0ebc10d493' - 'ab469714d77f3a29c7dda715e5ab98e0' '87b0dc855181f98516acb18a7d551601' 'c54a3afd4aa3c1af560c9b6adb600f3a' '2fb25aef03ffd1282414d8cca3df7056' @@ -78,6 +70,4 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f' 'df727c98350a64e2171c950bbefc9c5d' '7b890e7044db38e8d439f67e398af206' '35693f50939d5827aeabfce8c5dce589' - '974c137d3fcb85942ba8945a1bc815fe' - 'f454faeabfa153b10389a9a3bfd51c4a' 'b608044c9e7530a400d8f5b88fdfe6e6') diff --git a/abs/core/linhes-scripts/update_schema_021_to_022.sh b/abs/core/linhes-scripts/update_schema_021_to_022.sh deleted file mode 100644 index 4157fb4..0000000 --- a/abs/core/linhes-scripts/update_schema_021_to_022.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -mysql mythconverg <&2 - exit 1 -fi - - -if [ "$(id -u)" != "0" ]; -then - echo "This script must be run as root." 1>&2 - exit 1 - -fi - - -sv stop mythbackend -sv stop frontend - -screen -c /usr/LH/etc/upgrade_screen_rc diff --git a/abs/core/linhes-scripts/upgrade_linhes_script.sh b/abs/core/linhes-scripts/upgrade_linhes_script.sh deleted file mode 100644 index e397006..0000000 --- a/abs/core/linhes-scripts/upgrade_linhes_script.sh +++ /dev/null @@ -1,176 +0,0 @@ -#!/bin/bash -#Script to facilitate easy upgrade to latest LinHES. -LOGFILE=/tmp/upgrade.fifo -clear - - - -if [ "$(id -u)" != "0" ]; then - echo "This script must be run as root" 1>&2 - exit 1 - -fi - - -function pause(){ - read -p "$*" -} - - -echo "The script will guide you thru the process of upgrading to the latest LinHES." -pause 'Press to continue...' -echo -echo "Sync'n with the repos..." -echo -pacman -Sy >>$LOGFILE 2>>$LOGFILE - -echo "Updating pacman" -pacman -S --noconfirm pacman >> $LOGFILE -echo "Updating pacman database to new format" -pacman-db-upgrade >>$LOGFILE - -echo "Removing misc outdated packages " -pacman -R --noconfirm aufs-utils aufs >> $LOGFILE -pacman -R --noconfirm xf86-video-sis >> $LOGFILE -pacman -R --noconfirm madwifi >> $LOGFILE -pacman -R --noconfirm hauppauge-hvr-firmware >> $LOGFILE -pacman -R --noconfirm v4l-dvb >> $LOGFILE - - -echo "Resyncing with repository" -pacman -Syyyy > $LOGFILE -pacman -Qu > /tmp/linhes_upgrade -if [ ! -s /tmp/linhes_upgrade ] -then - echo "No upgrades found. This could mean the repository is busy." - echo "Or your system is already up to date." - echo "If you have not upgraded, please try again later." - echo "Starting the backend." - sv start mythbackend &>/dev/null - exit 1 -fi -if grep -E "Master|Stand" /etc/systemconfig &>/dev/null - then - echo "Stopping the backend." - sv stop mythbackend &>/dev/null -fi -if pacman -Qs mythvodka &>/dev/null - then - echo "Removing MythVodka if installed as it is no longer compatible with MythTV." - echo - pacman -R mythvodka &>/dev/null -fi -echo -echo "Backing up Online Streams listings." -echo -cp /usr/share/mythtv/is.xml /usr/share/mythtv/is.xml.021 -echo "Removing mythcontrol and mythphone if installed." -echo -if pacman -Qs mythcontrols &>/dev/null - then - pacman -R mythcontrols &>/dev/null -fi -if pacman -Qs mythphone &>/dev/null - then - pacman -R mythphone &>/dev/null -fi - -# if grep -q kernel26 /tmp/linhes_upgrade -# then -# echo "Upgrading the kernel." -# echo -# if pacman -Qs v4l-dvb &>/dev/null -# then -# pacman -Sf --noconfirm kernel26 &>/dev/null && pacman -Sf --noconfirm v4l-dvb -# else -# pacman -S kernel26 --noconfirm &>/dev/null -# fi -# fi -# if grep -q v4l-dvb /tmp/linhes_upgrade -# then -# pacman -Sf --noconfirm v4l-dvb &>/dev/null -# fi -# echo "Checking for VDPAU packages and upgrading if needed." -# echo -# if pacman -Qs vdpinfo-71xx &>/dev/null -# then -# pacman -Rd vdpinfo-71xx &>/dev/null -# fi -# if pacman -Qs vdpinfo-96xx &>/dev/null -# then -# pacman -Rd vdpinfo-96xx &>/dev/null -# fi -# if pacman -Qs vdpinfo &>/dev/null -# then -# pacman -Rd vdpinfo &>/dev/null && pacman -S --noconfirm nvidia &>/dev/null && pacman -S --noconfirm vdpauinfo &>/dev/null -# fi -echo "Performing complete system upgrade." -echo "This may take some time depending on your connection speed." -echo "Server bandwidth utilization will also have an affect." -echo "Please be patient." -echo -pacman -Su --noconfirm 2>$LOGFILE > $LOGFILE -echo "Restoring Online Streams listings." -echo -cp /usr/share/mythtv/is.xml.021 /usr/share/mythtv/is.xml -# if grep -E "Master|Stand" /etc/systemconfig &>/dev/null -# then -# echo "Starting the backend. This will automatically update the schema." -# sv start mythbackend &>/dev/null -# echo "I'll launch an xterm so you watch output backend log." -# echo "Once the schema updates are complete, switch back to this xterm." -# echo -e "\033[1mWhen you see \"Upgrading to MythTV schema version 1254\"\033[0m" -# echo "You can switch back to this xterm." -# echo -e "\033[1mNote:After pressing , I'll be asleep for 30 secs...\033[0m" -# echo -e "\033[1mThis will give the schema time to upgrade.\033[0m" -# pause 'Press to continue...' -# xterm -fn *18* -e tail -f /var/log/mythtv/mythbackend.log & -# #Sleeping for 30 seconds to give the schema time to upgrade.... -# sleep 30 -# read -p "Press to continue once the schema upgrade is complete." -# echo -# echo -e "\033[1mNow, the frontend will launch to update the schema for any plugins.\033[0m" -# echo -e "\033[1mOnce the this is done, please exit the frontend.\033[0m" -# pause 'Press to continue...' -# xterm -e mythfrontend -# echo -# echo "Performing LinHES specific schema updates." -# echo -# /usr/LH/bin/update_schema_021_to_022.sh -# cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg -# /usr/LH/bin/mythwelcome-config.py -# fi -#remove portmap as it's no longer used. - -remove_service.sh portmap - -wget http://linhes.org/downloads/R6/sources/wallpaper.png -P /tmp -mv /tmp/wallpaper.png /home/mythtv/.fluxbox/ -chown mythtv.mythtv /home/mythtv/.fluxbox/wallpaper.png -echo "All done!" - - - -echo -e "\033[5mThanks for choosing LinHES!\033[0m" - #echo "The kernel was upgraded, we need to reboot." - pause "Press to reboot." - reboot - -# if grep -q kernel26 /tmp/linhes_upgrade -# then -# echo "The kernel was upgraded, we need to reboot." -# pause "Press to reboot." -# reboot -# else -# if grep -q v4l-dvb /tmp/linhes_upgrade -# then -# echo "The V4L\DVB modules were upgraded." -# pause "Press to reboot." -# reboot -# else -# echo "Launching mythfrontend once again!" -# echo "Enjoy the latest version!" -# sleep 5 -# mythfrontend -# fi -# fi diff --git a/abs/core/linhes-scripts/upgrade_screen_rc b/abs/core/linhes-scripts/upgrade_screen_rc deleted file mode 100644 index 8c49a8d..0000000 --- a/abs/core/linhes-scripts/upgrade_screen_rc +++ /dev/null @@ -1,9 +0,0 @@ -bind j focus down -bind k focus up -startup_message off -screen -t upgrade bash -c "upgrade_linhes_script.sh" -split -focus down -startup_message off -screen -t progress bash -c "while true; do cat /tmp/upgrade.fifo; sleep .5; done" -focus up diff --git a/abs/core/linhes-scripts/upgrade_to_0.22.sh b/abs/core/linhes-scripts/upgrade_to_0.22.sh deleted file mode 100644 index 8536a05..0000000 --- a/abs/core/linhes-scripts/upgrade_to_0.22.sh +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash -#Script to facilitate easy upgrade to MythTV 0.22 in LinHES. -if [ "$(id -u)" != "0" ]; then - echo "This script must be run as root" 1>&2 - exit 1 -fi -function pause(){ - read -p "$*" -} -clear -echo "The script will guide you thru the process of upgrading LinHES to MythTV 0.22." -pause 'Press to continue...' -if grep -E "Master|Stand" /etc/systemconfig &>/dev/null - then - echo "Stopping the backend." - sv stop mythbackend &>/dev/null -fi -echo "Sync'n with the repos..." -pacman -Sy &>/dev/null -echo "Removing MythVodka if installed as it is no longer compatible with MythTV." -if pacman -Qs mythvodka &>/dev/null - then - pacman -R mythvodka &>/dev/null -fi -echo "Backing up Online Streams listings." -cp /usr/share/mythtv/is.xml /usr/share/mythtv/is.xml.021 -echo "Removing mythcontrol, mythphone and mythsmolt if installed." -if pacman -Qs mythcontrols &>/dev/null - then - pacman -R mythcontrols &>/dev/null -fi -if pacman -Qs mythphone &>/dev/null - then - pacman -R mythphone &>/dev/null -fi -if pacman -Qs mythsmolt &>/dev/null - then - pacman -R mythsmolt &>/dev/null -fi -echo "Upgrading the kernel." -if pacman -Qs v4l-dvb &>/dev/null - then - pacman -Sf --noconfirm kernel26 &>/dev/null && pacman -Sf --noconfirm v4l-dvb - else - pacman -S kernel26 --noconfirm &>/dev/null -fi -echo "Checking for VDPAU packages and upgrading if needed." -if pacman -Qs vdpinfo-71xx &>/dev/null - then - pacman -Rd vdpinfo-71xx &>/dev/null -fi -if pacman -Qs vdpinfo-96xx &>/dev/null - then - pacman -Rd vdpinfo-96xx &>/dev/null -fi -if pacman -Qs vdpinfo &>/dev/null - then - pacman -Rd vdpinfo &>/dev/null && pacman -S --noconfirm nvidia &>/dev/null && pacman -S --noconfirm vdpauinfo &>/dev/null -fi -echo "Performing complete system upgrade." -echo "This may take some time depending on your connection speed." -echo "Server bandwidth utilization will also have an affect." -echo "Please be patient." -pacman -Su --noconfirm &>/dev/null -echo "Restoring Online Streams listings." -cp /usr/share/mythtv/is.xml.021 /usr/share/mythtv/is.xml -clear -if grep -E "Master|Stand" /etc/systemconfig &>/dev/null - then - echo "Starting the backend. This will automatically update the schema." - sv start mythbackend &>/dev/null - echo "I'll launch an xterm so you watch output backend log." - echo "Once the schema updates are complete, switch back to this xterm." - echo -e "\033[1mWhen you see \"Upgrading to MythTV schema version 1244\"\033[0m" - echo "You can switch back to this xterm." - echo -e "\033[1mNote:After pressing , I'll be asleep for 30 secs...\033[0m" - echo -e "\033[1mThis will give the schema time to upgrade.\033[0m" - pause 'Press to continue...' - xterm -fn *18* -e tail -f /var/log/mythtv/mythbackend.log & - #Sleeping for 30 seconds to give the schema time to upgrade.... - sleep 30 - read -p "Press to continue once the schema upgrade is complete." - echo -e "\033[1mNow, the frontend will launch to update the schema for any plugins.\033[0m" - echo -e "\033[1mOnce the this is done, please exit the frontend.\033[0m" - pause 'Press to continue...' - xterm -e mythfrontend - echo "Performing LinHES specific schema updates." - /usr/LH/bin/update_schema_021_to_022.sh - cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg -fi -echo "All done!" -echo -e "\033[5mThanks for choosing LinHES!\033[0m" -pause "Press to reboot." -reboot -- cgit v0.12 From 5e639998dbbff36f5555b4ab9798cefaeae8bca2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 22 Oct 2013 09:35:18 -0500 Subject: LinHES-config: replace pacman -f with --force as pacman 4.1 doesn't support -f. --- abs/core/LinHES-config/PKGBUILD | 8 ++++---- abs/core/LinHES-config/install_db_chroot.sh | 2 +- abs/core/LinHES-config/restore_km_db_chroot.sh | 2 +- abs/core/LinHES-config/soundconfig.sh | 4 ++-- abs/core/LinHES-config/startx | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 6a8cba3..d4983bb 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.0 -pkgrel=10 +pkgrel=11 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' @@ -141,12 +141,12 @@ md5sums=('c832059cd635359d39a2ac3166ff463c' 'fda01259a4bc74d83c9092d338bd247a' '768504ef10ecd11a22875ccea9fcf62b' 'f73d6d6f98839e900cb6685bf5dc4eae' - '408688e3bcb2cefe512f9a89863137c8' + 'b8becf69d4309b938ceba3178c799270' '2a7f3b34e522acfd08283b86c8926aba' 'b596d2e3779a434435bc0f0277b1ba3e' '5012fbd31d205a6d6b0a1d8caf3eba8f' '157e73d0f90d7b306aba8f5921aeedd3' - 'a6faa20d905e2fd92ce79acab044b759' + 'a805504b6593eaa416fe5f32cd4d1b9e' '8ba06c2ce6129371548cc360ccca27f8' '5f890ea9bda6aef652d2560ca19dac07' 'ab2aa42c2947148c2b1cac0ade6d1d55' @@ -154,7 +154,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c' 'f6a935c35123fdc7c259c01cbc794a64' '5e865cc04fe5de8a39d9c1e377fc4ebe' 'd3490e93f313bbbcbc6c3693c56b9c17' - '3d1e4a119f38cff0498bf8a67e94e4b3' + 'e959df98947eb0d2ea64ff616b61aab5' '2506860a416e1988934225d80d501c2c' 'c0549457750c4f8e8038d904a0f3012a' '075fe16ef92621ce31f41df5c5577daf' diff --git a/abs/core/LinHES-config/install_db_chroot.sh b/abs/core/LinHES-config/install_db_chroot.sh index 272b556..47de18c 100644 --- a/abs/core/LinHES-config/install_db_chroot.sh +++ b/abs/core/LinHES-config/install_db_chroot.sh @@ -12,7 +12,7 @@ echo "install_db_chroot hostname is $hostname" #myhost=`cat /etc/hostname` #mount -t proc none /proc -pacman --noconfirm -Sf mysql +pacman --noconfirm -S --force mysql /etc/rc.d/mysqld status=1 diff --git a/abs/core/LinHES-config/restore_km_db_chroot.sh b/abs/core/LinHES-config/restore_km_db_chroot.sh index e72e8c2..132dae3 100644 --- a/abs/core/LinHES-config/restore_km_db_chroot.sh +++ b/abs/core/LinHES-config/restore_km_db_chroot.sh @@ -11,7 +11,7 @@ DBFILE=$1 if [ $SystemType = "Master_backend" -o $SystemType = "Standalone" ] then #restore database - pacman --noconfirm -Sf mysql + pacman --noconfirm -S --force mysql status=1 mysqlstatus=1 while [ ! $status = 0 ] diff --git a/abs/core/LinHES-config/soundconfig.sh b/abs/core/LinHES-config/soundconfig.sh index b9eb906..f682465 100755 --- a/abs/core/LinHES-config/soundconfig.sh +++ b/abs/core/LinHES-config/soundconfig.sh @@ -30,7 +30,7 @@ function load_alsa() { echo " uncompressing ALSA modules" tar -xf sound-preoss.tar.bz2 # echo " installing alsa-lib" - #pacman -Sf --noconfirm alsa-lib + #pacman -S --force --noconfirm alsa-lib echo " uninstalling oss" pacman -R --noconfirm oss @@ -75,7 +75,7 @@ function installOSS { pacman -Q oss 2>/dev/null if [ ! $? = 0 ] then - pacman --noconfirm -Sf oss + pacman --noconfirm -S --force oss fi soundon add_service.sh oss diff --git a/abs/core/LinHES-config/startx b/abs/core/LinHES-config/startx index 75ba06a..b59dc7f 100755 --- a/abs/core/LinHES-config/startx +++ b/abs/core/LinHES-config/startx @@ -18,7 +18,7 @@ then startx /root/live-install.sh -- -logverbose 6 -config /root/xorg.conf.install -allowMouseOpenFail else #VNC - pacman -Sf --noconfirm tightvnc + pacman -S --force --noconfirm tightvnc cd /root mkdir .vnc echo mythvantage |vncpasswd -f > /root/.vnc/passwd -- cgit v0.12 From abf8d961437ad11b4e19f2d60e89ea4965654dcf Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 22 Oct 2013 09:42:56 -0500 Subject: LinHES-system: replace pacman -f with --force as pacman 4.1 doesn't support -f. --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/lh_system_host_update | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 6661028..71c7ae1 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.0 -pkgrel=28 +pkgrel=29 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -92,7 +92,7 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa' '3edef50a49a47694bf8add39cc160add' '5e17e0786afd891550a660f646076308' 'bc69a520add58ede9b060c73e67ace13' - '1be1d3dfc83f828eede93055713882ae' + '26fdd26e945f0c187f9fdcf98a7a5bef' '47e093e8cfe4b5b96602358e1f540832' 'a8e486f5d23913242b6edb862bf44c0e' '2c005d95312018bef80092136f80f254' diff --git a/abs/core/LinHES-system/lh_system_host_update b/abs/core/LinHES-system/lh_system_host_update index 75fe548..56a22e5 100644 --- a/abs/core/LinHES-system/lh_system_host_update +++ b/abs/core/LinHES-system/lh_system_host_update @@ -42,7 +42,7 @@ case $Hostupdateplan in echo "" echo "Updating ALL packages" pacman -Sy - pacman --noconfirm -Sfu + pacman --noconfirm -Su --force ;; "None") echo "" -- cgit v0.12 From 1b4d71125ff77190894aa29e3021809cd47b4d64 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 22 Oct 2013 10:57:25 -0500 Subject: linhes-theme: add config-ui.xml to move helptext on country and language screen so it doesn't overlap. --- abs/core/linhes-theme/LinHES/config-ui.xml | 833 +++++++++++++++++++++++++++++ abs/core/linhes-theme/PKGBUILD | 2 +- 2 files changed, 834 insertions(+), 1 deletion(-) create mode 100644 abs/core/linhes-theme/LinHES/config-ui.xml diff --git a/abs/core/linhes-theme/LinHES/config-ui.xml b/abs/core/linhes-theme/LinHES/config-ui.xml new file mode 100644 index 0000000..c4a3ed0 --- /dev/null +++ b/abs/core/linhes-theme/LinHES/config-ui.xml @@ -0,0 +1,833 @@ + + + + + + + + 20,50,760,450 + 0,0,760,420 + grid + 5 + + + 0,0,250,60 + + 0,0,250,60 + roundbox + 4 + + + + + + 0,5,80,50 + true + + + + + + + + + + + + + + + + + + + + 700,425 + + + lb-uparrow-reg.png + + + + + lb-uparrow-sel.png + + + + + 740,425 + + + lb-dnarrow-reg.png + + + + + lb-dnarrow-sel.png + + + + + + + + + + + 30,535 + + + + + + + + + + + + + + 10,39,780,275 + + + + 51,43,60,267 + + + + + 515,43,219,267 + + + + 19,50 + + + + 705,0,60,25 + true + + + + + + + + + + + + + + 210,370 + + + + + + 210,430 + + + + + + + + 30,490 + + + + + + + + + + + + + + + + 20,55,370,450 + + + + 30,65,350,430 + center + 4 + vertical + selection + 0,0,100%,97% + + + 0,0,100%,55 + + 0,2,100%,100% + + + + + + 5,7,60,40 + + + + + + + + + + + + + + + + + + + + + + 10,96% + + + lb-uparrow-sel.png + + + + + 40,96% + + + lb-dnarrow-sel.png + + + + Select the country in which you currently reside + + + + + + 410,55,370,450 + + + + 420,65,350,430 + 4 + center + vertical + selection + 0,0,100%,97% + + + 0,0,100%,55 + + 0,2,100%,100% + + + + + + + + + + + + + + + + + + + + + + + + + 10,96% + + + lb-uparrow-sel.png + + + + + 40,96% + + + lb-dnarrow-sel.png + + + + Select your preferred language + + + + + + + + + + + + + + + + + + + + + + + + + + + + 310,167 + + + + 310,232 + + + + 310,297 + + + + 290,370 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 250,97 + + + + 250,153 + + + + 250,198 + + + + 250,243 + + + + 250,288 + + + + 250,333 + + + + 250,372 + + + + + + + + + + + + + + + + + + + + + + 310,167 + + + + + + + + + + + + + + + + + + 20,55,760,410 + + + + 30,65,740,390 + 4 + vertical + selection + 0,0,100%,97% + + + 0,0,100%,55 + + 0,2,100%,100% + + + + + + + + + + + 470,2,100,50 + + 0,0,100,50 + + + + + + + + + + + 680,7,40,40 + + 0,0,40,40 + + 0,0,40,40 + roundbox + 6 + + + + 6,5 + shared/secure.png + + + + 0,0,40,40 + + 0,0,40,40 + roundbox + 6 + + + + 2,5 + shared/unsecure.png + + + + + + + + + + + + + + + + + + + + + + 10,96% + + + lb-uparrow-sel.png + + + + + 40,96% + + + lb-dnarrow-sel.png + + + + Select the server you wish to connect to + + + + + + + + + + + + + diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index a9a7cbb..bd3ea7b 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-theme pkgver=1.4 -pkgrel=2 +pkgrel=3 pkgdesc="Default LinHES theme." arch=('i686' 'x86_64') license=('GPL2') -- cgit v0.12 From 85d4c6d7272c21ec6dccc5d4bda36313cb70e30d Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 22 Oct 2013 12:00:24 -0500 Subject: linhes-theme: fix PKGBUILD to use package() --- abs/core/linhes-theme/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index bd3ea7b..75d2157 100644 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -3,16 +3,16 @@ pkgname=linhes-theme pkgver=1.4 -pkgrel=3 +pkgrel=4 pkgdesc="Default LinHES theme." arch=('i686' 'x86_64') license=('GPL2') url="http://linhes.org/" -build() { - cd $startdir/src/ - cp -a $startdir/LinHES $startdir/src/ - mkdir -p $startdir/pkg/usr/share/mythtv/themes - cp -a LinHES $startdir/pkg/usr/share/mythtv/themes +package() { + cd $srcdir/ + cp -a $startdir/LinHES $srcdir/ + mkdir -p $pkgdir/usr/share/mythtv/themes + cp -a LinHES $pkgdir/usr/share/mythtv/themes } md5sums=() -- cgit v0.12