[OE-core] [PATCH] meta/recipes-core/base-passwd/base-passwd/noshadow.patch: Split it into two parts

[Laszlo Papp]

Saul, would it be possible that you leave a short message on the
mailing list in the corresponding thread if a change is merged to
avoid such things in the future?

On Wed, Feb 5, 2014 at 3:49 PM, Saul Wold <sgw at linux.intel.com> wrote:
> On 02/05/2014 03:13 AM, Laszlo Papp wrote:
>>
>> The current change contains two different logics resulting that users like
>> me
>> may need to partially override the behavior of it. It would be easier for
>> end
>> users to keep one change while dropping the other if needed, like in our
>> case.
>>
>
> I beleive that your first version of this was merged, is this different that
> the one you send on 1/30?
>
> It seems that the line count in this patch is different than the first,
> please rebase against master and update this patch please.
>
> Thanks
>
> Sau!
>
>
>> Signed-off-by: Laszlo Papp <lpapp at kde.org>
>> ---
>>   meta/recipes-core/base-passwd/base-passwd/nobash.patch | 10 +---------
>>   .../base-passwd/base-passwd/noshadow.patch             | 18
>> ++++++++++++++++++
>>   meta/recipes-core/base-passwd/base-passwd_3.5.29.bb    |  1 +
>>   3 files changed, 20 insertions(+), 9 deletions(-)
>>   create mode 100644
>> meta/recipes-core/base-passwd/base-passwd/noshadow.patch
>>
>> diff --git a/meta/recipes-core/base-passwd/base-passwd/nobash.patch
>> b/meta/recipes-core/base-passwd/base-passwd/nobash.patch
>> index 6371576..eed87db 100644
>> --- a/meta/recipes-core/base-passwd/base-passwd/nobash.patch
>> +++ b/meta/recipes-core/base-passwd/base-passwd/nobash.patch
>> @@ -1,14 +1,6 @@
>>   use /bin/sh instead of /bin/bash, since the latter may not be included
>> in
>>   some images such as minimal
>>
>> -comment added by Kevin Tian <kevin.tian at intel.com>, 2010-07-06
>> -
>> -remove "*" for root since we don't have a /etc/shadow so far.
>> -
>> -by Kevin Tian <kevin.tian at intel.com>, 2010-07-06
>> -
>> -Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
>> -
>>   Upstream-Status: Invalid [configuration]
>>
>>   Signed-off-by: Scott Garman <scott.a.garman at intel.com>
>> @@ -17,7 +9,7 @@ Signed-off-by: Scott Garman <scott.a.garman at intel.com>
>>   +++ base-passwd/passwd.master
>>   @@ -1,4 +1,4 @@
>>   -root:*:0:0:root:/root:/bin/bash
>> -+root::0:0:root:/root:/bin/sh
>> ++root:*:0:0:root:/root:/bin/sh
>>    daemon:*:1:1:daemon:/usr/sbin:/bin/sh
>>    bin:*:2:2:bin:/bin:/bin/sh
>>    sys:*:3:3:sys:/dev:/bin/sh
>> diff --git a/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
>> b/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
>> new file mode 100644
>> index 0000000..14e3959
>> --- /dev/null
>> +++ b/meta/recipes-core/base-passwd/base-passwd/noshadow.patch
>> @@ -0,0 +1,18 @@
>> +comment added by Kevin Tian <kevin.tian at intel.com>, 2010-07-06
>> +
>> +remove "*" for root since we don't have a /etc/shadow so far.
>> +
>> +by Kevin Tian <kevin.tian at intel.com>, 2010-07-06
>> +
>> +Upstream-Status: Invalid [configuration]
>> +
>> +Signed-off-by: Scott Garman <scott.a.garman at intel.com>
>> +
>> +--- base-passwd/passwd.master~nobash
>> ++++ base-passwd/passwd.master
>> +@@ -1,4 +1,4 @@
>> +-root:*:0:0:root:/root:/bin/sh
>> ++root::0:0:root:/root:/bin/sh
>> + daemon:*:1:1:daemon:/usr/sbin:/bin/sh
>> + bin:*:2:2:bin:/bin:/bin/sh
>> + sys:*:3:3:sys:/dev:/bin/sh
>> diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
>> b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
>> index 082037a..5b31fce 100644
>> --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
>> +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
>> @@ -9,6 +9,7 @@ DEPENDS = "docbook-utils-native linuxdoc-tools-native"
>>   SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz
>> \
>>              file://add_shutdown.patch \
>>              file://nobash.patch \
>> +           file://noshadow.patch \
>>              file://input.patch \
>>              file://disable-docs.patch \
>>             "
>>
>