* [PATCH 0/1]dhcp: Fix hard coded libdir issue for multilib
@ 2011-07-21 8:59 Mei Lei
2011-07-21 8:59 ` [PATCH 1/1] dhcp: Fix " Mei Lei
2011-07-22 15:59 ` [PATCH 0/1]dhcp: Fix hard coded " Saul Wold
0 siblings, 2 replies; 4+ messages in thread
From: Mei Lei @ 2011-07-21 8:59 UTC (permalink / raw)
To: openembedded-core
This pull request fixes some hard coded /usr/lib path issues, please review it.
Thanks,
Lei
The following changes since commit 8af286885353d5740971f137f8c1ada2b43dd2a8:
Paul Eggleton (1):
README.hardware: update MPC8315E-RDB instructions
are available in the git repository at:
git://git.pokylinux.org/poky-contrib lmei3/multilib-lsb-v2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/multilib-lsb-v2
Mei Lei (1):
dhcp: Fix libdir issue for multilib
.../dhcp/dhcp-4.2.0/fix-external-bind.patch | 14 +++++++-------
meta/recipes-connectivity/dhcp/dhcp4.inc | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/1] dhcp: Fix libdir issue for multilib
2011-07-21 8:59 [PATCH 0/1]dhcp: Fix hard coded libdir issue for multilib Mei Lei
@ 2011-07-21 8:59 ` Mei Lei
2011-07-21 9:51 ` Phil Blundell
2011-07-22 15:59 ` [PATCH 0/1]dhcp: Fix hard coded " Saul Wold
1 sibling, 1 reply; 4+ messages in thread
From: Mei Lei @ 2011-07-21 8:59 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Mei Lei <lei.mei@intel.com>
---
.../dhcp/dhcp-4.2.0/fix-external-bind.patch | 14 +++++++-------
meta/recipes-connectivity/dhcp/dhcp4.inc | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch b/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch
index f03936d..4f11655 100644
--- a/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch
@@ -28,7 +28,7 @@ index 77ed055..5a77f2d 100644
scripts/solaris scripts/openwrt
dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
- ../bind/lib/libdns.a ../bind/lib/libisc.a
-+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++ $(libbind)/libdns.a $(libbind)/libisc.a
man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
EXTRA_DIST = $(man_MANS)
@@ -53,7 +53,7 @@ index 61049be..85aefa3 100644
omshell_SOURCES = omshell.c
omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
- ../bind/lib/libdns.a ../bind/lib/libisc.a
-+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++ $(libbind)/libdns.a $(libbind)/libisc.a
libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
@@ -61,7 +61,7 @@ index 61049be..85aefa3 100644
cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
- ../bind/lib/libdns.a ../bind/lib/libisc.a
\ No newline at end of file
-+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++ $(libbind)/libdns.a $(libbind)/libisc.a
diff --git a/omapip/Makefile.am b/omapip/Makefile.am
index 595950a..17f2233 100644
--- a/omapip/Makefile.am
@@ -71,7 +71,7 @@ index 595950a..17f2233 100644
svtest_SOURCES = test.c
-svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
-+svtest_LDADD = libomapi.a $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++svtest_LDADD = libomapi.a $(libbind)/libdns.a $(libbind)/libisc.a
diff --git a/relay/Makefile.am b/relay/Makefile.am
index d8757ca..a7885da 100644
@@ -82,7 +82,7 @@ index d8757ca..a7885da 100644
dhcrelay_SOURCES = dhcrelay.c
dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
- ../bind/lib/libdns.a ../bind/lib/libisc.a
-+ $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++ $(libbind)/libdns.a $(libbind)/libisc.a
man_MANS = dhcrelay.8
EXTRA_DIST = $(man_MANS)
@@ -96,8 +96,8 @@ index cdfaf47..d2c254b 100644
dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
- ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \
- ../bind/lib/libisc.a
-+ ../dhcpctl/libdhcpctl.a $(libbind)/lib/libdns.a \
-+ $(libbind)/lib/libisc.a
++ ../dhcpctl/libdhcpctl.a $(libbind)/libdns.a \
++ $(libbind)/libisc.a
man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
EXTRA_DIST = $(man_MANS)
diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp4.inc
index 885cc19..bdaa5e9 100644
--- a/meta/recipes-connectivity/dhcp/dhcp4.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp4.inc
@@ -25,7 +25,7 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
--with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
--with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
--with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
- --with-libbind=${STAGING_LIBDIR}/.. \
+ --with-libbind=${STAGING_LIBDIR}/ \
"
do_compile_prepend () {
--
1.6.3.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/1]dhcp: Fix hard coded libdir issue for multilib
2011-07-21 8:59 [PATCH 0/1]dhcp: Fix hard coded libdir issue for multilib Mei Lei
2011-07-21 8:59 ` [PATCH 1/1] dhcp: Fix " Mei Lei
@ 2011-07-22 15:59 ` Saul Wold
1 sibling, 0 replies; 4+ messages in thread
From: Saul Wold @ 2011-07-22 15:59 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 07/21/2011 01:59 AM, Mei Lei wrote:
> This pull request fixes some hard coded /usr/lib path issues, please review it.
>
> Thanks,
> Lei
>
> The following changes since commit 8af286885353d5740971f137f8c1ada2b43dd2a8:
> Paul Eggleton (1):
> README.hardware: update MPC8315E-RDB instructions
>
> are available in the git repository at:
>
> git://git.pokylinux.org/poky-contrib lmei3/multilib-lsb-v2
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lmei3/multilib-lsb-v2
>
> Mei Lei (1):
> dhcp: Fix libdir issue for multilib
>
> .../dhcp/dhcp-4.2.0/fix-external-bind.patch | 14 +++++++-------
> meta/recipes-connectivity/dhcp/dhcp4.inc | 2 +-
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-07-22 16:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-21 8:59 [PATCH 0/1]dhcp: Fix hard coded libdir issue for multilib Mei Lei
2011-07-21 8:59 ` [PATCH 1/1] dhcp: Fix " Mei Lei
2011-07-21 9:51 ` Phil Blundell
2011-07-22 15:59 ` [PATCH 0/1]dhcp: Fix hard coded " Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox