* [PR PATCH] New package: bees-0.7
@ 2021-10-05 21:14 jcgruenhage
2021-10-06 2:47 ` [PR REVIEW] " Vaelatern
` (18 more replies)
0 siblings, 19 replies; 21+ messages in thread
From: jcgruenhage @ 2021-10-05 21:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]
There is a new pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages bees-0.7_1
https://github.com/void-linux/void-packages/pull/33356
New package: bees-0.7
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33356.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bees-0.7_1-33356.patch --]
[-- Type: text/x-diff, Size: 2341 bytes --]
From ea58c3a9429d211f06291b826205d5642faa7970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Tue, 5 Oct 2021 23:05:33 +0200
Subject: [PATCH] New package: bees-0.7
---
srcpkgs/bees/patches/Makefile.patch | 23 +++++++++++++++++++++++
srcpkgs/bees/template | 13 +++++++++++++
2 files changed, 36 insertions(+)
create mode 100644 srcpkgs/bees/patches/Makefile.patch
create mode 100644 srcpkgs/bees/template
diff --git a/srcpkgs/bees/patches/Makefile.patch b/srcpkgs/bees/patches/Makefile.patch
new file mode 100644
index 000000000000..18b924e6a7ae
--- /dev/null
+++ b/srcpkgs/bees/patches/Makefile.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile b/Makefile
+index 9c840c4..dbff6b3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -52,7 +52,7 @@ scripts: scripts/beesd scripts/beesd@.service
+ install_tools: ## Install support tools + libs
+ install_tools: src
+ install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
+- install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
++ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/bin/fiewalk
+
+ install_bees: ## Install bees + libs
+ install_bees: src $(RUN_INSTALL_TESTS)
+@@ -60,7 +60,7 @@ install_bees: src $(RUN_INSTALL_TESTS)
+
+ install_scripts: ## Install scipts
+ install_scripts: scripts
+- install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd
++ install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd
+ install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample
+ ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),)
+ install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service
+
diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
new file mode 100644
index 000000000000..f060692c9148
--- /dev/null
+++ b/srcpkgs/bees/template
@@ -0,0 +1,13 @@
+# Template file for 'bees'
+pkgname=bees
+version=0.7
+revision=1
+build_style=gnu-makefile
+hostmakedepends="git discount"
+depends="btrfs-progs"
+short_desc="Best-Effort Extent-Same, a btrfs deduplication agent"
+maintainer="Paradigm <unixparadigm@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Zygo/bees"
+distfiles="https://github.com/Zygo/bees/archive/refs/tags/v${version}.tar.gz"
+checksum=2e67422b9f0d9ef665523b474fb27055efffceb263f8ccfdfda2a3aac9c6bdb1
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
@ 2021-10-06 2:47 ` Vaelatern
2021-10-06 9:51 ` jcgruenhage
` (17 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Vaelatern @ 2021-10-06 2:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 187 bytes --]
New review comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#discussion_r722844513
Comment:
Why does this use git to do the build?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
2021-10-06 2:47 ` [PR REVIEW] " Vaelatern
@ 2021-10-06 9:51 ` jcgruenhage
2021-10-06 11:08 ` jcgruenhage
` (16 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: jcgruenhage @ 2021-10-06 9:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
New review comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#discussion_r723074603
Comment:
https://github.com/Zygo/bees/blob/7933ccb660de3f4b5cd8d2ac2af00d4d4e6acdf3/Makefile#L10 <- this here, but looking at it again, this doesn't look all that required because of the `|| echo UNKNOWN` part
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
2021-10-06 2:47 ` [PR REVIEW] " Vaelatern
2021-10-06 9:51 ` jcgruenhage
@ 2021-10-06 11:08 ` jcgruenhage
2021-10-06 13:51 ` Vaelatern
` (15 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: jcgruenhage @ 2021-10-06 11:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 290 bytes --]
New review comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#discussion_r723134004
Comment:
actually, we should do something like [this](https://github.com/archlinux/svntogit-community/blob/packages/bees/trunk/PKGBUILD#L25) as well
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR REVIEW] New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (2 preceding siblings ...)
2021-10-06 11:08 ` jcgruenhage
@ 2021-10-06 13:51 ` Vaelatern
2021-10-06 14:56 ` [PR PATCH] [Updated] " jcgruenhage
` (14 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Vaelatern @ 2021-10-06 13:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 286 bytes --]
New review comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#discussion_r723298243
Comment:
Could likely set the variable in pre_build()
The command would fail since it's not a git checkout, so definitely drop this dependency.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (3 preceding siblings ...)
2021-10-06 13:51 ` Vaelatern
@ 2021-10-06 14:56 ` jcgruenhage
2021-10-06 18:59 ` Vaelatern
` (13 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: jcgruenhage @ 2021-10-06 14:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages bees-0.7_1
https://github.com/void-linux/void-packages/pull/33356
New package: bees-0.7
<!-- Mark items with [x] where applicable -->
Based majorly on #32643, with commits cleaned up, version updated and the Makefile patch modified a bit.
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33356.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bees-0.7_1-33356.patch --]
[-- Type: text/x-diff, Size: 2382 bytes --]
From 3424c0917e138dd026540cbf2d9f3d1d134bfb41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Tue, 5 Oct 2021 23:05:33 +0200
Subject: [PATCH] New package: bees-0.7
---
srcpkgs/bees/patches/Makefile.patch | 23 +++++++++++++++++++++++
srcpkgs/bees/template | 16 ++++++++++++++++
2 files changed, 39 insertions(+)
create mode 100644 srcpkgs/bees/patches/Makefile.patch
create mode 100644 srcpkgs/bees/template
diff --git a/srcpkgs/bees/patches/Makefile.patch b/srcpkgs/bees/patches/Makefile.patch
new file mode 100644
index 000000000000..18b924e6a7ae
--- /dev/null
+++ b/srcpkgs/bees/patches/Makefile.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile b/Makefile
+index 9c840c4..dbff6b3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -52,7 +52,7 @@ scripts: scripts/beesd scripts/beesd@.service
+ install_tools: ## Install support tools + libs
+ install_tools: src
+ install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
+- install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
++ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/bin/fiewalk
+
+ install_bees: ## Install bees + libs
+ install_bees: src $(RUN_INSTALL_TESTS)
+@@ -60,7 +60,7 @@ install_bees: src $(RUN_INSTALL_TESTS)
+
+ install_scripts: ## Install scipts
+ install_scripts: scripts
+- install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd
++ install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd
+ install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample
+ ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),)
+ install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service
+
diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
new file mode 100644
index 000000000000..6e1754c0d38f
--- /dev/null
+++ b/srcpkgs/bees/template
@@ -0,0 +1,16 @@
+# Template file for 'bees'
+pkgname=bees
+version=0.7
+revision=1
+build_style=gnu-makefile
+depends="btrfs-progs"
+short_desc="Best-Effort Extent-Same, a btrfs deduplication agent"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Zygo/bees"
+distfiles="https://github.com/Zygo/bees/archive/refs/tags/v${version}.tar.gz"
+checksum=2e67422b9f0d9ef665523b474fb27055efffceb263f8ccfdfda2a3aac9c6bdb1
+
+pre_build() {
+ export BEES_VERSION="${version}"
+}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (4 preceding siblings ...)
2021-10-06 14:56 ` [PR PATCH] [Updated] " jcgruenhage
@ 2021-10-06 18:59 ` Vaelatern
2021-10-07 12:04 ` jcgruenhage
` (12 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Vaelatern @ 2021-10-06 18:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 425 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#issuecomment-936912049
Comment:
```
./chatter >chatter.txt 2>&1 || (RC=$?; cat chatter.txt; exit $RC)
/bin/sh: line 1: ./chatter: cannot execute binary file: Exec format error
```
sounds like it's supposed to be built with `HOST_CC` (correct variable)? or this step needs to not be necessary in cross builds.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (5 preceding siblings ...)
2021-10-06 18:59 ` Vaelatern
@ 2021-10-07 12:04 ` jcgruenhage
2021-10-08 9:48 ` jcgruenhage
` (11 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: jcgruenhage @ 2021-10-07 12:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#issuecomment-937727013
Comment:
afaict, the variable should be `CXX_FOR_BUILD`, and the same for the `CXXFLAGS` etc, but even with those it doesn't seem to quite pass the tests. I don't know much about cross compilation together with make, so I'd be happy about input here.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (6 preceding siblings ...)
2021-10-07 12:04 ` jcgruenhage
@ 2021-10-08 9:48 ` jcgruenhage
2021-10-08 20:19 ` Chocimier
` (10 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: jcgruenhage @ 2021-10-08 9:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 731 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#issuecomment-938505628
Comment:
I'm trying to get bees to pass CI, but running tests + cross compilation does not work at all, and all the patches I've worked on so far just made it worse, resulting in the tests also not passing when it's not cross compiling
If anyone with more knowledge on the intersection of static libs from a subfolders, C++ cross compilation and running tests from a Makefile could take a swing at this, I'd be happier, because I'd like to see this done properly, but otherwise: I could undo the patches and put in nocross and make_check=no, which would make it pass.
Any opinions on this?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (7 preceding siblings ...)
2021-10-08 9:48 ` jcgruenhage
@ 2021-10-08 20:19 ` Chocimier
2021-10-08 23:03 ` Vaelatern
` (9 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Chocimier @ 2021-10-08 20:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 592 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#issuecomment-939093793
Comment:
Tooling around betafs that fails its own test suite is not we would want.
Problem here is that test is part of default build: https://github.com/Zygo/bees/blob/12e80658a8cfb5dc1d8676e3696681ad32fab552/Makefile#L15-L19
Set `make_build_args="DEFAULT_MAKE_TARGET=all"` and it should build for x86_64 and aarch glibc. Arm* would still fail due to atomics (fixable), musl will fail as upstream uses glibc extensions.
Installing docs would be nice too.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (8 preceding siblings ...)
2021-10-08 20:19 ` Chocimier
@ 2021-10-08 23:03 ` Vaelatern
2022-03-27 10:29 ` [PR PATCH] [Updated] " jcgruenhage
` (8 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Vaelatern @ 2021-10-08 23:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#issuecomment-939158741
Comment:
I would be fine with a patch that removes the tests from the default set.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (9 preceding siblings ...)
2021-10-08 23:03 ` Vaelatern
@ 2022-03-27 10:29 ` jcgruenhage
2022-03-27 10:42 ` jcgruenhage
` (7 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: jcgruenhage @ 2022-03-27 10:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages bees-0.7_1
https://github.com/void-linux/void-packages/pull/33356
New package: bees-0.7
<!-- Mark items with [x] where applicable -->
Based majorly on #32643, with commits cleaned up, version updated and the Makefile patch modified a bit.
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33356.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bees-0.7_1-33356.patch --]
[-- Type: text/x-diff, Size: 6923 bytes --]
From 4833ab5ae965f2bd36e108448ff8a170e81d802b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Tue, 5 Oct 2021 23:05:33 +0200
Subject: [PATCH] New package: bees-0.7
---
.../0001-don-t-run-tests-unless-asked.patch | 44 +++++++++++++++
.../patches/0002-move-sbin-into-bin.patch | 37 +++++++++++++
...0003-start-work-on-cross-compilation.patch | 54 +++++++++++++++++++
srcpkgs/bees/template | 18 +++++++
4 files changed, 153 insertions(+)
create mode 100644 srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
create mode 100644 srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
create mode 100644 srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
create mode 100644 srcpkgs/bees/template
diff --git a/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
new file mode 100644
index 000000000000..4b1431b45873
--- /dev/null
+++ b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
@@ -0,0 +1,44 @@
+From e139a679d7cc3f04ad001054a6b1815b7afc92e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:04:15 +0200
+Subject: [PATCH 1/3] don't run tests unless asked
+
+---
+ Makefile | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9c840c4..d4c241e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,16 +14,12 @@ BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN)
+
+ DEFAULT_MAKE_TARGET ?= reallyall
+
+-ifeq ($(DEFAULT_MAKE_TARGET),reallyall)
+- RUN_INSTALL_TESTS = test
+-endif
+-
+ include Defines.mk
+
+ default: $(DEFAULT_MAKE_TARGET)
+
+ all: lib src scripts
+-reallyall: all doc test
++reallyall: all doc
+
+ clean: ## Cleanup
+ git clean -dfx -e localconf
+@@ -55,7 +51,7 @@ install_tools: src
+ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
+
+ install_bees: ## Install bees + libs
+-install_bees: src $(RUN_INSTALL_TESTS)
++install_bees: src
+ install -Dm755 bin/bees $(DESTDIR)$(LIBEXEC_PREFIX)/bees
+
+ install_scripts: ## Install scipts
+--
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
new file mode 100644
index 000000000000..3d3b7fe22291
--- /dev/null
+++ b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
@@ -0,0 +1,37 @@
+From fc133aa8647fe34a41c70bd5915c7f7f655d3160 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:05:15 +0200
+Subject: [PATCH 2/3] move sbin/* into bin/*
+
+Void does not distinguis between bin and sbin, but this patch will
+likely not be upstreamable.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d4c241e..2694e78 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@ scripts: scripts/beesd scripts/beesd@.service
+ install_tools: ## Install support tools + libs
+ install_tools: src
+ install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
+- install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
++ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/bin/fiewalk
+
+ install_bees: ## Install bees + libs
+ install_bees: src
+@@ -56,7 +56,7 @@ install_bees: src
+
+ install_scripts: ## Install scipts
+ install_scripts: scripts
+- install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd
++ install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd
+ install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample
+ ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),)
+ install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service
+--
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
new file mode 100644
index 000000000000..30f758460754
--- /dev/null
+++ b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
@@ -0,0 +1,54 @@
+From be64a6e50987dba582d8704d62cb1f9a3577645d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:06:54 +0200
+Subject: [PATCH 3/3] start work on cross compilation
+
+The tests have to be run on the host, so these shouldn't be cross
+compiled. This patch is not done yet, but it's included here anyway, so
+that whoever wants to continue on it doesn't have to start from scratch.
+---
+ makeflags | 3 +++
+ test/Makefile | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/makeflags b/makeflags
+index c5b6951..29e0430 100644
+--- a/makeflags
++++ b/makeflags
+@@ -11,3 +11,6 @@ CCFLAGS += -I../include -D_FILE_OFFSET_BITS=64
+
+ BEES_CFLAGS = $(CCFLAGS) -std=c99 $(CFLAGS)
+ BEES_CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast $(CXXFLAGS)
++
++BEES_CFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c99 $(CFLAGS_FOR_BUILD)
++BEES_CXXFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c++11 -Wold-style-cast $(CXXFLAGS_FOR_BUILD)
+diff --git a/test/Makefile b/test/Makefile
+index ae66a7c..3c70244 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -24,7 +24,7 @@ BEES_LDFLAGS = -L../lib $(LDFLAGS)
+ mkdir -p $@
+
+ .depends/%.dep: %.cc tests.h Makefile | .depends
+- $(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) -M -MF $@ -MT $(<:.cc=.o) $<
+
+ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ cat $^ > $@.new
+@@ -33,10 +33,10 @@ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ include depends.mk
+
+ $(PROGRAMS:%=%.o): %.o: %.cc ../makeflags Makefile
+- $(CXX) $(BEES_CXXFLAGS) -o $@ -c $<
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAG_FOR_BUILDS) -o $@ -c $<
+
+ $(PROGRAMS): %: %.o ../makeflags Makefile ../lib/libcrucible.a
+- $(CXX) $(BEES_CXXFLAGS) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
+
+ %.txt: % Makefile FORCE
+ ./$< >$@ 2>&1 || (RC=$$?; cat $@; exit $$RC)
+--
+2.35.1
+
diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
new file mode 100644
index 000000000000..eeda1cd34854
--- /dev/null
+++ b/srcpkgs/bees/template
@@ -0,0 +1,18 @@
+# Template file for 'bees'
+pkgname=bees
+version=0.7
+revision=1
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+depends="btrfs-progs"
+short_desc="Best-Effort Extent-Same, a btrfs deduplication agent"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Zygo/bees"
+distfiles="https://github.com/Zygo/bees/archive/refs/tags/v${version}.tar.gz"
+checksum=2e67422b9f0d9ef665523b474fb27055efffceb263f8ccfdfda2a3aac9c6bdb1
+make_check="no"
+
+pre_build() {
+ export BEES_VERSION="${version}"
+}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (10 preceding siblings ...)
2022-03-27 10:29 ` [PR PATCH] [Updated] " jcgruenhage
@ 2022-03-27 10:42 ` jcgruenhage
2022-03-27 10:44 ` jcgruenhage
` (6 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: jcgruenhage @ 2022-03-27 10:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages bees-0.7_1
https://github.com/void-linux/void-packages/pull/33356
New package: bees-0.7
<!-- Mark items with [x] where applicable -->
Based majorly on #32643, with commits cleaned up, version updated and the Makefile patch modified a bit.
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33356.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bees-0.7_1-33356.patch --]
[-- Type: text/x-diff, Size: 7273 bytes --]
From f984bd492b9d00e26b154003c672e34f76e2fc1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Tue, 5 Oct 2021 23:05:33 +0200
Subject: [PATCH] New package: bees-0.7
---
.../0001-don-t-run-tests-unless-asked.patch | 44 +++++++++++++++
.../patches/0002-move-sbin-into-bin.patch | 37 +++++++++++++
...0003-start-work-on-cross-compilation.patch | 54 +++++++++++++++++++
srcpkgs/bees/template | 28 ++++++++++
4 files changed, 163 insertions(+)
create mode 100644 srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
create mode 100644 srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
create mode 100644 srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
create mode 100644 srcpkgs/bees/template
diff --git a/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
new file mode 100644
index 000000000000..4b1431b45873
--- /dev/null
+++ b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
@@ -0,0 +1,44 @@
+From e139a679d7cc3f04ad001054a6b1815b7afc92e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:04:15 +0200
+Subject: [PATCH 1/3] don't run tests unless asked
+
+---
+ Makefile | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9c840c4..d4c241e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,16 +14,12 @@ BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN)
+
+ DEFAULT_MAKE_TARGET ?= reallyall
+
+-ifeq ($(DEFAULT_MAKE_TARGET),reallyall)
+- RUN_INSTALL_TESTS = test
+-endif
+-
+ include Defines.mk
+
+ default: $(DEFAULT_MAKE_TARGET)
+
+ all: lib src scripts
+-reallyall: all doc test
++reallyall: all doc
+
+ clean: ## Cleanup
+ git clean -dfx -e localconf
+@@ -55,7 +51,7 @@ install_tools: src
+ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
+
+ install_bees: ## Install bees + libs
+-install_bees: src $(RUN_INSTALL_TESTS)
++install_bees: src
+ install -Dm755 bin/bees $(DESTDIR)$(LIBEXEC_PREFIX)/bees
+
+ install_scripts: ## Install scipts
+--
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
new file mode 100644
index 000000000000..3d3b7fe22291
--- /dev/null
+++ b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
@@ -0,0 +1,37 @@
+From fc133aa8647fe34a41c70bd5915c7f7f655d3160 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:05:15 +0200
+Subject: [PATCH 2/3] move sbin/* into bin/*
+
+Void does not distinguis between bin and sbin, but this patch will
+likely not be upstreamable.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d4c241e..2694e78 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@ scripts: scripts/beesd scripts/beesd@.service
+ install_tools: ## Install support tools + libs
+ install_tools: src
+ install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
+- install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
++ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/bin/fiewalk
+
+ install_bees: ## Install bees + libs
+ install_bees: src
+@@ -56,7 +56,7 @@ install_bees: src
+
+ install_scripts: ## Install scipts
+ install_scripts: scripts
+- install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd
++ install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd
+ install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample
+ ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),)
+ install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service
+--
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
new file mode 100644
index 000000000000..30f758460754
--- /dev/null
+++ b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
@@ -0,0 +1,54 @@
+From be64a6e50987dba582d8704d62cb1f9a3577645d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:06:54 +0200
+Subject: [PATCH 3/3] start work on cross compilation
+
+The tests have to be run on the host, so these shouldn't be cross
+compiled. This patch is not done yet, but it's included here anyway, so
+that whoever wants to continue on it doesn't have to start from scratch.
+---
+ makeflags | 3 +++
+ test/Makefile | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/makeflags b/makeflags
+index c5b6951..29e0430 100644
+--- a/makeflags
++++ b/makeflags
+@@ -11,3 +11,6 @@ CCFLAGS += -I../include -D_FILE_OFFSET_BITS=64
+
+ BEES_CFLAGS = $(CCFLAGS) -std=c99 $(CFLAGS)
+ BEES_CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast $(CXXFLAGS)
++
++BEES_CFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c99 $(CFLAGS_FOR_BUILD)
++BEES_CXXFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c++11 -Wold-style-cast $(CXXFLAGS_FOR_BUILD)
+diff --git a/test/Makefile b/test/Makefile
+index ae66a7c..3c70244 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -24,7 +24,7 @@ BEES_LDFLAGS = -L../lib $(LDFLAGS)
+ mkdir -p $@
+
+ .depends/%.dep: %.cc tests.h Makefile | .depends
+- $(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) -M -MF $@ -MT $(<:.cc=.o) $<
+
+ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ cat $^ > $@.new
+@@ -33,10 +33,10 @@ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ include depends.mk
+
+ $(PROGRAMS:%=%.o): %.o: %.cc ../makeflags Makefile
+- $(CXX) $(BEES_CXXFLAGS) -o $@ -c $<
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAG_FOR_BUILDS) -o $@ -c $<
+
+ $(PROGRAMS): %: %.o ../makeflags Makefile ../lib/libcrucible.a
+- $(CXX) $(BEES_CXXFLAGS) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
+
+ %.txt: % Makefile FORCE
+ ./$< >$@ 2>&1 || (RC=$$?; cat $@; exit $$RC)
+--
+2.35.1
+
diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
new file mode 100644
index 000000000000..38f6c07da4e2
--- /dev/null
+++ b/srcpkgs/bees/template
@@ -0,0 +1,28 @@
+# Template file for 'bees'
+pkgname=bees
+version=0.7
+revision=1
+build_style=gnu-makefile
+make_check_target="test"
+hostmakedepends="pkg-config"
+depends="btrfs-progs"
+short_desc="Best-Effort Extent-Same, a btrfs deduplication agent"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Zygo/bees"
+distfiles="https://github.com/Zygo/bees/archive/refs/tags/v${version}.tar.gz"
+checksum=2e67422b9f0d9ef665523b474fb27055efffceb263f8ccfdfda2a3aac9c6bdb1
+
+if [ "$CROSS_BUILD" ]; then
+ # Tests don't work properly with cross compilation, because it doesn't
+ # differentiate between host and target compilers correctly.
+ #
+ # There is a patch included which starts working on this, but I
+ # couldn't get it to work properly, so it's not being applied right
+ # now.
+ make_check="no"
+fi
+
+pre_build() {
+ export BEES_VERSION="${version}"
+}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (11 preceding siblings ...)
2022-03-27 10:42 ` jcgruenhage
@ 2022-03-27 10:44 ` jcgruenhage
2022-03-27 13:13 ` jcgruenhage
` (5 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: jcgruenhage @ 2022-03-27 10:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages bees-0.7_1
https://github.com/void-linux/void-packages/pull/33356
New package: bees-0.7
<!-- Mark items with [x] where applicable -->
Based majorly on #32643, with commits cleaned up, version updated and the Makefile patch modified a bit.
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33356.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bees-0.7_1-33356.patch --]
[-- Type: text/x-diff, Size: 7636 bytes --]
From 39e7d37cc5a1ec507f51366e930c004f0f530b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Tue, 5 Oct 2021 23:05:33 +0200
Subject: [PATCH] New package: bees-0.7
---
.../0001-don-t-run-tests-unless-asked.patch | 44 +++++++++++++++
.../patches/0002-move-sbin-into-bin.patch | 37 +++++++++++++
...0003-start-work-on-cross-compilation.patch | 54 +++++++++++++++++++
srcpkgs/bees/patches/series | 2 +
srcpkgs/bees/template | 28 ++++++++++
5 files changed, 165 insertions(+)
create mode 100644 srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
create mode 100644 srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
create mode 100644 srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
create mode 100644 srcpkgs/bees/patches/series
create mode 100644 srcpkgs/bees/template
diff --git a/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
new file mode 100644
index 000000000000..4b1431b45873
--- /dev/null
+++ b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
@@ -0,0 +1,44 @@
+From e139a679d7cc3f04ad001054a6b1815b7afc92e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:04:15 +0200
+Subject: [PATCH 1/3] don't run tests unless asked
+
+---
+ Makefile | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9c840c4..d4c241e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,16 +14,12 @@ BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN)
+
+ DEFAULT_MAKE_TARGET ?= reallyall
+
+-ifeq ($(DEFAULT_MAKE_TARGET),reallyall)
+- RUN_INSTALL_TESTS = test
+-endif
+-
+ include Defines.mk
+
+ default: $(DEFAULT_MAKE_TARGET)
+
+ all: lib src scripts
+-reallyall: all doc test
++reallyall: all doc
+
+ clean: ## Cleanup
+ git clean -dfx -e localconf
+@@ -55,7 +51,7 @@ install_tools: src
+ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
+
+ install_bees: ## Install bees + libs
+-install_bees: src $(RUN_INSTALL_TESTS)
++install_bees: src
+ install -Dm755 bin/bees $(DESTDIR)$(LIBEXEC_PREFIX)/bees
+
+ install_scripts: ## Install scipts
+--
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
new file mode 100644
index 000000000000..3d3b7fe22291
--- /dev/null
+++ b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
@@ -0,0 +1,37 @@
+From fc133aa8647fe34a41c70bd5915c7f7f655d3160 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:05:15 +0200
+Subject: [PATCH 2/3] move sbin/* into bin/*
+
+Void does not distinguis between bin and sbin, but this patch will
+likely not be upstreamable.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d4c241e..2694e78 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@ scripts: scripts/beesd scripts/beesd@.service
+ install_tools: ## Install support tools + libs
+ install_tools: src
+ install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
+- install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
++ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/bin/fiewalk
+
+ install_bees: ## Install bees + libs
+ install_bees: src
+@@ -56,7 +56,7 @@ install_bees: src
+
+ install_scripts: ## Install scipts
+ install_scripts: scripts
+- install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd
++ install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd
+ install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample
+ ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),)
+ install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service
+--
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
new file mode 100644
index 000000000000..30f758460754
--- /dev/null
+++ b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
@@ -0,0 +1,54 @@
+From be64a6e50987dba582d8704d62cb1f9a3577645d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:06:54 +0200
+Subject: [PATCH 3/3] start work on cross compilation
+
+The tests have to be run on the host, so these shouldn't be cross
+compiled. This patch is not done yet, but it's included here anyway, so
+that whoever wants to continue on it doesn't have to start from scratch.
+---
+ makeflags | 3 +++
+ test/Makefile | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/makeflags b/makeflags
+index c5b6951..29e0430 100644
+--- a/makeflags
++++ b/makeflags
+@@ -11,3 +11,6 @@ CCFLAGS += -I../include -D_FILE_OFFSET_BITS=64
+
+ BEES_CFLAGS = $(CCFLAGS) -std=c99 $(CFLAGS)
+ BEES_CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast $(CXXFLAGS)
++
++BEES_CFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c99 $(CFLAGS_FOR_BUILD)
++BEES_CXXFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c++11 -Wold-style-cast $(CXXFLAGS_FOR_BUILD)
+diff --git a/test/Makefile b/test/Makefile
+index ae66a7c..3c70244 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -24,7 +24,7 @@ BEES_LDFLAGS = -L../lib $(LDFLAGS)
+ mkdir -p $@
+
+ .depends/%.dep: %.cc tests.h Makefile | .depends
+- $(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) -M -MF $@ -MT $(<:.cc=.o) $<
+
+ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ cat $^ > $@.new
+@@ -33,10 +33,10 @@ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ include depends.mk
+
+ $(PROGRAMS:%=%.o): %.o: %.cc ../makeflags Makefile
+- $(CXX) $(BEES_CXXFLAGS) -o $@ -c $<
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAG_FOR_BUILDS) -o $@ -c $<
+
+ $(PROGRAMS): %: %.o ../makeflags Makefile ../lib/libcrucible.a
+- $(CXX) $(BEES_CXXFLAGS) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
+
+ %.txt: % Makefile FORCE
+ ./$< >$@ 2>&1 || (RC=$$?; cat $@; exit $$RC)
+--
+2.35.1
+
diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series
new file mode 100644
index 000000000000..d9a2837128f2
--- /dev/null
+++ b/srcpkgs/bees/patches/series
@@ -0,0 +1,2 @@
+0001-don-t-run-tests-unless-asked.patch
+0002-move-sbin-into-bin.patch
diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
new file mode 100644
index 000000000000..38f6c07da4e2
--- /dev/null
+++ b/srcpkgs/bees/template
@@ -0,0 +1,28 @@
+# Template file for 'bees'
+pkgname=bees
+version=0.7
+revision=1
+build_style=gnu-makefile
+make_check_target="test"
+hostmakedepends="pkg-config"
+depends="btrfs-progs"
+short_desc="Best-Effort Extent-Same, a btrfs deduplication agent"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Zygo/bees"
+distfiles="https://github.com/Zygo/bees/archive/refs/tags/v${version}.tar.gz"
+checksum=2e67422b9f0d9ef665523b474fb27055efffceb263f8ccfdfda2a3aac9c6bdb1
+
+if [ "$CROSS_BUILD" ]; then
+ # Tests don't work properly with cross compilation, because it doesn't
+ # differentiate between host and target compilers correctly.
+ #
+ # There is a patch included which starts working on this, but I
+ # couldn't get it to work properly, so it's not being applied right
+ # now.
+ make_check="no"
+fi
+
+pre_build() {
+ export BEES_VERSION="${version}"
+}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (12 preceding siblings ...)
2022-03-27 10:44 ` jcgruenhage
@ 2022-03-27 13:13 ` jcgruenhage
2022-03-27 13:17 ` jcgruenhage
` (4 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: jcgruenhage @ 2022-03-27 13:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages bees-0.7_1
https://github.com/void-linux/void-packages/pull/33356
New package: bees-0.7
<!-- Mark items with [x] where applicable -->
Based majorly on #32643, with commits cleaned up, version updated and the Makefile patch modified a bit.
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33356.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bees-0.7_1-33356.patch --]
[-- Type: text/x-diff, Size: 7644 bytes --]
From c2e4b681d9fe4b4eebc1a090142f6ff46af1f219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Tue, 5 Oct 2021 23:05:33 +0200
Subject: [PATCH] New package: bees-0.7
---
.../0001-don-t-run-tests-unless-asked.patch | 44 +++++++++++++++
.../patches/0002-move-sbin-into-bin.patch | 37 +++++++++++++
...0003-start-work-on-cross-compilation.patch | 54 +++++++++++++++++++
srcpkgs/bees/patches/series | 2 +
srcpkgs/bees/template | 28 ++++++++++
5 files changed, 165 insertions(+)
create mode 100644 srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
create mode 100644 srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
create mode 100644 srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
create mode 100644 srcpkgs/bees/patches/series
create mode 100644 srcpkgs/bees/template
diff --git a/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
new file mode 100644
index 000000000000..4b1431b45873
--- /dev/null
+++ b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
@@ -0,0 +1,44 @@
+From e139a679d7cc3f04ad001054a6b1815b7afc92e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:04:15 +0200
+Subject: [PATCH 1/3] don't run tests unless asked
+
+---
+ Makefile | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9c840c4..d4c241e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,16 +14,12 @@ BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN)
+
+ DEFAULT_MAKE_TARGET ?= reallyall
+
+-ifeq ($(DEFAULT_MAKE_TARGET),reallyall)
+- RUN_INSTALL_TESTS = test
+-endif
+-
+ include Defines.mk
+
+ default: $(DEFAULT_MAKE_TARGET)
+
+ all: lib src scripts
+-reallyall: all doc test
++reallyall: all doc
+
+ clean: ## Cleanup
+ git clean -dfx -e localconf
+@@ -55,7 +51,7 @@ install_tools: src
+ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
+
+ install_bees: ## Install bees + libs
+-install_bees: src $(RUN_INSTALL_TESTS)
++install_bees: src
+ install -Dm755 bin/bees $(DESTDIR)$(LIBEXEC_PREFIX)/bees
+
+ install_scripts: ## Install scipts
+--
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
new file mode 100644
index 000000000000..3d3b7fe22291
--- /dev/null
+++ b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
@@ -0,0 +1,37 @@
+From fc133aa8647fe34a41c70bd5915c7f7f655d3160 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:05:15 +0200
+Subject: [PATCH 2/3] move sbin/* into bin/*
+
+Void does not distinguis between bin and sbin, but this patch will
+likely not be upstreamable.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d4c241e..2694e78 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@ scripts: scripts/beesd scripts/beesd@.service
+ install_tools: ## Install support tools + libs
+ install_tools: src
+ install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
+- install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
++ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/bin/fiewalk
+
+ install_bees: ## Install bees + libs
+ install_bees: src
+@@ -56,7 +56,7 @@ install_bees: src
+
+ install_scripts: ## Install scipts
+ install_scripts: scripts
+- install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd
++ install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd
+ install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample
+ ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),)
+ install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service
+--
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
new file mode 100644
index 000000000000..30f758460754
--- /dev/null
+++ b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
@@ -0,0 +1,54 @@
+From be64a6e50987dba582d8704d62cb1f9a3577645d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:06:54 +0200
+Subject: [PATCH 3/3] start work on cross compilation
+
+The tests have to be run on the host, so these shouldn't be cross
+compiled. This patch is not done yet, but it's included here anyway, so
+that whoever wants to continue on it doesn't have to start from scratch.
+---
+ makeflags | 3 +++
+ test/Makefile | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/makeflags b/makeflags
+index c5b6951..29e0430 100644
+--- a/makeflags
++++ b/makeflags
+@@ -11,3 +11,6 @@ CCFLAGS += -I../include -D_FILE_OFFSET_BITS=64
+
+ BEES_CFLAGS = $(CCFLAGS) -std=c99 $(CFLAGS)
+ BEES_CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast $(CXXFLAGS)
++
++BEES_CFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c99 $(CFLAGS_FOR_BUILD)
++BEES_CXXFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c++11 -Wold-style-cast $(CXXFLAGS_FOR_BUILD)
+diff --git a/test/Makefile b/test/Makefile
+index ae66a7c..3c70244 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -24,7 +24,7 @@ BEES_LDFLAGS = -L../lib $(LDFLAGS)
+ mkdir -p $@
+
+ .depends/%.dep: %.cc tests.h Makefile | .depends
+- $(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) -M -MF $@ -MT $(<:.cc=.o) $<
+
+ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ cat $^ > $@.new
+@@ -33,10 +33,10 @@ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ include depends.mk
+
+ $(PROGRAMS:%=%.o): %.o: %.cc ../makeflags Makefile
+- $(CXX) $(BEES_CXXFLAGS) -o $@ -c $<
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAG_FOR_BUILDS) -o $@ -c $<
+
+ $(PROGRAMS): %: %.o ../makeflags Makefile ../lib/libcrucible.a
+- $(CXX) $(BEES_CXXFLAGS) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
++ $(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
+
+ %.txt: % Makefile FORCE
+ ./$< >$@ 2>&1 || (RC=$$?; cat $@; exit $$RC)
+--
+2.35.1
+
diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series
new file mode 100644
index 000000000000..d9a2837128f2
--- /dev/null
+++ b/srcpkgs/bees/patches/series
@@ -0,0 +1,2 @@
+0001-don-t-run-tests-unless-asked.patch
+0002-move-sbin-into-bin.patch
diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
new file mode 100644
index 000000000000..c9184f593e87
--- /dev/null
+++ b/srcpkgs/bees/template
@@ -0,0 +1,28 @@
+# Template file for 'bees'
+pkgname=bees
+version=0.7
+revision=1
+archs="~*-musl"
+build_style=gnu-makefile
+make_check_target="test"
+hostmakedepends="pkg-config"
+depends="btrfs-progs"
+short_desc="Best-Effort Extent-Same, a btrfs deduplication agent"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Zygo/bees"
+distfiles="https://github.com/Zygo/bees/archive/refs/tags/v${version}.tar.gz"
+checksum=2e67422b9f0d9ef665523b474fb27055efffceb263f8ccfdfda2a3aac9c6bdb1
+
+if [ "$CROSS_BUILD" ]; then
+# Tests don't work properly with cross compilation, because it doesn't
+# differentiate between host and target compilers correctly.
+#
+# There is a patch included which starts working on this, but I couldn't get it
+# to work properly, so it's not being applied right now.
+ make_check="no"
+fi
+
+pre_build() {
+ export BEES_VERSION="${version}"
+}
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (13 preceding siblings ...)
2022-03-27 13:13 ` jcgruenhage
@ 2022-03-27 13:17 ` jcgruenhage
2022-03-27 14:56 ` Vaelatern
` (3 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: jcgruenhage @ 2022-03-27 13:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#issuecomment-1079930219
Comment:
So, set up to be only available on glibc targets, tests only run when not cross compiling. My started patch for cross compiling + testing is included, but deselected using the the `series` file. Any more changes you'd want?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (14 preceding siblings ...)
2022-03-27 13:17 ` jcgruenhage
@ 2022-03-27 14:56 ` Vaelatern
2022-03-27 14:56 ` [PR PATCH] [Merged]: " Vaelatern
` (2 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Vaelatern @ 2022-03-27 14:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#issuecomment-1079947967
Comment:
I'm willing to accept the possibly useless patch as suitably low cost.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Merged]: New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (15 preceding siblings ...)
2022-03-27 14:56 ` Vaelatern
@ 2022-03-27 14:56 ` Vaelatern
2022-03-27 15:05 ` jcgruenhage
2022-03-27 15:24 ` Vaelatern
18 siblings, 0 replies; 21+ messages in thread
From: Vaelatern @ 2022-03-27 14:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1540 bytes --]
There's a merged pull request on the void-packages repository
New package: bees-0.7
https://github.com/void-linux/void-packages/pull/33356
Description:
<!-- Mark items with [x] where applicable -->
Based majorly on #32643, with commits cleaned up, version updated and the Makefile patch modified a bit.
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (16 preceding siblings ...)
2022-03-27 14:56 ` [PR PATCH] [Merged]: " Vaelatern
@ 2022-03-27 15:05 ` jcgruenhage
2022-03-27 15:24 ` Vaelatern
18 siblings, 0 replies; 21+ messages in thread
From: jcgruenhage @ 2022-03-27 15:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#issuecomment-1079949665
Comment:
Leaving it in as a discoverable starting point seemed like the right approach, but I'm also happy to remove it if it's not desirable to include it.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: New package: bees-0.7
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
` (17 preceding siblings ...)
2022-03-27 15:05 ` jcgruenhage
@ 2022-03-27 15:24 ` Vaelatern
18 siblings, 0 replies; 21+ messages in thread
From: Vaelatern @ 2022-03-27 15:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/33356#issuecomment-1079953128
Comment:
too late, merged :)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PR PATCH] [Updated] New package: bees-0.7
2021-08-23 6:26 [PR PATCH] New package: bees-081a6af278fc2b4f33198e2ec0028f8383bb6d4a_1 Paradigm0001
@ 2021-10-05 1:55 ` Paradigm0001
0 siblings, 0 replies; 21+ messages in thread
From: Paradigm0001 @ 2021-10-05 1:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]
There is an updated pull request by Paradigm0001 against master on the void-packages repository
https://github.com/Paradigm0001/void-packages master
https://github.com/void-linux/void-packages/pull/32643
New package: bees-0.7
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/32643.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32643.patch --]
[-- Type: text/x-diff, Size: 5199 bytes --]
From b4e92650c52a28f97f3bbf5888dbec0b54c0b624 Mon Sep 17 00:00:00 2001
From: Paradigm0001 <46477191+Paradigm0001@users.noreply.github.com>
Date: Mon, 23 Aug 2021 06:17:05 +0000
Subject: [PATCH 1/3] Upload bees template and patch files
---
srcpkgs/bees/patches/sbin-remove.patch | 25 +++++++++++++++++++++
srcpkgs/bees/patches/sbin-remove.patch.args | 1 +
srcpkgs/bees/template | 13 +++++++++++
3 files changed, 39 insertions(+)
create mode 100644 srcpkgs/bees/patches/sbin-remove.patch
create mode 100644 srcpkgs/bees/patches/sbin-remove.patch.args
create mode 100644 srcpkgs/bees/template
diff --git a/srcpkgs/bees/patches/sbin-remove.patch b/srcpkgs/bees/patches/sbin-remove.patch
new file mode 100644
index 000000000000..0c2077cd2c38
--- /dev/null
+++ b/srcpkgs/bees/patches/sbin-remove.patch
@@ -0,0 +1,25 @@
+--- Makefile_bak 2021-08-22 22:58:00.224045573 -0700
++++ Makefile 2021-08-22 23:08:13.971375382 -0700
+@@ -49,18 +49,15 @@
+
+ scripts: scripts/beesd scripts/beesd@.service
+
+-install_tools: ## Install support tools + libs
+-install_tools: src
+- install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
+- install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
+-
+ install_bees: ## Install bees + libs
+ install_bees: src $(RUN_INSTALL_TESTS)
+- install -Dm755 bin/bees $(DESTDIR)$(LIBEXEC_PREFIX)/bees
++ install -Dm755 bin/bees $(DESTDIR)$(PREFIX)/bin/bees
++ install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
++ install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/bin/fiewalk
+
+ install_scripts: ## Install scipts
+ install_scripts: scripts
+- install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd
++ install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd
+ install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample
+ ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),)
+ install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service
diff --git a/srcpkgs/bees/patches/sbin-remove.patch.args b/srcpkgs/bees/patches/sbin-remove.patch.args
new file mode 100644
index 000000000000..f3c7a7c5da68
--- /dev/null
+++ b/srcpkgs/bees/patches/sbin-remove.patch.args
@@ -0,0 +1 @@
+Makefile
diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
new file mode 100644
index 000000000000..c632bb470aa4
--- /dev/null
+++ b/srcpkgs/bees/template
@@ -0,0 +1,13 @@
+# Template file for 'bees'
+pkgname=bees
+version=081a6af278fc2b4f33198e2ec0028f8383bb6d4a
+revision=1
+build_style=gnu-makefile
+makedepends="gcc git discount"
+depends="btrfs-progs"
+short_desc="Best-Effort Extent-Same, a btrfs deduplication agent"
+maintainer="Paradigm <unixparadigm@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Zygo/bees"
+distfiles="https://github.com/Zygo/bees/archive/${version}.tar.gz"
+checksum=c7251c3b3cf2eec79c35dad93e1bb2d160175c99c35d03e7cd37ae1f8bbb437a
From 14555c72772545672e33c5fb0e47b09d134e1009 Mon Sep 17 00:00:00 2001
From: "Paradigm0001@github.com" <Paradigm0001@github.com>
Date: Mon, 23 Aug 2021 00:19:40 -0700
Subject: [PATCH 2/3] Renamed patch file and removed arg file
---
srcpkgs/bees/patches/{sbin-remove.patch => Makefile.patch} | 4 ++--
srcpkgs/bees/patches/sbin-remove.patch.args | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
rename srcpkgs/bees/patches/{sbin-remove.patch => Makefile.patch} (86%)
delete mode 100644 srcpkgs/bees/patches/sbin-remove.patch.args
diff --git a/srcpkgs/bees/patches/sbin-remove.patch b/srcpkgs/bees/patches/Makefile.patch
similarity index 86%
rename from srcpkgs/bees/patches/sbin-remove.patch
rename to srcpkgs/bees/patches/Makefile.patch
index 0c2077cd2c38..7a9f417fccfd 100644
--- a/srcpkgs/bees/patches/sbin-remove.patch
+++ b/srcpkgs/bees/patches/Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile_bak 2021-08-22 22:58:00.224045573 -0700
-+++ Makefile 2021-08-22 23:08:13.971375382 -0700
+--- ../bees-081a6af278fc2b4f33198e2ec0028f8383bb6d4a/Makefile 2021-06-19 01:35:28.000000000 -0700
++++ ./Makefile 2021-08-23 00:15:28.826863730 -0700
@@ -49,18 +49,15 @@
scripts: scripts/beesd scripts/beesd@.service
diff --git a/srcpkgs/bees/patches/sbin-remove.patch.args b/srcpkgs/bees/patches/sbin-remove.patch.args
deleted file mode 100644
index f3c7a7c5da68..000000000000
--- a/srcpkgs/bees/patches/sbin-remove.patch.args
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
From a3fd33bbddf9c5729360458f755794fe0bcecf69 Mon Sep 17 00:00:00 2001
From: "Paradigm0001@github.com" <Paradigm0001@github.com>
Date: Mon, 23 Aug 2021 04:23:12 -0700
Subject: [PATCH 3/3] Removed unnecessary gcc dep and renamed makedepends to
hostmakedepends
---
srcpkgs/bees/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
index c632bb470aa4..617b36e02cbd 100644
--- a/srcpkgs/bees/template
+++ b/srcpkgs/bees/template
@@ -3,7 +3,7 @@ pkgname=bees
version=081a6af278fc2b4f33198e2ec0028f8383bb6d4a
revision=1
build_style=gnu-makefile
-makedepends="gcc git discount"
+hostmakedepends="git discount"
depends="btrfs-progs"
short_desc="Best-Effort Extent-Same, a btrfs deduplication agent"
maintainer="Paradigm <unixparadigm@protonmail.com>"
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2022-03-27 15:24 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-05 21:14 [PR PATCH] New package: bees-0.7 jcgruenhage
2021-10-06 2:47 ` [PR REVIEW] " Vaelatern
2021-10-06 9:51 ` jcgruenhage
2021-10-06 11:08 ` jcgruenhage
2021-10-06 13:51 ` Vaelatern
2021-10-06 14:56 ` [PR PATCH] [Updated] " jcgruenhage
2021-10-06 18:59 ` Vaelatern
2021-10-07 12:04 ` jcgruenhage
2021-10-08 9:48 ` jcgruenhage
2021-10-08 20:19 ` Chocimier
2021-10-08 23:03 ` Vaelatern
2022-03-27 10:29 ` [PR PATCH] [Updated] " jcgruenhage
2022-03-27 10:42 ` jcgruenhage
2022-03-27 10:44 ` jcgruenhage
2022-03-27 13:13 ` jcgruenhage
2022-03-27 13:17 ` jcgruenhage
2022-03-27 14:56 ` Vaelatern
2022-03-27 14:56 ` [PR PATCH] [Merged]: " Vaelatern
2022-03-27 15:05 ` jcgruenhage
2022-03-27 15:24 ` Vaelatern
-- strict thread matches above, loose matches on Subject: below --
2021-08-23 6:26 [PR PATCH] New package: bees-081a6af278fc2b4f33198e2ec0028f8383bb6d4a_1 Paradigm0001
2021-10-05 1:55 ` [PR PATCH] [Updated] New package: bees-0.7 Paradigm0001
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 NNTP newsgroup(s).