From 881a3b5e5947ef9599b82ad1202df098630ac976 Mon Sep 17 00:00:00 2001 From: Andrew D'Angelo Date: Fri, 19 Jan 2024 02:54:47 +0000 Subject: [PATCH] Add symbol menu overlay --- .gitmodules | 3 +++ beepy_drivers/Config.in | 1 + beepy_drivers/package/beepy-kbd/beepy-kbd.mk | 2 +- beepy_drivers/package/beepy-kbd/module | 2 +- .../package/beepy-symbol-overlay/Config.in | 7 +++++++ .../beepy-symbol-overlay.mk | 18 ++++++++++++++++++ .../package/beepy-symbol-overlay/module | 1 + beepy_drivers/package/sharp-drm/module | 2 +- beepy_drivers/package/sharp-drm/sharp-drm.mk | 2 +- 9 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 beepy_drivers/package/beepy-symbol-overlay/Config.in create mode 100644 beepy_drivers/package/beepy-symbol-overlay/beepy-symbol-overlay.mk create mode 160000 beepy_drivers/package/beepy-symbol-overlay/module diff --git a/.gitmodules b/.gitmodules index 537f820..41f15d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ path = beepy_drivers/package/beepy-kbd/module url = git@github.com:ardangelo/beepberry-keyboard-driver.git branch = main +[submodule "beepy_drivers/package/beepy-symbol-overlay/module"] + path = beepy_drivers/package/beepy-symbol-overlay/module + url = git@github.com:ardangelo/beepy-symbol-overlay.git diff --git a/beepy_drivers/Config.in b/beepy_drivers/Config.in index cdc1819..0ac6fd2 100644 --- a/beepy_drivers/Config.in +++ b/beepy_drivers/Config.in @@ -1,5 +1,6 @@ source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/sharp-drm/Config.in" source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/beepy-kbd/Config.in" +source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/beepy-symbol-overlay/Config.in" source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/libgc/Config.in" source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/w3m/Config.in" source "$BR2_EXTERNAL_BEEPY_DRIVERS_PATH/package/libxapian/Config.in" diff --git a/beepy_drivers/package/beepy-kbd/beepy-kbd.mk b/beepy_drivers/package/beepy-kbd/beepy-kbd.mk index fb76f32..285206b 100644 --- a/beepy_drivers/package/beepy-kbd/beepy-kbd.mk +++ b/beepy_drivers/package/beepy-kbd/beepy-kbd.mk @@ -1,4 +1,4 @@ -BEEPY_KBD_VERSION = 2.3 +BEEPY_KBD_VERSION = 2.6 BEEPY_KBD_BASE = $(BR2_EXTERNAL_BEEPY_DRIVERS_PATH)/package/beepy-kbd BEEPY_KBD_SITE = $(BEEPY_KBD_BASE)/module BEEPY_KBD_SITE_METHOD = local diff --git a/beepy_drivers/package/beepy-kbd/module b/beepy_drivers/package/beepy-kbd/module index c9c0380..c98de44 160000 --- a/beepy_drivers/package/beepy-kbd/module +++ b/beepy_drivers/package/beepy-kbd/module @@ -1 +1 @@ -Subproject commit c9c0380ca7833fdc81fbe971e0aa942535b562a0 +Subproject commit c98de44866907946b18d6ed5f98ec04ff171a4fb diff --git a/beepy_drivers/package/beepy-symbol-overlay/Config.in b/beepy_drivers/package/beepy-symbol-overlay/Config.in new file mode 100644 index 0000000..b4a113f --- /dev/null +++ b/beepy_drivers/package/beepy-symbol-overlay/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_BEEPY_SYMBOL_OVERLAY + bool "beepy-symbol-overlay" + default y + depends on BR2_LINUX_KERNEL + select BR2_PACKAGE_SHARP_DRM + help + Symbol menu overlay diff --git a/beepy_drivers/package/beepy-symbol-overlay/beepy-symbol-overlay.mk b/beepy_drivers/package/beepy-symbol-overlay/beepy-symbol-overlay.mk new file mode 100644 index 0000000..1102abb --- /dev/null +++ b/beepy_drivers/package/beepy-symbol-overlay/beepy-symbol-overlay.mk @@ -0,0 +1,18 @@ +BEEPY_SYMBOL_OVERLAY_VERSION = 1.0 +BEEPY_SYMBOL_OVERLAY_BASE = $(BR2_EXTERNAL_BEEPY_DRIVERS_PATH)/package/beepy-symbol-overlay +BEEPY_SYMBOL_OVERLAY_SITE = $(BEEPY_SYMBOL_OVERLAY_BASE)/module +BEEPY_SYMBOL_OVERLAY_SITE_METHOD = local + +BEEPY_SYMBOL_OVERLAY_INSTALL_IMAGES = YES +BEEPY_SYMBOL_OVERLAY_MODULE_SUBDIRS = . + +define BEEPY_SYMBOL_OVERLAY_BUILD_CMDS + $(MAKE) CXX="$(TARGET_CXX)" OBJCOPY="$(TARGET_OBJCOPY)" LD="$(TARGET_LD)" -C $(@D) \ + CXXFLAGS=-DDEFAULT_KEYMAP_PATH=\\\"/usr/share/keymaps/beepy-kbd.map\\\" +endef + +define BEEPY_SYMBOL_OVERLAY_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/symbol-overlay $(TARGET_DIR)/sbin +endef + +$(eval $(generic-package)) diff --git a/beepy_drivers/package/beepy-symbol-overlay/module b/beepy_drivers/package/beepy-symbol-overlay/module new file mode 160000 index 0000000..fec8e5d --- /dev/null +++ b/beepy_drivers/package/beepy-symbol-overlay/module @@ -0,0 +1 @@ +Subproject commit fec8e5d4515a0d6a48ab11d3fb1f600c664f7afb diff --git a/beepy_drivers/package/sharp-drm/module b/beepy_drivers/package/sharp-drm/module index 1e293ae..682a2c4 160000 --- a/beepy_drivers/package/sharp-drm/module +++ b/beepy_drivers/package/sharp-drm/module @@ -1 +1 @@ -Subproject commit 1e293ae1ca3e89b1930211e6ed885b768be23c1d +Subproject commit 682a2c4cfe4d02bdff3e19239da1fab497b6a128 diff --git a/beepy_drivers/package/sharp-drm/sharp-drm.mk b/beepy_drivers/package/sharp-drm/sharp-drm.mk index 5f05c9c..f532431 100644 --- a/beepy_drivers/package/sharp-drm/sharp-drm.mk +++ b/beepy_drivers/package/sharp-drm/sharp-drm.mk @@ -1,4 +1,4 @@ -SHARP_DRM_VERSION = 1.1 +SHARP_DRM_VERSION = 1.4 SHARP_DRM_BASE = $(BR2_EXTERNAL_BEEPY_DRIVERS_PATH)/package/sharp-drm SHARP_DRM_SITE = $(SHARP_DRM_BASE)/module SHARP_DRM_SITE_METHOD = local