diff options
| author |   Ross Burton <ross.burton@intel.com> | 2015-12-17 20:57:01 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-22 16:08:43 +0000 |
| commit | 1e49b502e730d51420682aa9b57628ae113fe0b2 (patch) | |
| tree | 0efec506007dd1aade8ce3827580c2a97f632011 /meta/recipes-core | |
| parent | d1ff1fef987457eb1a5ffe42dbabc7808fa7d598 (diff) | |
| download | openembedded-core-contrib-1e49b502e730d51420682aa9b57628ae113fe0b2.tar.gz | |
systemd: remove merge conflicts accidently left in
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch | 5 |
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 have_manpages=no AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages])) AS_IF([test "x$enable_manpages" != xno], [ -@@ -1616,6 +1635,12 @@ AC_MSG_RESULT([ +@@ -1616,6 +1635,9 @@ AC_MSG_RESULT([ SysV init scripts: ${SYSTEM_SYSVINIT_PATH} SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} Build Python: ${PYTHON} -+<<<<<<< HEAD -+======= + Installation Python: ${PYTHON_BINARY} + sphinx binary: ${SPHINX_BUILD} + firmware path: ${FIRMWARE_PATH} -+>>>>>>> parent of be2ea72... udev: remove userspace firmware loading support PAM modules dir: ${with_pamlibdir} PAM configuration dir: ${with_pamconfdir} D-Bus policy dir: ${with_dbuspolicydir} |