mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] hackbench: remove obsolete package
@ 2015-03-23  7:52 Robert Schwebel
  2015-03-23  7:59 ` Robert Schwebel
  0 siblings, 1 reply; 3+ messages in thread
From: Robert Schwebel @ 2015-03-23  7:52 UTC (permalink / raw)
  To: ptxdist; +Cc: Robert Schwebel

The old hackbench code has long been obsoleted by the version in
rt-tests. This variant doesn't even have license information.

Remove the package.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
 rules/hackbench.in          | 14 ---------
 rules/hackbench.make        | 75 ---------------------------------------------
 scripts/migrate/migrate_ptx | 10 ++++++
 3 files changed, 10 insertions(+), 89 deletions(-)
 delete mode 100644 rules/hackbench.in
 delete mode 100644 rules/hackbench.make

diff --git a/rules/hackbench.in b/rules/hackbench.in
deleted file mode 100644
index f3f0518..0000000
--- a/rules/hackbench.in
+++ /dev/null
@@ -1,14 +0,0 @@
-## SECTION=test_suites
-config HACKBENCH
-	tristate
-	prompt "hackbench"
-	help
-	  The hackbench test is a benchmark for measuring the performance,
-	  overhead, and scalability of the Linux scheduler. Created by Rusty
-	  Russell, it uses client and server processes grouped to send and
-	  receive data in order to simulate the connections established for a
-	  chat room. Each client sends a message to each server in the group.
-
-	  See http://developer.osdl.org/craiger/hackbench/ for details.
-
-# vim: syntax=kconfig
diff --git a/rules/hackbench.make b/rules/hackbench.make
deleted file mode 100644
index 0dab420..0000000
--- a/rules/hackbench.make
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de>
-#               2009 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_HACKBENCH) += hackbench
-
-#
-# Paths and names
-#
-HACKBENCH_VERSION	:= 20070821-1
-HACKBENCH_MD5		:= b1c0bd167c4c28bbd6177a6316e20541
-HACKBENCH		:= hackbench-$(HACKBENCH_VERSION)
-HACKBENCH_SUFFIX	:= tar.bz2
-HACKBENCH_URL		:= http://www.pengutronix.de/software/ptxdist/temporary-src/$(HACKBENCH).$(HACKBENCH_SUFFIX)
-HACKBENCH_SOURCE	:= $(SRCDIR)/$(HACKBENCH).$(HACKBENCH_SUFFIX)
-HACKBENCH_DIR		:= $(BUILDDIR)/$(HACKBENCH)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-HACKBENCH_PATH	:= PATH=$(CROSS_PATH)
-HACKBENCH_ENV 	:= $(CROSS_ENV)
-
-$(STATEDIR)/hackbench.prepare:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/hackbench.compile:
-	@$(call targetinfo)
-	cd $(HACKBENCH_DIR) && $(HACKBENCH_PATH) CC=$(CROSS_CC) $(MAKE) $(PARALLELMFLAGS) hackbench
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/hackbench.install:
-	@$(call targetinfo)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/hackbench.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, hackbench)
-	@$(call install_fixup, hackbench,PRIORITY,optional)
-	@$(call install_fixup, hackbench,SECTION,base)
-	@$(call install_fixup, hackbench,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
-	@$(call install_fixup, hackbench,DESCRIPTION,missing)
-
-	@$(call install_copy, hackbench, 0, 0, 0755, $(HACKBENCH_DIR)/hackbench, /usr/bin/hackbench)
-
-	@$(call install_finish, hackbench)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index 347ff23..536ae86 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -228,6 +228,7 @@ s/^PTXCONF_LIBUSB_DISABLE_LOG=y$/# PTXCONF_LIBUSB_LOG is not set/
 # reason : userspace tool replacement
 #
 s/^\(\(# \)\?PTXCONF_\)LOWPAN_TOOLS/\1WPAN_TOOLS/
+
 #
 # from   : ptxdist-2015.02.0
 # to     : ptxdist-2015.03.0
@@ -238,3 +239,12 @@ s/^\(\(# \)\?PTXCONF_\)LOWPAN_TOOLS/\1WPAN_TOOLS/
 /^.*GNUPG.*GNUPG.*/p
 /^.*GNUPG.*GNUPG.*/d
 s/^\(\(# \)\?PTXCONF_\)GNUPG\([^\n]*\n\)\(.*\)$/\1GNUPG\3\1GNUPG_GPG\3\4/
+
+#
+# from   : ptxdist-2015.02.0
+# to     : ptxdist-2015.03.0
+# symbol : HACKBENCH -> RT_TESTS_HACKBENCH
+# reason : old tool obsolete, new version is from rt-tests
+#
+s/^\(\(# \)PTXCONF_\)HACKBENCH/\1RT_TESTS_HACKBENCH/
+s/^PTXCONF_HACKBENCH=\([ym]\)/PTXCONF_RT_TESTS_HACKBENCH=y\nPTXCONF_RT_TESTS=\1/
-- 
2.1.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [ptxdist] [PATCH] hackbench: remove obsolete package
  2015-03-23  7:52 [ptxdist] [PATCH] hackbench: remove obsolete package Robert Schwebel
@ 2015-03-23  7:59 ` Robert Schwebel
  2015-03-26  9:04   ` Michael Olbrich
  0 siblings, 1 reply; 3+ messages in thread
From: Robert Schwebel @ 2015-03-23  7:59 UTC (permalink / raw)
  To: ptxdist

Michael,

On Mon, Mar 23, 2015 at 08:52:00AM +0100, Robert Schwebel wrote:
> +#
> +# from   : ptxdist-2015.02.0
> +# to     : ptxdist-2015.03.0
> +# symbol : HACKBENCH -> RT_TESTS_HACKBENCH
> +# reason : old tool obsolete, new version is from rt-tests
> +#
> +s/^\(\(# \)PTXCONF_\)HACKBENCH/\1RT_TESTS_HACKBENCH/
> +s/^PTXCONF_HACKBENCH=\([ym]\)/PTXCONF_RT_TESTS_HACKBENCH=y\nPTXCONF_RT_TESTS=\1/

I tried the trick you suggested, but I'm still not entirely happy:

- I get a warning during migration:
  .config:2062:warning: override: reassigning to symbol RT_TESTS_HACKBENCH

- There are still cases of RT_TESTS already being set to either y or m
  where the migration helper does the wrong thing.

Better ideas, anyone?

rsc
-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [ptxdist] [PATCH] hackbench: remove obsolete package
  2015-03-23  7:59 ` Robert Schwebel
@ 2015-03-26  9:04   ` Michael Olbrich
  0 siblings, 0 replies; 3+ messages in thread
From: Michael Olbrich @ 2015-03-26  9:04 UTC (permalink / raw)
  To: ptxdist

On Mon, Mar 23, 2015 at 08:59:42AM +0100, Robert Schwebel wrote:
> Michael,
> 
> On Mon, Mar 23, 2015 at 08:52:00AM +0100, Robert Schwebel wrote:
> > +#
> > +# from   : ptxdist-2015.02.0
> > +# to     : ptxdist-2015.03.0
> > +# symbol : HACKBENCH -> RT_TESTS_HACKBENCH
> > +# reason : old tool obsolete, new version is from rt-tests
> > +#
> > +s/^\(\(# \)PTXCONF_\)HACKBENCH/\1RT_TESTS_HACKBENCH/
> > +s/^PTXCONF_HACKBENCH=\([ym]\)/PTXCONF_RT_TESTS_HACKBENCH=y\nPTXCONF_RT_TESTS=\1/
> 
> I tried the trick you suggested, but I'm still not entirely happy:
> 
> - I get a warning during migration:
>   .config:2062:warning: override: reassigning to symbol RT_TESTS_HACKBENCH

It' only happens once during migrate, and that's ok.

> - There are still cases of RT_TESTS already being set to either y or m
>   where the migration helper does the wrong thing.
> 
> Better ideas, anyone?

I've simplified it a bit while applying, broke it and fixed it again.
It works as I would expect it:

RT_TESTS will remain as is, when it's already enabled. I don't think
anything else makes sense.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-03-26  9:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-23  7:52 [ptxdist] [PATCH] hackbench: remove obsolete package Robert Schwebel
2015-03-23  7:59 ` Robert Schwebel
2015-03-26  9:04   ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox