1
0
mirror of https://github.com/systemd/systemd synced 2026-03-23 07:14:53 +01:00

Compare commits

...

3 Commits

Author SHA1 Message Date
Frantisek Sumsal
a2efdaac07 ci: add ppc64le Rawhide chroot to the Packit chroot set 2021-07-19 12:16:36 +01:00
James Hilliard
e5d86ebed5 Add meson option to disable urlify.
Useful for systems that don't use a version of less with hyperlink
support.
2021-07-19 11:57:51 +02:00
Luca Boccassi
95b63c755b git-contrib: copypaste-friendly output
Format output in a manner that can be copypasted as-is to NEWS.
That is, with 8 spaces indentation and wrapped at 80 columns.

Before:

$ tools/git-contrib.sh
        Ben Stockett,
        Carl Lei,
        Frantisek Sumsal,
        Gibeom Gwon,
        Hugo Osvaldo Barrera,
        James Hilliard,
        Jan Palus,
        Lennart Poettering,
        Luca Boccassi,
        Luca BRUNO,
        Mike Gilbert,
        nassir90,
        nl6720,
        Raul Tambre,
        Yegor Alexeyev,
        Yu Watanabe,
        Zbigniew Jędrzejewski-Szmek,

After:

        Contributions from: Ben Stockett, Carl Lei, Frantisek Sumsal,
        Gibeom Gwon, Hugo Osvaldo Barrera, James Hilliard, Jan Palus,
        Lennart Poettering, Luca Boccassi, Luca BRUNO, Mike Gilbert,
        nassir90, nl6720, Raul Tambre, Yegor Alexeyev, Yu Watanabe,
        Zbigniew Jędrzejewski-Szmek
2021-07-19 15:39:26 +09:00
5 changed files with 11 additions and 2 deletions

View File

@ -39,4 +39,5 @@ jobs:
targets: targets:
- fedora-rawhide-aarch64 - fedora-rawhide-aarch64
- fedora-rawhide-i386 - fedora-rawhide-i386
- fedora-rawhide-ppc64le
- fedora-rawhide-x86_64 - fedora-rawhide-x86_64

View File

@ -278,6 +278,7 @@ conf.set_quoted('USER_PRESET_DIR', userpresetdir)
conf.set_quoted('VENDOR_KEYRING_PATH', join_paths(rootlibexecdir, 'import-pubring.gpg')) conf.set_quoted('VENDOR_KEYRING_PATH', join_paths(rootlibexecdir, 'import-pubring.gpg'))
conf.set('ANSI_OK_COLOR', 'ANSI_' + get_option('ok-color').underscorify().to_upper()) conf.set('ANSI_OK_COLOR', 'ANSI_' + get_option('ok-color').underscorify().to_upper())
conf.set10('ENABLE_URLIFY', get_option('urlify'))
conf.set10('ENABLE_FEXECVE', get_option('fexecve')) conf.set10('ENABLE_FEXECVE', get_option('fexecve'))
conf.set10('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_default) conf.set10('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_default)
conf.set('STATUS_UNIT_FORMAT_DEFAULT', 'STATUS_UNIT_FORMAT_' + status_unit_format_default.to_upper()) conf.set('STATUS_UNIT_FORMAT_DEFAULT', 'STATUS_UNIT_FORMAT_' + status_unit_format_default.to_upper())

View File

@ -444,6 +444,8 @@ option('ok-color', type : 'combo',
'highlight-cyan', 'highlight-white'], 'highlight-cyan', 'highlight-white'],
value : 'green', value : 'green',
description: 'color of the "OK" status message') description: 'color of the "OK" status message')
option('urlify', type : 'boolean', value : 'true',
description : 'enable pager Hyperlink ANSI sequence support')
option('fexecve', type : 'boolean', value : 'false', option('fexecve', type : 'boolean', value : 'false',
description : 'use fexecve() to spawn children') description : 'use fexecve() to spawn children')

View File

@ -19,6 +19,7 @@
#include "util.h" #include "util.h"
bool urlify_enabled(void) { bool urlify_enabled(void) {
#if ENABLE_URLIFY
static int cached_urlify_enabled = -1; static int cached_urlify_enabled = -1;
if (cached_urlify_enabled < 0) { if (cached_urlify_enabled < 0) {
@ -32,6 +33,9 @@ bool urlify_enabled(void) {
} }
return cached_urlify_enabled; return cached_urlify_enabled;
#else
return 0;
#endif
} }
int terminal_urlify(const char *url, const char *text, char **ret) { int terminal_urlify(const char *url, const char *text, char **ret) {

View File

@ -5,4 +5,5 @@ set -eu
tag="$(git describe --abbrev=0 --match 'v[0-9][0-9][0-9]')" tag="$(git describe --abbrev=0 --match 'v[0-9][0-9][0-9]')"
git log --pretty=tformat:%aN --author=noreply@weblate.org --invert-grep -s "${tag}.." | \ git log --pretty=tformat:%aN --author=noreply@weblate.org --invert-grep -s "${tag}.." | \
sed 's/ / /g; s/--/-/g; s/.*/\0,/' | sed 's/ / /g; s/--/-/g; s/.*/\0,/' |
sort -u sort -u | tr '\n' ' ' | sed -e "s/^/Contributions from: /g" -e "s/,\s*$/\n/g" | fold -w 72 -s | \
sed -e "s/^/ /g" -e "s/\s*$//g"