diff options
| -rw-r--r-- | abs/core/LinHES-config/PKGBUILD | 6 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/mv_install.py | 1 | ||||
| -rwxr-xr-x | abs/core/LinHES-config/systemconfig.sh | 11 | ||||
| -rw-r--r-- | abs/core/pacman/PKGBUILD | 2 | ||||
| -rw-r--r-- | abs/core/pacman/pacman.install | 16 | ||||
| -rw-r--r-- | abs/core/python_modules/python-parted/PKGBUILD | 19 |
6 files changed, 36 insertions, 19 deletions
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index 2289196..2df19dd 100644 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=2.2 -pkgrel=21 +pkgrel=23 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' @@ -101,13 +101,13 @@ build() { install -m 0755 issue $startdir/pkg/etc/issue } -md5sums=('c1f6bd445284408767ab8ab4c4164aed' +md5sums=('c737f8538aea20fcb5f3903957e80837' '1a4694fcd694b362c339bda781ed0f3e' 'e36da536dd651ef182e7642337889e77' '985891a43f7c4c983eb2a362162f1a0f' 'd7a8cd4a0060399ae22e69f74e04eb07' '7a45287a07145fde5aa664583d4f6fba' - 'f88d2fb88339a4bf8ec9217a3fbcdef7' + '39ca949f82123a5e84902d761a6f9ca2' '8ac1cfd2eca0f641737da0d0aca416a7' '9ae8d79f620c6d19973c55c32a921874' '95526b4d3dec6c9341088fb6511d831a' diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py index 9dcc7b7..694a0b8 100755 --- a/abs/core/LinHES-config/mv_install.py +++ b/abs/core/LinHES-config/mv_install.py @@ -7,6 +7,7 @@ try: import parted except: print "module parted not found" + sys.exit(1) def usage(): print "help text:" diff --git a/abs/core/LinHES-config/systemconfig.sh b/abs/core/LinHES-config/systemconfig.sh index 218f705..dce8c74 100755 --- a/abs/core/LinHES-config/systemconfig.sh +++ b/abs/core/LinHES-config/systemconfig.sh @@ -10,6 +10,17 @@ echo "----------------------start of systemconfig $@ ----------------------" . $MV_ROOT/bin/networkconfig.sh postfix=`cat ${BASE}/usr/local/share/mythtv/.releasetype` +for i in larch liblarch larch-profiles larch-live +do + pacman -Q $i + if [ $? == 0 ] + then + pacman -R $i --noconfirm + fi +done + + sed -i '/larch/d' /etc/pacman.conf + systemconfig.py -m $@ rc=$? echo "systemconfig.py exit code $rc" diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD index e25f7a7..80dabe4 100644 --- a/abs/core/pacman/PKGBUILD +++ b/abs/core/pacman/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.3 -pkgrel=4 +pkgrel=5 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64') url="http://www.archlinux.org/pacman/" diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install index a3066bc..c066733 100644 --- a/abs/core/pacman/pacman.install +++ b/abs/core/pacman/pacman.install @@ -9,6 +9,7 @@ post_upgrade() { if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then _warnupgrade fi + _updateconf echo ">>>" echo ">>> ATTENTION! ATTENTION! ATTENTION!" echo ">>> /etc/pacman.conf has changed. If you have customized your" @@ -18,6 +19,21 @@ post_upgrade() { echo ">>>" } +_updateconf() { + pacconf="/etc/pacman.conf" + #add SyncFirst + grep -q SyncFirst $pacconf + if [ $? -eq 1 ] + then + sed -i '/\[options\]/ a\SyncFirst = pacman ' $pacconf + fi + #remove larch + sed -i '/larch/d' $pacconf + +} + + + _warnupgrade() { echo ">>>" echo ">>> The pacman database format has changed as of pacman 3.5.0." diff --git a/abs/core/python_modules/python-parted/PKGBUILD b/abs/core/python_modules/python-parted/PKGBUILD index 862405c..e00fa93 100644 --- a/abs/core/python_modules/python-parted/PKGBUILD +++ b/abs/core/python_modules/python-parted/PKGBUILD @@ -1,28 +1,17 @@ pkgname=python-parted __pkgname=pyparted -pkgver=2.0.12 -pkgver=3.4 +pkgver=3.8 pkgrel=4 pkgdesc="Python bindings for libparted" arch=('i686' 'x86_64') license=('LGPL' 'MPL') -depends=('python2' 'parted' 'python-decorator') +depends=('python2' 'parted=>3.0' 'python-decorator') options=('!libtool') source=(https://fedorahosted.org/releases/p/y/pyparted/pyparted-${pkgver}.tar.gz) url="https://fedorahosted.org/pyparted/" build() { cd "${srcdir}/${__pkgname}-${pkgver}" - ./configure --prefix=/usr || return 1 - make || return 1 + python2 setup.py install --prefix=/usr --root="${pkgdir}" } -package(){ - cd "${srcdir}/${__pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 -} -md5sums=('8fc485db0b88e59bbdfc4be8ba4068fa') -md5sums=('cc064f12110a6f0d0c236ee7b18fee88') -md5sums=('f244958142c9fd3ff5ee95f578e2f76d') -md5sums=('7f5d06bd6336f3a699840d8639ab8a0d') -md5sums=('f244958142c9fd3ff5ee95f578e2f76d') -md5sums=('cc064f12110a6f0d0c236ee7b18fee88') +md5sums=('e9cd0c94c71ac17755f71a8e1561eac2') |