From cddcdb141172d5ae3a1d9d424fa62d87a5cd1e5f Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 31 Jul 2023 21:33:20 +0800 Subject: [PATCH] treewide: The remaining of kernel configuration rendering --- gnome/applications/cheese-kernel.xml | 16 ++++++++++++++++ gnome/applications/cheese.xml | 16 +++++----------- kernel-config/gnome/applications/cheese.toml | 11 +++++++++++ kernel-config/multimedia/libdriv/alsa-lib.toml | 8 ++++++++ .../multimedia/libdriv/intel-media.toml | 2 ++ kernel-config/pst/printing/parallel-printer.toml | 3 +++ kernel-config/pst/printing/usb-printer.toml | 4 ++++ kernel-config/x/lib/qtwebengine.toml | 3 +++ kernel-config/xsoft/other/rox-filer.toml | 1 + multimedia/libdriv/alsa-lib-kernel.xml | 10 ++++++++++ multimedia/libdriv/alsa-lib.xml | 6 ++---- multimedia/libdriv/intel-media-kernel.xml | 10 ++++++++++ multimedia/libdriv/intel-media.xml | 6 ++---- multimedia/libdriv/intel-vaapi-driver.xml | 7 +++---- pst/printing/cups.xml | 14 ++++---------- pst/printing/gutenprint.xml | 7 ++----- pst/printing/parallel-printer-kernel.xml | 10 ++++++++++ pst/printing/usb-printer-kernel.xml | 8 ++++++++ template/template.xml | 16 +++++++--------- x/lib/qtwebengine-kernel.xml | 10 ++++++++++ x/lib/qtwebengine.xml | 7 ++----- xsoft/other/rox-filer-kernel.xml | 7 +++++++ xsoft/other/rox-filer.xml | 4 ++-- 23 files changed, 132 insertions(+), 54 deletions(-) create mode 100644 gnome/applications/cheese-kernel.xml create mode 100644 kernel-config/gnome/applications/cheese.toml create mode 100644 kernel-config/multimedia/libdriv/alsa-lib.toml create mode 100644 kernel-config/multimedia/libdriv/intel-media.toml create mode 100644 kernel-config/pst/printing/parallel-printer.toml create mode 100644 kernel-config/pst/printing/usb-printer.toml create mode 100644 kernel-config/x/lib/qtwebengine.toml create mode 100644 kernel-config/xsoft/other/rox-filer.toml create mode 100644 multimedia/libdriv/alsa-lib-kernel.xml create mode 100644 multimedia/libdriv/intel-media-kernel.xml create mode 100644 pst/printing/parallel-printer-kernel.xml create mode 100644 pst/printing/usb-printer-kernel.xml create mode 100644 x/lib/qtwebengine-kernel.xml create mode 100644 xsoft/other/rox-filer-kernel.xml diff --git a/gnome/applications/cheese-kernel.xml b/gnome/applications/cheese-kernel.xml new file mode 100644 index 0000000000..5ad14e07c1 --- /dev/null +++ b/gnome/applications/cheese-kernel.xml @@ -0,0 +1,16 @@ + + + +Device Drivers ---> + <*/M> Multimedia support ---> [MEDIA_SUPPORT] + [*] Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends) + ... [MEDIA_SUBDRV_AUTOSELECT] + Media device types ---> + [*] Cameras and video grabbers [MEDIA_CAMERA_SUPPORT] + Media drivers ---> + [ /*] Media USB Adapters ---> [MEDIA_USB_SUPPORT] + # Most modern USB camera needs this. + # For other devices you need to figure it out yourself: + < /*/M> USB Video Class (UVC) [USB_VIDEO_CLASS] diff --git a/gnome/applications/cheese.xml b/gnome/applications/cheese.xml index 43735d5d9e..0e1e94a629 100644 --- a/gnome/applications/cheese.xml +++ b/gnome/applications/cheese.xml @@ -105,18 +105,12 @@ kernel if necessary: -Device Drivers ---> - <*> Multimedia support ---> [CONFIG_MEDIA_SUPPORT] - [*] Autoselect ancillary drivers (tuners, sensors, i2c, spi, frontends) [CONFIG_MEDIA_SUBDRV_AUTOSELECT] - Media device types ---> - [*] Cameras and video grabbers [CONFIG_MEDIA_CAMERA_SUPPORT] - Media drivers ---> - [*] Media USB Adapters ---> [CONFIG_MEDIA_USB_SUPPORT] - Select device(s) as needed + - - cheese - + + cheese + diff --git a/kernel-config/gnome/applications/cheese.toml b/kernel-config/gnome/applications/cheese.toml new file mode 100644 index 0000000000..d770b3af55 --- /dev/null +++ b/kernel-config/gnome/applications/cheese.toml @@ -0,0 +1,11 @@ +MEDIA_SUPPORT='*M' +MEDIA_SUBDRV_AUTOSELECT='*' +MEDIA_CAMERA_SUPPORT='*' +MEDIA_USB_SUPPORT='* ' + +[USB_VIDEO_CLASS] +value = '*M ' +comment = [ + 'Most modern USB camera needs this.', + 'For other devices you need to figure it out yourself', +] diff --git a/kernel-config/multimedia/libdriv/alsa-lib.toml b/kernel-config/multimedia/libdriv/alsa-lib.toml new file mode 100644 index 0000000000..0058905001 --- /dev/null +++ b/kernel-config/multimedia/libdriv/alsa-lib.toml @@ -0,0 +1,8 @@ +SOUND = '*M' + +[SND] +value = '*M' +comment = [ + 'Select settings and drivers appropriate for your hardware', + 'in the submenu', +] diff --git a/kernel-config/multimedia/libdriv/intel-media.toml b/kernel-config/multimedia/libdriv/intel-media.toml new file mode 100644 index 0000000000..b76593aa42 --- /dev/null +++ b/kernel-config/multimedia/libdriv/intel-media.toml @@ -0,0 +1,2 @@ +DRM='*M' +DRM_I915='*M' diff --git a/kernel-config/pst/printing/parallel-printer.toml b/kernel-config/pst/printing/parallel-printer.toml new file mode 100644 index 0000000000..cb4379f444 --- /dev/null +++ b/kernel-config/pst/printing/parallel-printer.toml @@ -0,0 +1,3 @@ +PARPORT='*M' +PARPORT_PC='*M' +PRINTER='*M' diff --git a/kernel-config/pst/printing/usb-printer.toml b/kernel-config/pst/printing/usb-printer.toml new file mode 100644 index 0000000000..bfad199e8d --- /dev/null +++ b/kernel-config/pst/printing/usb-printer.toml @@ -0,0 +1,4 @@ +# Things like XHCI_HCD or OHCI_HCD do not belong here +# These should be in libusb page +USB_SUPPORT='*' +USB_PRINTER='*M' diff --git a/kernel-config/x/lib/qtwebengine.toml b/kernel-config/x/lib/qtwebengine.toml new file mode 100644 index 0000000000..0fdfd598ec --- /dev/null +++ b/kernel-config/x/lib/qtwebengine.toml @@ -0,0 +1,3 @@ +NAMESPACES = { value = '*', forced = true } +USER_NS = { value = '* ', comment = 'Enable or disable *both* of them' } +PID_NS = '* ' diff --git a/kernel-config/xsoft/other/rox-filer.toml b/kernel-config/xsoft/other/rox-filer.toml new file mode 100644 index 0000000000..812c225f96 --- /dev/null +++ b/kernel-config/xsoft/other/rox-filer.toml @@ -0,0 +1 @@ +DNOTIFY='*' diff --git a/multimedia/libdriv/alsa-lib-kernel.xml b/multimedia/libdriv/alsa-lib-kernel.xml new file mode 100644 index 0000000000..1990681a9a --- /dev/null +++ b/multimedia/libdriv/alsa-lib-kernel.xml @@ -0,0 +1,10 @@ + + + +Device Drivers ---> + <*/M> Sound card support ---> [SOUND] + # Select settings and drivers appropriate for your hardware + # in the submenu: + <*/M> Advanced Linux Sound Architecture ---> [SND] diff --git a/multimedia/libdriv/alsa-lib.xml b/multimedia/libdriv/alsa-lib.xml index 3b5a3d97d2..0f0cc30ef2 100644 --- a/multimedia/libdriv/alsa-lib.xml +++ b/multimedia/libdriv/alsa-lib.xml @@ -102,10 +102,8 @@ configuration and recompile the kernel: - Device Drivers ---> - <*/M> Sound card support ---> [CONFIG_SOUND] - <*/M> Advanced Linux Sound Architecture ---> [CONFIG_SND] - Select settings and drivers appropriate for your hardware. + In the Device Drivers ⇒ Sound card support ⇒ Advanced Linux diff --git a/multimedia/libdriv/intel-media-kernel.xml b/multimedia/libdriv/intel-media-kernel.xml new file mode 100644 index 0000000000..8ec074c1da --- /dev/null +++ b/multimedia/libdriv/intel-media-kernel.xml @@ -0,0 +1,10 @@ + + + +Device Drivers ---> + Graphics support ---> + <*/M> Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) ---> + ... [DRM] + <*/M> Intel 8xx/9xx/G3x/G4x/HD Graphics [DRM_I915] diff --git a/multimedia/libdriv/intel-media.xml b/multimedia/libdriv/intel-media.xml index 9ea6113463..69738885cb 100644 --- a/multimedia/libdriv/intel-media.xml +++ b/multimedia/libdriv/intel-media.xml @@ -112,10 +112,8 @@ Recompile the kernel if necessary: -Device Drivers ---> - Graphics support ---> - <*/M> Direct Rendering Manager (XFree86 ... support) ---> [CONFIG_DRM] - <*/M> Intel 8xx/9xx/G3x/G4x/HD Graphics [CONFIG_DRM_I915] + intel-media diff --git a/multimedia/libdriv/intel-vaapi-driver.xml b/multimedia/libdriv/intel-vaapi-driver.xml index e664e477b0..1ac1ee4e25 100644 --- a/multimedia/libdriv/intel-vaapi-driver.xml +++ b/multimedia/libdriv/intel-vaapi-driver.xml @@ -84,10 +84,9 @@ Recompile the kernel if necessary: -Device Drivers ---> - Graphics support ---> - <*/M> Direct Rendering Manager (XFree86 ... support) ---> [CONFIG_DRM] - <*/M> Intel 8xx/9xx/G3x/G4x/HD Graphics [CONFIG_DRM_I915] + + intel-vaapi-driver diff --git a/pst/printing/cups.xml b/pst/printing/cups.xml index 98bf8bf926..40906d270e 100644 --- a/pst/printing/cups.xml +++ b/pst/printing/cups.xml @@ -129,22 +129,16 @@ configuration and recompile the kernel: -Device Drivers ---> - [*] USB support ---> [CONFIG_USB_SUPPORT] - <*/M> OHCI HCD (USB 1.1) support [CONFIG_USB_OHCI_HCD] - <*/M> UHCI HCD (most Intel and VIA) support [CONFIG_USB_UHCI_HCD] - <*/M> USB Printer support [CONFIG_USB_PRINTER] + If you have a parallel printer, enable the following options in your kernel configuration and recompile the kernel: -Device Drivers ---> - <*/M> Parallel port support ---> [CONFIG_PARPORT] - <*/M> PC-style hardware [CONFIG_PARPORT_PC] - Character devices ---> - <*/M> Parallel printer support [CONFIG_PRINTER] + cups diff --git a/pst/printing/gutenprint.xml b/pst/printing/gutenprint.xml index 1318361789..e073d3b732 100644 --- a/pst/printing/gutenprint.xml +++ b/pst/printing/gutenprint.xml @@ -127,11 +127,8 @@ recompile the kernel: -Device Drivers ---> - [*] USB support ---> [CONFIG_USB_SUPPORT] - <*/M> OHCI HCD (USB 1.1) support [CONFIG_USB_OHCI_HCD] - <*/M> UHCI HCD (most Intel and VIA) support [CONFIG_USB_UHCI_HCD] - <*/M> USB Printer support [CONFIG_USB_PRINTER] + escputil for usb printers diff --git a/pst/printing/parallel-printer-kernel.xml b/pst/printing/parallel-printer-kernel.xml new file mode 100644 index 0000000000..21ac67c054 --- /dev/null +++ b/pst/printing/parallel-printer-kernel.xml @@ -0,0 +1,10 @@ + + + +Device Drivers ---> + <*/M> Parallel port support ---> [PARPORT] + <*/M> PC-style hardware [PARPORT_PC] + Character devices ---> + <*/M> Parallel printer support [PRINTER] diff --git a/pst/printing/usb-printer-kernel.xml b/pst/printing/usb-printer-kernel.xml new file mode 100644 index 0000000000..3325828a84 --- /dev/null +++ b/pst/printing/usb-printer-kernel.xml @@ -0,0 +1,8 @@ + + + +Device Drivers ---> + [*] USB support ---> [USB_SUPPORT] + <*/M> USB Printer support [USB_PRINTER] diff --git a/template/template.xml b/template/template.xml index 6e69d33428..e9e9392ea0 100644 --- a/template/template.xml +++ b/template/template.xml @@ -161,15 +161,13 @@ kernel if necessary: - -Master section ---> - Subsection ---> - [*] Required parameter [CONFIG_REQU_PAR] - <*> Required parameter (not as module) [CONFIG_REQU_PAR_NMOD] - <*/M> Required parameter (could be a module) [CONFIG_REQU_PAR_MOD] - <*/M/ > Optional parameter [CONFIG_OPT_PAR] - [ ] Incompatible parameter [CONFIG_INCOMP_PAR] - < > Incompatible parameter (even as module) [CONFIG_INCOMP_PAR_MOD] + + Select the appropriate sub-options that appear when the above options are diff --git a/x/lib/qtwebengine-kernel.xml b/x/lib/qtwebengine-kernel.xml new file mode 100644 index 0000000000..2080cb5afe --- /dev/null +++ b/x/lib/qtwebengine-kernel.xml @@ -0,0 +1,10 @@ + + + +General setup ---> + -*- Namespaces support ---> [NAMESPACES] + # Enable or disable *both* of them: + [ /*] User namespace [USER_NS] + [ /*] PID Namespaces [PID_NS] diff --git a/x/lib/qtwebengine.xml b/x/lib/qtwebengine.xml index 26bd517333..2b15da9b1f 100644 --- a/x/lib/qtwebengine.xml +++ b/x/lib/qtwebengine.xml @@ -624,11 +624,8 @@ make configuration and recompile the kernel if necessary: - -General setup ---> - -*- Namespaces support ---> - [ ] User namespace [CONFIG_USER_NS] - [*] PID namespace [CONFIG_PID_NS] + qtwebengine diff --git a/xsoft/other/rox-filer-kernel.xml b/xsoft/other/rox-filer-kernel.xml new file mode 100644 index 0000000000..f99ae53c5a --- /dev/null +++ b/xsoft/other/rox-filer-kernel.xml @@ -0,0 +1,7 @@ + + + +File systems ---> + [*] Dnotify support [DNOTIFY] diff --git a/xsoft/other/rox-filer.xml b/xsoft/other/rox-filer.xml index 8a7a00cb1a..76aa30cf86 100644 --- a/xsoft/other/rox-filer.xml +++ b/xsoft/other/rox-filer.xml @@ -86,8 +86,8 @@ dnotify support in your kernel. In make menuconfig: -File systems ---> - [*] Dnotify support [CONFIG_DNOTIFY] + Save the new .config and then compile the kernel.