summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-12-17 20:57:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-22 16:08:51 +0000
commitd2b770caade430f584c83806924b962982ab7ddc (patch)
tree772081818f5478a713f7f9a25191fddc028a023c /meta/recipes-core
parentca69643faa949664e3d5c3c182cbe2ba1dc55026 (diff)
downloadpoky-d2b770caade430f584c83806924b962982ab7ddc.tar.gz
systemd: remove merge conflicts accidently left in
(From OE-Core rev: 1e49b502e730d51420682aa9b57628ae113fe0b2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch b/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
index 03ab0d459e..6e5a8fb813 100644
--- a/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
+++ b/meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
@@ -110,16 +110,13 @@ index a3e639d..00736f5 100644
110 have_manpages=no 110 have_manpages=no
111 AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages])) 111 AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages]))
112 AS_IF([test "x$enable_manpages" != xno], [ 112 AS_IF([test "x$enable_manpages" != xno], [
113@@ -1616,6 +1635,12 @@ AC_MSG_RESULT([ 113@@ -1616,6 +1635,9 @@ AC_MSG_RESULT([
114 SysV init scripts: ${SYSTEM_SYSVINIT_PATH} 114 SysV init scripts: ${SYSTEM_SYSVINIT_PATH}
115 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} 115 SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH}
116 Build Python: ${PYTHON} 116 Build Python: ${PYTHON}
117+<<<<<<< HEAD
118+=======
119+ Installation Python: ${PYTHON_BINARY} 117+ Installation Python: ${PYTHON_BINARY}
120+ sphinx binary: ${SPHINX_BUILD} 118+ sphinx binary: ${SPHINX_BUILD}
121+ firmware path: ${FIRMWARE_PATH} 119+ firmware path: ${FIRMWARE_PATH}
122+>>>>>>> parent of be2ea72... udev: remove userspace firmware loading support
123 PAM modules dir: ${with_pamlibdir} 120 PAM modules dir: ${with_pamlibdir}
124 PAM configuration dir: ${with_pamconfdir} 121 PAM configuration dir: ${with_pamconfdir}
125 D-Bus policy dir: ${with_dbuspolicydir} 122 D-Bus policy dir: ${with_dbuspolicydir}