summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-11-20 14:44:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-25 17:57:22 +0000
commit596cfc5b0aac2c73e2ad911a719404c665700417 (patch)
treefb2251f99505c9e858f2f572d834d13e6a3d75dc
parent939be4d775a8ea6bbce8fc26c624036dde53d428 (diff)
downloadpoky-596cfc5b0aac2c73e2ad911a719404c665700417.tar.gz
console-tools: remove the recipe
The last release of this was in 2002(!), kbd is the modern, supported alternative. (From OE-Core rev: 320319f24dd1be300bc89c52b97d1703eab83029) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch51
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch57
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch44
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/Makevars41
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch17
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch12
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch29
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch56
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch75
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m424
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch19
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch22
-rw-r--r--meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch49
-rw-r--r--meta/recipes-core/console-tools/console-tools_0.3.2.bb48
15 files changed, 0 insertions, 545 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index d85e5b697f..a289008b8c 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -103,7 +103,6 @@ RECIPE_MAINTAINER_pn-cogl-1.0 = "Ross Burton <ross.burton@intel.com>"
103RECIPE_MAINTAINER_pn-connman = "Changhyeok Bae <changhyeok.bae@gmail.com>" 103RECIPE_MAINTAINER_pn-connman = "Changhyeok Bae <changhyeok.bae@gmail.com>"
104RECIPE_MAINTAINER_pn-connman-conf = "Ross Burton <ross.burton@intel.com>" 104RECIPE_MAINTAINER_pn-connman-conf = "Ross Burton <ross.burton@intel.com>"
105RECIPE_MAINTAINER_pn-connman-gnome = "Ross Burton <ross.burton@intel.com>" 105RECIPE_MAINTAINER_pn-connman-gnome = "Ross Burton <ross.burton@intel.com>"
106RECIPE_MAINTAINER_pn-console-tools = "Chen Qi <Qi.Chen@windriver.com>"
107RECIPE_MAINTAINER_pn-consolekit = "Chen Qi <Qi.Chen@windriver.com>" 106RECIPE_MAINTAINER_pn-consolekit = "Chen Qi <Qi.Chen@windriver.com>"
108RECIPE_MAINTAINER_pn-core-image-base = "Richard Purdie <richard.purdie@linuxfoundation.org>" 107RECIPE_MAINTAINER_pn-core-image-base = "Richard Purdie <richard.purdie@linuxfoundation.org>"
109RECIPE_MAINTAINER_pn-core-image-minimal = "Richard Purdie <richard.purdie@linuxfoundation.org>" 108RECIPE_MAINTAINER_pn-core-image-minimal = "Richard Purdie <richard.purdie@linuxfoundation.org>"
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch
deleted file mode 100644
index ace4bf0a76..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Cover-the-else-with-__GLIBC__.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From b6a59b05f1fa514c6b387c9544bd63b1bfcf2eed Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 Jan 2016 05:38:29 +0000
4Subject: [PATCH] Cover the else with __GLIBC__
5
6Fixes build errors on musl/x86
7
8| In file included from
9/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/asm/termios.h:1:0,
10| from
11/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/linux/termios.h:5,
12| from
13/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/console-tools/0.3.2-r8/console-tools-0.3.2/vttools/resizecons.c:86:
14|
15/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/asm-generic/termios.h:14:8:
16error: redefinition of 'struct winsize'
17| struct winsize {
18| ^
19| In file included from
20/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/sys/ioctl.h:7:0,
21| from
22/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/work/i586-oe-linux-musl/console-tools/0.3.2-r8/console-tools-0.3.2/vttools/resizecons.c:81:
23|
24/home/ubuntu/work/oe/openembedded-core/build/tmp-musl/sysroots/qemux86/usr/include/bits/ioctl.h:90:8:
25note: originally defined here
26| struct winsize {
27| ^
28
29Signed-off-by: Khem Raj <raj.khem@gmail.com>
30---
31Upstream-Status: Pending
32
33 vttools/resizecons.c | 2 +-
34 1 file changed, 1 insertion(+), 1 deletion(-)
35
36diff --git a/vttools/resizecons.c b/vttools/resizecons.c
37index f0a7055..e8753b1 100644
38--- a/vttools/resizecons.c
39+++ b/vttools/resizecons.c
40@@ -81,7 +81,7 @@
41 #include <sys/ioctl.h>
42 #if (__GNU_LIBRARY__ >= 6)
43 # include <sys/perm.h>
44-#else
45+#elif defined __GLIBC__
46 # include <linux/types.h>
47 # include <linux/termios.h>
48 #endif
49--
502.7.0
51
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch
deleted file mode 100644
index 6e72ec665b..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1Subject: Fix 'format-security' compilation error.
2
3Upstream-Status: Pending
4
5Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
6---
7 kbdtools/kbd_mode.c | 6 +++---
8 kbdtools/setmetamode.c | 2 +-
9 2 files changed, 4 insertions(+), 4 deletions(-)
10
11diff --git a/kbdtools/kbd_mode.c b/kbdtools/kbd_mode.c
12index 02dca38..8dbcd39 100644
13--- a/kbdtools/kbd_mode.c
14+++ b/kbdtools/kbd_mode.c
15@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
16 /* report mode */
17 if (ioctl(fd, KDGKBMODE, &mode))
18 {
19- fprintf(stderr, progname);
20+ fprintf(stderr, "%s", progname);
21 perror(_(": error reading keyboard mode\n"));
22 exit(1);
23 }
24@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
25 kbd_rep.period = rate;
26 if (ioctl(fd, KDKBDREP, &kbd_rep))
27 {
28- fprintf(stderr, progname);
29+ fprintf(stderr, "%s", progname);
30 perror(_(": error setting keyboard repeat mode\n"));
31 exit(1);
32 }
33@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
34
35 if (ioctl(fd, KDSKBMODE, mode))
36 {
37- fprintf(stderr, progname);
38+ fprintf(stderr, "%s", progname);
39 perror(_(": error setting keyboard mode\n"));
40 exit(1);
41 }
42diff --git a/kbdtools/setmetamode.c b/kbdtools/setmetamode.c
43index 5bed945..0ba7676 100644
44--- a/kbdtools/setmetamode.c
45+++ b/kbdtools/setmetamode.c
46@@ -42,7 +42,7 @@ void report(int meta)
47 default:
48 s = N_("Strange mode for Meta key?\n");
49 }
50- printf(_(s));
51+ printf("%s", _(s));
52 }
53
54 struct meta
55--
562.8.3
57
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch
deleted file mode 100644
index 64b5b044dd..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 0fd5dda51d68e1ec2a87e27b5ed0dff3503b4681 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 31 Dec 2015 08:12:38 +0000
4Subject: [PATCH] kbdtools: Include sys/types.h for u_char and u_short
5 definition
6
7on musl this gets exposed since sys/types.h is not
8included via some other indirect inclusion as is the case with glibc
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Pending
13
14 kbdtools/dumpkeys.c | 1 +
15 kbdtools/loadkeys.y | 1 +
16 2 files changed, 2 insertions(+)
17
18diff --git a/kbdtools/dumpkeys.c b/kbdtools/dumpkeys.c
19index 6159d49..c19fb21 100644
20--- a/kbdtools/dumpkeys.c
21+++ b/kbdtools/dumpkeys.c
22@@ -26,6 +26,7 @@
23 #include <errno.h>
24 #include <sysexits.h>
25 #include <sys/ioctl.h>
26+#include <sys/types.h>
27 #include <linux/types.h>
28 #include <linux/kd.h>
29 #include <linux/keyboard.h>
30diff --git a/kbdtools/loadkeys.y b/kbdtools/loadkeys.y
31index b6a8e01..4468f77 100644
32--- a/kbdtools/loadkeys.y
33+++ b/kbdtools/loadkeys.y
34@@ -71,6 +71,7 @@
35 #include <linux/kd.h>
36 #include <linux/keyboard.h>
37 #include <sys/ioctl.h>
38+#include <sys/types.h>
39 #include <ctype.h>
40 #include <sysexits.h>
41 #include <signal.h>
42--
432.6.4
44
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars b/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars
deleted file mode 100644
index 32692ab4b9..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/Makevars
+++ /dev/null
@@ -1,41 +0,0 @@
1# Makefile variables for PO directory in any package using GNU gettext.
2
3# Usually the message domain is the same as the package name.
4DOMAIN = $(PACKAGE)
5
6# These two variables depend on the location of this directory.
7subdir = po
8top_builddir = ..
9
10# These options get passed to xgettext.
11XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
12
13# This is the copyright holder that gets inserted into the header of the
14# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
15# package. (Note that the msgstr strings, extracted from the package's
16# sources, belong to the copyright holder of the package.) Translators are
17# expected to transfer the copyright for their translations to this person
18# or entity, or to disclaim their copyright. The empty string stands for
19# the public domain; in this case the translators are expected to disclaim
20# their copyright.
21COPYRIGHT_HOLDER = Free Software Foundation, Inc.
22
23# This is the email address or URL to which the translators shall report
24# bugs in the untranslated strings:
25# - Strings which are not entire sentences, see the maintainer guidelines
26# in the GNU gettext documentation, section 'Preparing Strings'.
27# - Strings which use unclear terms or require additional context to be
28# understood.
29# - Strings which make invalid assumptions about notation of date, time or
30# money.
31# - Pluralisation problems.
32# - Incorrect English spelling.
33# - Incorrect formatting.
34# It can be your email address, or a mailing list address where translators
35# can write to without being subscribed, or the URL of a web page through
36# which the translators can contact you.
37MSGID_BUGS_ADDRESS =
38
39# This is the list of locale categories, beyond LC_MESSAGES, for which the
40# message catalogs shall be used. It is usually empty.
41EXTRA_LOCALE_CATEGORIES =
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
deleted file mode 100644
index c287014767..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/codepage.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1Upstream-Status: Pending
2
3#
4# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
5#
6
7--- console-tools-0.3.2/contrib/codepage.c~codepage
8+++ console-tools-0.3.2/contrib/codepage.c
9@@ -229,7 +229,7 @@
10 return 0;
11
12 fprintf(stderr, "\
13-Warning: CP format is a hack!\n
14+Warning: CP format is a hack!\n\
15 The files produced may or may not be usable!\n");
16
17 sprintf(outfile, "%d.cp", CPEntryHeader.codepage);
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
deleted file mode 100644
index c93f511950..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/compile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
1Upstream-Status: Pending
2
3--- console-tools-0.3.2/kbdtools/showkey.c~compile 1999-08-25 17:20:08.000000000 -0400
4+++ console-tools-0.3.2/kbdtools/showkey.c 2004-05-09 03:03:23.000000000 -0400
5@@ -264,7 +264,6 @@
6 break;
7 case cmd_keymap:
8 printf(")\n");
9- default:
10 }
11 }
12
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
deleted file mode 100644
index 15c100c908..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Pending
2
3--- console-tools-0.3.2/configure.in~configure
4+++ console-tools-0.3.2/configure.in
5@@ -2,13 +2,14 @@
6 dnl Process this file with autoconf to produce a configure script.
7
8 # Initialize
9-AC_INIT(kbdtools/loadkeys.y)
10+AC_INIT
11+AC_CONFIG_SRCDIR([kbdtools/loadkeys.y])
12
13 define(ct_unicodedata_default,/usr/share/unidata/UnicodeData-2.txt)
14 ct_localdatadir_default=/usr/local/share # iff --enable-localdatadir without specific dir
15
16 #AC_CONFIG_AUX_DIR(autoconf)
17-AC_CANONICAL_SYSTEM
18+AC_CANONICAL_TARGET([])
19 AM_INIT_AUTOMAKE(console-tools, 0.3.2)
20
21 # Defaults
22@@ -25,7 +26,6 @@
23 # i18n stuff
24 ALL_LINGUAS="cs de ru ga fr"
25 AM_GNU_GETTEXT
26-AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
27
28 AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale")
29
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
deleted file mode 100644
index be61eb846b..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/fix-libconsole-linking.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1Fix the following error detected with i586-pokymllib32-linux-gcc (the
2multilib x86-64 lib32 compiler):
3 ../lib/ctutils/.libs/libctutils.so: undefined reference to `get_kernel_sfm'
4 collect2: error: ld returned 1 exit status
5
6It seems that libctutils.so (the library that uses get_kernel_sfm) must
7be stated before libconsole.so (the library that exports the function) when
8using multilib gcc
9
10Upstream-Status: Pending
11Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
12
13Index: console-tools-0.3.2/fontfiletools/Makefile.am
14===================================================================
15--- console-tools-0.3.2.orig/fontfiletools/Makefile.am
16+++ console-tools-0.3.2/fontfiletools/Makefile.am
17@@ -10,5 +10,5 @@ EXTRA_DIST = fonts2virfont.c virfont.h
18
19 # libconsole is needed by ctutils
20 LDADD = ../lib/ctlocal/libctlocal.a ../lib/cfont/libcfont.la \
21- ../lib/console/libconsole.la \
22- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la
23+ ../lib/ctutils/libctutils.la \
24+ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la
25Index: console-tools-0.3.2/vttools/Makefile.am
26===================================================================
27--- console-tools-0.3.2.orig/vttools/Makefile.am
28+++ console-tools-0.3.2/vttools/Makefile.am
29@@ -7,9 +7,9 @@ bin_PROGRAMS = chvt deallocvt writevt fg
30 vcstime vt-is-UTF8 openvt @RESIZECONS@
31 EXTRA_PROGRAMS = resizecons
32
33-LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \
34+LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \
35 ../lib/cfont/libcfont.la \
36- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la
37+ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la
38
39 vcstime_LDADD = ../lib/ctlocal/libctlocal.a
40 screendump_LDADD = ../lib/ctlocal/libctlocal.a
41Index: console-tools-0.3.2/kbdtools/Makefile.am
42===================================================================
43--- console-tools-0.3.2.orig/kbdtools/Makefile.am
44+++ console-tools-0.3.2/kbdtools/Makefile.am
45@@ -15,9 +15,9 @@ EXTRA_PROGRAMS = getkeycodes setkeycodes
46 loadkeys_SOURCES = loadkeys.y analyze.l
47
48 YFLAGS = -d
49-LDADD = ../lib/ctlocal/libctlocal.a ../lib/console/libconsole.la \
50+LDADD = ../lib/ctlocal/libctlocal.a ../lib/ctutils/libctutils.la \
51 ../lib/cfont/libcfont.la \
52- ../lib/ctutils/libctutils.la ../lib/generic/libctgeneric.la
53+ ../lib/console/libconsole.la ../lib/generic/libctgeneric.la
54
55 loadkeys_LDADD = $(LDADD) @LEXLIB@
56
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
deleted file mode 100644
index f370be8592..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/kbdrate.patch
+++ /dev/null
@@ -1,75 +0,0 @@
1Patch from Matthias Goebl <oe@m.goebl.net>
2Added via OE bugtracker: bug #478
3
4Upstream-Status: Pending
5
6--- console-tools-0.3.2/kbdtools/kbd_mode.c.orig
7+++ console-tools-0.3.2/kbdtools/kbd_mode.c
8@@ -29,11 +29,16 @@
9 OPT("-u --unicode ", _("UTF-8 mode (UNICODE)"));
10 OPT("-s --scancode ", _("scancode mode (RAW)"));
11 OPT(" --mode={8bit,keycode,unicode,scancode} ", _("set mode"));
12+ OPT("-r --rate=RATE ", _("set repeat rate (default: 33)"));
13+ OPT("-d --delay=DELAY ", _("set repeat delay (default: 250)"));
14
15 OPT("-h --help ", HELPDESC);
16 OPT("-V --version ", VERSIONDESC);
17 }
18
19+int rate=-1;
20+int delay=-1;
21+
22 static int parse_cmdline (int argc, char *argv[])
23 {
24 int mode = -1;
25@@ -46,11 +51,13 @@
26 { "mode" , required_argument, NULL, 'm' },
27 { "scancode" , no_argument, NULL, 's' },
28 { "unicode" , no_argument, NULL, 'u' },
29+ { "rate" , required_argument, NULL, 'r' },
30+ { "delay" , required_argument, NULL, 'd' },
31 { NULL, 0, NULL, 0 }
32 };
33 int c;
34
35- while ( (c = getopt_long (argc, argv, "Vhaksu", long_opts, NULL)) != EOF)
36+ while ( (c = getopt_long (argc, argv, "Vhaksur:d:", long_opts, NULL)) != EOF)
37 switch (c) {
38 case 'h':
39 usage ();
40@@ -58,6 +65,14 @@
41 case 'V':
42 version ();
43 exit(0);
44+ case 'r':
45+ rate = atoi(optarg);
46+ mode = -2;
47+ break;
48+ case 'd':
49+ delay = atoi(optarg);
50+ mode = -2;
51+ break;
52 case 'a':
53 mode = K_XLATE;
54 break;
55@@ -129,6 +144,20 @@
56 exit(0);
57 }
58
59+ if ( rate != -1 || delay != -1 )
60+ {
61+ struct kbd_repeat kbd_rep;
62+ kbd_rep.delay = delay;
63+ kbd_rep.period = rate;
64+ if (ioctl(fd, KDKBDREP, &kbd_rep))
65+ {
66+ fprintf(stderr, progname);
67+ perror(_(": error setting keyboard repeat mode\n"));
68+ exit(1);
69+ }
70+ if(mode==-2) exit(0);
71+ }
72+
73 if (ioctl(fd, KDSKBMODE, mode))
74 {
75 fprintf(stderr, progname);
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4 b/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4
deleted file mode 100644
index 18d47a94f7..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4
+++ /dev/null
@@ -1,24 +0,0 @@
1# Check whether LC_MESSAGES is available in <locale.h>.
2# Ulrich Drepper <drepper@cygnus.com>, 1995.
3#
4# This file can be copied and used freely without restrictions. It can
5# be used in projects which are not available under the GNU General Public
6# License or the GNU Library General Public License but which still want
7# to provide support for the GNU gettext functionality.
8# Please note that the actual code of the GNU gettext library is covered
9# by the GNU Library General Public License, and the rest of the GNU
10# gettext package package is covered by the GNU General Public License.
11# They are *not* in the public domain.
12
13# serial 2
14
15AC_DEFUN([AM_LC_MESSAGES],
16 [if test $ac_cv_header_locale_h = yes; then
17 AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
18 [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
19 am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
20 if test $am_cv_val_LC_MESSAGES = yes; then
21 AC_DEFINE(HAVE_LC_MESSAGES, 1,
22 [Define if your <locale.h> file defines LC_MESSAGES.])
23 fi
24 fi])
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
deleted file mode 100644
index a6735a53ff..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/no-dep-on-libfl.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1No reason to link with libfl since 'loadkeys' implements
2its own yywrap()/yylex() functions.
3
4Upstream-Status: Pending
5Signed-off-by: Jacob Kroon <jacob.kroon@mikrodidakt.se>
6
7Index: console-tools-0.3.2/kbdtools/Makefile.am
8===================================================================
9--- console-tools-0.3.2.orig/kbdtools/Makefile.am
10+++ console-tools-0.3.2/kbdtools/Makefile.am
11@@ -19,8 +19,6 @@ LDADD = ../lib/ctlocal/libctlocal.a ../l
12 ../lib/cfont/libcfont.la \
13 ../lib/console/libconsole.la ../lib/generic/libctgeneric.la
14
15-loadkeys_LDADD = $(LDADD) @LEXLIB@
16-
17 bin_SCRIPTS = mk_modmap
18
19 noinst_HEADERS = loadkeys.h
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch
deleted file mode 100644
index 2ed609219c..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1The docs need tools we don't have to build so disable them.
2
3Also remove intl since the Makefile doesn't work with 3.82 and we
4don't want to build libintl anyway.
5
6Upstream-Status: Inappropriate [configuration]
7RP 2012/10/17
8
9Index: console-tools-0.3.2/Makefile.am
10===================================================================
11--- console-tools-0.3.2.orig/Makefile.am 1999-04-15 01:33:24.000000000 +0000
12+++ console-tools-0.3.2/Makefile.am 2012-10-17 11:48:14.107069145 +0000
13@@ -1,7 +1,7 @@
14 # -*- makefile -*-
15 AUTOMAKE_OPTIONS = foreign
16
17-SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib doc \
18- compat include examples po intl
19+SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib \
20+ compat include examples po
21
22 EXTRA_DIST = BUGS RELEASE CREDITS COPYING.kbd local-scripts/* debian/* *.lsm
diff --git a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch b/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
deleted file mode 100644
index 0c95068a36..0000000000
--- a/meta/recipes-core/console-tools/console-tools-0.3.2/uclibc-fileno.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Fixing the locale issues isn't enough, console-tools also does a couple of
2other pretty stupid things (like FILE *f; f->_fileno instead of fileno(f)),
3
4Upstream-Status: Pending
5
6--- console-tools-0.3.2/lib/cfont/fontstruct.c.ark 2005-05-22 19:12:38.000000000 +0000
7+++ console-tools-0.3.2/lib/cfont/fontstruct.c 2005-05-22 19:13:23.000000000 +0000
8@@ -50,8 +50,7 @@
9 * get filesize
10 */
11
12- /* FIXME: should not use _fileno ! */
13- if (fstat(fontfile->_fileno, &stbuf) == -1)
14+ if (fstat(fileno(fontfile), &stbuf) == -1)
15 goto rsf_return_error;
16
17 if (S_ISREG(stbuf.st_mode))
18@@ -211,8 +210,7 @@
19 * get filesize
20 */
21
22- /* FIXME: should not use _fileno ! */
23- if (fstat(fontfile->_fileno, &stbuf) == -1)
24+ if (fstat(fileno(fontfile), &stbuf) == -1)
25 goto rfg_return_error;
26
27 if (S_ISREG(stbuf.st_mode))
28--- console-tools-0.3.2/lib/console/acm.c.ark 2005-05-22 19:17:15.000000000 +0000
29+++ console-tools-0.3.2/lib/console/acm.c 2005-05-22 19:17:23.000000000 +0000
30@@ -30,7 +30,7 @@
31 lct_boolean parse_failed = False;
32 lct_boolean is_unicode;
33
34- if (fstat(fp->_fileno, &stbuf))
35+ if (fstat(fileno(fp), &stbuf))
36 perror(_("Cannot stat ACM file")), exit(1);
37
38 /* first try a wg15-charmap (glibc) file format */
39--- console-tools-0.3.2/include/lct/local.h.ark 2005-05-22 19:08:54.000000000 +0000
40+++ console-tools-0.3.2/include/lct/local.h 2005-05-22 19:09:12.000000000 +0000
41@@ -8,7 +8,7 @@
42 #include <locale.h>
43
44
45-#ifdef HAVE_LOCALE_H
46+#if defined(HAVE_LOCALE_H) && defined(HAVE_LIBINTL_H)
47 # include <libintl.h>
48 # define _(String) gettext (String)
49 # ifdef gettext_noop
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
deleted file mode 100644
index ba44fbe60f..0000000000
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ /dev/null
@@ -1,48 +0,0 @@
1SUMMARY = "Allows you to set-up and manipulate the Linux console"
2DESCRIPTION = "Provides tools that enable the set-up and manipulation of the linux console and console-font files."
3SECTION = "base"
4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING.kbd;md5=9b2d91511d3d80d4d20ac6e6b0137fe9"
6DEPENDS = "flex-native bison-native"
7PR = "r8"
8
9SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
10 file://codepage.patch \
11 file://configure.patch \
12 file://compile.patch \
13 file://kbdrate.patch \
14 file://uclibc-fileno.patch \
15 file://nodocs.patch \
16 file://fix-libconsole-linking.patch \
17 file://no-dep-on-libfl.patch \
18 file://0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch \
19 file://0001-Cover-the-else-with-__GLIBC__.patch \
20 file://0001-Fix-format-security-compilation-error.patch \
21 file://lcmessage.m4 \
22 file://Makevars"
23
24SRC_URI[md5sum] = "bf21564fc38b3af853ef724babddbacd"
25SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1c126c2"
26
27UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lct/files/console-tools-devel/"
28UPSTREAM_CHECK_REGEX = "/console-tools-devel/(?P<pver>(\d\d?\.)+\d\d?)/"
29
30inherit autotools gettext update-alternatives
31
32CFLAGS_append_aarch64 = " -D_USE_TERMIOS "
33
34ASNEEDED = ""
35
36do_configure_prepend () {
37 mkdir -p ${S}/m4
38 cp ${WORKDIR}/lcmessage.m4 ${S}/m4/
39 rm -f ${S}/acinclude.m4
40 cp ${WORKDIR}/Makevars ${S}/po/
41}
42
43ALTERNATIVE_PRIORITY = "30"
44
45bindir_progs = "chvt deallocvt fgconsole openvt"
46ALTERNATIVE_${PN} = "${bindir_progs}"
47
48RDEPENDS_${PN} = "bash"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-09 07:06:08 +0000