From: Thorsten Scherer <t.scherer@eckelmann.de>
To: ptxdist@pengutronix.de
Cc: Thorsten Scherer <t.scherer@eckelmann.de>
Subject: [ptxdist] [PATCH 04/42] calibrator: Remove after one year in staging
Date: Mon, 4 May 2026 14:12:53 +0200 [thread overview]
Message-ID: <20260504121331.57729-5-t.scherer@eckelmann.de> (raw)
In-Reply-To: <20260504121331.57729-1-t.scherer@eckelmann.de>
Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de>
---
...-round-_round-to-avoid-name-conficts.patch | 104 ------------------
patches/calibrator-20070821-1/series | 3 -
rules/calibrator.in | 18 ---
rules/calibrator.make | 61 ----------
4 files changed, 186 deletions(-)
delete mode 100644 patches/calibrator-20070821-1/0001-rename-round-_round-to-avoid-name-conficts.patch
delete mode 100644 patches/calibrator-20070821-1/series
delete mode 100644 rules/calibrator.in
delete mode 100644 rules/calibrator.make
diff --git a/patches/calibrator-20070821-1/0001-rename-round-_round-to-avoid-name-conficts.patch b/patches/calibrator-20070821-1/0001-rename-round-_round-to-avoid-name-conficts.patch
deleted file mode 100644
index 25f1d4ca444d..000000000000
--- a/patches/calibrator-20070821-1/0001-rename-round-_round-to-avoid-name-conficts.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 13 Feb 2011 20:42:38 +0100
-Subject: [PATCH] rename round -> _round to avoid name conficts
-
-calibrator.c:131:5: error: conflicting types for 'round'
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- calibrator.c | 30 +++++++++++++++---------------
- 1 files changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/calibrator.c b/calibrator.c
-index e045dfd..45f2eb4 100644
---- a/calibrator.c
-+++ b/calibrator.c
-@@ -128,7 +128,7 @@ void ErrXit(char *format, ...) {
- exit(1);
- }
-
--lng round(dbl x)
-+lng _round(dbl x)
- {
- return (lng)(x + 0.5);
- }
-@@ -890,16 +890,16 @@ void plotCache(cacheInfo *cache, lng **result, lng MHz, char *fn, FILE *fp, lng
- fprintf(fp, ")\n");
- fprintf(fp, "set y2tics");
- for (l = 0, s = " ("; l <= cache->levels; l++, s = ", ") {
-- if (!delay) fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(cache->latency1[l] - delay)), NSperIt(cache->latency1[l] - delay));
-- else fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(cache->latency2[l] - delay)), NSperIt(cache->latency2[l] - delay));
-+ if (!delay) fprintf(fp, "%s'(%ld)' %f", s, _round(CYperIt(cache->latency1[l] - delay)), NSperIt(cache->latency1[l] - delay));
-+ else fprintf(fp, "%s'(%ld)' %f", s, _round(CYperIt(cache->latency2[l] - delay)), NSperIt(cache->latency2[l] - delay));
- }
- for (y = 1; y <= yh; y *= 10) {
- fprintf(fp, "%s'%1.3g' %ld", s, (dbl)(y * MHz) / 1000.0, y);
- }
- fprintf(fp, ")\n");
- for (l = 0; l <= cache->levels; l++) {
-- if (!delay) z = (dbl)round(CYperIt(cache->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
-- else z = (dbl)round(CYperIt(cache->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
-+ if (!delay) z = (dbl)_round(CYperIt(cache->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
-+ else z = (dbl)_round(CYperIt(cache->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
- fprintf(fp, "set label %ld '(%1.3g) ' at %f,%f right\n", l + 1, z, xl, z);
- fprintf(fp, "set arrow %ld from %f,%f to %f,%f nohead lt 0\n", l + 1, xl, z, xh, z);
- }
-@@ -986,16 +986,16 @@ void plotTLB(TLBinfo *TLB, lng **result, lng MHz, char *fn, FILE *fp, lng delay)
- fprintf(fp, "%s'<L1>' %ld)\n", s, TLB->mincachelines);
- fprintf(fp, "set y2tics");
- for (l = 0, s = " ("; l <= TLB->levels; l++, s = ", ") {
-- if (!delay) fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(TLB->latency1[l] - delay)), NSperIt(TLB->latency1[l] - delay));
-- else fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(TLB->latency2[l] - delay)), NSperIt(TLB->latency2[l] - delay));
-+ if (!delay) fprintf(fp, "%s'(%ld)' %f", s, _round(CYperIt(TLB->latency1[l] - delay)), NSperIt(TLB->latency1[l] - delay));
-+ else fprintf(fp, "%s'(%ld)' %f", s, _round(CYperIt(TLB->latency2[l] - delay)), NSperIt(TLB->latency2[l] - delay));
- }
- for (y = 1; y <= yh; y *= 10) {
- fprintf(fp, "%s'%1.3g' %ld", s, (dbl)(y * MHz) / 1000.0, y);
- }
- fprintf(fp, ")\n");
- for (l = 0; l <= TLB->levels; l++) {
-- if (!delay) z = (dbl)round(CYperIt(TLB->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
-- else z = (dbl)round(CYperIt(TLB->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
-+ if (!delay) z = (dbl)_round(CYperIt(TLB->latency1[l] - delay)) * 1000.0 / (dbl)MHz;
-+ else z = (dbl)_round(CYperIt(TLB->latency2[l] - delay)) * 1000.0 / (dbl)MHz;
- fprintf(fp, "set label %ld '(%1.3g) ' at %f,%f right\n", l + 1, z, xl, z);
- fprintf(fp, "set arrow %ld from %f,%f to %f,%f nohead lt 0\n", l + 1, xl, z, xh, z);
- }
-@@ -1023,9 +1023,9 @@ void printCPU(cacheInfo *cache, lng MHz, lng delay)
- FILE *fp = stdout;
-
- fprintf(fp, "CPU loop + L1 access: ");
-- fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[0]), round(CYperIt(cache->latency1[0])));
-+ fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[0]), _round(CYperIt(cache->latency1[0])));
- fprintf(fp, " ( delay: ");
-- fprintf(fp, " %6.2f ns = %3ld cy )\n", NSperIt(delay), round(CYperIt(delay)));
-+ fprintf(fp, " %6.2f ns = %3ld cy )\n", NSperIt(delay), _round(CYperIt(delay)));
- fprintf(fp, "\n");
- fflush(fp);
- }
-@@ -1047,8 +1047,8 @@ void printCache(cacheInfo *cache, lng MHz)
- fprintf(fp, " %3ld KB ", cache->size[l] / 1024);
- }
- fprintf(fp, " %3ld bytes ", cache->linesize[l + 1]);
-- fprintf(fp, " %6.2f ns = %3ld cy " , NSperIt(cache->latency2[l + 1] - cache->latency2[l]), round(CYperIt(cache->latency2[l + 1] - cache->latency2[l])));
-- fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[l + 1] - cache->latency1[l]), round(CYperIt(cache->latency1[l + 1] - cache->latency1[l])));
-+ fprintf(fp, " %6.2f ns = %3ld cy " , NSperIt(cache->latency2[l + 1] - cache->latency2[l]), _round(CYperIt(cache->latency2[l + 1] - cache->latency2[l])));
-+ fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[l + 1] - cache->latency1[l]), _round(CYperIt(cache->latency1[l + 1] - cache->latency1[l])));
- }
- fprintf(fp, "\n");
- fflush(fp);
-@@ -1075,9 +1075,9 @@ void printTLB(TLBinfo *TLB, lng MHz)
- } else {
- fprintf(fp, " %3ld KB ", TLB->pagesize[l + 1] / 1024);
- }
-- fprintf(fp, " %6.2f ns = %3ld cy ", NSperIt(TLB->latency2[l + 1] - TLB->latency2[l]), round(CYperIt(TLB->latency2[l + 1] - TLB->latency2[l])));
-+ fprintf(fp, " %6.2f ns = %3ld cy ", NSperIt(TLB->latency2[l + 1] - TLB->latency2[l]), _round(CYperIt(TLB->latency2[l + 1] - TLB->latency2[l])));
- /*
-- fprintf(fp, " %6.2f ns = %3ld cy" , NSperIt(TLB->latency1[l + 1] - TLB->latency1[l]), round(CYperIt(TLB->latency1[l + 1] - TLB->latency1[l])));
-+ fprintf(fp, " %6.2f ns = %3ld cy" , NSperIt(TLB->latency1[l + 1] - TLB->latency1[l]), _round(CYperIt(TLB->latency1[l + 1] - TLB->latency1[l])));
- */
- fprintf(fp, "\n");
- }
---
-1.7.2.3
-
diff --git a/patches/calibrator-20070821-1/series b/patches/calibrator-20070821-1/series
deleted file mode 100644
index 246504a4977a..000000000000
--- a/patches/calibrator-20070821-1/series
+++ /dev/null
@@ -1,3 +0,0 @@
-# generated by git-ptx-patches
-0001-rename-round-_round-to-avoid-name-conficts.patch
-# 682c31e68ff1d6e2427b342da2b7433e - git-ptx-patches magic
diff --git a/rules/calibrator.in b/rules/calibrator.in
deleted file mode 100644
index 03f87f5a3967..000000000000
--- a/rules/calibrator.in
+++ /dev/null
@@ -1,18 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=test_suites
-
-config CALIBRATOR
- tristate
- prompt "calibrator"
- select LIBC_M
- help
- The Calibrator is a Cache-Memory and TLB Calibration Tool
-
- See http://homepages.cwi.nl/~manegold/Calibrator/ for details.
-
- STAGING: remove in PTXdist 2026.03.0
- Unmaintained in PTXdist, upstream dead and fails to build with
- current toolchains.
-
-# vim: syntax=kconfig
diff --git a/rules/calibrator.make b/rules/calibrator.make
deleted file mode 100644
index 67b858588882..000000000000
--- a/rules/calibrator.make
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_CALIBRATOR) += calibrator
-
-#
-# Paths and names
-#
-CALIBRATOR_VERSION := 20070821-1
-CALIBRATOR_MD5 := b26765e360144e951f4924aed6e6d45c
-CALIBRATOR := calibrator-$(CALIBRATOR_VERSION)
-CALIBRATOR_SUFFIX := tar.bz2
-CALIBRATOR_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(CALIBRATOR).$(CALIBRATOR_SUFFIX)
-CALIBRATOR_SOURCE := $(SRCDIR)/$(CALIBRATOR).$(CALIBRATOR_SUFFIX)
-CALIBRATOR_DIR := $(BUILDDIR)/$(CALIBRATOR)
-CALIBRATOR_LICENSE := custom
-CALIBRATOR_LICENSE_FILES := file://calibrator.c;md5=8f7790f3cb58345fcb862c4ceab869ce;startline=6;endline=37
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-CALIBRATOR_MAKE_ENV := $(CROSS_ENV) LDLIBS=-lm
-CALIBRATOR_MAKE_OPT := calibrator
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/calibrator.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/calibrator.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, calibrator)
- @$(call install_fixup, calibrator,PRIORITY,optional)
- @$(call install_fixup, calibrator,SECTION,base)
- @$(call install_fixup, calibrator,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
- @$(call install_fixup, calibrator,DESCRIPTION,missing)
-
- @$(call install_copy, calibrator, 0, 0, 0755, $(CALIBRATOR_DIR)/calibrator, /usr/bin/calibrator)
-
- @$(call install_finish, calibrator)
-
- @$(call touch)
-
-# vim: syntax=make
--
2.53.0
next prev parent reply other threads:[~2026-05-04 12:14 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-04 12:12 [ptxdist] [PATCH 00/42] treewide: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 01/42] archivemount: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 02/42] argtable2: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 03/42] bing: " Thorsten Scherer
2026-05-04 12:12 ` Thorsten Scherer [this message]
2026-05-04 12:12 ` [ptxdist] [PATCH 05/42] daemonize: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 06/42] dhex: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 07/42] dialog: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 08/42] frodo: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 09/42] gnuplot: " Thorsten Scherer
2026-05-04 12:12 ` [ptxdist] [PATCH 10/42] latencytop: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 11/42] latrace: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 12/42] libcli: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 13/42] libgee: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 14/42] libiodbc: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 15/42] liblockfile: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 16/42] libmikmod: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 17/42] liburcu: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 18/42] links: " Thorsten Scherer
2026-05-04 12:13 ` [ptxdist] [PATCH 19/42] lsuio: " Thorsten Scherer
2026-05-04 12:52 ` [ptxdist] [PATCH 20/42] ltt-control: " Thorsten Scherer
2026-05-04 12:52 ` [ptxdist] [PATCH 21/42] lua-filesystem: " Thorsten Scherer
2026-05-04 12:52 ` [ptxdist] [PATCH 22/42] media-session: " Thorsten Scherer
2026-05-04 12:52 ` [ptxdist] [PATCH 23/42] mtd-oopslog: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 24/42] openct: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 25/42] pcmciautils: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 26/42] pslib: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 27/42] sched_switch: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 28/42] schedtool: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 29/42] sdl-gfx: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 30/42] sdl-ttf: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 31/42] sdl: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 32/42] sdl_image: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 33/42] sdl_mixer: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 34/42] setserial: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 35/42] smtpclient: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 36/42] ssmtp: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 37/42] supertux: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 38/42] utelnetd: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 39/42] wireshark: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 40/42] xerces: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 41/42] xterm: " Thorsten Scherer
2026-05-04 12:53 ` [ptxdist] [PATCH 42/42] zsync: " Thorsten Scherer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260504121331.57729-5-t.scherer@eckelmann.de \
--to=t.scherer@eckelmann.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox