From 8fa39b031f889f0fb1d2c6711850e5f7a8f80951 Mon Sep 17 00:00:00 2001 From: j1nx Date: Thu, 12 Aug 2021 16:38:16 +0200 Subject: [PATCH] Move over to skill-ovos-setup --- buildroot-external/Config.in | 2 +- .../configs/rpi4_64-gui_defconfig | 2 +- .../mycroft-skill-ovos-pairing/Config.in | 7 ------- .../mycroft-skill-ovos-pairing.mk | 20 ------------------- .../mycroft-skill-ovos-setup/Config.in | 6 ++++++ .../mycroft-skill-ovos-setup.mk | 20 +++++++++++++++++++ 6 files changed, 28 insertions(+), 29 deletions(-) delete mode 100644 buildroot-external/package/mycroft-skill-ovos-pairing/Config.in delete mode 100644 buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk create mode 100644 buildroot-external/package/mycroft-skill-ovos-setup/Config.in create mode 100644 buildroot-external/package/mycroft-skill-ovos-setup/mycroft-skill-ovos-setup.mk diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index ac4e78ca..a4324548 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -225,7 +225,7 @@ menu "Mycroft A.I. Skills" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-homescreen/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-info/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-mycroftgui/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-pairing/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-setup/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-volume/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-parrot/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-personal/Config.in" diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 796cc68c..7cf22ce4 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -697,7 +697,7 @@ BR2_PACKAGE_MYCROFT_SKILL_OVOS_ENCLOSURE=y BR2_PACKAGE_MYCROFT_SKILL_OVOS_HOMESCREEN=y BR2_PACKAGE_MYCROFT_SKILL_OVOS_INFO=y BR2_PACKAGE_MYCROFT_SKILL_OVOS_MYCROFTGUI=y -BR2_PACKAGE_MYCROFT_SKILL_OVOS_PAIRING=y +BR2_PACKAGE_MYCROFT_SKILL_OVOS_SETUP=y BR2_PACKAGE_MYCROFT_SKILL_OVOS_VOLUME=y BR2_PACKAGE_MYCROFT_SKILL_PARROT=y BR2_PACKAGE_MYCROFT_SKILL_PERSONAL=y diff --git a/buildroot-external/package/mycroft-skill-ovos-pairing/Config.in b/buildroot-external/package/mycroft-skill-ovos-pairing/Config.in deleted file mode 100644 index 8c314711..00000000 --- a/buildroot-external/package/mycroft-skill-ovos-pairing/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_MYCROFT_SKILL_OVOS_PAIRING - bool "mycroft-skill-ovos-pairing" - help - Mycroft AI - OVOS Pairing Skill - Connect your device to the Mycroft server - - https://github.com/OpenVoiceOS/skill-ovos-pairing diff --git a/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk b/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk deleted file mode 100644 index 0434a2c5..00000000 --- a/buildroot-external/package/mycroft-skill-ovos-pairing/mycroft-skill-ovos-pairing.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# mycroft-skill-ovos-pairing -# -################################################################################ - -MYCROFT_SKILL_OVOS_PAIRING_VERSION = b09758266bd7c90dd1629e41cb17d0f23b64b3c3 -MYCROFT_SKILL_OVOS_PAIRING_SITE = git://github.com/OpenVoiceOS/skill-ovos-pairing -MYCROFT_SKILL_OVOS_PAIRING_SITE_METHOD = git -MYCROFT_SKILL_OVOS_PAIRING_DIRLOCATION = home/mycroft/.local/share/mycroft/skills -MYCROFT_SKILL_OVOS_PAIRING_DIRNAME = skill-ovos-pairing.openvoiceos - -define MYCROFT_SKILL_OVOS_PAIRING_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_PAIRING_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_PAIRING_DIRNAME) - cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_PAIRING_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_PAIRING_DIRNAME) - cp -dpfr $(MYCROFT_SKILL_OVOS_PAIRING_DL_DIR)/git/.git* \ - $(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_PAIRING_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_PAIRING_DIRNAME) -endef - -$(eval $(generic-package)) diff --git a/buildroot-external/package/mycroft-skill-ovos-setup/Config.in b/buildroot-external/package/mycroft-skill-ovos-setup/Config.in new file mode 100644 index 00000000..4e6216ca --- /dev/null +++ b/buildroot-external/package/mycroft-skill-ovos-setup/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_MYCROFT_SKILL_OVOS_SETUP + bool "mycroft-skill-ovos-setup" + help + OVOS Setup Skill + + https://github.com/OpenVoiceOS/skill-ovos-setup diff --git a/buildroot-external/package/mycroft-skill-ovos-setup/mycroft-skill-ovos-setup.mk b/buildroot-external/package/mycroft-skill-ovos-setup/mycroft-skill-ovos-setup.mk new file mode 100644 index 00000000..913be819 --- /dev/null +++ b/buildroot-external/package/mycroft-skill-ovos-setup/mycroft-skill-ovos-setup.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# mycroft-skill-ovos-setup +# +################################################################################ + +MYCROFT_SKILL_OVOS_SETUP_VERSION = b09758266bd7c90dd1629e41cb17d0f23b64b3c3 +MYCROFT_SKILL_OVOS_SETUP_SITE = git://github.com/OpenVoiceOS/skill-ovos-setup +MYCROFT_SKILL_OVOS_SETUP_SITE_METHOD = git +MYCROFT_SKILL_OVOS_SETUP_DIRLOCATION = home/mycroft/.local/share/mycroft/skills +MYCROFT_SKILL_OVOS_SETUP_DIRNAME = skill-ovos-setup.openvoiceos + +define MYCROFT_SKILL_OVOS_SETUP_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_SETUP_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_SETUP_DIRNAME) + cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_SETUP_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_SETUP_DIRNAME) + cp -dpfr $(MYCROFT_SKILL_OVOS_SETUP_DL_DIR)/git/.git* \ + $(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_SETUP_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_SETUP_DIRNAME) +endef + +$(eval $(generic-package))