Applied

Lucas De Marchi

On Fri, Dec 18, 2020 at 8:08 AM Lucas De Marchi
[off-list ref] wrote:

When there isn't a modules.builtin.modinfo from the kernel, depmod
should not generate and 0-sized modules.builtin.alias.bin file. It
should rather be an empty index.

Lucas De Marchi (3):
  depmod: unconditionally write builtin.alias.bin
  shared: fix UNIQ definition
  testsuite: add test for empty modules.builtin.aliases.bin

 shared/macro.h                                     |   7 +++++--
 .../lib/modules/5.6.0/modules.alias                |   1 +
 .../lib/modules/5.6.0/modules.alias.bin            | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.builtin              |   1 +
 .../lib/modules/5.6.0/modules.builtin.alias.bin    | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.builtin.bin          | Bin 0 -> 39 bytes
 .../lib/modules/5.6.0/modules.dep                  |   0
 .../lib/modules/5.6.0/modules.dep.bin              | Bin 0 -> 12 bytes
 .../lib/modules/5.6.0/modules.devname              |   1 +
 .../lib/modules/5.6.0/modules.softdep              |   1 +
 .../lib/modules/5.6.0/modules.symbols              |   1 +
 .../lib/modules/5.6.0/modules.symbols.bin          | Bin 0 -> 12 bytes
 testsuite/test-init.c                              |   9 ++++++++-
 testsuite/testsuite.h                              |   2 +-
 tools/depmod.c                                     |  10 ++++++----
 15 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.alias.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.alias.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.builtin.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.dep.bin
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.devname
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.softdep
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols
 create mode 100644 testsuite/rootfs-pristine/test-init-load-resources-empty-builtin-aliases-bin/lib/modules/5.6.0/modules.symbols.bin

--
2.29.2