Date   

Re: Cross compilation error finding libraries

Bel Hadj Salem Talel
 

Hi,

Actually the Yocto SDK sets LD variable correctly : here is its value :
aarch64-poky-linux-ld --sysroot=/media/talel/data/sdk-multigate/sysroots/aarch64-poky-linux

Now I'm stuck with linking,
Please help me.
Thansk, Talel


[meta-zephyr][PATCH] zephyr-kernel: add Zephyr RTOS version 2.4.0 support

Jon Mason
 

Update Zephyr to the latest version. Tested via zephyr-philosophers on
qemu-cortex-m3.

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
classes/zephyr-kernel-src.bbclass | 10 +++++-----
...phyr-kernel-src_2.3.bb => zephyr-kernel-src_2.4.bb} | 0
2 files changed, 5 insertions(+), 5 deletions(-)
rename recipes-kernel/zephyr-kernel/{zephyr-kernel-src_2.3.bb => zephyr-kernel-src_2.4.bb} (100%)

diff --git a/classes/zephyr-kernel-src.bbclass b/classes/zephyr-kernel-src.bbclass
index 50e46af030ec..d2452231352d 100644
--- a/classes/zephyr-kernel-src.bbclass
+++ b/classes/zephyr-kernel-src.bbclass
@@ -1,18 +1,18 @@
#Set relevant variables based on Zephyr kernel version

-PREFERRED_VERSION_zephyr-kernel ??= "2.3.0"
+PREFERRED_VERSION_zephyr-kernel ??= "2.4.0"

SRCREV_FORMAT = "default_cmsis"
-SRCREV_default = "b8c78e254ff875680e99c9f131fbe285c4575927"
+SRCREV_default = "7a3b253ced7333f5c0269387a7f3ed1dee69739d"
SRCREV_cmsis = "542b2296e6d515b265e25c6b7208e8fea3014f90"


-SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.3-branch;name=default \
+SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=v2.4-branch;name=default \
git://github.com/zephyrproject-rtos/cmsis.git;protocol=https;destsuffix=git/modules/cmsis;name=cmsis \
file://0001-cmake-add-yocto-toolchain.patch \
"

-PV = "2.3.0+git${SRCPV}"
+PV = "2.4.0+git${SRCPV}"

LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
@@ -21,7 +21,7 @@ ZEPHYR_TEST_SRCDIR = "tests/legacy/kernel/"

python () {
src_pn = d.getVar('PREFERRED_VERSION_zephyr-kernel', True)
- if src_pn == '2.3.0':
+ if src_pn == '2.4.0':
return
else:
bb.error("Unsupported Zephyr kernel version requested")
diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.3.bb b/recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.4.bb
similarity index 100%
rename from recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.3.bb
rename to recipes-kernel/zephyr-kernel/zephyr-kernel-src_2.4.bb
--
2.20.1


Re: [prelink-cross][PATCH v5] Add SPDX license headers to all source files

Mark Hatle
 

A quick review of this looks fine. I'm currently swamped with some work stuff
and ELC-E this week.

I intend to get to this (and a few other contributions next week. If you don't
see anything from me next week. Please smack me upside the head.

--Mark

On 10/9/20 3:27 PM, Meh Mbeh Ida Delphine wrote:
Added SPDX headers in all source files except src/makecrc.c since it is not copyrighted.
Skipped Makefile.am as well.
Also cleared redundant license text.
Updated README file with correct email addresses.

Fixes: [YOCTO #13529]

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@gmail.com>
---

Changes in V5:
* None(Address review comments)

Changes in V4:
* Add [YOCTO #13529] tag to git commit log instead of subject line
* Updated the README file with right email addresses

Changes in V3:
* Address review comments
* Change subject line to reflect what the patch is trying to do

Changes in V2:
* Address review comments

README | 4 ++--
src/arch-alpha.c | 15 ++-------------
src/arch-arm.c | 15 ++-------------
src/arch-cris.c | 15 ++-------------
src/arch-i386.c | 15 ++-------------
src/arch-ia64.c | 15 ++-------------
src/arch-mips.c | 16 ++--------------
src/arch-ppc.c | 15 ++-------------
src/arch-ppc64.c | 15 ++-------------
src/arch-s390.c | 15 ++-------------
src/arch-s390x.c | 15 ++-------------
src/arch-sh.c | 15 ++-------------
src/arch-sparc.c | 16 +++-------------
src/arch-sparc64.c | 15 ++-------------
src/arch-x86_64.c | 15 ++-------------
src/cache.c | 15 ++-------------
src/canonicalize.c | 16 ++--------------
src/checksum.c | 15 ++-------------
src/conflict.c | 15 ++-------------
src/crc32.c | 15 ++-------------
src/cxx.c | 15 ++-------------
src/data.c | 15 ++-------------
src/doit.c | 15 ++-------------
src/dso.c | 15 ++-------------
src/dwarf2.c | 15 ++-------------
src/dwarf2.h | 15 ++-------------
src/exec.c | 15 ++-------------
src/execle_open.c | 15 ++-------------
src/execstack.c | 15 ++-------------
src/fptr.c | 15 ++-------------
src/fptr.h | 15 ++-------------
src/gather.c | 15 ++-------------
src/get.c | 15 ++-------------
src/hashtab.c | 17 ++---------------
src/hashtab.h | 16 +++-------------
src/layout.c | 15 ++-------------
src/layout.h | 15 ++-------------
src/main.c | 15 ++-------------
src/md5.c | 16 ++--------------
src/md5.h | 15 ++-------------
src/mdebug.c | 15 ++-------------
src/prelink.c | 15 ++-------------
src/prelink.h | 15 ++-------------
src/prelinktab.h | 15 ++-------------
src/reloc-info.c | 15 ++-------------
src/reloc-info.h | 15 ++-------------
src/reloc.c | 15 ++-------------
src/reloc.h | 15 ++-------------
src/sha.c | 4 ++++
src/sha.h | 4 ++++
src/space.c | 15 ++-------------
src/space.h | 15 ++-------------
src/stabs.c | 15 ++-------------
src/undo.c | 15 ++-------------
src/undoall.c | 15 ++-------------
src/verify.c | 15 ++-------------
56 files changed, 118 insertions(+), 696 deletions(-)

diff --git a/README b/README
index 2d8893b..5f91fab 100644
--- a/README
+++ b/README
@@ -13,8 +13,8 @@ Patch submission
When submitting patches to the cross-prelink project, please do the
following:

-To: mark.hatle@windriver.com
-Cc: yocto@yoctoproject.org
+To: mark.hatle@kernel.crashing.org
+Cc: yocto@lists.yoctoproject.org

Subject: [prelink-cross] ....

diff --git a/src/arch-alpha.c b/src/arch-alpha.c
index 7802a3e..bc5c192 100644
--- a/src/arch-alpha.c
+++ b/src/arch-alpha.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-arm.c b/src/arch-arm.c
index eec7c57..b5ea886 100644
--- a/src/arch-arm.c
+++ b/src/arch-arm.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009, 2011, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-cris.c b/src/arch-cris.c
index 3272779..634bf9f 100644
--- a/src/arch-cris.c
+++ b/src/arch-cris.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-i386.c b/src/arch-i386.c
index a1e0fcc..5a0b2ca 100644
--- a/src/arch-i386.c
+++ b/src/arch-i386.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-ia64.c b/src/arch-ia64.c
index 6039115..56196de 100644
--- a/src/arch-ia64.c
+++ b/src/arch-ia64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-mips.c b/src/arch-mips.c
index 02c608f..2875ec3 100644
--- a/src/arch-mips.c
+++ b/src/arch-mips.c
@@ -2,20 +2,8 @@
Written by Richard Sandiford <richard@codesourcery.com>, 2006
Updated by Maciej W. Rozycki <macro@codesourcery.com>, 2008.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
/* GENERAL NOTES

The psABI defines R_MIPS_REL32 as A - EA + S, where the value of EA
diff --git a/src/arch-ppc.c b/src/arch-ppc.c
index e22e5d5..e296d79 100644
--- a/src/arch-ppc.c
+++ b/src/arch-ppc.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-ppc64.c b/src/arch-ppc64.c
index a764b99..3f2c375 100644
--- a/src/arch-ppc64.c
+++ b/src/arch-ppc64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2002.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-s390.c b/src/arch-s390.c
index e5fe130..1a65f5c 100644
--- a/src/arch-s390.c
+++ b/src/arch-s390.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2010, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-s390x.c b/src/arch-s390x.c
index e4d82f7..926cfa2 100644
--- a/src/arch-s390x.c
+++ b/src/arch-s390x.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sh.c b/src/arch-sh.c
index 1b11312..a852266 100644
--- a/src/arch-sh.c
+++ b/src/arch-sh.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sparc.c b/src/arch-sparc.c
index e016a79..41b297d 100644
--- a/src/arch-sparc.c
+++ b/src/arch-sparc.c
@@ -1,19 +1,9 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-sparc64.c b/src/arch-sparc64.c
index aee4601..c6a1027 100644
--- a/src/arch-sparc64.c
+++ b/src/arch-sparc64.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2004, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/arch-x86_64.c b/src/arch-x86_64.c
index 2f6c551..249661a 100644
--- a/src/arch-x86_64.c
+++ b/src/arch-x86_64.c
@@ -3,19 +3,8 @@
Copyright (C) 2011 Wind River Systems, Inc.
x32 support by Mark Hatle <mark.hatle@windriver.com>

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/cache.c b/src/cache.c
index 1cc3217..b476581 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2013 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/canonicalize.c b/src/canonicalize.c
index 79df44e..e94ec06 100644
--- a/src/canonicalize.c
+++ b/src/canonicalize.c
@@ -2,20 +2,8 @@
Copyright (C) 1996-2002, 2004, 2005, 2006 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <assert.h>
#include <stdlib.h>
diff --git a/src/checksum.c b/src/checksum.c
index 20a23a0..5c80fc5 100644
--- a/src/checksum.c
+++ b/src/checksum.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/conflict.c b/src/conflict.c
index 5613ace..83713c5 100644
--- a/src/conflict.c
+++ b/src/conflict.c
@@ -3,19 +3,8 @@
Written by Jakub Jelinek <jakub@redhat.com>, 2001.
Updated by Maciej W. Rozycki <macro@codesourcery.com>, 2008.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/crc32.c b/src/crc32.c
index f36abb5..81e990b 100644
--- a/src/crc32.c
+++ b/src/crc32.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <stdint.h>
diff --git a/src/cxx.c b/src/cxx.c
index 4391ebe..4b911a9 100644
--- a/src/cxx.c
+++ b/src/cxx.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2007, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/data.c b/src/data.c
index 751f96f..d648744 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include "prelink.h"
diff --git a/src/doit.c b/src/doit.c
index 3784866..42e6819 100644
--- a/src/doit.c
+++ b/src/doit.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2003, 2004, 2005, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/dso.c b/src/dso.c
index 949abf9..9cce846 100644
--- a/src/dso.c
+++ b/src/dso.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/dwarf2.c b/src/dwarf2.c
index b9588b1..d230bb7 100644
--- a/src/dwarf2.c
+++ b/src/dwarf2.c
@@ -2,19 +2,8 @@
Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/dwarf2.h b/src/dwarf2.h
index b0c80b6..888f2c7 100644
--- a/src/dwarf2.h
+++ b/src/dwarf2.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2009, 2010, 2011, 2012 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#define DW_TAG_padding 0x00
#define DW_TAG_array_type 0x01
diff --git a/src/exec.c b/src/exec.c
index ca7fd14..431690e 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/execle_open.c b/src/execle_open.c
index 2ee5cbc..0d4bef5 100644
--- a/src/execle_open.c
+++ b/src/execle_open.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/execstack.c b/src/execstack.c
index 97fb453..fe044c5 100644
--- a/src/execstack.c
+++ b/src/execstack.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2003, 2005, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2003.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/fptr.c b/src/fptr.c
index cfe3aed..65a2804 100644
--- a/src/fptr.c
+++ b/src/fptr.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/fptr.h b/src/fptr.h
index 36ef7c6..c4ce3f7 100644
--- a/src/fptr.h
+++ b/src/fptr.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef FPTR_H
#define FPTR_H
diff --git a/src/gather.c b/src/gather.c
index 277f1b5..0d1e7c4 100644
--- a/src/gather.c
+++ b/src/gather.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/get.c b/src/get.c
index 0659962..bb58b1e 100644
--- a/src/get.c
+++ b/src/get.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2009 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/hashtab.c b/src/hashtab.c
index fa27446..7dc389d 100644
--- a/src/hashtab.c
+++ b/src/hashtab.c
@@ -2,21 +2,8 @@
Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@cygnus.com).

-This file is part of the libiberty library.
-Libiberty is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public
-License as published by the Free Software Foundation; either
-version 2 of the License, or (at your option) any later version.
-
-Libiberty is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with libiberty; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

/* This package implements basic hash table functionality. It is possible
to search for an entry, create an entry and destroy an entry.
diff --git a/src/hashtab.h b/src/hashtab.h
index 31e63e0..d3f297f 100644
--- a/src/hashtab.h
+++ b/src/hashtab.h
@@ -2,19 +2,8 @@
Copyright (C) 1999, 2000 Free Software Foundation, Inc.
Contributed by Vladimir Makarov (vmakarov@cygnus.com).

-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

/* This package implements basic hash table functionality. It is possible
to search for an entry, create an entry and destroy an entry.
@@ -29,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
expanded by creation of new hash table and transferring elements from
the old table to the new table. */

+
#ifndef __HASHTAB_H__
#define __HASHTAB_H__

diff --git a/src/layout.c b/src/layout.c
index 859ab66..29be7a3 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/layout.h b/src/layout.h
index f481d22..1b10bc0 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2004, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef LAYOUT_H
#define LAYOUT_H
diff --git a/src/main.c b/src/main.c
index 6ba89d5..39e44ad 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2010, 2011 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <errno.h>
diff --git a/src/md5.c b/src/md5.c
index 0d2fdef..19a8e0b 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -4,21 +4,9 @@
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu.

- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.

- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <sys/types.h>
#include <stdlib.h>
diff --git a/src/md5.h b/src/md5.h
index 55f6195..eb0b85e 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -4,19 +4,8 @@
NOTE: The canonical source of this file is maintained with the GNU C
Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu.

- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef _MD5_H
#define _MD5_H 1
diff --git a/src/mdebug.c b/src/mdebug.c
index 4c22d2f..eb6d1b5 100644
--- a/src/mdebug.c
+++ b/src/mdebug.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/prelink.c b/src/prelink.c
index 64c4fea..bf774c9 100644
--- a/src/prelink.c
+++ b/src/prelink.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/prelink.h b/src/prelink.h
index 39c4390..4c4c243 100644
--- a/src/prelink.h
+++ b/src/prelink.h
@@ -4,19 +4,8 @@
Written by Jakub Jelinek <jakub@redhat.com>, 2001.
Updated by Maciej W. Rozycki <macro@codesourcery.com>, 2008.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef PRELINK_H
#define PRELINK_H
diff --git a/src/prelinktab.h b/src/prelinktab.h
index f41c79c..a404292 100644
--- a/src/prelinktab.h
+++ b/src/prelinktab.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef PRELINKTAB_H
#define PRELINKTAB_H
diff --git a/src/reloc-info.c b/src/reloc-info.c
index 4ce333c..d51cfc1 100644
--- a/src/reloc-info.c
+++ b/src/reloc-info.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2008 CodeSourcery
Written by Maciej W. Rozycki <macro@codesourcery.com>, 2008.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>

diff --git a/src/reloc-info.h b/src/reloc-info.h
index a8f8b7c..592a92c 100644
--- a/src/reloc-info.h
+++ b/src/reloc-info.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2008 CodeSourcery
Written by Maciej W. Rozycki <macro@codesourcery.com>, 2008.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef RELOC_INFO_H
#define RELOC_INFO_H
diff --git a/src/reloc.c b/src/reloc.c
index deb0abe..9883dc7 100644
--- a/src/reloc.c
+++ b/src/reloc.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2005 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/reloc.h b/src/reloc.h
index a2ceff9..ee91f7e 100644
--- a/src/reloc.h
+++ b/src/reloc.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef RELOC_H
#define RELOC_H
diff --git a/src/sha.c b/src/sha.c
index cfbc956..f979bc4 100644
--- a/src/sha.c
+++ b/src/sha.c
@@ -1,3 +1,7 @@
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
/* sha.c - Functions to compute the SHA1 hash (message-digest) of files
or blocks of memory. Complies to the NIST specification FIPS-180-1.

diff --git a/src/sha.h b/src/sha.h
index 13583e3..810072b 100644
--- a/src/sha.h
+++ b/src/sha.h
@@ -1,3 +1,7 @@
+/*
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
+
/* sha.h - Declaration of functions and datatypes for SHA1 sum computing
library functions.

diff --git a/src/space.c b/src/space.c
index 4bd4760..8223daf 100644
--- a/src/space.c
+++ b/src/space.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/space.h b/src/space.h
index 5c9f725..59d087c 100644
--- a/src/space.h
+++ b/src/space.h
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2004 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#ifndef SPACE_H
#define SPACE_H
diff --git a/src/stabs.c b/src/stabs.c
index c0a5a6a..fd0ca28 100644
--- a/src/stabs.c
+++ b/src/stabs.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2005, 2006 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/undo.c b/src/undo.c
index 4c38dab..e6cfae3 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2001, 2002, 2003, 2005, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2001.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>
diff --git a/src/undoall.c b/src/undoall.c
index 55d2a0b..44a0b4e 100644
--- a/src/undoall.c
+++ b/src/undoall.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2005 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2002.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <alloca.h>
diff --git a/src/verify.c b/src/verify.c
index 7f530c0..991794a 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -1,19 +1,8 @@
/* Copyright (C) 2002, 2003, 2006, 2007, 2010 Red Hat, Inc.
Written by Jakub Jelinek <jakub@redhat.com>, 2002.

- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/

#include <config.h>
#include <assert.h>


Re: Systemd, overlayfs, and machine-id problem

Vincent Prince
 

If you use volatile-binds recipe, you can override folders and files and it will select overlayfs or bind-mount automatically.

For example you can override /etc/hostname and /root with
volatile-binds.bbappend:

VOLATILE_BINDS += " \
    /data/etc-hostname    /etc/hostname \n\
/data/root /root \n\  "


Le mer. 28 oct. 2020 à 12:11, Morten Bruun <morten.bruun@...> a écrit :
Thanks for the suggestion!

On Tue, Oct 27, 2020 at 4:35 PM nefethael <vincent.prince.fr@...> wrote:

In my project, I ended up by overlaying not the entire /etc but only subparts I needed to modify.
(/etc/machine-id is maybe already a bind mount from /run/machine-id)
Hope it helps,


If I should overlay just part of /etc I'm down to single files - and that does not seem to be possible. 

I'm trying to figure out if I can solve my problem using bind mounts instead.

Otherwise I will have to skip the systemd test during for testimage or create our own version of it.

/Morten

 
Le mar. 27 oct. 2020 à 16:24, Khem Raj <raj.khem@...> a écrit :


On 10/27/20 2:23 AM, Morten Bruun wrote:
> Hi,
>
> In our current Yocto project we are using an overlayfs on top of /etc
>
> This seems to trigger the systemd-machine-id-setup service which fails
> with the error below:
>
> systemd-machine-id-setup[204]: Failed to unmount transient
> /etc/machine-id file: Invalid argument.
>
> The failed service then triggers an error in the test_systemd_failed
> test in the systemd testimage suite.
>
> As far as I understand the machine-id setup is triggered because
> path_is_mount_point() can report false positives when using overlayfs.
>
> Is there a way to fix this?

maybe pregeenerate machine ID sometimes you can seed it from CPU Id or
soc ID from eeprom.

>
> Kind regards,
> Morten
>
>
>
>
>








--

apide.png


Morten Bruun

e: morten@...

t: +45 2968 2241

w: apide.com


Re: Systemd, overlayfs, and machine-id problem

Morten Bruun
 

Thanks for the suggestion!

On Tue, Oct 27, 2020 at 4:35 PM nefethael <vincent.prince.fr@...> wrote:

In my project, I ended up by overlaying not the entire /etc but only subparts I needed to modify.
(/etc/machine-id is maybe already a bind mount from /run/machine-id)
Hope it helps,


If I should overlay just part of /etc I'm down to single files - and that does not seem to be possible. 

I'm trying to figure out if I can solve my problem using bind mounts instead.

Otherwise I will have to skip the systemd test during for testimage or create our own version of it.

/Morten

 
Le mar. 27 oct. 2020 à 16:24, Khem Raj <raj.khem@...> a écrit :


On 10/27/20 2:23 AM, Morten Bruun wrote:
> Hi,
>
> In our current Yocto project we are using an overlayfs on top of /etc
>
> This seems to trigger the systemd-machine-id-setup service which fails
> with the error below:
>
> systemd-machine-id-setup[204]: Failed to unmount transient
> /etc/machine-id file: Invalid argument.
>
> The failed service then triggers an error in the test_systemd_failed
> test in the systemd testimage suite.
>
> As far as I understand the machine-id setup is triggered because
> path_is_mount_point() can report false positives when using overlayfs.
>
> Is there a way to fix this?

maybe pregeenerate machine ID sometimes you can seed it from CPU Id or
soc ID from eeprom.

>
> Kind regards,
> Morten
>
>
>
>
>








--

apide.png


Morten Bruun

e: morten@...

t: +45 2968 2241

w: apide.com


Re: grubenv not being generated

Khem Raj
 

On Tue, Oct 27, 2020 at 4:59 PM Howard <howard.egan@avid.com> wrote:

Thanks Khem:

Not entirely certain what that means. Apologies, I'm learning about 10 different things at the same time here.

I probably should have also asked, should I expect grubenv to be present?
I meant follow the lead from one of the emails you pointed and in
addition add a dependency on grub-native so you get the tool you are
looking for during build.





Re: grubenv not being generated

Howard
 

Thanks Khem:

Not entirely certain what that means.   Apologies, I'm learning about 10 different things at the same time here. 

I probably should have also asked, should I expect grubenv to be present?



Re: grubenv not being generated

Khem Raj
 

On 10/27/20 3:33 PM, Howard wrote:
Hi:
I am using grub as my bootloader, and enabling it via
EFI_PROVIDER = "grub-efi"
That all seems to work fine, except that grubenv is not being created anywhere.  I can run grub-editenv to create one on the target, but I need it built in.
Most of what I'm reading implies that it should be getting built.  I will say this, however, and that is that grub.cfg does not seem to reference the grubenv file which kind of makes sense since grubenv is not present.
I did find this thread, but it didn't really have any answers.
https://lists.yoctoproject.org/g/yocto/message/40612?p=,,,20,0,0,0::Created,,grubenv,20,2,0,61333830 <https://lists.yoctoproject.org/g/yocto/message/40612?p=,,,20,0,0,0::Created,,grubenv,20,2,0,61333830>
Wondering what I am missing.
perhaps a post edit function and add grub-native to DEPENDS so you can find needed binaries during cross build.

Many Thanks
Howard


grubenv not being generated

Howard
 

Hi:

I am using grub as my bootloader, and enabling it via 

EFI_PROVIDER = "grub-efi"

That all seems to work fine, except that grubenv is not being created anywhere.  I can run grub-editenv to create one on the target, but I need it built in.

Most of what I'm reading implies that it should be getting built.  I will say this, however, and that is that grub.cfg does not seem to reference the grubenv file which kind of makes sense since grubenv is not present.

I did find this thread, but it didn't really have any answers.
https://lists.yoctoproject.org/g/yocto/message/40612?p=,,,20,0,0,0::Created,,grubenv,20,2,0,61333830

Wondering what I am missing.

Many Thanks
Howard


Re: Cross compilation error finding libraries

Khem Raj
 

On Tue, Oct 27, 2020 at 9:41 AM Bel Hadj Salem Talel <bhstalel@gmail.com> wrote:

Hi,

Thanks for the reply.
Setting LD to $CC didn't work as well.
Pass LDFLAGS as CLFAGS as well, you need to use --syroot option during
link as well



Re: How to use WORKDIR of recipe A in recipe B ?

Khem Raj
 

Hello Talel

On Tue, Oct 27, 2020 at 11:23 AM Bel Hadj Salem Talel
<bhstalel@gmail.com> wrote:

Hi All,

I have a macchina.io recipe that fetches the source from Github and compiles it correctly.

In the WORKDIR , there is a samples directory with many examples, and each example has a Makefile, here is an example :

include $(POCO_BASE)/build/rules/global
include $(POCO_BASE)/OSP/BundleCreator/BundleCreator.make
objects = BundleActivator
target = io.macchina.samples.sensor1
target_includes = $(PROJECT_BASE)/devices/Devices/include
target_libs = IoTDevices PocoOSP PocoUtil PocoJSON PocoXML PocoFoundation
postbuild = $(SET_LD_LIBRARY_PATH) $(BUNDLE_TOOL) -n$(OSNAME) -a$(OSARCH) -o../bundles HelloSensor1.bndlspec
include $(POCO_BASE)/build/rules/dylib

There is a global variable that are used when building macchina, like (POCO_BASE, BUNDLE_TOOL, ...)

Now, I don't want to make a patch for my custom sample, because that will force macchina to recompile again and that will take more than 45minutes.
I need to use the macchina WORKDIR
many options to handle such situations.
usually, workdirs is strictly specific to one recipe, no other recipe
gets to peak into it. however if you have multiple recipes needing to
access same sources again
its perhaps ok to turn it into recipe-source recipe which sets up
common sources dir and every recipe refers to it. This however only
works if you purely need to access source
and source alone. If you are depending on intermediate buils artifacts
e.g. object file libraries etc. then better approach is to add it to
your -dev package from the source recipe
during its build and then when you DEPEND = "recipeA" in your recipeB
it will automatically stage them in the recipe specific sysroot.

However in many case you need fully configured and built trees of a
package into another. then look at how kernel is sharing its build
artifacts for kernel module builds from other
recipes.



Re: Recent issues with BB_DONT_CACHE?

Khem Raj
 

On Tue, Oct 27, 2020 at 11:05 AM Andrew Geissler <geissonator@gmail.com> wrote:

Over in the OpenBMC project, we rebased on yocto master (https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/37488). After this we started seeing intermittent issues with our os-release.bb recipe. We have a .bbappend in our meta-phosphor layer (https://github.com/openbmc/openbmc/blob/583147ea45f94ee363e9ae30ccb65b9ed1561b54/meta-phosphor/recipes-core/os-release/os-release.bbappend) that issues git commands to use the git hash to fill in our os-release.

After updating to the latest poky, sometimes the build works fine, other times we run into https://github.com/openbmc/openbmc/issues/3720

ERROR�[0m: �[31mWhen reparsing /var/lib/jenkins-slave/workspace/ci-meta/distro/ubuntu/label/docker-builder/target/witherspoon/openbmc/meta/recipes-core/os-release/os-release.bb:do_compile, the basehash value changed from 5da39bb75d4e4256ff7e589f6204c0ee79f16031e54aa78a23d630633becceac to c266b6051c26e27a7f5585d632b703511a7a9657fa2960515b570d3ef54a8ef2. The metadata is not deterministic and this needs to be fixed.�[0m

After some debug, it appears as if occasionally, bitbake is using the sstate cached os-release initially, and then during the build process it moves to using the correct hash id. This then causes the above error. We had issues with this way back in the day when we first introduced this bbappend and the solution was to add this to that recipe:

BB_DONT_CACHE = "1"

I don't see anything in that commit list from poky that looks suspicious but it definitely started happening when we brought that in. I tried modifying our os-release.bbappend to only run once during the compile phase but that caused issues where sometimes the os-release field in our flash image was incorrect (https://gerrit.openbmc-project.xyz/c/openbmc/meta-phosphor/+/37705 is the revert of that try)
You can add a function and use nostamp on it so it gets executed every
time, something like
https://github.com/YoeDistro/yoe-distro/blob/dunfell/sources/meta-yoe/recipes-core/images/updater.inc#L27-L47
for ideas

secondly, https://github.com/openbmc/openbmc/blob/583147ea45f94ee363e9ae30ccb65b9ed1561b54/meta-phosphor/recipes-core/os-release/os-release.bbappend#L38
seems to be
interesting what is the intention here ?

I think it would be better to have this data extraction added to
bitbake so it can be run at the beginning when layers are parsed, it
already is dumping build configuration so latch on
to it would get you what you want.





dlib recipe linking issue

Marek Belisko
 

Hi,

I'm creating a recipe for the dlib library. Source also contains
python bindings so my recipe looks like:

SUMMARY = "A toolkit for making real world machine learning and data
analysis applications"
HOMEPAGE = "https://github.com/davisking/dlib"

LICENSE = "Boost-Software"
LIC_FILES_CHKSUM =
"file://dlib/LICENSE.txt;md5=2c7a3fa82e66676005cd4ee2608fd7d2 \

file://dlib/external/pybind11/LICENSE;md5=beb87117af69fd10fbf9fb14c22a2e62
\

file://dlib/external/libpng/LICENSE;md5=243135ddedf702158f9170807cbcfb66
\

file://docs/docs/license.xml;md5=2e6ff4080dcb217d4d300b90e9aabb5b \

file://examples/LICENSE_FOR_EXAMPLE_PROGRAMS.txt;md5=57eee82829ed297e23d84de5f905afee
\

file://examples/video_frames/license.txt;md5=127ee508b60a6be9dea8af3b441993dc
\

file://python_examples/LICENSE_FOR_EXAMPLE_PROGRAMS.txt;md5=064f53ab40ea2b6a4bba1324149e4fde"

SRC_URI = "git://github.com/davisking/dlib.git;protocol=https"

PV = "1.0+git${SRCPV}"
SRCREV = "3b794540baeabbcd033b544230401967106d5483"

S = "${WORKDIR}/git"

inherit setuptools3

DEPENDS += "python3 cmake-native"

FILES_${PN}-dev += "${libdir}/cmake/dlib"

EXTRA_OECMAKE += "-DDLIB_NO_GUI_SUPPORT=ON -DBUILD_SHARED_LIBS=ON
-DDLIB_USE_CUDA=OFF"

Problem is to build python bindings because it builds the first c++
code using cmake and pybind11. I hit the first issue described here:
https://github.com/davisking/dlib/issues/2220 and resolved it simply
by commenting out code which compares python binary and toolchain
binary.

Then compilation seems to progress but there is again an issue with
linkin because it tries to link with x86-64 python libraries instead
of arm python3 libs. Any ideas how to solve this issue or anyone can
share a working recipe.

Thanks and BR,

marek





--
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer

Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
twitter: #opennandra
web: http://open-nandra.com


Re: How to use WORKDIR of recipe A in recipe B ?

Bel Hadj Salem Talel
 

Sorry this is rest of the mail:

I need to use the macchina WORKDIR in a different recipe , so that I can compile only my sample.
For example, in my recipe I export those global variable used in the Makefile like :

export POCO_BASE = ${WORKDIR_MACCHINA}
...

Any idea ?
Thanks ,Talel


How to use WORKDIR of recipe A in recipe B ?

Bel Hadj Salem Talel
 

Hi All,

I have a macchina.io recipe that fetches the source from Github and compiles it correctly.

In the WORKDIR , there is a samples directory with many examples, and each example has a Makefile, here is an example :

include $(POCO_BASE)/build/rules/global
include $(POCO_BASE)/OSP/BundleCreator/BundleCreator.make
objects = BundleActivator
target          = io.macchina.samples.sensor1
target_includes = $(PROJECT_BASE)/devices/Devices/include
target_libs     = IoTDevices PocoOSP PocoUtil PocoJSON PocoXML PocoFoundation
postbuild = $(SET_LD_LIBRARY_PATH) $(BUNDLE_TOOL) -n$(OSNAME) -a$(OSARCH) -o../bundles HelloSensor1.bndlspec
include $(POCO_BASE)/build/rules/dylib

There is a global variable that are used when building macchina, like (POCO_BASE, BUNDLE_TOOL, ...)

Now, I don't want to make a patch for my custom sample, because that will force macchina to recompile again and that will take more than 45minutes.
I need to use the macchina WORKDIR


Recent issues with BB_DONT_CACHE?

Andrew Geissler
 

Over in the OpenBMC project, we rebased on yocto master (https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/37488). After this we started seeing intermittent issues with our os-release.bb recipe. We have a .bbappend in our meta-phosphor layer (https://github.com/openbmc/openbmc/blob/583147ea45f94ee363e9ae30ccb65b9ed1561b54/meta-phosphor/recipes-core/os-release/os-release.bbappend) that issues git commands to use the git hash to fill in our os-release.

After updating to the latest poky, sometimes the build works fine, other times we run into https://github.com/openbmc/openbmc/issues/3720

ERROR�[0m: �[31mWhen reparsing /var/lib/jenkins-slave/workspace/ci-meta/distro/ubuntu/label/docker-builder/target/witherspoon/openbmc/meta/recipes-core/os-release/os-release.bb:do_compile, the basehash value changed from 5da39bb75d4e4256ff7e589f6204c0ee79f16031e54aa78a23d630633becceac to c266b6051c26e27a7f5585d632b703511a7a9657fa2960515b570d3ef54a8ef2. The metadata is not deterministic and this needs to be fixed.�[0m

After some debug, it appears as if occasionally, bitbake is using the sstate cached os-release initially, and then during the build process it moves to using the correct hash id. This then causes the above error. We had issues with this way back in the day when we first introduced this bbappend and the solution was to add this to that recipe:

BB_DONT_CACHE = "1"

I don't see anything in that commit list from poky that looks suspicious but it definitely started happening when we brought that in. I tried modifying our os-release.bbappend to only run once during the compile phase but that caused issues where sometimes the os-release field in our flash image was incorrect (https://gerrit.openbmc-project.xyz/c/openbmc/meta-phosphor/+/37705 is the revert of that try)


Re: Cross compilation error finding libraries

Bel Hadj Salem Talel
 

Hi,

Thanks for the reply.
Setting LD to $CC didn't work as well.


Re: [meta-selinux][PATCH] layer.conf: add gatesgarth compatibility

Vincent Prince
 

Thanks, no problem :)

Le mar. 27 oct. 2020 à 16:09, Joe MacDonald <joe@...> a écrit :
[Re: [yocto] [meta-selinux][PATCH] layer.conf: add gatesgarth compatibility] On 20.10.27 (Tue 16:00) nefethael wrote:

> Hi Jon,
>
> There is already a pending patch submitted some time ago by Aníbal Limó here
> https://patchwork.openembedded.org/patch/177350/

Yeah, I've had that older patch in my work-tree for a while now and
haven't pushed it upstream yet.  I'll get on that today.  Sorry for the
delay.

-Joe.

>
> Best regards,
> Vincent
>
>
>
> Le lun. 26 oct. 2020 à 21:56, Jon Mason <jdmason@...> a écrit :
>
>     Signed-off-by: Jon Mason <jdmason@...>
>     ---
>      conf/layer.conf | 2 +-
>      1 file changed, 1 insertion(+), 1 deletion(-)
>
>     diff --git a/conf/layer.conf b/conf/layer.conf
>     index da24359b7484..178ce1b734d3 100644
>     --- a/conf/layer.conf
>     +++ b/conf/layer.conf
>     @@ -23,7 +23,7 @@ BBFILE_PRIORITY_selinux = "5"
>      # cause compatibility issues with other layers
>      LAYERVERSION_selinux = "1"
>
>     -LAYERSERIES_COMPAT_selinux = "dunfell"
>     +LAYERSERIES_COMPAT_selinux = "dunfell gatesgarth"
>
>      LAYERDEPENDS_selinux = " \
>          core \
>     --
>     2.20.1
>
>
>
>
>

>
>
>


--
-Joe MacDonald.
:wq


Re: Systemd, overlayfs, and machine-id problem

Vincent Prince
 

Hi,

In my project, I ended up by overlaying not the entire /etc but only subparts I needed to modify.
(/etc/machine-id is maybe already a bind mount from /run/machine-id)
Hope it helps,

Best regards,
Vincent


Le mar. 27 oct. 2020 à 16:24, Khem Raj <raj.khem@...> a écrit :


On 10/27/20 2:23 AM, Morten Bruun wrote:
> Hi,
>
> In our current Yocto project we are using an overlayfs on top of /etc
>
> This seems to trigger the systemd-machine-id-setup service which fails
> with the error below:
>
> systemd-machine-id-setup[204]: Failed to unmount transient
> /etc/machine-id file: Invalid argument.
>
> The failed service then triggers an error in the test_systemd_failed
> test in the systemd testimage suite.
>
> As far as I understand the machine-id setup is triggered because
> path_is_mount_point() can report false positives when using overlayfs.
>
> Is there a way to fix this?

maybe pregeenerate machine ID sometimes you can seed it from CPU Id or
soc ID from eeprom.

>
> Kind regards,
> Morten
>
>
>
>
>




Re: Cross compilation error finding libraries

Khem Raj
 

On 10/27/20 2:52 AM, Bel Hadj Salem Talel wrote:
Hi All,
I have an SDK populated from an image.
After sourcing the SDK env file, I try to run make on a project with this command :
make CC="$CC" LD="$LD" CFLAGS="${CFLAGS}
--sysroot=/media/talel/data/sdk-multigate/sysroots/aarch64-poky-linux"
CXXFLAGS="${CXXFLAGS}
--sysroot=/media/talel/data/sdk-multigate/sysroots/aarch64-poky-linux"
I specified the CFLAGS and CXXFLAGS as mentionned in Yocto document (part 5.2 Makefile-Based projects) : https://www.yoctoproject.org/docs/1.1.2/adt-manual/adt-manual.html
Now I have this error:
** Building dynamic library (debug, shared) /home/talel/Documents/macchina.io/samples/LinuxThermalSimple/bin/Linux/x86_64/io.macchina.linux-thermal-simpled.so
aarch64-poky-linux-g++ -shared -Wl,-soname,io.macchina.linux-thermal-simpled.so -o /home/talel/Documents/macchina.io/samples/LinuxThermalSimple/bin/Linux/x86_64/io.macchina.linux-thermal-simpled.so /home/talel/Documents/macchina.io/samples/LinuxThermalSimple/obj/Linux/x86_64/debug_shared/LinuxThermalSensor.o /home/talel/Documents/macchina.io/samples/LinuxThermalSimple/obj/Linux/x86_64/debug_shared/BundleActivator.o -L/home/talel/Documents/macchina.io/lib/Linux/x86_64 -L/home/talel/Documents/macchina.io/platform/lib/Linux/x86_64 -lIoTDevicesd -lPocoRemotingNGd -lPocoOSPd -lPocoUtild -lPocoXMLd -lPocoFoundationd  -lpthread -ldl -lrt
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find crti.o: No such file or directory
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find crtbeginS.o: No such file or directory
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lIoTDevicesd
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lPocoRemotingNGd
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lPocoOSPd
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lPocoUtild
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lPocoXMLd
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lPocoFoundationd
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lpthread
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -ldl
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lrt
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lstdc++
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lm
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lgcc_s
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lc
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find -lgcc_s
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find crtendS.o: No such file or directory
/media/talel/data/sdk-multigate/sysroots/x86_64-pokysdk-linux/usr/libexec/aarch64-poky-linux/gcc/aarch64-poky-linux/9.2.0/real-ld: cannot find crtn.o: No such file or directory
collect2: error: ld returned 1 exit status
/home/talel/Documents/macchina.io/platform/build/rules/dylib:54: recipe for target '/home/talel/Documents/macchina.io/samples/LinuxThermalSimple/bin/Linux/x86_64/io.macchina.linux-thermal-simpled.so' failed
make: *** [/home/talel/Documents/macchina.io/samples/LinuxThermalSimple/bin/Linux/x86_64/io.macchina.linux-thermal-simpled.so] Error 1
I need help.
I see that your linker is not using proper sysroot perhaps using LD=${CC} might help.

Thanks, Talel

3881 - 3900 of 55069