Skip to contentSkip to conversation

systemd: move pam files to own package

PATCH Superseded [email protected] 3 participants 11 messages Sep 25, 2017 – Oct 10, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 systemd: move pam files to own package

From: Andy Kling <[email protected]>

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

---
 meta/recipes-core/systemd/systemd_234.bb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
meta/recipes-core/systemd/systemd_234.bb +12 -3
index 2695e15ac6..fa16807406 100644
@@ -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 \
Signature · 1 line
2.14.1
#1 lore raw
Quoted 5 lines · On 25 September 2017 at 09:59, <[email protected]> wrote:

From: Andy Kling <[email protected]>

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

#2 lore raw

PATCH v2 1/1 systemd: move pam files to own package

In reply to [email protected]

From: Andy Kling <[email protected]>

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

---
 meta/recipes-core/systemd/systemd_234.bb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
meta/recipes-core/systemd/systemd_234.bb +12 -3
index 881896bfb5..137070e48b 100644
@@ -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 \
Signature · 1 line
2.14.1
#3 lore raw
Quoted 11 lines · On 26 September 2017 at 18:17, <[email protected]> wrote:

From: Andy Kling <[email protected]>

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

#4 lore raw

PATCH v3 1/1 systemd: add runtime dependencies to pam plugins.

In reply to [email protected]

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.

v2: improve commit message
v3: drop systemd-pam

---
 meta/recipes-core/systemd/systemd_234.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
meta/recipes-core/systemd/systemd_234.bb +7 -2
index 881896bfb5..acc4c4623b 100644
@@ -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 \
Signature · 1 line
2.14.1
#5 lore raw

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

Quoted 14 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of [email protected]
Sent: den 27 september 2017 11:40
To: [email protected]
Subject: [OE-core] [PATCH v3] systemd: add runtime dependencies to pam plugins.

From: Andy Kling <[email protected]>

This ensures pam plugins required by /etc/pam.d/systemd-user to open a user session are installed.

Quoted 8 lines

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.

Quoted 2 lines

---

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

Quoted 40 lines
 meta/recipes-core/systemd/systemd_234.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
meta/recipes-core/systemd/systemd_234.bb +7 -3
index 881896bfb5..acc4c4623b 100644
@@ -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

Quoted 1 line

--

//Peter

#6 lore raw

PATCH v4 1/1 systemd: add runtime dependencies to pam plugins.

In reply to [email protected]

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.

---
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(-)
meta/recipes-core/systemd/systemd_234.bb +7 -2
index 881896bfb5..acc4c4623b 100644
@@ -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 \
Signature · 1 line
2.14.2
#7 lore raw

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

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.

Ross

Quoted 69 lines · 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.

---
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(-)
meta/recipes-core/systemd/systemd_234.bb +0 -0
index 881896bfb5..acc4c4623b 100644
@@ -31,6 +31,12 @@ SRC_URI += " \
            "
 SRC_URI_append_qemuall = " file://0001-core-device.c-

Change-the-default-device-timeout-to-2.patch"

meta/recipes-core/systemd/systemd_234.bb +6 -0
+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)} \

meta/recipes-core/systemd/systemd_234.bb +0 -0
@@ -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"

meta/recipes-core/systemd/systemd_234.bb +1 -1
-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

meta/recipes-core/systemd/systemd_234.bb +0 -2
@@ -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

author
#8 lore raw

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

2017-09-29 18:31 GMT+02:00 Burton, Ross <[email protected]>:

Quoted 81 lines

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.

Ross

Quoted 65 lines · 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.

---
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(-)
meta/recipes-core/systemd/systemd_234.bb +0 -0
index 881896bfb5..acc4c4623b 100644
@@ -31,6 +31,12 @@ SRC_URI += " \
            "
 SRC_URI_append_qemuall = "

file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"

meta/recipes-core/systemd/systemd_234.bb +6 -0
+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)} \

meta/recipes-core/systemd/systemd_234.bb +0 -0
@@ -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"

meta/recipes-core/systemd/systemd_234.bb +1 -1
-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

meta/recipes-core/systemd/systemd_234.bb +0 -2
@@ -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

Quoted 7 lines
Quoted 5 lines

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

author
#9 lore raw

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

2017-10-02 20:06 GMT+02:00 Andy <[email protected]>:

Quoted 97 lines

2017-09-29 18:31 GMT+02:00 Burton, Ross <[email protected]>:

Quoted 81 lines

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.

Ross

Quoted 65 lines · 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.

---
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(-)
meta/recipes-core/systemd/systemd_234.bb +0 -0
index 881896bfb5..acc4c4623b 100644
@@ -31,6 +31,12 @@ SRC_URI += " \
            "
 SRC_URI_append_qemuall = "

file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"

meta/recipes-core/systemd/systemd_234.bb +6 -0
+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)} \

meta/recipes-core/systemd/systemd_234.bb +0 -0
@@ -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"

meta/recipes-core/systemd/systemd_234.bb +1 -1
-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

meta/recipes-core/systemd/systemd_234.bb +0 -2
@@ -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

Quoted 7 lines
Quoted 5 lines

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

Quoted 8 lines

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

#10 lore raw

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

Quoted 3 lines · Andy

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