mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 05:51:45 -09:00
Code Issues Packages Projects Releases Wiki Activity

system: add support for merged /usr/sbin (aka merged-bin)

Browse Source 
Starting with version 256 [0], systemd warns when /usr/bin and
/usr/sbin are different directories; in the future, it may even
refuse to boot in such a situation.

Add support for merged-bin, not unlike the support we have for
merged-usr; we also make merged-bin a sub-case of merged-usr
(i.e. it is not possible to do merged-bin without merged-usr).

[0] https://github.com/systemd/systemd/blob/v256/NEWS#L265

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Acked-by: Arnout Vandecappelle <arnout@mind.be>
Acked-by: TIAN Yuanhao <tianyuanhao3@163.com>
Cc: Edgar Bonet <bonet@grenoble.cnrs.fr>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
Yann E. MORIN
2025-09-01 11:01:20 +02:00
committed by Romain Naour
parent fc3cdc6d1e
commit 428ac6fcc4
6 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
support/scripts/check-merged
View File

@@ -1,7 +1,9 @@
#!/usr/bin/env bash
#
# Check if a given custom skeleton or overlay complies to the merged /usr
# Check if a given custom skeleton or overlay complies to the merged
# requirements:
#
# - for merged-usr:
# /bin missing, or a relative symlink to usr/bin
# /lib missing, or a relative symlink to usr/lib
# /sbin missing, or a relative symlink to usr/sbin
@@ -11,9 +13,14 @@
#
# *: must be present for skeletons, can be missing for overlays
#
# - for merged-bin: all of the above, except:
# /usr/sbin missing, or a relative symlink to bin (thus points
# to /usr/bin)
#
# Input:
# --type TYPE the type of root to check: 'skeleton' or 'overlay'
# --merged-usr check for merged /usr
# --merged-bin check for merged /usr/bin
# $*: the root directories (skeleton, overlays) to check
# Output:
# stdout: the list of non-compliant paths (empty if compliant).
@@ -22,12 +29,13 @@
# !0: if any directory to check is improperly merged
#
opts="type:,merged-usr"
opts="type:,merged-usr,merged-bin"
ARGS="$(getopt -n check-merged -o "" -l "${opts}" -- "${@}")" || exit 1
eval set -- "${ARGS}"
type=
merged_usr=false
merged_bin=false
while :; do
case "${1}" in
(--type)
@@ -38,6 +46,10 @@ while :; do
merged_usr=true
shift
;;
(--merged-bin)
merged_bin=true
shift
;;
(--)
shift
break
@@ -110,10 +122,14 @@ for root; do
if ${merged_usr}; then
test_dir "${type}" "${root}" "/" "usr/bin"
test_dir "${type}" "${root}" "/" "usr/lib"
test_dir "${type}" "${root}" "/" "usr/sbin"
test_merged "${type}" "${root}" "/" "bin" "usr/bin"
test_merged "${type}" "${root}" "/" "lib" "usr/lib"
test_merged "${type}" "${root}" "/" "sbin" "usr/sbin"
if ${merged_bin}; then
test_merged "${type}" "${root}" "/usr/" "sbin" "bin"
else
test_dir "${type}" "${root}" "/" "usr/sbin"
fi
fi
done