Commit c11126cf authored by abveritas's avatar abveritas

rebuilding/updating all chakra-init-live enabled packages, prep for...

rebuilding/updating all chakra-init-live enabled packages, prep for netinstall, .service enabled in packages
parent b6cbd42a
......@@ -5,7 +5,7 @@
pkgname=avahi
pkgver=0.6.31
pkgrel=4
pkgrel=5
pkgdesc="A multicast/unicast DNS-SD framework"
arch=('x86_64')
url="http://www.avahi.org/"
......
post_install() {
getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
echo "Enabling systemd service"
systemctl enable avahi-daemon.service
}
post_upgrade() {
echo "Enabling systemd service"
systemctl enable avahi-daemon.service
}
pre_remove() {
echo "Disabling systemd service"
systemctl disable avahi-daemon.service
}
post_remove() {
......
......@@ -3,11 +3,12 @@
# maintainer: abveritas[at]chakra-project[dot]org>
pkgname=bluez
# Do not update to 5.0, until lts kernel is at 3.4 or above
pkgver=4.101
pkgrel=1
pkgrel=2
pkgdesc="Libraries and tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch=('i686' 'x86_64')
arch=('x86_64')
license=('GPL2')
depends=('dbus-core' 'python2' 'systemd')
makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx')
......@@ -24,11 +25,9 @@ options=('!libtool')
backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
'bluetooth.conf.d'
'rc.bluetooth')
'bluetooth.conf.d')
md5sums=('902b390af95c6c5d6d1a17d94c8344ab'
'7412982b440f29fa7f76a41a87fef985'
'864cbd24e6efc3592e9284b0b5fb2cfd')
'7412982b440f29fa7f76a41a87fef985')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......@@ -58,8 +57,6 @@ build() {
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth
install -d ${pkgdir}/etc/bluetooth
install -m644 network/network.conf \
......
post_install() {
echo "Enabling systemd service"
systemctl enable bluetooth.service
}
post_upgrade() {
post_install
}
pre_remove() {
echo "Disabling systemd service"
systemctl disable bluetooth.service
}
#!/bin/bash
#
# Start/stop the Bluetooth daemons
#
. /etc/rc.conf
. /etc/rc.d/functions
DAEMON_NAME="bluetoothd"
HIDD_NAME="hidd"
RFCOMM_NAME="rfcomm"
PAND_NAME="pand"
DUND_NAME="dund"
DAEMON_EXEC="/usr/sbin/bluetoothd"
HIDD_EXEC="/usr/bin/hidd"
RFCOMM_EXEC="/usr/bin/rfcomm"
PAND_EXEC="/usr/bin/pand"
DUND_EXEC="/usr/bin/dund"
DAEMON_ENABLE="true"
HIDD_ENABLE="false"
RFCOMM_ENABLE="false"
PAND_ENABLE="false"
DUND_ENABLE="false"
RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
HIDD_OPTIONS=""
PAND_OPTIONS=""
DUND_OPTIONS=""
[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
case "$1" in
start)
stat_busy "Starting bluetooth subsystem:"
if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then
stat_append " $DAEMON_NAME"
$DAEMON_EXEC
sleep 1
fi
if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
stat_append " $HIDD_NAME"
$HIDD_EXEC $HIDD_OPTIONS
fi
if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
stat_append " $RFCOMM_NAME"
$RFCOMM_EXEC -f $RFCOMM_CONFIG bind all
fi
if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then
stat_append " $PAND_NAME"
$PAND_EXEC $PAND_OPTIONS
fi
if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
stat_append " $DUND_NAME"
$DUND_EXEC $DUND_OPTIONS
fi
add_daemon bluetooth
stat_done
;;
stop)
stat_busy "Stopping bluetooth subsystem:"
stat_append " $DUND_NAME"
killall $DUND_NAME >/dev/null 2>&1
stat_append " $PAND_NAME"
killall $PAND_NAME >/dev/null 2>&1
if [ -x "$RFCOMM_EXEC" ]; then
stat_append " $RFCOMM_NAME"
$RFCOMM_EXEC release all >/dev/null 2>&1
fi
stat_append " $HIDD_NAME"
killall $HIDD_NAME >/dev/null 2>&1
stat_append " $DAEMON_NAME"
killall $DAEMON_NAME >/dev/null 2>&1
rm_daemon bluetooth
stat_done
;;
restart)
$0 stop
sleep 1
$0 start
;;
*)
echo "usage: $0 {start|stop|restart}"
esac
exit 0
......@@ -6,7 +6,7 @@
pkgname=networkmanager
_pkgname=NetworkManager
pkgver=0.9.6.4
pkgrel=1
pkgrel=2
pkgdesc="Network Management daemon"
arch=('x86_64')
license=('GPL')
......
post_install() {
echo "Enabling systemd service"
systemctl enable NetworkManager.service
}
post_upgrade() {
(( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
ATTENTION:
......@@ -6,4 +11,12 @@ ATTENTION:
any custom settings to the new config file.
MSG
true
echo "Enabling systemd service"
systemctl enable NetworkManager.service
}
pre_remove() {
echo "Disabling systemd service"
systemctl disable NetworkManager.service
}
......@@ -6,7 +6,7 @@
pkgname=ntp
pkgver=4.2.6.p5
_realver=4.2.6p5
pkgrel=2
pkgrel=3
pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync"
arch=('x86_64')
license=('custom')
......
......@@ -2,6 +2,9 @@ post_install() {
getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null
getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null
true
echo "Enabling systemd service"
systemctl enable ntpd.service
}
post_upgrade() {
......@@ -11,6 +14,14 @@ post_upgrade() {
if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then
chown -R ntp /var/lib/ntp
fi
echo "Enabling systemd service"
systemctl enable ntpd.service
}
pre_remove() {
echo "Disabling systemd service"
systemctl disable ntpd.service
}
post_remove() {
......
......@@ -5,7 +5,7 @@
pkgname=udisks
pkgver=1.0.4
pkgrel=6
pkgrel=7
pkgdesc="Disk Management Service"
arch=('x86_64')
url="http://www.freedesktop.org/wiki/Software/udisks"
......@@ -14,6 +14,7 @@ depends=('systemd' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-map
'libatasmart' 'lsof' 'lvm2' 'util-linux')
makedepends=('intltool' 'docbook-xsl')
options=(!libtool)
install=udisks.install
replaces=('devicekit-disks')
source=("http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz"
'udisks.service'
......
post_install() {
echo "Enabling systemd service"
systemctl enable udisks.service
}
post_upgrade() {
post_install
}
pre_remove() {
echo "Disabling systemd service"
systemctl disable udisks.service
}
......@@ -4,24 +4,29 @@
# maintainer abveritas@chakra-project.org
pkgname=upower
pkgver=0.9.18
pkgver=0.9.19
pkgrel=1
pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://upower.freedesktop.org"
license=('GPL')
depends=('systemd>=188' 'libusbx' 'polkit>=0.98' 'pm-utils>=1.4.1' 'dbus-glib>=0.92')
depends=('systemd>=196' 'libusbx' 'polkit>=0.98' 'pm-utils>=1.4.1' 'dbus-glib>=0.92')
makedepends=('pkg-config' 'intltool' 'docbook-xsl')
replaces=('devicekit-power')
options=('!libtool')
source=($url/releases/${pkgname}-${pkgver}.tar.xz)
md5sums=('bfaaa1e7f8479fca5594406b3c36dff9')
install=upower.install
source=($url/releases/${pkgname}-${pkgver}.tar.xz
'unifying.patch')
md5sums=('f96955ff1a2e4f006937d6b5ea95afb8'
'04b2a6141e80e422a9fe2820b5b3a613')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
# put udev files in /usr/lib
sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
patch -p1 -i "${srcdir}"/unifying.patch
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var \
......
From 35b0d25b49d04cf7d33699c34f42a196c8e92a2e Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Sat, 01 Dec 2012 12:30:03 +0000
Subject: lg-unifying: fix K750 features name, use 1 second interval
I've recently got access to some spec on this, so I'm now able to document
his a bit better. Also, change the 0x78 value for the function sending
BattLightMeasureBroadcastEvent to 0x1 since this is the number of event we
want, and one is enough.
Signed-off-by: Julien Danjou <julien@danjou.info>
Signed-off-by: Richard Hughes <richard@hughsie.com>
---
diff --git a/src/linux/up-device-lg-unifying.c b/src/linux/up-device-lg-unifying.c
index e8997c0..eddd1ec 100644
--- a/src/linux/up-device-lg-unifying.c
+++ b/src/linux/up-device-lg-unifying.c
@@ -84,10 +84,9 @@
#define HIDPP_FEATURE_GETDEVICENAMETYPE_FUNCTION_GETCOUNT (0x00 << 4)
#define HIDPP_FEATURE_GETDEVICENAMETYPE_FUNCTION_GETDEVICENAME (0x01 << 4)
-/* I wish i has the spec for this, but I don't so I invented the name */
-#define HIDPP_FEATURE_K750_BATTERY 0x4301
-#define HIDPP_FEATURE_K750_BATTERY_FUNCTION_STARTLUXANDBATTERY (0x00 << 4)
-#define HIDPP_FEATURE_K750_BATTERY_FUNCTION_LUXANDBATTERYEVENT (0x01 << 4)
+#define HIDPP_FEATURE_SOLAR_DASHBOARD 0x4301
+#define HIDPP_FEATURE_SOLAR_DASHBOARD_FUNCTION_SetLightMeasure (0x00 << 4)
+#define HIDPP_FEATURE_SOLAR_DASHBOARD_BattLightMeasureBroadcastEvent (0x01 << 4)
#define HIDPP_FEATURE_FUNCTION_AS_ARG(feature) \
feature >> 8, feature, 0x00
@@ -105,7 +104,7 @@ struct UpDeviceUnifyingPrivate
int fd;
/* Device index on the Unifying "bus" */
gint device_index;
- gint feature_k750_battery_index;
+ gint feature_solar_dashboard_index;
GIOChannel *channel;
guint channel_source_id;
};
@@ -130,8 +129,8 @@ up_device_unifying_event_io (GIOChannel *channel, GIOCondition condition, gpoint
while (read (unifying->priv->fd, buf, sizeof(buf)) > 0)
if (buf[0] == HIDPP_HEADER_RESPONSE &&
buf[1] == unifying->priv->device_index &&
- buf[2] == unifying->priv->feature_k750_battery_index &&
- buf[3] == HIDPP_FEATURE_K750_BATTERY_FUNCTION_LUXANDBATTERYEVENT) {
+ buf[2] == unifying->priv->feature_solar_dashboard_index &&
+ buf[3] == HIDPP_FEATURE_SOLAR_DASHBOARD_BattLightMeasureBroadcastEvent) {
lux = (buf[5] << 8) | buf[6];
if (lux > 200) {
g_object_set (device,
@@ -283,25 +282,24 @@ up_device_unifying_hidpp2_set_battery (UpDeviceUnifying *unifying)
0x00, 0x00, 0x00, 0x00, 0x00,
};
- if (unifying->priv->feature_k750_battery_index == -1)
- unifying->priv->feature_k750_battery_index =
- up_device_unifying_hidpp2_get_feature_index (unifying, HIDPP_FEATURE_K750_BATTERY);
+ if (unifying->priv->feature_solar_dashboard_index == -1)
+ unifying->priv->feature_solar_dashboard_index =
+ up_device_unifying_hidpp2_get_feature_index (unifying, HIDPP_FEATURE_SOLAR_DASHBOARD);
- if (unifying->priv->feature_k750_battery_index == 0) {
- /* Probably not a K750 */
+ if (unifying->priv->feature_solar_dashboard_index == 0) {
+ /* Probably not a solar keyboard */
/* TODO: add support for BatteryLevelStatus */
} else {
/* This request will make the keyboard send a bunch of packets
* (events) with lux-meter and battery information */
- request[2] = unifying->priv->feature_k750_battery_index;
- request[3] = HIDPP_FEATURE_K750_BATTERY_FUNCTION_STARTLUXANDBATTERY;
- /* Don't know what this means */
- request[4] = 0x78;
- request[5] = 0x01;
+ request[2] = unifying->priv->feature_solar_dashboard_index;
+ request[3] = HIDPP_FEATURE_SOLAR_DASHBOARD_FUNCTION_SetLightMeasure;
+ request[4] = 0x01; /* Max number of reports: number of report sent after function call */
+ request[5] = 0x01; /* Report period: time between reports, in seconds */
if (write (unifying->priv->fd, request, sizeof(request)) != sizeof(request)) {
- g_debug ("Unable to send K750 battery/lux events start request to device");
+ g_debug ("Unable to send solar battery/lux events start request to device");
return FALSE;
}
@@ -719,7 +717,7 @@ up_device_unifying_init (UpDeviceUnifying *unifying)
unifying->priv = UP_DEVICE_UNIFYING_GET_PRIVATE (unifying);
unifying->priv->poll_timer_id = 0;
unifying->priv->fd = -1;
- unifying->priv->feature_k750_battery_index = -1;
+ unifying->priv->feature_solar_dashboard_index = -1;
}
/**
--
cgit v0.9.0.2-2-gbebe
post_install() {
echo "Enabling systemd service"
systemctl enable upower.service
}
post_upgrade() {
post_install
}
pre_remove() {
echo "Disabling systemd service"
systemctl disable upower.service
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment