Date   

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

Robert Berger
 

On 04/02/2021 19:17, Richard Purdie wrote:

- 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.
-
+* SPDX-License-Identifier: GPL-2.0-or-later
+*/
I guess the correct SPDX id is then:

LGPL-2.1-or-later

In order to get this right I would highly recommend to use fossology to look at those files.

This file mentions "GNU Lesser General Public License" and version 2.1
which is not GPL-2.0!
It is critical to get this bit right.
Cheers,
Richard
Regards,

Robert


Re: Building eSDK fails #sdk

Robert Berger
 

Hi,

My comments are in-line

On 04/02/2021 19:43, alexander.troff@... wrote:
Hello,
I build the SDK with bitbake core-image-base -c populate_sdk and it works just fine. But trying to build the eSDK with bitbake core-image-base -c populate_sdk_ext results in this error:
ERROR: buildtools-tarball-1.0-r0 do_populate_sdk: Unable to install packages. Command '/opt/build/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/recipe-sysroot-native/usr/bin/opkg --volatile-cache -f /opt/build/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/opkg.conf -t /opt/build/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/temp/ipktemp/ -o /opt/build/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/sdk/image/opt/my-os/0.1/sysroots/none --force_postinstall --prefer-arch-to-version   install cppzmq-dev googletest-dev libappcommunicator-dev liblogger-dev libmodbus-dev libmyos-common-dev protobuf-c zeromq-staticdev' returned 255:
Collected errors:
 * opkg_prepare_url_for_install: Couldn't find anything to satisfy 'cppzmq-dev'.
ERROR: Logfile of failure stored in: /opt/build/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/temp/log.do_populate_sdk.155
ERROR: Task (/opt/yocto/poky/meta/recipes-core/meta/buildtools-tarball.bb:do_populate_sdk) failed with exit code '1'
Which version is this?

Can it be reproduced?

If so you might want to add it to https://bugzilla.yoctoproject.org

The listed Packeges are set in the TOOLCHAIN_TARGET_TASK variable. I tryed using IMAGE_INSTALL_append but this didn't help.
Does someone have an idea?
greetings
Alex
Regards,

Robert


Need to manually create device-tree directory during build

Jonas Vautherin
 

As a learning experience, I am trying to build a downstream kernel from source. It works, but it requires that I manually make a directory in the yocto `tmp/` folder, and I am trying to understand why :-).

I created a BSP layer, and I want to use one of the downstream dts files [1]. Because that file is in `arch/arm/boot/dts/qcom/msm8909-pm8916-mpp3-hw00.dts`, my machine configuration sets:

```
KERNEL_DEVICETREE += "qcom/msm8909-pm8916-mpp3-hw00.dtb"
```

I `inherit kernel` in my linux recipe, which I believe will build the dtb from the corresponding dts in the downstream sources. However, somewhere during the build process, I get the following error:

```
|   DTC     arch/arm/boot/dts/qcom/msm8909-pm8916-mpp3-hw00.dtb
| cc1: fatal error: opening output file arch/arm/boot/dts/qcom/.msm8909-pm8916-mpp3-hw00.dtb.dts.tmp: No such file or directory
```

If I create the following `qcom` directory manually and re-run `bitbake virtual/kernel`, then it works:

```
mkdir tmp/work/skycontroller3-poky-linux-gnueabi/linux-skycontroller3/3.18.31-r0/linux-skycontroller3-standard-build/arch/arm/boot/dts/qcom
```

So it feels like this `qcom/` subdirectory poses problems. I am not sure if I am missing a configuration somewhere, or if that could be a bug (or maybe the dts should be in `boot/dts` and never in a subdir like `boot/dts/qcom`?).

I read through `classes/devicetree.bbclass` and `classes/kernel-devicetree.bbclass`, but I don't think that the `*.dts.dtb.tmp` file is created there.

Looking for insights on what may be going wrong here :-).

Best,
Jonas


Re: RT patch for 5.4.74?

jchludzinski
 

From Altera/Intel?

On 2021-02-04 17:20, jchludzinski via lists.yoctoproject.org wrote:
Is there an RT patch for 5.4.74?
(I've used patch-5.4.44-rt27.patch.)
---John
--
NULL


RT patch for 5.4.74?

jchludzinski
 

Is there an RT patch for 5.4.74?
(I've used patch-5.4.44-rt27.patch.)

---John


[prelink-cross][PATCH 3/3] Edit SPDX license header version

Meh Mbeh Ida Delphine <idadelm@...>
 

Signed-off-by: Ida Delphine <idadelm@...>
---
src/canonicalize.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/canonicalize.c b/src/canonicalize.c
index e94ec06..a8b2d44 100644
--- a/src/canonicalize.c
+++ b/src/canonicalize.c
@@ -2,7 +2,7 @@
Copyright (C) 1996-2002, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.

-* SPDX-License-Identifier: GPL-2.0-or-later
+* SPDX-License-Identifier: LGPL-2.1-or-later
*/

#include <assert.h>
--
2.25.1


[prelink-cross][PATCH 3/3] Edit SPDX license header version

Meh Mbeh Ida Delphine <idadelm@...>
 

Signed-off-by: Ida Delphine <idadelm@...>
---
src/canonicalize.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/canonicalize.c b/src/canonicalize.c
index e94ec06..8c84336 100644
--- a/src/canonicalize.c
+++ b/src/canonicalize.c
@@ -2,7 +2,7 @@
Copyright (C) 1996-2002, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.

-* SPDX-License-Identifier: GPL-2.0-or-later
+* SPDX-License-Identifier: GPL-2.1-or-later
*/

#include <assert.h>
--
2.25.1


[prelink-cross][PATCH 1/3] Add SPDX license headers to all source files

Meh Mbeh Ida Delphine <idadelm@...>
 

From: Meh Mbeh Ida Delphine <idadelm@...>

Fixed bug #13529
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.

Signed-off-by: Meh Mbeh Ida Delphine <idadelm@...>
---
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 ++-------------
55 files changed, 116 insertions(+), 694 deletions(-)

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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 2006
Updated by Maciej W. Rozycki <macro@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>

- 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@...>, 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@...>, 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@...>, 2001.
Updated by Maciej W. Rozycki <macro@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...).

-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@...).

-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@...>, 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@...>, 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@...>, 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@....

- 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@...>, 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@....

- 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@...>, 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@...>, 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@...>, 2001.
Updated by Maciej W. Rozycki <macro@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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@...>, 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>
--
2.25.1


[prelink-cross][PATCH 2/3] Updated email addresses

Meh Mbeh Ida Delphine <idadelm@...>
 

Signed-off-by: Ida Delphine <idadelm@...>
---
README | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 2d8893b..7c4918a 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Please contact <mark.hatle@...> if you have a question about this
+Please contact <mark.hatle@...> if you have a question about this
version. The original author is not responsible for the modified version!

Compilation
@@ -13,8 +13,8 @@ Patch submission
When submitting patches to the cross-prelink project, please do the
following:

-To: mark.hatle@...
-Cc: yocto@...
+To: mark.hatle@...
+Cc: yocto@...

Subject: [prelink-cross] ....

--
2.25.1


Building eSDK fails #sdk

alexander.troff@...
 

Hello,
I build the SDK with bitbake core-image-base -c populate_sdk and it works just fine. But trying to build the eSDK with bitbake core-image-base -c populate_sdk_ext results in this error:

ERROR: buildtools-tarball-1.0-r0 do_populate_sdk: Unable to install packages. Command '/opt/build/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/recipe-sysroot-native/usr/bin/opkg --volatile-cache -f /opt/build/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/opkg.conf -t /opt/build/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/temp/ipktemp/ -o /opt/build/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/sdk/image/opt/my-os/0.1/sysroots/none  --force_postinstall --prefer-arch-to-version   install cppzmq-dev googletest-dev libappcommunicator-dev liblogger-dev libmodbus-dev libmyos-common-dev protobuf-c zeromq-staticdev' returned 255:
Collected errors:
 * opkg_prepare_url_for_install: Couldn't find anything to satisfy 'cppzmq-dev'.

ERROR: Logfile of failure stored in: /opt/build/tmp/work/x86_64-nativesdk-pokysdk-linux/buildtools-tarball/1.0-r0/temp/log.do_populate_sdk.155
ERROR: Task (/opt/yocto/poky/meta/recipes-core/meta/buildtools-tarball.bb:do_populate_sdk) failed with exit code '1'


The listed Packeges are set in the TOOLCHAIN_TARGET_TASK variable. I tryed using IMAGE_INSTALL_append but this didn't help.
Does someone have an idea?

greetings
Alex


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

Richard Purdie
 

On Tue, 2021-02-02 at 11:54 +0100, Meh Mbeh Ida Delphine wrote:
From: Meh Mbeh Ida Delphine <idadelm@...>

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]
Thanks for this. There are a couple of tweaks I noticed as I was about
to merge it. Firstly, can you make the email address update a separate
commit please. Commits should do one logical thing.

- 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
+*/
This file mentions "GNU Lesser General Public License" and version 2.1
which is not GPL-2.0!

It is critical to get this bit right.

Cheers,

Richard


[meta-virtualization]: dunfell docker run issues

Marek Belisko
 

Hi,

I'm trying to run docker containers on orangepi and use
meta-virtualization layer to add docker. I've installed the docker-ce
package and everything seems to be fine.

But docker service seems fails to start with:
Feb 04 15:00:01 orange-pi-zero dockerd[495]: failed to start daemon:
Devices cgroup isn't mounted

I was trying to add various options to kernel command line like
described here: https://github.com/docker/cli/issues/2104

but it doesn't work. My command-line looks like:
...systemd.unified_cgroup_hierarchy=0 cgroup_enable=memory
cgroup_memory=1 swapaccount=1 cgroup_no_v1=all

Any other ideas what to check? Thanks a lot.

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


[meta-zephyr][PATCH v2 2/2] zephyr-peripheral-esp: fix compilation

Wojciech Zmuda
 

From: Wojciech Zmuda <wojciech.zmuda@...>

Bluetooth peripheral ESP sample application does not compile
because of:
- broken source directory path passing to cmake,
- broken paths in do_deploy,
- unnecessary call for do_install,
- missing tinycrypt.

The first issue caused the following error:

<...>/gcc/arm-yocto-eabi/9.3.0/ld: <...>/recipe-sysroot/usr/lib/libc.a(lib_a-exit.o): in function `exit':
/usr/src/debug/newlib/3.2.0-r0/newlib-3.2.0/newlib/libc/stdlib/exit.c:64: undefined reference to `_exit'
collect2: error: ld returned 1 exit status

Fix the issue by providing Zephyr source directory to cmake
via OECMAKE_SOURCEPATH variable. On the do_configure step cmake
now gets the full path to the sample source code instead of
Zephyr root directory.

The second and third issue caused errors because of missing files.
Don't execute do_install and use the same paths in deploy as the
other sample apps do.

Inspecting meta-zephyr commits history shows that similar approach
was used in bb files of other sample application when updating
them to work with Zephyr 2.0.

For the missing Tinycrypt, append its location to cmake.

Signed-off-by: Wojciech Zmuda <wojciech.zmuda@...>
---
recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb b/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
index 2ffe5ae..192c76d 100644
--- a/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
+++ b/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
@@ -5,15 +5,12 @@ inherit deploy
ZEPHYR_SAMPLE_NAME="samples/bluetooth/peripheral_esp"
ZEPHYR_SRC_DIR = "${S}/${ZEPHYR_SAMPLE_NAME}"
ZEPHYR_BASE = "${S}"
-
-do_compile () {
- cd ${ZEPHYR_SRC_DIR}
- oe_runmake ${ZEPHYR_MAKE_ARGS}
-}
+OECMAKE_SOURCEPATH = "${ZEPHYR_SRC_DIR}"
+EXTRA_OECMAKE_append = "\;${S}/modules/crypto/tinycrypt"

do_deploy () {
- install -D ${ZEPHYR_SAMPLE_NAME}/outdir/${BOARD}/zephyr.elf ${DEPLOYDIR}/${PN}.elf
- install -D ${ZEPHYR_SAMPLE_NAME}/outdir/${BOARD}/zephyr.bin ${DEPLOYDIR}/${PN}.bin
+ install -D ${B}/zephyr/${ZEPHYR_MAKE_OUTPUT} ${DEPLOYDIR}/${PN}.elf
}

addtask deploy after do_compile
+do_install[noexec] = "1"
--
2.25.1


[meta-zephyr][PATCH v2 1/2] zephyr-kernel: clone Tinycrypt

Wojciech Zmuda
 

From: Wojciech Zmuda <wojciech.zmuda@...>

Tinycrypt is a library used in some sample applications,
i.e. in zephyr-peripheral-esp. Add it to kernel bbclass,
so it can be referenced in applications recipes that
use it.

Signed-off-by: Wojciech Zmuda <wojciech.zmuda@...>
---
classes/zephyr-kernel-src.bbclass | 2 ++
1 file changed, 2 insertions(+)

diff --git a/classes/zephyr-kernel-src.bbclass b/classes/zephyr-kernel-src.bbclass
index b7fb81d..c6c8d61 100644
--- a/classes/zephyr-kernel-src.bbclass
+++ b/classes/zephyr-kernel-src.bbclass
@@ -9,6 +9,7 @@ SRCREV_nordic = "d8a6ea9695ddf792bb18bb6035c13b1daac5d79c"
SRCREV_stm32 = "f0e11398128ac9abdff713da5d3035e6c96e9b86"
SRCREV_open-amp = "de1b85a13032a2de1d8b6695ae5f800b613e739d"
SRCREV_libmetal = "9d4ee2c3cfd5f49861939447990f3b7d7bf9bf94"
+SRCREV_tinycrypt = "3e9a49d2672ec01435ffbf0d788db6d95ef28de0"

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 \
@@ -16,6 +17,7 @@ SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=
git://github.com/zephyrproject-rtos/hal_stm32.git;protocol=https;destsuffix=git/modules/hal/stm32;name=stm32 \
git://github.com/zephyrproject-rtos/open-amp.git;protocol=https;destsuffix=git/modules/lib/open-amp;name=open-amp \
git://github.com/zephyrproject-rtos/libmetal.git;protocol=https;destsuffix=git/modules/hal/libmetal;name=libmetal \
+ git://github.com/zephyrproject-rtos/tinycrypt.git;protocol=https;destsuffix=git/modules/crypto/tinycrypt;name=tinycrypt \
file://0001-cmake-add-yocto-toolchain.patch \
"

--
2.25.1


[meta-zephyr][PATCH v2 0/2] Fix Bluetooth Peripheral ESP sample compilation

Wojciech Zmuda
 

From: Wojciech Zmuda <wojciech.zmuda@...>

v1 -> v2:
- Addedd missing [meta-zephyr] tag
- Re-sending with slightly different git-send-email
configuration, so the authorship is pointed to my @huawei.com email
instead of the one I'm sending it from.

Wojciech Zmuda (2):
zephyr-kernel: clone Tinycrypt
zephyr-peripheral-esp: fix compilation

classes/zephyr-kernel-src.bbclass | 2 ++
recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb | 11 ++++-------
2 files changed, 6 insertions(+), 7 deletions(-)

--
2.25.1


[PATCH 2/2] zephyr-peripheral-esp: fix compilation

Wojciech Zmuda
 

Bluetooth peripheral ESP sample application does not compile
because of:
- broken source directory path passing to cmake,
- broken paths in do_deploy,
- unnecessary call for do_install,
- missing tinycrypt.

The first issue caused the following error:

<...>/gcc/arm-yocto-eabi/9.3.0/ld: <...>/recipe-sysroot/usr/lib/libc.a(lib_a-exit.o): in function `exit':
/usr/src/debug/newlib/3.2.0-r0/newlib-3.2.0/newlib/libc/stdlib/exit.c:64: undefined reference to `_exit'
collect2: error: ld returned 1 exit status

Fix the issue by providing Zephyr source directory to cmake
via OECMAKE_SOURCEPATH variable. On the do_configure step cmake
now gets the full path to the sample source code instead of
Zephyr root directory.

The second and third issue caused errors because of missing files.
Don't execute do_install and use the same paths in deploy as the
other sample apps do.

Inspecting meta-zephyr commits history shows that similar approach
was used in bb files of other sample application when updating
them to work with Zephyr 2.0.

For the missing Tinycrypt, append its location to cmake.

Signed-off-by: Wojciech Zmuda <wojciech.zmuda@...>
---
recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb b/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
index 2ffe5ae..192c76d 100644
--- a/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
+++ b/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
@@ -5,15 +5,12 @@ inherit deploy
ZEPHYR_SAMPLE_NAME="samples/bluetooth/peripheral_esp"
ZEPHYR_SRC_DIR = "${S}/${ZEPHYR_SAMPLE_NAME}"
ZEPHYR_BASE = "${S}"
-
-do_compile () {
- cd ${ZEPHYR_SRC_DIR}
- oe_runmake ${ZEPHYR_MAKE_ARGS}
-}
+OECMAKE_SOURCEPATH = "${ZEPHYR_SRC_DIR}"
+EXTRA_OECMAKE_append = "\;${S}/modules/crypto/tinycrypt"

do_deploy () {
- install -D ${ZEPHYR_SAMPLE_NAME}/outdir/${BOARD}/zephyr.elf ${DEPLOYDIR}/${PN}.elf
- install -D ${ZEPHYR_SAMPLE_NAME}/outdir/${BOARD}/zephyr.bin ${DEPLOYDIR}/${PN}.bin
+ install -D ${B}/zephyr/${ZEPHYR_MAKE_OUTPUT} ${DEPLOYDIR}/${PN}.elf
}

addtask deploy after do_compile
+do_install[noexec] = "1"
--
2.25.1


[PATCH 1/2] zephyr-kernel: clone Tinycrypt

Wojciech Zmuda
 

Tinycrypt is a library used in some sample applications,
i.e. in zephyr-peripheral-esp. Add it to kernel bbclass,
so it can be referenced in applications recipes that
use it.

Signed-off-by: Wojciech Zmuda <wojciech.zmuda@...>
---
classes/zephyr-kernel-src.bbclass | 2 ++
1 file changed, 2 insertions(+)

diff --git a/classes/zephyr-kernel-src.bbclass b/classes/zephyr-kernel-src.bbclass
index b7fb81d..c6c8d61 100644
--- a/classes/zephyr-kernel-src.bbclass
+++ b/classes/zephyr-kernel-src.bbclass
@@ -9,6 +9,7 @@ SRCREV_nordic = "d8a6ea9695ddf792bb18bb6035c13b1daac5d79c"
SRCREV_stm32 = "f0e11398128ac9abdff713da5d3035e6c96e9b86"
SRCREV_open-amp = "de1b85a13032a2de1d8b6695ae5f800b613e739d"
SRCREV_libmetal = "9d4ee2c3cfd5f49861939447990f3b7d7bf9bf94"
+SRCREV_tinycrypt = "3e9a49d2672ec01435ffbf0d788db6d95ef28de0"

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 \
@@ -16,6 +17,7 @@ SRC_URI = "git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=
git://github.com/zephyrproject-rtos/hal_stm32.git;protocol=https;destsuffix=git/modules/hal/stm32;name=stm32 \
git://github.com/zephyrproject-rtos/open-amp.git;protocol=https;destsuffix=git/modules/lib/open-amp;name=open-amp \
git://github.com/zephyrproject-rtos/libmetal.git;protocol=https;destsuffix=git/modules/hal/libmetal;name=libmetal \
+ git://github.com/zephyrproject-rtos/tinycrypt.git;protocol=https;destsuffix=git/modules/crypto/tinycrypt;name=tinycrypt \
file://0001-cmake-add-yocto-toolchain.patch \
"

--
2.25.1


[PATCH 0/2] Fix Bluetooth Peripheral ESP sample compilation

Wojciech Zmuda
 

The zephyr-peripheral-esp target cannot be built due to multiple of reasons,
mostly missing tinycript and the recipe being not aligned to changes that
happened during upudating this meta-layer to Zephyr v2.4.0.

This patch set applies necessary fixes and clones Tinycrypt so it can be used
in other recipes that need it.

Tested on 96Boards Nitrogen.


Wojciech Zmuda (2):
zephyr-kernel: clone Tinycrypt
zephyr-peripheral-esp: fix compilation

classes/zephyr-kernel-src.bbclass | 2 ++
recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb | 11 ++++-------
2 files changed, 6 insertions(+), 7 deletions(-)

--
2.25.1


Re: #yocto CORE_IMAGE_EXTRA_INSTALL Where can I find a list of valid package names? #yocto

Quentin Schulz
 

Hi David,

On Thu, Feb 04, 2021 at 01:24:35AM -0700, David Babich wrote:
Thanks for that reply. I actually deleted my message from the forum post
because I thought maybe I hadn't dug through things enough and perhaps I
was wasting people's time. But I think you provided some validation to my
question. I'm more used to the typical ncurses method of configuration of
the old days with a kernel config a rootfs config etc. I will try your
suggested command. But I'm wondering are the names typical of what I might
expect if I were to do something like "sudo apt-get install <whatever>"
Not always. E.g. debian packages are renamed if they only have a library
in it to be the name of said library. This does not happen for rpm and
opkg. Note: this is a vague memory, I don't use de packages in Yocto so
to be taken with a grain of salt.

(which is somewhat of an experience thing) or do I just simply need to dig
around on web searches to find out what the actual name is. I've found
Not web searches. Basically, one would need to identify the recipe
building the software in the package you want to find.
From there, you can read the list of packages in PACKAGES (sometimes,
like for gstreamer plugins for example, it is dynamically set so you
won't be able to find them by just reading the recipe (though you can
more or less guess them)).

To know what's inside one of the packages without baking the recipe, one
would need to have a look at the FILES_${PN}<-xxx> variables.

It's therefore mostly knowledge and trial and errors as Josef said.

The difficulty for the Yocto project to compile a list of packages and
which recipe build them is that packages can depend on configuration
files (machines, distros, ...). Sometimes they do appear, sometimes not.
Sometimes a package for a distro contains more than a package for
another distro while having the same name.

Which is also a reason why ncurses/menuconfig would be hard for Yocto
Project, because content of packages are not guaranteed to be identical
between machines and distros, so it'd be hard to give descriptions of
options to select.

Hope this helps,
Quentin


Re: #yocto CORE_IMAGE_EXTRA_INSTALL Where can I find a list of valid package names? #yocto

David Babich
 

FYI I just tried your suggestion and it yielded great results.  Nice suggestion!

5581 - 5600 of 57784