[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-317-g25c91b9b0
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2022-02-24 10:13:31
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 25c91b9b073e9ebb085a9790d69b2606d73368d8 (commit)
from 62e4d3b55e3bdf4b1cb598c9cb8d0d1266687dda (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 25c91b9b073e9ebb085a9790d69b2606d73368d8
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Feb 24 11:10:42 2022 +0100
Revert "[BUILDROOT] Add PWM Music package"
This reverts commit ec875f2aac27e54cf54ff374cd3bdf6022a025ec.
As it breaks build:
Applying 045-armadeus-add-pwm-music-package.patch using patch:
patching file package/Config.in
Hunk #1 FAILED at 52.
1 out of 1 hunk FAILED -- saving rejects to file package/Config.in.rej
-----------------------------------------------------------------------
Summary of changes:
.../045-armadeus-add-pwm-music-package.patch | 54 ----------------------
patches/buildroot/2021.02/cleanup_buildroot.sh | 2 -
2 files changed, 56 deletions(-)
delete mode 100644 patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
diff --git a/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch b/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
deleted file mode 100644
index 59c70d3c8..000000000
--- a/patches/buildroot/2021.02/045-armadeus-add-pwm-music-package.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Add PWM Music package (mostly to test buzzers connected on PWM ;-) )
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: buildroot/package/Config.in
-===================================================================
---- buildroot.orig/package/Config.in
-+++ buildroot/package/Config.in
-@@ -52,6 +52,7 @@ menu "Audio and video applications"
- source "package/on2-8170-libs/Config.in"
- source "package/opus-tools/Config.in"
- source "package/pulseaudio/Config.in"
-+ source "package/pwmmusic/Config.in"
- source "package/pywebradio/Config.in"
- source "package/sox/Config.in"
- source "package/squeezelite/Config.in"
-Index: buildroot/package/pwmmusic/Config.in
-===================================================================
---- /dev/null
-+++ buildroot/package/pwmmusic/Config.in
-@@ -0,0 +1,7 @@
-+config BR2_PACKAGE_PWMMUSIC
-+ bool "PWM Music"
-+ help
-+ PWM Music Library for embedded Linux systems.
-+ Currently only supports SMB music ;-)
-+
-+ https://github.com/will-zegers/PWM-Music-Lib
-Index: buildroot/package/pwmmusic/pwmmusic.mk
-===================================================================
---- /dev/null
-+++ buildroot/package/pwmmusic/pwmmusic.mk
-@@ -0,0 +1,21 @@
-+################################################################################
-+#
-+# pwmmusic
-+#
-+################################################################################
-+
-+PWMMUSIC_VERSION = f2cc3bad9e2fa5a78cd7846e651735ec47766248
-+PWMMUSIC_SITE = $(call github,will-zegers,PWM-Music-Lib,$(PWMMUSIC_VERSION))
-+PWMMUSIC_LICENSE = UNKNOWN
-+PWMMUSIC_LICENSE_FILES = README.md
-+
-+define PWMMUSIC_BUILD_CMDS
-+ $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
-+ -C $(@D)/src all
-+endef
-+
-+define PWMMUSIC_INSTALL_TARGET_CMDS
-+ install -m 0755 -D $(@D)/src/pwmSong $(TARGET_DIR)/root/pwm_smb
-+endef
-+
-+$(eval $(generic-package))
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index e8cfb7cda..56fb8e557 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -102,8 +102,6 @@ rm -rf buildroot/package/pci_debug/pci_debug.mk
rm -rf buildroot/package/pcre/0002-Disable-C-unit-tests.patch
rm -rf buildroot/package/pcre/pcre.hash
rm -rf buildroot/package/pcre/pcre.mk
-rm -rf buildroot/package/pwmmusic/Config.in
-rm -rf buildroot/package/pwmmusic/pwmmusic.mk
rm -rf buildroot/package/python-flask-socketio/Config.in
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.hash
rm -rf buildroot/package/python-flask-socketio/python-flask-socketio.mk
hooks/post-receive
--
armadeus
|