mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
Merge branch 'ivi'
This commit is contained in:
@@ -0,0 +1,13 @@
|
|||||||
|
Index: gnet/examples/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- gnet.orig/examples/Makefile.am
|
||||||
|
+++ gnet/examples/Makefile.am
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
|
||||||
|
@SET_MAKE@
|
||||||
|
|
||||||
|
-SUBDIRS = xmlrpc
|
||||||
|
+SUBDIRS =
|
||||||
|
|
||||||
|
if OS_WIN32
|
||||||
|
noinst_PROGRAMS = echoclient echoserver \
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
Index: trunk/configure.ac
|
||||||
|
===================================================================
|
||||||
|
--- trunk.orig/configure.ac
|
||||||
|
+++ trunk/configure.ac
|
||||||
|
@@ -332,53 +332,6 @@ AC_DEFINE_UNQUOTED(GNET_SOCKADDR_FAMILY_
|
||||||
|
[$gnet_sockaddr_family_field_name],
|
||||||
|
[Name of sockaddr_storage family field])
|
||||||
|
|
||||||
|
-dnl #######################################
|
||||||
|
-dnl Check if abstract sockets are supported
|
||||||
|
-dnl #######################################
|
||||||
|
-
|
||||||
|
-AC_LANG_PUSH(C)
|
||||||
|
-AC_CACHE_CHECK([for abstract socket namespace availability],
|
||||||
|
- ac_cv_gnet_have_abstract_sockets,
|
||||||
|
- [AC_RUN_IFELSE([AC_LANG_PROGRAM(
|
||||||
|
-[[
|
||||||
|
-#include <sys/types.h>
|
||||||
|
-#include <stdlib.h>
|
||||||
|
-#include <string.h>
|
||||||
|
-#include <stdio.h>
|
||||||
|
-#include <sys/socket.h>
|
||||||
|
-#include <sys/un.h>
|
||||||
|
-#include <errno.h>
|
||||||
|
-]],
|
||||||
|
-[[
|
||||||
|
- int listen_fd, len;
|
||||||
|
- struct sockaddr_un addr;
|
||||||
|
-
|
||||||
|
- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0);
|
||||||
|
- if (listen_fd < 0) {
|
||||||
|
- perror ("socket() failed: ");
|
||||||
|
- exit (1);
|
||||||
|
- }
|
||||||
|
- memset (&addr, '\0', sizeof (addr));
|
||||||
|
- addr.sun_family = AF_UNIX;
|
||||||
|
- strcpy (addr.sun_path, "X/tmp/gnet-fake-socket-path-used-in-configure-test");
|
||||||
|
- len = SUN_LEN (&addr); /* calculate size before adding the \0 */
|
||||||
|
- addr.sun_path[0] = '\0'; /* this is what makes it abstract */
|
||||||
|
-
|
||||||
|
- if (bind (listen_fd, (struct sockaddr*) &addr, len) < 0) {
|
||||||
|
- perror ("Abstract socket namespace bind() failed: ");
|
||||||
|
- exit (1);
|
||||||
|
- }
|
||||||
|
- exit (0);
|
||||||
|
-]])],
|
||||||
|
- [ac_cv_gnet_have_abstract_sockets=yes],
|
||||||
|
- [ac_cv_gnet_have_abstract_sockets=no]
|
||||||
|
-)])
|
||||||
|
-AC_LANG_POP(C)
|
||||||
|
-
|
||||||
|
-if test x$ac_cv_gnet_have_abstract_sockets = xyes ; then
|
||||||
|
- AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace])
|
||||||
|
-fi
|
||||||
|
-
|
||||||
|
###############################
|
||||||
|
# Compiler characteristics
|
||||||
|
AC_C_CONST
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
DESCRIPTION = "GNet is a simple network library. It is written in C, object-oriented, and built upon GLib."
|
||||||
|
LICENSE = "LGPL"
|
||||||
|
SECTION = "libs/network"
|
||||||
|
HOMEPAGE = "http://www.gnetlibrary.org"
|
||||||
|
DEPENDS = "glib-2.0"
|
||||||
|
PV = "2.0.7+svn${SRCDATE}"
|
||||||
|
|
||||||
|
SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk \
|
||||||
|
file://buildfix.patch;patch=1 \
|
||||||
|
file://configure_fix.patch;patch=1"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/trunk"
|
||||||
|
|
||||||
|
EXTRA_OECONF = "--disable-pthreads"
|
||||||
|
|
||||||
|
FILES_${PN}-dev += "${libdir}/gnet-2.0"
|
||||||
|
|
||||||
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
|
do_stage() {
|
||||||
|
autotools_stage_all
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures"
|
||||||
|
HOMEPAGE = "http://sourceforge.net/projects/libexif"
|
||||||
|
SECTION = "libs"
|
||||||
|
LICENSE = "LGPL"
|
||||||
|
|
||||||
|
SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2"
|
||||||
|
|
||||||
|
inherit autotools
|
||||||
|
|
||||||
|
do_configure_append() {
|
||||||
|
sed -i s:doc\ binary:binary:g Makefile
|
||||||
|
}
|
||||||
|
|
||||||
|
AUTOTOOLS_STAGE_PKGCONFIG = "1"
|
||||||
|
|
||||||
|
do_stage() {
|
||||||
|
autotools_stage_all
|
||||||
|
}
|
||||||
+42
@@ -0,0 +1,42 @@
|
|||||||
|
#! /bin/sh
|
||||||
|
#
|
||||||
|
# This is an init script for openembedded
|
||||||
|
# Copy it to /etc/init.d/monit and type
|
||||||
|
# > update-rc.d monit defaults 99
|
||||||
|
#
|
||||||
|
monit=/usr/bin/monit
|
||||||
|
pidfile=/var/run/monit.pid
|
||||||
|
monit_args="-c /etc/monitrc"
|
||||||
|
|
||||||
|
test -x "$monit" || exit 0
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
echo -n "Starting Monit"
|
||||||
|
start-stop-daemon --start --quiet --exec $monit -- $monit_args
|
||||||
|
RETVAL=$?
|
||||||
|
echo "."
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
echo -n "Stopping Monit"
|
||||||
|
start-stop-daemon --stop --quiet --pidfile $pidfile
|
||||||
|
RETVAL=$?
|
||||||
|
echo "."
|
||||||
|
;;
|
||||||
|
restart)
|
||||||
|
$0 stop
|
||||||
|
$0 start
|
||||||
|
RETVAL=$?
|
||||||
|
;;
|
||||||
|
status)
|
||||||
|
$monit $monit_args status
|
||||||
|
RETVAL=$?
|
||||||
|
echo "."
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Usage: $0 {start|stop|restart|status}"
|
||||||
|
exit 1
|
||||||
|
esac
|
||||||
|
|
||||||
|
exit $RETVAL
|
||||||
|
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
LICENSE = "GPL"
|
||||||
|
DEPENDS = "openssl"
|
||||||
|
|
||||||
|
SRC_URI = "http://www.tildeslash.com/monit/dist/monit-${PV}.tar.gz\
|
||||||
|
file://init"
|
||||||
|
|
||||||
|
INITSCRIPT_NAME = "monit"
|
||||||
|
INITSCRIPT_PARAMS = "defaults 99"
|
||||||
|
|
||||||
|
inherit autotools update-rc.d
|
||||||
|
|
||||||
|
EXTRA_OECONF = "--with-ssl-lib-dir=${STAGING_LIBDIR} --with-ssl-incl-dir=${STAGING_INCDIR}"
|
||||||
|
|
||||||
|
do_install_append() {
|
||||||
|
install -d ${D}${sysconfdir}/init.d/
|
||||||
|
install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/monit
|
||||||
|
sed -i 's:# set daemon 120:set daemon 120:' ${S}/monitrc
|
||||||
|
sed -i 's:include /etc/monit.d/:include /${sysconfdir}/monit.d/:' ${S}/monitrc
|
||||||
|
install -m 600 ${S}/monitrc ${D}${sysconfdir}/monitrc
|
||||||
|
install -m 700 -d ${D}${sysconfdir}/monit.d/
|
||||||
|
}
|
||||||
|
|
||||||
|
CONFFILES_${PN} += "${sysconfdir}/monitrc"
|
||||||
|
|
||||||
Reference in New Issue
Block a user