From 0eb873bda0c019269cefe04d8c06abea2b371b37 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 1 Sep 2025 11:01:18 +0200 Subject: [PATCH] support/scripts: rename check-merged-usr.sh We're going to need it to check merged-bin, so the naming would be misleading as it would no longer be just about merged-usr. Also drop the extension, it's useless. Signed-off-by: Yann E. MORIN Acked-by: Arnout Vandecappelle Signed-off-by: Romain Naour --- Makefile | 2 +- package/skeleton-custom/skeleton-custom.mk | 2 +- support/scripts/{check-merged-usr.sh => check-merged} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename support/scripts/{check-merged-usr.sh => check-merged} (100%) diff --git a/Makefile b/Makefile index 77ca3b4702..935893be17 100644 --- a/Makefile +++ b/Makefile @@ -783,7 +783,7 @@ endif # counterparts are appropriately setup as symlinks ones to the others. ifeq ($(BR2_ROOTFS_MERGED_USR),y) @$(call MESSAGE,"Sanity check in overlays $(call qstrip,$(BR2_ROOTFS_OVERLAY))") - support/scripts/check-merged-usr.sh \ + support/scripts/check-merged \ --type overlay \ $(call qstrip,$(BR2_ROOTFS_OVERLAY)) endif # merged /usr diff --git a/package/skeleton-custom/skeleton-custom.mk b/package/skeleton-custom/skeleton-custom.mk index c194108307..82e1506156 100644 --- a/package/skeleton-custom/skeleton-custom.mk +++ b/package/skeleton-custom/skeleton-custom.mk @@ -27,7 +27,7 @@ endif # counterparts are appropriately setup as symlinks ones to the others. ifeq ($(BR2_ROOTFS_MERGED_USR),y) define SKELETON_CUSTOM_NOT_MERGED_USR_DIRS - support/scripts/check-merged-usr.sh \ + support/scripts/check-merged \ --type skeleton \ $(SKELETON_CUSTOM_PATH) endef diff --git a/support/scripts/check-merged-usr.sh b/support/scripts/check-merged similarity index 100% rename from support/scripts/check-merged-usr.sh rename to support/scripts/check-merged