Get rid of the customizable TTY devices number patch. This breaks on some non-Arch distros and is only interesting to a very limited number of users that aren't necessarily our core target userbase.
This commit is contained in:
parent
ba4ac2ab52
commit
72e3d2de49
18
PKGBUILD
18
PKGBUILD
@ -143,7 +143,6 @@ case $_basever in
|
||||
0009-prjc_v5.7-r3.patch
|
||||
0011-ZFS-fix.patch
|
||||
0012-linux-hardened.patch
|
||||
0012-misc-additions.patch
|
||||
)
|
||||
sha256sums=('de8163bb62f822d84f7a3983574ec460060bf013a78ff79cd7c979ff1ec1d7e0'
|
||||
'66a0173a13cd58015f5bf1b14f67bfa15dc1db5d8e7225fcd95ac2e9a5341653'
|
||||
@ -169,8 +168,7 @@ case $_basever in
|
||||
'965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7'
|
||||
'b2a2ae866fc3f1093f67e69ba59738827e336b8f800fb0487599127f7f3ef881'
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
|
||||
'6821f92bd2bde3a3938d17b070d70f18a2f33cae81647567b5a4d94c9cd75f3d'
|
||||
'bdc60c83cd5fbf9912f9201d6e4fe3c84fe5f634e6823bd8e78264ad606b3a9e')
|
||||
'6821f92bd2bde3a3938d17b070d70f18a2f33cae81647567b5a4d94c9cd75f3d')
|
||||
;;
|
||||
58)
|
||||
opt_ver="5.8%2B"
|
||||
@ -202,7 +200,6 @@ case $_basever in
|
||||
0009-prjc_v5.8-r3.patch
|
||||
0011-ZFS-fix.patch
|
||||
#0012-linux-hardened.patch
|
||||
0012-misc-additions.patch
|
||||
)
|
||||
sha256sums=('e7f75186aa0642114af8f19d99559937300ca27acaf7451b36d4f9b0f85cf1f5'
|
||||
'5b558a40c2fdad2c497fe0b1a64679313fd5a7ccbaecef8803d49b3baaccbacd'
|
||||
@ -224,8 +221,7 @@ case $_basever in
|
||||
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
|
||||
'965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7'
|
||||
'f5dbff4833a2e3ca94c202e5197894d5f1006c689ff149355353e77d2e17c943'
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
|
||||
'98311deeb474b39e821cd1e64198793d5c4d797155b3b8bbcb1938b7f11e8d74')
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104')
|
||||
;;
|
||||
59)
|
||||
opt_ver="5.8%2B"
|
||||
@ -257,7 +253,6 @@ case $_basever in
|
||||
0009-prjc_v5.9-r3.patch
|
||||
0011-ZFS-fix.patch
|
||||
#0012-linux-hardened.patch
|
||||
0012-misc-additions.patch
|
||||
)
|
||||
sha256sums=('3239a4ee1250bf2048be988cc8cb46c487b2c8a0de5b1b032d38394d5c6b1a06'
|
||||
'46c520da2db82d8f9a15c2117d3a50e0faaaf98f05bd4ea1f3105e2724f207d6'
|
||||
@ -282,8 +277,7 @@ case $_basever in
|
||||
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
|
||||
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
|
||||
'0d5fe3a9050536fe431564b221badb85af7ff57b330e3978ae90d21989fcad2d'
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
|
||||
'433b919e6a0be26784fb4304c43b1811a28f12ad3de9e26c0af827f64c0c316e')
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104')
|
||||
;;
|
||||
510)
|
||||
opt_ver="5.8%2B"
|
||||
@ -340,7 +334,7 @@ case $_basever in
|
||||
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
|
||||
'e308292fc42840a2366280ea7cf26314e92b931bb11f04ad4830276fc0326ee1'
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
|
||||
'034e3958993a616b98d172d68658e844f7bfd445da742fbce4a24995e5de1d8d')
|
||||
'c41bf6a5d2ec52df766ce3019800cf7dd60a62f52811ead6f20dd06765870de2')
|
||||
;;
|
||||
511)
|
||||
opt_ver="5.8%2B"
|
||||
@ -372,7 +366,6 @@ case $_basever in
|
||||
#0009-prjc_v5.11-r0.patch
|
||||
0011-ZFS-fix.patch
|
||||
#0012-linux-hardened.patch
|
||||
0012-misc-additions.patch
|
||||
)
|
||||
sha256sums=('c158fd7a2efa738554d04f281770c65afaef9cab14f1a114ee499fcbe27eae95'
|
||||
'SKIP'
|
||||
@ -385,8 +378,7 @@ case $_basever in
|
||||
'7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7'
|
||||
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
|
||||
'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
|
||||
'433b919e6a0be26784fb4304c43b1811a28f12ad3de9e26c0af827f64c0c316e')
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104')
|
||||
;;
|
||||
esac
|
||||
|
||||
|
@ -69,8 +69,6 @@ if [ -e "$_EXT_CONFIG_PATH" ]; then
|
||||
source "$_EXT_CONFIG_PATH"
|
||||
fi
|
||||
|
||||
_misc_adds="false" # We currently don't want this enabled on non-Arch
|
||||
|
||||
if [ "$1" = "install" ] || [ "$1" = "config" ]; then
|
||||
|
||||
if [ -z $_distro ] && [ "$1" = "install" ]; then
|
||||
|
@ -371,7 +371,7 @@ _tkg_srcprep() {
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$_misc_adds" = "true" ] && [ "$_basever" != "54" ]; then
|
||||
if [ "$_misc_adds" = "true" ]; then
|
||||
msg2 "Applying misc additions patch"
|
||||
tkgpatch="$srcdir/0012-misc-additions.patch" && _tkg_patcher
|
||||
fi
|
||||
@ -466,7 +466,6 @@ _tkg_srcprep() {
|
||||
echo "# CONFIG_DYNAMIC_FAULT is not set" >> ./.config
|
||||
sed -i -e 's/CONFIG_DEFAULT_FQ_CODEL=y/# CONFIG_DEFAULT_FQ_CODEL is not set/' ./.config
|
||||
echo "CONFIG_DEFAULT_CAKE=y" >> ./.config
|
||||
echo "CONFIG_NR_TTY_DEVICES=63" >> ./.config
|
||||
if [ "$_basever" = "54" ]; then
|
||||
echo "CONFIG_TP_SMAPI=m" >> ./.config
|
||||
echo "CONFIG_RAID6_USE_PREFER_GEN=y" >> ./.config
|
||||
|
@ -1,59 +1,3 @@
|
||||
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
|
||||
index 0840d27381ea..73aba9a31064 100644
|
||||
--- a/drivers/tty/Kconfig
|
||||
+++ b/drivers/tty/Kconfig
|
||||
@@ -75,6 +75,19 @@ config VT_CONSOLE_SLEEP
|
||||
def_bool y
|
||||
depends on VT_CONSOLE && PM_SLEEP
|
||||
|
||||
+config NR_TTY_DEVICES
|
||||
+ int "Maximum tty device number"
|
||||
+ depends on VT
|
||||
+ range 12 63
|
||||
+ default 63
|
||||
+ help
|
||||
+ This option is used to change the number of tty devices in /dev.
|
||||
+ The default value is 63. The lowest number you can set is 12,
|
||||
+ 63 is also the upper limit so we don't overrun the serial
|
||||
+ consoles.
|
||||
+
|
||||
+ If unsure, say 63.
|
||||
+
|
||||
config HW_CONSOLE
|
||||
bool
|
||||
depends on VT && !UML
|
||||
diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h
|
||||
index e9d39c48520a..3bceead8da40 100644
|
||||
--- a/include/uapi/linux/vt.h
|
||||
+++ b/include/uapi/linux/vt.h
|
||||
@@ -3,12 +3,25 @@
|
||||
#define _UAPI_LINUX_VT_H
|
||||
|
||||
|
||||
+/*
|
||||
+ * We will make this definition solely for the purpose of making packages
|
||||
+ * such as splashutils build, because they can not understand that
|
||||
+ * NR_TTY_DEVICES is defined in the kernel configuration.
|
||||
+ */
|
||||
+#ifndef CONFIG_NR_TTY_DEVICES
|
||||
+#define CONFIG_NR_TTY_DEVICES 63
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* These constants are also useful for user-level apps (e.g., VC
|
||||
* resizing).
|
||||
*/
|
||||
#define MIN_NR_CONSOLES 1 /* must be at least 1 */
|
||||
-#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */
|
||||
+/*
|
||||
+ * NR_TTY_DEVICES:
|
||||
+ * Value MUST be at least 12 and must never be higher then 63
|
||||
+ */
|
||||
+#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES /* serial lines start above this */
|
||||
/* Note: the ioctl VT_GETSTATE does not work for
|
||||
consoles 16 and higher (since it returns a short) */
|
||||
|
||||
|
||||
From e5e77ad2223f662e1615266d8ef39a8db7e65a70 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Felix=20H=C3=A4dicke?= <felixhaedicke@web.de>
|
||||
Date: Thu, 19 Nov 2020 09:22:32 +0100
|
||||
|
@ -1,54 +0,0 @@
|
||||
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
|
||||
index 0840d27381ea..73aba9a31064 100644
|
||||
--- a/drivers/tty/Kconfig
|
||||
+++ b/drivers/tty/Kconfig
|
||||
@@ -75,6 +75,19 @@ config VT_CONSOLE_SLEEP
|
||||
def_bool y
|
||||
depends on VT_CONSOLE && PM_SLEEP
|
||||
|
||||
+config NR_TTY_DEVICES
|
||||
+ int "Maximum tty device number"
|
||||
+ depends on VT
|
||||
+ range 12 63
|
||||
+ default 63
|
||||
+ help
|
||||
+ This option is used to change the number of tty devices in /dev.
|
||||
+ The default value is 63. The lowest number you can set is 12,
|
||||
+ 63 is also the upper limit so we don't overrun the serial
|
||||
+ consoles.
|
||||
+
|
||||
+ If unsure, say 63.
|
||||
+
|
||||
config HW_CONSOLE
|
||||
bool
|
||||
depends on VT && !UML
|
||||
diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h
|
||||
index e9d39c48520a..3bceead8da40 100644
|
||||
--- a/include/uapi/linux/vt.h
|
||||
+++ b/include/uapi/linux/vt.h
|
||||
@@ -3,12 +3,25 @@
|
||||
#define _UAPI_LINUX_VT_H
|
||||
|
||||
|
||||
+/*
|
||||
+ * We will make this definition solely for the purpose of making packages
|
||||
+ * such as splashutils build, because they can not understand that
|
||||
+ * NR_TTY_DEVICES is defined in the kernel configuration.
|
||||
+ */
|
||||
+#ifndef CONFIG_NR_TTY_DEVICES
|
||||
+#define CONFIG_NR_TTY_DEVICES 63
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* These constants are also useful for user-level apps (e.g., VC
|
||||
* resizing).
|
||||
*/
|
||||
#define MIN_NR_CONSOLES 1 /* must be at least 1 */
|
||||
-#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */
|
||||
+/*
|
||||
+ * NR_TTY_DEVICES:
|
||||
+ * Value MUST be at least 12 and must never be higher then 63
|
||||
+ */
|
||||
+#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES /* serial lines start above this */
|
||||
/* Note: the ioctl VT_GETSTATE does not work for
|
||||
consoles 16 and higher (since it returns a short) */
|
@ -1,55 +0,0 @@
|
||||
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
|
||||
index 0840d27381ea..73aba9a31064 100644
|
||||
--- a/drivers/tty/Kconfig
|
||||
+++ b/drivers/tty/Kconfig
|
||||
@@ -75,6 +75,19 @@ config VT_CONSOLE_SLEEP
|
||||
def_bool y
|
||||
depends on VT_CONSOLE && PM_SLEEP
|
||||
|
||||
+config NR_TTY_DEVICES
|
||||
+ int "Maximum tty device number"
|
||||
+ depends on VT
|
||||
+ range 12 63
|
||||
+ default 63
|
||||
+ ---help---
|
||||
+ This option is used to change the number of tty devices in /dev.
|
||||
+ The default value is 63. The lowest number you can set is 12,
|
||||
+ 63 is also the upper limit so we don't overrun the serial
|
||||
+ consoles.
|
||||
+
|
||||
+ If unsure, say 63.
|
||||
+
|
||||
config HW_CONSOLE
|
||||
bool
|
||||
depends on VT && !UML
|
||||
diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h
|
||||
index e9d39c48520a..3bceead8da40 100644
|
||||
--- a/include/uapi/linux/vt.h
|
||||
+++ b/include/uapi/linux/vt.h
|
||||
@@ -3,12 +3,25 @@
|
||||
#define _UAPI_LINUX_VT_H
|
||||
|
||||
|
||||
+/*
|
||||
+ * We will make this definition solely for the purpose of making packages
|
||||
+ * such as splashutils build, because they can not understand that
|
||||
+ * NR_TTY_DEVICES is defined in the kernel configuration.
|
||||
+ */
|
||||
+#ifndef CONFIG_NR_TTY_DEVICES
|
||||
+#define CONFIG_NR_TTY_DEVICES 63
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* These constants are also useful for user-level apps (e.g., VC
|
||||
* resizing).
|
||||
*/
|
||||
#define MIN_NR_CONSOLES 1 /* must be at least 1 */
|
||||
-#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */
|
||||
+/*
|
||||
+ * NR_TTY_DEVICES:
|
||||
+ * Value MUST be at least 12 and must never be higher then 63
|
||||
+ */
|
||||
+#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES /* serial lines start above this */
|
||||
/* Note: the ioctl VT_GETSTATE does not work for
|
||||
consoles 16 and higher (since it returns a short) */
|
||||
|
@ -1,54 +0,0 @@
|
||||
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
|
||||
index 0840d27381ea..73aba9a31064 100644
|
||||
--- a/drivers/tty/Kconfig
|
||||
+++ b/drivers/tty/Kconfig
|
||||
@@ -75,6 +75,19 @@ config VT_CONSOLE_SLEEP
|
||||
def_bool y
|
||||
depends on VT_CONSOLE && PM_SLEEP
|
||||
|
||||
+config NR_TTY_DEVICES
|
||||
+ int "Maximum tty device number"
|
||||
+ depends on VT
|
||||
+ range 12 63
|
||||
+ default 63
|
||||
+ ---help---
|
||||
+ This option is used to change the number of tty devices in /dev.
|
||||
+ The default value is 63. The lowest number you can set is 12,
|
||||
+ 63 is also the upper limit so we don't overrun the serial
|
||||
+ consoles.
|
||||
+
|
||||
+ If unsure, say 63.
|
||||
+
|
||||
config HW_CONSOLE
|
||||
bool
|
||||
depends on VT && !UML
|
||||
diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h
|
||||
index e9d39c48520a..3bceead8da40 100644
|
||||
--- a/include/uapi/linux/vt.h
|
||||
+++ b/include/uapi/linux/vt.h
|
||||
@@ -3,12 +3,25 @@
|
||||
#define _UAPI_LINUX_VT_H
|
||||
|
||||
|
||||
+/*
|
||||
+ * We will make this definition solely for the purpose of making packages
|
||||
+ * such as splashutils build, because they can not understand that
|
||||
+ * NR_TTY_DEVICES is defined in the kernel configuration.
|
||||
+ */
|
||||
+#ifndef CONFIG_NR_TTY_DEVICES
|
||||
+#define CONFIG_NR_TTY_DEVICES 63
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* These constants are also useful for user-level apps (e.g., VC
|
||||
* resizing).
|
||||
*/
|
||||
#define MIN_NR_CONSOLES 1 /* must be at least 1 */
|
||||
-#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */
|
||||
+/*
|
||||
+ * NR_TTY_DEVICES:
|
||||
+ * Value MUST be at least 12 and must never be higher then 63
|
||||
+ */
|
||||
+#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES /* serial lines start above this */
|
||||
/* Note: the ioctl VT_GETSTATE does not work for
|
||||
consoles 16 and higher (since it returns a short) */
|
@ -1,54 +0,0 @@
|
||||
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
|
||||
index 0840d27381ea..73aba9a31064 100644
|
||||
--- a/drivers/tty/Kconfig
|
||||
+++ b/drivers/tty/Kconfig
|
||||
@@ -75,6 +75,19 @@ config VT_CONSOLE_SLEEP
|
||||
def_bool y
|
||||
depends on VT_CONSOLE && PM_SLEEP
|
||||
|
||||
+config NR_TTY_DEVICES
|
||||
+ int "Maximum tty device number"
|
||||
+ depends on VT
|
||||
+ range 12 63
|
||||
+ default 63
|
||||
+ help
|
||||
+ This option is used to change the number of tty devices in /dev.
|
||||
+ The default value is 63. The lowest number you can set is 12,
|
||||
+ 63 is also the upper limit so we don't overrun the serial
|
||||
+ consoles.
|
||||
+
|
||||
+ If unsure, say 63.
|
||||
+
|
||||
config HW_CONSOLE
|
||||
bool
|
||||
depends on VT && !UML
|
||||
diff --git a/include/uapi/linux/vt.h b/include/uapi/linux/vt.h
|
||||
index e9d39c48520a..3bceead8da40 100644
|
||||
--- a/include/uapi/linux/vt.h
|
||||
+++ b/include/uapi/linux/vt.h
|
||||
@@ -3,12 +3,25 @@
|
||||
#define _UAPI_LINUX_VT_H
|
||||
|
||||
|
||||
+/*
|
||||
+ * We will make this definition solely for the purpose of making packages
|
||||
+ * such as splashutils build, because they can not understand that
|
||||
+ * NR_TTY_DEVICES is defined in the kernel configuration.
|
||||
+ */
|
||||
+#ifndef CONFIG_NR_TTY_DEVICES
|
||||
+#define CONFIG_NR_TTY_DEVICES 63
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* These constants are also useful for user-level apps (e.g., VC
|
||||
* resizing).
|
||||
*/
|
||||
#define MIN_NR_CONSOLES 1 /* must be at least 1 */
|
||||
-#define MAX_NR_CONSOLES 63 /* serial lines start at 64 */
|
||||
+/*
|
||||
+ * NR_TTY_DEVICES:
|
||||
+ * Value MUST be at least 12 and must never be higher then 63
|
||||
+ */
|
||||
+#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES /* serial lines start above this */
|
||||
/* Note: the ioctl VT_GETSTATE does not work for
|
||||
consoles 16 and higher (since it returns a short) */
|
Loading…
Reference in New Issue
Block a user