diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:11 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-01 19:09:57 +0100 |
commit | d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch) | |
tree | f36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1 | |
parent | caab7fc509bf27706ff3248689f6afd04225cfda (diff) | |
download | poky-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz |
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1')
5 files changed, 156 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch new file mode 100644 index 0000000000..579d72f484 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/dhcp-3.0.3-dhclient-dbus.patch | |||
@@ -0,0 +1,84 @@ | |||
1 | --- client/scripts/bsdos | ||
2 | +++ client/scripts/bsdos | ||
3 | @@ -47,6 +47,11 @@ | ||
4 | . /etc/dhcp/dhclient-exit-hooks | ||
5 | fi | ||
6 | # probably should do something with exit status of the local script | ||
7 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
8 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
9 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
10 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
11 | + fi | ||
12 | exit $exit_status | ||
13 | } | ||
14 | |||
15 | --- client/scripts/freebsd | ||
16 | +++ client/scripts/freebsd | ||
17 | @@ -57,6 +57,11 @@ | ||
18 | . /etc/dhcp/dhclient-exit-hooks | ||
19 | fi | ||
20 | # probably should do something with exit status of the local script | ||
21 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
22 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
23 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
24 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
25 | + fi | ||
26 | exit $exit_status | ||
27 | } | ||
28 | |||
29 | --- client/scripts/linux | ||
30 | +++ client/scripts/linux | ||
31 | @@ -69,6 +69,11 @@ | ||
32 | . /etc/dhcp/dhclient-exit-hooks | ||
33 | fi | ||
34 | # probably should do something with exit status of the local script | ||
35 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
36 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
37 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
38 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
39 | + fi | ||
40 | exit $exit_status | ||
41 | } | ||
42 | |||
43 | --- client/scripts/netbsd | ||
44 | +++ client/scripts/netbsd | ||
45 | @@ -47,6 +47,11 @@ | ||
46 | . /etc/dhcp/dhclient-exit-hooks | ||
47 | fi | ||
48 | # probably should do something with exit status of the local script | ||
49 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
50 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
51 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
52 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
53 | + fi | ||
54 | exit $exit_status | ||
55 | } | ||
56 | |||
57 | --- client/scripts/openbsd | ||
58 | +++ client/scripts/openbsd | ||
59 | @@ -47,6 +47,11 @@ | ||
60 | . /etc/dhcp/dhclient-exit-hooks | ||
61 | fi | ||
62 | # probably should do something with exit status of the local script | ||
63 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
64 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
65 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
66 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
67 | + fi | ||
68 | exit $exit_status | ||
69 | } | ||
70 | |||
71 | --- client/scripts/solaris | ||
72 | +++ client/scripts/solaris | ||
73 | @@ -47,6 +47,11 @@ | ||
74 | . /etc/dhcp/dhclient-exit-hooks | ||
75 | fi | ||
76 | # probably should do something with exit status of the local script | ||
77 | + if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then | ||
78 | + dbus-send --system --dest=com.redhat.dhcp \ | ||
79 | + --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \ | ||
80 | + 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`" | ||
81 | + fi | ||
82 | exit $exit_status | ||
83 | } | ||
84 | |||
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fix-client-path.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fix-client-path.patch new file mode 100644 index 0000000000..f6a7be1d81 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fix-client-path.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | CLIENT_PATH is the only environment when executing dhclient-script, | ||
2 | without this patch, dhclient-script won't run properly because it | ||
3 | invokes ifconfig and route | ||
4 | |||
5 | 7/28/2010 - qhe | ||
6 | |||
7 | diff -ru dhcp-4.1.1-P1.orig//client/Makefile.am dhcp-4.1.1-P1/client/Makefile.am | ||
8 | --- dhcp-4.1.1-P1.orig//client/Makefile.am 2010-07-29 13:20:05.000000000 +0800 | ||
9 | +++ dhcp-4.1.1-P1/client/Makefile.am 2010-07-29 13:28:14.000000000 +0800 | ||
10 | @@ -10,9 +10,9 @@ | ||
11 | EXTRA_DIST = $(man_MANS) | ||
12 | |||
13 | dhclient.o: dhclient.c | ||
14 | - $(COMPILE) -DCLIENT_PATH='"$(sbindir)"' \ | ||
15 | + $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):$(base_sbindir):$(bindir):$(base_bindir)"' \ | ||
16 | -DLOCALSTATEDIR='"$(localstatedir)"' -c dhclient.c | ||
17 | |||
18 | dhc6.o: dhc6.c | ||
19 | - $(COMPILE) -DCLIENT_PATH='"$(sbindir)"' \ | ||
20 | + $(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):$(base_sbindir):$(bindir):$(base_bindir)"' \ | ||
21 | -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fixincludes.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fixincludes.patch new file mode 100644 index 0000000000..91d99cce22 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/fixincludes.patch | |||
@@ -0,0 +1,10 @@ | |||
1 | --- dhcp-3.0.2/common/tr.c~compile 2005-10-13 14:23:37.000000000 +0200 | ||
2 | +++ dhcp-3.0.2/common/tr.c 2005-10-13 14:23:45.000000000 +0200 | ||
3 | @@ -39,6 +39,7 @@ | ||
4 | #include "includes/netinet/udp.h" | ||
5 | #include "includes/netinet/if_ether.h" | ||
6 | #include "netinet/if_tr.h" | ||
7 | +#include <asm/types.h> | ||
8 | #include <sys/time.h> | ||
9 | |||
10 | /* | ||
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/noattrmode.patch b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/noattrmode.patch new file mode 100644 index 0000000000..5c766d6c06 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/noattrmode.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- dhcp-3.0.1/includes/dhcpd.h~compile | ||
7 | +++ dhcp-3.0.1/includes/dhcpd.h | ||
8 | @@ -306,9 +306,9 @@ | ||
9 | # define EPHEMERAL_FLAGS (MS_NULL_TERMINATION | \ | ||
10 | UNICAST_BROADCAST_HACK) | ||
11 | |||
12 | - binding_state_t __attribute__ ((mode (__byte__))) binding_state; | ||
13 | - binding_state_t __attribute__ ((mode (__byte__))) next_binding_state; | ||
14 | - binding_state_t __attribute__ ((mode (__byte__))) desired_binding_state; | ||
15 | + binding_state_t binding_state; | ||
16 | + binding_state_t next_binding_state; | ||
17 | + binding_state_t desired_binding_state; | ||
18 | |||
19 | struct lease_state *state; | ||
20 | |||
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/site.h b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/site.h new file mode 100644 index 0000000000..2289554ef3 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp-4.1.1-P1/site.h | |||
@@ -0,0 +1,21 @@ | |||
1 | /* | ||
2 | * define config file location in ${S}/includes/site.h | ||
3 | * still need to take care of installation path (${sysconfdir}/dhcpd.conf) | ||
4 | * | ||
5 | * 7/22/2010 - qhe | ||
6 | */ | ||
7 | |||
8 | /* Define this if you want DNS update functionality to be available. */ | ||
9 | |||
10 | #define NSUPDATE | ||
11 | |||
12 | /* Define this if you aren't debugging and you want to save memory | ||
13 | (potentially a _lot_ of memory) by allocating leases in chunks rather | ||
14 | than one at a time. */ | ||
15 | |||
16 | #define COMPACT_LEASES | ||
17 | |||
18 | |||
19 | /* local */ | ||
20 | #define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf" | ||
21 | #define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf" | ||