kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Apply some bug fixes for the NetBSD hald from sergio lenzi in PR 49604.

Browse source 
Bump PKGREVISION.
This commit is contained in:
wiz 2015-01-25 18:46:09 +00:00
parent a5efee50ca
commit b40d0aeda0
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sysutils/hal/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.70 2014/08/28 10:58:18 jperkin Exp $
# $NetBSD: Makefile,v 1.71 2015/01/25 18:46:09 wiz Exp $
DISTNAME= hal-0.5.14
PKGREVISION= 13
PKGREVISION= 14
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
EXTRACT_SUFX= .tar.bz2

4
sysutils/hal/files/hald-netbsd/devinfo_mass.c
View file

@ -1,4 +1,4 @@
/* $NetBSD: devinfo_mass.c,v 1.4 2010/12/26 20:59:31 markd Exp $ */
/* $NetBSD: devinfo_mass.c,v 1.5 2015/01/25 18:46:09 wiz Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill <jmcneill@invisible.ca>
@ -230,7 +230,7 @@ devinfo_mass_add(HalDevice *parent, const char *devnode, char *devfs_path, char
}
if (gparent_devnode && strstr (gparent_devnode, "umass") == gparent_devnode)
hal_device_property_set_string (d, "storage.bus", "usb");
else if (strstr (parent_devnode, "atabus") == parent_devnode)
else if (parent_devnode && strstr (parent_devnode, "atabus") == parent_devnode)
hal_device_property_set_string (d, "storage.bus", "ide");
else
hal_device_property_set_string (d, "storage.bus", "scsi");

4
sysutils/hal/files/hald-netbsd/devinfo_misc.c
View file

@ -137,12 +137,12 @@ devinfo_default_apply_quirks(HalDevice *d, const char *devnode)
/* acpiacad(4) */
if (strncmp (devnode, "acpiacad", 8) == 0) {
HAL_INFO (("%s: applying acpiacad quirks"));
HAL_INFO (("%s: applying acpiacad quirks",devnode));
hal_device_add_capability (d, "ac_adapter");
/* acpibat(4) */
} else if (strncmp (devnode, "acpibat", 7) == 0) {
HAL_INFO (("%s: applying acpibat quirks"));
HAL_INFO (("%s: applying acpibat quirks",devnode));
hal_device_add_capability (d, "battery");
hal_device_property_set_string (d, "battery.type", "primary");
}

4
sysutils/hal/files/hald-netbsd/drvctl.c
View file

@ -123,7 +123,7 @@ drvctl_dev_add(gchar *name)
parent = hal_device_store_match_key_value_string (
hald_get_gdl(), "netbsd.device", pdevnode);
if (parent == NULL)
HAL_INFO (("dev_add: name=%s but netbsd.device=%s not found", pdevnode));
HAL_INFO (("dev_add: name=%s but netbsd.device=%s not found",name, pdevnode));
}
d = devinfo_add_node (parent, name);
@ -245,7 +245,7 @@ drvctl_find_device_with_child(const gchar *curnode, const gchar *devnode,
if (laa.l_childname)
free(laa.l_childname);
/* HAL_INFO (("%s: couldn't find device with child %s", curnode, devnode)); */
HAL_INFO (("%s: couldn't find device with child %s", curnode, devnode));
return FALSE;
}