PKG_NAME:=libudev-fbsd
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_VERSION:=20160820
PKG_SOURCE_VERSION:=1f21323b817e70253d3c04bc8bedd61c477d0544
--- /dev/null
+--- a/src/libudev.c
++++ b/src/libudev.c
+@@ -130,6 +130,12 @@ udev_device_get_devnum(struct udev_devic
+ }
+
+ char const *
++udev_device_get_driver(struct udev_device *udev_device)
++{
++ return NULL;
++}
++
++char const *
+ udev_device_get_property_value(struct udev_device *dev, char const *property)
+ {
+ LOG("udev_device_get_property_value %s\n", property);
+--- a/src/libudev.h
++++ b/src/libudev.h
+@@ -30,6 +30,7 @@ struct udev_device *udev_device_new_from
+ struct udev *udev, char const *syspath);
+ struct udev_device *udev_device_new_from_devnum(
+ struct udev *udev, char type, dev_t devnum);
++char const *udev_device_get_driver(struct udev_device *udev_device);
+ char const *udev_device_get_syspath(struct udev_device *udev_device);
+ char const *udev_device_get_sysname(struct udev_device *udev_device);
+ char const *udev_device_get_subsystem(struct udev_device *udev_device);
--- /dev/null
+--- a/src/libudev.c
++++ b/src/libudev.c
+@@ -26,6 +26,7 @@ struct udev_device {
+ struct udev *udev;
+ int refcount;
+ char syspath[32];
++ char sysfspath[64];
+ dev_t devnum;
+ char const *sysname;
+ char const *action;
+@@ -115,6 +116,29 @@ udev_device_new_from_devnum(struct udev
+ return NULL;
+ }
+
++struct udev_device *
++udev_device_new_from_subsystem_sysname(
++ struct udev *udev, const char *subsystem, const char *sysname)
++{
++ struct udev_device *u;
++ char sysfsname[64];
++ struct stat st;
++
++ snprintf(sysfsname, sizeof(sysfsname), "/sys/bus/%s/devices/%s/", subsystem, sysname);
++ if (stat(sysfsname, &st) == 0)
++ {
++ char sysfsdev[64];
++ u = calloc(1, sizeof(struct udev_device));
++ strncpy(u->sysfspath, sysfsname, sizeof(u->sysfspath));
++
++ return u;
++ }
++ else
++ {
++ return NULL;
++ }
++}
++
+ char const *
+ udev_device_get_devnode(struct udev_device *udev_device)
+ {
+@@ -132,6 +156,20 @@ udev_device_get_devnum(struct udev_devic
+ char const *
+ udev_device_get_driver(struct udev_device *udev_device)
+ {
++ if (udev_device->sysfspath)
++ {
++ char driverlnp[64];
++ char driverlnk[32];
++ snprintf(driverlnp, sizeof(driverlnp), "%s/driver",
++ udev_device->sysfspath);
++ if (readlink(driverlnp, driverlnk, sizeof(driver)))
++ {
++ char *drivernm;
++ drivernm = strrchr(driverlnk, '/');
++ if (drivernm)
++ return ++drivernm;
++ }
++ }
+ return NULL;
+ }
+
+--- a/src/libudev.h
++++ b/src/libudev.h
+@@ -30,6 +30,8 @@ struct udev_device *udev_device_new_from
+ struct udev *udev, char const *syspath);
+ struct udev_device *udev_device_new_from_devnum(
+ struct udev *udev, char type, dev_t devnum);
++struct udev_device *udev_device_new_from_subsystem_sysname(
++ struct udev *udev, const char *subsystem, const char *sysname);
+ char const *udev_device_get_driver(struct udev_device *udev_device);
+ char const *udev_device_get_syspath(struct udev_device *udev_device);
+ char const *udev_device_get_sysname(struct udev_device *udev_device);
--- /dev/null
+--- a/src/libudev.c
++++ b/src/libudev.c
+@@ -162,7 +162,7 @@ udev_device_get_driver(struct udev_devic
+ char driverlnk[32];
+ snprintf(driverlnp, sizeof(driverlnp), "%s/driver",
+ udev_device->sysfspath);
+- if (readlink(driverlnp, driverlnk, sizeof(driver)))
++ if (readlink(driverlnp, driverlnk, sizeof(driverlnk)))
+ {
+ char *drivernm;
+ drivernm = strrchr(driverlnk, '/');
+@@ -600,6 +600,18 @@ udev_enumerate_add_match_property(struct
+ value);
+ return -1;
+ }
++
++int
++udev_enumerate_add_nomatch_sysattr(struct udev_enumerate *udev_enumerate,
++ const char *sysattr, const char *value)
++{
++ (void)udev_enumerate;
++ (void)sysattr;
++ (void)value;
++ LOG("stub: udev_enumerate_add_nomatch_sysattr %s %s\n", sysattr,
++ value);
++ return -1;
++}
+
+ void
+ udev_enumerate_unref(struct udev_enumerate *udev_enumerate)
+--- a/src/libudev.h
++++ b/src/libudev.h
+@@ -59,6 +59,8 @@ int udev_enumerate_add_match_sysname(
+ struct udev_enumerate *udev_enumerate, char const *sysname);
+ int udev_enumerate_add_match_property(struct udev_enumerate *udev_enumerate,
+ char const *property, char const *value);
++int udev_enumerate_add_nomatch_sysattr(struct udev_enumerate *udev_enumerate,
++ const char *sysattr, const char *value);
+ void udev_enumerate_unref(struct udev_enumerate *udev_enumerate);
+
+ #define udev_list_entry_foreach(list_entry, first_entry) \
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
PKG_NAME:=postgresql
PKG_VERSION:=9.4.12
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=PostgreSQL
PKG_FIXUP:=autoreconf
PKG_MACRO_PATHS:=config
PKG_BUILD_DEPENDS += postgresql/host
+PKG_INSTALL:=1
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR)/usr/bin/
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/bin/pg_config/pg_config $(STAGING_DIR)/usr/bin/
+ $(INSTALL_DIR) $(STAGING_DIR)/host/bin/
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/bin/pg_config/pg_config $(STAGING_DIR)/host/bin/
$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg $(STAGING_DIR_HOSTPKG)/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/timezone/zic $(STAGING_DIR_HOSTPKG)/bin/
# because PROFILE means something else in the project Makefile
unexport PROFILE
-define Build/Compile
- +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- all
- +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- install
-endef
-
define Package/libpq/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.so.* $(1)/usr/lib/
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/bin
+ $(LN) $(STAGING_DIR)/host/bin/pg_config $(1)/usr/bin
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/libpq $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(1)/usr/include/
+++ b/configure.in
@@ -25,7 +25,7 @@ recommended. You can remove the check f
your responsibility whether the result works or not.])])
- AC_COPYRIGHT([Copyright (c) 1996-2015, PostgreSQL Global Development Group])
+ AC_COPYRIGHT([Copyright (c) 1996-2014, PostgreSQL Global Development Group])
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
-AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_AUX_DIR([config])
--- /dev/null
+--- a/GNUmakefile.in
++++ b/GNUmakefile.in
+@@ -8,7 +8,7 @@ subdir =
+ top_builddir = .
+ include $(top_builddir)/src/Makefile.global
+
+-$(call recurse,all install,src config)
++$(call recurse,all install,src config contrib)
+
+ all:
+ +@echo "All of PostgreSQL successfully made. Ready to install."
--- a/src/bin/psql/print.h
+++ b/src/bin/psql/print.h
-@@ -197,10 +197,6 @@ extern void setDecimalLocale(void);
+@@ -179,10 +179,6 @@ extern void printQuery(const PGresult *r
+ extern void setDecimalLocale(void);
extern const printTextFormat *get_line_style(const printTableOpt *opt);
- extern void refresh_utf8format(const printTableOpt *opt);
-#ifndef __CYGWIN__
-#define DEFAULT_PAGER "more"
-Index: postgresql-9.5.4/src/bin/pg_ctl/pg_ctl.c
-===================================================================
---- postgresql-9.5.4.orig/src/bin/pg_ctl/pg_ctl.c
-+++ postgresql-9.5.4/src/bin/pg_ctl/pg_ctl.c
-@@ -95,6 +95,7 @@ static char *event_source = NULL;
+--- a/src/bin/pg_ctl/pg_ctl.c
++++ b/src/bin/pg_ctl/pg_ctl.c
+@@ -94,6 +94,7 @@ static char *exec_path = NULL;
static char *register_servicename = "PostgreSQL"; /* FIXME: + version ID? */
static char *register_username = NULL;
static char *register_password = NULL;
static char *argv0 = NULL;
static bool allow_core_files = false;
static time_t start_time;
-@@ -2114,6 +2115,9 @@ do_help(void)
- #endif
+@@ -2093,6 +2094,9 @@ do_help(void)
+ printf(_(" -D, --pgdata=DATADIR location of the database storage area\n"));
printf(_(" -s, --silent only print errors, no informational messages\n"));
printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n"));
+#if !defined(WIN32) && !defined(__CYGWIN__)
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -w wait until operation completes\n"));
printf(_(" -W do not wait until operation completes\n"));
-@@ -2310,6 +2314,7 @@ main(int argc, char **argv)
+@@ -2289,6 +2293,7 @@ main(int argc, char **argv)
{"pgdata", required_argument, NULL, 'D'},
{"silent", no_argument, NULL, 's'},
{"timeout", required_argument, NULL, 't'},
{"core-files", no_argument, NULL, 'c'},
{NULL, 0, NULL, 0}
};
-@@ -2350,20 +2355,6 @@ main(int argc, char **argv)
+@@ -2329,20 +2334,6 @@ main(int argc, char **argv)
}
}
env_wait = getenv("PGCTLTIMEOUT");
if (env_wait != NULL)
-@@ -2449,11 +2440,15 @@ main(int argc, char **argv)
+@@ -2416,11 +2407,15 @@ main(int argc, char **argv)
wait_seconds_arg = true;
break;
case 'U':
break;
case 'w':
do_wait = true;
-@@ -2535,6 +2530,41 @@ main(int argc, char **argv)
+@@ -2502,6 +2497,41 @@ main(int argc, char **argv)
exit(1);
}
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=usbip
-PKG_RELEASE:=5
+PKG_RELEASE:=6
PKG_LICENSE:=GPL-2.0
# Since kernel 2.6.39.1 userspace tools are inside the kernel tree
endef
Hooks/Prepare/Pre += prepare_source_directory
-PKG_BUILD_DEPENDS:=eudev
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_FLAGS:=nonshared
define Package/usbip
$(call Package/usbip/Default)
TITLE+= (common)
- DEPENDS+= +libwrap +kmod-usbip +eudev
+ DEPENDS+= +libwrap +kmod-usbip +libudev-fbsd
endef
define Package/usbip-client
+++ /dev/null
-# udev package config
-
-menu "Configuration"
- depends on PACKAGE_eudev
-
-config EUDEV_EXTRA_ata_id
- bool "Install eudev ata_id callout"
- default y
- help
- ata_id - udev callout to read product/serial number
- from ATA drives
-
-config EUDEV_EXTRA_blkid
- bool "Use blkid to identify block devices"
- default y
- help
- blkid - make use of libblkid to identify block devices
-
-config EUDEV_EXTRA_cdrom_id
- bool "Install eudev cdrom_id callout"
- default y
- help
- cdrom_id - udev callout to determine the capabilities
- of optical drives and media
-
-config EUDEV_EXTRA_collect
- bool "Install eudev collect"
- default n
- help
- Adds ID to the list governed by <checkpoint>
-
-config EUDEV_EXTRA_input_id
- bool "Install input_id callout"
- default y
- help
- input_id - udev callout to classify input devices
-
-config EUDEV_EXTRA_kmod
- bool "Use kmod for loading kernel modules"
- default n
- help
- kmod - make use of kmod to load kernel modules on demand
-
-config EUDEV_EXTRA_mtd_probe
- bool "Install mtd_probe callout"
- default y
- help
- mtd_probe - udev callout to probe mtd devices
-
-config EUDEV_EXTRA_rule_generator
- bool "Install (legacy) eudev rule_generator"
- default n
- help
-
-config EUDEV_EXTRA_scsi_id
- bool "Install eudev scsi_id callout"
- default y
- help
- scsi_id - retrieve and generate a unique SCSI identifier
-
-config EUDEV_EXTRA_v4l_id
- bool "Install eudev v4l_id callout"
- default y
- help
- v4l_id - udev callout to identify Video4Linux devices
-
-
-endmenu
+++ /dev/null
-#
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=eudev
-PKG_VERSION:=3.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://dev.gentoo.org/~blueness/eudev/
-PKG_MD5SUM:=7e42d9b9ed8162021665139520676367
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-PKG_BUILD_DEPENDS:=gperf/host
-PKG_FIXUP:=autoreconf
-PKG_INSTALL=1
-
-define Package/libudev
- SECTION:=libs
- CATEGORY:=Libraries
- TITLE:=Dynamic device management subsystem
- URL:=https://wiki.gentoo.org/wiki/Project:Eudev
- MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
-endef
-
-define Package/eudev
- SECTION:=base
- CATEGORY:=Base system
- TITLE:=Dynamic device management subsystem
- URL:=https://wiki.gentoo.org/wiki/Project:Eudev
- MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
- MENU:=1
- DEPENDS:=+EUDEV_EXTRA_blkid:libblkid +EUDEV_EXTRA_kmod:libkmod +librt +libudev
- PROVIDES:=udev
- CONFLICTS:=udev
-endef
-
-define Package/eudev/description
-udev allows Linux users to have a dynamic /dev directory and it
-provides the ability to have persistent device names.
-eudev is a fork of systemd-udev with the goal of obtaining better
-compatibility with existing software such as OpenRC and Upstart, older
-kernels, various toolchains and anything else required by users and
-various distributions.
-endef
-
-define Package/eudev/conffiles
-/etc/udev/udev.conf
-endef
-
-define Package/eudev/config
- source "$(SOURCE)/Config.in"
-endef
-
-CONFIGURE_ARGS += \
- --prefix=/usr --exec-prefix= --sysconfdir=/etc \
- --libexecdir=/lib/udev --sbindir=/sbin \
- --disable-hwdb --disable-introspection --disable-manpages \
- --disable-selinux \
- $(if $(CONFIG_EUDEV_EXTRA_blkid),--enable-blkid,--disable-blkid) \
- $(if $(CONFIG_EUDEV_EXTRA_kmod),--enable-kmod,--disable-kmod)
-
-
-eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_ata_id) += ata_id
-
-eudev-extra-rules-$(CONFIG_EUDEV_EXTRA_blkid) += 60-persistent-storage.rules
-
-eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_cdrom_id) += cdrom_id
-eudev-extra-rules-$(CONFIG_EUDEV_EXTRA_cdrom_id) += 60-cdrom_id.rules
-
-eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_collect) += collect
-
-eudev-extra-rules-$(CONFIG_EUDEV_EXTRA_input_id) += 60-persistent-input.rules
-
-eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_mtd_probe) += mtd_probe
-eudev-extra-rules-$(CONFIG_EUDEV_EXTRA_mtd_probe) += 75-probe_mtd.rules
-
-eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_scsi_id) += scsi_id
-
-eudev-extra-lib-bin-$(CONFIG_EUDEV_EXTRA_v4l_id) += v4l_id
-eudev-extra-rules-$(CONFIG_EUDEV_EXTRA_v4l_id) += 60-persistent-v4l.rules
-
-define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/libudev.h $(1)/usr/include
- $(INSTALL_DIR) $(1)/usr/share/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/udev.pc $(1)/usr/share/pkgconfig
- $(INSTALL_DIR) $(1)/lib
- $(CP) $(PKG_INSTALL_DIR)/lib/libudev.so* $(1)/lib
- $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/lib/pkgconfig/libudev.pc $(1)/usr/lib/pkgconfig
-endef
-
-define Package/libudev/install
- $(INSTALL_DIR) $(1)/lib
- $(CP) $(PKG_INSTALL_DIR)/lib/libudev.so* $(1)/lib
-endef
-
-define Package/eudev/install
- $(INSTALL_DIR) $(1)/etc/udev/rules.d
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/udev/udev.conf $(1)/etc/udev
-
- $(INSTALL_DIR) $(1)/sbin
- $(INSTALL_BIN) \
- $(PKG_INSTALL_DIR)/usr/bin/udevadm \
- $(PKG_INSTALL_DIR)/sbin/udevd \
- $(1)/sbin
-
- $(INSTALL_DIR) $(1)/lib/udev/rules.d
- $(INSTALL_DATA) \
- $(addprefix $(PKG_INSTALL_DIR)/lib/udev/rules.d/, \
- $(eudev-extra-rules-y)) \
- $(addprefix $(PKG_INSTALL_DIR)/lib/udev/rules.d/, \
- 50-udev-default.rules \
- 60-block.rules \
- 60-drm.rules \
- 60-evdev.rules \
- 60-persistent-alsa.rules \
- 60-persistent-storage-tape.rules \
- 60-serial.rules \
- 64-btrfs.rules \
- 70-mouse.rules \
- 75-net-description.rules \
- 78-sound-card.rules \
- 80-net-name-slot.rules) \
- $(1)/lib/udev/rules.d
-
-ifneq ($(eudev-extra-lib-bin-y),)
- $(INSTALL_BIN) \
- $(addprefix $(PKG_INSTALL_DIR)/lib/udev/, \
- $(eudev-extra-lib-bin-y)) \
- $(1)/lib/udev/
-endif
-endef
-
-$(eval $(call BuildPackage,eudev))
-$(eval $(call BuildPackage,libudev))
+++ /dev/null
-Index: eudev-3.1.5/src/mtd_probe/mtd_probe.h
-===================================================================
---- eudev-3.1.5.orig/src/mtd_probe/mtd_probe.h
-+++ eudev-3.1.5/src/mtd_probe/mtd_probe.h
-@@ -18,6 +18,7 @@
- */
-
- #include <mtd/mtd-user.h>
-+#include <stdint.h>
-
- #include "macro.h"
-
PKG_NAME:=uvcdynctrl
PKG_VERSION:=0.2.4
+PKG_REV:=2
PKG_SOURCE:=libwebcam-src-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/libwebcam
define Package/uvcdynctrl
SECTION:=utils
CATEGORY:=Utilities
- DEPENDS:=+libwebcam +PACKAGE_UVCDYNCTRL_UDEV_RULE:udev
+ DEPENDS:=+libwebcam
TITLE:=Manage dynamic controls in uvcvideo
URL:=http://sourceforge.net/projects/libwebcam/
MENU:=1
- uvcdynctrl: Manage dynamic controls in uvcvideo (GPL)
endef
-define Package/uvcdynctrl/config
-config PACKAGE_UVCDYNCTRL_UDEV_RULE
- bool "uvcdynctrl udev rule, selects udev"
- depends on PACKAGE_uvcdynctrl
- default no
- help
- Installs an udev rule to load uvcdynctrl with dynamic controls
- from xml files in /usr/share/uvcdynctrl when a webcam is attached.
-endef
-
define Package/libwebcam
SECTION:=libs
CATEGORY:=Libraries
$(INSTALL_DIR) $(1)/usr/{bin,share}
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/uvcdynctrl* $(1)/usr/bin/
$(CP) $(PKG_INSTALL_DIR)/usr/share/uvcdynctrl/ $(1)/usr/share/
-
-ifeq ($(CONFIG_PACKAGE_UVCDYNCTRL_UDEV_RULE),y)
- $(INSTALL_DIR) $(1)/lib/udev/rules.d
- $(CP) $(PKG_INSTALL_DIR)/lib/udev/rules.d/*.rules $(1)/lib/udev/rules.d/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/udev/uvcdynctrl $(1)/lib/udev/
-endif
endef
define Package/libwebcam/install
projects / feed / packages.git / commitdiff