mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

support/scripts: also exit in error on improperly merged-usr

Browse Source 
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
Yann E. MORIN
2025-09-01 11:01:15 +02:00
committed by Romain Naour
parent 9bc1453856
commit 74b29f34ba
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
support/scripts/check-merged-usr.sh
View File

@@ -14,6 +14,9 @@
# $1: the root directory (skeleton, overlay) to check # $1: the root directory (skeleton, overlay) to check
# Output: # Output:
# stdout: the list of non-compliant paths (empty if compliant). # stdout: the list of non-compliant paths (empty if compliant).
# Exit code:
# 0: in case of success (stdout will be empty)
# !0: if any path is improperly merged
# #
# The directory to check for merged-usr # The directory to check for merged-usr
@@ -45,9 +48,13 @@ test_merged() {
if ! is_valid_merged "${root}" "${dir1}" "${dir2}"; then if ! is_valid_merged "${root}" "${dir1}" "${dir2}"; then
printf '%s\n' "${dir1}" printf '%s\n' "${dir1}"
is_success=false
fi fi
} }
is_success=true
test_merged "${root}" "/lib" "/usr/lib" test_merged "${root}" "/lib" "/usr/lib"
test_merged "${root}" "/bin" "/usr/bin" test_merged "${root}" "/bin" "/usr/bin"
test_merged "${root}" "/sbin" "/usr/sbin" test_merged "${root}" "/sbin" "/usr/sbin"
${is_success}