From d4cc1dded5b45243f3b86aa01dc3da48a734aa22 Mon Sep 17 00:00:00 2001 From: Barbaross Date: Mon, 3 Oct 2022 09:12:51 -0400 Subject: [PATCH 1/7] keyd: update to 2.4.2 --- srcpkgs/keyd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/keyd/template b/srcpkgs/keyd/template index 39b6aeaff0ae..ac149364173e 100644 --- a/srcpkgs/keyd/template +++ b/srcpkgs/keyd/template @@ -1,6 +1,6 @@ # Template file for 'keyd' pkgname=keyd -version=2.4.1 +version=2.4.2 revision=1 build_style=gnu-makefile make_use_env=yes @@ -10,7 +10,7 @@ license="MIT" homepage="https://github.com/rvaiya/keyd" changelog="https://raw.githubusercontent.com/rvaiya/keyd/master/docs/CHANGELOG.md" distfiles="https://github.com/rvaiya/keyd/archive/refs/tags/v${version}.tar.gz" -checksum=23e6eac529b0c07ad99420c2a8a75967b7cadb0c3509284cc0f7633056dc50e2 +checksum=877e1a39efaa062c996856d632d6aeedd409422be6c5bdb2064a9b707293c280 system_groups="keyd" post_install() { From 41ebb281a459d9b6766b93b2c57c269a6c71a701 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 5 Oct 2022 13:21:10 +0200 Subject: [PATCH 2/7] drumkv1: update to 0.9.27. --- srcpkgs/drumkv1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template index 866c71aba2ed..02c6ca17a803 100644 --- a/srcpkgs/drumkv1/template +++ b/srcpkgs/drumkv1/template @@ -1,6 +1,6 @@ # Template file for 'drumkv1' pkgname=drumkv1 -version=0.9.26 +version=0.9.27 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -11,5 +11,5 @@ maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://drumkv1.sourceforge.io/" changelog="https://github.com/rncbc/drumkv1/raw/master/ChangeLog" -distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz" -checksum=1149811ae195dd08e835d87fa23f644660a7dbda271afab4b57c9ec51eee0548 +distfiles="${SOURCEFORGE_SITE}/drumkv1/drumkv1-${version}.tar.gz" +checksum=433b247794e6fdf9b32929fb52ee7135808b25b8be19d574a3b6068857f92649 From 7415854eb90a2b1f238bda9a0ad143bc92224765 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 5 Oct 2022 13:21:15 +0200 Subject: [PATCH 3/7] padthv1: update to 0.9.27. --- srcpkgs/padthv1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template index 181a84267632..184a5017da3b 100644 --- a/srcpkgs/padthv1/template +++ b/srcpkgs/padthv1/template @@ -1,6 +1,6 @@ # Template file for 'padthv1' pkgname=padthv1 -version=0.9.26 +version=0.9.27 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -11,5 +11,5 @@ maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://padthv1.sourceforge.io/" changelog="https://github.com/rncbc/padthv1/raw/master/ChangeLog" -distfiles="https://download.sourceforge.net/padthv1/padthv1-${version}.tar.gz" -checksum=813f818d6c6c66b403937c66a7729ea85226eab17db0992334441613c903ef0a +distfiles="${SOURCEFORGE_SITE}/padthv1/padthv1-${version}.tar.gz" +checksum=a4969fc144d4440ecd81e83ddce535a477cae732f27f479c0d77af085e02b579 From d7b0e6dc27cd43492ad7a161d04c614e567f0f89 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 5 Oct 2022 13:21:20 +0200 Subject: [PATCH 4/7] samplv1: update to 0.9.27. --- srcpkgs/samplv1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template index 62dc3cf39b54..de5f2b556813 100644 --- a/srcpkgs/samplv1/template +++ b/srcpkgs/samplv1/template @@ -1,6 +1,6 @@ # Template file for 'samplv1' pkgname=samplv1 -version=0.9.26 +version=0.9.27 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -11,5 +11,5 @@ maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://samplv1.sourceforge.io/" changelog="https://github.com/rncbc/samplv1/raw/master/ChangeLog" -distfiles="https://download.sourceforge.net/samplv1/samplv1-${version}.tar.gz" -checksum=91b680d97efad89dcb98221b9cc7df733dcc8a437666184ba862c2341c1c1fe7 +distfiles="${SOURCEFORGE_SITE}/samplv1/samplv1-${version}.tar.gz" +checksum=7ef99b6b7912faf7ba7df937d72a463562249daa96126aad9313158d0b67ad73 From cada318906ecee8ed6cbd062921f38cfd14f35e1 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 5 Oct 2022 13:21:25 +0200 Subject: [PATCH 5/7] synthv1: update to 0.9.27. --- srcpkgs/synthv1/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template index e4e6913ca355..95507391a281 100644 --- a/srcpkgs/synthv1/template +++ b/srcpkgs/synthv1/template @@ -1,6 +1,6 @@ # Template file for 'synthv1' pkgname=synthv1 -version=0.9.26 +version=0.9.27 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -10,5 +10,5 @@ maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://synthv1.sourceforge.io/" changelog="https://github.com/rncbc/synthv1/raw/master/ChangeLog" -distfiles="https://download.sourceforge.net/synthv1/synthv1-${version}.tar.gz" -checksum=8d551fc7572feeac2f1676b4a8915e1e20f5a7f2075044335d7bb840069c51ab +distfiles="${SOURCEFORGE_SITE}/synthv1/synthv1-${version}.tar.gz" +checksum=6fb3edefad2af719b80cdf890780f4dbac95a14ebdf0a471671f2723cb8b0c8f From 8871db31c635fdd89bbb96b2f74c2c0cef1d82ee Mon Sep 17 00:00:00 2001 From: Barbaross Date: Thu, 4 Aug 2022 09:27:43 -0400 Subject: [PATCH 6/7] keyd: Verify current udevd process is supervised by runit Sometimes when starting the keyd service, the keyboard can become unresponsive. This is the result of keyd starting when the early udevd process is still running but before the udevd runit service has started. The udevd runit service kills the early udevd process causing the keyboard to become unresponsive until the keyd process has been terminated. The below code verifies that the supervised udevd process is the same as the currently running udevd process. Please enter the commit message for your changes. Lines starting with '#' will be ignored, and an empty message aborts the commit. --- srcpkgs/keyd/files/keyd/run | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/srcpkgs/keyd/files/keyd/run b/srcpkgs/keyd/files/keyd/run index 868cb747ab6c..5e62cef91c72 100644 --- a/srcpkgs/keyd/files/keyd/run +++ b/srcpkgs/keyd/files/keyd/run @@ -1,2 +1,11 @@ #!/bin/sh + +# Sometimes when starting the keyd service, the keyboard can become unresponsive. +# This is the result of keyd starting when the early udevd process is still running but +# before the udevd runit service has started. The udevd runit service kills the early udevd +# process causing the keyboard to become unresponsive until the keyd process has been +# terminated. The below code verifies that the supervised udevd process is the same as +# the currently running udevd process. +[ "$(cat /var/service/udevd/supervise/pid)" = "$(pgrep -x udevd)" ] || exit 1 + exec keyd From b51c9c38db0bbfa6f672cd88121b8a8fded38327 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 5 Oct 2022 15:21:57 +0200 Subject: [PATCH 7/7] u-boot-tools: update to 2022.10. --- .../fix-build-with-binutils-2.38.patch | 42 +++++++++++++++++++ srcpkgs/u-boot-tools/template | 4 +- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/u-boot-tools/patches/fix-build-with-binutils-2.38.patch diff --git a/srcpkgs/u-boot-tools/patches/fix-build-with-binutils-2.38.patch b/srcpkgs/u-boot-tools/patches/fix-build-with-binutils-2.38.patch new file mode 100644 index 000000000000..08e389f54c48 --- /dev/null +++ b/srcpkgs/u-boot-tools/patches/fix-build-with-binutils-2.38.patch @@ -0,0 +1,42 @@ +>From version 2.38, binutils default to ISA spec version 20191213. This +means that the csr read/write (csrr*/csrw*) instructions and fence.i +instruction has separated from the `I` extension, become two standalone +extensions: Zicsr and Zifencei. As the kernel uses those instruction, +this causes the following build failure: + +arch/riscv/cpu/mtrap.S: Assembler messages: +arch/riscv/cpu/mtrap.S:65: Error: unrecognized opcode `csrr a0,scause' +arch/riscv/cpu/mtrap.S:66: Error: unrecognized opcode `csrr a1,sepc' +arch/riscv/cpu/mtrap.S:67: Error: unrecognized opcode `csrr a2,stval' +arch/riscv/cpu/mtrap.S:70: Error: unrecognized opcode `csrw sepc,a0' + +Signed-off-by: Alexandre Ghiti +--- + arch/riscv/Makefile | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile +index 0b80eb8d86..53d1194ffb 100644 +--- a/arch/riscv/Makefile ++++ b/arch/riscv/Makefile +@@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y) + CMODEL = medany + endif + +-ARCH_FLAGS = -march=$(ARCH_BASE)$(ARCH_A)$(ARCH_C) -mabi=$(ABI) \ ++RISCV_MARCH = $(ARCH_BASE)$(ARCH_A)$(ARCH_C) ++ ++# Newer binutils versions default to ISA spec version 20191213 which moves some ++# instructions from the I extension to the Zicsr and Zifencei extensions. ++toolchain-need-zicsr-zifencei := $(call cc-option-yn, -mabi=$(ABI) -march=$(RISCV_MARCH)_zicsr_zifencei) ++ifeq ($(toolchain-need-zicsr-zifencei),y) ++ RISCV_MARCH := $(RISCV_MARCH)_zicsr_zifencei ++endif ++ ++ARCH_FLAGS = -march=$(RISCV_MARCH) -mabi=$(ABI) \ + -mcmodel=$(CMODEL) + + PLATFORM_CPPFLAGS += $(ARCH_FLAGS) +-- +2.32.0 + diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template index 0ca8e34429cb..77c53dc7858e 100644 --- a/srcpkgs/u-boot-tools/template +++ b/srcpkgs/u-boot-tools/template @@ -1,6 +1,6 @@ # Template file for 'u-boot-tools' pkgname=u-boot-tools -version=2022.07 +version=2022.10 revision=1 wrksrc="u-boot-${version}" build_style=gnu-makefile @@ -13,7 +13,7 @@ maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://www.denx.de/wiki/U-Boot/" distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2" -checksum=92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e +checksum=50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 if [ "$CROSS_BUILD" ]; then make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"