From ab7fa7b3c11b2cf1cfe49cb66149ef3d0d67b6b7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 16 Sep 2013 12:15:08 -0500 Subject: linhes-scripts: remove acl_fix.fstab.py as it isn't needed in R8. Remove linhes-scripts as a dep from LinHES-system, certmaster, e16_theme_settings and wmaker_settings as acl_fix_fstab.py was the reason for the dep. --- abs/core/LinHES-system/PKGBUILD | 8 ++-- abs/core/certmaster/PKGBUILD | 27 ++++++----- abs/core/e16_theme_settings/PKGBUILD | 6 +-- abs/core/linhes-scripts/PKGBUILD | 6 +-- abs/core/linhes-scripts/acl_fix_fstab.py | 64 -------------------------- abs/core/linhes-scripts/linhes-scripts.install | 7 --- abs/core/wmaker_settings/PKGBUILD | 6 +-- 7 files changed, 27 insertions(+), 97 deletions(-) delete mode 100644 abs/core/linhes-scripts/acl_fix_fstab.py diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index b21ff84..94b94fb 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,14 +1,14 @@ pkgname=LinHES-system pkgver=8.0 -pkgrel=9 +pkgrel=10 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" license=('GPL2') depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch' - 'python_aosd' 'linhes-scripts>=7-24' 'udisks' - 'LinHES-config>=2.3-59' 'sudo' 'python2-dbus' 'unclutter' - 'wmctrl' 'archlinux-xdg-menu' 'ethtool' 'gnu-netcat') + 'python_aosd' 'udisks' 'LinHES-config>=2.3-59' 'sudo' + 'python2-dbus' 'unclutter' 'wmctrl' 'archlinux-xdg-menu' + 'ethtool' 'gnu-netcat') backup=('etc/modprobe.d/alsa-base.conf') binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh LinHES-run load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh diff --git a/abs/core/certmaster/PKGBUILD b/abs/core/certmaster/PKGBUILD index 0c2bb91..85cb0f1 100644 --- a/abs/core/certmaster/PKGBUILD +++ b/abs/core/certmaster/PKGBUILD @@ -1,10 +1,10 @@ pkgname=certmaster pkgver=0.28 -pkgrel=3 +pkgrel=4 pkgdesc="certmaster" url="https://fedorahosted.org/certmaster/ " license="gpl" -depends=('pyopenssl' 'linhes-scripts>=7-24' ) +depends=('pyopenssl') makedepends=() conflicts=() replaces=() @@ -16,17 +16,20 @@ source=($pkgname-$pkgver.tar.gz certmaster.conf minion.conf logrotate-certmaster arch=('i686' 'x86_64') build() { - cd $startdir/src/$pkgname-${pkgver} + cd $srcdir/$pkgname-${pkgver} python setup.py build - python setup.py install --prefix=$startdir/pkg/usr - cd $startdir/src - install -m755 -D minion.conf $startdir/pkg/etc/certmaster/minion.conf - install -m755 -D certmaster.conf $startdir/pkg/etc/certmaster/certmaster.conf - install -m644 -D logrotate-certmaster.conf $startdir/pkg/etc/logrotate.d/certmaster - mkdir -p $startdir/pkg/var/log/certmaster - cd $startdir/pkg - find ./usr/bin/* -exec sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' {} \; - find ./ -name "*.pyc" -print | xargs rm -f + python setup.py install --prefix=$pkgdir/usr +} + +package() { + cd $srcdir + install -m755 -D minion.conf $pkgdir/etc/certmaster/minion.conf + install -m755 -D certmaster.conf $pkgdir/etc/certmaster/certmaster.conf + install -m644 -D logrotate-certmaster.conf $pkgdir/etc/logrotate.d/certmaster + mkdir -p $pkgdir/var/log/certmaster + cd $pkgdir + find $pkgdir/usr/bin/* -exec sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' {} \; + find $pkgdir/ -name "*.pyc" -print | xargs rm -f } md5sums=('f5acc9ff1efa34971296e26d794c5b35' '953ff601e5381b457383e7a3c4928192' diff --git a/abs/core/e16_theme_settings/PKGBUILD b/abs/core/e16_theme_settings/PKGBUILD index 4616e97..4526103 100644 --- a/abs/core/e16_theme_settings/PKGBUILD +++ b/abs/core/e16_theme_settings/PKGBUILD @@ -1,15 +1,15 @@ pkgname=e16_theme_settings pkgver=1.0 -pkgrel=15 +pkgrel=16 pkgdesc="Default settings for e16" -depends=(enlightenment 'linhes-scripts>=7-24') +depends=('enlightenment') source=() arch=('i686' 'x86_64') groups=(alt_wm) install=e16.install configdir=/usr/share/wm_data backup=('usr/share/wm_data/e16_config_dir/e_config--0.0.cfg') -build() { +package() { echo $startdir mkdir -p $pkgdir/$configdir rsync -arp --exclude=.svn $startdir/e16_config_dir $pkgdir/$configdir diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD index e78d857..0c81167 100644 --- a/abs/core/linhes-scripts/PKGBUILD +++ b/abs/core/linhes-scripts/PKGBUILD @@ -3,7 +3,7 @@ pkgname=linhes-scripts pkgver=7 -pkgrel=54 +pkgrel=55 pkgdesc="Various scripts that help to make LinHES, LinHES." arch=('i686' 'x86_64') license=('GPL2') @@ -39,7 +39,6 @@ qip7100-cc.sh dtheme.sh upgrade_screen_rc upgrade_linhes_script.sh -acl_fix_fstab.py stop_xss.sh myth2mkv LinHES-osd @@ -51,7 +50,7 @@ package() { cd ${srcdir} install -d ${pkgdir}/usr/LH/bin install -d ${pkgdir}/usr/LH/etc - install -D -m755 myth2* *.sh *.pl *.py vdpau* run-* pause_* LinHES* get_airplay_key ${pkgdir}/usr/LH/bin/ + install -D -m755 myth2* *.sh *.pl vdpau* run-* pause_* LinHES* get_airplay_key ${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 @@ -89,7 +88,6 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f' '35693f50939d5827aeabfce8c5dce589' '974c137d3fcb85942ba8945a1bc815fe' 'f454faeabfa153b10389a9a3bfd51c4a' - 'cc9cdabcdfc969c2829b58c0e513488c' '54a478660d0f8150fe10112a9ecf2740' '503df99218373dfc75e7e7f5e449a44e' 'b608044c9e7530a400d8f5b88fdfe6e6' diff --git a/abs/core/linhes-scripts/acl_fix_fstab.py b/abs/core/linhes-scripts/acl_fix_fstab.py deleted file mode 100644 index 187cab1..0000000 --- a/abs/core/linhes-scripts/acl_fix_fstab.py +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/python2 -import os -import sys -import subprocess as sub - -def should_add_acl(mount_point,fs_map): - acl_fs_list=["ext3","ext4"] - rc = False - for i in fs_map: - if i[0] == mount_point: - if i[1] in acl_fs_list: - rc = True - - return rc - - -cmd="cp -f /etc/fstab /etc/fstab.backup.pre_acl" -os.system(cmd) -f = open('/etc/fstab', 'r') -fstab=f.readlines() -f.close() - -p = sub.Popen(['/sbin/fsck','-N' ],stdout=sub.PIPE,stderr=sub.PIPE) -output, errors = p.communicate() -output = output.split("\n") -fs_map=[] -for i in output: - if i.startswith("["): - split_line=i.split() - #find mount_p and remove the last char - mount_p = split_line[3][:-1] - fstype = split_line[4].split(".")[1] - append_tuple=(mount_p,fstype) - fs_map.append(append_tuple) - - - -mp=['/' , '/myth', '/data'] -newfstab=[] -for line in fstab: - new_line=line - split_line=line.split() - try: - if split_line[1] in mp and should_add_acl(split_line[1],fs_map): - #print split_line[3] - if "acl" in split_line[3]: - pass - else: - print "Adding ACL" - new_acl=split_line[3]+",acl" - split_line[3]=new_acl - new_line='\t'.join(split_line) - except: - pass - newfstab.append(new_line) - - -f = open('/etc/fstab', 'w') -for i in newfstab: - f.write(i) - f.write("\n") - -f.close() - diff --git a/abs/core/linhes-scripts/linhes-scripts.install b/abs/core/linhes-scripts/linhes-scripts.install index d4c9e59..f554bd0 100644 --- a/abs/core/linhes-scripts/linhes-scripts.install +++ b/abs/core/linhes-scripts/linhes-scripts.install @@ -2,13 +2,6 @@ post_upgrade() { . /etc/profile /usr/LH/bin/remove_php_mythvideo.sh - if [ "`vercmp $2 7-24`" -lt 0 ] - then - echo "Applying ACL fix and remounting /" - /usr/LH/bin/acl_fix_fstab.py - mount -o remount / - fi - } # vim:set ts=2 sw=2 et: diff --git a/abs/core/wmaker_settings/PKGBUILD b/abs/core/wmaker_settings/PKGBUILD index 8b29e41..0ad0dfd 100644 --- a/abs/core/wmaker_settings/PKGBUILD +++ b/abs/core/wmaker_settings/PKGBUILD @@ -1,14 +1,14 @@ pkgname=wmaker_settings pkgver=1.0 -pkgrel=18 +pkgrel=19 pkgdesc="Default settings for windowmaker+ theme" -depends=('windowmaker' 'linhes-scripts>=7-24') +depends=('windowmaker') source=() arch=('i686' 'x86_64') groups=(alt_wm) install=wmaker_settings.install configdir=/usr/share/wm_data -build() { +package() { echo $startdir mkdir -p $pkgdir/$configdir rsync -arp --exclude=.svn $startdir/GNUstep $pkgdir/$configdir -- cgit v0.12