We need some way to adjust it or check it automatically since it will be not be the last time when the copyright year willl be upgraded
On Thu, Feb 18, 2021 at 7:34 PM Zheng, Ruoqin <zhengrq.f...@cn.fujitsu.com> wrote: > Hi, > > > > The original patch named > 0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch modified the > copyright of arm from “2016-2021” to “2016-2020”. > > ----------------------------------------- > > diff --git a/sysdeps/aarch64/bits/wordsize.h b/sysdeps/arm/bits/wordsize.h > > similarity index 80% > > copy from sysdeps/aarch64/bits/wordsize.h > > copy to sysdeps/arm/bits/wordsize.h > > index 91da566b74..34fcdef1f1 100644 > > --- a/sysdeps/aarch64/bits/wordsize.h > > +++ b/sysdeps/arm/bits/wordsize.h > > @@ -1,6 +1,6 @@ > > /* Determine the wordsize from the preprocessor defines. > > > > - Copyright (C) 2016-2021 Free Software Foundation, Inc. > > + Copyright (C) 2016-2020 Free Software Foundation, Inc. > > This file is part of the GNU C Library. > > ----------------------------------------- > > > > In fact, the content of bits/wordsize.h of arm is the same as aarch64. And > this difference of copyright causes an error when enable multilib, because > this file is not the same of lib32-libc6-dev and libc6-dev. > > ----------------------------------------- > > $ diff -Naur > tmp/work/aarch64-ubinux-linux/glibc/2.33-r0/image/usr/include/bits/wordsize.h > tmp/work/armv7ahf-neon-ubinuxmllib32-linux-gnueabi/lib32-glibc/2.33-r0/image/usr/include/bits/wordsize.h > > --- > tmp/work/aarch64-ubinux-linux/glibc/2.33-r0/image/usr/include/bits/wordsize.h > 2021-02-18 13:12:58.642576190 +0900 > > +++ > tmp/work/armv7ahf-neon-ubinuxmllib32-linux-gnueabi/lib32-glibc/2.33-r0/image/usr/include/bits/wordsize.h > 2021-02-19 12:16:11.129806703 +0900 > > @@ -1,6 +1,6 @@ > > /* Determine the wordsize from the preprocessor defines. > > > > - Copyright (C) 2016-2021 Free Software Foundation, Inc. > > + Copyright (C) 2016-2020 Free Software Foundation, Inc. > > This file is part of the GNU C Library. > > > > The GNU C Library is free software; you can redistribute it and/or > > ----------------------------------------- > > > > I don’t know why this patch modified copyright of arm. Shouldn’t copyright > of this file of arm and aarch64 be the same? > > So, I modified copyright aim to make arm the same as aarch64. Or should I > modified the copyright of aarch64 to “2016-2020” ? > > > > Best regards > > Zheng > > > > > > > > *From:* Khem Raj <raj.k...@gmail.com> > *Sent:* Friday, February 19, 2021 10:37 AM > *To:* Zheng, Ruoqin/郑 若钦 <zhengrq.f...@cn.fujitsu.com> > *Cc:* openembedded-core@lists.openembedded.org > *Subject:* Re: [OE-core] [PATCH] wordsize.h: This file should be the same > under arm and aarch64, othersise the following error happens: > > > > I don’t understand this change why are copyright years different can you > explain > > > > On Thu, Feb 18, 2021 at 5:37 PM zhengruoqin <zhengrq.f...@cn.fujitsu.com> > wrote: > > "file /usr/include/bits/wordsize.h conflicts between attempted installs of > lib32-libc6-dev-2.33-r0.armv7ahf_neon and libc6-dev-2.33-r0.aarch64" > > Signed-off-by: Zheng Ruoqin <zhengrq.f...@cn.fujitsu.com> > --- > ...29-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git > a/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch > b/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch > index 791029c4c0..11a77cdf93 100644 > --- > a/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch > +++ > b/meta/recipes-core/glibc/glibc/0029-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch > @@ -50,7 +50,7 @@ index 91da566b74..34fcdef1f1 100644 > /* Determine the wordsize from the preprocessor defines. > > - Copyright (C) 2016-2021 Free Software Foundation, Inc. > -+ Copyright (C) 2016-2020 Free Software Foundation, Inc. > ++ Copyright (C) 2016-2021 Free Software Foundation, Inc. > This file is part of the GNU C Library. > > The GNU C Library is free software; you can redistribute it and/or > -- > 2.25.1 > > > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148339): https://lists.openembedded.org/g/openembedded-core/message/148339 Mute This Topic: https://lists.openembedded.org/mt/80746333/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
