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

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

[Thomas Deutschmann]

commit:     6aa3d60b7896bab5572e66e3415f808bc73d7038
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  1 19:20:44 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep  1 20:31:12 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6aa3d60b

gkbuilds/expat: add --without-docbook to src_configure

Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 gkbuilds/expat.gkbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gkbuilds/expat.gkbuild b/gkbuilds/expat.gkbuild
index e280846..22dbb29 100644
--- a/gkbuilds/expat.gkbuild
+++ b/gkbuilds/expat.gkbuild
@@ -4,6 +4,7 @@
 src_configure() {
 	local myconf=(
 		--enable-static
+		--without-docbook
 	)
 
 	gkconf "${myconf[@]}"

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

[Thomas Deutschmann]

commit:     074b43e3ede4b1c161a64937f32c815fcee4d8c8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 23:18:34 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 23:23:50 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=074b43e3

gkbuilds/boost{,-build}: Disable distcc usage

It's known that distcc cannot really compile boost: It will always
fallback to local processing -- even in pump mode.

However, when user normally uses distcc, user has probably set higher
parallel jobs (MAKEOPTS) than available processing units which could
kill the system running genkernel.

DISABLE_DISTCC=yes will limit distcc to localhost and adjust MAKEOPTS
if necessary only for this gkbuild.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/boost-build.gkbuild | 4 ++++
 gkbuilds/boost.gkbuild       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/gkbuilds/boost-build.gkbuild b/gkbuilds/boost-build.gkbuild
index b2883ed..baf1811 100644
--- a/gkbuilds/boost-build.gkbuild
+++ b/gkbuilds/boost-build.gkbuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# distcc is known to fail compiling boost and will fallback
+# to local processing; Even when using distcc pump mode.
+DISABLE_DISTCC=yes
+
 MY_PV="${PV//./_}"
 S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
 QA_IGNORE_DYNAMICALLY_LINKED_PROGRAM='(bjam|b2)$'

diff --git a/gkbuilds/boost.gkbuild b/gkbuilds/boost.gkbuild
index 8b1012b..a796e0f 100644
--- a/gkbuilds/boost.gkbuild
+++ b/gkbuilds/boost.gkbuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# distcc is known to fail compiling boost and will fallback
+# to local processing; Even when using distcc pump mode.
+DISABLE_DISTCC=yes
+
 create_user-config.jam() {
 	local user_config_jam="${S}"/user-config.jam
 	if [[ -s ${user_config_jam} ]]; then

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

[Thomas Deutschmann]

commit:     48d78fa0ba224a032d29fe1eec23fcbc307e7f0e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 15:01:25 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 15:01:25 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=48d78fa0

gkbuilds/mdadm: Honor CFLAGS

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/mdadm.gkbuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gkbuilds/mdadm.gkbuild b/gkbuilds/mdadm.gkbuild
index 504a905..2307d0e 100644
--- a/gkbuilds/mdadm.gkbuild
+++ b/gkbuilds/mdadm.gkbuild
@@ -6,8 +6,8 @@ src_prepare() {
 
 	local defs='-DNO_DLM -DNO_COROSYNC'
 	sed -i \
-		-e "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = -Os ${defs}:" \
-		-e "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = -Os ${defs}:" \
+		-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/" \
 		Makefile \

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

[Thomas Deutschmann]

commit:     88926bcb350f23d5660d3430cc5517326f3cb33c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 22:55:50 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 00:08:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=88926bcb

gkbuilds/thin-provisioning-tools: Add -j1 to avoid parallel install problem

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/thin-provisioning-tools.gkbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gkbuilds/thin-provisioning-tools.gkbuild b/gkbuilds/thin-provisioning-tools.gkbuild
index 64500c9..3091202 100644
--- a/gkbuilds/thin-provisioning-tools.gkbuild
+++ b/gkbuilds/thin-provisioning-tools.gkbuild
@@ -23,6 +23,7 @@ src_compile() {
 
 src_install() {
 	local MYMAKEOPTS=( "DESTDIR=${D}" )
+	MYMAKEOPTS+=( -j1 )
 	MYMAKEOPTS+=( "DATADIR=${D}/usr/share" )
 	MYMAKEOPTS+=( "install" )
 

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

[Thomas Deutschmann]

commit:     837bd3dd4a9db47e5d005a26516ea14d41579450
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 02:26:00 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 02:35:30 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=837bd3dd

gkbuilds/thin-provisioning-tools: minor fixes

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/thin-provisioning-tools.gkbuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gkbuilds/thin-provisioning-tools.gkbuild b/gkbuilds/thin-provisioning-tools.gkbuild
index 3091202..c3ebc7f 100644
--- a/gkbuilds/thin-provisioning-tools.gkbuild
+++ b/gkbuilds/thin-provisioning-tools.gkbuild
@@ -7,17 +7,17 @@ src_prepare() {
 }
 
 src_configure() {
-	append-ldflags -static
-
 	local myconf=(
 		--with-optimisation=''
 		--disable-testing
+		--enable-static
 	)
 
 	gkconf "${myconf[@]}"
 }
 
 src_compile() {
+	MAKEOPTS+=" V="
 	gkmake
 }
 

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

[Thomas Deutschmann]

commit:     063b9290acc655488ed3f44d56f2cd541c84d7da
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 15 20:34:00 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 20:38:11 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=063b9290

gkbuilds/xfsprogs: avoid automagic on libdevmapper

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/xfsprogs.gkbuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gkbuilds/xfsprogs.gkbuild b/gkbuilds/xfsprogs.gkbuild
index b16379f..9f2c6ba 100644
--- a/gkbuilds/xfsprogs.gkbuild
+++ b/gkbuilds/xfsprogs.gkbuild
@@ -14,6 +14,9 @@ src_configure() {
 	export OPTIMIZER=${CFLAGS}
 	unset PLATFORM # if set in user env, this breaks configure
 
+	# Avoid automagic on libdevmapper, #709694
+	export ac_cv_search_dm_task_create=no
+
 	local myconf=(
 		--enable-blkid
 		--disable-libicu

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

[Thomas Deutschmann]

commit:     9aa413c047bc6cb366746634c8a397d10207ba24
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 15 18:58:02 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 15 20:38:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9aa413c0

gkbuilds/util-linux: Use $D

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/util-linux.gkbuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gkbuilds/util-linux.gkbuild b/gkbuilds/util-linux.gkbuild
index da09225..0c4377e 100644
--- a/gkbuilds/util-linux.gkbuild
+++ b/gkbuilds/util-linux.gkbuild
@@ -23,7 +23,7 @@ src_configure() {
 
 src_install() {
 	local MYMAKEOPTS=( "V=1" )
-	MYMAKEOPTS+=( "DESTDIR=${DESTDIR}" )
+	MYMAKEOPTS+=( "DESTDIR=${D}" )
 	MYMAKEOPTS+=( "install-pkgconfigDATA" )
 	MYMAKEOPTS+=( "install-nodist_blkidincHEADERS" )
 	MYMAKEOPTS+=( "install-nodist_mountincHEADERS" )
@@ -33,9 +33,9 @@ src_install() {
 
 	mkdir "${D}"/sbin || die "Failed to create '${D}/sbin'!"
 
-	cp -a blkid.static "${DESTDIR}"/sbin/blkid \
-		|| die "Failed to copy '${S}/blkid.static' to '${DESTDIR}/sbin/blkid'!"
+	cp -a blkid.static "${D}"/sbin/blkid \
+		|| die "Failed to copy '${S}/blkid.static' to '${D}/sbin/blkid'!"
 
-	"${STRIP}" --strip-all "${DESTDIR}"/sbin/blkid \
-		|| die "Failed to strip '${DESTDIR}/sbin/blkid'!"
+	"${STRIP}" --strip-all "${D}"/sbin/blkid \
+		|| die "Failed to strip '${D}/sbin/blkid'!"
 }

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

[Thomas Deutschmann]

commit:     8d3182553b151bcaf9010fae4dcc091f18096839
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  7 22:39:11 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr  7 22:39:11 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8d318255

gkbuilds/lvm: Force CONFIG_SHELL=bash

Bug: https://bugs.gentoo.org/716496
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/lvm.gkbuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gkbuilds/lvm.gkbuild b/gkbuilds/lvm.gkbuild
index 9cedead..3af06e6 100644
--- a/gkbuilds/lvm.gkbuild
+++ b/gkbuilds/lvm.gkbuild
@@ -34,6 +34,9 @@ src_configure() {
 		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[@]}"
 }
 

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

[Thomas Deutschmann]

commit:     ce030506862adaea477be85081e94c48dbce98f5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 21:54:08 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu May 14 21:54:08 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ce030506

gkbuilds/util-linux: don't even check for Python

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/util-linux.gkbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gkbuilds/util-linux.gkbuild b/gkbuilds/util-linux.gkbuild
index 0c4377e..feb862b 100644
--- a/gkbuilds/util-linux.gkbuild
+++ b/gkbuilds/util-linux.gkbuild
@@ -14,6 +14,7 @@ src_configure() {
 		--without-ncursesw
 		--without-ncurses
 		--disable-widechar
+		--without-python
 		--disable-pylibmount
 		--enable-static-programs=blkid
 	)

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

[Thomas Deutschmann]

commit:     db22b64c7d60911a5790571368cd440c3fb8f238
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 13:52:05 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 13:52:57 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=db22b64c

gkbuilds/libgpg-error: Set CC_FOR_BUILD

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/libgpg-error.gkbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gkbuilds/libgpg-error.gkbuild b/gkbuilds/libgpg-error.gkbuild
index 1e42881..0f086bf 100644
--- a/gkbuilds/libgpg-error.gkbuild
+++ b/gkbuilds/libgpg-error.gkbuild
@@ -53,6 +53,7 @@ src_configure() {
 	local myconf=(
 		--disable-nls
 		--enable-static
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 	)
 
 	gkconf "${myconf[@]}"

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

[Thomas Deutschmann]

commit:     c465346aaba1bc8a1fd775eb6e9e724706cf6252
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 16 13:52:33 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 16 13:53:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c465346a

gkbuilds/gnupg: Set CC_FOR_BUILD

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/gnupg.gkbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gkbuilds/gnupg.gkbuild b/gkbuilds/gnupg.gkbuild
index d99836a..6284a89 100644
--- a/gkbuilds/gnupg.gkbuild
+++ b/gkbuilds/gnupg.gkbuild
@@ -41,6 +41,7 @@ src_configure() {
 		--without-bzip2
 		--without-libusb
 		--without-readline
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 	)
 
 	gkconf "${myconf[@]}"

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

[Thomas Deutschmann]

commit:     7c8e344dd138df4655d4a329b54b0e75d8ca9e3b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 02:16:23 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 02:16:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7c8e344d

gkbuilds/dropbear: Enable AES GCM support

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/dropbear.gkbuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gkbuilds/dropbear.gkbuild b/gkbuilds/dropbear.gkbuild
index e6a43f6..a165ae2 100644
--- a/gkbuilds/dropbear.gkbuild
+++ b/gkbuilds/dropbear.gkbuild
@@ -5,7 +5,10 @@ src_prepare() {
 	default
 
 	# Disable DSS support
-	echo "#define DROPBEAR_DSS 0" > localoptions.h || die "Failed to disable DSS support"
+	echo "#define DROPBEAR_DSS 0" >> localoptions.h || die "Failed to disable DSS support"
+
+	# Enable AES GCM support
+	echo "#define DROPBEAR_ENABLE_GCM_MODE 1" >> localoptions.h || die "Failed to enable AES GCM support"
 }
 
 src_configure() {

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

[Thomas Deutschmann]

commit:     88da47c6c06e5b48ddf73d85fcb7a90a287ffaaa
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 16:11:29 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=88da47c6

libgcrypt: Honor toolchain

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/libgcrypt.gkbuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gkbuilds/libgcrypt.gkbuild b/gkbuilds/libgcrypt.gkbuild
index a6686d3..388a6b5 100644
--- a/gkbuilds/libgcrypt.gkbuild
+++ b/gkbuilds/libgcrypt.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_configure() {
@@ -10,6 +10,7 @@ src_configure() {
 		--enable-static=yes
 	)
 
+	CC_FOR_BUILD="$(tc-getBUILD_CC)" \
 	gkconf "${myconf[@]}"
 }
 

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

[Thomas Deutschmann]

commit:     f8d41285f26cf220dbc1a448639cffaf820e648b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 16:11:47 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f8d41285

strace: Honor toolchain

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/strace.gkbuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gkbuilds/strace.gkbuild b/gkbuilds/strace.gkbuild
index 540f6cb..62399ce 100644
--- a/gkbuilds/strace.gkbuild
+++ b/gkbuilds/strace.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_configure() {
@@ -11,6 +11,8 @@ src_configure() {
 		--without-libdw
 	)
 
+	CC_FOR_BUILD="$(tc-getBUILD_CC)" \
+	CPP_FOR_BUILD="$(tc-getBUILD_CPP)" \
 	gkconf "${myconf[@]}"
 }
 

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

[Thomas Deutschmann]

commit:     bf863ca44a22e1aa571f69da6e95be945937eb06
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 16:12:11 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bf863ca4

xfsprogs: Honor toolchain

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/xfsprogs.gkbuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gkbuilds/xfsprogs.gkbuild b/gkbuilds/xfsprogs.gkbuild
index 9f2c6ba..9884687 100644
--- a/gkbuilds/xfsprogs.gkbuild
+++ b/gkbuilds/xfsprogs.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_prepare() {
@@ -26,6 +26,8 @@ src_configure() {
 		--disable-scrub
 	)
 
+	BUILD_CC="$(tc-getBUILD_CC)" \
+	BUILD_LD="$(tc-getBUILD_LD)" \
 	gkconf "${myconf[@]}"
 }
 

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

[Thomas Deutschmann]

commit:     f2d17444644f07b04b2f5ff484b71d1e0d12ace6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 14:57:15 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 14:29:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f2d17444

gkbuilds: Bump copyright on files touched this year

Update the copyright notice on all files that were touched since
January 1st but did not have the notice updated.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/btrfs-progs.gkbuild  | 2 +-
 gkbuilds/dropbear.gkbuild     | 2 +-
 gkbuilds/gnupg.gkbuild        | 2 +-
 gkbuilds/libgpg-error.gkbuild | 2 +-
 gkbuilds/util-linux.gkbuild   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gkbuilds/btrfs-progs.gkbuild b/gkbuilds/btrfs-progs.gkbuild
index 9c85b91..b55bd34 100644
--- a/gkbuilds/btrfs-progs.gkbuild
+++ b/gkbuilds/btrfs-progs.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_configure() {

diff --git a/gkbuilds/dropbear.gkbuild b/gkbuilds/dropbear.gkbuild
index a165ae2..55639cb 100644
--- a/gkbuilds/dropbear.gkbuild
+++ b/gkbuilds/dropbear.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_prepare() {

diff --git a/gkbuilds/gnupg.gkbuild b/gkbuilds/gnupg.gkbuild
index 6284a89..468cb4e 100644
--- a/gkbuilds/gnupg.gkbuild
+++ b/gkbuilds/gnupg.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_configure() {

diff --git a/gkbuilds/libgpg-error.gkbuild b/gkbuilds/libgpg-error.gkbuild
index 0f086bf..05f81a3 100644
--- a/gkbuilds/libgpg-error.gkbuild
+++ b/gkbuilds/libgpg-error.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_prepare() {

diff --git a/gkbuilds/util-linux.gkbuild b/gkbuilds/util-linux.gkbuild
index feb862b..81670c1 100644
--- a/gkbuilds/util-linux.gkbuild
+++ b/gkbuilds/util-linux.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_configure() {

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

[Thomas Deutschmann]

commit:     328939565639000eab12170a3a060612e0045ff5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 20:20:43 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 22:36:05 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=32893956

libgcrypt: Fix libgcrypt-config wrapper

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/libgcrypt.gkbuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gkbuilds/libgcrypt.gkbuild b/gkbuilds/libgcrypt.gkbuild
index 388a6b5..1f063c4 100644
--- a/gkbuilds/libgcrypt.gkbuild
+++ b/gkbuilds/libgcrypt.gkbuild
@@ -23,11 +23,18 @@ src_install() {
 		"${D}"/usr/bin/mpicalc \
 		"${D}"/usr/share
 
+	# remove hardcoded $BROOT
+	sed -i \
+		-e 's/-L\/[^-"]*//' \
+		-e 's/-I\/[^"]*//' \
+		"${D}"/usr/bin/libgcrypt-config  \
+		|| die
+
 	# libgcrypt-config tries to be smart and will omit include
 	# and lib dir due to set prefix
 	sed -i \
-		-e "s|/usr/include|/dont-try-to-be-smart|" \
-		-e "s|/usr/lib|/dont-try-to-be-smart|" \
+		-e "s|x/usr/include|x/dont-try-to-be-smart|" \
+		-e "s|x/usr/lib|x/dont-try-to-be-smart|" \
 		"${D}"/usr/bin/libgcrypt-config \
 		|| die "Failed to make libgcrypt-config dumb!"
 

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

[Thomas Deutschmann]

commit:     9293b49303dac0a18294cba3d5dcec74154ca392
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 19:49:28 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 19:49:28 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9293b493

kmod: remove hardcoded $BROOT value

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/kmod.gkbuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gkbuilds/kmod.gkbuild b/gkbuilds/kmod.gkbuild
index 6bdc0c4..44a2df3 100644
--- a/gkbuilds/kmod.gkbuild
+++ b/gkbuilds/kmod.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_prepare() {
@@ -25,6 +25,12 @@ src_configure() {
 src_install() {
 	default
 
+	# remove hardcoded $BROOT
+	sed -i \
+		-e 's/-L\/[^ ]*/-L${libdir}/' \
+		"${D}"/usr/lib*/pkgconfig/*.pc \
+		|| die
+
 	rm -rf \
 		"${D}"/usr/share/
 }

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

[Thomas Deutschmann]

commit:     d1f25b7d50dffbff5ddbf63fba6294309a5a19b5
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 01:13:19 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 01:13:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d1f25b7d

bcache: Fix pkg-config call

Bug: https://bugs.gentoo.org/737894
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/bcache-tools.gkbuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gkbuilds/bcache-tools.gkbuild b/gkbuilds/bcache-tools.gkbuild
index f34828b..556e7f2 100644
--- a/gkbuilds/bcache-tools.gkbuild
+++ b/gkbuilds/bcache-tools.gkbuild
@@ -6,7 +6,7 @@ src_configure() {
 }
 
 src_compile() {
-	PKG_CONFIG="$(tc-getPKG_CONFIG) -static" \
+	PKG_CONFIG="$(tc-getPKG_CONFIG) --static" \
 	gkmake V=1
 }
 

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

[Thomas Deutschmann]

commit:     74996872513894f53240533d6408e37f2893a87a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 16:46:46 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 16:47:08 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=74996872

gkbuilds/dropbear: Build dbclient

Required for scp.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/dropbear.gkbuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gkbuilds/dropbear.gkbuild b/gkbuilds/dropbear.gkbuild
index 55639cb..9e2c18b 100644
--- a/gkbuilds/dropbear.gkbuild
+++ b/gkbuilds/dropbear.gkbuild
@@ -25,7 +25,7 @@ src_configure() {
 src_compile() {
 	local MYMAKEOPTS=( "V=1" )
 	MYMAKEOPTS+=( "MULTI=1" )
-	MYMAKEOPTS+=( "PROGRAMS='dropbear dropbearkey dropbearconvert scp'" )
+	MYMAKEOPTS+=( "PROGRAMS='dbclient dropbear dropbearkey dropbearconvert scp'" )
 	gkmake "${MYMAKEOPTS[@]}"
 }
 
@@ -48,6 +48,9 @@ src_install() {
 	"${STRIP}" --strip-all "${D}"/usr/bin/dropbearmulti \
 		|| die "Failed to strip '${D}/usr/bin/dropbearmulti'!"
 
+	ln -s dropbearmulti "${D}"/usr/bin/dbclient \
+		|| die "Failed to symlink '${D}/usr/bin/dbclient' to '${D}/usr/bin/dropbearmulti'!"
+
 	ln -s ../bin/dropbearmulti "${D}"/usr/sbin/dropbear \
 		|| die "Failed to symlink '${D}/usr/sbin/dropbear' to '${D}/usr/bin/dropbearmulti'!"
 

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

[Thomas Deutschmann]

commit:     08a8044fcd552fc913ec3168be0af323b4b86c05
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 17:52:53 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 17:52:53 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=08a8044f

gkbuilds/eudev: Set exec_prefix

This is required for proper generation of 64-btrfs.rules.

Bug: https://bugs.gentoo.org/739268
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/eudev.gkbuild | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gkbuilds/eudev.gkbuild b/gkbuilds/eudev.gkbuild
index 0677f0e..a9df513 100644
--- a/gkbuilds/eudev.gkbuild
+++ b/gkbuilds/eudev.gkbuild
@@ -3,6 +3,11 @@
 
 src_configure() {
 	local myconf=(
+		--exec-prefix=
+		--bindir=/usr/bin
+		--sbindir=/usr/sbin
+		--includedir=/usr/include
+		--libdir=/usr/lib
 		--enable-static
 		--enable-blkid
 		--disable-introspection

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

[Thomas Deutschmann]

commit:     6ba53084e045073489c1c773df052e5c7fc0d78f
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 16:01:11 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 16:35:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6ba53084

gkbuilds/e2fsprogs: Use libblkid/libuuid from util-linux

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/e2fsprogs.gkbuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gkbuilds/e2fsprogs.gkbuild b/gkbuilds/e2fsprogs.gkbuild
index 7cebcca..5ba2cd6 100644
--- a/gkbuilds/e2fsprogs.gkbuild
+++ b/gkbuilds/e2fsprogs.gkbuild
@@ -14,8 +14,8 @@ src_configure() {
 		--bindir=/bin
 		--with-root-prefix=""
 		--disable-nls
-		--disable-libblkid
-		--disable-libuuid
+		--enable-libblkid
+		--enable-libuuid
 		--disable-fsck
 		--disable-uuidd
 		--disable-debugfs

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

[Thomas Deutschmann]

commit:     ec43af22117f4a55ee206d2a28394b55d3f836f1
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 16:02:40 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 16:35:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ec43af22

gkbuilds/xfsprogs: Build xfs_growfs

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/xfsprogs.gkbuild | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/gkbuilds/xfsprogs.gkbuild b/gkbuilds/xfsprogs.gkbuild
index 9884687..c0b2d33 100644
--- a/gkbuilds/xfsprogs.gkbuild
+++ b/gkbuilds/xfsprogs.gkbuild
@@ -32,15 +32,24 @@ src_configure() {
 }
 
 src_compile() {
-	gkmake V=1 headers repair
+	gkmake V=1 headers growfs repair
 }
 
 src_install() {
 	mkdir "${D}"/sbin || die "Failed to create '${D}/sbin'!"
 
+	cp growfs/xfs_growfs "${D}"/sbin \
+		|| die "Failed to copy '${S}/repair/xfs_growfs' to '${D}/sbin/'!"
+
 	cp repair/xfs_repair "${D}"/sbin \
 		|| die "Failed to copy '${S}/repair/xfs_repair' to '${D}/sbin/'!"
 
-	"${STRIP}" --strip-all "${D}"/sbin/xfs_repair \
-		|| die "Failed to strip '${D}/sbin/xfs_repair'!"
+	local sbin
+	for sbin in \
+		"${D}/sbin/xfs_growfs" \
+		"${D}/sbin/xfs_repair" \
+	; do
+		"${STRIP}" --strip-all "${sbin}" \
+			|| die "Failed to strip '${sbin}'!"
+	done
 }

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

[Thomas Deutschmann]

commit:     e70eb3cba036d10a8fc8aab73e3367d74424ec42
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 16:02:04 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 16:35:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e70eb3cb

gkbuilds/e2fsprogs: Build resize2fs

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/e2fsprogs.gkbuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gkbuilds/e2fsprogs.gkbuild b/gkbuilds/e2fsprogs.gkbuild
index 5ba2cd6..bedb257 100644
--- a/gkbuilds/e2fsprogs.gkbuild
+++ b/gkbuilds/e2fsprogs.gkbuild
@@ -20,7 +20,7 @@ src_configure() {
 		--disable-uuidd
 		--disable-debugfs
 		--disable-imager
-		--disable-resizer
+		--enable-resizer
 		--disable-defrag
 	)
 
@@ -38,6 +38,7 @@ src_install() {
 	for file in \
 		e2fsck/e2fsck \
 		misc/mke2fs \
+		resize/resize2fs \
 	; do
 		cp -a "${S}"/${file} "${D}"/sbin/ \
 			|| die "Failed to copy '${S}/${file}' to '${D}/sbin/'!"

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

[Thomas Deutschmann]

commit:     012432aedd39bb26d6840af13a679eddc4a8fa9e
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 21:17:42 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 22:10:05 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=012432ae

Bump dropbear to v2020.81

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/dropbear.gkbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gkbuilds/dropbear.gkbuild b/gkbuilds/dropbear.gkbuild
index 9e2c18b..7b63087 100644
--- a/gkbuilds/dropbear.gkbuild
+++ b/gkbuilds/dropbear.gkbuild
@@ -13,6 +13,7 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
+		--enable-bundled-libtom
 		--enable-static
 		--disable-pam
 		--disable-syslog

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

[Thomas Deutschmann]

commit:     bd268279a58eaa2761829bd5113a79cb82d9528a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 03:37:29 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 03:43:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bd268279

gkbuilds/libgpg-error: do not install gpg-error-config or gpgrt-config anymore

The new gpgrt-config wrapper clashes with buildroot environment.
Instead of patch gpgrt-config, libgcrypt has been patched to
use pkg-config instead of gpg-error-config or gpgrt-config helper.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/libgpg-error.gkbuild | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/gkbuilds/libgpg-error.gkbuild b/gkbuilds/libgpg-error.gkbuild
index 9c6193b..5d38e33 100644
--- a/gkbuilds/libgpg-error.gkbuild
+++ b/gkbuilds/libgpg-error.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_prepare() {
@@ -59,24 +59,8 @@ src_install() {
 
 	rm -rf \
 		"${D}"/usr/bin/gpg-error \
+		"${D}"/usr/bin/gpg-error-config \
 		"${D}"/usr/bin/gpgrt-config \
 		"${D}"/usr/bin/yat2m \
 		"${D}"/usr/share
-
-	mv "${D}"/usr/bin/gpg-error-config "${D}"/usr/bin/gpg-error-config.ori \
-		|| die "Failed to rename '${D}/usr/bin/gpg-error-config' to '${D}/usr/bin/gpg-error-config.ori'!"
-
-	cat >"${D}"/usr/bin/gpg-error-config <<-EOF
-	#!/bin/sh
-
-	SYSROOT=\$(dirname "\$(dirname "\$(dirname "\$(readlink -fm "\$0")")")")
-
-	exec "\${SYSROOT}"/usr/bin/gpg-error-config.ori "\$@" | sed -e 's#/#'\${SYSROOT}'/#'
-	EOF
-
-	chmod +x "${D}"/usr/bin/gpg-error-config \
-		|| die "Failed to chmod of '${D}/bin/gpg-error-config'!"
-
-	ln -s gpg-error-config "${D}"/usr/bin/gpgrt-config \
-		|| die "Failed to symlink '${D}/bin/gpgrt-config' to '${D}/bin/gpg-error-config'!"
 }

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

[Thomas Deutschmann]

commit:     4feb914a72ab3a59f2a79d8b97cc6a0bffe53605
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 03:40:34 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 03:43:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4feb914a

gkbuilds/libgpg-error: remove lock-obj-pub.${CHOST}.h workaround

Workaround for bug 584052 shouldn't be necessary anymore.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/libgpg-error.gkbuild | 43 -------------------------------------------
 1 file changed, 43 deletions(-)

diff --git a/gkbuilds/libgpg-error.gkbuild b/gkbuilds/libgpg-error.gkbuild
index 5d38e33..f03defb 100644
--- a/gkbuilds/libgpg-error.gkbuild
+++ b/gkbuilds/libgpg-error.gkbuild
@@ -1,49 +1,6 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-src_prepare() {
-	default
-
-	if [[ ! -f "${S}/src/syscfg/lock-obj-pub.${CHOST}.h" ]]
-	then
-		print_warning 3 "CHOST '${CHOST}' not known by ${P} -- workaround for bug 584052 needed ..."
-		local CHOST_KNOWN=
-		local -a CHOST_ARRAY=( ${CHOST//-/ } )
-
-		i=0
-		while [[ ${i} -lt ${#CHOST_ARRAY[@]} ]]
-		do
-			if [[ ${i} -eq 0 ]]
-			then
-				case "${CHOST_ARRAY[${i}]}" in
-					arm*)
-						CHOST_ARRAY[${i}]=arm
-						;;
-				esac
-			elif [[ ${i} -eq 1 && "${CHOST_ARRAY[${i}]}" != "unknown" ]]
-			then
-				CHOST_ARRAY[${i}]=unknown
-			fi
-
-			if [[ ${CHOST_KNOWN} != "*${CHOST_ARRAY[${i}]}*" ]]
-			then
-				CHOST_KNOWN+="${CHOST_ARRAY[${i}]}-"
-			fi
-
-			i=$((i + 1))
-		done
-
-		CHOST_KNOWN=${CHOST_KNOWN%-}
-		if [[ ! -f "${S}/src/syscfg/lock-obj-pub.${CHOST_KNOWN}.h" ]]
-		then
-			print_warning 3 "We tried our best but even '${CHOST_KNOWN}' looks unknown -- good luck!"
-		else
-			export CHOST=${CHOST_KNOWN}
-			print_warning 3 "CHOST set to '${CHOST_KNOWN}'!"
-		fi
-	fi
-}
-
 src_configure() {
 	local myconf=(
 		--disable-nls

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

[Thomas Deutschmann]

commit:     81bf123895dfa60b72a357a3317a224907547f2c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 19:59:25 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 19:59:25 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=81bf1238

gkbuilds/thin-provisioning-tools: no need to manually call gkautoreconf

Default src_prepare() will take care of calling gkautoreconf when needed.

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/thin-provisioning-tools.gkbuild | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gkbuilds/thin-provisioning-tools.gkbuild b/gkbuilds/thin-provisioning-tools.gkbuild
index c3ebc7f..bd69ff7 100644
--- a/gkbuilds/thin-provisioning-tools.gkbuild
+++ b/gkbuilds/thin-provisioning-tools.gkbuild
@@ -1,11 +1,6 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-src_prepare() {
-	default
-	gkautoreconf
-}
-
 src_configure() {
 	local myconf=(
 		--with-optimisation=''

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

[Thomas Deutschmann]

commit:     9da63337a5462a8a75a4afe0f09051dcf23aeac8
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  6 17:24:52 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jul  6 17:24:52 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9da63337

boost-build: Use BUILD CXX

When doing cross compile, the b2 program must be executable
on host system which tries to build boost.

Fixes: 5e340654 ("Bump boost to v1.76.0")
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/boost-build.gkbuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gkbuilds/boost-build.gkbuild b/gkbuilds/boost-build.gkbuild
index 5d470c1..03d1f88 100644
--- a/gkbuilds/boost-build.gkbuild
+++ b/gkbuilds/boost-build.gkbuild
@@ -12,10 +12,12 @@ QA_IGNORE_DYNAMICALLY_LINKED_PROGRAM='(bjam|b2)$'
 src_compile() {
 	cd engine || die "Failed to chdir to '${S}/engine'!"
 
+	# Using BUILD CXX here because the host system
+	# building the initramfs must be able to execute created b2 program
 	local myargs=(
 		./build.sh
 		cxx
-		--cxx="$(tc-getCXX)"
+		--cxx="$(tc-getBUILD_CXX)"
 		--cxxflags="${CXXFLAGS}"
 		-d+2
 		--without-python

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

[Thomas Deutschmann]

commit:     4db4564e99c03779fb7121a64d48240e9d773939
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  1 18:42:34 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct  1 18:43:36 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4db4564e

gkbuilds/btrfs-progs: Disable backtrace on non-glibc systems

Bug: https://bugs.gentoo.org/815676
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/btrfs-progs.gkbuild | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gkbuilds/btrfs-progs.gkbuild b/gkbuilds/btrfs-progs.gkbuild
index b55bd34..48b9e6d 100644
--- a/gkbuilds/btrfs-progs.gkbuild
+++ b/gkbuilds/btrfs-progs.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_configure() {
@@ -10,6 +10,14 @@ src_configure() {
 		--disable-documentation
 	)
 
+	if isTrue "$(is_glibc)"
+	then
+		myconf+=( --enable-backtrace )
+	else
+		# backtrace does not work on musl, bug #815676
+		myconf+=( --disable-backtrace )
+	fi
+
 	gkconf "${myconf[@]}"
 }
 

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

[Thomas Deutschmann]

commit:     279e43a7afbc08cce743002661f02e94c5d6821b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 17:57:38 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 18:14:35 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=279e43a7

Bump cryptsetup to v2.4.1

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/cryptsetup.gkbuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild
index 57fc537..007874d 100644
--- a/gkbuilds/cryptsetup.gkbuild
+++ b/gkbuilds/cryptsetup.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_configure() {
@@ -13,6 +13,7 @@ src_configure() {
 		--sbindir=/sbin
 		--disable-nls
 		--disable-selinux
+		--disable-ssh-token
 		--disable-veritysetup
 		--disable-cryptsetup-reencrypt
 		--disable-integritysetup

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

[Thomas Deutschmann]

commit:     3547a0eee6abc5cd3434168f9e6c7adda8669370
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 17:56:00 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 18:14:35 2021 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3547a0ee

gkbuilds/coreutils: Fix cross-compile

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 gkbuilds/coreutils.gkbuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gkbuilds/coreutils.gkbuild b/gkbuilds/coreutils.gkbuild
index f320d63..6ad51f9 100644
--- a/gkbuilds/coreutils.gkbuild
+++ b/gkbuilds/coreutils.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 src_prepare() {
@@ -29,7 +29,7 @@ src_configure() {
 	# no selinux
 	export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no
 
-	if tc-is-cross-compiler
+	if isTrue "$(tc-is-cross-compiler)"
 	then
 		export fu_cv_sys_stat_statfs2_bsize=yes #311569
 		export gl_cv_func_realpath_works=yes #416629

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

[Robin H. Johnson]

commit:     cfc9ff455e2473e4322bd18c5fa21370d9c0702e
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Mar 24 18:43:40 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun May 15 23:14:01 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cfc9ff45

gkbuild/util-linux: Install the correct binaries with slibtool

Signed-off-by: orbea <orbea <AT> riseup.net>

 gkbuilds/util-linux.gkbuild | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/gkbuilds/util-linux.gkbuild b/gkbuilds/util-linux.gkbuild
index 40ea1fb..5addbb1 100644
--- a/gkbuilds/util-linux.gkbuild
+++ b/gkbuilds/util-linux.gkbuild
@@ -47,11 +47,8 @@ src_install() {
 
 	mkdir "${D}"/sbin || die "Failed to create '${D}/sbin'!"
 
-	cp -a blkid.static "${D}"/sbin/blkid \
-		|| die "Failed to copy '${S}/blkid.static' to '${D}/sbin/blkid'!"
-
-	cp -a switch_root "${D}"/sbin/switch_root \
-		|| die "Failed to copy '${S}/switch_root' to '${D}/sbin/switch_root'!"
+	install_exe 'blkid.static' "${D}"/sbin/blkid
+	install_exe 'switch_root' "${D}"/sbin/switch_root
 
 	local sbin
 	for sbin in \

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

[Robin H. Johnson]

commit:     2d2e91f288679e272f731917feb58f3768ea586d
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Thu Mar 24 20:17:07 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun May 15 23:14:01 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2d2e91f2

gkbuild/cryptsetup: Install the correct binaries with slibtool

Signed-off-by: orbea <orbea <AT> riseup.net>

 gkbuilds/cryptsetup.gkbuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild
index 007874d..816df60 100644
--- a/gkbuilds/cryptsetup.gkbuild
+++ b/gkbuilds/cryptsetup.gkbuild
@@ -34,8 +34,7 @@ src_install() {
 		"${D}"/sbin/* \
 		"${D}"/usr/share/
 
-	cp -a cryptsetup.static "${D}"/sbin/cryptsetup \
-		|| die "Failed to copy '${S}/cryptsetup.static' to '${D}/sbin/cryptsetup'!"
+	install_exe 'cryptsetup.static' "${D}"/sbin/cryptsetup
 
 	"${STRIP}" --strip-all "${D}"/sbin/cryptsetup \
 		|| die "Failed to strip '${D}/sbin/cryptsetup'!"

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

[Robin H. Johnson]

commit:     8b7422293dcf9cc62518dcbc49239b6e637b6b74
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  4 04:46:21 2022 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 04:46:55 2022 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8b742229

gkbuilds/boost-build.gkbuild: upstream boost flags changed

Upstream boost changed the flags to use 'off' instead of 'none'.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Closes: https://bugs.gentoo.org/854480

 gkbuilds/boost-build.gkbuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gkbuilds/boost-build.gkbuild b/gkbuilds/boost-build.gkbuild
index 03d1f88..0e06ba7 100644
--- a/gkbuilds/boost-build.gkbuild
+++ b/gkbuilds/boost-build.gkbuild
@@ -53,6 +53,6 @@ src_install() {
 	find "${D}/usr/share/boost-build" -iname "*.py" -delete \
 		|| die "Failed to remove python files"
 
-	echo 'variant gentoorelease : release : <optimization>none <debug-symbols>none <runtime-link>shared ;' > "${D}/usr/share/boost-build/site-config.jam" \
+	echo 'variant gentoorelease : release : <optimization>off <debug-symbols>off <runtime-link>shared ;' > "${D}/usr/share/boost-build/site-config.jam" \
 		|| die "Failed to create '${D}/usr/share/boost-build/site-config.jam'!"
 }

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

[Sam James]

commit:     231fdfd9f1c1819d19440627ebe0ea58576a9965
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  5 20:41:39 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul  5 20:41:39 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=231fdfd9

gkbuilds: cryptsetup: disable asciidoc

Signed-off-by: Sam James <sam <AT> gentoo.org>

 gkbuilds/cryptsetup.gkbuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gkbuilds/cryptsetup.gkbuild b/gkbuilds/cryptsetup.gkbuild
index 816df60..c084286 100644
--- a/gkbuilds/cryptsetup.gkbuild
+++ b/gkbuilds/cryptsetup.gkbuild
@@ -11,6 +11,7 @@ src_configure() {
 	local myconf=(
 		--enable-internal-argon2
 		--sbindir=/sbin
+		--disable-asciidoc
 		--disable-nls
 		--disable-selinux
 		--disable-ssh-token

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

[Ben Kohler]

commit:     529576b64de23b81d34f5b820893bdeb30ee1caf
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 13:53:31 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 13:53:31 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=529576b6

gkbuilds/busybox: rework toolchain handling

Thanks to Mike Gilbert, code changes borrowed from gentoo.git commit
25e0a98682b9ab600cb3a6ea3fc3834ce1cce8f6

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

 gkbuilds/busybox.gkbuild | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/gkbuilds/busybox.gkbuild b/gkbuilds/busybox.gkbuild
index ac09363..cf1e4bc 100644
--- a/gkbuilds/busybox.gkbuild
+++ b/gkbuilds/busybox.gkbuild
@@ -9,14 +9,6 @@ src_prepare() {
 		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
 		Makefile.flags || gen_die
 
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^HOSTCXX/s:=.*:= $(tc-getBUILD_CXX):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || gen_die
-
 	sed -i \
 		-e 's:-static-libgcc::' \
 		Makefile.flags || die
@@ -28,8 +20,28 @@ src_prepare() {
 		|| die "Failed top copy '${TEMP}/busybox-config' to '${S}/.config.gk_orig'!"
 }
 
+bbmake() {
+	local args=(
+		V=1
+		CROSS_COMPILE="${CHOST}-"
+		AR="${AR}"
+		CC="${CC}"
+		HOSTCC="${BUILD_CC}"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		PKG_CONFIG="${PKG_CONFIG}"
+	)
+	make "${args[@]}" "$@"
+}
+
 src_configure() {
-	gkexec "yes '' | ${MAKE} V=1 oldconfig" 1
+	tc-export AR CC BUILD_CC PKG_CONFIG
+	BUILD_CFLAGS=${CFLAGS}
+	BUILD_CFLAGS+=" -D_FILE_OFFSET_BITS=64"
+	gkexec "yes '' | bbmake V=1 oldconfig" 1
+}
+
+src_compile() {
+	bbmake busybox
 }
 
 src_install() {

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

[Ben Kohler]

commit:     12cdca31704000822c50b996facc955d5e3ae5a9
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 15:35:34 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 15:35:34 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=12cdca31

gkbuilds/lvm: add 2.03 support

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

 gkbuilds/lvm.gkbuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gkbuilds/lvm.gkbuild b/gkbuilds/lvm.gkbuild
index 3006381..27a7521 100644
--- a/gkbuilds/lvm.gkbuild
+++ b/gkbuilds/lvm.gkbuild
@@ -54,6 +54,8 @@ src_install() {
 	"${STRIP}" --strip-all "${D}"/usr/sbin/lvm \
 		|| die "Failed to strip '${D}/usr/sbin/lvm'!"
 
+	# dmsetup.static has moved to libdm/dm-tools/ in 2.03, allow both locations for now
+	[ -f libdm/dm-tools/dmsetup.static ] && mv libdm/dm-tools/dmsetup.static tools/dmsetup.static
 	cp -a tools/dmsetup.static "${D}"/usr/sbin/dmsetup \
 		|| die "Failed to copy '${S}/tools/dmsetup.static' to '${D}/usr/sbin/dmsetup'!"
 

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

[Ben Kohler]

commit:     89280d3b386a0efa0260bdf0f36ca29fe17a36d4
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 16:20:26 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 16:20:26 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=89280d3b

gkbuilds/lvm: move 2.03 changes to new file

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

 gkbuilds/lvm-2.03.22.gkbuild | 78 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/gkbuilds/lvm-2.03.22.gkbuild b/gkbuilds/lvm-2.03.22.gkbuild
new file mode 100644
index 0000000..b806d77
--- /dev/null
+++ b/gkbuilds/lvm-2.03.22.gkbuild
@@ -0,0 +1,78 @@
+# 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 libdm/dm-tools/dmsetup.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 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'!"
+}

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

[Ben Kohler]

commit:     65bfab819d614e0d719a10ef6c47238df298869a
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 16:18:23 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 16:18:23 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=65bfab81

Revert "gkbuilds/lvm: add 2.03 support"

This reverts commit 12cdca31704000822c50b996facc955d5e3ae5a9.

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

 gkbuilds/lvm.gkbuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gkbuilds/lvm.gkbuild b/gkbuilds/lvm.gkbuild
index 27a7521..3006381 100644
--- a/gkbuilds/lvm.gkbuild
+++ b/gkbuilds/lvm.gkbuild
@@ -54,8 +54,6 @@ src_install() {
 	"${STRIP}" --strip-all "${D}"/usr/sbin/lvm \
 		|| die "Failed to strip '${D}/usr/sbin/lvm'!"
 
-	# dmsetup.static has moved to libdm/dm-tools/ in 2.03, allow both locations for now
-	[ -f libdm/dm-tools/dmsetup.static ] && mv libdm/dm-tools/dmsetup.static tools/dmsetup.static
 	cp -a tools/dmsetup.static "${D}"/usr/sbin/dmsetup \
 		|| die "Failed to copy '${S}/tools/dmsetup.static' to '${D}/usr/sbin/dmsetup'!"
 

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

[Ben Kohler]

commit:     33d9a5c70bb3e7db978d8dc1e774742f98487ad6
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 16:43:48 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 16:43:48 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=33d9a5c7

gkbuilds/mdadm: fix for mdadm-4.2

Seems to need new option to build without libudev usage

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

 gkbuilds/mdadm-4.2.gkbuild | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gkbuilds/mdadm-4.2.gkbuild b/gkbuilds/mdadm-4.2.gkbuild
new file mode 100644
index 0000000..d996346
--- /dev/null
+++ b/gkbuilds/mdadm-4.2.gkbuild
@@ -0,0 +1,38 @@
+# 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() {
+	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'!"
+}

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

[Ben Kohler]

commit:     50e41722130ca8a1a7ef4ae008e35ec81292cda8
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 17:12:57 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 17:12:57 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=50e41722

gkbuilds/lvm: missing space in new cp command

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

 gkbuilds/lvm-2.03.22.gkbuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gkbuilds/lvm-2.03.22.gkbuild b/gkbuilds/lvm-2.03.22.gkbuild
index b806d77..f913f1a 100644
--- a/gkbuilds/lvm-2.03.22.gkbuild
+++ b/gkbuilds/lvm-2.03.22.gkbuild
@@ -48,7 +48,7 @@ src_install() {
 		"${D}"/usr/sbin/* \
 		"${D}"/share
 
-	cp -a libdm/dm-tools/dmsetup.static"${D}"/usr/sbin/lvm \
+	cp -a libdm/dm-tools/dmsetup.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 \

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

[Ben Kohler]

commit:     a6435a8eb4c9f962fb45829520d7a887e27d2b18
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 17:26:05 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 17:26:05 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a6435a8e

gkbuilds/lvm: fix totally botched cp command

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

 gkbuilds/lvm-2.03.22.gkbuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gkbuilds/lvm-2.03.22.gkbuild b/gkbuilds/lvm-2.03.22.gkbuild
index f913f1a..bbfb652 100644
--- a/gkbuilds/lvm-2.03.22.gkbuild
+++ b/gkbuilds/lvm-2.03.22.gkbuild
@@ -48,13 +48,13 @@ src_install() {
 		"${D}"/usr/sbin/* \
 		"${D}"/share
 
-	cp -a libdm/dm-tools/dmsetup.static "${D}"/usr/sbin/lvm \
+	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 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 \

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

[Ben Kohler]

commit:     0000259d542ed3f6618d7f9522b8442b1e2d7df8
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri May  3 17:07:13 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri May  3 17:10:26 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0000259d

gkbuilds/busybox: add gkexec wrapper to bbmake compilation

We lost this in the toolchain refactoring.  This makes sure the build
output goes to genkernel.log instead of spamming the terminal.

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

 gkbuilds/busybox.gkbuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gkbuilds/busybox.gkbuild b/gkbuilds/busybox.gkbuild
index cf1e4bc..286e458 100644
--- a/gkbuilds/busybox.gkbuild
+++ b/gkbuilds/busybox.gkbuild
@@ -41,7 +41,7 @@ src_configure() {
 }
 
 src_compile() {
-	bbmake busybox
+	gkexec bbmake busybox
 }
 
 src_install() {

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

[Ben Kohler]

commit:     fb29d87cc5dcfd6e3222f3bee63fc9e6a764fa3c
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 14:47:29 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May 22 14:47:29 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fb29d87c

gkbuilds/mdadm-4.2: add missing musl fix

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

 gkbuilds/mdadm-4.2.gkbuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gkbuilds/mdadm-4.2.gkbuild b/gkbuilds/mdadm-4.2.gkbuild
index d996346..99bfb84 100644
--- a/gkbuilds/mdadm-4.2.gkbuild
+++ b/gkbuilds/mdadm-4.2.gkbuild
@@ -16,6 +16,9 @@ src_prepare() {
 }
 
 src_compile() {
+	# bug 907082
+	append-cppflags -D_LARGEFILE64_SOURCE
+
 	CXFLAGS="-DNO_LIBUDEV" gkmake V=1 mdadm mdmon
 }
 

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

[Ben Kohler]

commit:     92b9792b8c644fdccff00d25d5be32448498b987
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 19:11:50 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu May 23 19:11:50 2024 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=92b9792b

gkbuilds: add json-c-0.17

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

 gkbuilds/json-c-0.17.gkbuild | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gkbuilds/json-c-0.17.gkbuild b/gkbuilds/json-c-0.17.gkbuild
new file mode 100644
index 0000000..9d89852
--- /dev/null
+++ b/gkbuilds/json-c-0.17.gkbuild
@@ -0,0 +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
+}