* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bootchart2/files/, app-benchmarks/bootchart2/
@ 2016-04-21 4:22 Mike Frysinger
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2016-04-21 4:22 UTC (permalink / raw
To: gentoo-commits
commit: 8bea3f73fa42fa9025d4aeb8950611af99984563
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 04:21:58 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 04:21:58 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bea3f73
app-benchmarks/bootchart2: fix build w/newer glibc #579922
.../bootchart2/bootchart2-0.14.7-r1.ebuild | 1 +
.../files/bootchart2-0.14.7-sysmacros.patch | 29 ++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.7-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.7-r1.ebuild
index 4e466bd..b652fe0 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.7-r1.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.7-r1.ebuild
@@ -36,6 +36,7 @@ S="${WORKDIR}"/${PN%2}-${PV}
CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-sysmacros.patch #579922
tc-export CC
sed \
-e "/^install/s:py-install-compile::g" \
diff --git a/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch b/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch
new file mode 100644
index 0000000..de6e411
--- /dev/null
+++ b/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/579922
+
+From add58c3b57064afd6f7d2fd5f09006d28a3e770e Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 21 Apr 2016 00:19:32 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
+
+These funcs are defined in the sys/sysmacros.h header, not sys/types.h.
+Linux C libraries are updating to drop the implicit include, so we need
+to include it explicitly.
+---
+ collector/collector.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/collector/collector.c b/collector/collector.c
+index cfdcb26..2f3ce6b 100644
+--- a/collector/collector.c
++++ b/collector/collector.c
+@@ -33,6 +33,7 @@
+ #include "common.h"
+
+ #include <sys/mount.h>
++#include <sys/sysmacros.h>
+ #include <linux/fs.h>
+ #include <linux/genetlink.h>
+ #include <linux/taskstats.h>
+--
+2.7.4
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bootchart2/files/, app-benchmarks/bootchart2/
@ 2018-01-30 8:23 Mike Frysinger
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2018-01-30 8:23 UTC (permalink / raw
To: gentoo-commits
commit: 470f9c05bfa49199f15b8f7756ad67be26fd4617
Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Tue Jan 30 08:22:32 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 08:23:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=470f9c05
app-benchmarks/bootchart2: version bump to 0.14.8
app-benchmarks/bootchart2/Manifest | 1 +
app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild | 78 ++++++++++++++++++++++
.../files/bootchart2-0.14.7-sysmacros.patch | 1 +
3 files changed, 80 insertions(+)
diff --git a/app-benchmarks/bootchart2/Manifest b/app-benchmarks/bootchart2/Manifest
index 152810057b9..c1474b95b81 100644
--- a/app-benchmarks/bootchart2/Manifest
+++ b/app-benchmarks/bootchart2/Manifest
@@ -1 +1,2 @@
DIST bootchart2-0.14.7.tar.gz 1175145 BLAKE2B dfe56572eb2f85b68e0ad871c939ef16c48b0ee11ca881f03914d6773b86050091b232d80706f0df1d094c2e069c252609a0266d1cfa5159a6a0916321ea1dcf SHA512 82074a6ca6725a1b9ffe2a5d7f7bc6fd7918ab837573c23f75e7ebf209f30284ac7e59d2e84768ed313e4cee80da8e67dde167881d907fe71eff376ae9d16541
+DIST bootchart2-0.14.8.tar.gz 1175527 BLAKE2B 623ca2269420eda79b09d955ab9d4a37af004e9e97ad0e0c6014e53b4b0c63239661cb5359345306504980b060ccd11488970cb0aa3d832bfb55392724e715dd SHA512 58303db91d22ccc44c0dc765e7a6672fb277840555fd87ce64b8987cba85250cfe3db17f3ec7e0e1e726ad59166a5d3d01a7a262c07b5690c595877b46c66bd0
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild
new file mode 100644
index 00000000000..d31698dcc3b
--- /dev/null
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.8.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit linux-info python-r1 systemd toolchain-funcs
+
+DESCRIPTION="Performance analysis and visualization of the system boot process"
+HOMEPAGE="https://github.com/mmeeks/bootchart/"
+SRC_URI="https://github.com/mmeeks/bootchart/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="svg test X"
+
+REQUIRED_USE="
+ X? ( ${PYTHON_REQUIRED_USE} )
+ test? ( X )"
+
+RDEPEND="
+ !app-benchmarks/bootchart
+ X? (
+ dev-python/pycairo[svg(+)?,${PYTHON_USEDEP}]
+ dev-python/pygtk[$(python_gen_usedep 'python2*')]
+ ${PYTHON_DEPS}
+ )
+ sys-apps/lsb-release"
+DEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}"/${PN%2}-${PV}
+
+CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.14.7-sysmacros.patch #579922
+ tc-export CC
+ sed -i \
+ -e "/^install/s:py-install-compile::g" \
+ -e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_unitdir):g" \
+ Makefile || die
+ sed -i \
+ -e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty:g' \
+ bootchartd.conf bootchartd.in || die
+}
+
+src_test() {
+ python_foreach_impl emake test
+}
+
+src_install() {
+ export DOCDIR=/usr/share/doc/${PF}
+ default
+
+ # Note: LIBDIR is hardcoded as /lib in collector/common.h, so we shouldn't
+ # just change it. Since no libraries are installed, /lib is fine.
+ keepdir /lib/bootchart/tmpfs
+
+ installation() {
+ python_domodule pybootchartgui
+
+ python_newscript pybootchartgui.py pybootchartgui
+ }
+ use X && python_foreach_impl installation
+
+ newinitd "${FILESDIR}"/${PN}.init ${PN}
+
+}
+
+pkg_postinst() {
+ elog "If you are using an initrd during boot"
+ echo
+ elog "please add the init script to your default runlevel"
+ elog "rc-update add bootchart2 default"
+ echo
+}
diff --git a/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch b/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch
index de6e4112b68..48cf685c0ca 100644
--- a/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch
+++ b/app-benchmarks/bootchart2/files/bootchart2-0.14.7-sysmacros.patch
@@ -1,4 +1,5 @@
https://bugs.gentoo.org/579922
+https://github.com/xrmx/bootchart/commit/add58c3b57064afd6f7d2fd5f09006d28a3e770e
From add58c3b57064afd6f7d2fd5f09006d28a3e770e Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bootchart2/files/, app-benchmarks/bootchart2/
@ 2020-04-30 15:10 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-04-30 15:10 UTC (permalink / raw
To: gentoo-commits
commit: e626c9c6082bf415656a64c2536ae2c52e20583d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 11:18:19 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 15:10:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e626c9c6
app-benchmarks/bootchart2: Drop USE X, broken python deps, EAPI-7 bump
Also drop no-op USE svg.
Drop USE test that depend on X, restrict tests.
Don't compress manpages.
Closes: https://bugs.gentoo.org/708108
Closes: https://bugs.gentoo.org/718200
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../bootchart2/bootchart2-0.14.8-r1.ebuild | 58 ++++++++++++++++++++++
.../bootchart2-0.14.8-no-compressed-man.patch | 15 ++++++
2 files changed, 73 insertions(+)
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.8-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.8-r1.ebuild
new file mode 100644
index 00000000000..6cb11cd3e6e
--- /dev/null
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.8-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Performance analysis and visualization of the system boot process"
+HOMEPAGE="https://github.com/mmeeks/bootchart/"
+SRC_URI="https://github.com/mmeeks/bootchart/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RESTRICT="test"
+
+RDEPEND="
+ !app-benchmarks/bootchart
+ sys-apps/lsb-release"
+
+S="${WORKDIR}"/${PN%2}-${PV}
+
+CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.14.7-sysmacros.patch # bug 579922
+ "${FILESDIR}"/${P}-no-compressed-man.patch
+)
+
+src_prepare() {
+ default
+ tc-export CC
+ sed -i \
+ -e "/^install/s:py-install-compile::g" \
+ -e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_systemunitdir):g" \
+ Makefile || die
+ sed -i \
+ -e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty:g' \
+ bootchartd.conf bootchartd.in || die
+}
+
+src_install() {
+ export DOCDIR=/usr/share/doc/${PF}
+ default
+
+ # Note: LIBDIR is hardcoded as /lib in collector/common.h, so we shouldn't
+ # just change it. Since no libraries are installed, /lib is fine.
+ keepdir /lib/bootchart/tmpfs
+
+ newinitd "${FILESDIR}"/${PN}.init ${PN}
+}
+
+pkg_postinst() {
+ elog "If you are using an initrd during boot"
+ elog "please add the init script to your default runlevel"
+ elog "rc-update add bootchart2 default"
+}
diff --git a/app-benchmarks/bootchart2/files/bootchart2-0.14.8-no-compressed-man.patch b/app-benchmarks/bootchart2/files/bootchart2-0.14.8-no-compressed-man.patch
new file mode 100644
index 00000000000..261e821a403
--- /dev/null
+++ b/app-benchmarks/bootchart2/files/bootchart2-0.14.8-no-compressed-man.patch
@@ -0,0 +1,15 @@
+--- a/Makefile 2015-12-17 09:12:57.000000000 +0100
++++ b/Makefile 2020-04-30 13:14:08.772369141 +0200
+@@ -107,9 +107,9 @@
+ install -m 644 -D README $(DESTDIR)$(DOCDIR)/README
+ install -m 644 -D README.pybootchart $(DESTDIR)$(DOCDIR)/README.pybootchart
+ mkdir -p $(DESTDIR)$(MANDIR)
+- gzip -c bootchart2.1 > $(DESTDIR)$(MANDIR)/bootchart2.1.gz
+- gzip -c bootchartd.1 > $(DESTDIR)$(MANDIR)/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).1.gz
+- gzip -c pybootchartgui.1 > $(DESTDIR)$(MANDIR)/pybootchartgui.1.gz
++ install -m 644 bootchart2.1 $(DESTDIR)$(MANDIR)/bootchart2.1
++ install -m 644 bootchartd.1 $(DESTDIR)$(MANDIR)/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).1
++ install -m 644 pybootchartgui.1 $(DESTDIR)$(MANDIR)/pybootchartgui.1
+
+ install-service:
+ mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bootchart2/files/, app-benchmarks/bootchart2/
@ 2022-08-16 0:19 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-08-16 0:19 UTC (permalink / raw
To: gentoo-commits
commit: 63adc98ac12a26bce1c16dd372f050073375b628
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 00:15:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 00:15:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63adc98a
app-benchmarks/bootchart2: fix build w/ glibc 2.36
Closes: https://bugs.gentoo.org/864205
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../bootchart2/bootchart2-0.14.9-r1.ebuild | 1 +
.../files/bootchart2-0.14.9-glibc-2.36.patch | 24 ++++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
index 6cd79686f3af..83e421f91a32 100644
--- a/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
+++ b/app-benchmarks/bootchart2/bootchart2-0.14.9-r1.ebuild
@@ -31,6 +31,7 @@ CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
PATCHES=(
"${FILESDIR}"/${PN}-0.14.8-no-compressed-man.patch
+ "${FILESDIR}"/${P}-glibc-2.36.patch
)
src_prepare() {
diff --git a/app-benchmarks/bootchart2/files/bootchart2-0.14.9-glibc-2.36.patch b/app-benchmarks/bootchart2/files/bootchart2-0.14.9-glibc-2.36.patch
new file mode 100644
index 000000000000..720079e9d794
--- /dev/null
+++ b/app-benchmarks/bootchart2/files/bootchart2-0.14.9-glibc-2.36.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/864205
+https://github.com/xrmx/bootchart/commit/8591c1e3edaea8f17396e3d2819d9064b2818cfb
+
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 6 Aug 2022 20:39:01 -0700
+Subject: [PATCH] Do not include linux/fs.h
+
+This header is not needed to be included anymore, moreover it conflicts
+with sys/mount.h from glibc 2.36+ see [1]
+
+[1] https://sourceware.org/glibc/wiki/Release/2.36
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/collector/collector.c
++++ b/collector/collector.c
+@@ -34,7 +34,6 @@
+
+ #include <sys/mount.h>
+ #include <sys/sysmacros.h>
+-#include <linux/fs.h>
+ #include <linux/genetlink.h>
+ #include <linux/taskstats.h>
+ #include <linux/cgroupstats.h>
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-16 0:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-30 15:10 [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bootchart2/files/, app-benchmarks/bootchart2/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-08-16 0:19 Sam James
2018-01-30 8:23 Mike Frysinger
2016-04-21 4:22 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox