[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: 92b9792b8c644fdccff00d25d5be32448498b987
Author: Ben Kohler gentoo org>
AuthorDate: Thu May 23 19:11:50 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Thu May 23 19:11:50 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=92b9792b
gkbuilds: add json-c-0.17
Signed-off-by: Ben Kohler 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 000..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
+}
[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: fb29d87cc5dcfd6e3222f3bee63fc9e6a764fa3c
Author: Ben Kohler gentoo org>
AuthorDate: Wed May 22 14:47:29 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Wed May 22 14:47:29 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=fb29d87c
gkbuilds/mdadm-4.2: add missing musl fix
Signed-off-by: Ben Kohler 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/
commit: 259d542ed3f6618d7f9522b8442b1e2d7df8
Author: Ben Kohler gentoo org>
AuthorDate: Fri May 3 17:07:13 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Fri May 3 17:10:26 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=259d
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 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/, defaults/
commit: 890c3819be5628b59ad7b2610c9ab49200da8edd
Author: Ben Kohler gentoo org>
AuthorDate: Tue Apr 30 16:17:20 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Tue Apr 30 16:17:20 2024 +
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 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 \
[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: a6435a8eb4c9f962fb45829520d7a887e27d2b18
Author: Ben Kohler gentoo org>
AuthorDate: Mon Apr 29 17:26:05 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Mon Apr 29 17:26:05 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a6435a8e
gkbuilds/lvm: fix totally botched cp command
Signed-off-by: Ben Kohler 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/
commit: 33d9a5c70bb3e7db978d8dc1e774742f98487ad6
Author: Ben Kohler gentoo org>
AuthorDate: Mon Apr 29 16:43:48 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Mon Apr 29 16:43:48 2024 +
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 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 000..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/
commit: 50e41722130ca8a1a7ef4ae008e35ec81292cda8
Author: Ben Kohler gentoo org>
AuthorDate: Mon Apr 29 17:12:57 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Mon Apr 29 17:12:57 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=50e41722
gkbuilds/lvm: missing space in new cp command
Signed-off-by: Ben Kohler 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/
commit: 89280d3b386a0efa0260bdf0f36ca29fe17a36d4
Author: Ben Kohler gentoo org>
AuthorDate: Mon Apr 29 16:20:26 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Mon Apr 29 16:20:26 2024 +
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 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 000..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/
commit: 65bfab819d614e0d719a10ef6c47238df298869a
Author: Ben Kohler gentoo org>
AuthorDate: Mon Apr 29 16:18:23 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Mon Apr 29 16:18:23 2024 +
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 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/
commit: 12cdca31704000822c50b996facc955d5e3ae5a9
Author: Ben Kohler gentoo org>
AuthorDate: Mon Apr 29 15:35:34 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Mon Apr 29 15:35:34 2024 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=12cdca31
gkbuilds/lvm: add 2.03 support
Signed-off-by: Ben Kohler 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/
commit: 529576b64de23b81d34f5b820893bdeb30ee1caf
Author: Ben Kohler gentoo org>
AuthorDate: Sat Apr 27 13:53:31 2024 +
Commit: Ben Kohler gentoo org>
CommitDate: Sat Apr 27 13:53:31 2024 +
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 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/, patches/open-iscsi/2.1.8/
commit: c8db050cb16cebb026a64896f7ac1dff57beee7a
Author: Sam James gentoo org>
AuthorDate: Thu Jul 27 10:42:44 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jul 27 10:42:44 2023 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c8db050c
open-iscsi: update to 2.1.8
Signed-off-by: Sam James gentoo.org>
gkbuilds/open-iscsi.gkbuild| 6 +++---
.../2.1.8/open-iscsi-2.1.8-Makefiles.patch | 24 ++
.../2.1.8/open-iscsi-2.1.8-static-iscsistart.patch | 11 ++
3 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/gkbuilds/open-iscsi.gkbuild b/gkbuilds/open-iscsi.gkbuild
index 250d0a2..595b68e 100644
--- a/gkbuilds/open-iscsi.gkbuild
+++ b/gkbuilds/open-iscsi.gkbuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
src_compile() {
@@ -6,8 +6,8 @@ src_compile() {
export NO_SYSTEMD=1
export PKG_CONFIG="$(tc-getPKG_CONFIG) --static"
- gkmake -C utils/sysdeps V=1
- gkmake -C utils/fwparam_ibft V=1
+ gkmake -C sysdeps V=1
+ gkmake -C usr/fwparam_ibft V=1
gkmake -C libopeniscsiusr V=1
gkmake -C usr -j1 V=1 iscsistart
}
diff --git a/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-Makefiles.patch
b/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-Makefiles.patch
new file mode 100644
index 000..5d0bef1
--- /dev/null
+++ b/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-Makefiles.patch
@@ -0,0 +1,24 @@
+--- a/libopeniscsiusr/Makefile
b/libopeniscsiusr/Makefile
+@@ -50,7 +50,7 @@ EXTRA_MAN_FILE = libopeniscsiusr.h.3
+ OBJS = context.o misc.o session.o sysfs.o iface.o idbm.o node.o default.o
+
+ CFLAGS ?= -O2 -g
+-CFLAGS += -Wall -Werror -Wextra -fvisibility=hidden -fPIC
++CFLAGS += -Wextra -fvisibility=hidden -fPIC
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
+ CFLAGS += -DSBINDIR=\"$(SBINDIR)\"
+ CFLAGS += -DISCSI_DB_ROOT=\"$(DBROOT)\"
+@@ -60,9 +60,10 @@ LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
+
+ LIBADD =
+
+-all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc
++all: $(LIBS) $(LIBS_MAJOR)
+
+ $(LIBS): $(OBJS)
++ $(AR) $(ARFLAGS) libopeniscsiusr.a $^
+ $(CC) $(CFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LDFLAGS)
$(LIBADD)
+ ln -sf $@ $(DEVLIB)
+
+--
diff --git a/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-static-iscsistart.patch
b/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-static-iscsistart.patch
new file mode 100644
index 000..9ac800a
--- /dev/null
+++ b/patches/open-iscsi/2.1.8/open-iscsi-2.1.8-static-iscsistart.patch
@@ -0,0 +1,11 @@
+--- a/usr/Makefile
b/usr/Makefile
+@@ -99,7 +99,7 @@ iscsiadm: $(ISCSI_LIB_OBJS) $(SYSDEPS_OBJS)
$(DISCOVERY_OBJS) $(FW_BOOT_OBJS) \
+
+ iscsistart: $(ISCSI_LIB_OBJS) $(SYSDEPS_OBJS) $(INITIATOR_OBJS)
$(FW_BOOT_OBJS) \
+ $(ISCSISTART_OBJS)
+- $(CC) $(CFLAGS) $^ -o $@ -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB)
++ $(CC) $(CFLAGS) $^ -o $@ -static -lcrypto -lrt $(LDFLAGS) $(ISCSI_LIB)
+
+ install: $(DESTDIR)$(SBINDIR) $(PROGRAMS_DEST)
+
[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: 231fdfd9f1c1819d19440627ebe0ea58576a9965
Author: Sam James gentoo org>
AuthorDate: Wed Jul 5 20:41:39 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 5 20:41:39 2023 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=231fdfd9
gkbuilds: cryptsetup: disable asciidoc
Signed-off-by: Sam James 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/
commit: 8b7422293dcf9cc62518dcbc49239b6e637b6b74
Author: Robin H. Johnson gentoo org>
AuthorDate: Mon Jul 4 04:46:21 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Mon Jul 4 04:46:55 2022 +
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 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 : none
none shared ;' >
"${D}/usr/share/boost-build/site-config.jam" \
+ echo 'variant gentoorelease : release : off
off 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/
commit: cfc9ff455e2473e4322bd18c5fa21370d9c0702e
Author: orbea riseup net>
AuthorDate: Thu Mar 24 18:43:40 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun May 15 23:14:01 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cfc9ff45
gkbuild/util-linux: Install the correct binaries with slibtool
Signed-off-by: orbea 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/
commit: 2d2e91f288679e272f731917feb58f3768ea586d
Author: orbea riseup net>
AuthorDate: Thu Mar 24 20:17:07 2022 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun May 15 23:14:01 2022 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=2d2e91f2
gkbuild/cryptsetup: Install the correct binaries with slibtool
Signed-off-by: orbea 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/
commit: 3547a0eee6abc5cd3434168f9e6c7adda8669370
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Nov 15 17:56:00 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Nov 15 18:14:35 2021 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3547a0ee
gkbuilds/coreutils: Fix cross-compile
Signed-off-by: Thomas Deutschmann 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/
commit: 279e43a7afbc08cce743002661f02e94c5d6821b
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Nov 15 17:57:38 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Nov 15 18:14:35 2021 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=279e43a7
Bump cryptsetup to v2.4.1
Signed-off-by: Thomas Deutschmann 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/
commit: 4db4564e99c03779fb7121a64d48240e9d773939
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Oct 1 18:42:34 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Oct 1 18:43:36 2021 +
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 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/
commit: 9da63337a5462a8a75a4afe0f09051dcf23aeac8
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Jul 6 17:24:52 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Jul 6 17:24:52 2021 +
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 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/
commit: 81bf123895dfa60b72a357a3317a224907547f2c
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Mar 15 19:59:25 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Mar 15 19:59:25 2021 +
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 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/
commit: 4feb914a72ab3a59f2a79d8b97cc6a0bffe53605
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Feb 18 03:40:34 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Feb 18 03:43:37 2021 +
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 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/
commit: bd268279a58eaa2761829bd5113a79cb82d9528a
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Feb 18 03:37:29 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Feb 18 03:43:37 2021 +
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 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/
commit: 012432aedd39bb26d6840af13a679eddc4a8fa9e
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Feb 8 21:17:42 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Feb 8 22:10:05 2021 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=012432ae
Bump dropbear to v2020.81
Signed-off-by: Thomas Deutschmann 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/, defaults/
commit: 15df18bf51edb4dca84c8fc3000aa873f7f041d7
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Feb 8 21:55:30 2021 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Feb 8 22:10:14 2021 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=15df18bf
Bump kmod to v28
Signed-off-by: Thomas Deutschmann gentoo.org>
defaults/software.sh | 6 +++---
gkbuilds/kmod.gkbuild | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/defaults/software.sh b/defaults/software.sh
index 619b026..e938584 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -74,7 +74,7 @@
GKPKG_DROPBEAR_BINPKG="${GKPKG_DROPBEAR_BINPKG:-%%CACHE%%/dropbear-${GKPKG_DROPB
GKPKG_EUDEV_PN="eudev"
GKPKG_EUDEV_PV="${GKPKG_EUDEV_PV:-VERSION_EUDEV}"
-GKPKG_EUDEV_DEPS="util-linux zlib xz kmod"
+GKPKG_EUDEV_DEPS="util-linux zlib xz zstd kmod"
GKPKG_EUDEV_SRCTAR="${GKPKG_EUDEV_SRCTAR:-${DISTDIR}/eudev-${GKPKG_EUDEV_PV}.tar.gz}"
GKPKG_EUDEV_SRCDIR="${GKPKG_EUDEV_SRCDIR:-eudev-${GKPKG_EUDEV_PV}}"
GKPKG_EUDEV_BINPKG="${GKPKG_EUDEV_BINPKG:-%%CACHE%%/eudev-${GKPKG_EUDEV_PV}-%%ARCH%%.tar.xz}"
@@ -116,7 +116,7 @@
GKPKG_HWIDS_BINPKG="${GKPKG_HWIDS_BINPKG:-%%CACHE%%/hwids-${GKPKG_HWIDS_PV}-%%AR
GKPKG_ISCSI_PN="open-iscsi"
GKPKG_ISCSI_PV="${GKPKG_ISCSI_PV:-VERSION_ISCSI}"
-GKPKG_ISCSI_DEPS="util-linux zlib xz kmod"
+GKPKG_ISCSI_DEPS="util-linux zlib xz zstd kmod"
GKPKG_ISCSI_SRCTAR="${GKPKG_ISCSI_SRCTAR:-${DISTDIR}/open-iscsi-${GKPKG_ISCSI_PV}.tar.gz}"
GKPKG_ISCSI_SRCDIR="${GKPKG_ISCSI_SRCDIR:-open-iscsi-${GKPKG_ISCSI_PV}}"
GKPKG_ISCSI_BINPKG="${GKPKG_ISCSI_BINPKG:-%%CACHE%%/iscsi-${GKPKG_ISCSI_PV}-%%ARCH%%.tar.xz}"
@@ -130,7 +130,7 @@
GKPKG_JSON_C_BINPKG="${GKPKG_JSON_C_BINPKG:-%%CACHE%%/json-c-${GKPKG_JSON_C_PV}-
GKPKG_KMOD_PN="kmod"
GKPKG_KMOD_PV="${GKPKG_KMOD_PV:-VERSION_KMOD}"
-GKPKG_KMOD_DEPS="zlib xz"
+GKPKG_KMOD_DEPS="zlib xz zstd"
GKPKG_KMOD_SRCTAR="${GKPKG_KMOD_SRCTAR:-${DISTDIR}/kmod-${GKPKG_KMOD_PV}.tar.xz}"
GKPKG_KMOD_SRCDIR="${GKPKG_KMOD_SRCDIR:-kmod-${GKPKG_KMOD_PV}}"
GKPKG_KMOD_BINPKG="${GKPKG_KMOD_BINPKG:-%%CACHE%%/kmod-${GKPKG_KMOD_PV}-%%ARCH%%.tar.xz}"
diff --git a/gkbuilds/kmod.gkbuild b/gkbuilds/kmod.gkbuild
index bf0f355..8572b77 100644
--- a/gkbuilds/kmod.gkbuild
+++ b/gkbuilds/kmod.gkbuild
@@ -24,6 +24,7 @@ src_configure() {
--disable-tools
--with-xz
--with-zlib
+ --with-zstd
--without-openssl
)
[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: 6ba53084e045073489c1c773df052e5c7fc0d78f
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Aug 28 16:01:11 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Aug 28 16:35:59 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6ba53084
gkbuilds/e2fsprogs: Use libblkid/libuuid from util-linux
Signed-off-by: Thomas Deutschmann 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/
commit: e70eb3cba036d10a8fc8aab73e3367d74424ec42
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Aug 28 16:02:04 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Aug 28 16:35:59 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e70eb3cb
gkbuilds/e2fsprogs: Build resize2fs
Signed-off-by: Thomas Deutschmann 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/
commit: ec43af22117f4a55ee206d2a28394b55d3f836f1
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Aug 28 16:02:40 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Aug 28 16:35:59 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=ec43af22
gkbuilds/xfsprogs: Build xfs_growfs
Signed-off-by: Thomas Deutschmann 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/, defaults/
commit: 743800055c2b0a4bcb6f674c7543598ed8f843e8
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Aug 28 13:52:43 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Aug 28 15:41:38 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=74380005
Use switch_root from util-linux
switch_root from busybox does not move /dev, /sys, /proc and /run.
If we do that manually there is a small window for a race condition
when /dev, /sys or /proc is still needed but already moved. switch_root
from util-linux will move these mounts on its own and will therefore
avoid any potential problems.
Signed-off-by: Thomas Deutschmann gentoo.org>
defaults/linuxrc| 32 ++--
gen_initramfs.sh| 24
gkbuilds/util-linux.gkbuild | 26 --
3 files changed, 38 insertions(+), 44 deletions(-)
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 5c3b0ce..afb91d8 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -1335,34 +1335,6 @@ then
run pkill -9 udevd >/dev/null 2>&1
fi
-# If devtmpfs is mounted, try move it to the new root
-# If that fails, try to unmount all possible mounts of
-# devtmpfs as stuff breaks otherwise
-for fs in /run /dev /sys /proc
-do
- if grep -qs "${fs}" /proc/mounts
- then
- chroot_dir="${CHROOT}${fs}"
- [ ! -d "${chroot_dir}" ] && run mkdir -p "${chroot_dir}"
-
- if ! run mount -o move ${fs} "${CHROOT}"${fs}
- then
- run umount ${fs} || \
- bad_msg "Failed to move and unmount the ramdisk ${fs}!"
- fi
-
- unset chroot_dir
- fi
-done
-
-if [ ! -e "${CHROOT}/dev/console" ] || [ ! -e "${CHROOT}/dev/null" ]
-then
- bad_msg "ERROR: your real /dev is missing console and null"
-elif [ -e /etc/initrd.splash -a ! -e "${CHROOT}/dev/tty1" ]
-then
- bad_msg "ERROR: your real /dev is missing tty1, required for splash"
-fi
-
# Run debug shell if requested
rundebugshell "before entering switch_root"
@@ -1380,8 +1352,8 @@ elif [ $$ != 1 ]
then
bad_msg "PID was not 1! switch_root would fail"
else
- good_msg "Switching to real root: switch_root -c /dev/console ${CHROOT}
${init} ${init_opts}"
- exec switch_root -c "/dev/console" "${CHROOT}" "${init}" ${init_opts}
+ good_msg "Switching to real root: switch_root ${CHROOT} ${init}
${init_opts}"
+ exec switch_root "${CHROOT}" "${init}" ${init_opts}
fi
# If we get here, something bad has happened
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 875068c..479e6a6 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -635,9 +635,9 @@ append_bcache() {
fi
}
-append_blkid() {
- local PN="util-linux"
- local TDIR="${TEMP}/initramfs-blkid-temp"
+append_unionfs_fuse() {
+ local PN=unionfs-fuse
+ local TDIR="${TEMP}/initramfs-${PN}-temp"
if [ -d "${TDIR}" ]
then
rm -r "${TDIR}" || gen_die "Failed to clean out existing
'${TDIR}'!"
@@ -650,13 +650,9 @@ append_blkid() {
unpack "$(get_gkpkg_binpkg "${PN}")" "${TDIR}"
cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
-
- # Delete unneeded files
- rm -rf usr/
-
log_future_cpio_content
find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F
"${CPIO_ARCHIVE}" \
- || gen_die "Failed to append blkid to cpio!"
+ || gen_die "Failed to append ${PN} to cpio!"
cd "${TEMP}" || die "Failed to chdir to '${TEMP}'!"
if isTrue "${CLEANUP}"
@@ -665,9 +661,9 @@ append_blkid() {
fi
}
-append_unionfs_fuse() {
- local PN=unionfs-fuse
- local TDIR="${TEMP}/initramfs-${PN}-temp"
+append_util-linux() {
+ local PN="util-linux"
+ local TDIR="${TEMP}/initramfs-util-linux-temp"
if [ -d "${TDIR}" ]
then
rm -r "${TDIR}" || gen_die "Failed to clean out existing
'${TDIR}'!"
@@ -680,6 +676,10 @@ append_unionfs_fuse() {
unpack "$(get_gkpkg_binpkg "${PN}")" "${TDIR}"
cd "${TDIR}" || gen_die "Failed to chdir to '${TDIR}'!"
+
+ # Delete unneeded files
+ rm -rf usr/
+
log_future_cpio_content
find . -print0 | "${CPIO_COMMAND}" ${CPIO_ARGS} --append -F
"${CPIO_ARCHIVE}" \
|| gen_die "Failed to append ${PN} to cpio!"
@@ -1930,11 +1930,11 @@ create_initramfs() {
CPIO_ARCHIVE="${TMPDIR}/${GK_FILENAME_TEMP_INITRAMFS}"
append_data 'devices' # WARNING, must be first!
append_data 'base_layout'
+ append_data 'util-linux'
append_data 'eudev'
append_data 'devicemanager'
append_data 'auxilary' "${BUSYBOX}"
append_data 'busybox' "${BUSYBOX}"
- append_data 'blkid' "${DISKLABEL}"
append_data 'b2sum' "${B2SUM}"
append_data 'btrfs' "${BTRFS}"
[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: 08a8044fcd552fc913ec3168be0af323b4b86c05
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Aug 27 17:52:53 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Aug 27 17:52:53 2020 +
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 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/
commit: 74996872513894f53240533d6408e37f2893a87a
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Aug 25 16:46:46 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Aug 25 16:47:08 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=74996872
gkbuilds/dropbear: Build dbclient
Required for scp.
Signed-off-by: Thomas Deutschmann 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/
commit: d1f25b7d50dffbff5ddbf63fba6294309a5a19b5
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Aug 19 01:13:19 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Aug 19 01:13:19 2020 +
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 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/
commit: 9293b49303dac0a18294cba3d5dcec74154ca392
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Jul 23 19:49:28 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jul 23 19:49:28 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9293b493
kmod: remove hardcoded $BROOT value
Signed-off-by: Thomas Deutschmann 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/
commit: 328939565639000eab12170a3a060612e0045ff5
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Jul 20 20:20:43 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Jul 20 22:36:05 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=32893956
libgcrypt: Fix libgcrypt-config wrapper
Signed-off-by: Thomas Deutschmann 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/
commit: bf863ca44a22e1aa571f69da6e95be945937eb06
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Jul 14 16:12:11 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jul 16 14:29:17 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=bf863ca4
xfsprogs: Honor toolchain
Signed-off-by: Thomas Deutschmann 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/
commit: f2d17444644f07b04b2f5ff484b71d1e0d12ace6
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Jul 14 14:57:15 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jul 16 14:29:16 2020 +
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 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/, /
commit: 0b4c50fb24e49b2157292a799d78d386429e2331
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Jul 14 16:10:03 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jul 16 14:29:16 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=0b4c50fb
busybox: Honor toolchain
Signed-off-by: Thomas Deutschmann gentoo.org>
gen_determineargs.sh | 2 +-
gen_funcs.sh | 9 +
gkbuilds/busybox.gkbuild | 19 ++-
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index b464505..d145d16 100755
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -261,7 +261,7 @@ determine_output_filenames() {
determine_real_args() {
# Unset known variables which will interfere with _tc-getPROG().
local tc_var tc_varname_build tc_vars=$(get_tc_vars)
- for tc_var in ${tc_vars}
+ for tc_var in ${tc_vars} BROOT
do
tc_varname_build="BUILD_${tc_var}"
unset ${tc_var} ${tc_varname_build}
diff --git a/gen_funcs.sh b/gen_funcs.sh
index 6917202..69e7242 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -1304,6 +1304,15 @@ tc-getOBJDUMP() {
tc-getPROG OBJDUMP objdump "$@"
}
+tc-getPKG_CONFIG() {
+ if [ -n "${BROOT}" ]
+ then
+ echo "${BROOT}/usr/bin/pkg-config-wrapper"
+ else
+ tc-getPROG PKG_CONFIG pkg-config "$@"
+ fi
+}
+
tc-getREADELF() {
tc-getPROG READELF readelf "$@"
}
diff --git a/gkbuilds/busybox.gkbuild b/gkbuilds/busybox.gkbuild
index df99392..ac09363 100644
--- a/gkbuilds/busybox.gkbuild
+++ b/gkbuilds/busybox.gkbuild
@@ -1,9 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
src_prepare() {
default
+ # flag cleanup
+ sed -i -r \
+ -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
+
cp "${TEMP}"/busybox-config "${S}"/.config \
|| die "Failed top copy '${TEMP}/busybox-config' to
'${S}/.config'!"
[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: 88da47c6c06e5b48ddf73d85fcb7a90a287ffaaa
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Jul 14 16:11:29 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jul 16 14:29:16 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=88da47c6
libgcrypt: Honor toolchain
Signed-off-by: Thomas Deutschmann 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/
commit: f8d41285f26cf220dbc1a448639cffaf820e648b
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Jul 14 16:11:47 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jul 16 14:29:17 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f8d41285
strace: Honor toolchain
Signed-off-by: Thomas Deutschmann 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/, patches/e2fsprogs/1.45.6/
commit: 9f4db0bd1b34cdcc532d0d2a76972100b55cbbec
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Jul 14 16:10:59 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jul 16 14:29:16 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9f4db0bd
e2fsprogs: Honor toolchain
Signed-off-by: Thomas Deutschmann gentoo.org>
gkbuilds/e2fsprogs.gkbuild | 10 ++-
.../e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch | 83 ++
2 files changed, 92 insertions(+), 1 deletion(-)
diff --git a/gkbuilds/e2fsprogs.gkbuild b/gkbuilds/e2fsprogs.gkbuild
index 78c7193..7cebcca 100644
--- a/gkbuilds/e2fsprogs.gkbuild
+++ b/gkbuilds/e2fsprogs.gkbuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# e2fsprogs-1.45.6-build.patch would trigger gkautoreconf
+# which we cannot run because of gettext-0.20 incompatibility
+WANT_AUTORECONF=no
+
src_configure() {
append-ldflags -static
@@ -20,6 +24,10 @@ src_configure() {
--disable-defrag
)
+ ac_cv_path_LDCONFIG=: \
+ CC="$(tc-getCC)" \
+ BUILD_CC="$(tc-getBUILD_CC)" \
+ BUILD_LD="$(tc-getBUILD_LD)" \
gkconf "${myconf[@]}"
}
diff --git a/patches/e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch
b/patches/e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch
new file mode 100644
index 000..63e37f5
--- /dev/null
+++ b/patches/e2fsprogs/1.45.6/e2fsprogs-1.45.6-build.patch
@@ -0,0 +1,83 @@
+--- a/MCONFIG.in
b/MCONFIG.in
+@@ -86,6 +86,7 @@ SANITIZER_LDFLAGS = @lto_ldflags@ @ubsan_ldflags@
@addrsan_ldflags@ @threadsan_l
+
+ CC = @CC@
+ BUILD_CC = @BUILD_CC@
++BUILD_CFLAGS = @BUILD_CFLAGS@
+ CFLAGS = @CFLAGS@
+ CFLAGS_SHLIB = @CFLAGS_SHLIB@
+ CFLAGS_STLIB = @CFLAGS_STLIB@
+--- a/configure
b/configure
+@@ -12398,14 +12398,12 @@ $as_echo "$as_me: WARNING:
+ esac
+ fi
+
+-
+-# See if we need a separate native compiler.
+-if test $cross_compiling = no; then
+- BUILD_CC="$CC"
+-
+-else
+- for ac_prog in gcc cc
+-do
++if test "${BUILD_CC+set}" != "set"; then
++if test $cross_compiling = no; then
++ BUILD_CC="$CC"
++else
++ for ac_prog in gcc cc
++ do
+ # Extract the first word of "$ac_prog", so it can be a program name with
args.
+ set dummy $ac_prog; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+@@ -12446,6 +12444,16 @@ fi
+ test -n "$BUILD_CC" && break
+ done
+
++fi
++fi
++
++if test "${BUILD_CFLAGS+set}" != "set"; then
++if test $cross_compiling = no; then
++ BUILD_CFLAGS="$CFLAGS"
++else
++ BUILD_CFLAGS="-g -O2"
++fi
++
+ fi
+ for ac_header in dirent.herrno.h execinfo.h
getopt.hmalloc.hmntent.hpaths.h semaphore.h
setjmp.hsignal.hstdarg.hstdint.hstdlib.h
termios.h termio.hunistd.hutime.h attr/xattr.h
linux/falloc.h linux/fd.h linux/fsmap.h linux/major.h linux/loop.h
linux/types.h net/if_dl.h netinet/in.hsys/acl.h sys/disklabel.h
sys/disk.h sys/file.h sys/ioctl.h sys/key.h
sys/mkdev.h sys/mman.h sys/mount.h sys/prctl.h sys/resource.h
sys/select.hsys/socket.hsys/sockio.hsys/stat.h sys/syscall.h
sys/sysctl.hsys/sysmacros.h sys/time.h sys/types.h
sys/un.hsys/wait.h sys/xattr.h
+ do :
+--- a/configure.ac
b/configure.ac
+@@ -910,13 +910,24 @@ else
+ fi
+ AC_SUBST(MAKEINFO)
+ AC_PROG_INSTALL
+-# See if we need a separate native compiler.
+-if test $cross_compiling = no; then
+- BUILD_CC="$CC"
+- AC_SUBST(BUILD_CC)
+-else
+- AC_CHECK_PROGS(BUILD_CC, gcc cc)
++
++AC_ARG_VAR(BUILD_CC, [C compiler for build tools])
++if test "${BUILD_CC+set}" != "set"; then
++if test $cross_compiling = no; then
++ BUILD_CC="$CC"
++else
++ AC_CHECK_PROGS(BUILD_CC, gcc cc)
++fi
++fi
++AC_ARG_VAR(BUILD_CFLAGS, [C compiler flags for build tools])
++if test "${BUILD_CFLAGS+set}" != "set"; then
++if test $cross_compiling = no; then
++ BUILD_CFLAGS="$CFLAGS"
++else
++ BUILD_CFLAGS="-g -O2"
++fi
+ fi
++
+ AC_CHECK_HEADERS(m4_flatten([
+ dirent.h
+ errno.h
[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: 7c8e344dd138df4655d4a329b54b0e75d8ca9e3b
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Jun 20 02:16:23 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Jun 20 02:16:23 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7c8e344d
gkbuilds/dropbear: Enable AES GCM support
Signed-off-by: Thomas Deutschmann 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/
commit: c465346aaba1bc8a1fd775eb6e9e724706cf6252
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Jun 16 13:52:33 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Jun 16 13:53:10 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c465346a
gkbuilds/gnupg: Set CC_FOR_BUILD
Signed-off-by: Thomas Deutschmann 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/
commit: db22b64c7d60911a5790571368cd440c3fb8f238
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Jun 16 13:52:05 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Jun 16 13:52:57 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=db22b64c
gkbuilds/libgpg-error: Set CC_FOR_BUILD
Signed-off-by: Thomas Deutschmann 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/
commit: ce030506862adaea477be85081e94c48dbce98f5
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu May 14 21:54:08 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu May 14 21:54:08 2020 +
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 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/
commit: 8d3182553b151bcaf9010fae4dcc091f18096839
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Apr 7 22:39:11 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Apr 7 22:39:11 2020 +
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 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/
commit: 9aa413c047bc6cb366746634c8a397d10207ba24
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Feb 15 18:58:02 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Feb 15 20:38:10 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=9aa413c0
gkbuilds/util-linux: Use $D
Signed-off-by: Thomas Deutschmann 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/
commit: 063b9290acc655488ed3f44d56f2cd541c84d7da
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Feb 15 20:34:00 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Feb 15 20:38:11 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=063b9290
gkbuilds/xfsprogs: avoid automagic on libdevmapper
Signed-off-by: Thomas Deutschmann 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/
commit: 837bd3dd4a9db47e5d005a26516ea14d41579450
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Dec 31 02:26:00 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Tue Dec 31 02:35:30 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=837bd3dd
gkbuilds/thin-provisioning-tools: minor fixes
Signed-off-by: Thomas Deutschmann 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/
commit: 88926bcb350f23d5660d3430cc5517326f3cb33c
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Dec 13 22:55:50 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Dec 14 00:08:48 2019 +
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 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/
commit: 48d78fa0ba224a032d29fe1eec23fcbc307e7f0e
Author: Thomas Deutschmann gentoo org>
AuthorDate: Mon Nov 25 15:01:25 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Mon Nov 25 15:01:25 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=48d78fa0
gkbuilds/mdadm: Honor CFLAGS
Signed-off-by: Thomas Deutschmann 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/
commit: 074b43e3ede4b1c161a64937f32c815fcee4d8c8
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Sep 29 23:18:34 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Sep 29 23:23:50 2019 +
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 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/, patches/xfsprogs/5.1.0/, patches/xfsprogs/5.2.1/
commit: 7fdc2b2b1f8e029d38bc89c9b8ee894a02bdefdc
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Sep 6 20:41:52 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Sep 6 20:41:52 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=7fdc2b2b
Bump xfsprogs to v5.2.1
Signed-off-by: Thomas Deutschmann gentoo.org>
gkbuilds/xfsprogs.gkbuild | 1 -
.../5.1.0/xfsprogs-4.15.0-sharedlibs.patch | 105 -
.../xfsprogs-4.9.0-underlinking.patch | 0
3 files changed, 106 deletions(-)
diff --git a/gkbuilds/xfsprogs.gkbuild b/gkbuilds/xfsprogs.gkbuild
index 4456738..b16379f 100644
--- a/gkbuilds/xfsprogs.gkbuild
+++ b/gkbuilds/xfsprogs.gkbuild
@@ -15,7 +15,6 @@ src_configure() {
unset PLATFORM # if set in user env, this breaks configure
local myconf=(
- --disable-lto #655638
--enable-blkid
--disable-libicu
--disable-gettext
diff --git a/patches/xfsprogs/5.1.0/xfsprogs-4.15.0-sharedlibs.patch
b/patches/xfsprogs/5.1.0/xfsprogs-4.15.0-sharedlibs.patch
deleted file mode 100644
index a8911ce..000
--- a/patches/xfsprogs/5.1.0/xfsprogs-4.15.0-sharedlibs.patch
+++ /dev/null
@@ -1,105 +0,0 @@
xfsprogs-4.15.0/include/buildmacros
-+++ xfsprogs-4.15.0/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
-- cd $(TOPDIR)/$(LIBNAME)/.libs; \
-- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
-- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
-- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la
$(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
-- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so
$(PKG_LIB_DIR)/$(LIBNAME).so; \
-- fi
-+ set -e; cd $(TOPDIR)/$(LIBNAME); \
-+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la
$(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
xfsprogs-4.15.0/libfrog/Makefile
-+++ xfsprogs-4.15.0/libfrog/Makefile
-@@ -34,6 +36,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
xfsprogs-4.15.0/libhandle/Makefile
-+++ xfsprogs-4.15.0/libhandle/Makefile
-@@ -24,7 +24,6 @@
- include $(BUILDRULES)
-
- install: default
-- $(INSTALL_LTLIB)
-
- install-dev: default
- $(INSTALL_LTLIB_DEV)
xfsprogs-4.15.0/libxcmd/Makefile
-+++ xfsprogs-4.15.0/libxcmd/Makefile
-@@ -12,6 +12,8 @@
-
- CFILES = command.c input.c help.c quit.c
-
-+LTLIBS = $(LIBXFS) $(LIBBLKID)
-+
- ifeq ($(ENABLE_READLINE),yes)
- LCFLAGS += -DENABLE_READLINE
- LTLIBS += $(LIBREADLINE) $(LIBTERMCAP)
-@@ -26,6 +28,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
xfsprogs-4.15.0/libxfs/Makefile
-+++ xfsprogs-4.15.0/libxfs/Makefile
-@@ -151,6 +151,7 @@
-
- install-dev: install
- $(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
-+ $(INSTALL_LTLIB_DEV)
-
- # We need to install the headers before building the dependencies. If we
- # include the .ltdep file, the makefile decides that it needs to build the
xfsprogs-4.15.0/libxlog/Makefile
-+++ xfsprogs-4.15.0/libxlog/Makefile
-@@ -19,6 +19,9 @@
-
- include $(BUILDRULES)
-
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+ $(INSTALL_LTLIB_DEV)
-
- -include .ltdep
xfsprogs-4.15.0/Makefile
-+++ xfsprogs-4.15.0/Makefile
-@@ -92,6 +92,10 @@
- mkfs: libxcmd
- spaceman: libxcmd
- scrub: libhandle libxcmd
-+#libxfs: libfrog
-+#libfrog-install-dev: libxfs-install-dev
-+#libxlog: libxfs
-+#libxlog-install-dev: libxfs-install-dev
-
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
diff --git a/patches/xfsprogs/5.1.0/xfsprogs-4.9.0-underlinking.patch
b/patches/xfsprogs/5.2.1/xfsprogs-4.9.0-underlinking.patch
similarity index 100%
rename from patches/xfsprogs/5.1.0/xfsprogs-4.9.0-underlinking.patch
rename to patches/xfsprogs/5.2.1/xfsprogs-4.9.0-underlinking.patch
[gentoo-commits] proj/genkernel:master commit in: gkbuilds/
commit: 6aa3d60b7896bab5572e66e3415f808bc73d7038
Author: Stefan Strogin gentoo org>
AuthorDate: Sun Sep 1 19:20:44 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Sep 1 20:31:12 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=6aa3d60b
gkbuilds/expat: add --without-docbook to src_configure
Signed-off-by: Stefan Strogin 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/, defaults/
commit: 1d0c43bedc00e3365b9e972a91dac11a2c04285c
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Jul 14 09:41:39 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Jul 14 11:58:16 2019 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=1d0c43be
Rework --mdadm support
Signed-off-by: Thomas Deutschmann gentoo.org>
defaults/software.sh | 12 ++
gen_compile.sh | 43 -
gen_initramfs.sh | 64 --
gkbuilds/mdadm.gkbuild | 35 +++
4 files changed, 73 insertions(+), 81 deletions(-)
diff --git a/defaults/software.sh b/defaults/software.sh
index 532c520..5df1c0c 100644
--- a/defaults/software.sh
+++ b/defaults/software.sh
@@ -16,11 +16,6 @@
GKPKG_BUSYBOX_SRCTAR="${GKPKG_BUSYBOX_SRCTAR:-${DISTDIR}/busybox-${GKPKG_BUSYBOX
GKPKG_BUSYBOX_SRCDIR="${GKPKG_BUSYBOX_SRCDIR:-busybox-${GKPKG_BUSYBOX_PV}}"
GKPKG_BUSYBOX_BINPKG="${GKPKG_BUSYBOX_BINPKG:-%%CACHE%%/busybox-${GKPKG_BUSYBOX_PV}-%%ARCH%%.tar.xz}"
-MDADM_VER="${MDADM_VER:-VERSION_MDADM}"
-MDADM_DIR="${MDADM_DIR:-mdadm-${MDADM_VER}}"
-MDADM_SRCTAR="${MDADM_SRCTAR:-${DISTDIR}/mdadm-${MDADM_VER}.tar.xz}"
-MDADM_BINCACHE="${MDADM_BINCACHE:-%%CACHE%%/mdadm-${MDADM_VER}-%%ARCH%%.tar.bz2}"
-
GKPKG_DMRAID_PN="dmraid"
GKPKG_DMRAID_PV="${GKPKG_DMRAID_PV:-VERSION_DMRAID}"
GKPKG_DMRAID_DEPS="lvm"
@@ -77,6 +72,13 @@ GKPKG_LVM_SRCDIR="${GKPKG_LVM_SRCDIR:-LVM2.${GKPKG_LVM_PV}}"
GKPKG_LVM_SRCTAR="${GKPKG_LVM_SRCTAR:-${DISTDIR}/LVM2.${GKPKG_LVM_PV}.tgz}"
GKPKG_LVM_BINPKG="${GKPKG_LVM_BINPKG:-%%CACHE%%/LVM2.${GKPKG_LVM_PV}-%%ARCH%%.tar.xz}"
+GKPKG_MDADM_PN="mdadm"
+GKPKG_MDADM_PV="${GKPKG_MDADM_PV:-VERSION_MDADM}"
+GKPKG_MDADM_DEPS=""
+GKPKG_MDADM_SRCDIR="${GKPKG_MDADM_SRCDIR:-mdadm-${GKPKG_MDADM_PV}}"
+GKPKG_MDADM_SRCTAR="${GKPKG_MDADM_SRCTAR:-${DISTDIR}/mdadm-${GKPKG_MDADM_PV}.tar.xz}"
+GKPKG_MDADM_BINPKG="${GKPKG_MDADM_BINPKG:-%%CACHE%%/mdadm-${GKPKG_MDADM_PV}-%%ARCH%%.tar.xz}"
+
GKPKG_UNIONFS_FUSE_PN="unionfs-fuse"
GKPKG_UNIONFS_FUSE_PV="${GKPKG_UNIONFS_FUSE_PV:-VERSION_UNIONFS_FUSE}"
GKPKG_UNIONFS_FUSE_DEPS="fuse"
diff --git a/gen_compile.sh b/gen_compile.sh
index 1c096cb..92efaa0 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -529,49 +529,6 @@ compile_kernel() {
fi
}
-compile_mdadm() {
- if [ -f "${MDADM_BINCACHE}" ]
- then
- print_info 1 "$(getIndent 2)mdadm: >> Using cache ..."
- else
- [ -f "${MDADM_SRCTAR}" ] ||
- gen_die "Could not find MDADM source tarball:
${MDADM_SRCTAR}! Please place it there, or place another version, changing
/etc/genkernel.conf as necessary!"
- cd "${TEMP}"
- rm -rf "${MDADM_DIR}" > /dev/null
- /bin/tar -xpf "${MDADM_SRCTAR}" ||
- gen_die 'Could not extract MDADM source tarball!'
- [ -d "${MDADM_DIR}" ] ||
- gen_die "MDADM directory ${MDADM_DIR} is invalid!"
-
- cd "${MDADM_DIR}"
- apply_patches mdadm ${MDADM_VER}
- defs='-DNO_DLM -DNO_COROSYNC'
- sed -i \
- -e "/^CFLAGS = /s:^CFLAGS = \(.*\)$:CFLAGS = -Os
${defs}:" \
- -e "/^CXFLAGS = /s:^CXFLAGS = \(.*\)$:CXFLAGS = -Os
${defs}:" \
- -e "/^CWFLAGS = /s:^CWFLAGS = \(.*\)$:CWFLAGS = -Wall:"
\
- -e "s/^# LDFLAGS = -static/LDFLAGS = -static/" \
- Makefile || gen_die "Failed to sed mdadm Makefile"
-
- print_info 1 "$(getIndent 2)mdadm: >> Compiling ..."
- compile_generic 'mdadm mdmon' utils
-
- mkdir -p "${TEMP}/mdadm/sbin"
- install -m 0755 -s mdadm "${TEMP}/mdadm/sbin/mdadm" || gen_die
"Failed mdadm install"
- install -m 0755 -s mdmon "${TEMP}/mdadm/sbin/mdmon" || gen_die
"Failed mdmon install"
- print_info 1 "$(getIndent 2)mdadm: >> Copying to bincache ..."
- cd "${TEMP}/mdadm"
- ${UTILS_CROSS_COMPILE}strip "sbin/mdadm" "sbin/mdmon" ||
- gen_die 'Could not strip mdadm binaries!'
- /bin/tar -cjf "${MDADM_BINCACHE}" sbin/mdadm sbin/mdmon ||
- gen_die 'Could not create binary cache'
-
- cd "${TEMP}"
- isTrue "${CMD_DEBUGCLEANUP}" && rm -rf "${MDADM_DIR}" mdadm
- return 0
- fi
-}
-
determine_busybox_config_file() {
print_info 2 "$(get_indent 3)busybox: >> Checking for suitable busybox
configuration ..."
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index fc756d0..3971fd7 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -508,48 +508,46 @@ append_lvm() {
|| gen_die "Failed to append lvm to cpio!"
}
-append_mdadm(){
- if [ -d "${TEMP}/initramfs-mdadm-temp" ]
+append_mdadm() {
+ local PN
