Remove fbtest and microwindows recipe
We haven't included fbtest in our default images for a long time. Also, its lone dependency, microwindows, is broken due to an outdated SRC_URI that no longer exists. Remove both recipes Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar
parent
89d0ea1d42
commit
dd9843e31c
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (C) 2012, Digi International Inc.
|
||||
# Copyright (C) 2012-2025, Digi International Inc.
|
||||
#
|
||||
SUMMARY = "Debug applications packagegroup for DEY image"
|
||||
|
||||
|
|
@ -8,7 +8,6 @@ inherit packagegroup
|
|||
|
||||
RDEPENDS:${PN} = "\
|
||||
evtest \
|
||||
fbtest \
|
||||
i2c-tools \
|
||||
memwatch \
|
||||
packagegroup-core-tools-debug \
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
# Copyright (C) 2013-2022, Digi International Inc.
|
||||
|
||||
SUMMARY = "Digi's framebuffer test utility"
|
||||
SECTION = "base"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
|
||||
|
||||
DEPENDS = "microwindows"
|
||||
|
||||
SRC_URI = "file://fbtest.c"
|
||||
|
||||
S = "${WORKDIR}"
|
||||
|
||||
do_compile() {
|
||||
${CC} -O2 -Wall ${LDFLAGS} fbtest.c -o fbtest -lnano-X
|
||||
}
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 fbtest ${D}${bindir}
|
||||
}
|
||||
|
|
@ -1,187 +0,0 @@
|
|||
/*
|
||||
* fbtest.c
|
||||
*
|
||||
* Copyright (C) 2006-2009 by Digi International Inc.
|
||||
* All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 as published by
|
||||
* the Free Software Foundation.
|
||||
*
|
||||
* Description: draws some test patterns (R,G,B and white colorbars)
|
||||
*
|
||||
*/
|
||||
#include <fcntl.h>
|
||||
#include <linux/kd.h>
|
||||
#include <stdio.h> /* fprintf */
|
||||
#include <stdlib.h> /* EXIT_SUCCESS */
|
||||
#include <string.h> /* strcpy */
|
||||
#include <sys/ioctl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define MWINCLUDECOLORS
|
||||
#include <microwin/nano-X.h> /* GrOpen */
|
||||
|
||||
#ifdef S_SPLINT_S
|
||||
typedef /*@abstract@ */ MWCOLORVAL;
|
||||
typedef /*@abstract@ */ GR_EVENT;
|
||||
typedef /*@abstract@ */ GR_EVENT_EXPOSURE;
|
||||
typedef /*@abstract@ */ GR_WINDOW_ID;
|
||||
typedef /*@abstract@ */ GR_GC_ID;
|
||||
#endif
|
||||
|
||||
static void draw(const GR_EVENT * e);
|
||||
static void draw_colorbar(GR_WINDOW_ID wid, GR_GC_ID gc,
|
||||
int x, int y, int height, int dred, int dgreen, int dblue, char *label);
|
||||
|
||||
static GR_SCREEN_INFO l_xSIP;
|
||||
|
||||
static int dX = 0;
|
||||
static int dY = 0;
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
GR_EVENT event;
|
||||
GR_WINDOW_ID w;
|
||||
|
||||
printf("fbtest $Revision: 1.3 $ " __TIME__ "\n");
|
||||
|
||||
if ((argc != 1) && (argc != 3)) {
|
||||
fprintf(stderr, "Usage: %s [dX dY]\n", argv[0]);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
/* Disable framebuffer console cursor */
|
||||
int fd = open("/sys/class/graphics/fbcon/cursor_blink", O_WRONLY);
|
||||
if (fd >= 0) {
|
||||
write(fd, "0", 1);
|
||||
close(fd);
|
||||
}
|
||||
|
||||
if (3 == argc) {
|
||||
/* dX and dY is for testing the display to see that lines
|
||||
* vanish from display */
|
||||
dX = atoi(argv[1]);
|
||||
dY = atoi(argv[2]);
|
||||
}
|
||||
|
||||
if (GrOpen() < 0) {
|
||||
fprintf(stderr, "cannot open graphics\n");
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
GrGetScreenInfo(&l_xSIP);
|
||||
/* create window, center it in display */
|
||||
w = GrNewWindowEx(GR_WM_PROPS_NOAUTOMOVE,
|
||||
(unsigned char *)"nanox_mini", GR_ROOT_WINDOW_ID,
|
||||
dX, dY, l_xSIP.vs_width, l_xSIP.vs_height, GR_RGB(0, 0, 0));
|
||||
GrSelectEvents(w, GR_EVENT_MASK_EXPOSURE | GR_EVENT_MASK_CLOSE_REQ);
|
||||
GrMapWindow(w);
|
||||
|
||||
while (1) {
|
||||
GrGetNextEvent(&event);
|
||||
|
||||
switch (event.type) {
|
||||
case GR_EVENT_TYPE_EXPOSURE:
|
||||
/* now do the actual display work */
|
||||
draw(&event);
|
||||
break;
|
||||
case GR_EVENT_TYPE_CLOSE_REQ:
|
||||
GrClose();
|
||||
exit(EXIT_SUCCESS);
|
||||
}
|
||||
}
|
||||
/* @notreached@ */
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* @Function: draw
|
||||
* @Return: n/a
|
||||
* @Descr: displays colorbar
|
||||
***********************************************************************/
|
||||
static void draw(const GR_EVENT * e)
|
||||
{
|
||||
GR_WINDOW_ID wid = ((GR_EVENT_EXPOSURE *) e)->wid;
|
||||
GR_GC_ID gc = GrNewGC();
|
||||
char szResolution[64];
|
||||
int iY = 40;
|
||||
int idY = ((l_xSIP.vs_height - (2 * iY)) / 4) - 10;
|
||||
int i;
|
||||
|
||||
GrSetGCForeground(gc, WHITE);
|
||||
|
||||
/* border frame */
|
||||
GrRect(wid, gc, 0, 0, l_xSIP.vs_width, l_xSIP.vs_height);
|
||||
for (i = 0; i < l_xSIP.vs_height; i += 10) {
|
||||
int iLength;
|
||||
|
||||
if (!(i % 100))
|
||||
iLength = 10;
|
||||
else if (!(i % 50))
|
||||
iLength = 5;
|
||||
else
|
||||
iLength = 2;
|
||||
|
||||
GrLine(wid, gc, 0, i, iLength, i);
|
||||
GrLine(wid, gc, l_xSIP.vs_width, i, l_xSIP.vs_width - iLength - 1, i);
|
||||
}
|
||||
|
||||
for (i = 0; i < l_xSIP.vs_width; i += 10) {
|
||||
int iLength;
|
||||
|
||||
if (!(i % 100))
|
||||
iLength = 10;
|
||||
else if (!(i % 50))
|
||||
iLength = 5;
|
||||
else
|
||||
iLength = 2;
|
||||
|
||||
GrLine(wid, gc, i, 0, i, iLength);
|
||||
GrLine(wid, gc, i, l_xSIP.vs_height, i, l_xSIP.vs_height - iLength - 1);
|
||||
}
|
||||
|
||||
/* resolution */
|
||||
sprintf(szResolution, "%ix%i", l_xSIP.vs_width, l_xSIP.vs_height);
|
||||
GrText(wid, gc, l_xSIP.vs_width / 2 - 20, 20, szResolution, -1, GR_TFASCII | GR_TFTOP);
|
||||
|
||||
/* display colorbards */
|
||||
draw_colorbar(wid, gc, 10, iY, idY, 1, 0, 0, "red");
|
||||
iY += idY + 10;
|
||||
draw_colorbar(wid, gc, 10, iY, idY, 0, 1, 0, "green");
|
||||
iY += idY + 10;
|
||||
draw_colorbar(wid, gc, 10, iY, idY, 0, 0, 1, "blue");
|
||||
iY += idY + 10;
|
||||
draw_colorbar(wid, gc, 10, iY, idY, 1, 1, 1, "white");
|
||||
|
||||
GrDestroyGC(gc);
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
* @Function: draw_colorbar
|
||||
* @Return: n/a
|
||||
* @Descr: draws a colorbar with RGB modified by dred/dgreen/dblue
|
||||
***********************************************************************/
|
||||
static void draw_colorbar(GR_WINDOW_ID wid, GR_GC_ID gc,
|
||||
int x, int y, int height, int dred, int dgreen, int dblue, char *label)
|
||||
{
|
||||
int i;
|
||||
int red = 0;
|
||||
int green = 0;
|
||||
int blue = 0;
|
||||
|
||||
GrSetGCForeground(gc, WHITE);
|
||||
GrText(wid, gc, x, y, label, -1, GR_TFASCII | GR_TFTOP);
|
||||
|
||||
x += 40; /* leave room for text */
|
||||
|
||||
for (i = x; i < l_xSIP.vs_width - 20; i++) {
|
||||
GrSetGCForeground(gc, MWRGB(red, green, blue));
|
||||
GrLine(wid, gc, x, y, x, y + height);
|
||||
|
||||
red += dred;
|
||||
green += dgreen;
|
||||
blue += dblue;
|
||||
|
||||
x++;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,153 +0,0 @@
|
|||
From: Javier Viguera <javier.viguera@digi.com>
|
||||
Date: Thu, 27 Jun 2013 13:20:56 +0200
|
||||
Subject: [PATCH] defconfig
|
||||
|
||||
Upstream-Status: Inappropriate [DEY specific]
|
||||
|
||||
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
|
||||
---
|
||||
src/config | 40 ++++++++++++++++++++--------------------
|
||||
1 file changed, 20 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/src/config b/src/config
|
||||
index 36bfe2e..9d4e967 100644
|
||||
--- a/src/config
|
||||
+++ b/src/config
|
||||
@@ -37,7 +37,7 @@
|
||||
# note: ELKS can't build client/server nano-X, nor widget lib
|
||||
#
|
||||
####################################################################
|
||||
-ARCH = LINUX-NATIVE
|
||||
+ARCH = LINUX-ARM
|
||||
BIGENDIAN = N
|
||||
NATIVETOOLSPREFIX =
|
||||
ARMTOOLSPREFIX = arm-linux-
|
||||
@@ -62,9 +62,9 @@ GPROF = N
|
||||
# Libraries to build: microwin, nano-X, nanowidget, object frameworks
|
||||
#
|
||||
####################################################################
|
||||
-MICROWIN = Y
|
||||
+MICROWIN = N
|
||||
NANOX = Y
|
||||
-SHAREDLIBS = Y
|
||||
+SHAREDLIBS = N
|
||||
OBJFRAMEWORK = N
|
||||
|
||||
|
||||
@@ -73,15 +73,15 @@ OBJFRAMEWORK = N
|
||||
# Demos to build
|
||||
#
|
||||
####################################################################
|
||||
-MICROWINDEMO = Y
|
||||
-NANOXDEMO = Y
|
||||
+MICROWINDEMO = N
|
||||
+NANOXDEMO = N
|
||||
|
||||
####################################################################
|
||||
#
|
||||
# Applications to build
|
||||
#
|
||||
####################################################################
|
||||
-NANOWM = Y
|
||||
+NANOWM = N
|
||||
|
||||
####################################################################
|
||||
#
|
||||
@@ -108,12 +108,12 @@ SCREEN_PIXTYPE = MWPF_TRUECOLOR0888
|
||||
# or for speed or debugging. This affects the nano-X server only.
|
||||
#
|
||||
####################################################################
|
||||
-LINK_APP_INTO_SERVER = N
|
||||
+LINK_APP_INTO_SERVER = Y
|
||||
|
||||
####################################################################
|
||||
# Shared memory support for Nano-X client/server protocol speedup
|
||||
####################################################################
|
||||
-HAVE_SHAREDMEM_SUPPORT = N
|
||||
+HAVE_SHAREDMEM_SUPPORT = Y
|
||||
|
||||
####################################################################
|
||||
#
|
||||
@@ -134,7 +134,7 @@ HAVE_XPM_SUPPORT = Y
|
||||
####################################################################
|
||||
# JPEG support through libjpeg, see README.txt in contrib/jpeg
|
||||
####################################################################
|
||||
-HAVE_JPEG_SUPPORT = Y
|
||||
+HAVE_JPEG_SUPPORT = N
|
||||
INCJPEG = .
|
||||
LIBJPEG = /usr/lib/libjpeg.so
|
||||
|
||||
@@ -157,7 +157,7 @@ LIBTIFF = /usr/lib/libtiff.a
|
||||
# native .fnt loadable font support
|
||||
####################################################################
|
||||
HAVE_FNT_SUPPORT = Y
|
||||
-HAVE_FNTGZ_SUPPORT = Y
|
||||
+HAVE_FNTGZ_SUPPORT = N
|
||||
FNT_FONT_DIR = "fonts/bdf"
|
||||
|
||||
####################################################################
|
||||
@@ -170,7 +170,7 @@ LIBT1LIB = /usr/local/lib/libt1.a
|
||||
####################################################################
|
||||
# TrueType font support thru FreeType 1.x
|
||||
####################################################################
|
||||
-HAVE_FREETYPE_SUPPORT = Y
|
||||
+HAVE_FREETYPE_SUPPORT = N
|
||||
INCFTLIB = /usr/include/freetype1
|
||||
LIBFTLIB = /usr/lib/libttf.so
|
||||
FREETYPE_FONT_DIR = "fonts/truetype"
|
||||
@@ -188,8 +188,8 @@ LIBFT2LIB = /usr/lib/libfreetype.a
|
||||
# Selecting HAVE_PCFGZ_SUPPORT will allow you to directly read
|
||||
# .pcf.gz files, but it will add libz to the size of the server
|
||||
####################################################################
|
||||
-HAVE_PCF_SUPPORT = Y
|
||||
-HAVE_PCFGZ_SUPPORT = Y
|
||||
+HAVE_PCF_SUPPORT = N
|
||||
+HAVE_PCFGZ_SUPPORT = N
|
||||
PCF_FONT_DIR = "fonts/pcf"
|
||||
|
||||
####################################################################
|
||||
@@ -276,14 +276,14 @@ else
|
||||
# set FBREVERSE to reverse bit orders in 1,2,4 bpp
|
||||
# set FBVGA=N for all systems without VGA hardware (for MIPS must=N)
|
||||
FRAMEBUFFER = Y
|
||||
-FBVGA = Y
|
||||
-VTSWITCH = Y
|
||||
+FBVGA = N
|
||||
+VTSWITCH = N
|
||||
FBREVERSE = N
|
||||
|
||||
# set HAVETEXTMODE=Y for systems that can switch between text & graphics.
|
||||
# On a graphics-only embedded system, such as Osprey and Embedded
|
||||
# Planet boards, set HAVETEXTMODE=N
|
||||
-HAVETEXTMODE = Y
|
||||
+HAVETEXTMODE = N
|
||||
|
||||
# svgalib screen driver
|
||||
VGALIB = N
|
||||
@@ -311,10 +311,10 @@ HWVGA = N
|
||||
# YOPYMOUSE Yopy (/dev/yopy-ts)
|
||||
# HARRIERMOUSE NEC Harrier (/dev/tpanel)
|
||||
####################################################################
|
||||
-GPMMOUSE = Y
|
||||
+GPMMOUSE = N
|
||||
SERMOUSE = N
|
||||
SUNMOUSE = N
|
||||
-NOMOUSE = N
|
||||
+NOMOUSE = Y
|
||||
IPAQMOUSE = N
|
||||
ZAURUSMOUSE = N
|
||||
TUXMOUSE = N
|
||||
@@ -330,11 +330,11 @@ LIRCMOUSE = N
|
||||
|
||||
# keyboard or null kbd driver
|
||||
TTYKBD = N
|
||||
-SCANKBD = Y
|
||||
+SCANKBD = N
|
||||
PIPEKBD = N
|
||||
IPAQKBD = N
|
||||
LIRCKBD = N
|
||||
-NOKBD = N
|
||||
+NOKBD = Y
|
||||
|
||||
endif
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
|
||||
Date: Fri, 2 Aug 2019 14:28:35 +0200
|
||||
Subject: [PATCH] Arch.rules: remove 'mstructure-size-boundary' flag
|
||||
|
||||
This flag is not supported in ARM64 toolchains.
|
||||
|
||||
Upstream-Status: Inappropriate [DEY specific]
|
||||
|
||||
Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
|
||||
---
|
||||
Arch.rules | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Arch.rules b/Arch.rules
|
||||
index b01225d0f514..2fd57bf635b9 100644
|
||||
--- a/Arch.rules
|
||||
+++ b/Arch.rules
|
||||
@@ -46,7 +46,7 @@ COMPILER = gcc
|
||||
CXX_COMPILER = g++
|
||||
TOOLSPREFIX = $(ARMTOOLSPREFIX)
|
||||
DEFINES += -DLINUX=1 -DUNIX=1
|
||||
-CFLAGS += $(GCC_WARNINGS) $(OPTFLAGS) -mstructure-size-boundary=8
|
||||
+CFLAGS += $(GCC_WARNINGS) $(OPTFLAGS)
|
||||
LDFLAGS +=
|
||||
endif
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
# Copyright (C) 2013-2022, Digi International Inc.
|
||||
|
||||
SUMMARY = "Microwindows Graphical Engine"
|
||||
SECTION = "x11/wm"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
# License path relative to S = "${WORKDIR}/${PN}-${PV}/src"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=537b9004889eb701c48fc1fe78d9c30e"
|
||||
|
||||
SRC_URI = " \
|
||||
ftp://ftp.microwindows.org/pub/microwindows/microwindows-src-${PV}.tar.gz \
|
||||
file://0001-defconfig.patch;striplevel=2 \
|
||||
"
|
||||
|
||||
SRC_URI:append:aarch64 = " file://0002-Arch.rules-remove-mstructure-size-boundary-8-flag.patch; "
|
||||
|
||||
SRC_URI[md5sum] = "901e912cf3975f6460a9bb4325557645"
|
||||
SRC_URI[sha256sum] = "c0a8473842fc757ff4c225f82b83d98bba5da0dca0cf843cfc7792064a393435"
|
||||
|
||||
S = "${WORKDIR}/${PN}-${PV}/src"
|
||||
|
||||
EXTRA_OEMAKE = " \
|
||||
CC='${CC}' \
|
||||
CXX='${CXX}' \
|
||||
LD='${LD}' \
|
||||
ARMTOOLSPREFIX=${TARGET_PREFIX} \
|
||||
INSTALL_OWNER1= \
|
||||
INSTALL_OWNER2= \
|
||||
INSTALL_PREFIX=${D}${prefix} \
|
||||
"
|
||||
|
||||
do_install() {
|
||||
oe_runmake install
|
||||
}
|
||||
|
||||
RDEPENDS:${PN}-dev = ""
|
||||
Loading…
Reference in New Issue