{gkbuilds,patches}/bcache-tools: fix build

Signed-off-by: Ben Kohler <bkohler@gentoo.org>

4 files changed, 1 insertions, 153 deletions

diff --git a/defaults/software.sh b/defaults/software.sh
index df7deccf..42004f39 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -13,7 +13,7 @@ GKPKG_BCACHE_TOOLS_PN="bcache-tools"
 GKPKG_BCACHE_TOOLS_PV="${GKPKG_BCACHE_TOOLS_PV:-${VERSION_BCACHE_TOOLS}}"
 GKPKG_BCACHE_TOOLS_DEPS="util-linux eudev"
 GKPKG_BCACHE_TOOLS_SRCTAR="${GKPKG_BCACHE_TOOLS_SRCTAR:-${DISTDIR}/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}.tar.gz}"
-GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-a5e3753516bd39c431def86c8dfec8a9cea1ddd4}"
+GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-a5e3753516bd39c431def86c8dfec8a9cea1ddd4}"
 GKPKG_BCACHE_TOOLS_BINPKG="${GKPKG_BCACHE_TOOLS_BINPKG:-%%CACHE%%/bcache-tools-${GKPKG_BCACHE_TOOLS_PV}-%%ARCH%%.tar.xz}"
 
 GKPKG_BOOST_PN="boost"
diff --git a/patches/bcache-tools/1.1_p20230217/bcache-tools-1.0.8_p20141204-build.patch b/patches/bcache-tools/1.1_p20230217/bcache-tools-1.0.8_p20141204-build.patch
deleted file mode 100644
index 6f6d4ca6..00000000
--- a/patches/bcache-tools/1.1_p20230217/bcache-tools-1.0.8_p20141204-build.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,32 +1,63 @@
-+CC ?= gcc
-+PREFIX = /usr
-+UDEVLIBDIR = /lib/udev
-+DRACUTLIBDIR = /lib/dracut
-+INSTALL ?= install
-+CFLAGS ?= -O2 -Wall -g
-+PKG_CONFIG ?= pkg-config
- 
--PREFIX=/usr
--UDEVLIBDIR=/lib/udev
--DRACUTLIBDIR=/lib/dracut
--INSTALL=install
--CFLAGS+=-O2 -Wall -g
-+BCACHE_TEST_LIBS = $(shell $(PKG_CONFIG) --libs openssl) -lm
-+
-+MAKE_BCACHE_CFLAGS = $(shell $(PKG_CONFIG) --cflags uuid blkid)
-+MAKE_BCACHE_LIBS = $(shell $(PKG_CONFIG) --libs uuid blkid)
-+
-+PROBE_BCACHE_CFLAGS = $(shell $(PKG_CONFIG) --cflags uuid blkid)
-+PROBE_BCACHE_LIBS = $(shell $(PKG_CONFIG) --libs uuid blkid)
-+
-+BCACHE_SUPER_SHOW_CFLAGS = -std=gnu99 $(shell $(PKG_CONFIG) --cflags uuid)
-+BCACHE_SUPER_SHOW_LIBS = $(shell $(PKG_CONFIG) --libs uuid)
- 
- all: make-bcache probe-bcache bcache-super-show bcache-register
- 
- install: make-bcache probe-bcache bcache-super-show
--	$(INSTALL) -m0755 make-bcache bcache-super-show	$(DESTDIR)${PREFIX}/sbin/
--	$(INSTALL) -m0755 probe-bcache bcache-register		$(DESTDIR)$(UDEVLIBDIR)/
--	$(INSTALL) -m0644 69-bcache.rules	$(DESTDIR)$(UDEVLIBDIR)/rules.d/
-+	$(INSTALL) -m0755 -d $(DESTDIR)${PREFIX}/sbin
-+	$(INSTALL) -D -m0755 make-bcache bcache-super-show $(DESTDIR)${PREFIX}/sbin/
-+	$(INSTALL) -m0755 -d $(DESTDIR)$(UDEVLIBDIR)/rules.d
-+	$(INSTALL) -m0755 probe-bcache bcache-register $(DESTDIR)$(UDEVLIBDIR)/
-+	$(INSTALL) -m0644 69-bcache.rules $(DESTDIR)$(UDEVLIBDIR)/rules.d/
-+	$(INSTALL) -m0755 -d $(DESTDIR)${PREFIX}/share/man/man8
- 	$(INSTALL) -m0644 -- *.8 $(DESTDIR)${PREFIX}/share/man/man8/
--	$(INSTALL) -D -m0755 initramfs/hook	$(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
--	$(INSTALL) -D -m0755 initcpio/install	$(DESTDIR)/usr/lib/initcpio/install/bcache
-+	$(INSTALL) -D -m0755 initramfs/hook $(DESTDIR)/usr/share/initramfs-tools/hooks/bcache
-+	$(INSTALL) -D -m0755 initcpio/install $(DESTDIR)/usr/lib/initcpio/install/bcache
- 	$(INSTALL) -D -m0755 dracut/module-setup.sh $(DESTDIR)$(DRACUTLIBDIR)/modules.d/90bcache/module-setup.sh
- #	$(INSTALL) -m0755 bcache-test $(DESTDIR)${PREFIX}/sbin/
- 
- clean:
--	$(RM) -f make-bcache probe-bcache bcache-super-show bcache-test -- *.o
--
--bcache-test: LDLIBS += `pkg-config --libs openssl` -lm
--make-bcache: LDLIBS += `pkg-config --libs uuid blkid`
--make-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
--make-bcache: bcache.o
--probe-bcache: LDLIBS += `pkg-config --libs uuid blkid`
--probe-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
--bcache-super-show: LDLIBS += `pkg-config --libs uuid`
--bcache-super-show: CFLAGS += -std=gnu99
--bcache-super-show: bcache.o
-+	$(RM) -f make-bcache probe-bcache bcache-register bcache-super-show bcache-test -- *.o
-+
-+make-bcache: bcache.o make-bcache.o
-+	$(CC) -o $@ $^ $(LDFLAGS) $(MAKE_BCACHE_LIBS)
-+
-+bcache.o: bcache.c bcache.h
-+	$(CC) -c $(CFLAGS) $< -o $@
-+
-+make-bcache.o: make-bcache.c
-+	$(CC) -c $(CFLAGS) $(MAKE_BCACHE_CFLAGS) $< -o $@
-+
-+probe-bcache: probe-bcache.o
-+	$(CC) -o $@ $^ $(LDFLAGS) $(PROBE_BCACHE_LIBS)
-+
-+probe-bcache.o: probe-bcache.c
-+	$(CC) -c $(CFLAGS) $(PROBE_BCACHE_CFLAGS) $< -o $@
-+
-+bcache-super-show: bcache.o bcache-super-show.o
-+	$(CC) -o $@ $^ $(LDFLAGS) $(BCACHE_SUPER_SHOW_LIBS)
-+
-+bcache-super-show.o: bcache-super-show.c
-+	$(CC) -c $(CFLAGS) $(BCACHE_SUPER_SHOW_CFLAGS) $< -o $@
-+
- bcache-register: bcache-register.o
-+	$(CC) -o $@ $^ $(LDFLAGS) $(BCACHE_SUPER_SHOW_LIBS)
-+
-+bcache-register.o: bcache-register.c
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
diff --git a/patches/bcache-tools/1.1_p20230217/bcache-tools-1.0.8_p20141204-crc64.patch b/patches/bcache-tools/1.1_p20230217/bcache-tools-1.0.8_p20141204-crc64.patch
deleted file mode 100644
index cc4e0c5e..00000000
--- a/patches/bcache-tools/1.1_p20230217/bcache-tools-1.0.8_p20141204-crc64.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/bcache.c
-+++ b/bcache.c
-@@ -26,7 +26,7 @@
-  * x^7 + x^4 + x + 1
- */
- 
--static const uint64_t crc_table[256] = {
-+const uint64_t crc_table[256] = {
- 	0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL,
- 	0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL,
- 	0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL,
-@@ -114,16 +114,3 @@ static const uint64_t crc_table[256] = {
- 	0x5DEDC41A34BBEEB2ULL, 0x1F1D25F19D51D821ULL, 0xD80C07CD676F8394ULL,
- 	0x9AFCE626CE85B507ULL
- };
--
--inline uint64_t crc64(const void *_data, size_t len)
--{
--	uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
--	const unsigned char *data = _data;
--
--	while (len--) {
--		int i = ((int) (crc >> 56) ^ *data++) & 0xFF;
--		crc = crc_table[i] ^ (crc << 8);
--	}
--
--	return crc ^ 0xFFFFFFFFFFFFFFFFULL;
--}
---- a/bcache.h
-+++ b/bcache.h
-@@ -115,7 +115,20 @@ BITMASK(BDEV_STATE,		struct cache_sb, flags, 61, 2);
- #define BDEV_STATE_DIRTY	2U
- #define BDEV_STATE_STALE	3U
- 
--uint64_t crc64(const void *_data, size_t len);
-+extern const uint64_t crc_table[];
-+
-+static inline uint64_t crc64(const void *_data, size_t len)
-+{
-+        uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
-+        const unsigned char *data = _data;
-+
-+        while (len--) {
-+                int i = ((int) (crc >> 56) ^ *data++) & 0xFF;
-+                crc = crc_table[i] ^ (crc << 8);
-+        }
-+
-+        return crc ^ 0xFFFFFFFFFFFFFFFFULL;
-+}
- 
- #define node(i, j)		((void *) ((i)->d + (j)))
- #define end(i)			node(i, (i)->keys)
- 
diff --git a/patches/bcache-tools/1.1_p20230217/bcache-tools-1.0.8_p20141204-modprobe.patch b/patches/bcache-tools/1.1_p20230217/bcache-tools-1.0.8_p20141204-modprobe.patch
deleted file mode 100644
index aedfe29f..00000000
--- a/patches/bcache-tools/1.1_p20230217/bcache-tools-1.0.8_p20141204-modprobe.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/69-bcache.rules
-+++ b/69-bcache.rules
-@@ -18,7 +18,7 @@ ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end"
- ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
- 
- LABEL="bcache_backing_found"
--RUN{builtin}+="kmod load bcache"
-+RUN+="/sbin/modprobe bcache"
- RUN+="bcache-register $tempnode"
- LABEL="bcache_backing_end"
-