From 25998cb07d913ea786ede3c6fa4929033a608340 Mon Sep 17 00:00:00 2001 From: Terin Stock Date: Tue, 7 Jan 2025 21:22:22 +0100 Subject: sys-kernel/vtty: add 0_p20250105, drop 0_p20230917-r1 --- sys-kernel/vtty/Manifest | 2 +- ...01-vtty_write-with-size_t-counts-for-v6.6.patch | 32 -------------- .../files/0002-remove-no_llseek-for-v6.12.patch | 31 -------------- sys-kernel/vtty/vtty-0_p20230917-r1.ebuild | 50 ---------------------- sys-kernel/vtty/vtty-0_p20250105.ebuild | 45 +++++++++++++++++++ 5 files changed, 46 insertions(+), 114 deletions(-) delete mode 100644 sys-kernel/vtty/files/0001-vtty_write-with-size_t-counts-for-v6.6.patch delete mode 100644 sys-kernel/vtty/files/0002-remove-no_llseek-for-v6.12.patch delete mode 100644 sys-kernel/vtty/vtty-0_p20230917-r1.ebuild create mode 100644 sys-kernel/vtty/vtty-0_p20250105.ebuild (limited to 'sys-kernel') diff --git a/sys-kernel/vtty/Manifest b/sys-kernel/vtty/Manifest index dff9885..df35e00 100644 --- a/sys-kernel/vtty/Manifest +++ b/sys-kernel/vtty/Manifest @@ -1 +1 @@ -DIST vtty-0_p20230917.tar.gz 19947 BLAKE2B e9c2623828f46625746fe4a436f6a89ba2fedd4d157f07273160a5658d08c351c515da72651fc942c969369fadf267737d6ea46fc83106d825cb208201575540 SHA512 f71f0175bce4756bc8a589aea0e8a75b92ebbf6bf3c276598aac046933621185867f6b449de12e4c79a8a8695522a83511ea9418a941eb8f99c3e58f52a1a98b +DIST vtty-0_p20250105.tar.gz 19973 BLAKE2B 0856f6b4338ababf34554e335b78810d0d3d887ed1c099a53383f6d8640adee57ed514fc12a51962eb88bb6fc98e303aafd3bdf54d4120c55c17343191d06e63 SHA512 fe3c32ab785b516bd07db5a11f035b8c0f4b93adade2329c353031ac6a09c2aa137279ac5090a8628cf053d23dd0761cb9ba45e70df26431cb0601c171af0af7 diff --git a/sys-kernel/vtty/files/0001-vtty_write-with-size_t-counts-for-v6.6.patch b/sys-kernel/vtty/files/0001-vtty_write-with-size_t-counts-for-v6.6.patch deleted file mode 100644 index 49dc6ba..0000000 --- a/sys-kernel/vtty/files/0001-vtty_write-with-size_t-counts-for-v6.6.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c5d9c7c52b958fa62c1a8680e9bf5c1170bfa03d Mon Sep 17 00:00:00 2001 -From: Terin Stock -Date: Sun, 5 Jan 2025 19:50:24 +0100 -Subject: [PATCH 1/2] vtty_write with size_t counts for v6.6 - -As of Linux v6.6 the definition for tty_operations::write uses size_t to -unify with other tty_operations. - -Signed-off-by: Terin Stock ---- - vtty.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/vtty.c b/vtty.c -index b3c6c65..e086bd1 100644 ---- a/vtty.c -+++ b/vtty.c -@@ -105,7 +105,11 @@ static void vtty_close(struct tty_struct *tty, struct file *filp) - return; - } - -+#if LINUX_VERSION_CODE > KERNEL_VERSION(6,6,0) -+static ssize_t vtty_write(struct tty_struct *tty, const u8 *buf, size_t count) -+#else - static int vtty_write(struct tty_struct *tty, const unsigned char *buf, int count) -+#endif - { - // the TTY layer manages -EAGAIN and (non-)blocking writes - struct vtty_port *port = &ports[tty->index]; --- -2.45.2 - diff --git a/sys-kernel/vtty/files/0002-remove-no_llseek-for-v6.12.patch b/sys-kernel/vtty/files/0002-remove-no_llseek-for-v6.12.patch deleted file mode 100644 index 19f3437..0000000 --- a/sys-kernel/vtty/files/0002-remove-no_llseek-for-v6.12.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7ab72cec2dbb59f0963d55f27cbc57025fc6f579 Mon Sep 17 00:00:00 2001 -From: Terin Stock -Date: Sun, 5 Jan 2025 19:51:05 +0100 -Subject: [PATCH 2/2] remove no_llseek for v6.12 - -As of Linux v6.0 all calls to ->llseek are called through vfs_llseek and -setting no_llseek is equivalent to leaving it as NULL. The definition of -no_llseek was removed in v6.12. - -Signed-off-by: Terin Stock ---- - vtty.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/vtty.c b/vtty.c -index e086bd1..7931cde 100644 ---- a/vtty.c -+++ b/vtty.c -@@ -684,7 +684,9 @@ static long vtmx_ioctl(struct file * filp, unsigned int cmd, unsigned long arg) - - static struct file_operations vtmx_fops = { - .owner = THIS_MODULE, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,0,0) - .llseek = no_llseek, -+#endif - .read = vtmx_read, - .write = vtmx_write, - .poll = vtmx_poll, --- -2.45.2 - diff --git a/sys-kernel/vtty/vtty-0_p20230917-r1.ebuild b/sys-kernel/vtty/vtty-0_p20230917-r1.ebuild deleted file mode 100644 index a59aa5c..0000000 --- a/sys-kernel/vtty/vtty-0_p20230917-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit linux-mod-r1 udev - -DESCRIPTION="Virtual serial port kernel module" -HOMEPAGE="https://github.com/anszom/vtty" -COMMIT="49f3fb0ba5f062771d06182d24c2b525e4b67dea" -SRC_URI="https://github.com/anszom/vtty/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${COMMIT}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND="virtual/udev" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/0001-vtty_write-with-size_t-counts-for-v6.6.patch - "${FILESDIR}"/0002-remove-no_llseek-for-v6.12.patch -) - -src_compile() { - local modlist=( vtty ) - local modargs=( KDIR="${KV_OUT_DIR}" ) - - linux-mod-r1_src_compile -} - -src_install() { - linux-mod-r1_src_install - - udev_newrules - 69-vtty.rules <<-EOF - # do not edit this file, it will be overwritten on update - # - KERNEL=="vtmx", SUBSYSTEM=="misc", TAG+="uaccess" - KERNEL=="ttyV[0-9]*", SUBSYSTEM=="tty", TAG+="uaccess" - EOF -} - -pkg_postinst() { - linux-mod-r1_pkg_postinst - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-kernel/vtty/vtty-0_p20250105.ebuild b/sys-kernel/vtty/vtty-0_p20250105.ebuild new file mode 100644 index 0000000..00180ca --- /dev/null +++ b/sys-kernel/vtty/vtty-0_p20250105.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit linux-mod-r1 udev + +DESCRIPTION="Virtual serial port kernel module" +HOMEPAGE="https://github.com/anszom/vtty" +COMMIT="7ab72cec2dbb59f0963d55f27cbc57025fc6f579" +SRC_URI="https://github.com/anszom/vtty/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="virtual/udev" +DEPEND="${RDEPEND}" + +src_compile() { + local modlist=( vtty ) + local modargs=( KDIR="${KV_OUT_DIR}" ) + + linux-mod-r1_src_compile +} + +src_install() { + linux-mod-r1_src_install + + udev_newrules - 69-vtty.rules <<-EOF + # do not edit this file, it will be overwritten on update + # + KERNEL=="vtmx", SUBSYSTEM=="misc", TAG+="uaccess" + KERNEL=="ttyV[0-9]*", SUBSYSTEM=="tty", TAG+="uaccess" + EOF +} + +pkg_postinst() { + linux-mod-r1_pkg_postinst + udev_reload +} + +pkg_postrm() { + udev_reload +} -- cgit v1.2.3