From a57d1d477600ea9da3c4e03982908f5dffe6e7d7 Mon Sep 17 00:00:00 2001 From: j1nx Date: Thu, 12 Aug 2021 12:24:53 +0200 Subject: [PATCH] Move over to skill-ovos-common-play (and bump) --- buildroot-external/Config.in | 2 +- .../configs/rpi4_64-gui_defconfig | 2 +- .../Config.in | 8 -------- .../mycroft-skill-better-playback-control.mk | 20 ------------------- .../mycroft-skill-ovos-common-play/Config.in | 8 ++++++++ .../mycroft-skill-ovos-common-play.mk | 20 +++++++++++++++++++ 6 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 buildroot-external/package/mycroft-skill-better-playback-control/Config.in delete mode 100644 buildroot-external/package/mycroft-skill-better-playback-control/mycroft-skill-better-playback-control.mk create mode 100644 buildroot-external/package/mycroft-skill-ovos-common-play/Config.in create mode 100644 buildroot-external/package/mycroft-skill-ovos-common-play/mycroft-skill-ovos-common-play.mk diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index c9e3bcf0..ac4e78ca 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -210,7 +210,6 @@ menu "Mycroft A.I. Skills" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-alarm/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-audio-record/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-balena-wifi-setup/Config.in" - source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-better-playback-control/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-better-stop/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-camera/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-configuration/Config.in" @@ -221,6 +220,7 @@ menu "Mycroft A.I. Skills" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-joke/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-naptime/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-news/Config.in" + source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-common-play/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-enclosure/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-homescreen/Config.in" source "$BR2_EXTERNAL_OPENVOICEOS_PATH/package/mycroft-skill-ovos-info/Config.in" diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 4d784cec..796cc68c 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -682,7 +682,6 @@ BR2_PACKAGE_MYCROFT_SKILLS_REPO=y BR2_PACKAGE_MYCROFT_SKILL_ALARM=y BR2_PACKAGE_MYCROFT_SKILL_AUDIO_RECORD=y BR2_PACKAGE_MYCROFT_SKILL_BALENA_WIFI_SETUP=y -BR2_PACKAGE_MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL=y BR2_PACKAGE_MYCROFT_SKILL_BETTER_STOP=y BR2_PACKAGE_MYCROFT_SKILL_CAMERA=y BR2_PACKAGE_MYCROFT_SKILL_CONFIGURATION=y @@ -693,6 +692,7 @@ BR2_PACKAGE_MYCROFT_SKILL_IP=y BR2_PACKAGE_MYCROFT_SKILL_JOKE=y BR2_PACKAGE_MYCROFT_SKILL_NAPTIME=y BR2_PACKAGE_MYCROFT_SKILL_NEWS=y +BR2_PACKAGE_MYCROFT_SKILL_OVOS_COMMON_PLAY=y BR2_PACKAGE_MYCROFT_SKILL_OVOS_ENCLOSURE=y BR2_PACKAGE_MYCROFT_SKILL_OVOS_HOMESCREEN=y BR2_PACKAGE_MYCROFT_SKILL_OVOS_INFO=y diff --git a/buildroot-external/package/mycroft-skill-better-playback-control/Config.in b/buildroot-external/package/mycroft-skill-better-playback-control/Config.in deleted file mode 100644 index f3e71e7a..00000000 --- a/buildroot-external/package/mycroft-skill-better-playback-control/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL - bool "mycroft-skill-better-playback-control" - help - Better Common playback control system - NOTE: this is meant a better alternative to the - official playback control skill - - https://github.com/JarbasSkills/skill-better-playback-control diff --git a/buildroot-external/package/mycroft-skill-better-playback-control/mycroft-skill-better-playback-control.mk b/buildroot-external/package/mycroft-skill-better-playback-control/mycroft-skill-better-playback-control.mk deleted file mode 100644 index cfa48455..00000000 --- a/buildroot-external/package/mycroft-skill-better-playback-control/mycroft-skill-better-playback-control.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# mycroft-skill-better-playback-control -# -################################################################################ - -MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_VERSION = 6d06e616c9ce76ca0ad700dc6a88e01a51b36be5 -MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_SITE = git://github.com/OpenVoiceOS/skill-better-playback-control -MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_SITE_METHOD = git -MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_DIRLOCATION = home/mycroft/.local/share/mycroft/skills -MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_DIRNAME = skill-better-playback-control.openvoiceos - -define MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_DIRLOCATION)/$(MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_DIRNAME) - cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_DIRLOCATION)/$(MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_DIRNAME) - cp -dpfr $(MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_DL_DIR)/git/.git* \ - $(TARGET_DIR)/$(MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_DIRLOCATION)/$(MYCROFT_SKILL_BETTER_PLAYBACK_CONTROL_DIRNAME) -endef - -$(eval $(generic-package)) diff --git a/buildroot-external/package/mycroft-skill-ovos-common-play/Config.in b/buildroot-external/package/mycroft-skill-ovos-common-play/Config.in new file mode 100644 index 00000000..1e37c081 --- /dev/null +++ b/buildroot-external/package/mycroft-skill-ovos-common-play/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_MYCROFT_SKILL_OVOS_COMMON_PLAY + bool "mycroft-skill-ovos-common-play" + help + OVOS Common playback control system + NOTE: this is meant a better alternative to the + official playback control skill + + https://github.com/OpenVoiceOS/skill-ovos-common-play diff --git a/buildroot-external/package/mycroft-skill-ovos-common-play/mycroft-skill-ovos-common-play.mk b/buildroot-external/package/mycroft-skill-ovos-common-play/mycroft-skill-ovos-common-play.mk new file mode 100644 index 00000000..3b29b120 --- /dev/null +++ b/buildroot-external/package/mycroft-skill-ovos-common-play/mycroft-skill-ovos-common-play.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# mycroft-skill-ovos-common-play +# +################################################################################ + +MYCROFT_SKILL_OVOS_COMMON_PLAY_VERSION = e14743ee19117ad70b5dfa7bca774003a9f31ff5 +MYCROFT_SKILL_OVOS_COMMON_PLAY_SITE = git://github.com/OpenVoiceOS/skill-ovos-common-play +MYCROFT_SKILL_OVOS_COMMON_PLAY_SITE_METHOD = git +MYCROFT_SKILL_OVOS_COMMON_PLAY_DIRLOCATION = home/mycroft/.local/share/mycroft/skills +MYCROFT_SKILL_OVOS_COMMON_PLAY_DIRNAME = skill-ovos-common-play.openvoiceos + +define MYCROFT_SKILL_OVOS_COMMON_PLAY_INSTALL_TARGET_CMDS + mkdir -p $(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_COMMON_PLAY_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_COMMON_PLAY_DIRNAME) + cp -dpfr $(@D)/* $(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_COMMON_PLAY_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_COMMON_PLAY_DIRNAME) + cp -dpfr $(MYCROFT_SKILL_OVOS_COMMON_PLAY_DL_DIR)/git/.git* \ + $(TARGET_DIR)/$(MYCROFT_SKILL_OVOS_COMMON_PLAY_DIRLOCATION)/$(MYCROFT_SKILL_OVOS_COMMON_PLAY_DIRNAME) +endef + +$(eval $(generic-package))