diff options
| author | Mark Jonas <toertel@gmail.com> | 2020-12-22 17:39:54 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-12-23 22:46:50 -0800 |
| commit | 19c244dd39b9896eed9d7d8a2a033e60839cff86 (patch) | |
| tree | 5c4eda776304e76c8fd77850f1a159ff1ce9dd41 | |
| parent | f0b1671175493cd94cbbd79b3c1a7f5c576893f2 (diff) | |
| download | meta-openembedded-19c244dd39b9896eed9d7d8a2a033e60839cff86.tar.gz | |
beep: Update to 1.4.9 in new repository
The previous version 1.2.2 of beep was provided by
http://johnath.com/beep and was released in 2002. The latest version 1.3
was released 2010-07-13. On https://github.com/johnath/beep the
development stopped 2013-02-07.
In 2018 a developer worked on fixing CVE-2018-1000532 and realized that
fixing this would be more than just a simple patch. Because the original
repository was unmaintained for several years he created
https://github.com/spkr-beep/beep as the new home for beep.
Debian switched to the new beep with Buster.
https://packages.debian.org/buster/beep
Alpine 3.11, Arch Linux, Fedora, and Ubuntu 20.04 also switched to the
same new beep.
Fix build with clang
Signed-off-by: Mark Jonas <toertel@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
3 files changed, 95 insertions, 25 deletions
diff --git a/meta-oe/recipes-extended/beep/beep_1.2.2.bb b/meta-oe/recipes-extended/beep/beep_1.2.2.bb deleted file mode 100644 index cafc869645..0000000000 --- a/meta-oe/recipes-extended/beep/beep_1.2.2.bb +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | DESCRIPTION = "beep is a command line tool for linux that beeps the PC speaker" | ||
| 2 | LICENSE = "GPL-2.0" | ||
| 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" | ||
| 4 | |||
| 5 | SRC_URI = "\ | ||
| 6 | http://johnath.com/beep/beep-${PV}.tar.gz \ | ||
| 7 | file://linux-input.patch \ | ||
| 8 | " | ||
| 9 | |||
| 10 | SRC_URI[sha256sum] = "5c0445dac43950b7c7c3f235c6fb21f620ab3fd2f3aafaf09896e5730fcf49a1" | ||
| 11 | |||
| 12 | S = "${WORKDIR}/${BPN}-${PV}" | ||
| 13 | |||
| 14 | EXTRA_OEMAKE += 'CC="${CC}"' | ||
| 15 | EXTRA_OEMAKE += 'FLAGS="${CFLAGS} ${LDFLAGS}"' | ||
| 16 | |||
| 17 | do_configure[noexec] = "1" | ||
| 18 | |||
| 19 | do_compile() { | ||
| 20 | oe_runmake | ||
| 21 | } | ||
| 22 | |||
| 23 | do_install() { | ||
| 24 | install -Dm 0755 ${B}/${PN} ${D}${bindir}/${PN} | ||
| 25 | } | ||
diff --git a/meta-oe/recipes-extended/beep/beep_1.4.9.bb b/meta-oe/recipes-extended/beep/beep_1.4.9.bb new file mode 100644 index 0000000000..8d332b2faf --- /dev/null +++ b/meta-oe/recipes-extended/beep/beep_1.4.9.bb | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | SUMMARY = "beep allows you to have the PC speaker issue beeps and beep patterns" | ||
| 2 | DESCRIPTION = "beep allows you to have the PC speaker issue beeps and beep \ | ||
| 3 | patterns with given frequencies, durations, and spacing." | ||
| 4 | HOMEPAGE = "https://github.com/spkr-beep/beep" | ||
| 5 | BUGTRACKER = "https://github.com/spkr-beep/beep/issues" | ||
| 6 | |||
| 7 | LICENSE = "GPLv2+" | ||
| 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
| 9 | |||
| 10 | SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https \ | ||
| 11 | file://0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch \ | ||
| 12 | " | ||
| 13 | SRCREV = "8b85ddd09f73b9fd7caa5679298781a57af194ac" | ||
| 14 | S = "${WORKDIR}/git" | ||
| 15 | |||
| 16 | EXTRA_OEMAKE = " \ | ||
| 17 | COMPILER_gcc='${CC}' \ | ||
| 18 | LINKER_gcc='${CC}' \ | ||
| 19 | COMPILER_clang=no \ | ||
| 20 | LINKER_clang=no \ | ||
| 21 | " | ||
| 22 | |||
| 23 | EXTRA_OEMAKE_toolchain-clang = " \ | ||
| 24 | COMPILER_clang='${CC}' \ | ||
| 25 | LINKER_clang='${CC}' \ | ||
| 26 | COMPILER_gcc=no \ | ||
| 27 | LINKER_gcc=no \ | ||
| 28 | " | ||
| 29 | |||
| 30 | do_install() { | ||
| 31 | oe_runmake install DESTDIR='${D}' | ||
| 32 | } | ||
diff --git a/meta-oe/recipes-extended/beep/files/0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch b/meta-oe/recipes-extended/beep/files/0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch new file mode 100644 index 0000000000..ba7681b983 --- /dev/null +++ b/meta-oe/recipes-extended/beep/files/0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch | |||
| @@ -0,0 +1,63 @@ | |||
| 1 | From 6b33adfa438e35b6a37cfb0364274370ef4f9fc1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 23 Dec 2020 18:00:59 +0000 | ||
| 4 | Subject: [PATCH] Do not use -Werror as it fails with newer clang 11+ | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- | ||
| 9 | GNUmakefile | 1 - | ||
| 10 | 1 file changed, 1 deletion(-) | ||
| 11 | |||
| 12 | --- a/GNUmakefile | ||
| 13 | +++ b/GNUmakefile | ||
| 14 | @@ -91,12 +91,13 @@ comma := , | ||
| 15 | # If supported by COMPILER_gcc, add given flags to CFLAGS_gcc. | ||
| 16 | # Example usage: | ||
| 17 | # $(eval $(call CHECK_CFLAGS_gcc,-fasynchronous-unwind-tables)) | ||
| 18 | -define CHECK_CFLAGS_gcc | ||
| 19 | -CFLAGS_gcc += $$(if $$(shell if $$(COMPILER_gcc) $(1) -x c -o compile-check.gcc-o -c - < /dev/null > /dev/null 2>&1; then echo yes; else :; fi; rm -f compile-check.gcc-o > /dev/null 2>&1),$(1)) | ||
| 20 | -endef | ||
| 21 | |||
| 22 | COMPILER_gcc = gcc | ||
| 23 | LINKER_gcc = gcc | ||
| 24 | +ifneq ($(COMPILER_gcc),no) | ||
| 25 | +define CHECK_CFLAGS_gcc | ||
| 26 | +CFLAGS_gcc += $$(if $$(shell if $$(COMPILER_gcc) $(1) -x c -o compile-check.gcc-o -c - < /dev/null > /dev/null 2>&1; then echo yes; else :; fi; rm -f compile-check.gcc-o > /dev/null 2>&1),$(1)) | ||
| 27 | +endef | ||
| 28 | CPPFLAGS_gcc = | ||
| 29 | CFLAGS_gcc = | ||
| 30 | CFLAGS_gcc += -std=gnu99 -pedantic | ||
| 31 | @@ -113,30 +114,24 @@ CFLAGS_gcc += -save-temps=obj | ||
| 32 | LDFLAGS_gcc = | ||
| 33 | LIBS_gcc = | ||
| 34 | |||
| 35 | -ifneq ($(call pathsearch,$(COMPILER_gcc)),) | ||
| 36 | -ifneq ($(COMPILER_gcc)),no) | ||
| 37 | COMPILERS += gcc | ||
| 38 | endif | ||
| 39 | -endif | ||
| 40 | |||
| 41 | COMPILER_clang = clang | ||
| 42 | LINKER_clang = clang | ||
| 43 | + | ||
| 44 | +ifneq ($(COMPILER_clang),no) | ||
| 45 | CPPFLAGS_clang = | ||
| 46 | CFLAGS_clang += -Wall -Wextra | ||
| 47 | CFLAGS_clang += -Weverything | ||
| 48 | CFLAGS_clang += -Wno-padded | ||
| 49 | CFLAGS_clang += -std=gnu99 -pedantic | ||
| 50 | -CFLAGS_clang += -Werror | ||
| 51 | -CFLAGS_clang += -fsanitize=undefined | ||
| 52 | CFLAGS_clang += -O -g | ||
| 53 | LDFLAGS_clang = | ||
| 54 | LIBS_clang = | ||
| 55 | |||
| 56 | -ifneq ($(call pathsearch,$(COMPILER_clang)),) | ||
| 57 | -ifneq ($(COMPILER_clang),no) | ||
| 58 | COMPILERS += clang | ||
| 59 | endif | ||
| 60 | -endif | ||
| 61 | |||
| 62 | |||
| 63 | ######################################################################## | ||
