mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes/package_rpm: write file permissions and ownership explicitly into .spec

Browse Source 
Per 77d3529c31
rpm 4.19.1+ will not consider actual filesystem permissions and ownership, and will quietly default
to root if not expictly set otherwise in .spec file.

There's also additional diagnostics (printing what is in passwd/group)
when user/group name lookup against the sysroot fails.
That is never supposed to happen, and yet there was one report that it did:
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/8493/steps/23/logs/stdio

Investigating that issue led to the first three commits in this patchset:

sysroot user management postinsts: run with /bin/sh -e to report errors when they happen
classes/multilib: expand PACKAGE_WRITE_DEPS in addition to DEPENDS
classes/staging: capture output of sysroot postinsts into logs

(From OE-Core rev: a9db9a56617459e8f6f6dd466f2e18a7eed5c1e3)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-01-26 14:34:51 +01:00
committed by Richard Purdie
parent d00682ab5c
commit 347abb8c06
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
meta/classes-global/package_rpm.bbclass
View File

@@ -103,6 +103,7 @@ def write_rpm_perfiledata(srcname, d):
python write_specfile () {
import oe.packagedata
import os,pwd,grp,stat
# append information for logs and patches to %prep
def add_prep(d, spec_files_bottom):
@@ -198,6 +199,23 @@ python write_specfile () {
# of the walk, the isdir() test would then fail and the walk code would assume its a file
# hence we check for the names in files too.
for rootpath, dirs, files in os.walk(walkpath):
def get_attr(path):
stat_f = os.stat(rootpath + "/" + path, follow_symlinks=False)
mode = stat.S_IMODE(stat_f.st_mode)
try:
owner = pwd.getpwuid(stat_f.st_uid).pw_name
except Exception as e:
bb.error("Content of /etc/passwd in sysroot:\n{}".format(
open(d.getVar("RECIPE_SYSROOT") +"/etc/passwd").read()))
raise e
try:
group = grp.getgrgid(stat_f.st_gid).gr_name
except Exception as e:
bb.error("Content of /etc/group in sysroot:\n{}".format(
open(d.getVar("RECIPE_SYSROOT") +"/etc/group").read()))
raise e
return "%attr({:o},{},{}) ".format(mode, owner, group)
path = rootpath.replace(walkpath, "")
if path.endswith("DEBIAN") or path.endswith("CONTROL"):
continue
@@ -221,24 +239,28 @@ python write_specfile () {
if dir == "CONTROL" or dir == "DEBIAN":
continue
dir = dir.replace("%", "%%%%%%%%")
p = path + '/' + dir
# All packages own the directories their files are in...
target.append('%dir "' + path + '/' + dir + '"')
target.append(get_attr(dir) + '%dir "' + p + '"')
else:
# packages own only empty directories or explict directory.
# This will prevent the overlapping of security permission.
attr = get_attr(path)
if path and not files and not dirs:
target.append('%dir "' + path + '"')
target.append(attr + '%dir "' + path + '"')
elif path and path in dirfiles:
target.append('%dir "' + path + '"')
target.append(attr + '%dir "' + path + '"')
for file in files:
if file == "CONTROL" or file == "DEBIAN":
continue
file = file.replace("%", "%%%%%%%%")
if conffiles.count(path + '/' + file):
target.append('%config "' + path + '/' + file + '"')
attr = get_attr(file)
p = path + '/' + file
if conffiles.count(p):
target.append(attr + '%config "' + p + '"')
else:
target.append('"' + path + '/' + file + '"')
target.append(attr + '"' + p + '"')
# Prevent the prerm/postrm scripts from being run during an upgrade
def wrap_uninstall(scriptvar):