[PATCH] systemd: move pam files to own package

[PATCH] systemd: move pam files to own package

[andreas.kling]

From: Andy Kling <andreas.kling@peiker-cee.de>

  move pam related files to already existing systemd-pam package.
  add runtime dependencies to pam plugins introduced by file systemd-user.

Signed-off-by: Andy Kling <andreas.kling@peiker-cee.de>
---
 meta/recipes-core/systemd/systemd_234.bb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index 2695e15ac6..fa16807406 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -100,7 +100,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,${PN}-pam"
 # Verify keymaps on locale change
 PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
 # Update NAT firewall rules
@@ -434,6 +434,17 @@ FILES_${PN}-extra-utils = "\
                         ${rootlibexecdir}/systemd/systemd-cgroups-agent \
 "
 
+RDEPENDS_${PN}-pam += " \
+                        pam-plugin-unix \
+                        pam-plugin-loginuid \
+                        pam-plugin-keyinit \
+"
+
+FILES_${PN}-pam = " \
+                    ${sysconfdir}/pam.d/ \
+                    ${base_libdir}/security/*.so \
+"
+
 CONFFILES_${PN} = "${sysconfdir}/machine-id \
                 ${sysconfdir}/systemd/coredump.conf \
                 ${sysconfdir}/systemd/journald.conf \
@@ -450,7 +461,6 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${sysconfdir}/dbus-1/ \
                 ${sysconfdir}/machine-id \
                 ${sysconfdir}/modules-load.d/ \
-                ${sysconfdir}/pam.d/ \
                 ${sysconfdir}/sysctl.d/ \
                 ${sysconfdir}/systemd/ \
                 ${sysconfdir}/tmpfiles.d/ \
@@ -459,7 +469,6 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${sysconfdir}/resolv-conf.systemd \
                 ${rootlibexecdir}/systemd/* \
                 ${systemd_unitdir}/* \
-                ${base_libdir}/security/*.so \
                 /cgroup \
                 ${bindir}/systemd* \
                 ${bindir}/busctl \
-- 
2.14.1

Re: [PATCH] systemd: move pam files to own package

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

On 25 September 2017 at 09:59, <andreas.kling@gmail.com> wrote:

> From: Andy Kling <andreas.kling@peiker-cee.de>
>
>   move pam related files to already existing systemd-pam package.
>   add runtime dependencies to pam plugins introduced by file systemd-user.
>

This describes what the patch is doing but doesn't explain why.

Ross

[-- Attachment #2: Type: text/html, Size: 747 bytes --]

[PATCH v2] systemd: move pam files to own package

[andreas.kling]

From: Andy Kling <andreas.kling@peiker-cee.de>

  move pam related files to already existing systemd-pam package.
  add runtime dependencies to required pam plugins.

  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)

  v2: improve commit message

Signed-off-by: Andy Kling <andreas.kling@peiker-cee.de>
---
 meta/recipes-core/systemd/systemd_234.bb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index 881896bfb5..137070e48b 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -100,7 +100,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,${PN}-pam"
 # Verify keymaps on locale change
 PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
 # Update NAT firewall rules
@@ -435,6 +435,17 @@ FILES_${PN}-extra-utils = "\
                         ${rootlibexecdir}/systemd/systemd-cgroups-agent \
 "
 
+RDEPENDS_${PN}-pam += " \
+                        pam-plugin-unix \
+                        pam-plugin-loginuid \
+                        pam-plugin-keyinit \
+"
+
+FILES_${PN}-pam = " \
+                    ${sysconfdir}/pam.d/ \
+                    ${base_libdir}/security/*.so \
+"
+
 CONFFILES_${PN} = "${sysconfdir}/machine-id \
                 ${sysconfdir}/systemd/coredump.conf \
                 ${sysconfdir}/systemd/journald.conf \
@@ -451,7 +462,6 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${sysconfdir}/dbus-1/ \
                 ${sysconfdir}/machine-id \
                 ${sysconfdir}/modules-load.d/ \
-                ${sysconfdir}/pam.d/ \
                 ${sysconfdir}/sysctl.d/ \
                 ${sysconfdir}/systemd/ \
                 ${sysconfdir}/tmpfiles.d/ \
@@ -460,7 +470,6 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${sysconfdir}/resolv-conf.systemd \
                 ${rootlibexecdir}/systemd/* \
                 ${systemd_unitdir}/* \
-                ${base_libdir}/security/*.so \
                 /cgroup \
                 ${bindir}/systemd* \
                 ${bindir}/busctl \
-- 
2.14.1

Re: [PATCH v2] systemd: move pam files to own package

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 673 bytes --]

On 26 September 2017 at 18:17, <andreas.kling@gmail.com> wrote:

> From: Andy Kling <andreas.kling@peiker-cee.de>
>
>   move pam related files to already existing systemd-pam package.
>   add runtime dependencies to required pam plugins.
>
>   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)
>

Considering systemd-pam appears to be unused currently, and if PAM is
enabled it is fairly fundamental, why not just add the missing dependencies
and not move files around?

Ross

[-- Attachment #2: Type: text/html, Size: 1114 bytes --]

[PATCH v3] systemd: add runtime dependencies to pam plugins.

[andreas.kling]

From: Andy Kling <andreas.kling@peiker-cee.de>

  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.

  v2: improve commit message
  v3: drop systemd-pam

Signed-off-by: Andy Kling <andreas.kling@peiker-cee.de>
---
 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.1

Re: [PATCH v3] systemd: add runtime dependencies to pam plugins.

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org
> [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of
> andreas.kling@gmail.com
> Sent: den 27 september 2017 11:40
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH v3] systemd: add runtime dependencies to pam
> plugins.
> 
> From: Andy Kling <andreas.kling@peiker-cee.de>
> 
>   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.
> 
>   v2: improve commit message
>   v3: drop systemd-pam

The patch version information does not belong in the commit message.
You should add this kind of information below the three dashes below.

> Signed-off-by: Andy Kling <andreas.kling@peiker-cee.de>
> ---

This is where information about the patch belongs, e.g., what has changed 
in the various versions of the patch.

>  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.1
> 
> --

//Peter

[PATCH v4] systemd: add runtime dependencies to pam plugins.

[andreas.kling]

From: Andy Kling <andreas.kling@peiker-cee.de>

  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 <andreas.kling@peiker-cee.de>
---
 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

Re: [PATCH v4] systemd: add runtime dependencies to pam plugins.

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 3095 bytes --]

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: andreas.kling@peiker-cee.de <andreas.kling@peiker-cee.de>
Date:   Thu Sep 28 18:35:21 2017 +0200

    systemd: add runtime dependencies to pam plugins.

    Signed-off-by: Andy Kling <andreas.kling@peiker-cee.de>
    Signed-off-by: Ross Burton <ross.burton@intel.com>

Ross

On 28 September 2017 at 17:35, <andreas.kling@gmail.com> wrote:

> From: Andy Kling <andreas.kling@peiker-cee.de>
>
>   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 <andreas.kling@peiker-cee.de>
> ---
>  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
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 4939 bytes --]

Re: [PATCH v4] systemd: add runtime dependencies to pam plugins.

[Andy]

2017-09-29 18:31 GMT+02:00 Burton, Ross <ross.burton@intel.com>:
> 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: andreas.kling@peiker-cee.de <andreas.kling@peiker-cee.de>
> Date:   Thu Sep 28 18:35:21 2017 +0200
>
>     systemd: add runtime dependencies to pam plugins.
>
>     Signed-off-by: Andy Kling <andreas.kling@peiker-cee.de>
>     Signed-off-by: Ross Burton <ross.burton@intel.com>
>
> Ross
>
> On 28 September 2017 at 17:35, <andreas.kling@gmail.com> wrote:
>>
>> From: Andy Kling <andreas.kling@peiker-cee.de>
>>
>>   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 <andreas.kling@peiker-cee.de>
>> ---
>>  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
>> Openembedded-core@lists.openembedded.org
>> 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

Re: [PATCH v4] systemd: add runtime dependencies to pam plugins.

[Andy]

2017-10-02 20:06 GMT+02:00 Andy <andreas.kling@gmail.com>:
> 2017-09-29 18:31 GMT+02:00 Burton, Ross <ross.burton@intel.com>:
>> 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: andreas.kling@peiker-cee.de <andreas.kling@peiker-cee.de>
>> Date:   Thu Sep 28 18:35:21 2017 +0200
>>
>>     systemd: add runtime dependencies to pam plugins.
>>
>>     Signed-off-by: Andy Kling <andreas.kling@peiker-cee.de>
>>     Signed-off-by: Ross Burton <ross.burton@intel.com>
>>
>> Ross
>>
>> On 28 September 2017 at 17:35, <andreas.kling@gmail.com> wrote:
>>>
>>> From: Andy Kling <andreas.kling@peiker-cee.de>
>>>
>>>   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 <andreas.kling@peiker-cee.de>
>>> ---
>>>  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
>>> Openembedded-core@lists.openembedded.org
>>> 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

Re: [PATCH v4] systemd: add runtime dependencies to pam plugins.

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 262 bytes --]

On 9 October 2017 at 20:00, Andy <andreas.kling@gmail.com> wrote:

> 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.
>

That's stupid, I often quote by indenting in commit messages... :/

Ross

[-- Attachment #2: Type: text/html, Size: 694 bytes --]