libpam: support usrmerge
PATCH 1/1 libpam: support usrmerge
--- .../0001-Makefile.am-support-usrmage.patch | 28 +++++++++++++++++++ meta/recipes-extended/pam/libpam_1.5.1.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch
meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch new file +28 -0
@@ -0,0 +1,28 @@ +From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Wed, 6 Jan 2021 12:08:20 +0800 +Subject: [PATCH] Makefile.am: support usrmage + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li <[email protected]> +--- + modules/pam_namespace/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am +index ddd5fc0..a1f1bec 100644 +--- a/modules/pam_namespace/Makefile.am ++++ b/modules/pam_namespace/Makefile.am +@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) + securelibdir = $(SECUREDIR) + secureconfdir = $(SCONFIGDIR) + namespaceddir = $(SCONFIGDIR)/namespace.d +-servicedir = /lib/systemd/system ++servicedir = $(systemd_system_unitdir) + + AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ + -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) +-- +2.17.1 +
meta/recipes-extended/pam/libpam_1.5.1.bb +1 -0
@@ -22,6 +22,7 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://pam.d/other \ file://libpam-xtests.patch \ file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ + file://0001-Makefile.am-support-usrmage.patch \ " SRC_URI[sha256sum] = "201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc"
Signature · 1 line
2.17.1
Quoted 55 lines · Changqing Li
Signed-off-by Changqing Li <[email protected]>---
.../0001-Makefile.am-support-usrmage.patch | 28 +++++++++++++++++++
meta/recipes-extended/pam/libpam_1.5.1.bb | 1 +2 files changed, 29 insertions(+)create mode 100644
meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patchmeta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch new file +28
-0@@ -0,0 +1,28 @@ +From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Wed, 6 Jan 2021 12:08:20 +0800 +Subject: [PATCH] Makefile.am: support usrmage + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li <[email protected]> +--- + modules/pam_namespace/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am +index ddd5fc0..a1f1bec 100644 +--- a/modules/pam_namespace/Makefile.am ++++ b/modules/pam_namespace/Makefile.am +@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) + securelibdir = $(SECUREDIR) + secureconfdir = $(SCONFIGDIR) + namespaceddir = $(SCONFIGDIR)/namespace.d +-servicedir = /lib/systemd/system ++servicedir = $(systemd_system_unitdir) + + AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ + -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) +-- +2.17.1 +meta/recipes-extended/pam/libpam_1.5.1.bb +1
-0@@ -22,6 +22,7 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://pam.d/other \ file://libpam-xtests.patch \ file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ + file://0001-Makefile.am-support-usrmage.patch \"
Quoted 1 line
SRC_URI[sha256sum] = "
201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc"
I think we meed to create a patch which stands some better chance of making it upstream. Can we add something to allow servicedir to be set through configure? That patch might then be acceptable upstream?
Cheers,
Richard
Quoted 56 lines · Richard Purdie
Quoted 55 lines · Changqing Li
Signed-off-by Changqing Li <[email protected]>--- .../0001-Makefile.am-support-usrmage.patch | 28 +++++++++++++++++++ meta/recipes-extended/pam/libpam_1.5.1.bb | 1 + 2 files changed, 29 insertions(+)create mode 100644
meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patchmeta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch new file +28
-0@@ -0,0 +1,28 @@ +From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001 +From: Changqing Li <[email protected]> +Date: Wed, 6 Jan 2021 12:08:20 +0800 +Subject: [PATCH] Makefile.am: support usrmage + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Changqing Li <[email protected]> +--- + modules/pam_namespace/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/pam_namespace/Makefile.am b/modules/pam_namespace/Makefile.am +index ddd5fc0..a1f1bec 100644 +--- a/modules/pam_namespace/Makefile.am ++++ b/modules/pam_namespace/Makefile.am +@@ -18,7 +18,7 @@ TESTS = $(dist_check_SCRIPTS) + securelibdir = $(SECUREDIR) + secureconfdir = $(SCONFIGDIR) + namespaceddir = $(SCONFIGDIR)/namespace.d +-servicedir = /lib/systemd/system ++servicedir = $(systemd_system_unitdir) + + AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ + -DSECURECONF_DIR=\"$(SCONFIGDIR)/\" $(WARN_CFLAGS) +-- +2.17.1 +meta/recipes-extended/pam/libpam_1.5.1.bb +1
-0@@ -22,6 +22,7 @@ SRC_URI = "https://github.com/linux-pam/linux-pam/releases/download/v${PV}/Linux file://pam.d/other \ file://libpam-xtests.patch \ file://0001-modules-pam_namespace-Makefile.am-correctly-install-.patch \ + file://0001-Makefile.am-support-usrmage.patch \ "
Quoted 4 lines
Quoted 1 line
SRC_URI[sha256sum] = "
201d40730b1135b1b3cdea09f2c28ac634d73181ccd0172ceddee3649c5792fc"I think we meed to create a patch which stands some better chance of making it upstream. Can we add something to allow servicedir to be set through configure? That patch might then be acceptable upstream?
Thanks for the comments, I will try to upstream it with more proper change for upstream.
Quoted 5 lines
Cheers,
Richard