diff --git a/Makefile b/Makefile index ff25027c13..d1d1c88943 100644 --- a/Makefile +++ b/Makefile @@ -783,9 +783,9 @@ endif # counterparts are appropriately setup as symlinks ones to the others. @$(call MESSAGE,"Sanity check in overlays $(call qstrip,$(BR2_ROOTFS_OVERLAY))") support/scripts/check-merged \ - --type overlay \ - $(if $(BR2_ROOTFS_MERGED_USR),--merged-usr) \ - $(if $(BR2_ROOTFS_MERGED_BIN),--merged-bin) \ + -t overlay \ + $(if $(BR2_ROOTFS_MERGED_USR),-u) \ + $(if $(BR2_ROOTFS_MERGED_BIN),-b) \ $(call qstrip,$(BR2_ROOTFS_OVERLAY)) $(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \ diff --git a/package/skeleton-custom/skeleton-custom.mk b/package/skeleton-custom/skeleton-custom.mk index 7c79500046..b5a1a5e80d 100644 --- a/package/skeleton-custom/skeleton-custom.mk +++ b/package/skeleton-custom/skeleton-custom.mk @@ -25,9 +25,9 @@ endif define SKELETON_CUSTOM_CONFIGURE_CMDS support/scripts/check-merged \ - --type skeleton \ - $(if $(BR2_ROOTFS_MERGED_USR),--merged-usr) \ - $(if $(BR2_ROOTFS_MERGED_BIN),--merged-bin) \ + -t skeleton \ + $(if $(BR2_ROOTFS_MERGED_USR),-u) \ + $(if $(BR2_ROOTFS_MERGED_BIN),-b) \ $(SKELETON_CUSTOM_PATH) endef diff --git a/support/scripts/check-merged b/support/scripts/check-merged index bff6ae2b7b..447abfd815 100755 --- a/support/scripts/check-merged +++ b/support/scripts/check-merged @@ -23,9 +23,9 @@ # 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 +# -t TYPE the type of root to check: 'skeleton' or 'overlay' +# -u check for merged /usr +# -b check for merged /usr/bin # $*: the root directories (skeleton, overlays) to check # Output: # stdout: the list of non-compliant paths (empty if compliant). @@ -34,31 +34,16 @@ # !0: if any directory to check is improperly merged # -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) - type="${2}" - shift 2 - ;; - (--merged-usr) - merged_usr=true - shift - ;; - (--merged-bin) - merged_bin=true - shift - ;; - (--) - shift - break - ;; +while getopts "t:ub" OPT; do + case "${OPT}" in + (t) type="${OPTARG}";; + (u) merged_usr=true;; + (b) merged_bin=true;; + (:) printf "option %s expects a mandatory argument\n" "${OPTARG}"; exit 1;; + (\?) printf "unknown option %s\n" "${OPTARG}"; exit 1;; esac done