Remove use of PACKAGE_STRING

PACKAGE_VERSION is more explicit, and also, we don't pretend that changing the
project name in meson.build has any real effect. "systemd" is embedded in a
thousand different places, so let's just use the hardcoded string consistently.
This is mostly in preparation for future changes.

diff --git a/meson.build b/meson.build
index 1608278fbb03b11e09bc15ac98c1891348a07d5f..88fe6a16156d571589b715a7b86fd055e2e8a696 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,6 @@ libudev_version = '1.6.11'
 # names, sometimes. Not all variables are included in every
 # set. Ugh, ugh, ugh!
 conf = configuration_data()
-conf.set_quoted('PACKAGE_STRING',  meson.project_name() + ' ' + meson.project_version())
 conf.set_quoted('PACKAGE_VERSION', meson.project_version())
 
 substs = configuration_data()

diff --git a/src/basic/util.c b/src/basic/util.c
index c4f12a6daa052751576de06b65aac1220debe338..4d0c64f932fe21230a611208746b6a1e6e0f148b 100644 (file)
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -557,7 +557,7 @@ uint64_t system_tasks_max_scale(uint64_t v, uint64_t max) {
 }
 
 int version(void) {
-        puts(PACKAGE_STRING "\n"
+        puts("systemd " PACKAGE_VERSION "\n"
              SYSTEMD_FEATURES);
         return 0;
 }

diff --git a/src/core/main.c b/src/core/main.c
index 839dc062ff780700c9213beec517468c6ed66bcb..0c2313fc191a2ae36a373f4037477358a0f41a0c 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1914,7 +1914,7 @@ static void log_execution_mode(bool *ret_first_boot) {
         if (arg_system) {
                 int v;
 
-                log_info(PACKAGE_STRING " running in %ssystem mode. (" SYSTEMD_FEATURES ")",
+                log_info("systemd " PACKAGE_VERSION " running in %ssystem mode. (" SYSTEMD_FEATURES ")",
                          arg_action == ACTION_TEST ? "test " : "" );
 
                 v = detect_virtualization();
@@ -1942,7 +1942,7 @@ static void log_execution_mode(bool *ret_first_boot) {
                         _cleanup_free_ char *t;
 
                         t = uid_to_name(getuid());
-                        log_debug(PACKAGE_STRING " running in %suser mode for user " UID_FMT "/%s. (" SYSTEMD_FEATURES ")",
+                        log_debug("systemd " PACKAGE_VERSION " running in %suser mode for user " UID_FMT "/%s. (" SYSTEMD_FEATURES ")",
                                   arg_action == ACTION_TEST ? " test" : "", getuid(), strna(t));
                 }
 

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 1e08fcc55415468597086855c8a8bd5e2705d6fd..8d459235bfd9e175eb16910f869718ad05d83c08 100644 (file)
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -236,7 +236,7 @@ int start_upload(Uploader *u,
                         easy_setopt(curl, CURLOPT_VERBOSE, 1L, LOG_WARNING, );
 
                 easy_setopt(curl, CURLOPT_USERAGENT,
-                            "systemd-journal-upload " PACKAGE_STRING,
+                            "systemd-journal-upload " PACKAGE_VERSION,
                             LOG_WARNING, );
 
                 if (arg_key || startswith(u->url, "https://")) {