systemd/tools/meson-vcs-tag.sh

#!/usr/bin/env bash

set -eu
set -o pipefail

dir="$1"
tag="$2"
fallback="$3"

if [ -n "$tag" ]; then
    echo "$tag"
    exit 0
fi

# Apparently git describe has a bug where it always considers the work-tree
# dirty when invoked with --git-dir (even though 'git status' is happy). Work
# around this issue by cd-ing to the source directory.
cd "$dir"
# Check that we have either .git/ (a normal clone) or a .git file (a work-tree)
# and that we don't get confused if a tarball is extracted in a higher-level
# git repository.
[ -e .git ] && git describe --abbrev=7 --dirty=+ 2>/dev/null | sed 's/^v//' || echo "$fallback"
treewide: more portable bash shebangs As in 2a5fcfae024ffc370bb780572279f45a1da3f946 and in 3e67e5c9928f8b1e1c5a63def88d53ed1fed12eb using /usr/bin/env allows bash to be looked up in PATH rather than being hard-coded. As with the previous changes the same arguments apply - distributions have scripts to rewrite shebangs on installation and they know what locations to rely on. - For tests/compilation we should rather rely on the user to have setup there PATH correctly. In particular this makes testing from git easier on NixOS where do not provide /bin/bash to improve compose-ability. 2020-03-04 12:35:06 +03:00			`#!/usr/bin/env bash`
meson: generate version tag from git $ build/systemctl --version systemd 239-3555-g6178cbb5b5 +PAM +AUDIT +SELINUX +IMA -APPARMOR +SMACK +SYSVINIT +UTMP +LIBCRYPTSETUP +GCRYPT +GNUTLS +ACL +XZ +LZ4 +SECCOMP +BLKID +ELFUTILS +KMOD -IDN2 +IDN +PCRE2 default-hierarchy=hybrid $ git tag v240 -m 'v240' $ ninja -C build ninja: Entering directory `build' [76/76] Linking target fuzz-unit-file. $ build/systemctl --version systemd 240 +PAM +AUDIT +SELINUX +IMA -APPARMOR +SMACK +SYSVINIT +UTMP +LIBCRYPTSETUP +GCRYPT +GNUTLS +ACL +XZ +LZ4 +SECCOMP +BLKID +ELFUTILS +KMOD -IDN2 +IDN +PCRE2 default-hierarchy=hybrid This is very useful during development, because a precise version string is embedded in the build product and displayed during boot, so we don't have to guess answers for questions like "did I just boot the latest version or the one from before?". This change creates an overhead for "noop" builds. On my laptop, 'ninja -C build' that does nothing goes from 0.1 to 0.5 s. It would be nice to avoid this, but I think that <1 s is still acceptable. Fixes #7183. PACKAGE_VERSION is renamed to GIT_VERSION, to make it obvious that this is the more dynamically changing version string. Why save to a file? It would be easy to generate the version tag using run_command(), but we want to go through a file so that stuff gets rebuilt when this file changes. If we just defined an variable in meson, ninja wouldn't know it needs to rebuild things. 2018-12-20 22:35:25 +03:00
			`set -eu`
			`set -o pipefail`

meson-vcs-tag: add work-around for git bug 2018-12-19 15:25:07 +03:00			`dir="$1"`
meson: allow setting the version string during configuration This will be useful when building distro packages, because we can set the version string to the rpm/dpkg/whatever version string, and getter reports from end users. 2018-12-19 15:33:09 +03:00			`tag="$2"`
			`fallback="$3"`

			`if [ -n "$tag" ]; then`
scripts: use 4 space indentation We had all kinds of indentation: 2 sp, 3 sp, 4 sp, 8 sp, and mixed. 4 sp was the most common, in particular the majority of scripts under test/ used that. Let's standarize on 4 sp, because many commandlines are long and there's a lot of nesting, and with 8sp indentation less stuff fits. 4 sp also seems to be the default indentation, so this will make it less likely that people will mess up if they don't load the editor config. (I think people often use vi, and vi has no support to load project-wide configuration automatically. We distribute a .vimrc file, but it is not loaded by default, and even the instructions in it seem to discourage its use for security reasons.) Also remove the few vim config lines that were left. We should either have them on all files, or none. Also remove some strange stuff like '#!/bin/env bash', yikes. 2019-04-04 15:10:42 +03:00			`echo "$tag"`
			`exit 0`
meson: allow setting the version string during configuration This will be useful when building distro packages, because we can set the version string to the rpm/dpkg/whatever version string, and getter reports from end users. 2018-12-19 15:33:09 +03:00			`fi`
meson: generate version tag from git $ build/systemctl --version systemd 239-3555-g6178cbb5b5 +PAM +AUDIT +SELINUX +IMA -APPARMOR +SMACK +SYSVINIT +UTMP +LIBCRYPTSETUP +GCRYPT +GNUTLS +ACL +XZ +LZ4 +SECCOMP +BLKID +ELFUTILS +KMOD -IDN2 +IDN +PCRE2 default-hierarchy=hybrid $ git tag v240 -m 'v240' $ ninja -C build ninja: Entering directory `build' [76/76] Linking target fuzz-unit-file. $ build/systemctl --version systemd 240 +PAM +AUDIT +SELINUX +IMA -APPARMOR +SMACK +SYSVINIT +UTMP +LIBCRYPTSETUP +GCRYPT +GNUTLS +ACL +XZ +LZ4 +SECCOMP +BLKID +ELFUTILS +KMOD -IDN2 +IDN +PCRE2 default-hierarchy=hybrid This is very useful during development, because a precise version string is embedded in the build product and displayed during boot, so we don't have to guess answers for questions like "did I just boot the latest version or the one from before?". This change creates an overhead for "noop" builds. On my laptop, 'ninja -C build' that does nothing goes from 0.1 to 0.5 s. It would be nice to avoid this, but I think that <1 s is still acceptable. Fixes #7183. PACKAGE_VERSION is renamed to GIT_VERSION, to make it obvious that this is the more dynamically changing version string. Why save to a file? It would be easy to generate the version tag using run_command(), but we want to go through a file so that stuff gets rebuilt when this file changes. If we just defined an variable in meson, ninja wouldn't know it needs to rebuild things. 2018-12-20 22:35:25 +03:00
meson-vcs-tag: add work-around for git bug 2018-12-19 15:25:07 +03:00			`# Apparently git describe has a bug where it always considers the work-tree`
			`# dirty when invoked with --git-dir (even though 'git status' is happy). Work`
			`# around this issue by cd-ing to the source directory.`
meson-vcs-tag: enhance version info generation When build from release tarball and where there is parent .git dir, this situtaion will get wrong version info. (build with buildroot) The systemd running show wrong version in dmesg log: systemd[1]: systemd 2019.02-1086-gf5f17c4 running in system mode. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Shoule be: systemd[1]: systemd 241 running in system mode. (-PAM -AUDIT -SEL ^^^^^^^^^^^ 2019-05-10 11:58:08 +03:00			`cd "$dir"`
			`# Check that we have either .git/ (a normal clone) or a .git file (a work-tree)`
			`# and that we don't get confused if a tarball is extracted in a higher-level`
			`# git repository.`
			`[ -e .git ] && git describe --abbrev=7 --dirty=+ 2>/dev/null \| sed 's/^v//' \|\| echo "$fallback"`