diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
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-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch')
-rw-r--r-- | poky/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/poky/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch b/poky/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch deleted file mode 100644 index dc71d9b18b..0000000000 --- a/poky/meta/recipes-devtools/rpm/files/0001-configure.ac-add-option-for-dbus.patch +++ /dev/null @@ -1,42 +0,0 @@ -From dfb422c744fdc1838afc40b8e1f161bb46093d92 Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Sun, 8 Apr 2018 12:06:42 +0800 -Subject: [PATCH] configure.ac: add option for dbus - -Add option for dbus so that users could choose to build with dbus -or with no dbus. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - configure.ac | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4db15c7909..493f393d31 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -976,12 +976,15 @@ AS_IF([test "$enable_plugins" = yes],[ - ]) - AM_CONDITIONAL(ENABLE_PLUGINS,[test "$enable_plugins" = yes]) - --with_dbus=no --AS_IF([test "$enable_plugins" != no],[ -+AC_ARG_WITH([dbus], [AS_HELP_STRING([--with-dbus], [build with dbus support])], -+ [], -+ [with_dbus=yes]) -+ -+AS_IF([test "$with_dbus" != no],[ - PKG_CHECK_MODULES([DBUS], - [dbus-1 >= 1.3], -- [AC_DEFINE(DBUS, 1, [Build with dbus support?]) with_dbus=yes], -- [with_dbus=no]) -+ [AC_DEFINE(DBUS, 1, [Build with dbus support?])], -+ [AC_MSG_ERROR([dbus not present (--without-dbus to disable)])]) - AC_SUBST(DBUS_CFLAGS) - AC_SUBST(DBUS_LIBS) - ]) --- -2.11.0 - |