* [bug#61408] [PATCH] gnu: bees: Update to 0.9.1.
@ 2023-02-10 18:08 Morgan.J.Smith
2023-02-12 18:12 ` [bug#61408] [PATCH v2] " Morgan.J.Smith
0 siblings, 1 reply; 3+ messages in thread
From: Morgan.J.Smith @ 2023-02-10 18:08 UTC (permalink / raw)
To: 61408; +Cc: Morgan Smith
From: Morgan Smith <Morgan.J.Smith@outlook.com>
* gnu/packages/file-systems.scm (bees): Update to 0.9.1.
* gnu/local.mk: Remove bees-beesd-honor-destdir-on-installation.patch
* gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch: Delete
file
---
I looked at all the source files, looked at the changes since v0.8, and even
ran the new version successfully on my system. I think I've been pretty
thorough on this patch
gnu/local.mk | 1 -
gnu/packages/file-systems.scm | 13 +++---
...-beesd-honor-destdir-on-installation.patch | 40 -------------------
3 files changed, 5 insertions(+), 49 deletions(-)
delete mode 100644 gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index f1fed73987..83d6399efd 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -940,7 +940,6 @@ dist_patch_DATA = \
%D%/packages/patches/bsd-games-prevent-name-collisions.patch \
%D%/packages/patches/bsd-games-stdio.h.patch \
%D%/packages/patches/beancount-disable-googleapis-fonts.patch \
- %D%/packages/patches/bees-beesd-honor-destdir-on-installation.patch \
%D%/packages/patches/beignet-correct-file-names.patch \
%D%/packages/patches/bidiv-update-fribidi.patch \
%D%/packages/patches/binutils-2.37-file-descriptor-leak.patch \
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 049ef04ea8..f0e022ba0d 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1809,7 +1809,7 @@ (define-public fuse-overlayfs
(define-public bees
(package
(name "bees")
- (version "0.8")
+ (version "0.9.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1826,14 +1826,9 @@ (define-public bees
(("city.o.*") ""))
(substitute* "src/bees-hash.cc"
(("#include .crucible/city.h.") "#include <city.h>"))))
- (patches
- (search-patches
- ;; XXX: Cherry-picked from upstream, remove the patch when
- ;; bumping version.
- "bees-beesd-honor-destdir-on-installation.patch"))
(sha256
(base32
- "1kxpz1p9k5ir385kpvmfjawki5vg22hlx768k7835w6n5z5a65y4"))))
+ "1h2a7p1ik27cykbnql5b36wfv4n2arw4289p2vvs0v471b0x3b1c"))))
(build-system gnu-build-system)
(arguments
(list #:test-target "test"
@@ -1876,7 +1871,9 @@ (define-public bees
for large btrfs filesystems. It is an offline dedupe combined with an
incremental data scan capability to minimize time data spends on disk from
write to dedupe.")
- (license license:gpl3+)))
+ (license (list license:gpl3+
+ license:zlib ; lib/crc64.cc
+ license:gpl2)))) ; include/crucible/btrfs.h
(define-public dwarfs
(package
diff --git a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch b/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch
deleted file mode 100644
index 93817f42cf..0000000000
--- a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 66b00f8a972ebb4da68f7aa0d0656f43ce2a2c3a Mon Sep 17 00:00:00 2001
-From: Hilton Chain <hako@ultrarare.space>
-Date: Fri, 23 Dec 2022 11:04:46 +0800
-Subject: [PATCH] beesd: Honor DESTDIR on installation.
-
-Co-authored-by: Adam Faiz <adam.faiz@disroot.org>
-Signed-off-by: Hilton Chain <hako@ultrarare.space>
----
- Defines.mk | 1 +
- scripts/beesd.in | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Defines.mk b/Defines.mk
-index 9e8df40..e5394ba 100644
---- a/Defines.mk
-+++ b/Defines.mk
-@@ -2,6 +2,7 @@ MAKE += PREFIX=$(PREFIX) LIBEXEC_PREFIX=$(LIBEXEC_PREFIX) ETC_PREFIX=$(ETC_PREFI
-
- define TEMPLATE_COMPILER =
- sed $< >$@ \
-+ -e's#@DESTDIR@#$(DESTDIR)#' \
- -e's#@PREFIX@#$(PREFIX)#' \
- -e's#@ETC_PREFIX@#$(ETC_PREFIX)#' \
- -e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#'
-diff --git a/scripts/beesd.in b/scripts/beesd.in
-index 174bb6c..35d04aa 100755
---- a/scripts/beesd.in
-+++ b/scripts/beesd.in
-@@ -15,7 +15,7 @@ readonly AL128K="$((128*1024))"
- readonly AL16M="$((16*1024*1024))"
- readonly CONFIG_DIR=@ETC_PREFIX@/bees/
-
--readonly bees_bin=$(realpath @LIBEXEC_PREFIX@/bees)
-+readonly bees_bin=$(realpath @DESTDIR@/@LIBEXEC_PREFIX@/bees)
-
- command -v "$bees_bin" &> /dev/null || ERRO "Missing 'bees' agent"
-
---
-2.38.1
-
--
2.39.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#61408] [PATCH v2] gnu: bees: Update to 0.9.1.
2023-02-10 18:08 [bug#61408] [PATCH] gnu: bees: Update to 0.9.1 Morgan.J.Smith
@ 2023-02-12 18:12 ` Morgan.J.Smith
2023-02-23 22:57 ` bug#61408: " Tobias Geerinckx-Rice via Guix-patches via
0 siblings, 1 reply; 3+ messages in thread
From: Morgan.J.Smith @ 2023-02-12 18:12 UTC (permalink / raw)
To: 61408; +Cc: Morgan Smith
From: Morgan Smith <Morgan.J.Smith@outlook.com>
* gnu/packages/file-systems.scm (bees): Update to 0.9.1.
[arguments]: Add fixtest phase.
* gnu/local.mk: Remove bees-beesd-honor-destdir-on-installation.patch
* gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch: Delete
file
---
I have just discovered https://qa.guix.gnu.org and it is very cool. It helped
me fix this patch :)
gnu/local.mk | 1 -
gnu/packages/file-systems.scm | 22 +++++-----
...-beesd-honor-destdir-on-installation.patch | 40 -------------------
3 files changed, 13 insertions(+), 50 deletions(-)
delete mode 100644 gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index cdb99813d0..669d431802 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -941,7 +941,6 @@ dist_patch_DATA = \
%D%/packages/patches/bsd-games-prevent-name-collisions.patch \
%D%/packages/patches/bsd-games-stdio.h.patch \
%D%/packages/patches/beancount-disable-googleapis-fonts.patch \
- %D%/packages/patches/bees-beesd-honor-destdir-on-installation.patch \
%D%/packages/patches/beignet-correct-file-names.patch \
%D%/packages/patches/bidiv-update-fribidi.patch \
%D%/packages/patches/binutils-2.37-file-descriptor-leak.patch \
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 471f943754..492ae23dd1 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1809,7 +1809,7 @@ (define-public fuse-overlayfs
(define-public bees
(package
(name "bees")
- (version "0.8")
+ (version "0.9.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1826,14 +1826,9 @@ (define-public bees
(("city.o.*") ""))
(substitute* "src/bees-hash.cc"
(("#include .crucible/city.h.") "#include <city.h>"))))
- (patches
- (search-patches
- ;; XXX: Cherry-picked from upstream, remove the patch when
- ;; bumping version.
- "bees-beesd-honor-destdir-on-installation.patch"))
(sha256
(base32
- "1kxpz1p9k5ir385kpvmfjawki5vg22hlx768k7835w6n5z5a65y4"))))
+ "1h2a7p1ik27cykbnql5b36wfv4n2arw4289p2vvs0v471b0x3b1c"))))
(build-system gnu-build-system)
(arguments
(list #:test-target "test"
@@ -1845,6 +1840,12 @@ (define-public bees
#:phases
#~(modify-phases %standard-phases
(delete 'configure)
+ (add-after 'unpack 'fixtest
+ (lambda _
+ ;; Reported upstream. Check if fixed when updating.
+ ;; Fixes build failure on i686 and armhf where size_t != uint64_t.
+ (substitute* "test/seeker.cc"
+ (("size_t target") "uint64_t target"))))
(add-after 'unpack 'fixpath
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "scripts/beesd.in"
@@ -1867,7 +1868,8 @@ (define-public bees
(search-input-file inputs (string-append "/bin/" command)))
(("btrfs sub")
- (string-append (search-input-file inputs "/bin/btrfs") " sub"))))))))
+ (string-append (search-input-file inputs "/bin/btrfs")
+ " sub"))))))))
(inputs (list btrfs-progs cityhash util-linux))
(home-page "https://github.com/Zygo/bees")
(synopsis "Best-Effort Extent-Same, a btrfs dedupe agent")
@@ -1876,7 +1878,9 @@ (define-public bees
for large btrfs filesystems. It is an offline dedupe combined with an
incremental data scan capability to minimize time data spends on disk from
write to dedupe.")
- (license license:gpl3+)))
+ (license (list license:gpl3+
+ license:zlib ; lib/crc64.cc
+ license:gpl2)))) ; include/crucible/btrfs.h
(define-public dwarfs
(package
diff --git a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch b/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch
deleted file mode 100644
index 93817f42cf..0000000000
--- a/gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 66b00f8a972ebb4da68f7aa0d0656f43ce2a2c3a Mon Sep 17 00:00:00 2001
-From: Hilton Chain <hako@ultrarare.space>
-Date: Fri, 23 Dec 2022 11:04:46 +0800
-Subject: [PATCH] beesd: Honor DESTDIR on installation.
-
-Co-authored-by: Adam Faiz <adam.faiz@disroot.org>
-Signed-off-by: Hilton Chain <hako@ultrarare.space>
----
- Defines.mk | 1 +
- scripts/beesd.in | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Defines.mk b/Defines.mk
-index 9e8df40..e5394ba 100644
---- a/Defines.mk
-+++ b/Defines.mk
-@@ -2,6 +2,7 @@ MAKE += PREFIX=$(PREFIX) LIBEXEC_PREFIX=$(LIBEXEC_PREFIX) ETC_PREFIX=$(ETC_PREFI
-
- define TEMPLATE_COMPILER =
- sed $< >$@ \
-+ -e's#@DESTDIR@#$(DESTDIR)#' \
- -e's#@PREFIX@#$(PREFIX)#' \
- -e's#@ETC_PREFIX@#$(ETC_PREFIX)#' \
- -e's#@LIBEXEC_PREFIX@#$(LIBEXEC_PREFIX)#'
-diff --git a/scripts/beesd.in b/scripts/beesd.in
-index 174bb6c..35d04aa 100755
---- a/scripts/beesd.in
-+++ b/scripts/beesd.in
-@@ -15,7 +15,7 @@ readonly AL128K="$((128*1024))"
- readonly AL16M="$((16*1024*1024))"
- readonly CONFIG_DIR=@ETC_PREFIX@/bees/
-
--readonly bees_bin=$(realpath @LIBEXEC_PREFIX@/bees)
-+readonly bees_bin=$(realpath @DESTDIR@/@LIBEXEC_PREFIX@/bees)
-
- command -v "$bees_bin" &> /dev/null || ERRO "Missing 'bees' agent"
-
---
-2.38.1
-
--
2.39.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#61408: [PATCH v2] gnu: bees: Update to 0.9.1.
2023-02-12 18:12 ` [bug#61408] [PATCH v2] " Morgan.J.Smith
@ 2023-02-23 22:57 ` Tobias Geerinckx-Rice via Guix-patches via
0 siblings, 0 replies; 3+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2023-02-23 22:57 UTC (permalink / raw)
To: Morgan.J.Smith; +Cc: 61408-done, guix-patches
[-- Attachment #1: Type: text/plain, Size: 1099 bytes --]
Hi Morgan,
I've pushed an updated & modified version of this patch as
4f08551a83f3a9f5e22c70e51e488f38171e6937. Thanks!
Morgan.J.Smith@outlook.com 写道：
> * gnu/packages/file-systems.scm (bees): Update to 0.9.1.
> [arguments]: Add fixtest phase.
Since you reported this failure upstream, 0.9.2 was released with
your fix. \o/
I used that instead.
> * gnu/local.mk: Remove
> bees-beesd-honor-destdir-on-installation.patch
> *
> gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch:
> Delete
> file
I prefer writing this as
*
gnu/packages/patches/bees-beesd-honor-destdir-on-installation.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
> + license:gpl2)))) ; include/crucible/btrfs.h
Nice! Well spotted.
Now, any copyrightable change by BEES to this file would/will be
GPL3+. I didn't notice any in its commit log, though, so this
point is academic.
I erred on the side of keeping this, and added an explicit comment
that the combined work is GPL3+.
Kind regards,
T G-R
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-02-23 23:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-10 18:08 [bug#61408] [PATCH] gnu: bees: Update to 0.9.1 Morgan.J.Smith
2023-02-12 18:12 ` [bug#61408] [PATCH v2] " Morgan.J.Smith
2023-02-23 22:57 ` bug#61408: " Tobias Geerinckx-Rice via Guix-patches via
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).