support/check-bin-arch: exclude kernel modules for merged /usr

When using a merged /usr, the kernel module path is really
/usr/lib/modules, as /lib is a symlink to usr/lib .

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Reviewed-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 1b9a57442d0a234b03585235f516d755372f29b3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt
index eecf6e2ec05f82bf3ade9ffa030c4a72ceb8266b..521d6d50c7d57cd026d1b18cca72af4ea29b4aea 100644 (file)
--- a/docs/manual/adding-packages-generic.txt
+++ b/docs/manual/adding-packages-generic.txt
@@ -457,8 +457,8 @@ information is (assuming the package name is +libfoo+) :
   to the target directory) to ignore when checking that the package
   installs correctly cross-compiled binaries. You seldom need to set this
   variable, unless the package installs binary blobs outside the default
-  locations, `/lib/firmware`, `/usr/lib/firmware`, `/lib/modules`, and
-  `/usr/share`, which are automatically excluded.
+  locations, `/lib/firmware`, `/usr/lib/firmware`, `/lib/modules`,
+  `/usr/lib/modules`, and `/usr/share`, which are automatically excluded.
 
 The recommended way to define these variables is to use the following
 syntax:

diff --git a/support/scripts/check-bin-arch b/support/scripts/check-bin-arch
index d8385b4fcf2161e37b18fd3ea0d5b9cc4ed127f6..7f97696735c847c45c443642583d932268ded487 100755 (executable)
--- a/support/scripts/check-bin-arch
+++ b/support/scripts/check-bin-arch
@@ -14,6 +14,7 @@ declare -a IGNORES=(
        # and its modules may still be 64-bit. To keep the basic
        # check-bin-arch logic simple, just skip this directory.
        "/lib/modules"
+       "/usr/lib/modules"
 
        # Skip files in /usr/share, several packages (qemu,
        # pru-software-support) legitimately install ELF binaries that