Message ID | 1354496791-13337-1-git-send-email-cdhmanning@gmail.com |
---|---|
State | Accepted |
Headers | show |
>>>>> "Charles" == Charles Manning <cdhmanning@gmail.com> writes:
Charles> We don't always want all the font sets on small systems.
Committed with minor changes, see below.
Charles> Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Charles> ---
Charles> package/liberation/Config.in | 26 ++++++++++++++++++++++++++
Charles> package/liberation/liberation.mk | 28 +++++++++++++++++++++++++++-
Charles> 2 files changed, 53 insertions(+), 1 deletions(-)
Charles> diff --git a/package/liberation/Config.in b/package/liberation/Config.in
Charles> index 48d4195..11be2b5 100644
Charles> --- a/package/liberation/Config.in
Charles> +++ b/package/liberation/Config.in
Charles> @@ -5,3 +5,29 @@ config BR2_PACKAGE_LIBERATION
Charles> three most commonly used fonts on Microsoft systems:
Charles> Times New Roman, Arial, and Courier New.
Charles> +config BR2_PACKAGE_LIBERATION_SELECT_ALL
Charles> + bool "Select all Liberation fonts"
Charles> + depends on BR2_PACKAGE_LIBERATION
Charles> + default y
Charles> + help
Charles> + Select all Liberation fonts. Otherwise elect individual fonts
Charles> +
I've dropped this option as people can just enable all 3 suboptions (and
I default them to y to keep existing configs working).
Charles> +if !BR2_PACKAGE_LIBERATION_SELECT_ALL
Charles> +
Charles> +menu "Individual Liberation Fonts"
Charles> +
Charles> +config BR2_PACKAGE_LIBERATION_SELECT_MONO
Charles> + bool "Liberation Mono fonts"
Charles> + default n
The Kconfig names and description are quite long, so I changed these to
be:
config BR2_PACKAGE_LIBERATION_MONO
bool "mono fonts"
default y
Charles> +
Charles> +config BR2_PACKAGE_LIBERATION_SELECT_SANS
Charles> + bool "Liberation Sans fonts"
Charles> + depends on !BR2_PACKAGE_LIBERATION_SELECT_ALL
Charles> + default n
Charles> +
Charles> +config BR2_PACKAGE_LIBERATION_SELECT_SERIF
Charles> + bool "Liberation Serif fonts"
Charles> + default n
Charles> +endmenu
Charles> +
Charles> +endif
Charles> diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk
Charles> index 7d55650..277d426 100644
Charles> --- a/package/liberation/liberation.mk
Charles> +++ b/package/liberation/liberation.mk
Charles> @@ -9,9 +9,35 @@ LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz
Charles> LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation
Charles> +ifeq ($(BR2_PACKAGE_LIBERATION_SELECT_ALL),y)
Charles> +BR2_PACKAGE_LIBERATION_SELECT_MONO = y
Charles> +BR2_PACKAGE_LIBERATION_SELECT_SANS = y
Charles> +BR2_PACKAGE_LIBERATION_SELECT_SERIF = y
Charles> +endif
BR2_* variables should be considered readonly in the .mk files and not
changed here.
Charles> +
Charles> +ifeq ($(BR2_PACKAGE_LIBERATION_SELECT_MONO),y)
Charles> +define LIBERATION_INSTALL_MONO
Charles> + $(INSTALL) -m 644 $(@D)/LiberationMono*.ttf $(LIBERATION_TARGET_DIR)
Charles> +endef
Charles> +endif
Charles> +
Charles> +ifeq ($(BR2_PACKAGE_LIBERATION_SELECT_SANS),y)
Charles> +define LIBERATION_INSTALL_SANS
Charles> + $(INSTALL) -m 644 $(@D)/LiberationSans*.ttf $(LIBERATION_TARGET_DIR)
Charles> +endef
Charles> +endif
Charles> +
Charles> +ifeq ($(BR2_PACKAGE_LIBERATION_SELECT_SERIF),y)
Charles> +define LIBERATION_INSTALL_SERIF
Charles> + $(INSTALL) -m 644 $(@D)/LiberationSerif*.ttf $(LIBERATION_TARGET_DIR)
Charles> +endef
Charles> +endif
Charles> +
Charles> define LIBERATION_INSTALL_TARGET_CMDS
Charles> + $(LIBERATION_INSTALL_MONO)
Charles> + $(LIBERATION_INSTALL_SANS)
Charles> + $(LIBERATION_INSTALL_SERIF)
Charles> mkdir -p $(LIBERATION_TARGET_DIR)
Charles> - $(INSTALL) -m 644 $(@D)/*.ttf $(LIBERATION_TARGET_DIR)
The mkdir should go before the installs.
diff --git a/package/liberation/Config.in b/package/liberation/Config.in index 48d4195..11be2b5 100644 --- a/package/liberation/Config.in +++ b/package/liberation/Config.in @@ -5,3 +5,29 @@ config BR2_PACKAGE_LIBERATION three most commonly used fonts on Microsoft systems: Times New Roman, Arial, and Courier New. +config BR2_PACKAGE_LIBERATION_SELECT_ALL + bool "Select all Liberation fonts" + depends on BR2_PACKAGE_LIBERATION + default y + help + Select all Liberation fonts. Otherwise elect individual fonts + +if !BR2_PACKAGE_LIBERATION_SELECT_ALL + +menu "Individual Liberation Fonts" + +config BR2_PACKAGE_LIBERATION_SELECT_MONO + bool "Liberation Mono fonts" + default n + +config BR2_PACKAGE_LIBERATION_SELECT_SANS + bool "Liberation Sans fonts" + depends on !BR2_PACKAGE_LIBERATION_SELECT_ALL + default n + +config BR2_PACKAGE_LIBERATION_SELECT_SERIF + bool "Liberation Serif fonts" + default n +endmenu + +endif diff --git a/package/liberation/liberation.mk b/package/liberation/liberation.mk index 7d55650..277d426 100644 --- a/package/liberation/liberation.mk +++ b/package/liberation/liberation.mk @@ -9,9 +9,35 @@ LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation +ifeq ($(BR2_PACKAGE_LIBERATION_SELECT_ALL),y) +BR2_PACKAGE_LIBERATION_SELECT_MONO = y +BR2_PACKAGE_LIBERATION_SELECT_SANS = y +BR2_PACKAGE_LIBERATION_SELECT_SERIF = y +endif + +ifeq ($(BR2_PACKAGE_LIBERATION_SELECT_MONO),y) +define LIBERATION_INSTALL_MONO + $(INSTALL) -m 644 $(@D)/LiberationMono*.ttf $(LIBERATION_TARGET_DIR) +endef +endif + +ifeq ($(BR2_PACKAGE_LIBERATION_SELECT_SANS),y) +define LIBERATION_INSTALL_SANS + $(INSTALL) -m 644 $(@D)/LiberationSans*.ttf $(LIBERATION_TARGET_DIR) +endef +endif + +ifeq ($(BR2_PACKAGE_LIBERATION_SELECT_SERIF),y) +define LIBERATION_INSTALL_SERIF + $(INSTALL) -m 644 $(@D)/LiberationSerif*.ttf $(LIBERATION_TARGET_DIR) +endef +endif + define LIBERATION_INSTALL_TARGET_CMDS + $(LIBERATION_INSTALL_MONO) + $(LIBERATION_INSTALL_SANS) + $(LIBERATION_INSTALL_SERIF) mkdir -p $(LIBERATION_TARGET_DIR) - $(INSTALL) -m 644 $(@D)/*.ttf $(LIBERATION_TARGET_DIR) endef define LIBERATION_CLEAN_CMDS
We don't always want all the font sets on small systems. Signed-off-by: Charles Manning <cdhmanning@gmail.com> --- package/liberation/Config.in | 26 ++++++++++++++++++++++++++ package/liberation/liberation.mk | 28 +++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletions(-)