From d1f19b1dd74218181c80d4eaac2c2f998a0c81c7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 28 Oct 2020 13:55:35 +0000 Subject: [PATCH] add gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch --- ...x-usage-of-sd_journal_send-on-32-bit.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch diff --git a/gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch b/gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch new file mode 100644 index 0000000..158b0dd --- /dev/null +++ b/gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch @@ -0,0 +1,29 @@ +From ac26db038e67ea7fe8236cfafabcba74ad89b894 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 22 Oct 2020 14:25:51 +0000 +Subject: [PATCH] sysroot: Fix usage of sd_journal_send on 32 bit + +See https://bugzilla.redhat.com/show_bug.cgi?id=1890577 + +This is the same as https://github.com/ostreedev/ostree/pull/2219 +--- + src/daemon/rpmostree-sysroot-upgrader.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c +index 32e77a0a3..7a8e1e9ea 100644 +--- a/src/daemon/rpmostree-sysroot-upgrader.c ++++ b/src/daemon/rpmostree-sysroot-upgrader.c +@@ -1328,9 +1328,9 @@ write_history (RpmOstreeSysrootUpgrader *self, + SD_ID128_FORMAT_VAL(RPMOSTREE_NEW_DEPLOYMENT_MSG), + "MESSAGE=Created new deployment /%s", deployment_dirpath, + "DEPLOYMENT_PATH=/%s", deployment_dirpath, +- "DEPLOYMENT_TIMESTAMP=%ld", stbuf.st_ctime, +- "DEPLOYMENT_DEVICE=%u", stbuf.st_dev, +- "DEPLOYMENT_INODE=%u", stbuf.st_ino, ++ "DEPLOYMENT_TIMESTAMP=%" PRIu64, (uint64_t) stbuf.st_ctime, ++ "DEPLOYMENT_DEVICE=%" PRIu64, (uint64_t) stbuf.st_dev, ++ "DEPLOYMENT_INODE=%" PRIu64, (uint64_t) stbuf.st_ino, + "DEPLOYMENT_CHECKSUM=%s", ostree_deployment_get_csum (new_deployment), + "DEPLOYMENT_REFSPEC=%s", rpmostree_origin_get_refspec (self->origin), + /* we could use iovecs here and sd_journal_sendv to make these truly