summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2013-11-27 22:34:37 (GMT)
committerJames Meyer <james.meyer@operamail.com>2013-11-27 22:34:37 (GMT)
commiteaf688c196267efe08ce7b39203988275e83e8ba (patch)
tree9afa4dc2723eb4a355cf3449c31d11f39ab601de
parent50febebef4996733d7319593003881ab878b21a0 (diff)
downloadlinhes_pkgbuild-eaf688c196267efe08ce7b39203988275e83e8ba.zip
linhes_pkgbuild-eaf688c196267efe08ce7b39203988275e83e8ba.tar.gz
linhes_pkgbuild-eaf688c196267efe08ce7b39203988275e83e8ba.tar.bz2
func/LinHES-system: Move msg.cfg from the func package to LinHES-system.
This was done because msg.cfg is used by msg_daemon which is in LinHES-system. msg.cfg is also used by the func module msg.py, but msg.py calls msg_client/msg_deamon.
-rwxr-xr-xabs/core/LinHES-system/PKGBUILD14
-rw-r--r--abs/core/LinHES-system/msg.cfg (renamed from abs/core/func/msg.cfg)0
-rw-r--r--abs/core/func/PKGBUILD34
3 files changed, 25 insertions, 23 deletions
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index f7e3a55..0a0d5f1 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.1
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -30,7 +30,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
source=(LinHES-session LinHES-profile.sh $binfiles
alsa-base diskspace.cron cacheclean.cron xfs_defrag.cron
readme_is_xml readme_light add_storage.readme
- system-sudo.rules )
+ system-sudo.rules msg.cfg)
package() {
cd $srcdir
@@ -70,6 +70,9 @@ package() {
chown -R root:root $pkgdir/etc/sudoers.d
install -o root -g root -m 0750 $srcdir/system-sudo.rules $pkgdir/etc/sudoers.d/system_sudo
+ #config file of msg_daemon
+ install -m755 -D $srcdir/msg.cfg $pkgdir/usr/MythVantage/etc/msg.cfg
+
}
md5sums=('95720bd676d0b05e89e1f6ae6e0b4e2d'
@@ -83,7 +86,7 @@ md5sums=('95720bd676d0b05e89e1f6ae6e0b4e2d'
'542e670e78d117657f93141e9689f54d'
'8da6a7f1703a002f84e66629e847d8a6'
'bb72ab230c7a71706285bd0f31a4fb1f'
- 'a8c79014423a95b41908fbe74ba83a6e'
+ '07fc64580cc98aa28561730ac7695eca'
'962a3e9eaba2d1466251b7ab0956705d'
'1758aed160de64abfafb28a3a8f3390e'
'33fbebbd546672cedd3c5e7350ab414e'
@@ -117,7 +120,7 @@ md5sums=('95720bd676d0b05e89e1f6ae6e0b4e2d'
'34fc1f58ad1eabf4eff4979d420760c0'
'c3ada01d3a739abe3f920b02d4ea3f6e'
'a94fe6d980f4b810f2e2ae5352084b39'
- '1c71ff372978159f09342b18954500b3'
+ 'f808e8614246913a7f633b51c7169c85'
'3fc3d584fadd47f82c5cfe8ac0f4322a'
'503df99218373dfc75e7e7f5e449a44e'
'4a1fda884dcd7d65fb2690fbdbd92a83'
@@ -132,4 +135,5 @@ md5sums=('95720bd676d0b05e89e1f6ae6e0b4e2d'
'36bdfa8d877cea20ca3870faf08e08d5'
'59d0602bac7e06f11abba1894acc8bb0'
'da432d68962e109e09beb2b71c8c8571'
- '366ccb097d1c221389709485c3b2d159')
+ '366ccb097d1c221389709485c3b2d159'
+ 'bdd37627c9effd745a051fd2d279975b')
diff --git a/abs/core/func/msg.cfg b/abs/core/LinHES-system/msg.cfg
index 0d687c5..0d687c5 100644
--- a/abs/core/func/msg.cfg
+++ b/abs/core/LinHES-system/msg.cfg
diff --git a/abs/core/func/PKGBUILD b/abs/core/func/PKGBUILD
index a4844cb..1b7b000 100644
--- a/abs/core/func/PKGBUILD
+++ b/abs/core/func/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=func
pkgver=0.25
-pkgrel=16
+pkgrel=17
pkgdesc="fedora unifed network controller"
url=""
license="gpl"
@@ -10,27 +10,26 @@ conflicts=()
replaces=()
backup=('etc/func/minion.conf')
install=func.install
-source=($pkgname-$pkgver.tar.gz minion.conf power.py pacman.py failed_func fe_restart.py msg.py msg.cfg func_ssl_patch logrotate-func.conf)
+source=($pkgname-$pkgver.tar.gz minion.conf power.py pacman.py failed_func fe_restart.py msg.py func_ssl_patch logrotate-func.conf)
arch=('i686' 'x86_64')
package() {
moddir="$pkgdir/usr/lib/python2.7/site-packages/func/minion/modules/"
- cd $srcdir/$pkgname-${pkgver}
+ cd $srcdir/$pkgname-${pkgver}
patch -Np1 < $srcdir/func_ssl_patch
- python2 setup.py build
- python2 setup.py install --prefix=$pkgdir/usr
- cd $srcdir
- install -m755 -D minion.conf $pkgdir/etc/func/minion.conf
- install -m755 -D $srcdir/$pkgname-$pkgver/etc/async_methods.conf $pkgdir/etc/func/async_methods.conf
- install -m755 -D $srcdir/$pkgname-${pkgver}/etc/sample.acl $pkgdir/etc/func/minion-acl.d/sample.acl
- install -m755 -D $srcdir/$pkgname-${pkgver}/etc/Test.conf $pkgdir/etc/func/modules/Test.conf
- install -m755 -D $srcdir/power.py ${moddir}/power.py
- install -m755 -D $srcdir/pacman.py ${moddir}/pacman.py
- install -m755 -D $srcdir/msg.py ${moddir}/msg.py
- install -m755 -D $srcdir/msg.cfg $pkgdir/usr/MythVantage/etc/msg.cfg
- install -m755 -D $srcdir/fe_restart.py ${moddir}/fe_restart.py
- install -m755 -D $srcdir/failed_func $pkgdir/usr/MythVantage/bin/failed_func
- mkdir -p $pkgdir/var/log/func
+ python2 setup.py build
+ python2 setup.py install --prefix=$pkgdir/usr
+ cd $srcdir
+ install -m755 -D minion.conf $pkgdir/etc/func/minion.conf
+ install -m755 -D $srcdir/$pkgname-$pkgver/etc/async_methods.conf $pkgdir/etc/func/async_methods.conf
+ install -m755 -D $srcdir/$pkgname-${pkgver}/etc/sample.acl $pkgdir/etc/func/minion-acl.d/sample.acl
+ install -m755 -D $srcdir/$pkgname-${pkgver}/etc/Test.conf $pkgdir/etc/func/modules/Test.conf
+ install -m755 -D $srcdir/power.py ${moddir}/power.py
+ install -m755 -D $srcdir/pacman.py ${moddir}/pacman.py
+ install -m755 -D $srcdir/msg.py ${moddir}/msg.py
+ install -m755 -D $srcdir/fe_restart.py ${moddir}/fe_restart.py
+ install -m755 -D $srcdir/failed_func $pkgdir/usr/MythVantage/bin/failed_func
+ mkdir -p $pkgdir/var/log/func
install -m644 -D ../logrotate-func.conf $pkgdir/etc/logrotate.d/func
cd $pkgdir
@@ -44,6 +43,5 @@ md5sums=('892252004f122c61bb58bb4607553ffe'
'c30f420c01628a08061270e8502115c5'
'b02a733b7a74569e57521bc3708724a5'
'7b4266a8031cf7de485bf6b74e57bd74'
- 'bdd37627c9effd745a051fd2d279975b'
'b816bdb222e646a7801b218c3a626b0e'
'7d7c8a334f6b46ae1e5e483854b93924')