Compare commits

..

1 commit

Author SHA1 Message Date
Jerry James
0006d0c2ab OCaml 5.2.1 rebuild for Fedora 41 2025-01-28 21:16:15 -07:00
2 changed files with 3 additions and 56 deletions

View file

@ -1,33 +0,0 @@
From 7a80a6eec799841b828ba7f617709562d8061435 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 21 Oct 2024 11:55:53 +0100
Subject: [PATCH] prepare: Use stable owner, group and mtime in base.tar.gz
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2320025
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
---
src/mode_prepare.ml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/mode_prepare.ml b/src/mode_prepare.ml
index 70f9dd4..6af47b1 100644
--- a/src/mode_prepare.ml
+++ b/src/mode_prepare.ml
@@ -166,9 +166,12 @@ let prepare debug (copy_kernel, format, host_cpu,
let base = outputdir // "base.tar.gz" in
if debug >= 1 then printf "supermin: writing %s\n%!" base;
let cmd =
- sprintf "tar%s -C %s -zcf %s -T %s"
+ let mtime =
+ try sprintf "--mtime=@%s" (quote (Sys.getenv "SOURCE_DATE_EPOCH"))
+ with Not_found -> "" in
+ sprintf "tar%s -C %s -z --owner=0 --group=0 %s -cf %s -T %s"
(if debug >=1 then " -v" else "")
- (quote dir) (quote base) (quote files_from) in
+ (quote dir) mtime (quote base) (quote files_from) in
run_command cmd;
)
else (
--
2.46.0

View file

@ -38,7 +38,7 @@ ExcludeArch: %{ix86}
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.3.5
Release: 7%{?dist}
Release: 2%{?dist}
License: GPL-2.0-or-later
ExclusiveArch: %{kernel_arches}
@ -53,11 +53,6 @@ Source1: http://download.libguestfs.org/supermin/%{source_directory}/%{nam
# Keyring used to verify tarball signature.
Source2: libguestfs.keyring
# Use stable owner, group and mtime in base.tar.gz
# Upstream in > 5.3.5
# https://bugzilla.redhat.com/show_bug.cgi?id=2320025
Patch1: 0001-prepare-Use-stable-owner-group-and-mtime-in-base.tar.patch
BuildRequires: gcc
BuildRequires: make
BuildRequires: autoconf, automake
@ -211,23 +206,8 @@ make check || {
%changelog
* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 5.3.5-7
- OCaml 5.4.0 rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jul 11 2025 Jerry James <loganjerry@gmail.com> - 5.3.5-5
- Rebuild to fix OCaml dependencies
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jan 9 2025 Jerry James <loganjerry@gmail.com> - 5.3.5-3
- OCaml 5.3.0 rebuild for Fedora 42
* Mon Oct 21 2024 Richard W.M. Jones <rjones@redhat.com> - 5.3.5-2
- Use stable owner, group and mtime in base.tar.gz (RHBZ#2320025)
* Tue Jan 28 2025 Jerry James <loganjerry@gmail.com> - 5.3.5-2
- OCaml 5.2.1 rebuild for Fedora 41
* Sat Aug 31 2024 Richard W.M. Jones <rjones@redhat.com> - 5.3.5-1
- New upstream version 5.3.5