diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-16 17:11:34 -0800 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-08 18:21:44 -0500 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.gz talos-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.zip |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch')
-rw-r--r-- | poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch | 69 |
1 files changed, 36 insertions, 33 deletions
diff --git a/poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch b/poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch index a20b5f96f..006d18ae7 100644 --- a/poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch +++ b/poky/meta/recipes-connectivity/dhcp/dhcp/0008-tweak-to-support-external-bind.patch @@ -20,10 +20,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> server/tests/Makefile.am | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) -Index: dhcp-4.3.6/client/Makefile.am -=================================================================== ---- dhcp-4.3.6.orig/client/Makefile.am -+++ dhcp-4.3.6/client/Makefile.am +diff --git a/client/Makefile.am b/client/Makefile.am +index 4730bb3..84d8131 100644 +--- a/client/Makefile.am ++++ b/client/Makefile.am @@ -4,7 +4,7 @@ # production code. Sadly, we are not there yet. SUBDIRS = . tests @@ -33,10 +33,10 @@ Index: dhcp-4.3.6/client/Makefile.am AM_CPPFLAGS = -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \ -DLOCALSTATEDIR='"$(localstatedir)"' -I$(top_srcdir)/includes -Index: dhcp-4.3.6/client/tests/Makefile.am -=================================================================== ---- dhcp-4.3.6.orig/client/tests/Makefile.am -+++ dhcp-4.3.6/client/tests/Makefile.am +diff --git a/client/tests/Makefile.am b/client/tests/Makefile.am +index 5031d0c..a8dfd26 100644 +--- a/client/tests/Makefile.am ++++ b/client/tests/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . @@ -45,10 +45,10 @@ Index: dhcp-4.3.6/client/tests/Makefile.am AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) -Index: dhcp-4.3.6/common/tests/Makefile.am -=================================================================== ---- dhcp-4.3.6.orig/common/tests/Makefile.am -+++ dhcp-4.3.6/common/tests/Makefile.am +diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am +index f6a43e4..2f98d22 100644 +--- a/common/tests/Makefile.am ++++ b/common/tests/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . @@ -57,40 +57,40 @@ Index: dhcp-4.3.6/common/tests/Makefile.am AM_CPPFLAGS = $(ATF_CFLAGS) -I$(top_srcdir)/includes -Index: dhcp-4.3.6/dhcpctl/Makefile.am -=================================================================== ---- dhcp-4.3.6.orig/dhcpctl/Makefile.am -+++ dhcp-4.3.6/dhcpctl/Makefile.am +diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am +index ba8dd8b..9b2486e 100644 +--- a/dhcpctl/Makefile.am ++++ b/dhcpctl/Makefile.am @@ -1,4 +1,4 @@ -BINDLIBDIR = @BINDDIR@/lib +BINDLIBDIR = @BINDDIR@ AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -Index: dhcp-4.3.6/omapip/Makefile.am -=================================================================== ---- dhcp-4.3.6.orig/omapip/Makefile.am -+++ dhcp-4.3.6/omapip/Makefile.am +diff --git a/omapip/Makefile.am b/omapip/Makefile.am +index dd1afa0..e4a8599 100644 +--- a/omapip/Makefile.am ++++ b/omapip/Makefile.am @@ -1,4 +1,4 @@ -BINDLIBDIR = @BINDDIR@/lib +BINDLIBDIR = @BINDDIR@ AM_CPPFLAGS = -I$(top_srcdir)/includes - lib_LTLIBRARIES = libomapi.la -Index: dhcp-4.3.6/relay/Makefile.am -=================================================================== ---- dhcp-4.3.6.orig/relay/Makefile.am -+++ dhcp-4.3.6/relay/Makefile.am + lib_LIBRARIES = libomapi.a +diff --git a/relay/Makefile.am b/relay/Makefile.am +index 6d652f6..b3bf578 100644 +--- a/relay/Makefile.am ++++ b/relay/Makefile.am @@ -1,4 +1,4 @@ -BINDLIBDIR = @BINDDIR@/lib +BINDLIBDIR = @BINDDIR@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes -Index: dhcp-4.3.6/server/Makefile.am -=================================================================== ---- dhcp-4.3.6.orig/server/Makefile.am -+++ dhcp-4.3.6/server/Makefile.am +diff --git a/server/Makefile.am b/server/Makefile.am +index 3990b9c..b5d8c2d 100644 +--- a/server/Makefile.am ++++ b/server/Makefile.am @@ -4,7 +4,7 @@ # production code. Sadly, we are not there yet. SUBDIRS = . tests @@ -100,10 +100,10 @@ Index: dhcp-4.3.6/server/Makefile.am AM_CPPFLAGS = -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes -Index: dhcp-4.3.6/server/tests/Makefile.am -=================================================================== ---- dhcp-4.3.6.orig/server/tests/Makefile.am -+++ dhcp-4.3.6/server/tests/Makefile.am +diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am +index a87c5e7..9821081 100644 +--- a/server/tests/Makefile.am ++++ b/server/tests/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = . @@ -112,3 +112,6 @@ Index: dhcp-4.3.6/server/tests/Makefile.am AM_CPPFLAGS = $(ATF_CFLAGS) -DUNIT_TEST -I$(top_srcdir)/includes AM_CPPFLAGS += -I@BINDDIR@/include -I$(top_srcdir) +-- +1.8.3.1 + |