* [ptxdist] [PATCH 1/4] libusb: fix libusbx to libusb prompt
@ 2014-06-15 20:06 Alexander Aring
2014-06-15 20:06 ` [ptxdist] [PATCH 2/4] protobuf: version bump 2.4.1 -> 2.5.0 Alexander Aring
` (3 more replies)
0 siblings, 4 replies; 12+ messages in thread
From: Alexander Aring @ 2014-06-15 20:06 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
rules/libusb.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/libusb.in b/rules/libusb.in
index ff1a797..6121352 100644
--- a/rules/libusb.in
+++ b/rules/libusb.in
@@ -4,7 +4,7 @@ menuconfig LIBUSB
tristate
select LIBC_RT
select LIBC_PTHREAD
- prompt "libusbx-1.x "
+ prompt "libusb-1.x "
help
Library for programming USB applications without the
knowledge of Linux kernel internals.
--
2.0.0
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* [ptxdist] [PATCH 2/4] protobuf: version bump 2.4.1 -> 2.5.0
2014-06-15 20:06 [ptxdist] [PATCH 1/4] libusb: fix libusbx to libusb prompt Alexander Aring
@ 2014-06-15 20:06 ` Alexander Aring
2014-06-16 19:01 ` Michael Olbrich
2014-06-15 20:06 ` [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 -> 2.0.1 Alexander Aring
` (2 subsequent siblings)
3 siblings, 1 reply; 12+ messages in thread
From: Alexander Aring @ 2014-06-15 20:06 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
rules/protobuf.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/protobuf.make b/rules/protobuf.make
index 6a3a42c..3725a1f 100644
--- a/rules/protobuf.make
+++ b/rules/protobuf.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_PROTOBUF) += protobuf
#
# Paths and names
#
-PROTOBUF_VERSION := 2.4.1
-PROTOBUF_MD5 := ed436802019c9e1f40cc750eaf78f318
+PROTOBUF_VERSION := 2.5.0
+PROTOBUF_MD5 := a72001a9067a4c2c4e0e836d0f92ece4
PROTOBUF := protobuf-$(PROTOBUF_VERSION)
PROTOBUF_SUFFIX := tar.bz2
PROTOBUF_URL := http://protobuf.googlecode.com/files/$(PROTOBUF).$(PROTOBUF_SUFFIX)
--
2.0.0
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 -> 2.0.1
2014-06-15 20:06 [ptxdist] [PATCH 1/4] libusb: fix libusbx to libusb prompt Alexander Aring
2014-06-15 20:06 ` [ptxdist] [PATCH 2/4] protobuf: version bump 2.4.1 -> 2.5.0 Alexander Aring
@ 2014-06-15 20:06 ` Alexander Aring
2014-06-15 20:51 ` Alexander Aring
2014-06-16 18:22 ` Michael Olbrich
2014-06-15 20:06 ` [ptxdist] [PATCH 4/4] cmatrix: add new package Alexander Aring
2014-06-16 19:00 ` [ptxdist] [PATCH 1/4] libusb: fix libusbx to libusb prompt Michael Olbrich
3 siblings, 2 replies; 12+ messages in thread
From: Alexander Aring @ 2014-06-15 20:06 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
This patch updated the kbd package to version 2.0.1 and add many new
tools option which are available to install.
Also add options to install consolefonts, consoletrans, keymaps, etc...
Add new patch for remove the building for tests which also check for
"check" which is not necessary.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
I didn't check if I can really change the font on a console interface.
Sorry!
.../0001-getkeycode-show-reserved-scancode.patch | 33 -----
patches/kbd-1.15.2/series | 1 -
...configure-don-t-depend-on-check-for-tests.patch | 53 +++++++
.../0002-getkeycode-show-reserved-scancode.patch | 34 +++++
patches/kbd-2.0.1/autogen.sh | 1 +
patches/kbd-2.0.1/series | 2 +
rules/kbd.in | 153 +++++++++++++++++++--
rules/kbd.make | 90 ++++++++----
8 files changed, 295 insertions(+), 72 deletions(-)
delete mode 100644 patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
delete mode 100644 patches/kbd-1.15.2/series
create mode 100644 patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
create mode 100644 patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
create mode 120000 patches/kbd-2.0.1/autogen.sh
create mode 100644 patches/kbd-2.0.1/series
diff --git a/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch b/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
deleted file mode 100644
index de0c9f8..0000000
--- a/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3b6394ed6c8f26a4c59ce1446b40af9db6100f44 Mon Sep 17 00:00:00 2001
-From: Luotao Fu <l.fu@pengutronix.de>
-Date: Fri, 4 Jun 2010 10:36:42 +0200
-Subject: [PATCH] getkeycode: show reserved scancode
-
-The scancode 0 is usually reserved. Hence the getkeycodes starts scanning at 1.
-However, the scancode can still be used in some special cases, e.g. for a matrix
-keypad with board specific combination of keycodes and scancodes. This one
-change the scan range to start from 0.
-
-probably not for mainline, as far kdb is maintained et all.
-
-Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
----
- src/getkeycodes.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/getkeycodes.c b/src/getkeycodes.c
-index 6504e7e..2ea5298 100644
---- a/src/getkeycodes.c
-+++ b/src/getkeycodes.c
-@@ -47,7 +47,7 @@ main(int argc, char **argv) {
- old_kernel = 1;
- sc0 = 89;
- } else
-- for (sc0 = 1; sc0 <= 88; sc0++) {
-+ for (sc0 = 0; sc0 <= 88; sc0++) {
- a.scancode = sc0;
- a.keycode = 0;
- if (ioctl(fd, KDGETKEYCODE, &a) || a.keycode != sc0)
---
-1.7.1
-
diff --git a/patches/kbd-1.15.2/series b/patches/kbd-1.15.2/series
deleted file mode 100644
index d6cc8bd..0000000
--- a/patches/kbd-1.15.2/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-getkeycode-show-reserved-scancode.patch
diff --git a/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch b/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
new file mode 100644
index 0000000..caefa5e
--- /dev/null
+++ b/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
@@ -0,0 +1,53 @@
+From 6913deb7278f4f145e7deb8a6102dec843aeac0b Mon Sep 17 00:00:00 2001
+From: Alexander Aring <alex.aring@gmail.com>
+Date: Sun, 15 Jun 2014 15:48:20 +0200
+Subject: [PATCH 1/2] Makefile: configure: don't depend on check for tests
+
+This patch removes the dependency for check and removes the build of the tests
+environment.
+
+Signed-off-by: Alexander Aring <alex.aring@gmail.com>
+---
+ Makefile.am | 2 +-
+ configure.ac | 5 +----
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 89c7e83..beb6e29 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,7 +8,7 @@ EXTRA_DIST = \
+ CREDITS \
+ contrib docs rc
+
+-SUBDIRS = src data po tests docs
++SUBDIRS = src data po docs
+
+ kbd-$(VERSION).tar.xz:
+ make distcheck
+diff --git a/configure.ac b/configure.ac
+index 960cc07..fea8605 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,8 +11,6 @@ AM_INIT_AUTOMAKE([1.9 -Wall color-tests dist-xz])
+ AC_CONFIG_SRCDIR([src/loadkeys.c])
+ AC_CONFIG_HEADERS(config.h)
+
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
+-
+ m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
+ AM_SILENT_RULES([yes])
+
+@@ -138,8 +136,7 @@ AC_CONFIG_FILES([Makefile
+ po/Makefile.in
+ src/Makefile
+ src/libkeymap/Makefile
+- src/vlock/Makefile
+- tests/Makefile])
++ src/vlock/Makefile])
+ AC_OUTPUT
+
+ AC_MSG_RESULT([
+--
+2.0.0
+
diff --git a/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch b/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
new file mode 100644
index 0000000..2e12281
--- /dev/null
+++ b/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
@@ -0,0 +1,34 @@
+From 75370786760aaf74b032e6ab518735eed97e6550 Mon Sep 17 00:00:00 2001
+From: Luotao Fu <l.fu@pengutronix.de>
+Date: Fri, 4 Jun 2010 10:36:42 +0200
+Subject: [PATCH 2/2] getkeycode: show reserved scancode
+
+The scancode 0 is usually reserved. Hence the getkeycodes starts scanning at 1.
+However, the scancode can still be used in some special cases, e.g. for a matrix
+keypad with board specific combination of keycodes and scancodes. This one
+change the scan range to start from 0.
+
+probably not for mainline, as far kdb is maintained et all.
+
+Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
+Signed-off-by: Alexander Aring <alex.aring@gmail.com>
+---
+ src/getkeycodes.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/getkeycodes.c b/src/getkeycodes.c
+index d1fccf9..500fc5f 100644
+--- a/src/getkeycodes.c
++++ b/src/getkeycodes.c
+@@ -44,7 +44,7 @@ main(int argc, char **argv) {
+ if (ioctl(fd, KDGETKEYCODE, &a)) {
+ sc0 = 89;
+ } else
+- for (sc0 = 1; sc0 <= 88; sc0++) {
++ for (sc0 = 0; sc0 <= 88; sc0++) {
+ a.scancode = sc0;
+ a.keycode = 0;
+ if (ioctl(fd, KDGETKEYCODE, &a) || a.keycode != sc0)
+--
+2.0.0
+
diff --git a/patches/kbd-2.0.1/autogen.sh b/patches/kbd-2.0.1/autogen.sh
new file mode 120000
index 0000000..9f8a4cb
--- /dev/null
+++ b/patches/kbd-2.0.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/kbd-2.0.1/series b/patches/kbd-2.0.1/series
new file mode 100644
index 0000000..c0a3247
--- /dev/null
+++ b/patches/kbd-2.0.1/series
@@ -0,0 +1,2 @@
+0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
+0002-getkeycode-show-reserved-scancode.patch
diff --git a/rules/kbd.in b/rules/kbd.in
index ab35c8c..dbde1ba 100644
--- a/rules/kbd.in
+++ b/rules/kbd.in
@@ -7,19 +7,44 @@ menuconfig KBD
The kbd package contains keytable files and keyboard utilities
compatible with kernel version 1.1.54 and later. Setfont requires
1.1.92 or later.
+
if KBD
+config KBD_CHVT
+ bool
+ prompt "chvt"
+ depends on !BUSYBOX_CHVT || ALLYES
+ help
+ chvt - change foreground virtual terminal
+
+comment "BusyBox' chvt is selected!"
+ depends on BUSYBOX_CHVT
+
+config KBD_DEALLOCVT
+ bool
+ prompt "deallocvt"
+ depends on !BUSYBOX_DEALLOCVT || ALLYES
+ help
+ deallocvt - deallocate unused virtual terminals
+
+comment "BusyBox' deallocvt is selected!"
+ depends on BUSYBOX_DEALLOCVT
+
config KBD_DUMPKEYS
bool
prompt "dumpkeys"
help
dumpkeys - dump keyboard translation tables
-config KBD_LOADKEYS
+config KBD_FGCONSOLE
bool
- prompt "loadkeys"
+ prompt "fgconsole"
+ depends on !BUSYBOX_FGCONSOLE || ALLYES
help
- loadkeys - load keyboard translation tables
+ print the number of the active VT
+
+comment "BusyBox' fgconsole is selected!"
+ depends on BUSYBOX_FGCONSOLE
config KBD_GETKEYCODES
bool
@@ -27,6 +52,64 @@ config KBD_GETKEYCODES
help
getkeycodes - print kernel scancode-to-keycode mapping table
+config KBD_KBDINFO
+ bool
+ prompt "kbdinfo"
+ help
+ show kbd information
+
+config KBD_KBD_MODE
+ bool
+ prompt "kbd_mode"
+ help
+ report or set the keyboard mode
+
+config KBD_KBDRATE
+ bool
+ prompt "kbdrate"
+ help
+ reset the keyboard repeat rate and delay time
+
+config KBD_LOADKEYS
+ bool
+ prompt "loadkeys"
+ help
+ loadkeys - load keyboard translation tables
+
+config KBD_LOADUNIMAP
+ bool
+ prompt "loadunimap"
+ help
+ load the kernel unicode-to-font mapping table
+
+config KBD_MAPSCRN
+ bool
+ prompt "mapscrn"
+ help
+ load screen output mapping table
+
+config KBD_OPENVT
+ bool
+ prompt "openvt"
+ depends on !BUSYBOX_OPENVT || ALLYES
+ help
+ start a program on a new virtual terminal (VT)
+
+comment "BusyBox' openvt is selected!"
+ depends on BUSYBOX_OPENVT
+
+config KBD_PSFXTABLE
+ bool
+ prompt "psfxtable"
+ help
+ handle Unicode character tables for console fonts
+
+config KBD_SETFONT
+ bool
+ prompt "setfont"
+ help
+ load EGA/VGA console screen font
+
config KBD_SETKEYCODES
bool
prompt "setkeycodes"
@@ -37,6 +120,30 @@ config KBD_SETKEYCODES
comment "BusyBox' setkeycodes is selected!"
depends on BUSYBOX_SETKEYCODES
+config KBD_SETLEDS
+ bool
+ prompt "setleds"
+ help
+ set the keyboard leds
+
+config KBD_SETMETAMODE
+ bool
+ prompt "setmetamode"
+ help
+ define the keyboard meta key handling
+
+config KBD_SETVTRGB
+ bool
+ prompt "setvtrgb"
+ help
+ set the virtual terminal RGB colors
+
+config KBD_SHOWCONSOLEFONT
+ bool
+ prompt "showconsolefont"
+ help
+ Show the current EGA/VGA console screen font
+
config KBD_SHOWKEY
bool
prompt "showkey"
@@ -47,24 +154,40 @@ config KBD_SHOWKEY
comment "BusyBox' showkey is selected!"
depends on BUSYBOX_SHOWKEY
-config KBD_CHVT
+config KBD_UNICODE_START
bool
- prompt "chvt"
- depends on !BUSYBOX_CHVT || ALLYES
+ prompt "unicode_start"
help
- chvt - change foreground virtual terminal
+ put keyboard and console in unicode mode
-comment "BusyBox' chvt is selected!"
- depends on BUSYBOX_CHVT
+config KBD_UNICODE_STOP
+ bool
+ prompt "unicode_stop"
+ help
+ revert keyboard and console from unicode mode
-config KBD_DEALLOCVT
+config KBD_CONSOLEFONTS
bool
- prompt "deallocvt"
- depends on !BUSYBOX_DEALLOCVT || ALLYES
+ prompt "install consolefonts"
help
- deallocvt - deallocate unused virtual terminals
+ install consolefonts to /usr/share/consolefonts
-comment "BusyBox' deallocvt is selected!"
- depends on BUSYBOX_DEALLOCVT
+config KBD_CONSOLETRANS
+ bool
+ prompt "install consoletrans"
+ help
+ install consoletrans to /usr/share/consoletrans
+
+config KBD_KEYMAPS
+ bool
+ prompt "install keymaps"
+ help
+ install keymaps to /usr/share/keymaps
+
+config KBD_UNIMAPS
+ bool
+ prompt "install unimaps"
+ help
+ install unimaps to /usr/share/unimaps
endif
diff --git a/rules/kbd.make b/rules/kbd.make
index 9c51e04..8f28aca 100644
--- a/rules/kbd.make
+++ b/rules/kbd.make
@@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_KBD) += kbd
#
# Paths and names
#
-KBD_VERSION := 1.15.2
-KBD_MD5 := e850eb91e4d3b94b194efe8e953204c5
+KBD_VERSION := 2.0.1
+KBD_MD5 := e9f2b7046312c11cec9e52e22f307b6a
KBD := kbd-$(KBD_VERSION)
-KBD_SUFFIX := tar.bz2
+KBD_SUFFIX := tar.gz
KBD_URL := $(call ptx/mirror, KERNEL, utils/kbd/$(KBD).$(KBD_SUFFIX))
KBD_SOURCE := $(SRCDIR)/$(KBD).$(KBD_SUFFIX)
KBD_DIR := $(BUILDDIR)/$(KBD)
@@ -32,16 +32,41 @@ KBD_LICENSE := GPLv2+
#
# autoconf
#
-KBD_CONF_TOOL := autoconf
-KBD_CONF_OPT := \
+KBD_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--disable-nls \
--disable-rpath \
- --disable-klibc \
- --disable-klibc-layout \
+ --disable-optional-progs \
+ --disable-libkeymap \
+ --disable-vlock \
--without-libiconv-prefix \
--without-libintl-prefix
+
+KBD_TOOLS-y :=
+KBD_TOOLS-$(PTXCONF_KBD_CHVT) += chvt
+KBD_TOOLS-$(PTXCONF_KBD_DEALLOCVT) += deallocvt
+KBD_TOOLS-$(PTXCONF_KBD_DUMPKEYS) += dumpkeys
+KBD_TOOLS-$(PTXCONF_KBD_FGCONSOLE) += fgconsole
+KBD_TOOLS-$(PTXCONF_KBD_GETKEYCODES) += getkeycodes
+KBD_TOOLS-$(PTXCONF_KBD_KBDINFO) += kbdinfo
+KBD_TOOLS-$(PTXCONF_KBD_KBD_MODE) += kbd_mode
+KBD_TOOLS-$(PTXCONF_KBD_KBDRATE) += kbdrate
+KBD_TOOLS-$(PTXCONF_KBD_LOADKEYS) += loadkeys
+KBD_TOOLS-$(PTXCONF_KBD_LOADUNIMAP) += loadunimap
+KBD_TOOLS-$(PTXCONF_KBD_MAPSCRN) += mapscrn
+KBD_TOOLS-$(PTXCONF_KBD_OPENVT) += openvt
+KBD_TOOLS-$(PTXCONF_KBD_PSFXTABLE) += psfxtable
+KBD_TOOLS-$(PTXCONF_KBD_SETFONT) += setfont
+KBD_TOOLS-$(PTXCONF_KBD_SETKEYCODES) += setkeycodes
+KBD_TOOLS-$(PTXCONF_KBD_SETLEDS) += setleds
+KBD_TOOLS-$(PTXCONF_KBD_SETMETAMODE) += setmetamode
+KBD_TOOLS-$(PTXCONF_KBD_SETVTRGB) += setvtrgb
+KBD_TOOLS-$(PTXCONF_KBD_SHOWCONSOLEFONT) += showconsolefont
+KBD_TOOLS-$(PTXCONF_KBD_SHOWKEY) += showkey
+KBD_TOOLS-$(PTXCONF_KBD_UNICODE_START) += unicode_start
+KBD_TOOLS-$(PTXCONF_KBD_UNICODE_STOP) += unicode_stop
+
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
@@ -55,32 +80,51 @@ $(STATEDIR)/kbd.targetinstall:
@$(call install_fixup, kbd,AUTHOR,"Luotao Fu <l.fu@pengutronix.de>")
@$(call install_fixup, kbd,DESCRIPTION,missing)
-ifdef PTXCONF_KBD_DUMPKEYS
- @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/dumpkeys)
-endif
+ @$(foreach tool,$(KBD_TOOLS-y), \
+ $(call install_copy, kbd, 0, 0, 0755, -, \
+ /usr/bin/$(tool));)
-ifdef PTXCONF_KBD_LOADKEYS
- @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/loadkeys)
+ifdef PTXCONF_KBD_PSFXTABLE
+ @$(call install_link, kbd, psfxtable, /usr/bin/psfaddtable)
+ @$(call install_link, kbd, psfxtable, /usr/bin/psfgettable)
+ @$(call install_link, kbd, psfxtable, /usr/bin/psfstriptable)
endif
-ifdef PTXCONF_KBD_GETKEYCODES
- @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/getkeycodes)
-endif
-ifdef PTXCONF_KBD_SETKEYCODES
- @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/setkeycodes)
+ifdef PTXCONF_KBD_CONSOLEFONTS
+ @cd $(KBD_PKGDIR)/usr/share/consolefonts; \
+ find . -type f | while read file; do \
+ $(call install_copy, kbd, 0, 0, 0644, -, \
+ /usr/share/consolefonts/$$file); \
+ done
endif
-ifdef PTXCONF_KBD_SHOWKEY
- @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/showkey)
+ifdef PTXCONF_KBD_CONSOLETRANS
+ @cd $(KBD_PKGDIR)/usr/share/consoletrans; \
+ find . -type f | while read file; do \
+ $(call install_copy, kbd, 0, 0, 0644, -, \
+ /usr/share/consoletrans/$$file); \
+ done
endif
-ifdef PTXCONF_KBD_CHVT
- @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/chvt)
+ifdef PTXCONF_KBD_KEYMAPS
+ @cd $(KBD_PKGDIR)/usr/share/keymaps; \
+ find . -type f | while read file; do \
+ $(call install_copy, kbd, 0, 0, 0644, -, \
+ /usr/share/keymaps/$$file); \
+ done
+
+ @$(call install_link, kbd, mac, ppc)
endif
-ifdef PTXCONF_KBD_DEALLOCVT
- @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/deallocvt)
+ifdef PTXCONF_KBD_UNIMAPS
+ @cd $(KBD_PKGDIR)/usr/share/unimaps; \
+ find . -type f | while read file; do \
+ $(call install_copy, kbd, 0, 0, 0644, -, \
+ /usr/share/unimaps/$$file); \
+ done
+
+ @$(call install_link, kbd, mac, ppc)
endif
@$(call install_finish, kbd)
--
2.0.0
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* [ptxdist] [PATCH 4/4] cmatrix: add new package
2014-06-15 20:06 [ptxdist] [PATCH 1/4] libusb: fix libusbx to libusb prompt Alexander Aring
2014-06-15 20:06 ` [ptxdist] [PATCH 2/4] protobuf: version bump 2.4.1 -> 2.5.0 Alexander Aring
2014-06-15 20:06 ` [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 -> 2.0.1 Alexander Aring
@ 2014-06-15 20:06 ` Alexander Aring
2014-06-16 18:47 ` Michael Olbrich
2014-06-16 19:00 ` [ptxdist] [PATCH 1/4] libusb: fix libusbx to libusb prompt Michael Olbrich
3 siblings, 1 reply; 12+ messages in thread
From: Alexander Aring @ 2014-06-15 20:06 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
This is a must have tool for linux hackers. This tool isn't
cross-compile friendly. The added patch removes the static filename
check for consolefonts path. This is removed and should handeld by a
select on KBD_CONSOLEFONTS.
Another issue is that "make install-data-local" should install fonts
into consolefonts directory. This is also a static path without a
${prefix} variable. This is solved by install the necessary fonts
manually in targetinstall. Currently there is no X11 font support.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
...emove-check-on-file-and-check-on-mkfontdi.patch | 68 ++++++++++++++++++++++
patches/cmatrix-1.2a/autogen.sh | 1 +
patches/cmatrix-1.2a/series | 1 +
rules/cmatrix.in | 11 ++++
rules/cmatrix.make | 59 +++++++++++++++++++
5 files changed, 140 insertions(+)
create mode 100644 patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
create mode 120000 patches/cmatrix-1.2a/autogen.sh
create mode 100644 patches/cmatrix-1.2a/series
create mode 100644 rules/cmatrix.in
create mode 100644 rules/cmatrix.make
diff --git a/patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch b/patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
new file mode 100644
index 0000000..ee3b478
--- /dev/null
+++ b/patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
@@ -0,0 +1,68 @@
+From 29c8a5853843749a581e839be9bd869e32a85913 Mon Sep 17 00:00:00 2001
+From: Alexander Aring <alex.aring@gmail.com>
+Date: Sun, 15 Jun 2014 19:14:30 +0200
+Subject: [PATCH] configure: remove check on file and check on mkfontdir
+
+This patch removes the check on files which should be handled by ptxdist
+and dependencies. We cannot use a AC_CHECK_FILES on cross compiling.
+
+Also drop support for X11 mkfontdir util search.
+
+Signed-off-by: Alexander Aring <alex.aring@gmail.com>
+---
+ configure.in | 39 ---------------------------------------
+ 1 file changed, 39 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 509f63f..a7611b0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -81,45 +81,6 @@ else
+ AC_DEFINE_UNQUOTED(HAVE_CONSOLECHARS, $CONSOLECHARS)
+ fi
+
+-if test x$CONSOLECHARS != x -o x$CONSOLECHARS != x'"$CONSOLECHARS"'; then
+- if test x$SETFONT != x -o x$SETFONT != x'"$SETFONT"'; then
+-
+- dnl Now look for the console fonts directory...
+- AC_CHECK_FILES([/usr/lib/kbd/consolefonts /usr/share/consolefonts])
+-
+- if test "x$ac_cv_file__usr_lib_kbd_consolefonts" = "xno"; then
+- if test "x$ac_cv_file__usr_share_consolefonts" = "xno"; then
+- AC_MSG_WARN([
+-
+-*** You do not appear to have a consolefonts directory in a standard location
+-*** (/usr/lib/kbd or /usr/share), even though you appear to have the
+-*** consolechars and/or setfont command. The matrix font for the console
+-*** will not be installed. This means you will not be able to use the
+-*** matrix console font (and the -l command line switch) unless the font
+-*** is located in your current directory when you run CMatrix.
+-])
+- fi
+- fi
+- fi
+-fi
+-
+-
+-AC_PATH_PROG(MKFONTDIR, mkfontdir, "", $PATH:/usr/bin:/usr/bin/X11:/usr/local/bin/X11:/usr/X11R6/bin:/usr/local/bin:/sbin:/usr/sbin)
+-AC_CHECK_FILES([/usr/lib/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc])
+-
+-if test "x$ac_cv_file__usr_lib_X11_fonts_misc" = "xno"; then
+- if test "x$ac_cv_file__usr_X11R6_lib_X11_fonts_misc" = "xno"; then
+- AC_MSG_WARN([
+-
+-*** You do not appear to have an X window fonts directory in the standard
+-*** locations (/usr/lib/X11/fonts/misc or /usr/X11R6/lib/X11/fonts/misc). The
+-*** mtx.pcf font will not be installed. This means you will probably not
+-*** be able to use the mtx fonts in your x terminals, and hence be unable
+-*** to use the -x command line switch. Sorry about that...
+-])
+- fi
+- fi
+-
+ dnl Parse any configure options
+
+ LIBS="$LIBS $CURSES_LIB"
+--
+2.0.0
+
diff --git a/patches/cmatrix-1.2a/autogen.sh b/patches/cmatrix-1.2a/autogen.sh
new file mode 120000
index 0000000..9f8a4cb
--- /dev/null
+++ b/patches/cmatrix-1.2a/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/cmatrix-1.2a/series b/patches/cmatrix-1.2a/series
new file mode 100644
index 0000000..409d01e
--- /dev/null
+++ b/patches/cmatrix-1.2a/series
@@ -0,0 +1 @@
+0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
diff --git a/rules/cmatrix.in b/rules/cmatrix.in
new file mode 100644
index 0000000..d1903ab
--- /dev/null
+++ b/rules/cmatrix.in
@@ -0,0 +1,11 @@
+## SECTION=shell_and_console
+
+config CMATRIX
+ tristate
+ prompt "cmatrix"
+ select NCURSES
+ select KBD
+ select KBD_SETFONT
+ select KBD_CONSOLEFONTS
+ help
+ Shows a scrolling 'Matrix' like screen in Linux.
diff --git a/rules/cmatrix.make b/rules/cmatrix.make
new file mode 100644
index 0000000..d4ef7f6
--- /dev/null
+++ b/rules/cmatrix.make
@@ -0,0 +1,59 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Alexander Aring <aar@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_CMATRIX) += cmatrix
+
+#
+# Paths and names
+#
+CMATRIX_VERSION := 1.2a
+CMATRIX_MD5 := ebfb5733104a258173a9ccf2669968a1
+CMATRIX := cmatrix-$(CMATRIX_VERSION)
+CMATRIX_SUFFIX := tar.gz
+CMATRIX_URL := http://www.asty.org/cmatrix/dist/$(CMATRIX).$(CMATRIX_SUFFIX)
+CMATRIX_SOURCE := $(SRCDIR)/$(CMATRIX).$(CMATRIX_SUFFIX)
+CMATRIX_DIR := $(BUILDDIR)/$(CMATRIX)
+CMATRIX_LICENSE := GPLv2
+
+#
+# autoconf
+#
+CMATRIX_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --disable-debug
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/cmatrix.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, cmatrix)
+ @$(call install_fixup, cmatrix,PRIORITY,optional)
+ @$(call install_fixup, cmatrix,SECTION,base)
+ @$(call install_fixup, cmatrix,AUTHOR,"Alexander Aring <aar@pengutronix.de>")
+ @$(call install_fixup, cmatrix,DESCRIPTION,missing)
+
+ @$(call install_copy, cmatrix, 0, 0, 0755, -, /usr/bin/cmatrix)
+
+ @$(call install_copy, cmatrix, 0, 0, 0644, $(CMATRIX_DIR)/matrix.fnt, \
+ /usr/share/consolefonts/matrix.fnt)
+ @$(call install_copy, cmatrix, 0, 0, 0644, $(CMATRIX_DIR)/matrix.psf.gz, \
+ /usr/share/consolefonts/matrix.psf.gz)
+
+ @$(call install_finish, cmatrix)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.0.0
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 -> 2.0.1
2014-06-15 20:06 ` [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 -> 2.0.1 Alexander Aring
@ 2014-06-15 20:51 ` Alexander Aring
2014-06-16 18:22 ` Michael Olbrich
1 sibling, 0 replies; 12+ messages in thread
From: Alexander Aring @ 2014-06-15 20:51 UTC (permalink / raw)
To: ptxdist
Hi,
sorry my testing failed here.
On Sun, Jun 15, 2014 at 10:06:45PM +0200, Alexander Aring wrote:
...
> # ----------------------------------------------------------------------------
> # Target-Install
> # ----------------------------------------------------------------------------
> @@ -55,32 +80,51 @@ $(STATEDIR)/kbd.targetinstall:
> @$(call install_fixup, kbd,AUTHOR,"Luotao Fu <l.fu@pengutronix.de>")
> @$(call install_fixup, kbd,DESCRIPTION,missing)
>
> -ifdef PTXCONF_KBD_DUMPKEYS
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/dumpkeys)
> -endif
> + @$(foreach tool,$(KBD_TOOLS-y), \
> + $(call install_copy, kbd, 0, 0, 0755, -, \
> + /usr/bin/$(tool));)
>
> -ifdef PTXCONF_KBD_LOADKEYS
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/loadkeys)
> +ifdef PTXCONF_KBD_PSFXTABLE
> + @$(call install_link, kbd, psfxtable, /usr/bin/psfaddtable)
> + @$(call install_link, kbd, psfxtable, /usr/bin/psfgettable)
> + @$(call install_link, kbd, psfxtable, /usr/bin/psfstriptable)
> endif
>
> -ifdef PTXCONF_KBD_GETKEYCODES
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/getkeycodes)
> -endif
>
> -ifdef PTXCONF_KBD_SETKEYCODES
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/setkeycodes)
> +ifdef PTXCONF_KBD_CONSOLEFONTS
> + @cd $(KBD_PKGDIR)/usr/share/consolefonts; \
> + find . -type f | while read file; do \
> + $(call install_copy, kbd, 0, 0, 0644, -, \
> + /usr/share/consolefonts/$$file); \
> + done
> endif
>
> -ifdef PTXCONF_KBD_SHOWKEY
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/showkey)
> +ifdef PTXCONF_KBD_CONSOLETRANS
> + @cd $(KBD_PKGDIR)/usr/share/consoletrans; \
> + find . -type f | while read file; do \
> + $(call install_copy, kbd, 0, 0, 0644, -, \
> + /usr/share/consoletrans/$$file); \
> + done
> endif
>
> -ifdef PTXCONF_KBD_CHVT
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/chvt)
> +ifdef PTXCONF_KBD_KEYMAPS
> + @cd $(KBD_PKGDIR)/usr/share/keymaps; \
> + find . -type f | while read file; do \
> + $(call install_copy, kbd, 0, 0, 0644, -, \
> + /usr/share/keymaps/$$file); \
> + done
> +
> + @$(call install_link, kbd, mac, ppc)
This should be @$(call install_link, kbd, mac, /usr/share/keymaps/ppc)
> endif
>
> -ifdef PTXCONF_KBD_DEALLOCVT
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/deallocvt)
> +ifdef PTXCONF_KBD_UNIMAPS
> + @cd $(KBD_PKGDIR)/usr/share/unimaps; \
> + find . -type f | while read file; do \
> + $(call install_copy, kbd, 0, 0, 0644, -, \
> + /usr/share/unimaps/$$file); \
> + done
> +
> + @$(call install_link, kbd, mac, ppc)
This should be removed, copy&paste failure.
Sorry, I will send a v2 if the rest seems to be okay.
- Alex
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 -> 2.0.1
2014-06-15 20:06 ` [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 -> 2.0.1 Alexander Aring
2014-06-15 20:51 ` Alexander Aring
@ 2014-06-16 18:22 ` Michael Olbrich
2014-06-16 19:03 ` Alexander Aring
1 sibling, 1 reply; 12+ messages in thread
From: Michael Olbrich @ 2014-06-16 18:22 UTC (permalink / raw)
To: ptxdist
On Sun, Jun 15, 2014 at 10:06:45PM +0200, Alexander Aring wrote:
> This patch updated the kbd package to version 2.0.1 and add many new
> tools option which are available to install.
>
> Also add options to install consolefonts, consoletrans, keymaps, etc...
>
> Add new patch for remove the building for tests which also check for
> "check" which is not necessary.
>
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ---
> I didn't check if I can really change the font on a console interface.
> Sorry!
>
> .../0001-getkeycode-show-reserved-scancode.patch | 33 -----
> patches/kbd-1.15.2/series | 1 -
> ...configure-don-t-depend-on-check-for-tests.patch | 53 +++++++
> .../0002-getkeycode-show-reserved-scancode.patch | 34 +++++
> patches/kbd-2.0.1/autogen.sh | 1 +
> patches/kbd-2.0.1/series | 2 +
> rules/kbd.in | 153 +++++++++++++++++++--
> rules/kbd.make | 90 ++++++++----
> 8 files changed, 295 insertions(+), 72 deletions(-)
> delete mode 100644 patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
> delete mode 100644 patches/kbd-1.15.2/series
> create mode 100644 patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
> create mode 100644 patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
> create mode 120000 patches/kbd-2.0.1/autogen.sh
> create mode 100644 patches/kbd-2.0.1/series
>
> diff --git a/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch b/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
> deleted file mode 100644
> index de0c9f8..0000000
> --- a/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From 3b6394ed6c8f26a4c59ce1446b40af9db6100f44 Mon Sep 17 00:00:00 2001
> -From: Luotao Fu <l.fu@pengutronix.de>
> -Date: Fri, 4 Jun 2010 10:36:42 +0200
> -Subject: [PATCH] getkeycode: show reserved scancode
> -
> -The scancode 0 is usually reserved. Hence the getkeycodes starts scanning at 1.
> -However, the scancode can still be used in some special cases, e.g. for a matrix
> -keypad with board specific combination of keycodes and scancodes. This one
> -change the scan range to start from 0.
> -
> -probably not for mainline, as far kdb is maintained et all.
> -
> -Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
> ----
> - src/getkeycodes.c | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> -diff --git a/src/getkeycodes.c b/src/getkeycodes.c
> -index 6504e7e..2ea5298 100644
> ---- a/src/getkeycodes.c
> -+++ b/src/getkeycodes.c
> -@@ -47,7 +47,7 @@ main(int argc, char **argv) {
> - old_kernel = 1;
> - sc0 = 89;
> - } else
> -- for (sc0 = 1; sc0 <= 88; sc0++) {
> -+ for (sc0 = 0; sc0 <= 88; sc0++) {
> - a.scancode = sc0;
> - a.keycode = 0;
> - if (ioctl(fd, KDGETKEYCODE, &a) || a.keycode != sc0)
> ---
> -1.7.1
> -
> diff --git a/patches/kbd-1.15.2/series b/patches/kbd-1.15.2/series
> deleted file mode 100644
> index d6cc8bd..0000000
> --- a/patches/kbd-1.15.2/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -0001-getkeycode-show-reserved-scancode.patch
> diff --git a/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch b/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
> new file mode 100644
> index 0000000..caefa5e
> --- /dev/null
> +++ b/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
> @@ -0,0 +1,53 @@
> +From 6913deb7278f4f145e7deb8a6102dec843aeac0b Mon Sep 17 00:00:00 2001
> +From: Alexander Aring <alex.aring@gmail.com>
> +Date: Sun, 15 Jun 2014 15:48:20 +0200
> +Subject: [PATCH 1/2] Makefile: configure: don't depend on check for tests
> +
> +This patch removes the dependency for check and removes the build of the tests
> +environment.
> +
> +Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> +---
> + Makefile.am | 2 +-
> + configure.ac | 5 +----
> + 2 files changed, 2 insertions(+), 5 deletions(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index 89c7e83..beb6e29 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -8,7 +8,7 @@ EXTRA_DIST = \
> + CREDITS \
> + contrib docs rc
> +
> +-SUBDIRS = src data po tests docs
> ++SUBDIRS = src data po docs
> +
> + kbd-$(VERSION).tar.xz:
> + make distcheck
> +diff --git a/configure.ac b/configure.ac
> +index 960cc07..fea8605 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -11,8 +11,6 @@ AM_INIT_AUTOMAKE([1.9 -Wall color-tests dist-xz])
> + AC_CONFIG_SRCDIR([src/loadkeys.c])
> + AC_CONFIG_HEADERS(config.h)
> +
> +-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
> +-
> + m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
> + AM_SILENT_RULES([yes])
> +
> +@@ -138,8 +136,7 @@ AC_CONFIG_FILES([Makefile
> + po/Makefile.in
> + src/Makefile
> + src/libkeymap/Makefile
> +- src/vlock/Makefile
> +- tests/Makefile])
> ++ src/vlock/Makefile])
This change is unneded. It should still be possible to generate
tests/Makefile.
> + AC_OUTPUT
> +
> + AC_MSG_RESULT([
> +--
> +2.0.0
> +
> diff --git a/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch b/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
> new file mode 100644
> index 0000000..2e12281
> --- /dev/null
> +++ b/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
> @@ -0,0 +1,34 @@
> +From 75370786760aaf74b032e6ab518735eed97e6550 Mon Sep 17 00:00:00 2001
> +From: Luotao Fu <l.fu@pengutronix.de>
> +Date: Fri, 4 Jun 2010 10:36:42 +0200
> +Subject: [PATCH 2/2] getkeycode: show reserved scancode
> +
> +The scancode 0 is usually reserved. Hence the getkeycodes starts scanning at 1.
> +However, the scancode can still be used in some special cases, e.g. for a matrix
> +keypad with board specific combination of keycodes and scancodes. This one
> +change the scan range to start from 0.
> +
> +probably not for mainline, as far kdb is maintained et all.
> +
> +Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
> +Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> +---
> + src/getkeycodes.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/getkeycodes.c b/src/getkeycodes.c
> +index d1fccf9..500fc5f 100644
> +--- a/src/getkeycodes.c
> ++++ b/src/getkeycodes.c
> +@@ -44,7 +44,7 @@ main(int argc, char **argv) {
> + if (ioctl(fd, KDGETKEYCODE, &a)) {
> + sc0 = 89;
> + } else
> +- for (sc0 = 1; sc0 <= 88; sc0++) {
> ++ for (sc0 = 0; sc0 <= 88; sc0++) {
> + a.scancode = sc0;
> + a.keycode = 0;
> + if (ioctl(fd, KDGETKEYCODE, &a) || a.keycode != sc0)
> +--
> +2.0.0
> +
> diff --git a/patches/kbd-2.0.1/autogen.sh b/patches/kbd-2.0.1/autogen.sh
> new file mode 120000
> index 0000000..9f8a4cb
> --- /dev/null
> +++ b/patches/kbd-2.0.1/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/patches/kbd-2.0.1/series b/patches/kbd-2.0.1/series
> new file mode 100644
> index 0000000..c0a3247
> --- /dev/null
> +++ b/patches/kbd-2.0.1/series
> @@ -0,0 +1,2 @@
> +0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
> +0002-getkeycode-show-reserved-scancode.patch
> diff --git a/rules/kbd.in b/rules/kbd.in
> index ab35c8c..dbde1ba 100644
> --- a/rules/kbd.in
> +++ b/rules/kbd.in
> @@ -7,19 +7,44 @@ menuconfig KBD
> The kbd package contains keytable files and keyboard utilities
> compatible with kernel version 1.1.54 and later. Setfont requires
> 1.1.92 or later.
> +
> if KBD
>
> +config KBD_CHVT
> + bool
> + prompt "chvt"
> + depends on !BUSYBOX_CHVT || ALLYES
> + help
> + chvt - change foreground virtual terminal
> +
> +comment "BusyBox' chvt is selected!"
> + depends on BUSYBOX_CHVT
> +
> +config KBD_DEALLOCVT
> + bool
> + prompt "deallocvt"
> + depends on !BUSYBOX_DEALLOCVT || ALLYES
> + help
> + deallocvt - deallocate unused virtual terminals
> +
> +comment "BusyBox' deallocvt is selected!"
> + depends on BUSYBOX_DEALLOCVT
> +
> config KBD_DUMPKEYS
> bool
> prompt "dumpkeys"
> help
> dumpkeys - dump keyboard translation tables
>
> -config KBD_LOADKEYS
> +config KBD_FGCONSOLE
> bool
> - prompt "loadkeys"
> + prompt "fgconsole"
> + depends on !BUSYBOX_FGCONSOLE || ALLYES
> help
> - loadkeys - load keyboard translation tables
> + print the number of the active VT
> +
> +comment "BusyBox' fgconsole is selected!"
> + depends on BUSYBOX_FGCONSOLE
>
> config KBD_GETKEYCODES
> bool
> @@ -27,6 +52,64 @@ config KBD_GETKEYCODES
> help
> getkeycodes - print kernel scancode-to-keycode mapping table
>
> +config KBD_KBDINFO
> + bool
> + prompt "kbdinfo"
> + help
> + show kbd information
> +
> +config KBD_KBD_MODE
> + bool
> + prompt "kbd_mode"
> + help
> + report or set the keyboard mode
> +
> +config KBD_KBDRATE
> + bool
> + prompt "kbdrate"
> + help
> + reset the keyboard repeat rate and delay time
> +
> +config KBD_LOADKEYS
> + bool
> + prompt "loadkeys"
> + help
> + loadkeys - load keyboard translation tables
> +
> +config KBD_LOADUNIMAP
> + bool
> + prompt "loadunimap"
> + help
> + load the kernel unicode-to-font mapping table
> +
> +config KBD_MAPSCRN
> + bool
> + prompt "mapscrn"
> + help
> + load screen output mapping table
> +
> +config KBD_OPENVT
> + bool
> + prompt "openvt"
> + depends on !BUSYBOX_OPENVT || ALLYES
> + help
> + start a program on a new virtual terminal (VT)
> +
> +comment "BusyBox' openvt is selected!"
> + depends on BUSYBOX_OPENVT
> +
> +config KBD_PSFXTABLE
> + bool
> + prompt "psfxtable"
> + help
> + handle Unicode character tables for console fonts
> +
> +config KBD_SETFONT
> + bool
> + prompt "setfont"
> + help
> + load EGA/VGA console screen font
> +
> config KBD_SETKEYCODES
> bool
> prompt "setkeycodes"
> @@ -37,6 +120,30 @@ config KBD_SETKEYCODES
> comment "BusyBox' setkeycodes is selected!"
> depends on BUSYBOX_SETKEYCODES
>
> +config KBD_SETLEDS
> + bool
> + prompt "setleds"
> + help
> + set the keyboard leds
> +
> +config KBD_SETMETAMODE
> + bool
> + prompt "setmetamode"
> + help
> + define the keyboard meta key handling
> +
> +config KBD_SETVTRGB
> + bool
> + prompt "setvtrgb"
> + help
> + set the virtual terminal RGB colors
> +
> +config KBD_SHOWCONSOLEFONT
> + bool
> + prompt "showconsolefont"
> + help
> + Show the current EGA/VGA console screen font
> +
> config KBD_SHOWKEY
> bool
> prompt "showkey"
> @@ -47,24 +154,40 @@ config KBD_SHOWKEY
> comment "BusyBox' showkey is selected!"
> depends on BUSYBOX_SHOWKEY
>
> -config KBD_CHVT
> +config KBD_UNICODE_START
> bool
> - prompt "chvt"
> - depends on !BUSYBOX_CHVT || ALLYES
> + prompt "unicode_start"
> help
> - chvt - change foreground virtual terminal
> + put keyboard and console in unicode mode
>
> -comment "BusyBox' chvt is selected!"
> - depends on BUSYBOX_CHVT
> +config KBD_UNICODE_STOP
> + bool
> + prompt "unicode_stop"
> + help
> + revert keyboard and console from unicode mode
>
> -config KBD_DEALLOCVT
> +config KBD_CONSOLEFONTS
> bool
> - prompt "deallocvt"
> - depends on !BUSYBOX_DEALLOCVT || ALLYES
> + prompt "install consolefonts"
> help
> - deallocvt - deallocate unused virtual terminals
> + install consolefonts to /usr/share/consolefonts
>
> -comment "BusyBox' deallocvt is selected!"
> - depends on BUSYBOX_DEALLOCVT
> +config KBD_CONSOLETRANS
> + bool
> + prompt "install consoletrans"
> + help
> + install consoletrans to /usr/share/consoletrans
> +
> +config KBD_KEYMAPS
> + bool
> + prompt "install keymaps"
> + help
> + install keymaps to /usr/share/keymaps
> +
> +config KBD_UNIMAPS
> + bool
> + prompt "install unimaps"
> + help
> + install unimaps to /usr/share/unimaps
>
> endif
> diff --git a/rules/kbd.make b/rules/kbd.make
> index 9c51e04..8f28aca 100644
> --- a/rules/kbd.make
> +++ b/rules/kbd.make
> @@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_KBD) += kbd
> #
> # Paths and names
> #
> -KBD_VERSION := 1.15.2
> -KBD_MD5 := e850eb91e4d3b94b194efe8e953204c5
> +KBD_VERSION := 2.0.1
> +KBD_MD5 := e9f2b7046312c11cec9e52e22f307b6a
> KBD := kbd-$(KBD_VERSION)
> -KBD_SUFFIX := tar.bz2
> +KBD_SUFFIX := tar.gz
> KBD_URL := $(call ptx/mirror, KERNEL, utils/kbd/$(KBD).$(KBD_SUFFIX))
> KBD_SOURCE := $(SRCDIR)/$(KBD).$(KBD_SUFFIX)
> KBD_DIR := $(BUILDDIR)/$(KBD)
> @@ -32,16 +32,41 @@ KBD_LICENSE := GPLv2+
> #
> # autoconf
> #
> -KBD_CONF_TOOL := autoconf
> -KBD_CONF_OPT := \
> +KBD_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> --disable-nls \
> --disable-rpath \
> - --disable-klibc \
> - --disable-klibc-layout \
> + --disable-optional-progs \
> + --disable-libkeymap \
> + --disable-vlock \
> --without-libiconv-prefix \
> --without-libintl-prefix
>
> +
> +KBD_TOOLS-y :=
> +KBD_TOOLS-$(PTXCONF_KBD_CHVT) += chvt
> +KBD_TOOLS-$(PTXCONF_KBD_DEALLOCVT) += deallocvt
> +KBD_TOOLS-$(PTXCONF_KBD_DUMPKEYS) += dumpkeys
> +KBD_TOOLS-$(PTXCONF_KBD_FGCONSOLE) += fgconsole
> +KBD_TOOLS-$(PTXCONF_KBD_GETKEYCODES) += getkeycodes
> +KBD_TOOLS-$(PTXCONF_KBD_KBDINFO) += kbdinfo
> +KBD_TOOLS-$(PTXCONF_KBD_KBD_MODE) += kbd_mode
> +KBD_TOOLS-$(PTXCONF_KBD_KBDRATE) += kbdrate
> +KBD_TOOLS-$(PTXCONF_KBD_LOADKEYS) += loadkeys
> +KBD_TOOLS-$(PTXCONF_KBD_LOADUNIMAP) += loadunimap
> +KBD_TOOLS-$(PTXCONF_KBD_MAPSCRN) += mapscrn
> +KBD_TOOLS-$(PTXCONF_KBD_OPENVT) += openvt
> +KBD_TOOLS-$(PTXCONF_KBD_PSFXTABLE) += psfxtable
> +KBD_TOOLS-$(PTXCONF_KBD_SETFONT) += setfont
> +KBD_TOOLS-$(PTXCONF_KBD_SETKEYCODES) += setkeycodes
> +KBD_TOOLS-$(PTXCONF_KBD_SETLEDS) += setleds
> +KBD_TOOLS-$(PTXCONF_KBD_SETMETAMODE) += setmetamode
> +KBD_TOOLS-$(PTXCONF_KBD_SETVTRGB) += setvtrgb
> +KBD_TOOLS-$(PTXCONF_KBD_SHOWCONSOLEFONT) += showconsolefont
> +KBD_TOOLS-$(PTXCONF_KBD_SHOWKEY) += showkey
> +KBD_TOOLS-$(PTXCONF_KBD_UNICODE_START) += unicode_start
> +KBD_TOOLS-$(PTXCONF_KBD_UNICODE_STOP) += unicode_stop
> +
> # ----------------------------------------------------------------------------
> # Target-Install
> # ----------------------------------------------------------------------------
> @@ -55,32 +80,51 @@ $(STATEDIR)/kbd.targetinstall:
> @$(call install_fixup, kbd,AUTHOR,"Luotao Fu <l.fu@pengutronix.de>")
> @$(call install_fixup, kbd,DESCRIPTION,missing)
>
> -ifdef PTXCONF_KBD_DUMPKEYS
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/dumpkeys)
> -endif
> + @$(foreach tool,$(KBD_TOOLS-y), \
> + $(call install_copy, kbd, 0, 0, 0755, -, \
> + /usr/bin/$(tool));)
>
> -ifdef PTXCONF_KBD_LOADKEYS
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/loadkeys)
> +ifdef PTXCONF_KBD_PSFXTABLE
> + @$(call install_link, kbd, psfxtable, /usr/bin/psfaddtable)
> + @$(call install_link, kbd, psfxtable, /usr/bin/psfgettable)
> + @$(call install_link, kbd, psfxtable, /usr/bin/psfstriptable)
Why don't you add these to KBD_TOOLS-y as well?
> endif
>
> -ifdef PTXCONF_KBD_GETKEYCODES
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/getkeycodes)
> -endif
>
> -ifdef PTXCONF_KBD_SETKEYCODES
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/setkeycodes)
> +ifdef PTXCONF_KBD_CONSOLEFONTS
> + @cd $(KBD_PKGDIR)/usr/share/consolefonts; \
use '&&', otherwise stange things happen, if the directory does not exist.
> + find . -type f | while read file; do \
> + $(call install_copy, kbd, 0, 0, 0644, -, \
> + /usr/share/consolefonts/$$file); \
Use tabs!
> + done
> endif
>
> -ifdef PTXCONF_KBD_SHOWKEY
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/showkey)
> +ifdef PTXCONF_KBD_CONSOLETRANS
> + @cd $(KBD_PKGDIR)/usr/share/consoletrans; \
Same here.
> + find . -type f | while read file; do \
> + $(call install_copy, kbd, 0, 0, 0644, -, \
> + /usr/share/consoletrans/$$file); \
Same here.
> + done
> endif
>
> -ifdef PTXCONF_KBD_CHVT
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/chvt)
> +ifdef PTXCONF_KBD_KEYMAPS
> + @cd $(KBD_PKGDIR)/usr/share/keymaps; \
Same here.
> + find . -type f | while read file; do \
> + $(call install_copy, kbd, 0, 0, 0644, -, \
> + /usr/share/keymaps/$$file); \
> + done
Same here.
> +
> + @$(call install_link, kbd, mac, ppc)
> endif
>
> -ifdef PTXCONF_KBD_DEALLOCVT
> - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/deallocvt)
> +ifdef PTXCONF_KBD_UNIMAPS
> + @cd $(KBD_PKGDIR)/usr/share/unimaps; \
Same here.
> + find . -type f | while read file; do \
> + $(call install_copy, kbd, 0, 0, 0644, -, \
> + /usr/share/unimaps/$$file); \
> + done
Same here.
Michael
> +
> + @$(call install_link, kbd, mac, ppc)
> endif
>
> @$(call install_finish, kbd)
> --
> 2.0.0
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [ptxdist] [PATCH 4/4] cmatrix: add new package
2014-06-15 20:06 ` [ptxdist] [PATCH 4/4] cmatrix: add new package Alexander Aring
@ 2014-06-16 18:47 ` Michael Olbrich
2014-06-16 19:06 ` Alexander Aring
0 siblings, 1 reply; 12+ messages in thread
From: Michael Olbrich @ 2014-06-16 18:47 UTC (permalink / raw)
To: ptxdist
On Sun, Jun 15, 2014 at 10:06:46PM +0200, Alexander Aring wrote:
> This is a must have tool for linux hackers. This tool isn't
> cross-compile friendly. The added patch removes the static filename
> check for consolefonts path. This is removed and should handeld by a
> select on KBD_CONSOLEFONTS.
>
> Another issue is that "make install-data-local" should install fonts
> into consolefonts directory. This is also a static path without a
> ${prefix} variable. This is solved by install the necessary fonts
> manually in targetinstall. Currently there is no X11 font support.
This needs to be fixed. 'make install' fails here with:
[...]/install: cannot create regular file '/usr/share/consolefonts/matrix.fnt': Permission denied
[...]/install: cannot create regular file '/usr/share/consolefonts/matrix.psf.gz': Permission denied
This needs to be patched. Create $(DESTDIR)/usr/share/consolefonts/ and
install the fonts there.
>
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ---
> ...emove-check-on-file-and-check-on-mkfontdi.patch | 68 ++++++++++++++++++++++
> patches/cmatrix-1.2a/autogen.sh | 1 +
> patches/cmatrix-1.2a/series | 1 +
> rules/cmatrix.in | 11 ++++
> rules/cmatrix.make | 59 +++++++++++++++++++
> 5 files changed, 140 insertions(+)
> create mode 100644 patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
> create mode 120000 patches/cmatrix-1.2a/autogen.sh
> create mode 100644 patches/cmatrix-1.2a/series
> create mode 100644 rules/cmatrix.in
> create mode 100644 rules/cmatrix.make
>
> diff --git a/patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch b/patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
> new file mode 100644
> index 0000000..ee3b478
> --- /dev/null
> +++ b/patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
> @@ -0,0 +1,68 @@
> +From 29c8a5853843749a581e839be9bd869e32a85913 Mon Sep 17 00:00:00 2001
> +From: Alexander Aring <alex.aring@gmail.com>
> +Date: Sun, 15 Jun 2014 19:14:30 +0200
> +Subject: [PATCH] configure: remove check on file and check on mkfontdir
> +
> +This patch removes the check on files which should be handled by ptxdist
> +and dependencies. We cannot use a AC_CHECK_FILES on cross compiling.
This patch is not needed, if you set:
CMATRIX_CONF_ENV := \
$(CROSS_ENV) \
ac_cv_file__usr_lib_kbd_consolefonts=no \
ac_cv_file__usr_share_consolefonts=yes \
ac_cv_file__usr_lib_X11_fonts_misc=no \
ac_cv_file__usr_X11R6_lib_X11_fonts_misc=no
> +
> +Also drop support for X11 mkfontdir util search.
> +
> +Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> +---
> + configure.in | 39 ---------------------------------------
> + 1 file changed, 39 deletions(-)
> +
> +diff --git a/configure.in b/configure.in
> +index 509f63f..a7611b0 100644
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -81,45 +81,6 @@ else
> + AC_DEFINE_UNQUOTED(HAVE_CONSOLECHARS, $CONSOLECHARS)
> + fi
> +
> +-if test x$CONSOLECHARS != x -o x$CONSOLECHARS != x'"$CONSOLECHARS"'; then
> +- if test x$SETFONT != x -o x$SETFONT != x'"$SETFONT"'; then
> +-
> +- dnl Now look for the console fonts directory...
> +- AC_CHECK_FILES([/usr/lib/kbd/consolefonts /usr/share/consolefonts])
> +-
> +- if test "x$ac_cv_file__usr_lib_kbd_consolefonts" = "xno"; then
> +- if test "x$ac_cv_file__usr_share_consolefonts" = "xno"; then
> +- AC_MSG_WARN([
> +-
> +-*** You do not appear to have a consolefonts directory in a standard location
> +-*** (/usr/lib/kbd or /usr/share), even though you appear to have the
> +-*** consolechars and/or setfont command. The matrix font for the console
> +-*** will not be installed. This means you will not be able to use the
> +-*** matrix console font (and the -l command line switch) unless the font
> +-*** is located in your current directory when you run CMatrix.
> +-])
> +- fi
> +- fi
> +- fi
> +-fi
> +-
> +-
> +-AC_PATH_PROG(MKFONTDIR, mkfontdir, "", $PATH:/usr/bin:/usr/bin/X11:/usr/local/bin/X11:/usr/X11R6/bin:/usr/local/bin:/sbin:/usr/sbin)
> +-AC_CHECK_FILES([/usr/lib/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc])
> +-
> +-if test "x$ac_cv_file__usr_lib_X11_fonts_misc" = "xno"; then
> +- if test "x$ac_cv_file__usr_X11R6_lib_X11_fonts_misc" = "xno"; then
> +- AC_MSG_WARN([
> +-
> +-*** You do not appear to have an X window fonts directory in the standard
> +-*** locations (/usr/lib/X11/fonts/misc or /usr/X11R6/lib/X11/fonts/misc). The
> +-*** mtx.pcf font will not be installed. This means you will probably not
> +-*** be able to use the mtx fonts in your x terminals, and hence be unable
> +-*** to use the -x command line switch. Sorry about that...
> +-])
> +- fi
> +- fi
> +-
> + dnl Parse any configure options
> +
> + LIBS="$LIBS $CURSES_LIB"
> +--
> +2.0.0
> +
> diff --git a/patches/cmatrix-1.2a/autogen.sh b/patches/cmatrix-1.2a/autogen.sh
> new file mode 120000
> index 0000000..9f8a4cb
> --- /dev/null
> +++ b/patches/cmatrix-1.2a/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/patches/cmatrix-1.2a/series b/patches/cmatrix-1.2a/series
> new file mode 100644
> index 0000000..409d01e
> --- /dev/null
> +++ b/patches/cmatrix-1.2a/series
> @@ -0,0 +1 @@
> +0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
> diff --git a/rules/cmatrix.in b/rules/cmatrix.in
> new file mode 100644
> index 0000000..d1903ab
> --- /dev/null
> +++ b/rules/cmatrix.in
> @@ -0,0 +1,11 @@
> +## SECTION=shell_and_console
Maybe games is a better section, even if it's not really a game.
> +
> +config CMATRIX
> + tristate
> + prompt "cmatrix"
> + select NCURSES
> + select KBD
> + select KBD_SETFONT
> + select KBD_CONSOLEFONTS
> + help
> + Shows a scrolling 'Matrix' like screen in Linux.
> diff --git a/rules/cmatrix.make b/rules/cmatrix.make
> new file mode 100644
> index 0000000..d4ef7f6
> --- /dev/null
> +++ b/rules/cmatrix.make
> @@ -0,0 +1,59 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2014 by Alexander Aring <aar@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_CMATRIX) += cmatrix
> +
> +#
> +# Paths and names
> +#
> +CMATRIX_VERSION := 1.2a
> +CMATRIX_MD5 := ebfb5733104a258173a9ccf2669968a1
> +CMATRIX := cmatrix-$(CMATRIX_VERSION)
> +CMATRIX_SUFFIX := tar.gz
> +CMATRIX_URL := http://www.asty.org/cmatrix/dist/$(CMATRIX).$(CMATRIX_SUFFIX)
> +CMATRIX_SOURCE := $(SRCDIR)/$(CMATRIX).$(CMATRIX_SUFFIX)
> +CMATRIX_DIR := $(BUILDDIR)/$(CMATRIX)
> +CMATRIX_LICENSE := GPLv2
> +
# ----------------------------------------------------------------------------
# Prepare
# ----------------------------------------------------------------------------
and the env as specified above.
> +#
> +# autoconf
> +#
> +CMATRIX_CONF_OPT := \
> + $(CROSS_AUTOCONF_USR) \
> + --disable-debug
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/cmatrix.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, cmatrix)
> + @$(call install_fixup, cmatrix,PRIORITY,optional)
> + @$(call install_fixup, cmatrix,SECTION,base)
> + @$(call install_fixup, cmatrix,AUTHOR,"Alexander Aring <aar@pengutronix.de>")
> + @$(call install_fixup, cmatrix,DESCRIPTION,missing)
> +
> + @$(call install_copy, cmatrix, 0, 0, 0755, -, /usr/bin/cmatrix)
> +
> + @$(call install_copy, cmatrix, 0, 0, 0644, $(CMATRIX_DIR)/matrix.fnt, \
> + /usr/share/consolefonts/matrix.fnt)
> + @$(call install_copy, cmatrix, 0, 0, 0644, $(CMATRIX_DIR)/matrix.psf.gz, \
> + /usr/share/consolefonts/matrix.psf.gz)
You can drop the source path, once you have the new patch I mentioned.
Michael
> +
> + @$(call install_finish, cmatrix)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.0.0
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [ptxdist] [PATCH 1/4] libusb: fix libusbx to libusb prompt
2014-06-15 20:06 [ptxdist] [PATCH 1/4] libusb: fix libusbx to libusb prompt Alexander Aring
` (2 preceding siblings ...)
2014-06-15 20:06 ` [ptxdist] [PATCH 4/4] cmatrix: add new package Alexander Aring
@ 2014-06-16 19:00 ` Michael Olbrich
3 siblings, 0 replies; 12+ messages in thread
From: Michael Olbrich @ 2014-06-16 19:00 UTC (permalink / raw)
To: ptxdist
On Sun, Jun 15, 2014 at 10:06:43PM +0200, Alexander Aring wrote:
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Thanks, applied.
Michael
> ---
> rules/libusb.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules/libusb.in b/rules/libusb.in
> index ff1a797..6121352 100644
> --- a/rules/libusb.in
> +++ b/rules/libusb.in
> @@ -4,7 +4,7 @@ menuconfig LIBUSB
> tristate
> select LIBC_RT
> select LIBC_PTHREAD
> - prompt "libusbx-1.x "
> + prompt "libusb-1.x "
> help
> Library for programming USB applications without the
> knowledge of Linux kernel internals.
> --
> 2.0.0
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
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] 12+ messages in thread
* Re: [ptxdist] [PATCH 2/4] protobuf: version bump 2.4.1 -> 2.5.0
2014-06-15 20:06 ` [ptxdist] [PATCH 2/4] protobuf: version bump 2.4.1 -> 2.5.0 Alexander Aring
@ 2014-06-16 19:01 ` Michael Olbrich
0 siblings, 0 replies; 12+ messages in thread
From: Michael Olbrich @ 2014-06-16 19:01 UTC (permalink / raw)
To: ptxdist
On Sun, Jun 15, 2014 at 10:06:44PM +0200, Alexander Aring wrote:
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Thanks, applied.
Michael
> ---
> rules/protobuf.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/protobuf.make b/rules/protobuf.make
> index 6a3a42c..3725a1f 100644
> --- a/rules/protobuf.make
> +++ b/rules/protobuf.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_PROTOBUF) += protobuf
> #
> # Paths and names
> #
> -PROTOBUF_VERSION := 2.4.1
> -PROTOBUF_MD5 := ed436802019c9e1f40cc750eaf78f318
> +PROTOBUF_VERSION := 2.5.0
> +PROTOBUF_MD5 := a72001a9067a4c2c4e0e836d0f92ece4
> PROTOBUF := protobuf-$(PROTOBUF_VERSION)
> PROTOBUF_SUFFIX := tar.bz2
> PROTOBUF_URL := http://protobuf.googlecode.com/files/$(PROTOBUF).$(PROTOBUF_SUFFIX)
> --
> 2.0.0
>
>
> --
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
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] 12+ messages in thread
* Re: [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 -> 2.0.1
2014-06-16 18:22 ` Michael Olbrich
@ 2014-06-16 19:03 ` Alexander Aring
2014-06-16 19:15 ` Michael Olbrich
0 siblings, 1 reply; 12+ messages in thread
From: Alexander Aring @ 2014-06-16 19:03 UTC (permalink / raw)
To: ptxdist
On Mon, Jun 16, 2014 at 08:22:38PM +0200, Michael Olbrich wrote:
> On Sun, Jun 15, 2014 at 10:06:45PM +0200, Alexander Aring wrote:
> > This patch updated the kbd package to version 2.0.1 and add many new
> > tools option which are available to install.
> >
> > Also add options to install consolefonts, consoletrans, keymaps, etc...
> >
> > Add new patch for remove the building for tests which also check for
> > "check" which is not necessary.
> >
> > Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> > ---
> > I didn't check if I can really change the font on a console interface.
> > Sorry!
> >
> > .../0001-getkeycode-show-reserved-scancode.patch | 33 -----
> > patches/kbd-1.15.2/series | 1 -
> > ...configure-don-t-depend-on-check-for-tests.patch | 53 +++++++
> > .../0002-getkeycode-show-reserved-scancode.patch | 34 +++++
> > patches/kbd-2.0.1/autogen.sh | 1 +
> > patches/kbd-2.0.1/series | 2 +
> > rules/kbd.in | 153 +++++++++++++++++++--
> > rules/kbd.make | 90 ++++++++----
> > 8 files changed, 295 insertions(+), 72 deletions(-)
> > delete mode 100644 patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
> > delete mode 100644 patches/kbd-1.15.2/series
> > create mode 100644 patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
> > create mode 100644 patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
> > create mode 120000 patches/kbd-2.0.1/autogen.sh
> > create mode 100644 patches/kbd-2.0.1/series
> >
> > diff --git a/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch b/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
> > deleted file mode 100644
> > index de0c9f8..0000000
> > --- a/patches/kbd-1.15.2/0001-getkeycode-show-reserved-scancode.patch
> > +++ /dev/null
> > @@ -1,33 +0,0 @@
> > -From 3b6394ed6c8f26a4c59ce1446b40af9db6100f44 Mon Sep 17 00:00:00 2001
> > -From: Luotao Fu <l.fu@pengutronix.de>
> > -Date: Fri, 4 Jun 2010 10:36:42 +0200
> > -Subject: [PATCH] getkeycode: show reserved scancode
> > -
> > -The scancode 0 is usually reserved. Hence the getkeycodes starts scanning at 1.
> > -However, the scancode can still be used in some special cases, e.g. for a matrix
> > -keypad with board specific combination of keycodes and scancodes. This one
> > -change the scan range to start from 0.
> > -
> > -probably not for mainline, as far kdb is maintained et all.
> > -
> > -Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
> > ----
> > - src/getkeycodes.c | 2 +-
> > - 1 files changed, 1 insertions(+), 1 deletions(-)
> > -
> > -diff --git a/src/getkeycodes.c b/src/getkeycodes.c
> > -index 6504e7e..2ea5298 100644
> > ---- a/src/getkeycodes.c
> > -+++ b/src/getkeycodes.c
> > -@@ -47,7 +47,7 @@ main(int argc, char **argv) {
> > - old_kernel = 1;
> > - sc0 = 89;
> > - } else
> > -- for (sc0 = 1; sc0 <= 88; sc0++) {
> > -+ for (sc0 = 0; sc0 <= 88; sc0++) {
> > - a.scancode = sc0;
> > - a.keycode = 0;
> > - if (ioctl(fd, KDGETKEYCODE, &a) || a.keycode != sc0)
> > ---
> > -1.7.1
> > -
> > diff --git a/patches/kbd-1.15.2/series b/patches/kbd-1.15.2/series
> > deleted file mode 100644
> > index d6cc8bd..0000000
> > --- a/patches/kbd-1.15.2/series
> > +++ /dev/null
> > @@ -1 +0,0 @@
> > -0001-getkeycode-show-reserved-scancode.patch
> > diff --git a/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch b/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
> > new file mode 100644
> > index 0000000..caefa5e
> > --- /dev/null
> > +++ b/patches/kbd-2.0.1/0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
> > @@ -0,0 +1,53 @@
> > +From 6913deb7278f4f145e7deb8a6102dec843aeac0b Mon Sep 17 00:00:00 2001
> > +From: Alexander Aring <alex.aring@gmail.com>
> > +Date: Sun, 15 Jun 2014 15:48:20 +0200
> > +Subject: [PATCH 1/2] Makefile: configure: don't depend on check for tests
> > +
> > +This patch removes the dependency for check and removes the build of the tests
> > +environment.
> > +
> > +Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> > +---
> > + Makefile.am | 2 +-
> > + configure.ac | 5 +----
> > + 2 files changed, 2 insertions(+), 5 deletions(-)
> > +
> > +diff --git a/Makefile.am b/Makefile.am
> > +index 89c7e83..beb6e29 100644
> > +--- a/Makefile.am
> > ++++ b/Makefile.am
> > +@@ -8,7 +8,7 @@ EXTRA_DIST = \
> > + CREDITS \
> > + contrib docs rc
> > +
> > +-SUBDIRS = src data po tests docs
> > ++SUBDIRS = src data po docs
> > +
> > + kbd-$(VERSION).tar.xz:
> > + make distcheck
> > +diff --git a/configure.ac b/configure.ac
> > +index 960cc07..fea8605 100644
> > +--- a/configure.ac
> > ++++ b/configure.ac
> > +@@ -11,8 +11,6 @@ AM_INIT_AUTOMAKE([1.9 -Wall color-tests dist-xz])
> > + AC_CONFIG_SRCDIR([src/loadkeys.c])
> > + AC_CONFIG_HEADERS(config.h)
> > +
> > +-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
> > +-
> > + m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
> > + AM_SILENT_RULES([yes])
> > +
> > +@@ -138,8 +136,7 @@ AC_CONFIG_FILES([Makefile
> > + po/Makefile.in
> > + src/Makefile
> > + src/libkeymap/Makefile
> > +- src/vlock/Makefile
> > +- tests/Makefile])
> > ++ src/vlock/Makefile])
>
> This change is unneded. It should still be possible to generate
> tests/Makefile.
>
Ok.
> > + AC_OUTPUT
> > +
> > + AC_MSG_RESULT([
> > +--
> > +2.0.0
> > +
> > diff --git a/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch b/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
> > new file mode 100644
> > index 0000000..2e12281
> > --- /dev/null
> > +++ b/patches/kbd-2.0.1/0002-getkeycode-show-reserved-scancode.patch
> > @@ -0,0 +1,34 @@
> > +From 75370786760aaf74b032e6ab518735eed97e6550 Mon Sep 17 00:00:00 2001
> > +From: Luotao Fu <l.fu@pengutronix.de>
> > +Date: Fri, 4 Jun 2010 10:36:42 +0200
> > +Subject: [PATCH 2/2] getkeycode: show reserved scancode
> > +
> > +The scancode 0 is usually reserved. Hence the getkeycodes starts scanning at 1.
> > +However, the scancode can still be used in some special cases, e.g. for a matrix
> > +keypad with board specific combination of keycodes and scancodes. This one
> > +change the scan range to start from 0.
> > +
> > +probably not for mainline, as far kdb is maintained et all.
> > +
> > +Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
> > +Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> > +---
> > + src/getkeycodes.c | 2 +-
> > + 1 file changed, 1 insertion(+), 1 deletion(-)
> > +
> > +diff --git a/src/getkeycodes.c b/src/getkeycodes.c
> > +index d1fccf9..500fc5f 100644
> > +--- a/src/getkeycodes.c
> > ++++ b/src/getkeycodes.c
> > +@@ -44,7 +44,7 @@ main(int argc, char **argv) {
> > + if (ioctl(fd, KDGETKEYCODE, &a)) {
> > + sc0 = 89;
> > + } else
> > +- for (sc0 = 1; sc0 <= 88; sc0++) {
> > ++ for (sc0 = 0; sc0 <= 88; sc0++) {
> > + a.scancode = sc0;
> > + a.keycode = 0;
> > + if (ioctl(fd, KDGETKEYCODE, &a) || a.keycode != sc0)
> > +--
> > +2.0.0
> > +
> > diff --git a/patches/kbd-2.0.1/autogen.sh b/patches/kbd-2.0.1/autogen.sh
> > new file mode 120000
> > index 0000000..9f8a4cb
> > --- /dev/null
> > +++ b/patches/kbd-2.0.1/autogen.sh
> > @@ -0,0 +1 @@
> > +../autogen.sh
> > \ No newline at end of file
> > diff --git a/patches/kbd-2.0.1/series b/patches/kbd-2.0.1/series
> > new file mode 100644
> > index 0000000..c0a3247
> > --- /dev/null
> > +++ b/patches/kbd-2.0.1/series
> > @@ -0,0 +1,2 @@
> > +0001-Makefile-configure-don-t-depend-on-check-for-tests.patch
> > +0002-getkeycode-show-reserved-scancode.patch
> > diff --git a/rules/kbd.in b/rules/kbd.in
> > index ab35c8c..dbde1ba 100644
> > --- a/rules/kbd.in
> > +++ b/rules/kbd.in
> > @@ -7,19 +7,44 @@ menuconfig KBD
> > The kbd package contains keytable files and keyboard utilities
> > compatible with kernel version 1.1.54 and later. Setfont requires
> > 1.1.92 or later.
> > +
> > if KBD
> >
> > +config KBD_CHVT
> > + bool
> > + prompt "chvt"
> > + depends on !BUSYBOX_CHVT || ALLYES
> > + help
> > + chvt - change foreground virtual terminal
> > +
> > +comment "BusyBox' chvt is selected!"
> > + depends on BUSYBOX_CHVT
> > +
> > +config KBD_DEALLOCVT
> > + bool
> > + prompt "deallocvt"
> > + depends on !BUSYBOX_DEALLOCVT || ALLYES
> > + help
> > + deallocvt - deallocate unused virtual terminals
> > +
> > +comment "BusyBox' deallocvt is selected!"
> > + depends on BUSYBOX_DEALLOCVT
> > +
> > config KBD_DUMPKEYS
> > bool
> > prompt "dumpkeys"
> > help
> > dumpkeys - dump keyboard translation tables
> >
> > -config KBD_LOADKEYS
> > +config KBD_FGCONSOLE
> > bool
> > - prompt "loadkeys"
> > + prompt "fgconsole"
> > + depends on !BUSYBOX_FGCONSOLE || ALLYES
> > help
> > - loadkeys - load keyboard translation tables
> > + print the number of the active VT
> > +
> > +comment "BusyBox' fgconsole is selected!"
> > + depends on BUSYBOX_FGCONSOLE
> >
> > config KBD_GETKEYCODES
> > bool
> > @@ -27,6 +52,64 @@ config KBD_GETKEYCODES
> > help
> > getkeycodes - print kernel scancode-to-keycode mapping table
> >
> > +config KBD_KBDINFO
> > + bool
> > + prompt "kbdinfo"
> > + help
> > + show kbd information
> > +
> > +config KBD_KBD_MODE
> > + bool
> > + prompt "kbd_mode"
> > + help
> > + report or set the keyboard mode
> > +
> > +config KBD_KBDRATE
> > + bool
> > + prompt "kbdrate"
> > + help
> > + reset the keyboard repeat rate and delay time
> > +
> > +config KBD_LOADKEYS
> > + bool
> > + prompt "loadkeys"
> > + help
> > + loadkeys - load keyboard translation tables
> > +
> > +config KBD_LOADUNIMAP
> > + bool
> > + prompt "loadunimap"
> > + help
> > + load the kernel unicode-to-font mapping table
> > +
> > +config KBD_MAPSCRN
> > + bool
> > + prompt "mapscrn"
> > + help
> > + load screen output mapping table
> > +
> > +config KBD_OPENVT
> > + bool
> > + prompt "openvt"
> > + depends on !BUSYBOX_OPENVT || ALLYES
> > + help
> > + start a program on a new virtual terminal (VT)
> > +
> > +comment "BusyBox' openvt is selected!"
> > + depends on BUSYBOX_OPENVT
> > +
> > +config KBD_PSFXTABLE
> > + bool
> > + prompt "psfxtable"
> > + help
> > + handle Unicode character tables for console fonts
> > +
> > +config KBD_SETFONT
> > + bool
> > + prompt "setfont"
> > + help
> > + load EGA/VGA console screen font
> > +
> > config KBD_SETKEYCODES
> > bool
> > prompt "setkeycodes"
> > @@ -37,6 +120,30 @@ config KBD_SETKEYCODES
> > comment "BusyBox' setkeycodes is selected!"
> > depends on BUSYBOX_SETKEYCODES
> >
> > +config KBD_SETLEDS
> > + bool
> > + prompt "setleds"
> > + help
> > + set the keyboard leds
> > +
> > +config KBD_SETMETAMODE
> > + bool
> > + prompt "setmetamode"
> > + help
> > + define the keyboard meta key handling
> > +
> > +config KBD_SETVTRGB
> > + bool
> > + prompt "setvtrgb"
> > + help
> > + set the virtual terminal RGB colors
> > +
> > +config KBD_SHOWCONSOLEFONT
> > + bool
> > + prompt "showconsolefont"
> > + help
> > + Show the current EGA/VGA console screen font
> > +
> > config KBD_SHOWKEY
> > bool
> > prompt "showkey"
> > @@ -47,24 +154,40 @@ config KBD_SHOWKEY
> > comment "BusyBox' showkey is selected!"
> > depends on BUSYBOX_SHOWKEY
> >
> > -config KBD_CHVT
> > +config KBD_UNICODE_START
> > bool
> > - prompt "chvt"
> > - depends on !BUSYBOX_CHVT || ALLYES
> > + prompt "unicode_start"
> > help
> > - chvt - change foreground virtual terminal
> > + put keyboard and console in unicode mode
> >
> > -comment "BusyBox' chvt is selected!"
> > - depends on BUSYBOX_CHVT
> > +config KBD_UNICODE_STOP
> > + bool
> > + prompt "unicode_stop"
> > + help
> > + revert keyboard and console from unicode mode
> >
> > -config KBD_DEALLOCVT
> > +config KBD_CONSOLEFONTS
> > bool
> > - prompt "deallocvt"
> > - depends on !BUSYBOX_DEALLOCVT || ALLYES
> > + prompt "install consolefonts"
> > help
> > - deallocvt - deallocate unused virtual terminals
> > + install consolefonts to /usr/share/consolefonts
> >
> > -comment "BusyBox' deallocvt is selected!"
> > - depends on BUSYBOX_DEALLOCVT
> > +config KBD_CONSOLETRANS
> > + bool
> > + prompt "install consoletrans"
> > + help
> > + install consoletrans to /usr/share/consoletrans
> > +
> > +config KBD_KEYMAPS
> > + bool
> > + prompt "install keymaps"
> > + help
> > + install keymaps to /usr/share/keymaps
> > +
> > +config KBD_UNIMAPS
> > + bool
> > + prompt "install unimaps"
> > + help
> > + install unimaps to /usr/share/unimaps
> >
> > endif
> > diff --git a/rules/kbd.make b/rules/kbd.make
> > index 9c51e04..8f28aca 100644
> > --- a/rules/kbd.make
> > +++ b/rules/kbd.make
> > @@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_KBD) += kbd
> > #
> > # Paths and names
> > #
> > -KBD_VERSION := 1.15.2
> > -KBD_MD5 := e850eb91e4d3b94b194efe8e953204c5
> > +KBD_VERSION := 2.0.1
> > +KBD_MD5 := e9f2b7046312c11cec9e52e22f307b6a
> > KBD := kbd-$(KBD_VERSION)
> > -KBD_SUFFIX := tar.bz2
> > +KBD_SUFFIX := tar.gz
> > KBD_URL := $(call ptx/mirror, KERNEL, utils/kbd/$(KBD).$(KBD_SUFFIX))
> > KBD_SOURCE := $(SRCDIR)/$(KBD).$(KBD_SUFFIX)
> > KBD_DIR := $(BUILDDIR)/$(KBD)
> > @@ -32,16 +32,41 @@ KBD_LICENSE := GPLv2+
> > #
> > # autoconf
> > #
> > -KBD_CONF_TOOL := autoconf
> > -KBD_CONF_OPT := \
> > +KBD_CONF_OPT := \
> > $(CROSS_AUTOCONF_USR) \
> > --disable-nls \
> > --disable-rpath \
> > - --disable-klibc \
> > - --disable-klibc-layout \
> > + --disable-optional-progs \
> > + --disable-libkeymap \
> > + --disable-vlock \
> > --without-libiconv-prefix \
> > --without-libintl-prefix
> >
> > +
> > +KBD_TOOLS-y :=
> > +KBD_TOOLS-$(PTXCONF_KBD_CHVT) += chvt
> > +KBD_TOOLS-$(PTXCONF_KBD_DEALLOCVT) += deallocvt
> > +KBD_TOOLS-$(PTXCONF_KBD_DUMPKEYS) += dumpkeys
> > +KBD_TOOLS-$(PTXCONF_KBD_FGCONSOLE) += fgconsole
> > +KBD_TOOLS-$(PTXCONF_KBD_GETKEYCODES) += getkeycodes
> > +KBD_TOOLS-$(PTXCONF_KBD_KBDINFO) += kbdinfo
> > +KBD_TOOLS-$(PTXCONF_KBD_KBD_MODE) += kbd_mode
> > +KBD_TOOLS-$(PTXCONF_KBD_KBDRATE) += kbdrate
> > +KBD_TOOLS-$(PTXCONF_KBD_LOADKEYS) += loadkeys
> > +KBD_TOOLS-$(PTXCONF_KBD_LOADUNIMAP) += loadunimap
> > +KBD_TOOLS-$(PTXCONF_KBD_MAPSCRN) += mapscrn
> > +KBD_TOOLS-$(PTXCONF_KBD_OPENVT) += openvt
> > +KBD_TOOLS-$(PTXCONF_KBD_PSFXTABLE) += psfxtable
> > +KBD_TOOLS-$(PTXCONF_KBD_SETFONT) += setfont
> > +KBD_TOOLS-$(PTXCONF_KBD_SETKEYCODES) += setkeycodes
> > +KBD_TOOLS-$(PTXCONF_KBD_SETLEDS) += setleds
> > +KBD_TOOLS-$(PTXCONF_KBD_SETMETAMODE) += setmetamode
> > +KBD_TOOLS-$(PTXCONF_KBD_SETVTRGB) += setvtrgb
> > +KBD_TOOLS-$(PTXCONF_KBD_SHOWCONSOLEFONT) += showconsolefont
> > +KBD_TOOLS-$(PTXCONF_KBD_SHOWKEY) += showkey
> > +KBD_TOOLS-$(PTXCONF_KBD_UNICODE_START) += unicode_start
> > +KBD_TOOLS-$(PTXCONF_KBD_UNICODE_STOP) += unicode_stop
> > +
> > # ----------------------------------------------------------------------------
> > # Target-Install
> > # ----------------------------------------------------------------------------
> > @@ -55,32 +80,51 @@ $(STATEDIR)/kbd.targetinstall:
> > @$(call install_fixup, kbd,AUTHOR,"Luotao Fu <l.fu@pengutronix.de>")
> > @$(call install_fixup, kbd,DESCRIPTION,missing)
> >
> > -ifdef PTXCONF_KBD_DUMPKEYS
> > - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/dumpkeys)
> > -endif
> > + @$(foreach tool,$(KBD_TOOLS-y), \
> > + $(call install_copy, kbd, 0, 0, 0755, -, \
> > + /usr/bin/$(tool));)
> >
> > -ifdef PTXCONF_KBD_LOADKEYS
> > - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/loadkeys)
> > +ifdef PTXCONF_KBD_PSFXTABLE
> > + @$(call install_link, kbd, psfxtable, /usr/bin/psfaddtable)
> > + @$(call install_link, kbd, psfxtable, /usr/bin/psfgettable)
> > + @$(call install_link, kbd, psfxtable, /usr/bin/psfstriptable)
>
> Why don't you add these to KBD_TOOLS-y as well?
>
because that are symlinks to psfxtable. I don't know if all to the same
or it works like busybox and evaluate argv[0].
> > endif
> >
> > -ifdef PTXCONF_KBD_GETKEYCODES
> > - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/getkeycodes)
> > -endif
> >
> > -ifdef PTXCONF_KBD_SETKEYCODES
> > - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/setkeycodes)
> > +ifdef PTXCONF_KBD_CONSOLEFONTS
> > + @cd $(KBD_PKGDIR)/usr/share/consolefonts; \
>
> use '&&', otherwise stange things happen, if the directory does not exist.
>
You are right. I copy&pasted it from other fonts install rule
"rules/xorg-fonts.make". There is also no '&&' I will send some patches
for changing this, too.
> > + find . -type f | while read file; do \
> > + $(call install_copy, kbd, 0, 0, 0644, -, \
> > + /usr/share/consolefonts/$$file); \
>
> Use tabs!
>
Oops. Ok and this wasn't copy&pasted... :-)
Thanks Michael.
- Alex
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [ptxdist] [PATCH 4/4] cmatrix: add new package
2014-06-16 18:47 ` Michael Olbrich
@ 2014-06-16 19:06 ` Alexander Aring
0 siblings, 0 replies; 12+ messages in thread
From: Alexander Aring @ 2014-06-16 19:06 UTC (permalink / raw)
To: ptxdist
On Mon, Jun 16, 2014 at 08:47:58PM +0200, Michael Olbrich wrote:
> On Sun, Jun 15, 2014 at 10:06:46PM +0200, Alexander Aring wrote:
> > This is a must have tool for linux hackers. This tool isn't
> > cross-compile friendly. The added patch removes the static filename
> > check for consolefonts path. This is removed and should handeld by a
> > select on KBD_CONSOLEFONTS.
> >
> > Another issue is that "make install-data-local" should install fonts
> > into consolefonts directory. This is also a static path without a
> > ${prefix} variable. This is solved by install the necessary fonts
> > manually in targetinstall. Currently there is no X11 font support.
>
> This needs to be fixed. 'make install' fails here with:
> [...]/install: cannot create regular file '/usr/share/consolefonts/matrix.fnt': Permission denied
> [...]/install: cannot create regular file '/usr/share/consolefonts/matrix.psf.gz': Permission denied
>
> This needs to be patched. Create $(DESTDIR)/usr/share/consolefonts/ and
> install the fonts there.
Ok.
>
> >
> > Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> > ---
> > ...emove-check-on-file-and-check-on-mkfontdi.patch | 68 ++++++++++++++++++++++
> > patches/cmatrix-1.2a/autogen.sh | 1 +
> > patches/cmatrix-1.2a/series | 1 +
> > rules/cmatrix.in | 11 ++++
> > rules/cmatrix.make | 59 +++++++++++++++++++
> > 5 files changed, 140 insertions(+)
> > create mode 100644 patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
> > create mode 120000 patches/cmatrix-1.2a/autogen.sh
> > create mode 100644 patches/cmatrix-1.2a/series
> > create mode 100644 rules/cmatrix.in
> > create mode 100644 rules/cmatrix.make
> >
> > diff --git a/patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch b/patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
> > new file mode 100644
> > index 0000000..ee3b478
> > --- /dev/null
> > +++ b/patches/cmatrix-1.2a/0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
> > @@ -0,0 +1,68 @@
> > +From 29c8a5853843749a581e839be9bd869e32a85913 Mon Sep 17 00:00:00 2001
> > +From: Alexander Aring <alex.aring@gmail.com>
> > +Date: Sun, 15 Jun 2014 19:14:30 +0200
> > +Subject: [PATCH] configure: remove check on file and check on mkfontdir
> > +
> > +This patch removes the check on files which should be handled by ptxdist
> > +and dependencies. We cannot use a AC_CHECK_FILES on cross compiling.
>
> This patch is not needed, if you set:
>
> CMATRIX_CONF_ENV := \
> $(CROSS_ENV) \
> ac_cv_file__usr_lib_kbd_consolefonts=no \
> ac_cv_file__usr_share_consolefonts=yes \
> ac_cv_file__usr_lib_X11_fonts_misc=no \
> ac_cv_file__usr_X11R6_lib_X11_fonts_misc=no
Okay, I had a feeling about to set some ac_cv_* envs, I will try that.
>
> > +
> > +Also drop support for X11 mkfontdir util search.
> > +
> > +Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> > +---
> > + configure.in | 39 ---------------------------------------
> > + 1 file changed, 39 deletions(-)
> > +
> > +diff --git a/configure.in b/configure.in
> > +index 509f63f..a7611b0 100644
> > +--- a/configure.in
> > ++++ b/configure.in
> > +@@ -81,45 +81,6 @@ else
> > + AC_DEFINE_UNQUOTED(HAVE_CONSOLECHARS, $CONSOLECHARS)
> > + fi
> > +
> > +-if test x$CONSOLECHARS != x -o x$CONSOLECHARS != x'"$CONSOLECHARS"'; then
> > +- if test x$SETFONT != x -o x$SETFONT != x'"$SETFONT"'; then
> > +-
> > +- dnl Now look for the console fonts directory...
> > +- AC_CHECK_FILES([/usr/lib/kbd/consolefonts /usr/share/consolefonts])
> > +-
> > +- if test "x$ac_cv_file__usr_lib_kbd_consolefonts" = "xno"; then
> > +- if test "x$ac_cv_file__usr_share_consolefonts" = "xno"; then
> > +- AC_MSG_WARN([
> > +-
> > +-*** You do not appear to have a consolefonts directory in a standard location
> > +-*** (/usr/lib/kbd or /usr/share), even though you appear to have the
> > +-*** consolechars and/or setfont command. The matrix font for the console
> > +-*** will not be installed. This means you will not be able to use the
> > +-*** matrix console font (and the -l command line switch) unless the font
> > +-*** is located in your current directory when you run CMatrix.
> > +-])
> > +- fi
> > +- fi
> > +- fi
> > +-fi
> > +-
> > +-
> > +-AC_PATH_PROG(MKFONTDIR, mkfontdir, "", $PATH:/usr/bin:/usr/bin/X11:/usr/local/bin/X11:/usr/X11R6/bin:/usr/local/bin:/sbin:/usr/sbin)
> > +-AC_CHECK_FILES([/usr/lib/X11/fonts/misc /usr/X11R6/lib/X11/fonts/misc])
> > +-
> > +-if test "x$ac_cv_file__usr_lib_X11_fonts_misc" = "xno"; then
> > +- if test "x$ac_cv_file__usr_X11R6_lib_X11_fonts_misc" = "xno"; then
> > +- AC_MSG_WARN([
> > +-
> > +-*** You do not appear to have an X window fonts directory in the standard
> > +-*** locations (/usr/lib/X11/fonts/misc or /usr/X11R6/lib/X11/fonts/misc). The
> > +-*** mtx.pcf font will not be installed. This means you will probably not
> > +-*** be able to use the mtx fonts in your x terminals, and hence be unable
> > +-*** to use the -x command line switch. Sorry about that...
> > +-])
> > +- fi
> > +- fi
> > +-
> > + dnl Parse any configure options
> > +
> > + LIBS="$LIBS $CURSES_LIB"
> > +--
> > +2.0.0
> > +
> > diff --git a/patches/cmatrix-1.2a/autogen.sh b/patches/cmatrix-1.2a/autogen.sh
> > new file mode 120000
> > index 0000000..9f8a4cb
> > --- /dev/null
> > +++ b/patches/cmatrix-1.2a/autogen.sh
> > @@ -0,0 +1 @@
> > +../autogen.sh
> > \ No newline at end of file
> > diff --git a/patches/cmatrix-1.2a/series b/patches/cmatrix-1.2a/series
> > new file mode 100644
> > index 0000000..409d01e
> > --- /dev/null
> > +++ b/patches/cmatrix-1.2a/series
> > @@ -0,0 +1 @@
> > +0001-configure-remove-check-on-file-and-check-on-mkfontdi.patch
> > diff --git a/rules/cmatrix.in b/rules/cmatrix.in
> > new file mode 100644
> > index 0000000..d1903ab
> > --- /dev/null
> > +++ b/rules/cmatrix.in
> > @@ -0,0 +1,11 @@
> > +## SECTION=shell_and_console
>
> Maybe games is a better section, even if it's not really a game.
>
Ok. We need some eyecandy section, but I will place it into games.
> > +
> > +config CMATRIX
> > + tristate
> > + prompt "cmatrix"
> > + select NCURSES
> > + select KBD
> > + select KBD_SETFONT
> > + select KBD_CONSOLEFONTS
> > + help
> > + Shows a scrolling 'Matrix' like screen in Linux.
> > diff --git a/rules/cmatrix.make b/rules/cmatrix.make
> > new file mode 100644
> > index 0000000..d4ef7f6
> > --- /dev/null
> > +++ b/rules/cmatrix.make
> > @@ -0,0 +1,59 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2014 by Alexander Aring <aar@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_CMATRIX) += cmatrix
> > +
> > +#
> > +# Paths and names
> > +#
> > +CMATRIX_VERSION := 1.2a
> > +CMATRIX_MD5 := ebfb5733104a258173a9ccf2669968a1
> > +CMATRIX := cmatrix-$(CMATRIX_VERSION)
> > +CMATRIX_SUFFIX := tar.gz
> > +CMATRIX_URL := http://www.asty.org/cmatrix/dist/$(CMATRIX).$(CMATRIX_SUFFIX)
> > +CMATRIX_SOURCE := $(SRCDIR)/$(CMATRIX).$(CMATRIX_SUFFIX)
> > +CMATRIX_DIR := $(BUILDDIR)/$(CMATRIX)
> > +CMATRIX_LICENSE := GPLv2
> > +
>
> # ----------------------------------------------------------------------------
> # Prepare
> # ----------------------------------------------------------------------------
>
> and the env as specified above.
>
Yep.
> > +#
> > +# autoconf
> > +#
> > +CMATRIX_CONF_OPT := \
> > + $(CROSS_AUTOCONF_USR) \
> > + --disable-debug
> > +
> > +# ----------------------------------------------------------------------------
> > +# Target-Install
> > +# ----------------------------------------------------------------------------
> > +
> > +$(STATEDIR)/cmatrix.targetinstall:
> > + @$(call targetinfo)
> > +
> > + @$(call install_init, cmatrix)
> > + @$(call install_fixup, cmatrix,PRIORITY,optional)
> > + @$(call install_fixup, cmatrix,SECTION,base)
> > + @$(call install_fixup, cmatrix,AUTHOR,"Alexander Aring <aar@pengutronix.de>")
> > + @$(call install_fixup, cmatrix,DESCRIPTION,missing)
> > +
> > + @$(call install_copy, cmatrix, 0, 0, 0755, -, /usr/bin/cmatrix)
> > +
> > + @$(call install_copy, cmatrix, 0, 0, 0644, $(CMATRIX_DIR)/matrix.fnt, \
> > + /usr/share/consolefonts/matrix.fnt)
> > + @$(call install_copy, cmatrix, 0, 0, 0644, $(CMATRIX_DIR)/matrix.psf.gz, \
> > + /usr/share/consolefonts/matrix.psf.gz)
>
> You can drop the source path, once you have the new patch I mentioned.
>
Ok.
Thanks Michael.
- Alex
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 -> 2.0.1
2014-06-16 19:03 ` Alexander Aring
@ 2014-06-16 19:15 ` Michael Olbrich
0 siblings, 0 replies; 12+ messages in thread
From: Michael Olbrich @ 2014-06-16 19:15 UTC (permalink / raw)
To: ptxdist
On Mon, Jun 16, 2014 at 09:03:43PM +0200, Alexander Aring wrote:
> On Mon, Jun 16, 2014 at 08:22:38PM +0200, Michael Olbrich wrote:
> > On Sun, Jun 15, 2014 at 10:06:45PM +0200, Alexander Aring wrote:
> > > -ifdef PTXCONF_KBD_LOADKEYS
> > > - @$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/loadkeys)
> > > +ifdef PTXCONF_KBD_PSFXTABLE
> > > + @$(call install_link, kbd, psfxtable, /usr/bin/psfaddtable)
> > > + @$(call install_link, kbd, psfxtable, /usr/bin/psfgettable)
> > > + @$(call install_link, kbd, psfxtable, /usr/bin/psfstriptable)
> >
> > Why don't you add these to KBD_TOOLS-y as well?
> >
>
> because that are symlinks to psfxtable. I don't know if all to the same
> or it works like busybox and evaluate argv[0].
You're right. I didn't really read it... Leave it as is.
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] 12+ messages in thread
end of thread, other threads:[~2014-06-16 19:15 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-15 20:06 [ptxdist] [PATCH 1/4] libusb: fix libusbx to libusb prompt Alexander Aring
2014-06-15 20:06 ` [ptxdist] [PATCH 2/4] protobuf: version bump 2.4.1 -> 2.5.0 Alexander Aring
2014-06-16 19:01 ` Michael Olbrich
2014-06-15 20:06 ` [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 -> 2.0.1 Alexander Aring
2014-06-15 20:51 ` Alexander Aring
2014-06-16 18:22 ` Michael Olbrich
2014-06-16 19:03 ` Alexander Aring
2014-06-16 19:15 ` Michael Olbrich
2014-06-15 20:06 ` [ptxdist] [PATCH 4/4] cmatrix: add new package Alexander Aring
2014-06-16 18:47 ` Michael Olbrich
2014-06-16 19:06 ` Alexander Aring
2014-06-16 19:00 ` [ptxdist] [PATCH 1/4] libusb: fix libusbx to libusb prompt Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox