* [OE-core] [PATCH] wordsize.h: This file should be the same under arm and aarch64, othersise the following error happens:
@ 2021-02-19 1:36 zhengruoqin
2021-02-19 2:36 ` Khem Raj
0 siblings, 1 reply; 4+ messages in thread
From: zhengruoqin @ 2021-02-19 1:36 UTC (permalink / raw
To: openembedded-core
"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.fnst@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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [OE-core] [PATCH] wordsize.h: This file should be the same under arm and aarch64, othersise the following error happens:
2021-02-19 1:36 [OE-core] [PATCH] wordsize.h: This file should be the same under arm and aarch64, othersise the following error happens: zhengruoqin
@ 2021-02-19 2:36 ` Khem Raj
2021-02-19 3:34 ` zhengruoqin
0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2021-02-19 2:36 UTC (permalink / raw
To: zhengruoqin; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 1455 bytes --]
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.fnst@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.fnst@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
>
>
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 1937 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [OE-core] [PATCH] wordsize.h: This file should be the same under arm and aarch64, othersise the following error happens:
2021-02-19 2:36 ` Khem Raj
@ 2021-02-19 3:34 ` zhengruoqin
2021-02-19 3:44 ` Khem Raj
0 siblings, 1 reply; 4+ messages in thread
From: zhengruoqin @ 2021-02-19 3:34 UTC (permalink / raw
To: Khem Raj; +Cc: openembedded-core@lists.openembedded.org
[-- Attachment #1: Type: text/plain, Size: 3928 bytes --]
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.khem@gmail.com>
Sent: Friday, February 19, 2021 10:37 AM
To: Zheng, Ruoqin/郑 若钦 <zhengrq.fnst@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.fnst@cn.fujitsu.com<mailto:zhengrq.fnst@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.fnst@cn.fujitsu.com<mailto:zhengrq.fnst@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
[-- Attachment #2: Type: text/html, Size: 9657 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [OE-core] [PATCH] wordsize.h: This file should be the same under arm and aarch64, othersise the following error happens:
2021-02-19 3:34 ` zhengruoqin
@ 2021-02-19 3:44 ` Khem Raj
0 siblings, 0 replies; 4+ messages in thread
From: Khem Raj @ 2021-02-19 3:44 UTC (permalink / raw
To: Zheng, Ruoqin; +Cc: openembedded-core@lists.openembedded.org
[-- Attachment #1: Type: text/plain, Size: 4425 bytes --]
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.fnst@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.khem@gmail.com>
> *Sent:* Friday, February 19, 2021 10:37 AM
> *To:* Zheng, Ruoqin/郑 若钦 <zhengrq.fnst@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.fnst@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.fnst@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
>
>
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 8903 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-02-19 3:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-19 1:36 [OE-core] [PATCH] wordsize.h: This file should be the same under arm and aarch64, othersise the following error happens: zhengruoqin
2021-02-19 2:36 ` Khem Raj
2021-02-19 3:34 ` zhengruoqin
2021-02-19 3:44 ` Khem Raj
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.