2017-10-02 20:06 GMT+02:00 Andy <[email protected]>: > 2017-09-29 18:31 GMT+02:00 Burton, Ross <[email protected]>: >> I wish I knew why git was ignoring the commit message entirely when >> applying... It's ignoring everything apart from the SOB: >> >> $ git show >> commit 079754f2681ded614c5ee90e61f4ddbd8407998a >> Author: [email protected] <[email protected]> >> Date: Thu Sep 28 18:35:21 2017 +0200 >> >> systemd: add runtime dependencies to pam plugins. >> >> Signed-off-by: Andy Kling <[email protected]> >> Signed-off-by: Ross Burton <[email protected]> >> >> Ross >> >> On 28 September 2017 at 17:35, <[email protected]> wrote: >>> >>> From: Andy Kling <[email protected]> >>> >>> This ensures pam plugins required by /etc/pam.d/systemd-user >>> to open a user session are installed. >>> >>> systemd[1]: Starting User Manager for UID 994... >>> systemd[6493]: PAM unable to dlopen(/lib/security/pam_keyinit.so) >>> >>> Drop package systemd-pam to prevent confusion. >>> It is unused for a long time now. >>> >>> Signed-off-by: Andy Kling <[email protected]> >>> --- >>> v2: improve commit message >>> v3: drop systemd-pam >>> v4: move version info to annotation >>> meta/recipes-core/systemd/systemd_234.bb | 9 +++++++-- >>> 1 file changed, 7 insertions(+), 2 deletions(-) >>> >>> diff --git a/meta/recipes-core/systemd/systemd_234.bb >>> b/meta/recipes-core/systemd/systemd_234.bb >>> index 881896bfb5..acc4c4623b 100644 >>> --- a/meta/recipes-core/systemd/systemd_234.bb >>> +++ b/meta/recipes-core/systemd/systemd_234.bb >>> @@ -31,6 +31,12 @@ SRC_URI += " \ >>> " >>> SRC_URI_append_qemuall = " >>> file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" >>> >>> +PAM_PLUGINS = " \ >>> + pam-plugin-unix \ >>> + pam-plugin-loginuid \ >>> + pam-plugin-keyinit \ >>> +" >>> + >>> PACKAGECONFIG ??= "xz \ >>> ${@bb.utils.filter('DISTRO_FEATURES', 'efi pam selinux >>> ldconfig usrmerge', d)} \ >>> ${@bb.utils.contains('DISTRO_FEATURES', 'x11', >>> 'xkbcommon', '', d)} \ >>> @@ -100,7 +106,7 @@ PACKAGECONFIG[importd] = >>> "--enable-importd,--disable-importd" >>> PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" >>> PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" >>> PACKAGECONFIG[manpages] = >>> "--enable-manpages,--disable-manpages,libxslt-native xmlto-native >>> docbook-xml-dtd4-native docbook-xsl-stylesheets-native" >>> -PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam" >>> +PACKAGECONFIG[pam] = "--enable-pam,--disable-pam,libpam,${PAM_PLUGINS}" >>> # Verify keymaps on locale change >>> PACKAGECONFIG[xkbcommon] = >>> "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" >>> # Update NAT firewall rules >>> @@ -295,7 +301,6 @@ PACKAGES =+ "\ >>> ${PN}-kernel-install \ >>> ${PN}-rpm-macros \ >>> ${PN}-binfmt \ >>> - ${PN}-pam \ >>> ${PN}-zsh-completion \ >>> ${PN}-xorg-xinitrc \ >>> ${PN}-container \ >>> -- >>> 2.14.2 >>> >>> -- >>> _______________________________________________ >>> Openembedded-core mailing list >>> [email protected] >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> >> > > I'm still convinced this somehow must be my fault by editing the patch > with annotation. But no matter what I try, I can't get it to fail. > Downloading the original message from gmail, fetching the the patch > from patchwork. Using git mailinfo directly. Throwing different > options at it, looking at the mail content in hex, and so on. Even the > ugly cr/lf downloaded from gmail gets processed just fine. > > I'm a little bit lost here. I appreciate any idea what could went > wrong. I'm also happy with any workaround you may use to make it work > at you side. Maybe I should just upload the patch again without > touching the file? > > many thanks in advance > > Andy
jfyi this was change in git [1] and landed in v.2.13.0. I won't indent the body in the future to prevent this. thx for fixing it up [1] https://github.com/git/git/commit/fd1062e52e1a7ed3be443a320708ed849958c1bf -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
