-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve version handling in the repository and ZBM images
- Track installed version in ${zfsbootmenu_module_root}/zbm-release
- Install zbm-release as /etc/zbm-release in ZFSBootMenu images
- Add releng/version.sh to manage repository versioning
- Mark post-release development versions as part of release tagging
- Improve version handling in ZFSBootMenu build containers:
* zbm-builder.sh: allow temporary, writable overlays of /zbm
* releng/docker/build-init.sh: update ZBM version when possible
* releng/docker/image-build.sh: install git in standard images- Loading branch information
Showing
11 changed files
with
240 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| #!/bin/sh | ||
| # vim: softtabstop=2 shiftwidth=2 expandtab | ||
|
|
||
| usage() { | ||
| cat <<-EOF | ||
| USAGE: $0 [options] | ||
| OPTIONS | ||
| -h | ||
| Display this message and exit | ||
| -u | ||
| Update zbm-release and generate-zbm version information | ||
| -v <version> | ||
| Specify a particular version to use | ||
| EOF | ||
| } | ||
|
|
||
| detect_version() { | ||
| # If git-describe does the job, the job is done | ||
| version="$(git describe --tags HEAD 2>/dev/null)" || version="" | ||
|
|
||
| case "${version}" in | ||
| v[0-9]*) version="${version#v}" | ||
| esac | ||
|
|
||
| if [ -n "${version}" ]; then | ||
| echo "${version}" | ||
| return 0 | ||
| fi | ||
|
|
||
| # Otherwise, use git-rev-parse if possible | ||
| if branch="$(git rev-parse --abbrev-rev HEAD 2>/dev/null)"; then | ||
| case "${branch}" in | ||
| v[0-9]*) branch="${branch#v}" | ||
| esac | ||
|
|
||
| hash="$(git rev-parse --short HEAD 2>/dev/null)" || hash="" | ||
| [ -n "${hash}" ] && version="${branch:-UNKNOWN} (${hash})" | ||
|
|
||
| if [ -n "${version}" ]; then | ||
| echo "${version}" | ||
| return 0 | ||
| fi | ||
| fi | ||
|
|
||
| # Everything fell apart, so just try reading zbm-release | ||
| relfile="zfsbootmenu/zbm-release" | ||
| if [ -r "${relfile}" ]; then | ||
| # shellcheck disable=SC2153 | ||
| # shellcheck disable=SC1090 | ||
| version="$( . "${relfile}" 2>/dev/null && echo "${VERSION}" )" || version="" | ||
|
|
||
| if [ -n "${version}" ]; then | ||
| echo "${version}" | ||
| return 0 | ||
| fi | ||
| fi | ||
|
|
||
| # If there is no zbm-release, look to generate-zbm | ||
| genzbm="bin/generate-zbm" | ||
| if [ -r "${genzbm}" ]; then | ||
| # shellcheck disable=SC2016 | ||
| if verline="$(grep 'our $VERSION[[:space:]]*=' "${genzbm}")"; then | ||
| version="$(echo "${verline}" | head -n1 | sed -e "s/.*=[[:space:]]*['\"]//" -e "s/['\"].*//")" || version="" | ||
| if [ -n "${version}" ]; then | ||
| echo "${version}" | ||
| return 0 | ||
| fi | ||
| fi | ||
| fi | ||
|
|
||
| # There is apparently no version | ||
| echo "UNKNOWN" | ||
| return 1 | ||
| } | ||
|
|
||
| update_version() { | ||
| version="${1?a version is required}" | ||
|
|
||
| # Write zbm-release | ||
| if [ -d zfsbootmenu ] && [ -w zfsbootmenu ]; then | ||
| echo "Updating zfsbootmenu/zbm-release" | ||
| cat > zfsbootmenu/zbm-release <<-EOF | ||
| NAME="ZFSBootMenu" | ||
| PRETTY_NAME="ZFSBootMenu" | ||
| ID="zfsbootmenu" | ||
| ID_LIKE="void" | ||
| HOME_URL="https://zfsbootmenu.org" | ||
| DOCUMENTATION_URL="https://docs.zfsbootmenu.org" | ||
| BUG_REPORT_URL="https://github.com/zbm-dev/zfsbootmenu/issues" | ||
| SUPPORT_URL="https://github.com/zbm-dev/zfsbootmenu/discussions" | ||
| VERSION="${version}" | ||
| EOF | ||
| fi | ||
|
|
||
| # Update generate-zbm | ||
| if [ -w bin/generate-zbm ]; then | ||
| echo "Updating bin/generate-zbm" | ||
| sed -e "s/our \$VERSION.*/our \$VERSION = '${version}';/" -i bin/generate-zbm | ||
| fi | ||
| } | ||
|
|
||
| version= | ||
| update= | ||
| while getopts "huv:" opt; do | ||
| case "${opt}" in | ||
| u) | ||
| update="yes" | ||
| ;; | ||
| v) | ||
| version="${OPTARG}" | ||
| ;; | ||
| h) | ||
| usage | ||
| exit 0 | ||
| ;; | ||
| *) | ||
| usage >&2 | ||
| exit 1 | ||
| ;; | ||
| esac | ||
| done | ||
|
|
||
| [ -n "${version}" ] || version="$(detect_version)" | ||
|
|
||
| if [ "${update}" = yes ]; then | ||
| update_version "${version}" | ||
| else | ||
| echo "ZFSBootMenu version: ${version}" | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| NAME="ZFSBootMenu" | ||
| PRETTY_NAME="ZFSBootMenu" | ||
| ID="zfsbootmenu" | ||
| ID_LIKE="void" | ||
| HOME_URL="https://zfsbootmenu.org" | ||
| DOCUMENTATION_URL="https://docs.zfsbootmenu.org" | ||
| BUG_REPORT_URL="https://github.com/zbm-dev/zfsbootmenu/issues" | ||
| SUPPORT_URL="https://github.com/zbm-dev/zfsbootmenu/discussions" | ||
| VERSION="2.2.2+dev" |