[ptxdist] [PATCH 1/2] Revert "beep: move to staging"

[ptxdist] [PATCH 1/2] Revert "beep: move to staging"

[Ladislav Michl]

From: Ladislav Michl <ladis@linux-mips.org>

This reverts commit 56ddc68d6cada7fee791122e27d4b2388dc8715d
as original upstream is indeed dead, but project continues to
live at a new location and subsequent patch will update it.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/beep.in | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/rules/beep.in b/rules/beep.in
index 6c9ea8532..52abcd11e 100644
--- a/rules/beep.in
+++ b/rules/beep.in
@@ -1,12 +1,7 @@
-## SECTION=staging
-## old section:
-### SECTION=multimedia_sound
+## SECTION=multimedia_sound
 
 config BEEP
 	tristate
 	prompt "beep"
 	help
 	  Extended beep utility
-
-	  STAGING: remove in PTXdist 2025.05.0
-	  Unmaintained in PTXdist. Original upstream and URL are dead.
-- 
2.39.2

[ptxdist] [PATCH 2/2] beep: version bump 1.3 -> 1.4.12

[Ladislav Michl]

From: Ladislav Michl <ladis@linux-mips.org>

Move package to a new upstream at https://github.com/spkr-beep/beep/

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/beep.make | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/rules/beep.make b/rules/beep.make
index 69ab02f1a..06c42ce37 100644
--- a/rules/beep.make
+++ b/rules/beep.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_BEEP) += beep
 #
 # Paths and names
 #
-BEEP_VERSION	:= 1.3
-BEEP_MD5	:= 49c340ceb95dbda3f97b2daafac7892a
+BEEP_VERSION	:= 1.4.12
+BEEP_MD5	:= a817f05c5473a23d700778b2c0108cc4
 BEEP		:= beep-$(BEEP_VERSION)
 BEEP_SUFFIX	:= tar.gz
-BEEP_URL	:= http://www.johnath.com/beep/$(BEEP).$(BEEP_SUFFIX)
+BEEP_URL	:= https://github.com/spkr-beep/beep/archive/refs/tags/v$(BEEP_VERSION).$(BEEP_SUFFIX)
 BEEP_SOURCE	:= $(SRCDIR)/$(BEEP).$(BEEP_SUFFIX)
 BEEP_DIR	:= $(BUILDDIR)/$(BEEP)
 BEEP_LICENSE	:= GPL-2.0-only
@@ -28,7 +28,17 @@ BEEP_LICENSE	:= GPL-2.0-only
 # ----------------------------------------------------------------------------
 
 BEEP_CONF_TOOL	:= NO
-BEEP_MAKE_OPT	:= CC=$(CROSS_CC)
+BEEP_MAKE_OPT	:= \
+	CC=$(CROSS_CC) \
+	prefix=/usr
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+BEEP_INSTALL_OPT	:= \
+	prefix=/usr \
+	install
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.39.2

Re: [ptxdist] [PATCH 2/2] beep: version bump 1.3 -> 1.4.12

[Ladislav Michl]

On Tue, Apr 23, 2024 at 07:36:52AM +0200, Ladislav Michl wrote:
> Move package to a new upstream at https://github.com/spkr-beep/beep/

For v5te I needed to add LDFLAGS=-latomic to satisfy undefined reference:
arm-v5te-linux-gnueabi-gcc -Wl,-Map=beep.map,--cref -fasynchronous-unwind-tables -fanalyzer -fstack-protector-strong -fstack-clash-protection -fsanitize=undefined -save-temps=obj -O2 -g -std=gnu99 -pedantic -Wall -Wextra -Werror -Wno-padded -Wno-format-nonliteral   -o beep beep-log.o beep-main.o beep-library.o beep-usage.o beep-drivers.o beep-driver-console.o beep-driver-evdev.o   
/opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: undefined reference to `__atomic_compare_exchange_8'
/opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: undefined reference to `__atomic_load_8'
collect2: error: ld returned 1 exit status

I can see haproxy and dhcp packages are adding target flags based on
selected architecture. Is it to way to follow here?

	l.

Re: [ptxdist] [PATCH 2/2] beep: version bump 1.3 -> 1.4.12

[Michael Olbrich]

On Wed, Apr 24, 2024 at 05:33:22PM +0200, Ladislav Michl wrote:
> On Tue, Apr 23, 2024 at 07:36:52AM +0200, Ladislav Michl wrote:
> > Move package to a new upstream at https://github.com/spkr-beep/beep/
> 
> For v5te I needed to add LDFLAGS=-latomic to satisfy undefined reference:
> arm-v5te-linux-gnueabi-gcc -Wl,-Map=beep.map,--cref -fasynchronous-unwind-tables -fanalyzer -fstack-protector-strong -fstack-clash-protection -fsanitize=undefined -save-temps=obj -O2 -g -std=gnu99 -pedantic -Wall -Wextra -Werror -Wno-padded -Wno-format-nonliteral   -o beep beep-log.o beep-main.o beep-library.o beep-usage.o beep-drivers.o beep-driver-console.o beep-driver-evdev.o   
> /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: undefined reference to `__atomic_compare_exchange_8'
> /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: undefined reference to `__atomic_load_8'
> collect2: error: ld returned 1 exit status
> 
> I can see haproxy and dhcp packages are adding target flags based on
> selected architecture. Is it to way to follow here?

Yes, please handle it like that. If it's missing for other architectures
(ppc is a possibility here), I'll fix it when it fails in my tests.

Regards,
Michael

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [ptxdist] [PATCH 2/2] beep: version bump 1.3 -> 1.4.12

[Ladislav Michl]

On Thu, May 02, 2024 at 11:38:14AM +0200, Michael Olbrich wrote:
> On Wed, Apr 24, 2024 at 05:33:22PM +0200, Ladislav Michl wrote:
> > On Tue, Apr 23, 2024 at 07:36:52AM +0200, Ladislav Michl wrote:
> > > Move package to a new upstream at https://github.com/spkr-beep/beep/
> > 
> > For v5te I needed to add LDFLAGS=-latomic to satisfy undefined reference:
> > arm-v5te-linux-gnueabi-gcc -Wl,-Map=beep.map,--cref -fasynchronous-unwind-tables -fanalyzer -fstack-protector-strong -fstack-clash-protection -fsanitize=undefined -save-temps=obj -O2 -g -std=gnu99 -pedantic -Wall -Wextra -Werror -Wno-padded -Wno-format-nonliteral   -o beep beep-log.o beep-main.o beep-library.o beep-usage.o beep-drivers.o beep-driver-console.o beep-driver-evdev.o   
> > /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: undefined reference to `__atomic_compare_exchange_8'
> > /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: undefined reference to `__atomic_load_8'
> > collect2: error: ld returned 1 exit status
> > 
> > I can see haproxy and dhcp packages are adding target flags based on
> > selected architecture. Is it to way to follow here?
> 
> Yes, please handle it like that. If it's missing for other architectures
> (ppc is a possibility here), I'll fix it when it fails in my tests.

I already sent v2 with different approach. Problems boils down to beep's
GNUMakefile trying to figure out whenever compiler supports various
sanitizers flags, but fails to figure out, that it comes at price linking
with sanitizer libraries on some architectures. V2 solves that by removing
all those checks, so external libraries are no longer needed.

	ladis

Re: [ptxdist] [APPLIED] Revert "beep: move to staging"

[Michael Olbrich]

Thanks, applied as 565c43e0bc0e9063af000d31b16bd1041b68701b.

Michael

[sent from post-receive hook]

On Sun, 12 May 2024 15:16:36 +0200, Ladislav Michl <oss-lists@triops.cz> wrote:
> This reverts commit 56ddc68d6cada7fee791122e27d4b2388dc8715d
> as original upstream is indeed dead, but project continues to
> live at a new location and subsequent patch will update it.
> 
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <ZidI0jm-fKxjOGZL@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/beep.in b/rules/beep.in
> index 6c9ea85321b3..52abcd11e2b2 100644
> --- a/rules/beep.in
> +++ b/rules/beep.in
> @@ -1,12 +1,7 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=multimedia_sound
> +## SECTION=multimedia_sound
>  
>  config BEEP
>  	tristate
>  	prompt "beep"
>  	help
>  	  Extended beep utility
> -
> -	  STAGING: remove in PTXdist 2025.05.0
> -	  Unmaintained in PTXdist. Original upstream and URL are dead.