From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- recipes/dhcdbd/dhcdbd_1.14.bb | 24 +++++++++++++++++++ recipes/dhcdbd/dhcdbd_1.16.bb | 21 ++++++++++++++++ recipes/dhcdbd/dhcdbd_2.0.bb | 28 ++++++++++++++++++++++ recipes/dhcdbd/dhcdbd_3.0.bb | 27 +++++++++++++++++++++ recipes/dhcdbd/files/dbus-api-fix.patch | 20 ++++++++++++++++ recipes/dhcdbd/files/dbus_connection_unref.patch | 20 ++++++++++++++++ recipes/dhcdbd/files/dhcdbd | 28 ++++++++++++++++++++++ .../dhcdbd/files/dhcdbd-1.14-pkgconfig_dbus.patch | 26 ++++++++++++++++++++ recipes/dhcdbd/files/no-ext-options.patch | 13 ++++++++++ recipes/dhcdbd/files/paths.patch | 25 +++++++++++++++++++ 10 files changed, 232 insertions(+) create mode 100644 recipes/dhcdbd/dhcdbd_1.14.bb create mode 100644 recipes/dhcdbd/dhcdbd_1.16.bb create mode 100644 recipes/dhcdbd/dhcdbd_2.0.bb create mode 100644 recipes/dhcdbd/dhcdbd_3.0.bb create mode 100644 recipes/dhcdbd/files/dbus-api-fix.patch create mode 100644 recipes/dhcdbd/files/dbus_connection_unref.patch create mode 100755 recipes/dhcdbd/files/dhcdbd create mode 100644 recipes/dhcdbd/files/dhcdbd-1.14-pkgconfig_dbus.patch create mode 100644 recipes/dhcdbd/files/no-ext-options.patch create mode 100644 recipes/dhcdbd/files/paths.patch (limited to 'recipes/dhcdbd') diff --git a/recipes/dhcdbd/dhcdbd_1.14.bb b/recipes/dhcdbd/dhcdbd_1.14.bb new file mode 100644 index 0000000000..55d3c72899 --- /dev/null +++ b/recipes/dhcdbd/dhcdbd_1.14.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "DBus-enabled dhcp client" +HOMEPAGE = "http://people.redhat.com/jvdias/dhcdbd/" +SECTION = "net" +LICENSE = "GPL" +DEPENDS = "dbus" + +PR = "r1" + +SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \ + file://dhcdbd-1.14-pkgconfig_dbus.patch;patch=1 \ + file://dbus-api-fix.patch;patch=1 \ + file://dhcdbd" + +do_compile() { + CC=${TARGET_SYS}-gcc DESTDIR=${prefix} make +} + +do_install() { + DESTDIR=${D} make install + install -d ${D}/etc/init.d + install -m 0755 ${WORKDIR}/dhcdbd ${D}/etc/init.d/ +} + +FILES_${PN} += "${sysconfdir} ${datadir}/dbus-1 ${base_sbindir}/*" diff --git a/recipes/dhcdbd/dhcdbd_1.16.bb b/recipes/dhcdbd/dhcdbd_1.16.bb new file mode 100644 index 0000000000..24572fb259 --- /dev/null +++ b/recipes/dhcdbd/dhcdbd_1.16.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "DBus-enabled dhcp client" +HOMEPAGE = "http://people.redhat.com/jvdias/dhcdbd/" +SECTION = "net" +LICENSE = "GPL" +DEPENDS = "dbus" + +SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \ + file://dhcdbd-1.14-pkgconfig_dbus.patch;patch=1 \ + file://dhcdbd" + +do_compile() { + CC=${TARGET_SYS}-gcc DESTDIR=${prefix} make +} + +do_install() { + DESTDIR=${D} make install + install -d ${D}/etc/init.d + install -m 0755 ${WORKDIR}/dhcdbd ${D}/etc/init.d/ +} + +FILES_${PN} += "${sysconfdir} ${datadir}/dbus-1 ${base_sbindir}/*" diff --git a/recipes/dhcdbd/dhcdbd_2.0.bb b/recipes/dhcdbd/dhcdbd_2.0.bb new file mode 100644 index 0000000000..eedfe51d9a --- /dev/null +++ b/recipes/dhcdbd/dhcdbd_2.0.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "DBus-enabled dhcp client" +SECTION = "net" +LICENSE = "GPL" +DEPENDS = "dbus" +RDEPENDS = "dhcp-client" +PR = "r1" + +SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \ + file://dbus_connection_unref.patch;patch=1 \ + file://paths.patch;patch=1 \ + file://no-ext-options.patch;patch=1 \ + file://dhcdbd" + +inherit update-rc.d + +do_compile() { + CC=${TARGET_SYS}-gcc DESTDIR=${prefix} make +} + +do_install() { + DESTDIR=${D} make install + install -d ${D}/etc/init.d + install -m 0755 ${WORKDIR}/dhcdbd ${D}/etc/init.d/ +} + +INITSCRIPT_NAME = dhcdbd +INITSCRIPT_PARAMS = "start 30 2 3 4 5 . stop 30 0 1 6 ." +FILES_${PN} += "${sysconfdir} ${datadir}/dbus-1 ${base_sbindir}/*" diff --git a/recipes/dhcdbd/dhcdbd_3.0.bb b/recipes/dhcdbd/dhcdbd_3.0.bb new file mode 100644 index 0000000000..f30e5920ea --- /dev/null +++ b/recipes/dhcdbd/dhcdbd_3.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "DBus-enabled dhcp client" +SECTION = "net" +LICENSE = "GPL" +DEPENDS = "dbus" +RDEPENDS = "dhcp-client" +PR = "r1" + +SRC_URI = "https://fedorahosted.org/releases/d/h/dhcdbd/dhcdbd-${PV}.tar.bz2 \ + file://dbus_connection_unref.patch;patch=1 \ + file://paths.patch;patch=1 \ + file://dhcdbd" + +inherit update-rc.d + +do_compile() { + CC=${TARGET_SYS}-gcc DESTDIR=${prefix} make +} + +do_install() { + DESTDIR=${D} make install + install -d ${D}/etc/init.d + install -m 0755 ${WORKDIR}/dhcdbd ${D}/etc/init.d/ +} + +INITSCRIPT_NAME = dhcdbd +INITSCRIPT_PARAMS = "start 30 2 3 4 5 . stop 30 0 1 6 ." +FILES_${PN} += "${sysconfdir} ${datadir}/dbus-1 ${base_sbindir}/*" diff --git a/recipes/dhcdbd/files/dbus-api-fix.patch b/recipes/dhcdbd/files/dbus-api-fix.patch new file mode 100644 index 0000000000..ce05fc7bf8 --- /dev/null +++ b/recipes/dhcdbd/files/dbus-api-fix.patch @@ -0,0 +1,20 @@ +--- /tmp/dbus_service.c 2006-08-24 22:09:14.000000000 +0200 ++++ dhcdbd-1.14/dbus_service.c 2006-08-24 22:09:44.228306000 +0200 +@@ -1412,7 +1412,7 @@ + return ( cs ); + + give_up: +- dbus_connection_disconnect( connection ); ++ dbus_connection_close( connection ); + dbus_shutdown(); + return ( 0L ); + } +@@ -1456,7 +1456,7 @@ + cs->roots=0L; + + +- dbus_connection_disconnect( cs->connection ); ++ dbus_connection_close( cs->connection ); + dbus_shutdown(); + free( cs ); + } diff --git a/recipes/dhcdbd/files/dbus_connection_unref.patch b/recipes/dhcdbd/files/dbus_connection_unref.patch new file mode 100644 index 0000000000..e34c30b308 --- /dev/null +++ b/recipes/dhcdbd/files/dbus_connection_unref.patch @@ -0,0 +1,20 @@ +--- a/src/dbus_service.c.old 2006-11-29 08:32:03.390681525 +0100 ++++ b/src/dbus_service.c 2006-11-29 08:32:18.847562363 +0100 +@@ -1216,7 +1216,7 @@ + return (cs); + + give_up: +- dbus_connection_close(connection); ++ dbus_connection_unref(connection); + dbus_shutdown(); + + return (0L); +@@ -1250,7 +1250,7 @@ + tdestroy(cs->roots, free_root); + cs->roots = 0L; + +- dbus_connection_close(cs->connection); ++ dbus_connection_unref(cs->connection); + dbus_shutdown(); + free(cs); + } diff --git a/recipes/dhcdbd/files/dhcdbd b/recipes/dhcdbd/files/dhcdbd new file mode 100755 index 0000000000..568753c28c --- /dev/null +++ b/recipes/dhcdbd/files/dhcdbd @@ -0,0 +1,28 @@ +#!/bin/sh +# +# DHCDBD startup script + +. /etc/profile + +case $1 in + 'start') + echo -n "Starting dhcdbd daemon: dhcdbd" + /sbin/dhcdbd --system + echo "." + ;; + + 'stop') + echo -n "Stopping dhcdbd: dhcdbd" + killall `ps |grep /sbin/dhcdbd | grep -v grep | cut "-d " -f2` + echo "." + ;; + + 'restart') + $0 stop + $0 start + ;; + + *) + echo "Usage: $0 { start | stop | restart }" + ;; +esac diff --git a/recipes/dhcdbd/files/dhcdbd-1.14-pkgconfig_dbus.patch b/recipes/dhcdbd/files/dhcdbd-1.14-pkgconfig_dbus.patch new file mode 100644 index 0000000000..c2e2151d17 --- /dev/null +++ b/recipes/dhcdbd/files/dhcdbd-1.14-pkgconfig_dbus.patch @@ -0,0 +1,26 @@ +diff -Naur dhcdbd-1.14/Makefile dhcdbd-1.14-mod/Makefile +--- dhcdbd-1.14/Makefile 2006-01-17 22:23:51.000000000 +0100 ++++ dhcdbd-1.14-mod/Makefile 2006-08-02 18:02:42.000000000 +0200 +@@ -7,8 +7,8 @@ + LDFLAGS ?= -g + DESTDIR ?= / + LIBDIR ?= lib +-DBUS_INCLUDES ?= -I/usr/$(LIBDIR)/dbus-1.0/include -I/usr/include/dbus-1.0 +-DBUS_LIBS ?= -ldbus-1 ++DBUS_INCLUDES ?= `pkg-config dbus-1 --cflags` ++DBUS_LIBS ?= `pkg-config dbus-1 --libs` + OBJS = dbus_service.o dhcdbd.o dhcp_options.o main.o + SRCS = dbus_service.c dhcdbd.c dhcp_options.c main.c + INCS = dbus_service.h dhcdbd.h dhcp_options.h includes.h +diff -Naur dhcdbd-1.14/tests/Makefile dhcdbd-1.14-mod/tests/Makefile +--- dhcdbd-1.14/tests/Makefile 2006-01-17 22:23:51.000000000 +0100 ++++ dhcdbd-1.14-mod/tests/Makefile 2006-08-02 18:11:43.000000000 +0200 +@@ -2,7 +2,7 @@ + LD = ${CC} + CFLAGS ?= -g -Wall + LDFLAGS ?= -g +-DBUS_LIBS ?= -ldbus-1 ++DBUS_LIBS ?= `pkg-config dbus-1 --libs` + + all: test_dhcp_options test_dhcdbd_state test_subscriber test_subscriber_dbus test_prospective_subscriber + diff --git a/recipes/dhcdbd/files/no-ext-options.patch b/recipes/dhcdbd/files/no-ext-options.patch new file mode 100644 index 0000000000..774a2cf140 --- /dev/null +++ b/recipes/dhcdbd/files/no-ext-options.patch @@ -0,0 +1,13 @@ +Index: dhcdbd-2.0/include/dhcdbd.h +=================================================================== +--- dhcdbd-2.0.orig/include/dhcdbd.h 2006-10-18 09:38:18.000000000 +0100 ++++ dhcdbd-2.0/include/dhcdbd.h 2006-10-18 09:38:45.000000000 +0100 +@@ -76,7 +76,7 @@ + #endif + + #ifndef DHCLIENT_EXTENDED_OPTION_ENVIRONMENT +-#define DHCLIENT_EXTENDED_OPTION_ENVIRONMENT 1 ++#define DHCLIENT_EXTENDED_OPTION_ENVIRONMENT 0 + #endif + + #define DHCDBD_INTERFACE_TEXT "text" diff --git a/recipes/dhcdbd/files/paths.patch b/recipes/dhcdbd/files/paths.patch new file mode 100644 index 0000000000..bf547d695c --- /dev/null +++ b/recipes/dhcdbd/files/paths.patch @@ -0,0 +1,25 @@ +--- a/include/dhcdbd.h.orig 2006-08-24 18:34:47.000000000 +0200 ++++ b/include/dhcdbd.h 2006-09-28 19:48:59.000000000 +0200 +@@ -40,11 +40,11 @@ + #endif + + #ifndef DHCDBD_DHCLIENT_LEASE_DIR +-#define DHCDBD_DHCLIENT_LEASE_DIR "/var/lib/dhclient/" ++#define DHCDBD_DHCLIENT_LEASE_DIR "/var/lib/dhcp/" + #endif + + #ifndef DHCDBD_DHCLIENT_LEASE_PFX +-#define DHCDBD_DHCLIENT_LEASE_PFX "dhclient-" ++#define DHCDBD_DHCLIENT_LEASE_PFX "dhclient." + #endif + + #ifndef DHCDBD_DHCLIENT_LEASE_SFX +@@ -56,7 +56,7 @@ + #endif + + #ifndef DHCDBD_DHCLIENT_PID_PFX +-#define DHCDBD_DHCLIENT_PID_PFX "/var/run/dhclient-" ++#define DHCDBD_DHCLIENT_PID_PFX "/var/run/dhclient." + #endif + + #ifndef DHCDBD_DHCLIENT_PID_SFX -- cgit 1.2.3-korg