From owner-dev-commits-src-all@freebsd.org Wed Jan 13 10:02:29 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8A6204D6EE4; Wed, 13 Jan 2021 10:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DG3053T6Dz4QvN; Wed, 13 Jan 2021 10:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A12D1563F; Wed, 13 Jan 2021 10:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10DA2TW5035722; Wed, 13 Jan 2021 10:02:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10DA2TIU035721; Wed, 13 Jan 2021 10:02:29 GMT (envelope-from git) Date: Wed, 13 Jan 2021 10:02:29 GMT Message-Id: <202101131002.10DA2TIU035721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Edward Tomasz Napierala Subject: git: a339b4223a4f - main - linux: bump the default version from 3.10.0 to 3.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a339b4223a4fd7cddbd691302d2eeeddc045415a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jan 2021 10:02:29 -0000 The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=a339b4223a4fd7cddbd691302d2eeeddc045415a commit a339b4223a4fd7cddbd691302d2eeeddc045415a Author: Edward Tomasz Napierala AuthorDate: 2021-01-13 09:59:08 +0000 Commit: Edward Tomasz Napierala CommitDate: 2021-01-13 10:02:16 +0000 linux: bump the default version from 3.10.0 to 3.17.0 This is required for Qt5, as found in Ubuntu Focal. The library contains the minimum kernel version encoded in an ELF note; this makes rtld ignore it altogether, with a confusing error message. Without it, things fail like this: $ konsole: error while loading shared libraries: libQt5Core.so.5: cannot open shared object file: No such file or directory For reference, the Qt kernel version requirements can be found at: https://github.com/qt/qtbase/blob/dev/src/corelib/global/minimum-linux_p.h Sponsored by: The FreeBSD Foundation Reviewed By: emaste Differential Revision: https://reviews.freebsd.org/D28105 --- sys/compat/linux/linux_mib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_mib.h b/sys/compat/linux/linux_mib.h index bef21758acde..0a1baec39826 100644 --- a/sys/compat/linux/linux_mib.h +++ b/sys/compat/linux/linux_mib.h @@ -47,7 +47,7 @@ int linux_get_oss_version(struct thread *td); int linux_kernver(struct thread *td); #define LINUX_KVERSION 3 -#define LINUX_KPATCHLEVEL 10 +#define LINUX_KPATCHLEVEL 17 #define LINUX_KSUBLEVEL 0 #define LINUX_KERNVER(a,b,c) (((a) << 16) + ((b) << 8) + (c))