From: "Changqing Li" <changqing.li@windriver.com>
To: Richard Purdie <richard.purdie@linuxfoundation.org>,
openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH] libpam: support usrmerge
Date: Thu, 7 Jan 2021 08:33:13 +0800 [thread overview]
Message-ID: <bc3c12ce-bf78-be7b-6692-d310e56b660b@windriver.com> (raw)
In-Reply-To: <5b9e857b70fe4e4c346d1f28789bd11a9e9d2beb.camel@linuxfoundation.org>
On 1/6/21 9:58 PM, Richard Purdie wrote:
> On Wed, 2021-01-06 at 16:49 +0800, Changqing Li wrote:
>> Signed-off-by: Changqing Li <changqing.li@windriver.com>
>> ---
>> .../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
>>
>> diff --git a/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch b/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch
>> new file mode 100644
>> index 0000000000..5c6bc92705
>> --- /dev/null
>> +++ b/meta/recipes-extended/pam/libpam/0001-Makefile.am-support-usrmage.patch
>> @@ -0,0 +1,28 @@
>> +From c09e012590c1ec2d3b622b64f1bfc10a2286c9ea Mon Sep 17 00:00:00 2001
>> +From: Changqing Li <changqing.li@windriver.com>
>> +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 <changqing.li@windriver.com>
>> +---
>> + 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
>> +
>> diff --git a/meta/recipes-extended/pam/libpam_1.5.1.bb b/meta/recipes-extended/pam/libpam_1.5.1.bb
>> index 486c9d8aad..8c008a9701 100644
>> --- a/meta/recipes-extended/pam/libpam_1.5.1.bb
>> +++ b/meta/recipes-extended/pam/libpam_1.5.1.bb
>> @@ -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"
> 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.
>
> Cheers,
>
> Richard
>
prev parent reply other threads:[~2021-01-07 0:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 8:49 [PATCH] libpam: support usrmerge Changqing Li
2021-01-06 13:58 ` [OE-core] " Richard Purdie
2021-01-07 0:33 ` Changqing Li [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bc3c12ce-bf78-be7b-6692-d310e56b660b@windriver.com \
--to=changqing.li@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=richard.purdie@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.