summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--abs/core/LinHES-config/PKGBUILD11
-rwxr-xr-xabs/core/LinHES-config/install_proxy.sh18
-rwxr-xr-xabs/core/LinHES-config/mv_advanced.py1
-rwxr-xr-xabs/core/LinHES-config/mv_misc.py2
-rw-r--r--abs/core/mythinstall/PKGBUILD2
-rwxr-xr-xabs/core/mythinstall/checkout_MythVantage.sh26
-rw-r--r--abs/extra/autogen/PKGBUILD24
-rw-r--r--abs/extra/autogen/autogen.install20
-rw-r--r--abs/extra/bdf-unifont/LICENSE60
-rw-r--r--abs/extra/bdf-unifont/PKGBUILD24
-rw-r--r--abs/extra/bdf-unifont/unifont.install15
11 files changed, 187 insertions, 16 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 81d0fb6..b94878b 100644
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=2.3
-pkgrel=12
+pkgrel=30
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'
@@ -105,7 +105,7 @@ md5sums=('6259677916192a92d1adf47b276f7829'
'16b98fcb3753ef6cfc35075c326d30e4'
'e36da536dd651ef182e7642337889e77'
'985891a43f7c4c983eb2a362162f1a0f'
- 'd7a8cd4a0060399ae22e69f74e04eb07'
+ '2f0b85d37b15956b3d92419c886e040c'
'd705eb26cd25862bf0e84cc9964bd3db'
'c20f73d4da5d7e15e1f3eb85c7dcb49a'
'8ac1cfd2eca0f641737da0d0aca416a7'
@@ -121,12 +121,17 @@ md5sums=('6259677916192a92d1adf47b276f7829'
'a225143e3df6f56d451c2875e54ddbae'
'9151c74fcaf18ec4cf5e757cfdbc7017'
'3d1e4a119f38cff0498bf8a67e94e4b3'
+<<<<<<< HEAD
+ 'fb80a58b1b4cfb26aee48bc991162b40'
+ '5f3259afe031fda189edae41dd1458f0'
+=======
'd6c2d07c58ca6484c5be8b7093b921cd'
'e6538618f7bb5fb6b79c132803451c39'
+>>>>>>> origin/testing
'41b03fb1e0a9d9ae7588e3b813212772'
'b845de3e05c1734cce4b9ac5e8f1baaf'
'56ca5fd7d6b8d1828c95d13eb0d34de5'
- '7a5018c3ce9c6aff3fb26c04ee805ba9'
+ '5e69839659d65ddda35b8a9982dc29e9'
'62b4ce94277c32f525db5c1480670acd'
'ec6a9961e4d1b53ec1240c5979efff11'
'fe5e31b833cc6707209e9d656b6eb53c'
diff --git a/abs/core/LinHES-config/install_proxy.sh b/abs/core/LinHES-config/install_proxy.sh
index 71b675b..4bb2444 100755
--- a/abs/core/LinHES-config/install_proxy.sh
+++ b/abs/core/LinHES-config/install_proxy.sh
@@ -88,19 +88,31 @@ case $1 in
;;
check_gw)
#check gateway
+ rc=0
echo "network check gateway"
/sbin/route -n
mygwdefault=`/sbin/route -n |grep $default_interface|grep UG|awk '{ print $2}'`
echo "Default gateway seems to be $mygwdefault"
if [ ! x$mygwdefault = x ]
then
- sleep 2
- ping -c 5 $mygwdefault
- if [ ! $? = 0 ]
+ #sleep 2
+ for i in `seq 10`
+ do
+ ping -c 1 $mygwdefault
+ if [ $? = 0 ]
+ then
+ break
+ rc=1
+ fi
+ done
+
+
+ if [ rc = 0 ]
then
exit 4
fi
fi
+
;;
check_ns)
#check nameserver
diff --git a/abs/core/LinHES-config/mv_advanced.py b/abs/core/LinHES-config/mv_advanced.py
index aa0dcd8..dd00f1d 100755
--- a/abs/core/LinHES-config/mv_advanced.py
+++ b/abs/core/LinHES-config/mv_advanced.py
@@ -330,6 +330,7 @@ def setup_NFSshares(UseNFS,templatefile):
mv_common.pacinstall("nfs-utils")
mv_common.pacinstall("rpcbind")
cmd = '''sed -e "s/REPLACEME/*/g" %s >/etc/exports''' %templatefile
+ mv_common.runcmd(cmd)
mv_common.add_service("nfsd")
mv_common.add_service("nfs-common")
mv_common.add_service("rpcbind")
diff --git a/abs/core/LinHES-config/mv_misc.py b/abs/core/LinHES-config/mv_misc.py
index f49615a..0cbf872 100755
--- a/abs/core/LinHES-config/mv_misc.py
+++ b/abs/core/LinHES-config/mv_misc.py
@@ -82,7 +82,7 @@ def setup_nfs(systemconfig):
else:
#if standalone or slave try to use MBE
if systemconfig.get("SystemType") == "Frontend_only" or systemconfig["SystemType"] == "Slave_Backend":
- item = (systemconfig.get("dbhost") , data_config.DATAMOUNT)
+ item = (systemconfig.get("dbhost")+":"+ data_config.DATAMOUNT, data_config.DATAMOUNT)
nfslist.append(item)
setup_nfs_fstab(nfslist)
logging.info("__End of nfs\n")
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 36114e3..e45be4e 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=3
-pkgrel=9
+pkgrel=11
pkgdesc="LinHES installer/systemconfig GUI."
arch=i686
depends=()
diff --git a/abs/core/mythinstall/checkout_MythVantage.sh b/abs/core/mythinstall/checkout_MythVantage.sh
index 22af46a..a61ed95 100755
--- a/abs/core/mythinstall/checkout_MythVantage.sh
+++ b/abs/core/mythinstall/checkout_MythVantage.sh
@@ -1,7 +1,11 @@
#!/bin/bash
MYDIR=`pwd`
-#MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable\/mythtv\/src\/mythtv-0.23"
-MYTHPATH="\/data\/linhes_pkgbuild\/abs\/core\/mythtv\/stable-0.24\/mythtv\/src\/mythtv"
+
+PREFIX="\/usr\/include\/mythtv"
+LIBVERSION=0.24
+VERSION=0.24.0
+
+
function setup_links {
rm mythinstall.bin
rm mythbeselect.bin
@@ -16,7 +20,7 @@ if [ ! -d MythVantage-app ]
then
git clone http://mythvantage.com/MythVantage-app.git/
cd MythVantage-app
- git checkout --track -b LinHES origin/LinHES
+# git checkout --track -b LinHES origin/LinHES
cd $MYDIR
setup_links
cd -
@@ -36,15 +40,21 @@ git checkout master
}
dl_repo
-sed -i "s/^MYTHPATH.*$/MYTHPATH\=\"$MYTHPATH\"/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+set -x
+sed -i "s/^LIBVERSION.*$/LIBVERSION = $LIBVERSION/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+sed -i "s/^VERSION.*$/VERSION = $VERSION/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+sed -i "s/^PREFIX.*$/PREFIX = $PREFIX/g" $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+
+
+
sed -i "s/#define __MVAPP__/\/\/#define __MVAPP__/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
-echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythbeselect/mythberestart.pro
-echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
-echo "INCLUDEPATH += /usr/include/mythtv/libmythui/" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+# echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythbeselect/mythberestart.pro
+# echo "INCLUDEPATH += /usr/include/mythtv" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+# echo "INCLUDEPATH += /usr/include/mythtv/libmythui/" >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
-echo 'INCLUDEPATH += $$MYTHPATH/mythtv/libs/libmythtv/' >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+#echo 'INCLUDEPATH += $$MYTHPATH/mythtv/libs/libmythtv/' >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
cd $MYDIR/src/MythVantage-app/mythinstall && qmake
make || exit 1
diff --git a/abs/extra/autogen/PKGBUILD b/abs/extra/autogen/PKGBUILD
new file mode 100644
index 0000000..eea072e
--- /dev/null
+++ b/abs/extra/autogen/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 54700 2009-10-11 18:35:07Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Arjan Timmerman <arjan@soufly.nl>
+# Contributor: Tor Krill
+
+pkgname=autogen
+pkgver=5.11.5
+pkgrel=1
+pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text"
+arch=(i686 x86_64)
+url="http://autogen.sourceforge.net/"
+license=('GPL3')
+depends=('guile>=1.8.6' 'libxml2>=2.7.3' 'libtool>=2.2.6a')
+options=('!libtool' '!makeflags')
+install=autogen.install
+source=(http://downloads.sourceforge.net/autogen/${pkgname}-${pkgver}.tar.bz2)
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr || return 1
+ make || return 1
+ make DESTDIR="${pkgdir}" install || return 1
+}
+md5sums=('51c841eab6114de22b55f77a1c4f85b8')
diff --git a/abs/extra/autogen/autogen.install b/abs/extra/autogen/autogen.install
new file mode 100644
index 0000000..181c256
--- /dev/null
+++ b/abs/extra/autogen/autogen.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(autogen.info autogen.info-1 autogen.info-2)
+
+post_install() {
+ for file in ${filelist[@]}; do
+ install-info $infodir/${file}.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/${file}.gz $infodir/dir 2> /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/bdf-unifont/LICENSE b/abs/extra/bdf-unifont/LICENSE
new file mode 100644
index 0000000..066ea16
--- /dev/null
+++ b/abs/extra/bdf-unifont/LICENSE
@@ -0,0 +1,60 @@
+CENSE
+-------
+Roman Czyborra released his work (Perl scripts and font .hex files)
+under the following terms:
+
+ All of my works you find here are freeware. You may
+ freely copy, use, quote, modify or redistribute them
+ as long as you properly attribute my contribution and
+ have given a quick thought about whether Roman might
+ perhaps be interested to read what you did with his
+ stuff. Horizontal rules don't apply.
+
+David Starner released what in this package is named "hex2bdf-split"
+under the same license as Roman Czyborra's work.
+
+License for all of Paul Hardy's work (except "johab2ucs2" and
+"blanks.hex", mentioned separately), Makefile and debian/ mods
+by Anthony Fok, and modified software from Luis Gonzalez Miranda
+(with permission granted to Paul Hardy):
+
+ These are released under the terms of the GNU General Public
+ License version 2, or (at your option) a later version.
+
+License for Fonts:
+
+ Any fonts using glyphs from the "wqy-cjk.hex" file (including
+ the default TrueType font) are bound by the terms of the Wen
+ Quan Yi font license. Those fonts are released under the terms
+ of the GNU General Public License (GPL) versionn 2, with the
+ exception that embedding the font in a document does not by
+ itself bind that document to the terms of the GNU GPL.
+
+ Any fonts that do not use glyphs from the "wqy-cjk.hex" file
+ fall under the above "License for all of Roman Czyborra's work".
+
+ The fonts in "./font/precompiled" do use wqy-cjk.hex, and so
+ are licensed under the GNU GPL version 2, with the exception
+ that embedding the font in a document does not in itself bind
+ that document to the terms of the GNU GPL. The following
+ paragraphs explaining the exception is taken from the Wen
+ Quan Yi font distribution:
+
+ ** GPL v2.0 license with font embedding exception:
+
+ As a special exception, if you create a document which
+ uses this font, and embed this font or unaltered portions
+ of this font into the document, this font does not by
+ itself cause the resulting document to be covered by
+ the GNU General Public License. This exception does not
+ however invalidate any other reasons why the document
+ might be covered by the GNU General Public License.
+ If you modify this font, you may extend this exception
+ to your version of the font, but you are not obligated
+ to do so. If you do not wish to do so, delete this
+ exception statement from your version.
+
+License for "blanks.hex":
+
+ There is one exception to the above rules: Paul Hardy earlier
+ released the "blanks.hex" file into the public domain.
diff --git a/abs/extra/bdf-unifont/PKGBUILD b/abs/extra/bdf-unifont/PKGBUILD
new file mode 100644
index 0000000..2df7993
--- /dev/null
+++ b/abs/extra/bdf-unifont/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD,v 1.5 2008/09/24 07:16:54 ronald Exp $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=bdf-unifont
+pkgver=5.1.20080820
+pkgrel=1
+pkgdesc="GNU Unifont Glyphs"
+arch=('i686' 'x86_64')
+license=('custom' 'GPL2')
+url="http://unifoundry.com/unifont.html"
+depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
+install=unifont.install
+source=('http://unifoundry.com/unifont-5.1.20080820.bdf.gz' 'LICENSE')
+md5sums=('6b8263ceccef33bd633aa019d74b7943'
+ '64da5a96d6789d29d485cd67a43bc547')
+
+build() {
+ install -Dm644 ${srcdir}/unifont-5.1.20080820.bdf \
+ ${pkgdir}/usr/share/fonts/misc/unifont.bdf
+
+ # install LICENSE file
+ install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
+
diff --git a/abs/extra/bdf-unifont/unifont.install b/abs/extra/bdf-unifont/unifont.install
new file mode 100644
index 0000000..7d21ab5
--- /dev/null
+++ b/abs/extra/bdf-unifont/unifont.install
@@ -0,0 +1,15 @@
+post_install() {
+ echo -n "Updating font cache... "
+ fc-cache -f > /dev/null
+ mkfontscale /usr/share/fonts/misc
+ mkfontdir /usr/share/fonts/misc
+ echo "done."
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
generated by cgit v0.12 at 2024-11-29 13:03:07 (GMT)