> On Dec 17, 2015, at 12:57 PM, Ross Burton <[email protected]> wrote: >
thanks for fixing it. I was about to send a patch > Signed-off-by: Ross Burton <[email protected]> > --- > .../0016-Revert-udev-remove-userspace-firmware-loading-suppor.patch | 5 +---- > 1 file changed, 1 insertion(+), 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 03ab0d4..6e5a8fb 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} > -- > 2.6.4 > > -- > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-core
signature.asc
Description: Message signed with OpenPGP using GPGMail
-- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
