.semaphore/semaphore.yml

@@ -1,27 +0,0 @@
----
-# vi: ts=2 sw=2 et:
-
-version: v1.0
-name: Debian autopkgtest (LXC)
-agent:
-  machine:
-    type: e1-standard-2
-    os_image: ubuntu1804
-
-# Cancel any running or queued job for the same ref
-auto_cancel:
-  running:
-    when: "true"
-
-execution_time_limit:
-  hours: 1
-
-blocks:
-  - name: "Setup & test"
-    task:
-      jobs:
-        - name: "Install dependencies & run the Debian autopkgtest"
-          commands:
-            - checkout --use-cache
-            - .semaphore/semaphore-runner.sh SETUP
-            - .semaphore/semaphore-runner.sh RUN

README.md

@@ -4,7 +4,7 @@ System and Service Manager
 
 <a href="https://in.waw.pl/systemd-github-state/systemd-systemd-issues.svg"><img align="right" src="https://in.waw.pl/systemd-github-state/systemd-systemd-issues-small.svg" alt="Count of open issues over time"></a>
 <a href="https://in.waw.pl/systemd-github-state/systemd-systemd-pull-requests.svg"><img align="right" src="https://in.waw.pl/systemd-github-state/systemd-systemd-pull-requests-small.svg" alt="Count of open pull requests over time"></a>
-[![Semaphore CI 2.0 Build Status](https://the-real-systemd.semaphoreci.com/badges/systemd/branches/master.svg?style=shields)](https://the-real-systemd.semaphoreci.com/projects/systemd)<br/>
+[![Semaphore CI Build Status](https://semaphoreci.com/api/v1/projects/28a5a3ca-3c56-4078-8b5e-7ed6ef912e14/443470/shields_badge.svg)](https://semaphoreci.com/systemd/systemd)<br/>
 [![Coverity Scan Status](https://scan.coverity.com/projects/350/badge.svg)](https://scan.coverity.com/projects/350)<br/>
 [![OSS-Fuzz Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/systemd.svg)](https://oss-fuzz-build-logs.storage.googleapis.com/index.html#systemd)<br/>
 [![CIFuzz](https://github.com/systemd/systemd/workflows/CIFuzz/badge.svg)](https://github.com/systemd/systemd/actions)<br/>

meson.build

@@ -555,24 +555,15 @@ endif
 
 #####################################################################
 
-version_tag = get_option('version-tag')
-if version_tag != ''
-        vcs_data = configuration_data()
-        vcs_data.set('VCS_TAG', version_tag)
-        version_h = configure_file(configuration : vcs_data,
-                                   input : 'src/version/version.h.in',
-                                   output : 'version.h')
-else
-        vcs_tagger = [
-                project_source_root + '/tools/meson-vcs-tag.sh',
+vcs_tagger = [project_source_root + '/tools/meson-vcs-tag.sh',
               project_source_root,
+              get_option('version-tag'),
               meson.project_version()]
 
-        version_h = vcs_tag(
+version_h = vcs_tag(
         input : 'src/version/version.h.in',
         output : 'version.h',
         command: vcs_tagger)
-endif
 
 versiondep = declare_dependency(sources: version_h)
 

mkosi.build

@@ -92,8 +92,7 @@ if [ ! -f "$BUILDDIR"/build.ninja ] ; then
                 -D man=false \
                 -D "nobody-user=$nobody_user" \
                 -D "nobody-group=$nobody_group" \
-                -D translations=false \
-                -D version-tag="${VERSION_TAG}"
+                -D translations=false
 fi
 
 cd "$BUILDDIR"

src/basic/fs-util.h

@@ -43,8 +43,7 @@ int futimens_opath(int fd, const struct timespec ts[2]);
 int fd_warn_permissions(const char *path, int fd);
 int stat_warn_permissions(const char *path, const struct stat *st);
 
-#define laccess(path, mode)                                             \
-        (faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) < 0 ? -errno : 0)
+#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW)
 
 int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode);
 int touch(const char *path);

src/core/macros.systemd.in

@@ -5,7 +5,6 @@
 
 # RPM macros for packages installing systemd unit files
 
-%_systemd_util_dir @rootlibexecdir@
 %_unitdir @systemunitdir@
 %_userunitdir @userunitdir@
 %_presetdir @systempresetdir@

tools/meson-vcs-tag.sh

@@ -4,7 +4,13 @@ set -eu
 set -o pipefail
 
 dir="$1"
-fallback="$2"
+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