This was an experimental state pulled out of CVS back then. It doesn't work currently (maybe it never has?), e.g. fbset does not recognize its own commandline arguments. The code has also been deleted from CVS meanwhile. So, remove this package and use the just added fbset.
Signed-off-by: Wolfram Sang <[email protected]> Acked-by: Sascha Hauer <[email protected]> --- .../0001-fix-compiler-warnings.patch | 82 -------------------- ...0002-fbcmap-remove-obsolete-gnu-extension.patch | 58 -------------- .../0003-fbcmap-fix-Opt_command-handling.patch | 42 ---------- ...g-make-buildsystem-more-cross-compile-fri.patch | 38 --------- ...-Makefile-create-non-existing-directories.patch | 31 -------- .../0006-Makefile-install-fbconvert.patch | 28 ------- patches/fbutils-20041102-1/series | 6 -- rules/fbutils.in | 57 -------------- rules/fbutils.make | 73 ----------------- 9 files changed, 0 insertions(+), 415 deletions(-) delete mode 100644 patches/fbutils-20041102-1/0001-fix-compiler-warnings.patch delete mode 100644 patches/fbutils-20041102-1/0002-fbcmap-remove-obsolete-gnu-extension.patch delete mode 100644 patches/fbutils-20041102-1/0003-fbcmap-fix-Opt_command-handling.patch delete mode 100644 patches/fbutils-20041102-1/0004-Rules.config-make-buildsystem-more-cross-compile-fri.patch delete mode 100644 patches/fbutils-20041102-1/0005-Makefile-create-non-existing-directories.patch delete mode 100644 patches/fbutils-20041102-1/0006-Makefile-install-fbconvert.patch delete mode 100644 patches/fbutils-20041102-1/series delete mode 100644 rules/fbutils.in delete mode 100644 rules/fbutils.make diff --git a/patches/fbutils-20041102-1/0001-fix-compiler-warnings.patch b/patches/fbutils-20041102-1/0001-fix-compiler-warnings.patch deleted file mode 100644 index 0dcefb8..0000000 --- a/patches/fbutils-20041102-1/0001-fix-compiler-warnings.patch +++ /dev/null @@ -1,82 +0,0 @@ -From b092536f0611cfa12c86d85183ef9aee178898e6 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde <[email protected]> -Date: Fri, 26 Feb 2010 12:35:01 +0100 -Subject: [PATCH 1/6] fix compiler warnings - -Signed-off-by: Marc Kleine-Budde <[email protected]> ---- - include/util.h | 2 +- - lib/framebuffer.C | 4 ++-- - lib/list.C | 2 +- - lib/util.C | 3 ++- - 4 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/include/util.h b/include/util.h -index de490b8..484ff2e 100644 ---- a/include/util.h -+++ b/include/util.h -@@ -20,7 +20,7 @@ extern const char *ProgramName; - - extern void Die(const char *fmt,...) __attribute__((noreturn)); - extern void Warn(const char *fmt,...); --extern int GetNextOption(int &argc, const char **&argv, -+extern int GetNextOption(int argc, char **argv, - const struct option options[], - const u_int num_options); - -diff --git a/lib/framebuffer.C b/lib/framebuffer.C -index 923809b..b37c635 100644 ---- a/lib/framebuffer.C -+++ b/lib/framebuffer.C -@@ -164,7 +164,7 @@ void ColorMap::Invert(void) const - } - } - --void ColorMap::Print(const char *indent = "") const -+void ColorMap::Print(const char *indent) const - { - printf("start = %d\n", start); - printf("len = %d\n", len); -@@ -191,7 +191,7 @@ void Con2FBMap::Set(const FrameBuffer &fb) const - Die("ioctl FBIOPUT_CON2FBMAP: %s\n", strerror(errno)); - } - --void Con2FBMap::Print(const char *indent = "") const -+void Con2FBMap::Print(const char *indent) const - { - printf("%sconsole %d -> fb %d\n", indent, console, framebuffer); - } -diff --git a/lib/list.C b/lib/list.C -index e88e5cd..836d33b 100644 ---- a/lib/list.C -+++ b/lib/list.C -@@ -1,4 +1,4 @@ -- -+#include <string.h> - #include "list.h" - #include "util.h" - -diff --git a/lib/util.C b/lib/util.C -index 292380c..7bc4c0a 100644 ---- a/lib/util.C -+++ b/lib/util.C -@@ -6,6 +6,7 @@ - #include <string.h> - #include <unistd.h> - #include <sys/ioctl.h> -+#include <stdlib.h> - - #include "util.h" - -@@ -43,7 +44,7 @@ void Warn(const char *fmt,...) - - // Command Line Parameter Processing - --int GetNextOption(int &argc, const char **&argv, -+int GetNextOption(int argc, char **argv, - const struct option options[], const u_int num_options) - { - static bool first = true; --- -1.7.0 - diff --git a/patches/fbutils-20041102-1/0002-fbcmap-remove-obsolete-gnu-extension.patch b/patches/fbutils-20041102-1/0002-fbcmap-remove-obsolete-gnu-extension.patch deleted file mode 100644 index 01306b3..0000000 --- a/patches/fbutils-20041102-1/0002-fbcmap-remove-obsolete-gnu-extension.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 4d77caf0107881b1a73a8ca12531d8523f72ed17 Mon Sep 17 00:00:00 2001 -From: Robert Schwebel <[email protected]> -Date: Fri, 26 Feb 2010 12:29:56 +0100 -Subject: [PATCH 2/6] [fbcmap] remove obsolete gnu extension - -make[2]: Entering directory `.../fbutils-20041102-1/fbcmap' -arm-v4t-linux-gnueabi-g++ -Wall -I../include -O2 -M -E *.C > .depend -arm-v4t-linux-gnueabi-g++ -Wall -I../include -O2 -c fbcmap.C -o fbcmap.o -fbcmap.C: In function 'int main(int, char**)': -fbcmap.C:118: error: expected primary-expression before '?' token - -The GNU extension ">?" for MAX isn't supported any more - -Signed-off-by: Robert Schwebel <[email protected]> -Signed-off-by: Marc Kleine-Budde <[email protected]> ---- - fbcmap/fbcmap.C | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/fbcmap/fbcmap.C b/fbcmap/fbcmap.C -index c61f19a..30075c3 100644 ---- a/fbcmap/fbcmap.C -+++ b/fbcmap/fbcmap.C -@@ -13,6 +13,12 @@ - #include "framebuffer.h" - #include "util.h" - -+#ifndef MAX -+#define MAX(a, b) ((a > b) ? a : b) -+#endif -+#ifndef MIN -+#define MIN(a, b) ((a < b) ? a : b) -+#endif - - bool Opt_version = false; - bool Opt_verbose = false; -@@ -113,8 +119,7 @@ int main(int argc, char *argv[]) - break; - - case FB_VISUAL_DIRECTCOLOR: -- numcolorcells = 1<<(var.red.length >? var.green.length >? -- var.blue.length); -+ numcolorcells = 1<<(MAX(MAX(var.red.length,var.green.length),var.blue.length)); - break; - - case FB_VISUAL_PSEUDOCOLOR: -@@ -143,7 +148,7 @@ int main(int argc, char *argv[]) - } - cmap.Set(fb); - } else if (!strcmp(Opt_command, "vga")) { -- u_int len = cmap.len <? 16; -+ u_int len = MIN(cmap.len,16); - memcpy(cmap.red, VGA_Red, len*sizeof(*cmap.red)); - memcpy(cmap.green, VGA_Green, len*sizeof(*cmap.green)); - memcpy(cmap.blue, VGA_Blue, len*sizeof(*cmap.blue)); --- -1.7.0 - diff --git a/patches/fbutils-20041102-1/0003-fbcmap-fix-Opt_command-handling.patch b/patches/fbutils-20041102-1/0003-fbcmap-fix-Opt_command-handling.patch deleted file mode 100644 index 0b9781a..0000000 --- a/patches/fbutils-20041102-1/0003-fbcmap-fix-Opt_command-handling.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9188ffeab409fb4626ac9e70b40c2e07e9fa42d6 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde <[email protected]> -Date: Fri, 26 Feb 2010 12:36:28 +0100 -Subject: [PATCH 3/6] [fbcmap] fix Opt_command handling - -Signed-off-by: Marc Kleine-Budde <[email protected]> ---- - fbcmap/fbcmap.C | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/fbcmap/fbcmap.C b/fbcmap/fbcmap.C -index 30075c3..38965ad 100644 ---- a/fbcmap/fbcmap.C -+++ b/fbcmap/fbcmap.C -@@ -36,6 +36,7 @@ const struct option Options[] = { - { 0, 0, "debug", &Opt_debug, 0 }, - { 0, 'f', "frame-buffer", &Opt_fb, 1 }, - { 0, 'l', "length", &Opt_length, 1 }, -+ { 0, 'c', "command", &Opt_command, 1 }, - }; - - u_int DebugMask = 0; -@@ -67,11 +68,12 @@ static void Usage(void) - " -v, --verbose : Verbose mode\n" - " -l, --length len : Colormap length\n" - " -f, --frame-buffer dev : Framebuffer device to use\n" -- " -d, --dump : Dump the colormap (default operation)\n" -- " -r, --ramp : Set the colormap to a ramp\n" -- " -c, --vga : Set the colormap to the VGA console " -+ " -c <CMD> : execute command, where command is one of\n" -+ " vga : Set the colormap to the VGA console " - "palette\n" -- " -i, --inverse : Invert the current colormap\n" -+ " inverse : Invert the current colormap\n" -+ " ramp : Set the colormap to a ramp\n" -+ " dump : dump current palette (default)\n" - "\n", ProgramName); - } - --- -1.7.0 - diff --git a/patches/fbutils-20041102-1/0004-Rules.config-make-buildsystem-more-cross-compile-fri.patch b/patches/fbutils-20041102-1/0004-Rules.config-make-buildsystem-more-cross-compile-fri.patch deleted file mode 100644 index 9422c19..0000000 --- a/patches/fbutils-20041102-1/0004-Rules.config-make-buildsystem-more-cross-compile-fri.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0132b2aa2d4047729b01224a0eed8ae6c8ed913d Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde <[email protected]> -Date: Fri, 26 Feb 2010 12:33:14 +0100 -Subject: [PATCH 4/6] [Rules.config] make buildsystem more cross compile friendly - -- obey CXX and AR set in env -- use CPPFLAGS and LDFLAGS - -Signed-off-by: Marc Kleine-Budde <[email protected]> ---- - Rules.config | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Rules.config b/Rules.config -index 8d987a7..01fcc5c 100644 ---- a/Rules.config -+++ b/Rules.config -@@ -1,13 +1,13 @@ - --CXX = g++ -+CXX ?= g++ - OPTFLAGS = -O2 - DEBUGFLAGS = --CFLAGS = -Wall -I../include $(OPTFLAGS) $(DEBUGFLAGS) --LFLAGS = -L../lib -lfbutil -+CFLAGS += -Wall -I../include $(OPTFLAGS) $(DEBUGFLAGS) $(CPPFLAGS) -+LFLAGS = -L../lib -lfbutil $(LDFLAGS) - BISON = bison -d - FLEX = flex - INSTALL = install - RM = rm -f - LN = ln -sf --AR = ar -+AR ?= ar - --- -1.7.0 - diff --git a/patches/fbutils-20041102-1/0005-Makefile-create-non-existing-directories.patch b/patches/fbutils-20041102-1/0005-Makefile-create-non-existing-directories.patch deleted file mode 100644 index 88dc13d..0000000 --- a/patches/fbutils-20041102-1/0005-Makefile-create-non-existing-directories.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3b37ba348fd5537ca456fc4175cb22eebcc143c1 Mon Sep 17 00:00:00 2001 -From: Sascha Hauer <[email protected]> -Date: Fri, 26 Feb 2010 12:29:56 +0100 -Subject: [PATCH 5/6] [Makefile] create non-existing directories - -Use install -D, in case the directory does not exist yet; this may -happen when building with some cross build system which builds up the -root filesystem from scratch. - -Signed-off-by: Robert Schwebel <[email protected]> -Signed-off-by: Marc Kleine-Budde <[email protected]> ---- - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index b59d492..155a68d 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,7 +17,7 @@ install: - $(INSTALL) fbset/fbset $(DESTDIR)/usr/sbin/fbset - $(INSTALL) fbcmap/fbcmap $(DESTDIR)/usr/sbin/fbcmap - $(INSTALL) con2fbmap/con2fbmap $(DESTDIR)/usr/sbin/con2fbmap -- $(INSTALL) -p etc/modes $(DESTDIR)/etc/fb/modes -+ $(INSTALL) -D -p etc/modes $(DESTDIR)/etc/fb/modes - - include Rules.build - --- -1.7.0 - diff --git a/patches/fbutils-20041102-1/0006-Makefile-install-fbconvert.patch b/patches/fbutils-20041102-1/0006-Makefile-install-fbconvert.patch deleted file mode 100644 index 518606f..0000000 --- a/patches/fbutils-20041102-1/0006-Makefile-install-fbconvert.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c63194e3407aa345fa597420da60379d93e9ad7c Mon Sep 17 00:00:00 2001 -From: Michael Olbrich <[email protected]> -Date: Fri, 26 Feb 2010 12:29:56 +0100 -Subject: [PATCH 6/6] [Makefile] install fbconvert - -install fbconvert during 'make install' - -Signed-off-by: Michael Olbrich <[email protected]> -Signed-off-by: Marc Kleine-Budde <[email protected]> ---- - Makefile | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/Makefile b/Makefile -index 155a68d..45fef63 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,6 +17,7 @@ install: - $(INSTALL) fbset/fbset $(DESTDIR)/usr/sbin/fbset - $(INSTALL) fbcmap/fbcmap $(DESTDIR)/usr/sbin/fbcmap - $(INSTALL) con2fbmap/con2fbmap $(DESTDIR)/usr/sbin/con2fbmap -+ $(INSTALL) fbconvert/fbconvert $(DESTDIR)/usr/sbin/fbconvert - $(INSTALL) -D -p etc/modes $(DESTDIR)/etc/fb/modes - - include Rules.build --- -1.7.0 - diff --git a/patches/fbutils-20041102-1/series b/patches/fbutils-20041102-1/series deleted file mode 100644 index a3fe536..0000000 --- a/patches/fbutils-20041102-1/series +++ /dev/null @@ -1,6 +0,0 @@ -0001-fix-compiler-warnings.patch -0002-fbcmap-remove-obsolete-gnu-extension.patch -0003-fbcmap-fix-Opt_command-handling.patch -0004-Rules.config-make-buildsystem-more-cross-compile-fri.patch -0005-Makefile-create-non-existing-directories.patch -0006-Makefile-install-fbconvert.patch diff --git a/rules/fbutils.in b/rules/fbutils.in deleted file mode 100644 index 9db5f39..0000000 --- a/rules/fbutils.in +++ /dev/null @@ -1,57 +0,0 @@ -## SECTION=multimedia_framebuffer - -menuconfig FBUTILS - tristate - select LIBC_M - select GCCLIBS_GCC_S - select GCCLIBS_CXX - prompt "fbutils " - help - Utilities and support for framebuffer devices - -if FBUTILS - -comment "Target Options" - -config FBUTILS_FBSET - bool - default y - prompt "install fbset util on target" - depends on !BUSYBOX_FBSET || ALLYES - help - fbset is a system utility to show or change the settings - of the frame buffer device. The frame buffer device pro- - vides a simple and unique interface to access different - kinds of graphic displays. - -comment "BusyBox' fbset is selected!" - depends on BUSYBOX_FBSET - -config FBUTILS_FBCMAP - bool - default y - prompt "install fbcmap util on target" - help - Some color frame buffers support the FBIOPUTCMAP and - FBIOGETCMAP ioctl() requests, which provide access - to the colormap. - -config FBUTILS_CON2FBMAP - bool - default y - prompt "install con2fbmap util on target" - help - con2fbmap is a system utility to show or change the mapping - of the consoles to the frame buffer device. The frame buffer - device provides a simple and unique interface to access - different kinds of graphic displays. - -config FBUTILS_FBCONVERT - bool - default y - prompt "install fbconvert util on target" - help - Converts from the old fb.modes format to the new one - (/etc/fb.modes contains video mode descriptions.) - -endif diff --git a/rules/fbutils.make b/rules/fbutils.make deleted file mode 100644 index e19a659..0000000 --- a/rules/fbutils.make +++ /dev/null @@ -1,73 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2004 by Sascha Hauer -# -# 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_FBUTILS) += fbutils - -# -# Paths and names -# -FBUTILS_VERSION := 20041102-1 -FBUTILS_MD5 := 5a1e431eee0673a07a4f72c751d7a8eb -FBUTILS := fbutils-$(FBUTILS_VERSION) -FBUTILS_SUFFIX := tar.gz -FBUTILS_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(FBUTILS).$(FBUTILS_SUFFIX) -FBUTILS_SOURCE := $(SRCDIR)/$(FBUTILS).$(FBUTILS_SUFFIX) -FBUTILS_DIR := $(BUILDDIR)/$(FBUTILS) - - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(FBUTILS_SOURCE): - @$(call targetinfo) - @$(call get, FBUTILS) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -FBUTILS_PATH := PATH=$(CROSS_PATH) -FBUTILS_MAKE_ENV := $(CROSS_ENV) -FBUTILS_MAKE_PAR := NO - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/fbutils.targetinstall: - @$(call targetinfo) - - @$(call install_init, fbutils) - @$(call install_fixup, fbutils,PRIORITY,optional) - @$(call install_fixup, fbutils,SECTION,base) - @$(call install_fixup, fbutils,AUTHOR,"Robert Schwebel <[email protected]>") - @$(call install_fixup, fbutils,DESCRIPTION,missing) - -ifdef PTXCONF_FBUTILS_FBSET - @$(call install_copy, fbutils, 0, 0, 0755, -, /usr/sbin/fbset) -endif -ifdef PTXCONF_FBUTILS_FBCMAP - @$(call install_copy, fbutils, 0, 0, 0755, -, /usr/sbin/fbcmap) -endif -ifdef PTXCONF_FBUTILS_FBCONVERT - @$(call install_copy, fbutils, 0, 0, 0755, -, /usr/sbin/fbconvert) -endif -ifdef PTXCONF_FBUTILS_CON2FBMAP - @$(call install_copy, fbutils, 0, 0, 0755, -, /usr/sbin/con2fbmap) -endif - @$(call install_finish, fbutils) - - @$(call touch) - -# vim: syntax=make -- 1.7.2.5 -- ptxdist mailing list [email protected]
