Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.7832.1608793199842485198 for ; Wed, 23 Dec 2020 22:59:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=czzMxG+l; spf=pass (domain: gmail.com, ip: 209.85.214.177, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f177.google.com with SMTP id x18so884346pln.6 for ; Wed, 23 Dec 2020 22:59:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fihJTB3qmzG8AwHB/U9ZuxIwpEJBs52QE5bGRJy62UY=; b=czzMxG+lx+jkfGuCer0hK8oI8wEkZzHiBJGOIenWc0VGhuHviCAC67tBq5gYzQTyV/ BlQdHYxaF9Z0nsf7X0gba9arDmn9bgD31JxAOR4c4l/51odLYARlhvHUm+rB2A1Skiq0 A7qSyBEDJLIZUyg7T3QKHpvD5g4IUbE3ICNVvEsO/zWsMABGw1dxRHhrOevq1Bc88Yzs QGz7+cabFFDu3mItbTYSRDXy9Is79dEzrXmeEMmnJBbdQDXTcOYNE5nab5Ak55+TjDs+ bxkNoYP4HpfvgaOgQxyy7vku2uoWOeRUHrGsRmkUr08Ows+Gb31NNhOe6UkXKbf1yhNK bKcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=fihJTB3qmzG8AwHB/U9ZuxIwpEJBs52QE5bGRJy62UY=; b=j6S2pwGkB369xphK09zhh1uLb0dWZpMQbp567voF/6oZ8VxyF0IZTQy0ZHcx4dhNVU rgvUPy8Hfa8yCECOYQGsqs0Ief+KUR5R6eiwMlQUedATqFWEwKodue0JQklkx+MxwyoD 8ApaxA0Ku5VxR9pYdM+Xrh0ZqVlUDa1e/gdxZ8Np6Tsz9k50vPCdumuOC8Jx1SWzEh7q rRhaYGnOS0gk7T5WavyM/WvpwU5l4ul1ULaKn3iVe7b3fQXNEfWT4CKfV/sa+yEysQT4 +bLsGZUE6MiK3lX2/rK3f/ZQgZXzlMzmUEcIjph2MjP7KvDHGo8ekh9LHkBqt3UQsO/J m6xw== X-Gm-Message-State: AOAM533G69SmlRLItG94JhlO5wCfsHudDeObxt7thzfqjqGUMMeibSpI h2Nbxd/14cvO5QNDZ5yLvpVykOooSwMJ3w== X-Google-Smtp-Source: ABdhPJwD0ebTo1tLnbzrpMNkrnjEILSCHSsVgSxps2v+CDQHfbBqRfZbRyPN84sJnI7hON0/CYU7bw== X-Received: by 2002:a17:90a:d90e:: with SMTP id c14mr3119509pjv.85.1608793198969; Wed, 23 Dec 2020 22:59:58 -0800 (PST) Return-Path: Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:a0f0::a8e7]) by smtp.gmail.com with ESMTPSA id r20sm18840034pgb.3.2020.12.23.22.59.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Dec 2020 22:59:58 -0800 (PST) From: "Khem Raj" To: openembedded-devel@lists.openembedded.org Cc: Mark Jonas , Khem Raj Subject: [meta-oe][PATCH v3] beep: Update to 1.4.9 in new repository Date: Wed, 23 Dec 2020 22:59:51 -0800 Message-Id: <20201224065952.3714857-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Mark Jonas 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 Signed-off-by: Khem Raj --- v2: Fix build with clang v3: Do not build with both clang and gcc meta-oe/recipes-extended/beep/beep_1.2.2.bb | 25 -------- meta-oe/recipes-extended/beep/beep_1.4.9.bb | 32 ++++++++++ ...rror-as-it-fails-with-newer-clang-11.patch | 63 +++++++++++++++++++ 3 files changed, 95 insertions(+), 25 deletions(-) delete mode 100644 meta-oe/recipes-extended/beep/beep_1.2.2.bb create mode 100644 meta-oe/recipes-extended/beep/beep_1.4.9.bb create mode 100644 meta-oe/recipes-extended/beep/files/0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch 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 @@ -DESCRIPTION = "beep is a command line tool for linux that beeps the PC speaker" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" - -SRC_URI = "\ - http://johnath.com/beep/beep-${PV}.tar.gz \ - file://linux-input.patch \ -" - -SRC_URI[sha256sum] = "5c0445dac43950b7c7c3f235c6fb21f620ab3fd2f3aafaf09896e5730fcf49a1" - -S = "${WORKDIR}/${BPN}-${PV}" - -EXTRA_OEMAKE += 'CC="${CC}"' -EXTRA_OEMAKE += 'FLAGS="${CFLAGS} ${LDFLAGS}"' - -do_configure[noexec] = "1" - -do_compile() { - oe_runmake -} - -do_install() { - install -Dm 0755 ${B}/${PN} ${D}${bindir}/${PN} -} 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 @@ +SUMMARY = "beep allows you to have the PC speaker issue beeps and beep patterns" +DESCRIPTION = "beep allows you to have the PC speaker issue beeps and beep \ +patterns with given frequencies, durations, and spacing." +HOMEPAGE = "https://github.com/spkr-beep/beep" +BUGTRACKER = "https://github.com/spkr-beep/beep/issues" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/spkr-beep/beep.git;protocol=https \ + file://0001-Do-not-use-Werror-as-it-fails-with-newer-clang-11.patch \ +" +SRCREV = "8b85ddd09f73b9fd7caa5679298781a57af194ac" +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = " \ + COMPILER_gcc='${CC}' \ + LINKER_gcc='${CC}' \ + COMPILER_clang=no \ + LINKER_clang=no \ +" + +EXTRA_OEMAKE_toolchain-clang = " \ + COMPILER_clang='${CC}' \ + LINKER_clang='${CC}' \ + COMPILER_gcc=no \ + LINKER_gcc=no \ +" + +do_install() { + oe_runmake install DESTDIR='${D}' +} 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 @@ +From 6b33adfa438e35b6a37cfb0364274370ef4f9fc1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 23 Dec 2020 18:00:59 +0000 +Subject: [PATCH] Do not use -Werror as it fails with newer clang 11+ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + GNUmakefile | 1 - + 1 file changed, 1 deletion(-) + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -91,12 +91,13 @@ comma := , + # If supported by COMPILER_gcc, add given flags to CFLAGS_gcc. + # Example usage: + # $(eval $(call CHECK_CFLAGS_gcc,-fasynchronous-unwind-tables)) +-define CHECK_CFLAGS_gcc +-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)) +-endef + + COMPILER_gcc = gcc + LINKER_gcc = gcc ++ifneq ($(COMPILER_gcc),no) ++define CHECK_CFLAGS_gcc ++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)) ++endef + CPPFLAGS_gcc = + CFLAGS_gcc = + CFLAGS_gcc += -std=gnu99 -pedantic +@@ -113,30 +114,24 @@ CFLAGS_gcc += -save-temps=obj + LDFLAGS_gcc = + LIBS_gcc = + +-ifneq ($(call pathsearch,$(COMPILER_gcc)),) +-ifneq ($(COMPILER_gcc)),no) + COMPILERS += gcc + endif +-endif + + COMPILER_clang = clang + LINKER_clang = clang ++ ++ifneq ($(COMPILER_clang),no) + CPPFLAGS_clang = + CFLAGS_clang += -Wall -Wextra + CFLAGS_clang += -Weverything + CFLAGS_clang += -Wno-padded + CFLAGS_clang += -std=gnu99 -pedantic +-CFLAGS_clang += -Werror +-CFLAGS_clang += -fsanitize=undefined + CFLAGS_clang += -O -g + LDFLAGS_clang = + LIBS_clang = + +-ifneq ($(call pathsearch,$(COMPILER_clang)),) +-ifneq ($(COMPILER_clang),no) + COMPILERS += clang + endif +-endif + + + ######################################################################## -- 2.29.2