diff mbox series

shadow-sysroot: add license information

Message ID 20230714104148.3608888-1-enrico.scholz@sigma-chemnitz.de
State New
Headers show
Series shadow-sysroot: add license information | expand

Commit Message

Enrico Scholz July 14, 2023, 10:41 a.m. UTC 
From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>

Recipe references 'login.defs' in LIC_FILES_CHKSUM.  This causes some
problems:

- file does not contain a single word which is related with its license

- changing this file (here: increasing SYS_UID_MIN) invalidates
  LIC_FILES_CHKSUM

Add 'SPDX-License-Identifier' to the file and limit the checksum to
this part.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
 meta/recipes-extended/shadow/files/login.defs_shadow-sysroot | 1 +
 meta/recipes-extended/shadow/shadow-sysroot_4.6.bb           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Dvorkin Dmitry July 14, 2023, 1:20 p.m. UTC | #1 
Hello!

starting from 2aa82324d43467e7c8bfbbb59570ee3306264b75 commit (dunfell 
and probably other branches)

https://git.openembedded.org/openembedded-core/commit/?h=dunfell&id=2aa82324d43467e7c8bfbbb59570ee3306264b75

the

SYSTEMD_SERVICE:${PN} = "php-fpm@9000.service"

syntax in the recipe brings OE to error at do_rootfs step:

https://pastebin.com/WbDCPy4V


+ for service in php-fpm@9000.service
+ systemctl 
--root=/workdir/build.tppg2/tmp/work/tppg2-tps-linux-gnueabi/img-oac
-anpr/1.0-r0/rootfs enable php-fpm@9000.service
Traceback (most recent call last):
File 
"/workdir/build.tppg2/tmp/work/tppg2-tps-linux-gnueabi/img-oac-anpr/1.0-r
0/recipe-sysroot-native/usr/bin/systemctl", line 331, in <module>
main()
File 
"/workdir/build.tppg2/tmp/work/tppg2-tps-linux-gnueabi/img-oac-anpr/1.0-r
0/recipe-sysroot-native/usr/bin/systemctl", line 319, in main
SystemdUnit(root, service).enable()
File 
"/workdir/build.tppg2/tmp/work/tppg2-tps-linux-gnueabi/img-oac-anpr/1.0-r
0/recipe-sysroot-native/usr/bin/systemctl", line 232, in enable
self._process_deps(config, service, path, 'WantedBy', 'wants', instance)
File 
"/workdir/build.tppg2/tmp/work/tppg2-tps-linux-gnueabi/img-oac-anpr/1.0-r
0/recipe-sysroot-native/usr/bin/systemctl", line 192, in _process_deps
dependent = re.sub("([^%](%%)*)%i", "\\1{}".format(instance), dependent)
File 
"/workdir/build.tppg2/tmp/work/tppg2-tps-linux-gnueabi/img-oac-anpr/1.0-r
0/recipe-sysroot-native/usr/lib/python3.8/re.py", line 210, in sub
return _compile(pattern, flags).sub(repl, string, count)
File 
"/workdir/build.tppg2/tmp/work/tppg2-tps-linux-gnueabi/img-oac-anpr/1.0-r
0/recipe-sysroot-native/usr/lib/python3.8/re.py", line 327, in _subx
template = _compile_repl(template, pattern)
File 
"/workdir/build.tppg2/tmp/work/tppg2-tps-linux-gnueabi/img-oac-anpr/1.0-r
0/recipe-sysroot-native/usr/lib/python3.8/re.py", line 318, in 
_compile_repl
return sre_parse.parse_template(repl, pattern)
File 
"/workdir/build.tppg2/tmp/work/tppg2-tps-linux-gnueabi/img-oac-anpr/1.0-r
0/recipe-sysroot-native/usr/lib/python3.8/sre_parse.py", line 1036, in 
parse_tem
plate
addgroup(int(this[1:]), len(this) - 1)
File 
"/workdir/build.tppg2/tmp/work/tppg2-tps-linux-gnueabi/img-oac-anpr/1.0-r
0/recipe-sysroot-native/usr/lib/python3.8/sre_parse.py", line 980, in 
addgroup
raise s.error("invalid group reference %d" % index, pos)
re.error: invalid group reference 19 at position 1
%post(oac-php-1.0-r0.noarch): waitpid(3549888) rc 3549888 status 100
warning: %post(oac-php-1.0-r0.noarch) scriptlet failed, exit status 1
Error in POSTIN scriptlet in rpm package oac-php
Installing : curl-7.69.1-r0.cortexa9hf_neon 849/863
diff mbox series

Patch

diff --git a/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot b/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot
index 8a68dd341a61..a82f7969b19e 100644
--- a/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot
+++ b/meta/recipes-extended/shadow/files/login.defs_shadow-sysroot
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: BSD-3-Clause | Artistic-1.0
 #
 # /etc/login.defs - Configuration control definitions for the shadow package.
 #
diff --git a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
index e05fa237a240..5f3c7e121f91 100644
--- a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
+++ b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb
@@ -3,7 +3,7 @@  HOMEPAGE = "http://github.com/shadow-maint/shadow"
 BUGTRACKER = "http://github.com/shadow-maint/shadow/issues"
 SECTION = "base utils"
 LICENSE = "BSD-3-Clause | Artistic-1.0"
-LIC_FILES_CHKSUM = "file://login.defs_shadow-sysroot;md5=25e2f2de4dfc8f966ac5cdfce45cd7d5"
+LIC_FILES_CHKSUM = "file://login.defs_shadow-sysroot;endline=1;md5=ce8f87ba229dc6de3285a0aac9199544"
 
 DEPENDS = "base-passwd"