commit:     8f2b6ede25ea53098154eee0a440ded6f38668a9
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 16 18:39:42 2026 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Feb 16 18:39:42 2026 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8f2b6ede

gkbuilds: remove old gkbuild versions not used in current ebuilds

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

 gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild      | 27 --------
 ...-1.1_p20230217.gkbuild => bcache-tools.gkbuild} |  0
 gkbuilds/json-c-0.17.gkbuild                       | 28 --------
 gkbuilds/json-c-0.18.gkbuild                       | 28 --------
 gkbuilds/json-c.gkbuild                            | 26 ++++++++
 gkbuilds/lvm-2.03.22.gkbuild                       | 78 ----------------------
 gkbuilds/lvm.gkbuild                               |  2 +-
 gkbuilds/mdadm-4.2.gkbuild                         | 41 ------------
 gkbuilds/mdadm.gkbuild                             |  7 +-
 9 files changed, 32 insertions(+), 205 deletions(-)

diff --git a/gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild 
b/gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild
deleted file mode 100644
index 556e7f23..00000000
--- a/gkbuilds/bcache-tools-1.0.8_p20141204.gkbuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-src_configure() {
-       append-ldflags -static
-}
-
-src_compile() {
-       PKG_CONFIG="$(tc-getPKG_CONFIG) --static" \
-       gkmake V=1
-}
-
-src_install() {
-       gkmake V=1 UDEVLIBDIR="$(get_udevdir)" DESTDIR="${D}" install
-
-       rm -rf \
-               "${D}"/lib \
-               "${D}"/usr/lib/initcpio \
-               "${D}"/usr/sbin \
-               "${D}"/usr/share
-
-       "${STRIP}" --strip-all "${D}"/usr/lib/udev/bcache-register \
-               || die "Failed to strip '${D}/usr/lib/udev/bcache-register'!"
-
-       "${STRIP}" --strip-all "${D}"/usr/lib/udev/probe-bcache \
-               || die "Failed to strip '${D}/usr/lib/udev/probe-bcache'!"
-}

diff --git a/gkbuilds/bcache-tools-1.1_p20230217.gkbuild 
b/gkbuilds/bcache-tools.gkbuild
similarity index 100%
rename from gkbuilds/bcache-tools-1.1_p20230217.gkbuild
rename to gkbuilds/bcache-tools.gkbuild

diff --git a/gkbuilds/json-c-0.17.gkbuild b/gkbuilds/json-c-0.17.gkbuild
deleted file mode 100644
index 9d898525..00000000
--- a/gkbuilds/json-c-0.17.gkbuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-src_configure() {
-       mkdir ../${P}_build
-       cd ../${P}_build
-
-       gkexec "cmake \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DBUILD_APPS=OFF \
-               -DDISABLE_EXTRA_LIBS=ON \
-               -DDISABLE_WERROR=ON \
-               -DENABLE_RDRAND=no \
-               -DENABLE_THREADING=no \
-               -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-               -DCMAKE_INSTALL_LIBDIR=lib \
-               ../${P}"
-}
-
-src_compile() {
-       cd ../${P}_build
-       gkmake
-}
-
-src_install() {
-       cd ../${P}_build
-       gkmake DESTDIR="${D}" install
-}

diff --git a/gkbuilds/json-c-0.18.gkbuild b/gkbuilds/json-c-0.18.gkbuild
deleted file mode 100644
index 9d898525..00000000
--- a/gkbuilds/json-c-0.18.gkbuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-src_configure() {
-       mkdir ../${P}_build
-       cd ../${P}_build
-
-       gkexec "cmake \
-               -DCMAKE_INSTALL_PREFIX=/usr \
-               -DBUILD_APPS=OFF \
-               -DDISABLE_EXTRA_LIBS=ON \
-               -DDISABLE_WERROR=ON \
-               -DENABLE_RDRAND=no \
-               -DENABLE_THREADING=no \
-               -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-               -DCMAKE_INSTALL_LIBDIR=lib \
-               ../${P}"
-}
-
-src_compile() {
-       cd ../${P}_build
-       gkmake
-}
-
-src_install() {
-       cd ../${P}_build
-       gkmake DESTDIR="${D}" install
-}

diff --git a/gkbuilds/json-c.gkbuild b/gkbuilds/json-c.gkbuild
index c103679e..9d898525 100644
--- a/gkbuilds/json-c.gkbuild
+++ b/gkbuilds/json-c.gkbuild
@@ -1,2 +1,28 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+#
+src_configure() {
+       mkdir ../${P}_build
+       cd ../${P}_build
+
+       gkexec "cmake \
+               -DCMAKE_INSTALL_PREFIX=/usr \
+               -DBUILD_APPS=OFF \
+               -DDISABLE_EXTRA_LIBS=ON \
+               -DDISABLE_WERROR=ON \
+               -DENABLE_RDRAND=no \
+               -DENABLE_THREADING=no \
+               -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+               -DCMAKE_INSTALL_LIBDIR=lib \
+               ../${P}"
+}
+
+src_compile() {
+       cd ../${P}_build
+       gkmake
+}
+
+src_install() {
+       cd ../${P}_build
+       gkmake DESTDIR="${D}" install
+}

diff --git a/gkbuilds/lvm-2.03.22.gkbuild b/gkbuilds/lvm-2.03.22.gkbuild
deleted file mode 100644
index bbfb6522..00000000
--- a/gkbuilds/lvm-2.03.22.gkbuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-src_configure() {
-       # devicemapper needs to find udev
-       append-ldflags -Wl,-rpath-link,${BROOT}/usr/lib
-
-       export ac_cv_header_security_pam_misc_h=no
-       export ac_cv_header_security_pam_appl_h=no
-
-       local myconf=(
-               --enable-static_link
-               --enable-pkgconfig
-               --enable-dmeventd
-               --enable-cmdlib
-               --disable-lvmetad
-               --with-clvmd=none
-               --with-cluster=none
-               --disable-readline
-               --disable-selinux
-               --with-mirrors=internal
-               --with-snapshots=internal
-               --with-thin=internal
-               --with-cache=internal
-               --disable-udev-systemd-background-jobs
-               --enable-udev_sync
-               --enable-udev_rules
-       )
-
-       local texec
-       for texec in check dump repair restore
-       do
-               myconf+=( --with-thin-${texec}=/usr/sbin/thin_${texec} )
-               myconf+=( --with-cache-${texec}=/usr/sbin/cache_${texec} )
-       done
-
-       # Hard-wire this to bash as some shells (dash) don't know
-       # "-o pipefail" #682404, #716496
-       CONFIG_SHELL="/bin/bash" \
-       gkconf "${myconf[@]}"
-}
-
-src_install() {
-       default
-
-       rm -rf \
-               "${D}"/etc \
-               "${D}"/usr/sbin/* \
-               "${D}"/share
-
-       cp -a tools/lvm.static "${D}"/usr/sbin/lvm \
-               || die "Failed to copy '${S}/tools/lvm.static' to 
'${D}/usr/sbin/lvm'!"
-
-       "${STRIP}" --strip-all "${D}"/usr/sbin/lvm \
-               || die "Failed to strip '${D}/usr/sbin/lvm'!"
-
-       cp -a libdm/dm-tools/dmsetup.static "${D}"/usr/sbin/dmsetup \
-               || die "Failed to copy '${S}/tools/dmsetup.static' to 
'${D}/usr/sbin/dmsetup'!"
-
-       "${STRIP}" --strip-all "${D}"/usr/sbin/dmsetup \
-               || die "Failed to strip '${D}/usr/sbin/dmsetup'!"
-
-       ln -s dmsetup "${D}"/usr/sbin/dmstats \
-               || die "Failed to create symlink '${D}/usr/sbin/dmstats' to 
'${D}/usr/sbin/dmsetup'!"
-
-       # For backward compatibility (packages like multipath-tools are
-       # expecting /sbin/dmsetup in udev rules).
-       mkdir "${D}"/sbin || die "Failed to create '${D}/sbin'!"
-
-       ln -s ../usr/sbin/dmsetup "${D}"/sbin/dmsetup \
-               || die "Failed to create symlink '${D}/sbin/dmsetup' to 
'${D}/usr/sbin/dmsetup'!"
-
-       ln -s ../usr/sbin/dmstats "${D}"/sbin/dmstats \
-               || die "Failed to create symlink '${D}/sbin/dmstats' to 
'${D}/usr/sbin/dmstats'!"
-
-       ln -s ../usr/sbin/lvm "${D}"/sbin/lvm \
-               || die "Failed to create symlink '${D}/sbin/lvm' to 
'${D}/usr/sbin/lvm'!"
-}

diff --git a/gkbuilds/lvm.gkbuild b/gkbuilds/lvm.gkbuild
index 30063819..bbfb6522 100644
--- a/gkbuilds/lvm.gkbuild
+++ b/gkbuilds/lvm.gkbuild
@@ -54,7 +54,7 @@ src_install() {
        "${STRIP}" --strip-all "${D}"/usr/sbin/lvm \
                || die "Failed to strip '${D}/usr/sbin/lvm'!"
 
-       cp -a tools/dmsetup.static "${D}"/usr/sbin/dmsetup \
+       cp -a libdm/dm-tools/dmsetup.static "${D}"/usr/sbin/dmsetup \
                || die "Failed to copy '${S}/tools/dmsetup.static' to 
'${D}/usr/sbin/dmsetup'!"
 
        "${STRIP}" --strip-all "${D}"/usr/sbin/dmsetup \

diff --git a/gkbuilds/mdadm-4.2.gkbuild b/gkbuilds/mdadm-4.2.gkbuild
deleted file mode 100644
index 99bfb840..00000000
--- a/gkbuilds/mdadm-4.2.gkbuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-src_prepare() {
-       default
-
-       local defs='-DNO_DLM -DNO_COROSYNC -DNO_LIBUDEV'
-       sed -i \
-               -e "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = ${CFLAGS} 
${defs}:" \
-               -e "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = ${CFLAGS} 
${defs}:" \
-               -e "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:" \
-               -e "s/^# LDFLAGS = -static/LDFLAGS = -static/" \
-               -e "s|^UDEVDIR := .*|UDEVDIR = $(get_udevdir)|" \
-               Makefile \
-               || die "Failed to sed mdadm Makefile"
-}
-
-src_compile() {
-       # bug 907082
-       append-cppflags -D_LARGEFILE64_SOURCE
-
-       CXFLAGS="-DNO_LIBUDEV" gkmake V=1 mdadm mdmon
-}
-
-src_install() {
-       gkmake V=1 DESTDIR="${D}" install-udev
-
-       mkdir -p "${D}"/sbin || die "Failed to create '${D}/sbin'!"
-
-       cp -a mdadm "${D}"/sbin/ \
-               || die "Failed to copy '${S}/mdadm' to '${D}/sbin/'!"
-
-       "${STRIP}" --strip-all "${D}"/sbin/mdadm \
-               || die "Failed to strip '${D}/sbin/mdadm'!"
-
-       cp -a mdmon "${D}"/sbin/ \
-               || die "Failed to copy '${D}/sbin/mdmon' to '${D}/sbin/'!"
-
-       "${STRIP}" --strip-all "${D}"/sbin/mdmon \
-               || die "Failed to strip '${D}/sbin/mdmon'!"
-}

diff --git a/gkbuilds/mdadm.gkbuild b/gkbuilds/mdadm.gkbuild
index b43f753e..99bfb840 100644
--- a/gkbuilds/mdadm.gkbuild
+++ b/gkbuilds/mdadm.gkbuild
@@ -4,7 +4,7 @@
 src_prepare() {
        default
 
-       local defs='-DNO_DLM -DNO_COROSYNC'
+       local defs='-DNO_DLM -DNO_COROSYNC -DNO_LIBUDEV'
        sed -i \
                -e "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = ${CFLAGS} 
${defs}:" \
                -e "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = ${CFLAGS} 
${defs}:" \
@@ -16,7 +16,10 @@ src_prepare() {
 }
 
 src_compile() {
-       gkmake V=1 mdadm mdmon
+       # bug 907082
+       append-cppflags -D_LARGEFILE64_SOURCE
+
+       CXFLAGS="-DNO_LIBUDEV" gkmake V=1 mdadm mdmon
 }
 
 src_install() {

Reply via email to