[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc4a17f46c98c362b07ac853631530126ca46716
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via cc4a17f46c98c362b07ac853631530126ca46716 (commit) via 787d9428af6abe3fb3a90bd2dbbfe3e650f6b1fa (commit) via 2b4d457c2fd29aa5f81e15e1c239add5b6fa4f2c (commit) via 9a07118b716f168ff5b8c0c718862b3a72e4ab77 (commit) from 0e2cf06a8cd2b7970444e5bc473aab978ab403a4 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit cc4a17f46c98c362b07ac853631530126ca46716 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Aug 23 09:22:17 2024 +0000
Run "./make.sh lang"
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 787d9428af6abe3fb3a90bd2dbbfe3e650f6b1fa Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Aug 23 09:19:49 2024 +0000
make.sh: Fix printing the total build time
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2b4d457c2fd29aa5f81e15e1c239add5b6fa4f2c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 21 14:36:11 2024 +0000
Revert "make.sh: Swap mount propagation"
This reverts commit f3c360cd6e8daf0431f684bfad9c55f64bad6c7f.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9a07118b716f168ff5b8c0c718862b3a72e4ab77 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 21 14:29:58 2024 +0000
make.sh: Remove the brackets from build options
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.de | 1 - doc/language_issues.en | 1 - doc/language_issues.es | 1 - doc/language_issues.fr | 1 - doc/language_issues.it | 1 - doc/language_issues.nl | 1 - doc/language_issues.pl | 1 - doc/language_issues.ru | 1 - doc/language_issues.tr | 1 - make.sh | 11 ++++++----- 10 files changed, 6 insertions(+), 14 deletions(-)
Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 3241f8dea..b3d7082df 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -942,7 +942,6 @@ WARNING: untranslated string: guardian blocking of this address is not allowed = WARNING: untranslated string: guardian blocktime = unknown string WARNING: untranslated string: guardian common settings = unknown string WARNING: untranslated string: guardian configuration = unknown string -WARNING: untranslated string: guardian daemon = unknown string WARNING: untranslated string: guardian empty input = unknown string WARNING: untranslated string: guardian enabled = unknown string WARNING: untranslated string: guardian firewallaction = unknown string diff --git a/doc/language_issues.en b/doc/language_issues.en index a1a1e15dd..3aa4e9bd8 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -993,7 +993,6 @@ WARNING: untranslated string: guardian blocking of this address is not allowed = WARNING: untranslated string: guardian blocktime = unknown string WARNING: untranslated string: guardian common settings = unknown string WARNING: untranslated string: guardian configuration = unknown string -WARNING: untranslated string: guardian daemon = unknown string WARNING: untranslated string: guardian empty input = unknown string WARNING: untranslated string: guardian enabled = unknown string WARNING: untranslated string: guardian firewallaction = unknown string diff --git a/doc/language_issues.es b/doc/language_issues.es index 42652aea6..fbbcd1e74 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1004,7 +1004,6 @@ WARNING: untranslated string: guardian blocking of this address is not allowed = WARNING: untranslated string: guardian blocktime = unknown string WARNING: untranslated string: guardian common settings = unknown string WARNING: untranslated string: guardian configuration = unknown string -WARNING: untranslated string: guardian daemon = unknown string WARNING: untranslated string: guardian empty input = unknown string WARNING: untranslated string: guardian enabled = unknown string WARNING: untranslated string: guardian firewallaction = unknown string diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 212f2abb7..25193da6a 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -960,7 +960,6 @@ WARNING: untranslated string: guardian blocking of this address is not allowed = WARNING: untranslated string: guardian blocktime = unknown string WARNING: untranslated string: guardian common settings = unknown string WARNING: untranslated string: guardian configuration = unknown string -WARNING: untranslated string: guardian daemon = unknown string WARNING: untranslated string: guardian empty input = unknown string WARNING: untranslated string: guardian enabled = unknown string WARNING: untranslated string: guardian firewallaction = unknown string diff --git a/doc/language_issues.it b/doc/language_issues.it index d5e7b3e89..f00d959d5 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1079,7 +1079,6 @@ WARNING: untranslated string: guardian blocking of this address is not allowed = WARNING: untranslated string: guardian blocktime = unknown string WARNING: untranslated string: guardian common settings = unknown string WARNING: untranslated string: guardian configuration = unknown string -WARNING: untranslated string: guardian daemon = unknown string WARNING: untranslated string: guardian empty input = unknown string WARNING: untranslated string: guardian enabled = unknown string WARNING: untranslated string: guardian firewallaction = unknown string diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 607bfc9f1..9607f98af 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1085,7 +1085,6 @@ WARNING: untranslated string: guardian blocking of this address is not allowed = WARNING: untranslated string: guardian blocktime = unknown string WARNING: untranslated string: guardian common settings = unknown string WARNING: untranslated string: guardian configuration = unknown string -WARNING: untranslated string: guardian daemon = unknown string WARNING: untranslated string: guardian empty input = unknown string WARNING: untranslated string: guardian enabled = unknown string WARNING: untranslated string: guardian firewallaction = unknown string diff --git a/doc/language_issues.pl b/doc/language_issues.pl index d6fbb79cf..92ad3b7be 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1223,7 +1223,6 @@ WARNING: untranslated string: guardian blocking of this address is not allowed = WARNING: untranslated string: guardian blocktime = unknown string WARNING: untranslated string: guardian common settings = unknown string WARNING: untranslated string: guardian configuration = unknown string -WARNING: untranslated string: guardian daemon = unknown string WARNING: untranslated string: guardian empty input = unknown string WARNING: untranslated string: guardian enabled = unknown string WARNING: untranslated string: guardian firewallaction = unknown string diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 6b7253718..35a590b6b 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1218,7 +1218,6 @@ WARNING: untranslated string: guardian blocking of this address is not allowed = WARNING: untranslated string: guardian blocktime = unknown string WARNING: untranslated string: guardian common settings = unknown string WARNING: untranslated string: guardian configuration = unknown string -WARNING: untranslated string: guardian daemon = unknown string WARNING: untranslated string: guardian empty input = unknown string WARNING: untranslated string: guardian enabled = unknown string WARNING: untranslated string: guardian firewallaction = unknown string diff --git a/doc/language_issues.tr b/doc/language_issues.tr index df9eb58bb..3bf595efe 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1021,7 +1021,6 @@ WARNING: untranslated string: guardian blocking of this address is not allowed = WARNING: untranslated string: guardian blocktime = unknown string WARNING: untranslated string: guardian common settings = unknown string WARNING: untranslated string: guardian configuration = unknown string -WARNING: untranslated string: guardian daemon = unknown string WARNING: untranslated string: guardian empty input = unknown string WARNING: untranslated string: guardian enabled = unknown string WARNING: untranslated string: guardian firewallaction = unknown string diff --git a/make.sh b/make.sh index 6516f9dc0..cf12e4237 100755 --- a/make.sh +++ b/make.sh @@ -192,7 +192,7 @@ print_package() {
# Add the options if [ -n "${options}" ]; then - string="${string} (${options[@]})" + string="${string} ${options[@]}" fi
# Print the string @@ -241,9 +241,10 @@ print_status() { }
print_build_summary() { - local runtime=$(format_runtime $@) + local runtime="${1}"
- print_line "*** Build finished in ${runtime}" + print_line "*** Build Finished" + print_runtime "${runtime}" print_status DONE }
@@ -656,7 +657,7 @@ execute() {
# Create a new mount namespace "--mount" - "--propagation=private" + "--propagation=slave"
# Create a new PID namespace and fork "--pid" @@ -2154,7 +2155,7 @@ exec_in_namespace() { IN_NAMESPACE=1 \ exec unshare \ --mount \ - --propagation=slave \ + --propagation=private \ "${0}" "${args[@]}" "$@" }
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer