[gentoo-commits] proj/genkernel:master commit in: gkbuilds/, defaults/

[Ben Kohler]

commit:     890c3819be5628b59ad7b2610c9ab49200da8edd
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 16:17:20 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 16:17:20 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=890c3819

gkbuilds/bcache-tools: really build new bcache-tools now

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

 defaults/software.sh                                      |  2 +-
 ...tools.gkbuild => bcache-tools-1.0.8_p20141204.gkbuild} |  0
 ...e-tools.gkbuild => bcache-tools-1.1_p20230217.gkbuild} | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/defaults/software.sh b/defaults/software.sh
index 01c504b..df7decc 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-399021549984ad27bf4a13ae85e458833fe003d7}"
+GKPKG_BCACHE_TOOLS_SRCDIR="${GKPKG_BCACHE_TOOLS_SRCDIR:-bcache-tools-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/gkbuilds/bcache-tools.gkbuild 
b/gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild
similarity index 100%
copy from gkbuilds/bcache-tools.gkbuild
copy to gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild

diff --git a/gkbuilds/bcache-tools.gkbuild 
b/gkbuilds/bcache-tools-1.1_p20230217.gkbuild
similarity index 70%
rename from gkbuilds/bcache-tools.gkbuild
rename to gkbuilds/bcache-tools-1.1_p20230217.gkbuild
index 556e7f2..720da66 100644
--- a/gkbuilds/bcache-tools.gkbuild
+++ b/gkbuilds/bcache-tools-1.1_p20230217.gkbuild
@@ -1,6 +1,20 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+src_prepare() {
+       default
+
+       tc-export CC
+       sed \
+               -e '/^CFLAGS/s:-O2::' \
+               -e '/^CFLAGS/s:-g::' \
+               -e '/.*INSTALL.*share\/man/d' \
+               -e '/.*INSTALL.*bcache-status/d' \
+               -i Makefile || die
+
+       append-lfs-flags
+}
+
 src_configure() {
        append-ldflags -static
 }
@@ -11,6 +25,7 @@ src_compile() {
 }
 
 src_install() {
+       mkdir -p "${D}"/usr/sbin "${D}$(get_udevdir)"/rules.d
        gkmake V=1 UDEVLIBDIR="$(get_udevdir)" DESTDIR="${D}" install
 
        rm -rf \