diff options
25 files changed, 270 insertions, 159 deletions
diff --git a/abs/core/ceton-scripts/PKGBUILD b/abs/core/ceton-scripts/PKGBUILD new file mode 100644 index 0000000..8bab8c0 --- /dev/null +++ b/abs/core/ceton-scripts/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $ +# Maintainer: Cecil Watson<knoppmyth@gmail.com> + +pkgname=ceton-scripts +pkgver=1 +pkgrel=2 +pkgdesc="Scripts by Ron Frazier for use with Ceton InfiniTV4 and MythTV 0.24" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://linuxtv.org/" +source=('http://www.ronfrazier.net/mythtv/0.24/downloads/ceton_qam_channelmap.tar.gz' + 'http://www.ronfrazier.net/mythtv/0.24/downloads/ceton_channelmap.tar.gz' + 'ccm.patch' 'cqcm.patch') +build() { + cd $startdir/src/ + patch -p0 < ccm.patch + patch -p0 < cqcm.patch + mkdir -p $startdir/pkg/usr/bin + install -m 755 *.pl $pkgdir/usr/bin +} +md5sums=('7ef75cb01332ab86d56c348353d59a0e' + 'ab362902926c01a9b03498cc1aed4d14' + 'b57b7f04c1c177455b47efc958325ab9' + '40af5815f67fdf8070cf8aa041928a3b') diff --git a/abs/core/ceton-scripts/ccm.patch b/abs/core/ceton-scripts/ccm.patch new file mode 100644 index 0000000..53ec740 --- /dev/null +++ b/abs/core/ceton-scripts/ccm.patch @@ -0,0 +1,13 @@ +--- ceton_channelmap.pl.orig 2011-08-16 22:41:03.000000000 +0000 ++++ ceton_channelmap.pl 2011-08-16 22:41:47.000000000 +0000 +@@ -8,8 +8,8 @@ + + my $mysql_host = 'localhost'; + my $mysql_db = 'mythconverg'; +-my $mysql_user = 'root'; +-my $mysql_pw = 'PUT PASSWORD HERE'; ++my $mysql_user = 'mythtv'; ++my $mysql_pw = 'mythtv'; + + -e $wget_path or die "Error: wget does not appear to be in the location specified ($wget_path) . Please configure the \$wget_path variable in this script\n"; + diff --git a/abs/core/ceton-scripts/cqcm.patch b/abs/core/ceton-scripts/cqcm.patch new file mode 100644 index 0000000..479ed1f --- /dev/null +++ b/abs/core/ceton-scripts/cqcm.patch @@ -0,0 +1,13 @@ +--- ceton_qam_channelmap.pl.orig 2011-08-16 22:41:13.000000000 +0000 ++++ ceton_qam_channelmap.pl 2011-08-16 22:42:37.000000000 +0000 +@@ -11,8 +11,8 @@ + + my $mysql_host = 'localhost'; + my $mysql_db = 'mythconverg'; +-my $mysql_user = 'root'; +-my $mysql_pw = 'PUT PASSWORD HERE'; ++my $mysql_user = 'mythtv'; ++my $mysql_pw = 'mythtv'; + + my $global_modulation = 'qam_256'; + diff --git a/abs/core/ceton/PKGBUILD b/abs/core/ceton/PKGBUILD index 97eb417..366763d 100644 --- a/abs/core/ceton/PKGBUILD +++ b/abs/core/ceton/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ceton _kernver=2.6.39-LinHES -pkgver=1.2 +pkgver=1.3 pkgrel=3 pkgdesc="Drivers for Ceton InfiniTV4" arch=('i686' 'x86_64') @@ -12,17 +12,22 @@ url="http://linuxtv.org/" depends=('kernel26') makedepends=(kernel-headers) install=ceton.install -source=('http://www.cetoncorp.com/firmware/ceton_infinitv_linux_driver_1_2.tar.gz') +source=('http://www.cetoncorp.com/firmware/ceton_infinitv_linux_driver_1_3.tar.gz' + 'ctn_udev.patch' 'ifctn.sh') build() { cd $startdir/src/ceton_infinitv_linux_driver # patch -p1 < ../hdpvr.diff + patch -p0 < $srcdir/ctn_udev.patch make make install - mkdir -p $startdir/pkg/lib/modules/$_kernver/kernel/drivers/media/video - cp ctn91xx.ko $startdir/pkg/lib/modules/$_kernver/kernel/drivers/media/video + mkdir -p $startdir/pkg/lib/modules/$_kernver/extra + cp ctn91xx.ko $startdir/pkg/lib/modules/$_kernver/extra mkdir -p $pkgdir/etc/udev/rules.d cp 98-ctn91xx.rules $pkgdir/etc/udev/rules.d/ - + mkdir -p $pkgdir/usr/LH/bin + install -m 755 $srcdir/ifctn.sh $pkgdir/usr/LH/bin } -md5sums=('7a014a32d88e0792231b439079c20acd') +md5sums=('5021db6c04e2f0c2a8367d9c15827470' + '05371fcff10a2d9058644e860f5c17ef' + '3fc4c4981d2dab54b297f17564b7729f') diff --git a/abs/core/ceton/ctn_udev.patch b/abs/core/ceton/ctn_udev.patch new file mode 100644 index 0000000..91af3ac --- /dev/null +++ b/abs/core/ceton/ctn_udev.patch @@ -0,0 +1,5 @@ +--- 98-ctn91xx.rules.orig 2011-08-18 19:17:11.000000000 +0000 ++++ 98-ctn91xx.rules 2011-08-18 19:18:54.000000000 +0000 +@@ -1 +1 @@ +-KERNEL=="ctn91xx_*", NAME="ceton/%k", MODE="0666",OWNER="root",GROUP="root" ++KERNEL=="ctn91xx_*", NAME="ceton/%k", MODE="0666",OWNER="root",GROUP="root", RUN+="/usr/LH/bin/ifctn.sh" diff --git a/abs/core/ceton/ifctn.sh b/abs/core/ceton/ifctn.sh new file mode 100755 index 0000000..7d7265d --- /dev/null +++ b/abs/core/ceton/ifctn.sh @@ -0,0 +1,2 @@ +#!/bin/bash +/sbin/ifconfig ctn0 192.168.200.254 netmask 255.255.255.0 up diff --git a/abs/core/kernel26/PKGBUILD b/abs/core/kernel26/PKGBUILD index 3340474..1b0efcd 100644 --- a/abs/core/kernel26/PKGBUILD +++ b/abs/core/kernel26/PKGBUILD @@ -5,18 +5,19 @@ pkgname=('kernel26' 'kernel26-headers' 'kernel26-docs') # Build stock -ARCH kern # pkgname=kernel26-custom # Build kernel with a different name _kernelname=${pkgname#kernel26} _basekernel=2.6.39 -pkgver=${_basekernel}.3 -pkgrel=9 +pkgver=${_basekernel}.4 +pkgrel=2 makedepends=('xmlto' 'docbook-xsl') _archpatch=1 -_patchname="patch-${pkgver}-${_archpatch}-ARCH" +_patchname="patch-${_basekernel}-1-ARCH" _fbpatchname="fbcondecor-0.9.6-3.0-rc2.patch" -_ckpatchversion=2 -_ckpatchname="patch-${_basekernel}-ck${_ckpatchversion}" -_bfqpatch1="0001-block-prepare-I-O-context-code-for-BFQ-v2-for-2.6.39.patch" -_bfqpath="http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.39" -_bfqpatch2="0002-block-cgroups-kconfig-build-bits-for-BFQ-v2-2.6.39.patch" -_bfqpatch3="0003-block-introduce-the-BFQ-v2-I-O-sched-for-2.6.39.patch" +_kernelpatch="patch-${pkgver}" +#_ckpatchversion=2 +#_ckpatchname="patch-${_basekernel}-ck${_ckpatchversion}" +#_bfqpatch1="0001-block-prepare-I-O-context-code-for-BFQ-v2-for-2.6.39.patch" +#_bfqpath="http://algo.ing.unimo.it/people/paolo/disk_sched/patches/2.6.39" +#_bfqpatch2="0002-block-cgroups-kconfig-build-bits-for-BFQ-v2-2.6.39.patch" +#_bfqpatch3="0003-block-introduce-the-BFQ-v2-I-O-sched-for-2.6.39.patch" _aufspath="http://chakra-project.org/sources/kernel26/patches/39/aufs2.1/" _aufs1="aufs2-base-39-20110704.patch" _aufs2="aufs2-kbuild-39-20110704.patch" @@ -29,14 +30,15 @@ license=('GPL2') url="http://www.kernel.org" options=(!strip) source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2 + http://www.kernel.org/pub/linux/kernel/v2.6/$_kernelpatch.bz2 ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2 http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${_fbpatchname} - http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/${_basekernel}/${_basekernel}-ck${_ckpatchversion}/${_ckpatchname}.bz2 + #http://www.kernel.org/pub/linux/kernel/people/ck/patches/2.6/${_basekernel}/${_basekernel}-ck${_ckpatchversion}/${_ckpatchname}.bz2 # Let's leave these out for now... #${_bfqpath}/${_bfqpatch1} #${_bfqpath}/${_bfqpatch2} #${_bfqpath}/${_bfqpatch3} - fix_ck2.patch + #fix_ck2.patch logo_linux_clut224.ppm lh.patch ${_aufspath}/${_aufs1} @@ -49,14 +51,15 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2 kernel26.preset) build() { - patch -N -i ${srcdir}/fix_ck2.patch + # patch -N -i ${srcdir}/fix_ck2.patch cd ${srcdir}/linux-$_basekernel # Add -ARCH patches # See http://projects.archlinux.org/linux-2.6-ARCH.git/ + patch -Np1 -i ${srcdir}/${_kernelpatch} patch -Np1 -i ${srcdir}/${_patchname} # Add -LinHES patches patch -Np1 -i ${srcdir}/${_fbpatchname} - patch -Np1 -i ${srcdir}/${_ckpatchname} + # patch -Np1 -i ${srcdir}/${_ckpatchname} patch -Np1 -i ${srcdir}/lh.patch patch -Np1 -i ${srcdir}/${_aufs1} patch -Np1 -i ${srcdir}/${_aufs2} @@ -268,16 +271,15 @@ find $pkgdir -type d -exec chmod 755 {} \; rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } md5sums=('1aab7a741abe08d42e8eccf20de61e05' - 'b23d7def30e57242cfe088f4d8ca8baa' + 'ff5eb7323c054a128d2922bde3297ed5' + '25bb870bed3865d3771b5e40d6dbfd50' '865216ca79342c67dc3aa43c18245694' - 'ffa0384d5a243d17ca47c9bd0e2217e7' - '0ab7720f0d80d142a280cfe35b9a8730' '57d5f9aedb2e52ef76bab244cd2645cf' - '23f6df0ea11870513c7b6a02d9e6ed07' + '577f8e94d2525c7e6933f8a14dcda984' '964034dd2716e930b72e59a7231471db' '351469fd75d3fa848398728360c6ffa4' '3b4a1df8e1f584446918f76cfca66e9b' '93d83faea1144a5dbd6df0f42148fb7f' - 'c4c29a94610354288183ad0ee23e7ec3' + '7b90f6fcd433ddba40337b1e1158b789' '8be1f60e54eb505b7e67d39fd2233103' '25584700a0a679542929c4bed31433b6') diff --git a/abs/core/kernel26/config b/abs/core/kernel26/config index 90e0e1b..da92112 100644 --- a/abs/core/kernel26/config +++ b/abs/core/kernel26/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/i386 2.6.39 Kernel Configuration -# Fri Jul 22 06:53:20 2011 +# Linux/i386 2.6.39.4 Kernel Configuration +# Wed Aug 17 01:29:19 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -60,7 +60,6 @@ CONFIG_IRQ_WORK=y # # General setup # -CONFIG_SCHED_BFS=y CONFIG_EXPERIMENTAL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_CROSS_COMPILE="" @@ -125,11 +124,15 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y CONFIG_CPUSETS=y CONFIG_PROC_PID_CPUSET=y +# CONFIG_CGROUP_CPUACCT is not set CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set # CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set CONFIG_NAMESPACES=y @@ -138,6 +141,7 @@ CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y +CONFIG_SCHED_AUTOGROUP=y CONFIG_MM_OWNER=y # CONFIG_SYSFS_DEPRECATED is not set CONFIG_RELAY=y @@ -382,11 +386,6 @@ CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set -CONFIG_VMSPLIT_3G=y -# CONFIG_VMSPLIT_3G_OPT is not set -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_2G_OPT is not set -# CONFIG_VMSPLIT_1G is not set CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set @@ -434,16 +433,9 @@ CONFIG_EFI=y CONFIG_SECCOMP=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_HZ_100 is not set -# CONFIG_HZ_250_NODEFAULT is not set +# CONFIG_HZ_250 is not set # CONFIG_HZ_300 is not set CONFIG_HZ_1000=y -# CONFIG_HZ_1500 is not set -# CONFIG_HZ_2000 is not set -# CONFIG_HZ_3000 is not set -# CONFIG_HZ_4000 is not set -# CONFIG_HZ_5000 is not set -# CONFIG_HZ_7500 is not set -# CONFIG_HZ_10000 is not set CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y CONFIG_KEXEC=y @@ -5427,6 +5419,7 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_ARCH_WANT_FRAME_POINTERS=y CONFIG_FRAME_POINTER=y # CONFIG_BOOT_PRINTK_DELAY is not set +CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set diff --git a/abs/core/kernel26/lh.patch b/abs/core/kernel26/lh.patch index 025d094..9532b8a 100644 --- a/abs/core/kernel26/lh.patch +++ b/abs/core/kernel26/lh.patch @@ -1,13 +1,12 @@ -diff -Nur linux-2.6.39.orig/Makefile linux-2.6.39/Makefile ---- linux-2.6.39.orig/Makefile 2011-07-15 05:54:11.000000000 +0000 -+++ linux-2.6.39/Makefile 2011-07-15 06:28:23.000000000 +0000 -@@ -10,9 +10,9 @@ - # Comments in this file are targeted only to the developer, do not - # expect to learn how to build the kernel reading this file. +diff -ruaN linux-2.6.39.orig//Makefile linux-2.6.39/Makefile +--- linux-2.6.39.orig//Makefile 2011-08-17 03:55:56.000000000 +0000 ++++ linux-2.6.39/Makefile 2011-08-17 03:57:49.000000000 +0000 +@@ -1,7 +1,7 @@ + VERSION = 2 + PATCHLEVEL = 6 + SUBLEVEL = 39 +-EXTRAVERSION = .4 ++EXTRAVERSION = + NAME = Flesh-Eating Bats with Fangs --CKVERSION = -ck2 --CKNAME = BFS Powered --EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION) -+#CKVERSION = -ck2 -+#CKNAME = BFS Powered -+#EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION) + # *DOCUMENTATION* diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD index 36945b3..ab70bcd 100755 --- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD @@ -6,7 +6,7 @@ pkgname=mythtv pkgver=0.24 -pkgrel=19 +pkgrel=21 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') url="http://www.mythtv.org/" @@ -28,7 +28,8 @@ optdepends=('xmltv: to download tv listings') #replaces=('mythtv-contrib') #conflicts=('mythtv-contrib') source=(ftp://ftp.knoppmyth.net/R6/sources/mythtv-0.24-fixes.tar.bz2 - 'mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty') + 'mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty' + 'http://www.ronfrazier.net/mythtv/0.24/downloads/ceton_ver007.patch') _gitroot="https://github.com/MythTV/mythtv.git" _gitname="${pkgname}" build() { @@ -46,6 +47,8 @@ build() { echo "-----------------------------" patch -Np0 -i ${startdir}/src/$i || return 1 done + echo Applying patch for Ceton InfinTV4 + patch -p2 < ${startdir}/src//ceton_ver007.patch echo "--------------------------done applying patches-----------------------------------------------" sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgver/" version.pro @@ -102,4 +105,5 @@ md5sums=('91488a6b1b05d14c5c5c601908b699e5' 'd048fd37d5061c853b5712d5f187b25d' 'f735805a80b0d1180dee01f9df1b7004' 'f407d6af23e74a49540755420f84fa58' - '5469d9921b726db750b991c87d226158') + '5469d9921b726db750b991c87d226158' + 'f4abf567356a1f99a0177ac914829bb8') diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 828e54c..4c3c8e1 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=25 +pkgrel=30 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" @@ -18,7 +18,6 @@ build() { cd $startdir/src/runitscripts install -d $startdir/pkg/etc/ install -d $startdir/pkg/etc/runit/ - install -d $startdir/pkg/var/service install -d $startdir/pkg/etc/sv install -d $startdir/pkg/sbin install -d $startdir/pkg/etc/rc.d/functions.d diff --git a/abs/core/runit-scripts/runit.install b/abs/core/runit-scripts/runit.install index 813d9f2..b98574f 100755 --- a/abs/core/runit-scripts/runit.install +++ b/abs/core/runit-scripts/runit.install @@ -1,29 +1,9 @@ # arg 1: the new package version -pre_install () { -if [ ! -f /sbin/halt-init ] -then - mv /sbin/halt /sbin/halt-init - rm -f /sbin/reboot - rm -f /sbin/poweroff -fi - -} - -pre_upgrade () { -if [ ! -f /sbin/halt-init ] -then - mv /sbin/halt /sbin/halt-init - rm -f /sbin/reboot - rm -f /sbin/poweroff -fi - -} - post_install () { [ -e /service ] || mkdir /service - servicelist="acpid cron frontend lircd ntpd alsa-utils avahi dbus sshd syslog-ng tty2 tty3" + servicelist="acpid cron frontend lircd ntpd alsa-utils avahi dbus sshd syslog-ng tty2 tty3" for i in $servicelist do ln -s /etc/sv/$i /service/$i diff --git a/abs/core/runit-scripts/runitscripts/1 b/abs/core/runit-scripts/runitscripts/1 index af6b376..c64a047 100755 --- a/abs/core/runit-scripts/runitscripts/1 +++ b/abs/core/runit-scripts/runitscripts/1 @@ -11,6 +11,7 @@ rm -f /etc/sv/frontend/.runtime/* 2>/dev/null rm -f /etc/runit/reboot 2>/dev/null /sbin/agetty -8 38400 tty10 linux & stat_busy "Starting network" +/bin/mkdir -p /var/lock/subsys /etc/net/scripts/network.init start 2>/var/log/network.init.error >/var/log/network.init stat_done /usr/sbin/ethtool -s eth0 wol g 2>/dev/null diff --git a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run index 7a92437..15d3bb2 100644..100755 --- a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run +++ b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run @@ -8,5 +8,7 @@ [ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth - stat_runit "Starting bluetooth subsystem:" - exec /usr/sbin/bluetoothd -n +/sbin/svwaitup -s 15 /service/dbus || exit 1 +stat_runit "Starting bluetooth subsystem:" + +exec /usr/sbin/bluetoothd -n >/dev/null diff --git a/abs/core/runit-scripts/runitscripts/services/irqbalance/run b/abs/core/runit-scripts/runitscripts/services/irqbalance/run new file mode 100755 index 0000000..6342868 --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/irqbalance/run @@ -0,0 +1,16 @@ +#!/bin/bash + +# source application-specific settings +ONESHOT=0 +[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance + +if [ "$ONESHOT" -ne 0 ]; then + ONESHOT_CMD="--oneshot" +fi + +. /etc/rc.conf +. /etc/rc.d/functions + +stat_runit "Starting irqbalance" + +exec /usr/sbin/irqbalance --debug $ONESHOT_CMD >/dev/null diff --git a/abs/core/runit/PKGBUILD b/abs/core/runit/PKGBUILD index a3b202e..f1b1bb2 100644 --- a/abs/core/runit/PKGBUILD +++ b/abs/core/runit/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit pkgver=2.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="A replacement for sysvinit, and other init schemes, with service supervision" url="http://smarden.org/runit/" license=('BSD') @@ -46,18 +46,8 @@ package() { install -m0644 ../man/*.8 $pkgdir/usr/man/man8 gzip -9 $pkgdir/usr/man/man8/*.8 || return 1 -# rsync -a --exclude=.svn $startdir/runitscripts $srcdir -# cd $srcdir/runitscripts - install -d $pkgdir/etc/ install -d $pkgdir/etc/runit/ - install -d $pkgdir/var/service - -# install -m0700 1 2 3 ctrlaltdel $pkgdir/etc/runit -# install -m0755 reboot-runit halt-runit logger $pkgdir/sbin - - # install -d $pkgdir/etc/sv - # rsync -a --exclude=.svn services/* $pkgdir/etc/sv cd $startdir install -d $pkgdir/usr/bin diff --git a/abs/core/runit/runit.install b/abs/core/runit/runit.install index 392d7be..b62e94e 100755 --- a/abs/core/runit/runit.install +++ b/abs/core/runit/runit.install @@ -1,38 +1,58 @@ # arg 1: the new package version pre_install () { -if [ ! -f /sbin/halt-init ] -then - mv /sbin/halt /sbin/halt-init - mv /sbin/shutdown /sbin/shutdown-init +if [ ! -L /sbin/halt ] ; then + if [ -f /sbin/halt ] ; then + mv /sbin/halt /sbin/halt-init + fi +fi + +if [ ! -L /sbin/shutdown ] ; then + if [ -f /sbin/shutdown ] ; then + mv /sbin/shutdown /sbin/shutdown-init + fi +fi + +if [ -e /sbin/reboot ] ; then + rm -f /sbin/reboot +fi + +if [ -e /sbin/poweroff ] ; then + rm -f /sbin/poweroff fi - rm -f /sbin/reboot - rm -f /sbin/poweroff } pre_upgrade () { -if [ ! -f /sbin/halt-init ] -then - mv /sbin/halt /sbin/halt-init +if [ ! -f /sbin/halt-init ] ; then + if [ ! -L /sbin/halt ] ; then + mv /sbin/halt /sbin/halt-init + fi +fi + +if [ ! -f /sbin/shutdown-init ] ; then + if [ ! -L /sbin/shutdown ] ; then + mv /sbin/shutdown /sbin/shutdown-init + fi +fi + +if [ -e /sbin/reboot ] ; then + rm -f /sbin/reboot fi -if [ ! -f /sbin/shutdown-init ] -then - mv /sbin/shutdown /sbin/shutdown-init +if [ -e /sbin/poweroff ] ; then + rm -f /sbin/poweroff fi - rm -f /sbin/reboot - rm -f /sbin/poweroff } post_install () { - [ -e /sbin/halt ] || ln -s /sbin/halt.script /sbin/halt - [ -e /sbin/reboot ] || ln -s /sbin/reboot.script /sbin/reboot - [ -e /sbin/poweroff ] || ln -s /sbin/poweroff.script /sbin/poweroff - [ -e /sbin/reboot.init ] || ln -s /sbin/halt-init /sbin/reboot.init - [ -e /sbin/poweroff.init ] || ln -s /sbin/halt-init /sbin/poweroff.init - [ -e /sbin/shutdown ] || ln -s /sbin/shutdown.script /sbin/shutdown + [ -e /sbin/halt ] || ln -sf /sbin/halt.script /sbin/halt + [ -e /sbin/reboot ] || ln -sf /sbin/reboot.script /sbin/reboot + [ -e /sbin/poweroff ] || ln -sf /sbin/poweroff.script /sbin/poweroff + [ -e /sbin/reboot.init ] || ln -sf /sbin/halt-init /sbin/reboot.init + [ -e /sbin/poweroff.init ] || ln -sf /sbin/halt-init /sbin/poweroff.init + [ -e /sbin/shutdown ] || ln -sf /sbin/shutdown.script /sbin/shutdown } # arg 1: the new package version diff --git a/abs/core/sysvinit/PKGBUILD b/abs/core/sysvinit/PKGBUILD index 110d93c..3be24b0 100644 --- a/abs/core/sysvinit/PKGBUILD +++ b/abs/core/sysvinit/PKGBUILD @@ -4,14 +4,13 @@ pkgname=sysvinit pkgver=2.88 -pkgrel=3 +pkgrel=4 pkgdesc="Linux System V Init" arch=('i686' 'x86_64') url="http://savannah.nongnu.org/projects/sysvinit" license=('GPL') groups=('base') depends=('shadow' 'util-linux' 'coreutils' 'glibc' 'awk') -install=sysvinit.install source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgname}-${pkgver}dsf.tar.bz2 halt-init.patch) build() { @@ -23,6 +22,13 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}dsf" make ROOT="${pkgdir}" install + + # Rename some stuff so it does not bigfoot changes needed for runit + cd "${pkgdir}/sbin" + rm -f reboot poweroff + mv halt halt-init + mv shutdown shutdown-init + } md5sums=('6eda8a97b86e0a6f59dabbf25202aa6f' 'cd4c5767f63ca5881e3e1f1c4f10f896') diff --git a/abs/core/sysvinit/__changelog b/abs/core/sysvinit/__changelog index 9dc0b73..2a93469 100644 --- a/abs/core/sysvinit/__changelog +++ b/abs/core/sysvinit/__changelog @@ -18,3 +18,9 @@ patch halt to work with runit * Get flags */ + +# mjh 08-17-2011 +* mv halt to halt-init +* mv shutdown shutdown-init +* rm -f reboot poweroff +* remove sysvinit.install diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD index 584854d..b8883ea 100644 --- a/abs/extra/bluez/PKGBUILD +++ b/abs/extra/bluez/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez -pkgver=4.90 +pkgver=4.96 pkgrel=1 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" @@ -40,9 +40,8 @@ build() { --enable-hidd \ --enable-pand \ --enable-dund \ - --disable-cups \ - --enable-udevrules \ - --enable-configfiles || return 1 + --disable-cups || return 1 + make || return 1 } @@ -64,5 +63,5 @@ package() { sed -i 's#/usr/bin/python#/usr/bin/python2#' \ ${pkgdir}/usr/bin/bluez-simple-agent } -md5sums=('b111de22ff0f5c2b31f62b6be44dca00' +md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f' 'd12be5b494525bb1ba6eac5c3983dd3e') diff --git a/abs/extra/community/fuzemux-svn/PKGBUILD b/abs/extra/community/fuzemux-svn/PKGBUILD deleted file mode 100644 index 1acc914..0000000 --- a/abs/extra/community/fuzemux-svn/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Contributor: Michael Hanson <hansonorders@verizon.net> -# Maintainer: Michael Hanson <hansonorders@verizon.net> -pkgname=fuzemux-svn -pkgver=11 -pkgrel=2 -pkgdesc="A tool to remux AVI video files for the San Disk Sansa Fuze portable media player" -arch=('i686' 'x86_64') -url="http://code.google.com/p/fuzemux" -license=('GPL3') -#depends=() -makedepends=('subversion' 'autoconf') -provides=('fuzemux') -install=('fuzemux-svn.install') - -_svntrunk=http://fuzemux.googlecode.com/svn/trunk/ -_svnmod=fuzemux - -build() { - cd "$srcdir" - - if [ -d $_svnmod/.svn ]; then - (cd $_svnmod && svn up -r $pkgver) - else - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - fi - - msg "SVN checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_svnmod-build" - cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build" - cd "$srcdir/$_svnmod-build" - - # - # BUILD - # - /usr/bin/autoreconf --install - ./configure --prefix=/usr - make || return 1 - make DESTDIR="$pkgdir/" install -} diff --git a/abs/extra/community/fuzemux/PKGBUILD b/abs/extra/community/fuzemux/PKGBUILD new file mode 100644 index 0000000..aa542a5 --- /dev/null +++ b/abs/extra/community/fuzemux/PKGBUILD @@ -0,0 +1,26 @@ +# Contributor: Michael Hanson <hansonorders@verizon.net> +# Maintainer: Michael Hanson <hansonorders@verizon.net> +pkgname=fuzemux +pkgver=0.1.2 +pkgrel=1 +pkgdesc="A tool to remux AVI video files for the San Disk Sansa Fuze portable media player" +arch=('i686' 'x86_64') +url="http://code.google.com/p/fuzemux" +license=('cc-by-sa-3.0') +source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}-fixed.tar.gz") +provides=('fuzemux') +replaces=('fuzemux-svn') +install=fuzemux.install + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr + make || return 1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir}/ install +} +md5sums=('6c7323e9b98620b39644e4d652b3f8ad') diff --git a/abs/extra/community/fuzemux-svn/fuzemux-svn.install b/abs/extra/community/fuzemux/fuzemux.install index 877ec1b..877ec1b 100644 --- a/abs/extra/community/fuzemux-svn/fuzemux-svn.install +++ b/abs/extra/community/fuzemux/fuzemux.install diff --git a/abs/extra/community/video4fuze/PKGBUILD b/abs/extra/community/video4fuze/PKGBUILD new file mode 100644 index 0000000..35c1e85 --- /dev/null +++ b/abs/extra/community/video4fuze/PKGBUILD @@ -0,0 +1,38 @@ +# Contributor: Michael Hanson <hansonorders@verizon.net> +# Maintainer: Michael Hanson <hansonorders@verizon.net> +pkgname=video4fuze +pkgver=0.6 +pkgrel=1 +pkgdesc="A tool to make videos compatable with the San Disk Sana Fuze media player" +arch=('i686' 'x86_64') +url="http://code.google.com/p/video4fuze" +license=('GPL3' 'CC-BY-SA-3.0') +depends=('fuzemux' 'python2>=2.5' 'qt>=4.5' 'pyqt>=4.5' 'python-imaging' 'mplayer' 'ffmpeg-svn') +optdepends=('xterm') +source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}%2B.tar.gz") +provides=('video4fuze') +replaces=('video4fuze-svn') +install=video4fuze.install + +build() { + cd ${srcdir}/${pkgname}-${pkgver}+ + + for file in GUI/*.py *.py *.pyw ; do + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' ${file} + done + + sed -i 's/^python/python2/g' dist/* + + lrelease video4fuze_e4x.pro + + python2 setup.py install --root="$pkgdir" || return 1 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver}+ + install -D -m644 README.txt ${pkgdir}/usr/share/doc/video4fuze/README || return 1 + chmod 755 ${pkgdir}/usr/share/video4fuze/*.py || return 1 + chmod 755 ${pkgdir}/usr/share/video4fuze/*.pyw || return 1 + chmod 755 ${pkgdir}/usr/share/video4fuze/GUI/*.py || return 1 +} +md5sums=('f19250f2e166e10e5b115e8bffdfee35') diff --git a/abs/extra/community/video4fuze/video4fuze.install b/abs/extra/community/video4fuze/video4fuze.install new file mode 100644 index 0000000..d6e391f --- /dev/null +++ b/abs/extra/community/video4fuze/video4fuze.install @@ -0,0 +1,9 @@ +post_install() { + ln -s /usr/share/video4fuze/video4fuze.pyw /usr/bin/video4fuze + ln -s /usr/share/video4fuze/fuze.py /usr/bin/fuze.py +} + +pre_remove() { + rm -f /usr/bin/video4fuze + rm -f /usr/bin/fuze.py +} |