diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-07 16:34:48 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-10-07 16:34:54 +0300 |
| commit | 4fe7a1353f8f7f96c7407caa3352fa50fcce5aa3 (patch) | |
| tree | e1e898e098bec469e02e357983dae7436a072235 /meta-openembedded/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch | |
| parent | 00e122a7b3a839f5ce8b819cb1bfe92cf3781eda (diff) | |
| download | openbmc-4fe7a1353f8f7f96c7407caa3352fa50fcce5aa3.tar.xz | |
meta-openembedded: subtree update:e6d76b05a7..01d539b324
Adrian Ratiu (1):
renderdoc: add x11 to REQUIRED_DISTRO_FEATURES
Callaghan, Dan (2):
firewalld: update to 0.7.1
strongswan: install dev headers
George McCollister (1):
wireshark: fix qt5 build
Jean-Marie LEMETAYER (1):
python-toml: add recipes for python2 and python3
Khem Raj (1):
xscreensaver: Remove xserver-nodm-init rdep
Maciej Pijanowski (1):
smem: package smemcap separately
Ovidiu Panait (1):
kea: Disable parallel install
Peiran Hong (1):
zabbix: upgrade 3.0.9 -> 4.2.6
Randy MacLeod (1):
libteam: update from 1.28 to 1.29
Trevor Gamblin (2):
php: fix CVE-2019-6978
gd: fix CVE-2019-6978
Change-Id: I2c308ff46213876c1d74f42b5d9f9e52946bbf02
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch')
| -rw-r--r-- | meta-openembedded/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch b/meta-openembedded/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch deleted file mode 100644 index 28d590242..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/firewalld/files/0001-fix-building-in-a-separate-directory-outside-the-sou.patch +++ /dev/null @@ -1,68 +0,0 @@ -firewalld: fix building in a separate directory outside the source tree - -Upstream-Status: Accepted [https://github.com/firewalld/firewalld/pull/456] -Signed-off-by: Dan Callaghan <dan.callaghan@opengear.com> - ---- a/config/Makefile.am -+++ b/config/Makefile.am -@@ -377,11 +377,11 @@ install-config: - $(MKDIR_P) $(DESTDIR)$(sconfdir)/zones - $(MKDIR_P) $(DESTDIR)$(sconfdir)/helpers - $(MKDIR_P) $(DESTDIR)$(prefixlibdir) -- cp -r icmptypes $(DESTDIR)$(prefixlibdir) -- cp -r ipsets $(DESTDIR)$(prefixlibdir) -- cp -r services $(DESTDIR)$(prefixlibdir) -- cp -r zones $(DESTDIR)$(prefixlibdir) -- cp -r helpers $(DESTDIR)$(prefixlibdir) -+ cp -r $(srcdir)/icmptypes $(DESTDIR)$(prefixlibdir) -+ cp -r $(srcdir)/ipsets $(DESTDIR)$(prefixlibdir) -+ cp -r $(srcdir)/services $(DESTDIR)$(prefixlibdir) -+ cp -r $(srcdir)/zones $(DESTDIR)$(prefixlibdir) -+ cp -r $(srcdir)/helpers $(DESTDIR)$(prefixlibdir) - - uninstall-config: - rmdir $(DESTDIR)$(sconfdir)/icmptypes ---- a/doc/xml/Makefile.am -+++ b/doc/xml/Makefile.am -@@ -69,7 +69,8 @@ edit = sed \ - -e 's|\@PREFIX\@|$(prefix)|' \ - -e 's|\@SYSCONFDIR\@|$(sysconfdir)|' \ - -e 's|\@PACKAGE_STRING\@|$(PACKAGE_STRING)|' \ -- -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' -+ -e 's|\@IFCFGDIR\@|$(IFCFGDIR)|' \ -+ -e 's|@SRCDIR@|$(srcdir)|' - - transform-man.xsl: transform-man.xsl.in - $(edit) $< >$@ ---- a/doc/xml/firewall-cmd.xml.in -+++ b/doc/xml/firewall-cmd.xml.in -@@ -1,10 +1,10 @@ - <?xml version="1.0" encoding="utf-8"?> - <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" - [ --<!ENTITY authors SYSTEM "authors.xml"> --<!ENTITY seealso SYSTEM "seealso.xml"> --<!ENTITY notes SYSTEM "notes.xml"> --<!ENTITY errorcodes SYSTEM "errorcodes.xml"> -+<!ENTITY authors SYSTEM "@SRCDIR@/authors.xml"> -+<!ENTITY seealso SYSTEM "@SRCDIR@/seealso.xml"> -+<!ENTITY notes SYSTEM "@SRCDIR@/notes.xml"> -+<!ENTITY errorcodes SYSTEM "@SRCDIR@/errorcodes.xml"> - ]> - - <!-- ---- a/doc/xml/firewalld.xml.in -+++ b/doc/xml/firewalld.xml.in -@@ -1,9 +1,9 @@ - <?xml version="1.0" encoding="utf-8"?> - <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" - [ --<!ENTITY authors SYSTEM "authors.xml"> --<!ENTITY seealso SYSTEM "seealso.xml"> --<!ENTITY notes SYSTEM "notes.xml"> -+<!ENTITY authors SYSTEM "@SRCDIR@/authors.xml"> -+<!ENTITY seealso SYSTEM "@SRCDIR@/seealso.xml"> -+<!ENTITY notes SYSTEM "@SRCDIR@/notes.xml"> - ]> - - <!-- |