mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

systemd: remove merge conflicts accidently left in

Browse Source 
(From OE-Core rev: 1e49b502e730d51420682aa9b57628ae113fe0b2)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2015-12-17 20:57:01 +00:00
committed by Richard Purdie
parent ca69643faa
commit d2b770caad
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/systemd/systemd/0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch
+1 -4
View File
@@ -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}