[13/18] Disable crypt support in glibc

Submitted by Khem Raj on Aug. 6, 2018, 10:57 p.m. | Patch ID: 153444

Details

Message ID e9bcf3a4c54ac1cd9721abc0d9be5324d4004845.1533595822.git.raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj Aug. 6, 2018, 10:57 p.m.
We have independent crypt implementation coming from libxcrypt

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/glibc/glibc_2.28.bb | 1 +
 1 file changed, 1 insertion(+)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-core/glibc/glibc_2.28.bb b/meta/recipes-core/glibc/glibc_2.28.bb
index 086daed04c..906e6c2b62 100644
--- a/meta/recipes-core/glibc/glibc_2.28.bb
+++ b/meta/recipes-core/glibc/glibc_2.28.bb
@@ -83,6 +83,7 @@  EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
                 --enable-bind-now \
                 --enable-stack-protector=strong \
                 --enable-stackguard-randomization \
+                --disable-crypt \
                 ${GLIBCPIE} \
                 ${GLIBC_EXTRA_OECONF}"
 

Comments

Martin Jansa Aug. 8, 2018, 3:48 p.m.
Should this be squashed with "glibc: Drop packaging libcrypt from 2.28+
onwards" ?

I've accidentally cherry-picked the packaging change from patchwork and
missed this one which results in:

ERROR: glibc-2.28-r0 do_package: QA Issue: glibc: Files/directories were
installed but not shipped in any package:
  /lib/libcrypt.so.1
  /lib/libcrypt-2.28.so
Please set FILES such that these items are packaged. Alternatively if they
are unneeded, avoid installing them or delete them within do_install.
glibc: 2 installed and not shipped files. [installed-vs-shipped]


On Tue, Aug 7, 2018 at 12:59 AM Khem Raj <raj.khem@gmail.com> wrote:

> We have independent crypt implementation coming from libxcrypt
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-core/glibc/glibc_2.28.bb | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta/recipes-core/glibc/glibc_2.28.bb
> b/meta/recipes-core/glibc/glibc_2.28.bb
> index 086daed04c..906e6c2b62 100644
> --- a/meta/recipes-core/glibc/glibc_2.28.bb
> +++ b/meta/recipes-core/glibc/glibc_2.28.bb
> @@ -83,6 +83,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
>                  --enable-bind-now \
>                  --enable-stack-protector=strong \
>                  --enable-stackguard-randomization \
> +                --disable-crypt \
>                  ${GLIBCPIE} \
>                  ${GLIBC_EXTRA_OECONF}"
>
> --
> 2.18.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
Khem Raj Aug. 8, 2018, 4:06 p.m.
I deliberately kept it separate for readability from glibc upgrade,
but squashing this with packaging changes alone is ok. I will leave
that to Ross
On Wed, Aug 8, 2018 at 8:48 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> Should this be squashed with "glibc: Drop packaging libcrypt from 2.28+ onwards" ?
>
> I've accidentally cherry-picked the packaging change from patchwork and missed this one which results in:
>
> ERROR: glibc-2.28-r0 do_package: QA Issue: glibc: Files/directories were installed but not shipped in any package:
>   /lib/libcrypt.so.1
>   /lib/libcrypt-2.28.so
> Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
> glibc: 2 installed and not shipped files. [installed-vs-shipped]
>
>
> On Tue, Aug 7, 2018 at 12:59 AM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> We have independent crypt implementation coming from libxcrypt
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  meta/recipes-core/glibc/glibc_2.28.bb | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/meta/recipes-core/glibc/glibc_2.28.bb b/meta/recipes-core/glibc/glibc_2.28.bb
>> index 086daed04c..906e6c2b62 100644
>> --- a/meta/recipes-core/glibc/glibc_2.28.bb
>> +++ b/meta/recipes-core/glibc/glibc_2.28.bb
>> @@ -83,6 +83,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
>>                  --enable-bind-now \
>>                  --enable-stack-protector=strong \
>>                  --enable-stackguard-randomization \
>> +                --disable-crypt \
>>                  ${GLIBCPIE} \
>>                  ${GLIBC_EXTRA_OECONF}"
>>
>> --
>> 2.18.0
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton Aug. 8, 2018, 4:09 p.m.
Yeah squashing makes sense, as the intermediate commit is broken.

Ross

On 8 August 2018 at 17:06, Khem Raj <raj.khem@gmail.com> wrote:
> I deliberately kept it separate for readability from glibc upgrade,
> but squashing this with packaging changes alone is ok. I will leave
> that to Ross
> On Wed, Aug 8, 2018 at 8:48 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>>
>> Should this be squashed with "glibc: Drop packaging libcrypt from 2.28+ onwards" ?
>>
>> I've accidentally cherry-picked the packaging change from patchwork and missed this one which results in:
>>
>> ERROR: glibc-2.28-r0 do_package: QA Issue: glibc: Files/directories were installed but not shipped in any package:
>>   /lib/libcrypt.so.1
>>   /lib/libcrypt-2.28.so
>> Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
>> glibc: 2 installed and not shipped files. [installed-vs-shipped]
>>
>>
>> On Tue, Aug 7, 2018 at 12:59 AM Khem Raj <raj.khem@gmail.com> wrote:
>>>
>>> We have independent crypt implementation coming from libxcrypt
>>>
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>> ---
>>>  meta/recipes-core/glibc/glibc_2.28.bb | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/meta/recipes-core/glibc/glibc_2.28.bb b/meta/recipes-core/glibc/glibc_2.28.bb
>>> index 086daed04c..906e6c2b62 100644
>>> --- a/meta/recipes-core/glibc/glibc_2.28.bb
>>> +++ b/meta/recipes-core/glibc/glibc_2.28.bb
>>> @@ -83,6 +83,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
>>>                  --enable-bind-now \
>>>                  --enable-stack-protector=strong \
>>>                  --enable-stackguard-randomization \
>>> +                --disable-crypt \
>>>                  ${GLIBCPIE} \
>>>                  ${GLIBC_EXTRA_OECONF}"
>>>
>>> --
>>> 2.18.0
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj Aug. 8, 2018, 4:54 p.m.
OK I have pushed the changes to pull branch
On Wed, Aug 8, 2018 at 9:10 AM Burton, Ross <ross.burton@intel.com> wrote:
>
> Yeah squashing makes sense, as the intermediate commit is broken.
>
> Ross
>
> On 8 August 2018 at 17:06, Khem Raj <raj.khem@gmail.com> wrote:
> > I deliberately kept it separate for readability from glibc upgrade,
> > but squashing this with packaging changes alone is ok. I will leave
> > that to Ross
> > On Wed, Aug 8, 2018 at 8:48 AM Martin Jansa <martin.jansa@gmail.com> wrote:
> >>
> >> Should this be squashed with "glibc: Drop packaging libcrypt from 2.28+ onwards" ?
> >>
> >> I've accidentally cherry-picked the packaging change from patchwork and missed this one which results in:
> >>
> >> ERROR: glibc-2.28-r0 do_package: QA Issue: glibc: Files/directories were installed but not shipped in any package:
> >>   /lib/libcrypt.so.1
> >>   /lib/libcrypt-2.28.so
> >> Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
> >> glibc: 2 installed and not shipped files. [installed-vs-shipped]
> >>
> >>
> >> On Tue, Aug 7, 2018 at 12:59 AM Khem Raj <raj.khem@gmail.com> wrote:
> >>>
> >>> We have independent crypt implementation coming from libxcrypt
> >>>
> >>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >>> ---
> >>>  meta/recipes-core/glibc/glibc_2.28.bb | 1 +
> >>>  1 file changed, 1 insertion(+)
> >>>
> >>> diff --git a/meta/recipes-core/glibc/glibc_2.28.bb b/meta/recipes-core/glibc/glibc_2.28.bb
> >>> index 086daed04c..906e6c2b62 100644
> >>> --- a/meta/recipes-core/glibc/glibc_2.28.bb
> >>> +++ b/meta/recipes-core/glibc/glibc_2.28.bb
> >>> @@ -83,6 +83,7 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
> >>>                  --enable-bind-now \
> >>>                  --enable-stack-protector=strong \
> >>>                  --enable-stackguard-randomization \
> >>> +                --disable-crypt \
> >>>                  ${GLIBCPIE} \
> >>>                  ${GLIBC_EXTRA_OECONF}"
> >>>
> >>> --
> >>> 2.18.0
> >>>
> >>> --
> >>> _______________________________________________
> >>> Openembedded-core mailing list
> >>> Openembedded-core@lists.openembedded.org
> >>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core