mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-05 08:02:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

dhcp: upgrade to 4.3.1

Browse Source 
Rebase fixsepbuild.patch to 4.3.1

(From OE-Core rev: 580c2398cb6c84d89badc22fd9f5453b74d73a79)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia
2015-01-12 13:32:54 +08:00
committed by Richard Purdie
parent 02ee240db3
commit bee37d495d
2 changed files with 67 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
View File

@@ -4,47 +4,32 @@ Upstream-Status: Pending
RP 2013/03/21
Index: dhcp-4.2.5/common/Makefile.am
===================================================================
--- dhcp-4.2.5.orig/common/Makefile.am 2013-03-21 12:54:11.345063519 +0000
+++ dhcp-4.2.5/common/Makefile.am 2013-03-21 12:54:11.805063510 +0000
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
AM_CFLAGS = $(LDAP_CFLAGS)
Rebase to 4.3.1
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
client/Makefile.am | 6 ++++--
common/Makefile.am | 2 +-
dhcpctl/Makefile.am | 2 ++
dst/Makefile.am | 2 +-
omapip/Makefile.am | 2 ++
relay/Makefile.am | 2 +-
server/Makefile.am | 2 +-
7 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/client/Makefile.am b/client/Makefile.am
index 8411960..1740f72 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -4,6 +4,8 @@
# production code. Sadly, we are not there yet.
SUBDIRS = . tests
noinst_LIBRARIES = libdhcp.a
Index: dhcp-4.2.5/dst/Makefile.am
===================================================================
--- dhcp-4.2.5.orig/dst/Makefile.am 2013-03-21 12:54:11.345063519 +0000
+++ dhcp-4.2.5/dst/Makefile.am 2013-03-21 12:54:11.805063510 +0000
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
+AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes
lib_LIBRARIES = libdst.a
Index: dhcp-4.2.5/omapip/Makefile.am
===================================================================
--- dhcp-4.2.5.orig/omapip/Makefile.am 2013-03-21 12:54:11.677063511 +0000
+++ dhcp-4.2.5/omapip/Makefile.am 2013-03-21 12:54:11.809063510 +0000
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = -I$(top_srcdir)/includes
+
lib_LIBRARIES = libomapi.a
noinst_PROGRAMS = svtest
Index: dhcp-4.2.5/client/Makefile.am
===================================================================
--- dhcp-4.2.5.orig/client/Makefile.am 2013-03-21 12:54:11.677063511 +0000
+++ dhcp-4.2.5/client/Makefile.am 2013-03-21 12:54:11.809063510 +0000
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = -I$(top_srcdir)/includes
+
dist_sysconf_DATA = dhclient.conf.example
sbin_PROGRAMS = dhclient
dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
@@ -11,8 +13,8 @@
@@ -17,8 +19,8 @@ EXTRA_DIST = $(man_MANS)
dhclient.o: dhclient.c
$(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
@@ -55,30 +40,60 @@ Index: dhcp-4.2.5/client/Makefile.am
$(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
- -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c
+ -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c
Index: dhcp-4.2.5/dhcpctl/Makefile.am
===================================================================
--- dhcp-4.2.5.orig/dhcpctl/Makefile.am 2013-03-21 12:54:11.677063511 +0000
+++ dhcp-4.2.5/dhcpctl/Makefile.am 2013-03-21 12:54:11.809063510 +0000
diff --git a/common/Makefile.am b/common/Makefile.am
index eddef05..5ce045f 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
AM_CFLAGS = $(LDAP_CFLAGS)
noinst_LIBRARIES = libdhcp.a
diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
index 2987a53..cd72d75 100644
--- a/dhcpctl/Makefile.am
+++ b/dhcpctl/Makefile.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
+
bin_PROGRAMS = omshell
lib_LIBRARIES = libdhcpctl.a
noinst_PROGRAMS = cltest
Index: dhcp-4.2.5/relay/Makefile.am
===================================================================
--- dhcp-4.2.5.orig/relay/Makefile.am 2013-03-21 12:54:11.677063511 +0000
+++ dhcp-4.2.5/relay/Makefile.am 2013-03-21 12:54:11.809063510 +0000
diff --git a/dst/Makefile.am b/dst/Makefile.am
index 8937fe8..a14798b 100644
--- a/dst/Makefile.am
+++ b/dst/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
+AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes
lib_LIBRARIES = libdst.a
diff --git a/omapip/Makefile.am b/omapip/Makefile.am
index 5074479..9c0fab3 100644
--- a/omapip/Makefile.am
+++ b/omapip/Makefile.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = -I$(top_srcdir)/includes
+
lib_LIBRARIES = libomapi.a
noinst_PROGRAMS = svtest
diff --git a/relay/Makefile.am b/relay/Makefile.am
index ec72a31..f842071 100644
--- a/relay/Makefile.am
+++ b/relay/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
+AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
sbin_PROGRAMS = dhcrelay
dhcrelay_SOURCES = dhcrelay.c
Index: dhcp-4.2.5/server/Makefile.am
===================================================================
--- dhcp-4.2.5.orig/server/Makefile.am 2013-03-21 12:54:11.677063511 +0000
+++ dhcp-4.2.5/server/Makefile.am 2013-03-21 12:55:01.509062081 +0000
diff --git a/server/Makefile.am b/server/Makefile.am
index a446f0b..d0b873a 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -4,7 +4,7 @@
# production code. Sadly, we are not there yet.
SUBDIRS = . tests
@@ -88,3 +103,6 @@ Index: dhcp-4.2.5/server/Makefile.am
dist_sysconf_DATA = dhcpd.conf.example
sbin_PROGRAMS = dhcpd
--
1.9.1

4
meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb → meta/recipes-connectivity/dhcp/dhcp_4.3.1.bb
View File

@@ -8,5 +8,5 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
file://replace-ifconfig-route.patch \
"
SRC_URI[md5sum] = "1020d77e1a4c1f01b76279caff9beb80"
SRC_URI[sha256sum] = "a7b6517d5cf32c5e49d2323a63de00efe5391df7cb0045dfa0ec8f6ee46ebe8a"
SRC_URI[md5sum] = "b3a42ece3c7f2cd2e74a3e12ca881d20"
SRC_URI[sha256sum] = "266cbca8a7a6bb8f9ccc5765da0d2b04099329314a54a4fc1022d510ad3e9af0"