[weasel-commit] Source: hal=0.5.13-1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Sat, 16 Jan 2010 22:25:57 -0500
================================
hal:source=0.5.13-1 (previous: 0.5.12rc1-1)
cvc rdiff hal -1 /weasel.rpath.org@wgl:3-devel/0.5.13-1
================================
0.5.13-1 Filip Brcic (brcha@xxxxxxx) Sat Jan 16 22:25:42 2010
version bump + metadata
hal-0.5.13.tar.bz2: new
0.5.10-hald.rc: new
--- /dev/null
+++ 0.5.10-hald.rc
@@ -0,0 +41 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/files/0.5.10-hald.rc,v 1.4
2009/08/17 22:25:45 vapier Exp $
+
+depend() {
+ use logger acpid consolekit
+ need dbus
+ after coldplug dns nscd
+}
+
+start() {
+ [ -z "${HALD_VERBOSE}" ] && HALD_VERBOSE="no"
+ ebegin "Starting Hardware Abstraction Layer daemon"
+
+# REAL_ROOT=`mount -fv / | cut -d' ' -f1`
+# TEST_ROOT=`cat /proc/mounts | cut -d' ' -f1 | head -n 2 | tail -n 1`
+
+# if [ ! -e ${TEST_ROOT} ]; then
+# echo "You need a ${TEST_ROOT} that points to your ${REAL_ROOT}"
+# echo "See http://bugs.gentoo.org/show_bug.cgi?id=175243";
+# echo "Quick fix is: ln -s ${REAL_ROOT} ${TEST_ROOT}"
+# eend 2
+# fi
+
+ if [ -f /proc/acpi/event ]; then
+ chgrp haldaemon /proc/acpi/event
+ chmod 440 /proc/acpi/event
+ fi
+
+ [ ${#PATH} -gt 512 ] && export PATH=/usr/libexec:${PATH} #267928
+
+ start-stop-daemon --start -q --exec /usr/sbin/hald -- --use-syslog
--verbose=${HALD_VERBOSE}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping Hardware Abstraction Layer daemon"
+ start-stop-daemon --stop -q --pidfile /var/run/hald.pid
+ eend $?
+}
hal.recipe: changed
Index: hal.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- hal.recipe /weasel.rpath.org@wgl:3-devel/0.5.12rc1-1
+++ hal.recipe /weasel.rpath.org@wgl:3-devel/0.5.13-1
@@ -1,59 +1,62 @@
#
# Copyright (c) 2004-2008 rPath, Inc.
-# 2009 Weasel GNU/Linux
+# 2009-2010 Weasel GNU/Linux
# This file is distributed under the terms of the MIT License.
# A copy is available at http://www.rpath.com/permanent/mit-license.html
#
class Hal(AutoPackageRecipe):
name = 'hal'
- version = '0.5.12rc1'
+ version = '0.5.13'
+ patch_ver = '1'
buildRequires = [
- 'PolicyKit:devel', 'PolicyKit:runtime', 'dbus-glib:devel',
'dbus:devel',
- 'e2fsprogs:devel', 'expat:devel', 'glib:devel', 'gperf:runtime',
'libstdc++:devel',
- 'libusb:devel', 'libxml2:runtime', 'parted:devel', 'pciutils:data',
'pciutils:devel',
- 'pkg-config:devel', 'smbios:devel', 'udev:devel', 'usbutils:data',
'xmlto:runtime',
- 'zlib:devel', 'hwdata:data', 'gcc-c++:runtime', 'util-linux-ng:devel',
+ 'PolicyKit:devel', 'PolicyKit:runtime', 'autoconf:runtime',
+ 'automake:runtime', 'dbus-glib:devel', 'dbus:devel',
+ 'expat:devel', 'glib:devel', 'gperf:runtime',
+ 'libtool:runtime', 'libusb:devel', 'libxml2:runtime',
+ 'parted:devel', 'pciutils:devel', 'pkg-config:devel',
+ 'util-linux-ng:devel', 'zlib:devel',
]
+ shortDesc = 'Hardware abstraction layer'
+ longDesc = 'Hardware abstraction layer daemon'
+ url = 'http://www.freedesktop.org/wiki/Software/hal'
+ licenses = [ 'GPL-2', 'AFL-2.0' ]
+ categories = [ 'System' ]
+
def unpack(r):
- r.Description(shortDesc='Hardware abstraction layer',
- longDesc='Hardware abstraction layer daemon')
- r.PackageURL('http://www.freedesktop.org/wiki/Software/hal')
- r.Licenses('GPL-2', 'AFL-2.0')
r.addArchive('http://hal.freedesktop.org/releases/')
- patches = [
- '0002-policykit-dbus-policy.patch',
- '0003-Hide-partitions-marked-as-Compaq-Diagnostics.patch',
- '0004-policy-for-automount-prevention-on-system-disk.patch',
- '0005-always-add-mouse-property-to-touchpads.patch',
- '0006-remove-ill-conceived-uid-checks.patch',
- '0007-use-correct-directories-for-tests.patch',
- ]
- for patch in patches:
- r.addPatch(patch)
+ r.macros.patch_ver = r.patch_ver
+ r.addArchive('http://dev.gentoo.org/~dang/files/'
+
'%(name)s-%(version)s-gentoo-patches-%(patch_ver)s.tar.bz2')
- r.Run('autoreconf -f -i')
+ r.addPatches('../%(name)s-%(version)s-gentoo-patches-%(patch_ver)s'
+ '/patches',
+ exclude=[ '0001-plugdev-dbus-policy.patch' ])
+ r.Autoreconf()
+
+ def configure(r):
r.macros.cflags += ' -rdynamic'
r.macros.ldflags += ' -rdynamic'
- r.extraConfig = (
+ r.Configure(
' --with-backend=linux'
' --with-os-type=gentoo'
' --with-pid-file=%(localstatedir)s/run/hald.pid'
- ' --with-hwdata=%(datadir)s/hwdata'
+ ' --with-hwdata=%(datadir)s/misc'
' --with-socket-dir=%(localstatedir)s/run/hald'
+ ' --with-udev-prefix=%(sysconfdir)s'
' --enable-umount-helper'
' --enable-man-pages'
' --disable-acl-management'
' --enable-pci'
' --enable-apm'
' --enable-parted'
- ' --enable-docbook-docs'
- ' --enable-gtk-doc'
+ ' --disable-docbook-docs' # TODO: reenable when docbook and
gtk-doc is built
+ ' --disable-gtk-doc' # -- || --
' --enable-policy-kit'
' --enable-console-kit'
' --docdir=%(thisdocdir)s'
@@ -71,35 +74,22 @@
' --enable-sonypic'
)
- if Arch.x86_64:
- # First build 32bit version
- macros32 = r.macros.copy()
- macros32.cc = '"gcc -m32"'
- macros32.cxx = '"g++ -m32"'
- macros32.libdir = '%(prefix)s/lib'
- r.Run('cp -a %(builddir)s %(builddir)s/../32bit')
- r.Configure( r.extraConfig,
- dir='../32bit', overrideMacros=macros32)
- r.Run(""" sed -i
's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
../32bit/libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'
../32bit/libtool """)
- r.Make(dir='../32bit', overrideMacros=macros32)
- r.MakeInstall(dir='../32bit', overrideMacros=macros32)
- r.NormalizePkgConfig(exceptions='.*')
+ def policy(r):
+ # hal unmount for unclean unmounts
+ r.addSource('hal-unmount.dev',
+ dest='%(essentiallibdir)s/udev/hal-unmount')
- def configure(r):
- r.Configure(r.extraConfig)
+ r.addSource('0.5.10-hald.rc',
+ dest='%(initdir)s/hald',
+ mode=0755)
+ r.TagSpec('initscript', '%(initdir)s/hald') # Add to default
+ r.addSource('0.5.10-hald.conf',
+ dest='%(sysconfdir)s/conf.d/hald')
+
+ # New configuration examples
+ r.Doc('../%(name)s-%(version)s-gentoo-patches-%(patch_ver)s/'
+ 'config-examples/*.fdi')
- r.Run(""" sed -i
's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool """)
-
- def policy(r):
- r.addSource('hal-unmount.dev', dest='%(essentiallibdir)s/udev/')
- r.addSource('hald.initd', dest='%(initdir)s/hald', mode=0755)
- r.addSource('hald.confd', dest='%(sysconfdir)s/conf.d/hald')
-
- r.PackageSpec('hal-gnome', '%(datadir)s/%(name)s/device-manager/',
- '%(bindir)s/hal-device-manager')
- r.TagSpec('initscript', '%(initdir)s/')
r.Requires('hal-info:data', '%(sbindir)s/hald')
r.Requires('ConsoleKit:runtime', '%(sbindir)s/hald')
r.Requires('PolicyKit:runtime', '%(sbindir)s/hald')
hal-0.5.13-gentoo-patches-1.tar.bz2: new
0.5.10-hald.conf: new
--- /dev/null
+++ 0.5.10-hald.conf
@@ -0,0 +6 @@
+# /etc/conf.d/hald
+
+# Should HAL be verbose to syslog? Useful for debugging
+HALD_VERBOSE="no"
+
+# vim: ft=gentoo-conf-d
0002-policykit-dbus-policy.patch: removed
0004-policy-for-automount-prevention-on-system-disk.patch: removed
hald.initd: removed
hald.confd: removed
0005-always-add-mouse-property-to-touchpads.patch: removed
hal-0.5.12rc1.tar.bz2: removed
0006-remove-ill-conceived-uid-checks.patch: removed
0003-Hide-partitions-marked-as-Compaq-Diagnostics.patch: removed
0007-use-correct-directories-for-tests.patch: removed
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: hal=0.5.13-1 - rbuilder
