From a3f45e6770e9d2a205bfe020873a68713c0276f8efe86ac0efaca640dada503e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 30 Jan 2024 12:53:09 +0000 Subject: [PATCH] Accepting request 1142783 from home:ddiss:bcachefs_upstream_vendor - Build with rust functionality enabled [boo#1219158] * Switch to upstream vendored source tarball * Validate upstream source signature OBS-URL: https://build.opensuse.org/request/show/1142783 OBS-URL: https://build.opensuse.org/package/show/filesystems/bcachefs-tools?expand=0&rev=16 --- _service | 12 +--- bcachefs-tools-1.4.1.tar.xz | 3 - bcachefs-tools-vendored-1.4.1.tar.sign | 16 +++++ bcachefs-tools-vendored-1.4.1.tar.zst | 3 + bcachefs-tools.changes | 7 ++ bcachefs-tools.keyring | 99 ++++++++++++++++++++++++++ bcachefs-tools.spec | 12 ++-- 7 files changed, 134 insertions(+), 18 deletions(-) delete mode 100644 bcachefs-tools-1.4.1.tar.xz create mode 100644 bcachefs-tools-vendored-1.4.1.tar.sign create mode 100644 bcachefs-tools-vendored-1.4.1.tar.zst create mode 100644 bcachefs-tools.keyring diff --git a/_service b/_service index 8f1ed1e..6b42c7d 100644 --- a/_service +++ b/_service @@ -1,13 +1,3 @@ - - git - https://evilpiepirate.org/git/bcachefs-tools.git - v1.4.1 - 1.4.1 - - - *.tar - xz - - + diff --git a/bcachefs-tools-1.4.1.tar.xz b/bcachefs-tools-1.4.1.tar.xz deleted file mode 100644 index c8ed76f..0000000 --- a/bcachefs-tools-1.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0313c50d461217fe22593839e576372b0ec25a567749751d82874938aee063f6 -size 749312 diff --git a/bcachefs-tools-vendored-1.4.1.tar.sign b/bcachefs-tools-vendored-1.4.1.tar.sign new file mode 100644 index 0000000..868fe92 --- /dev/null +++ b/bcachefs-tools-vendored-1.4.1.tar.sign @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEKnAFLkS8Qha+jvQrE6szbY3KbnYFAmWlcbIACgkQE6szbY3K +bnYAWw/+Mw+Qv6mOmAZvWVm/cTmcZ2UBMm/0GmIx2V1Pb98UsR++KlnDkU36zA9q +QdsAy2JRt4U7OTS81h1mvmVby60tdKpUlMu6mqCSX+d7ZNEP/iMWecb7Ff/RztXS +xQdYE7q6sNT/r6JqhzUJWlmANDFVRgD/zEZ7WGPxHATtrsy/9ytWD0P38xprw/wK +bh5t+rgmapxVTpHpTu6Q8ImxVRzpWGYZLInHdXS5rOg8QrxSeBpcFvR3Vju3UDEw ++tjMj6xwCdje3PSlYU7XhWotMt4+oiNvkqgel+eQAKiXXG/tHkj3zu+Lqq+R6Cfw +rcPlHopLoxyUkab2jR0nvjNg7QuLJCjaQZuWpCSyM/pFjMPVmRdNYSSxk97ROGDO ++VflA2ArW0qzyEC1jfS4YT2mebKUEntJaRvGVVac1s0CWlPYjQK9HX8TJDS7G+CY +4emDXaJICTRxcMUzjsOQzWHMtmalzwXcAYTOlZPQFXzbXkdtqSsDxHjk2Z899qFR +DD7KpOtnc8CaQ7iKzsMSVsgJ5y2iTV1w3TpaP/H8OXf4YUtF5fh4jQMN5228P0/C +hFSqYHxvYTMuhz+rmsMsTu1wz3ITAHyvLhTOfQLs9i+9jwBEJsY+rmm2hc/Mzb9V +lNsJZZtklhCS2jq+2tVvcE9fYcujzefPMrNroHlqKOXT6Exi5VM= +=fx8S +-----END PGP SIGNATURE----- diff --git a/bcachefs-tools-vendored-1.4.1.tar.zst b/bcachefs-tools-vendored-1.4.1.tar.zst new file mode 100644 index 0000000..5fdf037 --- /dev/null +++ b/bcachefs-tools-vendored-1.4.1.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43e8f06f26dc203f3cb7cc73828440dcd50e4a389d3a576203664a355915f7f1 +size 21607217 diff --git a/bcachefs-tools.changes b/bcachefs-tools.changes index 4041163..86448c3 100644 --- a/bcachefs-tools.changes +++ b/bcachefs-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 29 06:55:58 UTC 2024 - David Disseldorp + +- Build with rust functionality enabled [boo#1219158] + * Switch to upstream vendored source tarball + * Validate upstream source signature + ------------------------------------------------------------------- Sat Jan 27 09:49:49 UTC 2024 - Jan Engelhardt diff --git a/bcachefs-tools.keyring b/bcachefs-tools.keyring new file mode 100644 index 0000000..a2a6ad5 --- /dev/null +++ b/bcachefs-tools.keyring @@ -0,0 +1,99 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +O15cDOJNTGiEsF40ii8eijfO2tFG49DZ00j2 +=9ATa +-----END PGP PUBLIC KEY BLOCK----- diff --git a/bcachefs-tools.spec b/bcachefs-tools.spec index 68bb8d8..9b6c648 100644 --- a/bcachefs-tools.spec +++ b/bcachefs-tools.spec @@ -23,10 +23,14 @@ Summary: Configuration utilities for bcachefs License: GPL-2.0-or-later Group: System/Filesystems URL: https://bcachefs.org/ -Source: %name-%version.tar.xz +Source0: https://evilpiepirate.org/%name/%name-vendored-%version.tar.zst +Source1: https://evilpiepirate.org/%name/%name-vendored-%version.tar.sign +Source2: %{name}.keyring +BuildRequires: cargo +BuildRequires: clang-devel BuildRequires: libaio-devel >= 0.3.111 BuildRequires: pkg-config -BuildRequires: xz +BuildRequires: zstd BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(libkeyutils) BuildRequires: pkgconfig(liblz4) @@ -59,10 +63,10 @@ This package contains utilities for creating and mounting bcachefs. %build %make_build PREFIX="%_prefix" ROOT_SBINDIR="%_sbindir" \ - EXTRA_CFLAGS="%optflags" NO_RUST=1 + EXTRA_CFLAGS="%optflags" %install -%make_install PREFIX="%_prefix" ROOT_SBINDIR="%_sbindir" NO_RUST=1 +%make_install PREFIX="%_prefix" ROOT_SBINDIR="%_sbindir" # this ain't no debian rm -Rf "%buildroot/etc/initramfs-tools" "%buildroot/%_datadir/initramfs-tools"