From ba5c0c37d143d39b1f2bd3b673bb142fdb296309 Mon Sep 17 00:00:00 2001 From: Roland Clobus Date: Wed, 20 Apr 2022 08:54:19 +0200 Subject: [PATCH] Use a shorter suffix for modified development versions. The default --iso-preparer value will fit into 128 bytes for a git checkout with local modifications (the longest version variant). --- functions/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/common.sh b/functions/common.sh index ede7c773f..6acaf34b6 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -19,10 +19,10 @@ VERSION="" # 3) For installed versions, the version from the file VERSION if [ ! -z "${LIVE_BUILD}" -a "$(command -v git)" -a -e ${LIVE_BUILD}/.git ]; then VERSION="$(cd ${LIVE_BUILD}; git log -n 1 --pretty=format:%H_%aI)" - # If a local modification is made or there are staged commits, add 'with_local_changes' + # If a local modification is made or there are staged commits, add 'mod' # See https://stackoverflow.com/questions/2657935/checking-for-a-dirty-index-or-untracked-files-with-git if ! $(cd ${LIVE_BUILD}; git diff-index --quiet HEAD --ignore-submodules --); then - VERSION="${VERSION}_with_local_changes" + VERSION="${VERSION}_mod" fi fi if [ -z "${VERSION}" -a ! -z "${LIVE_BUILD}" -a -e ${LIVE_BUILD}/debian/changelog ]; then