| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250516-keep-sorted-makefile-v1-1-82c6a4d3b1a8@chromium.org> Date: Fri, 16 May 2025 12:22:44 +0000 From: Ricardo Ribalda <ribalda@...omium.org> To: Hans Verkuil <hans@...erkuil.nl>, Mauro Carvalho Chehab <mchehab@...nel.org> Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org, Ricardo Ribalda <ribalda@...omium.org> Subject: [PATCH] media: Add automatic sort support for Makefile and Kconfig Add keep-sorted annotations to the build files in the media subsystem. Thanks to this we can enforce the proper sorting with CI. We use this occasion to fix the sorting of the files. There might be some controversial sorting. Eg: obj-y += dvb-usb-v2/ obj-y += dvb-usb/ This could be fixed with keep-sorted by_regex parameter, but I think it would make the code "uglier" for little benefit. Signed-off-by: Ricardo Ribalda <ribalda@...omium.org> --- drivers/media/common/Makefile | 3 ++- drivers/media/common/videobuf2/Makefile | 3 ++- drivers/media/dvb-frontends/Makefile | 4 ++-- drivers/media/pci/Makefile | 24 +++++++++++++----------- drivers/media/platform/Kconfig | 2 ++ drivers/media/platform/Makefile | 6 ++++-- drivers/media/radio/Makefile | 9 ++++++--- drivers/media/rc/Makefile | 6 ++++-- drivers/media/rc/keymaps/Makefile | 19 ++++++++++--------- drivers/media/spi/Makefile | 3 ++- drivers/media/tuners/Makefile | 3 ++- drivers/media/usb/Makefile | 8 +++++--- drivers/media/v4l2-core/Makefile | 10 +++++----- 13 files changed, 59 insertions(+), 41 deletions(-) diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile index c5ab905e7c20017f596d9576b6eabcd5081e9385..7b5feb328371a7a0c93a19b15d1578d0af247447 100644 --- a/drivers/media/common/Makefile +++ b/drivers/media/common/Makefile @@ -2,9 +2,10 @@ obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf2/ # Please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) +# keep-sorted start obj-$(CONFIG_CYPRESS_FIRMWARE) += cypress_firmware.o obj-$(CONFIG_TTPCI_EEPROM) += ttpci-eeprom.o obj-$(CONFIG_UVC_COMMON) += uvc.o obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o +# keep-sorted end diff --git a/drivers/media/common/videobuf2/Makefile b/drivers/media/common/videobuf2/Makefile index a6fe3f304685e9946738fdbaf77d45b967e7205a..dbaa35bfecce9eb6ed194ddd3d38b690fd78d48e 100644 --- a/drivers/media/common/videobuf2/Makefile +++ b/drivers/media/common/videobuf2/Makefile @@ -7,7 +7,7 @@ ifeq ($(CONFIG_TRACEPOINTS),y) endif # Please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) +# keep-sorted start obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-common.o obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o @@ -15,3 +15,4 @@ obj-$(CONFIG_VIDEOBUF2_DVB) += videobuf2-dvb.o obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o obj-$(CONFIG_VIDEOBUF2_V4L2) += videobuf2-v4l2.o obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o +# keep-sorted end diff --git a/drivers/media/dvb-frontends/Makefile b/drivers/media/dvb-frontends/Makefile index a93146cb428c310be4e8cbc27d63c272168e9c6c..74d6d6d7d11aff78ce11fe438f81c1b3e42b0bf3 100644 --- a/drivers/media/dvb-frontends/Makefile +++ b/drivers/media/dvb-frontends/Makefile @@ -17,8 +17,7 @@ stb0899-objs := stb0899_drv.o stb0899_algo.o stv0900-objs := stv0900_core.o stv0900_sw.o # Please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) - +# keep-sorted start obj-$(CONFIG_DVB_A8293) += a8293.o obj-$(CONFIG_DVB_AF9013) += af9013.o obj-$(CONFIG_DVB_AF9033) += af9033.o @@ -136,3 +135,4 @@ obj-$(CONFIG_DVB_ZD1301_DEMOD) += zd1301_demod.o obj-$(CONFIG_DVB_ZL10036) += zl10036.o obj-$(CONFIG_DVB_ZL10039) += zl10039.o obj-$(CONFIG_DVB_ZL10353) += zl10353.o +# keep-sorted end diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile index 02763ad8851157c04f7a8350e5f6a0a9ed093eea..f7a741cab19f1d100949db98a95a1620f54d1d44 100644 --- a/drivers/media/pci/Makefile +++ b/drivers/media/pci/Makefile @@ -4,24 +4,25 @@ # # Please keep it alphabetically sorted by directory -# (e. g. LC_ALL=C sort Makefile) -obj-y += ttpci/ \ +# keep-sorted start skip_lines=1 +obj-y += \ b2c2/ \ - pluto2/ \ + ddbridge/ \ dm1105/ \ - pt1/ \ - pt3/ \ + intel/ \ mantis/ \ + netup_unidvb/ \ ngene/ \ - ddbridge/ \ + pluto2/ \ + pt1/ \ + pt3/ \ saa7146/ \ smipcie/ \ - netup_unidvb/ \ - intel/ + ttpci/ +# keep-sorted end # Please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) - +# keep-sorted start obj-$(CONFIG_VIDEO_BT848) += bt8xx/ obj-$(CONFIG_VIDEO_COBALT) += cobalt/ obj-$(CONFIG_VIDEO_CX18) += cx18/ @@ -35,6 +36,7 @@ obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ obj-$(CONFIG_VIDEO_SAA7164) += saa7164/ obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/ obj-$(CONFIG_VIDEO_TW5864) += tw5864/ -obj-$(CONFIG_VIDEO_TW686X) += tw686x/ obj-$(CONFIG_VIDEO_TW68) += tw68/ +obj-$(CONFIG_VIDEO_TW686X) += tw686x/ obj-$(CONFIG_VIDEO_ZORAN) += zoran/ +# keep-sorted end diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 9287faafdce5873c78a6a2012bf7f8a8c448b79b..f69969100dc82db5179501d9c8c1667184004786 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -62,6 +62,7 @@ config VIDEO_MUX This driver provides support for N:1 video bus multiplexers. # Platform drivers - Please keep it alphabetically sorted +# keep-sorted start source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/amlogic/Kconfig" source "drivers/media/platform/amphion/Kconfig" @@ -90,5 +91,6 @@ source "drivers/media/platform/ti/Kconfig" source "drivers/media/platform/verisilicon/Kconfig" source "drivers/media/platform/via/Kconfig" source "drivers/media/platform/xilinx/Kconfig" +# keep-sorted end endif # MEDIA_PLATFORM_DRIVERS diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 6fd7db0541c7ecca04c5da5839e4d3641178aa9d..ccde8ead09781d78f77f5ecdee099aa9b28d7e02 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -4,7 +4,7 @@ # # Place here, alphabetically sorted by directory -# (e. g. LC_ALL=C sort Makefile) +# keep-sorted start obj-y += allegro-dvt/ obj-y += amlogic/ obj-y += amphion/ @@ -33,9 +33,11 @@ obj-y += ti/ obj-y += verisilicon/ obj-y += via/ obj-y += xilinx/ +# keep-sorted end # Please place here only ancillary drivers that aren't SoC-specific # Please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) +# keep-sorted start obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o obj-$(CONFIG_VIDEO_MUX) += video-mux.o +# keep-sorted end diff --git a/drivers/media/radio/Makefile b/drivers/media/radio/Makefile index 1ff46f3a6ed3fa6b23d5f057c15082b92cea2ac9..096b6dce14cd8f849ae449d44606e52180f871a8 100644 --- a/drivers/media/radio/Makefile +++ b/drivers/media/radio/Makefile @@ -6,20 +6,20 @@ shark2-objs := radio-shark2.o radio-tea5777.o # Please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) +# keep-sorted start obj-$(CONFIG_RADIO_AZTECH) += radio-aztech.o obj-$(CONFIG_RADIO_CADET) += radio-cadet.o obj-$(CONFIG_RADIO_GEMTEK) += radio-gemtek.o obj-$(CONFIG_RADIO_ISA) += radio-isa.o obj-$(CONFIG_RADIO_MAXIRADIO) += radio-maxiradio.o obj-$(CONFIG_RADIO_MIROPCM20) += radio-miropcm20.o -obj-$(CONFIG_RADIO_RTRACK2) += radio-rtrack2.o obj-$(CONFIG_RADIO_RTRACK) += radio-aimslab.o +obj-$(CONFIG_RADIO_RTRACK2) += radio-rtrack2.o obj-$(CONFIG_RADIO_SAA7706H) += saa7706h.o obj-$(CONFIG_RADIO_SF16FMI) += radio-sf16fmi.o obj-$(CONFIG_RADIO_SF16FMR2) += radio-sf16fmr2.o -obj-$(CONFIG_RADIO_SHARK2) += shark2.o obj-$(CONFIG_RADIO_SHARK) += radio-shark.o +obj-$(CONFIG_RADIO_SHARK2) += shark2.o obj-$(CONFIG_RADIO_SI470X) += si470x/ obj-$(CONFIG_RADIO_SI4713) += si4713/ obj-$(CONFIG_RADIO_SI476X) += radio-si476x.o @@ -32,9 +32,12 @@ obj-$(CONFIG_RADIO_TRUST) += radio-trust.o obj-$(CONFIG_RADIO_TYPHOON) += radio-typhoon.o obj-$(CONFIG_RADIO_WL1273) += radio-wl1273.o obj-$(CONFIG_RADIO_ZOLTRIX) += radio-zoltrix.o +# keep-sorted end +# keep-sorted start obj-$(CONFIG_USB_DSBR) += dsbr100.o obj-$(CONFIG_USB_KEENE) += radio-keene.o obj-$(CONFIG_USB_MA901) += radio-ma901.o obj-$(CONFIG_USB_MR800) += radio-mr800.o obj-$(CONFIG_USB_RAREMONO) += radio-raremono.o +# keep-sorted end diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile index 2bca6f7f07bc987a7b5c61f43f717e2b3cd967c8..8e0adabf109d65ba02bd20b5c57e027e92454ef2 100644 --- a/drivers/media/rc/Makefile +++ b/drivers/media/rc/Makefile @@ -10,7 +10,7 @@ rc-core-$(CONFIG_BPF_LIRC_MODE2) += bpf-lirc.o obj-$(CONFIG_RC_CORE) += rc-core.o # IR decoders - please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) +# keep-sorted start obj-$(CONFIG_IR_IMON_DECODER) += ir-imon-decoder.o obj-$(CONFIG_IR_JVC_DECODER) += ir-jvc-decoder.o obj-$(CONFIG_IR_MCE_KBD_DECODER) += ir-mce_kbd-decoder.o @@ -22,9 +22,10 @@ obj-$(CONFIG_IR_SANYO_DECODER) += ir-sanyo-decoder.o obj-$(CONFIG_IR_SHARP_DECODER) += ir-sharp-decoder.o obj-$(CONFIG_IR_SONY_DECODER) += ir-sony-decoder.o obj-$(CONFIG_IR_XMP_DECODER) += ir-xmp-decoder.o +# keep-sorted end # stand-alone IR receivers/transmitters - please keep it alphabetically -# sorted by Kconfig name (e. g. LC_ALL=C sort Makefile) +# keep-sorted start obj-$(CONFIG_IR_ENE) += ene_ir.o obj-$(CONFIG_IR_FINTEK) += fintek-cir.o obj-$(CONFIG_IR_GPIO_CIR) += gpio-ir-recv.o @@ -54,3 +55,4 @@ obj-$(CONFIG_RC_ATI_REMOTE) += ati_remote.o obj-$(CONFIG_RC_LOOPBACK) += rc-loopback.o obj-$(CONFIG_RC_ST) += st_rc.o obj-$(CONFIG_RC_XBOX_DVD) += xbox_remote.o +# keep-sorted end diff --git a/drivers/media/rc/keymaps/Makefile b/drivers/media/rc/keymaps/Makefile index d04572627cdd0b7962c5035a9202ca265d36eeb1..4ae66312eaf437c3ee25a809ef26cc28fa6c4573 100644 --- a/drivers/media/rc/keymaps/Makefile +++ b/drivers/media/rc/keymaps/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 # Please keep keymaps alphabetically sorted by directory name -#(e. g. LC_ALL=C sort Makefile) +# keep-sorted start skip_lines=1 obj-$(CONFIG_RC_MAP) += \ rc-adstech-dvb-t-pci.o \ rc-alink-dtu-m.o \ @@ -17,8 +17,8 @@ obj-$(CONFIG_RC_MAP) += \ rc-avermedia-dvbt.o \ rc-avermedia-m135a.o \ rc-avermedia-m733a-rm-k6.o \ - rc-avermedia.o \ rc-avermedia-rm-ks.o \ + rc-avermedia.o \ rc-avertv-303.o \ rc-azurewave-ad-tu700.o \ rc-beelink-gs1.o \ @@ -44,9 +44,9 @@ obj-$(CONFIG_RC_MAP) += \ rc-dvico-mce.o \ rc-dvico-portable.o \ rc-em-terratec.o \ - rc-encore-enltv2.o \ rc-encore-enltv-fm53.o \ rc-encore-enltv.o \ + rc-encore-enltv2.o \ rc-evga-indtube.o \ rc-eztv.o \ rc-flydvb.o \ @@ -74,16 +74,16 @@ obj-$(CONFIG_RC_MAP) += \ rc-leadtek-y04g0051.o \ rc-lme2510.o \ rc-manli.o \ - rc-mecool-kiii-pro.o \ rc-mecool-kii-pro.o \ + rc-mecool-kiii-pro.o \ rc-medion-x10-digitainer.o \ - rc-medion-x10.o \ rc-medion-x10-or2x.o \ + rc-medion-x10.o \ rc-minix-neo.o \ - rc-msi-digivox-iii.o \ rc-msi-digivox-ii.o \ - rc-msi-tvanywhere.o \ + rc-msi-digivox-iii.o \ rc-msi-tvanywhere-plus.o \ + rc-msi-tvanywhere.o \ rc-mygica-utv3.o \ rc-nebula.o \ rc-nec-terratec-cinergy-xs.o \ @@ -126,8 +126,8 @@ obj-$(CONFIG_RC_MAP) += \ rc-total-media-in-hand.o \ rc-trekstor.o \ rc-tt-1500.o \ - rc-twinhan1027.o \ rc-twinhan-dtv-cab-ci.o \ + rc-twinhan1027.o \ rc-vega-s9x.o \ rc-videomate-m1f.o \ rc-videomate-s350.o \ @@ -135,9 +135,10 @@ obj-$(CONFIG_RC_MAP) += \ rc-videostrong-kii-pro.o \ rc-wetek-hub.o \ rc-wetek-play2.o \ - rc-winfast.o \ rc-winfast-usbii-deluxe.o \ + rc-winfast.o \ rc-x96max.o \ rc-xbox-360.o \ rc-xbox-dvd.o \ rc-zx-irdec.o +# keep-sorted end diff --git a/drivers/media/spi/Makefile b/drivers/media/spi/Makefile index 6ac7adc64124a211035a377c5778af597f9a5a62..ce07bcf8f93ffa358bad20d5588c44e6dd04b13d 100644 --- a/drivers/media/spi/Makefile +++ b/drivers/media/spi/Makefile @@ -3,6 +3,7 @@ ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/cxd2880 # Please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) +# keep-sorted start obj-$(CONFIG_CXD2880_SPI_DRV) += cxd2880-spi.o obj-$(CONFIG_VIDEO_GS1662) += gs1662.o +# keep-sorted end diff --git a/drivers/media/tuners/Makefile b/drivers/media/tuners/Makefile index bd350a285aadad39d44f594c5f672e05f1cf55c4..ac7fc7031c3e3abbf4b37bfc76a0c8ed472aac81 100644 --- a/drivers/media/tuners/Makefile +++ b/drivers/media/tuners/Makefile @@ -7,7 +7,7 @@ ccflags-y += -I$(srctree)/drivers/media/dvb-frontends tda18271-objs := tda18271-maps.o tda18271-common.o tda18271-fe.o # Please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) +# keep-sorted start obj-$(CONFIG_MEDIA_TUNER_E4000) += e4000.o obj-$(CONFIG_MEDIA_TUNER_FC0011) += fc0011.o obj-$(CONFIG_MEDIA_TUNER_FC0012) += fc0012.o @@ -46,3 +46,4 @@ obj-$(CONFIG_MEDIA_TUNER_TUA9001) += tua9001.o obj-$(CONFIG_MEDIA_TUNER_XC2028) += xc2028.o obj-$(CONFIG_MEDIA_TUNER_XC4000) += xc4000.o obj-$(CONFIG_MEDIA_TUNER_XC5000) += xc5000.o +# keep-sorted end diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile index 6d171beea20d3973db1a46df5e33938e340f2026..14b7a6446d724cd6fcbcf7b626d8f2a887b4362b 100644 --- a/drivers/media/usb/Makefile +++ b/drivers/media/usb/Makefile @@ -4,17 +4,18 @@ # # DVB USB-only drivers. Please keep it alphabetically sorted by directory name -# (e. g. LC_ALL=C sort Makefile) +# keep-sorted start obj-y += b2c2/ -obj-y += dvb-usb/ obj-y += dvb-usb-v2/ +obj-y += dvb-usb/ obj-y += s2255/ obj-y += siano/ obj-y += ttusb-budget/ obj-y += ttusb-dec/ +# keep-sorted end # Please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) +# keep-sorted start obj-$(CONFIG_DVB_AS102) += as102/ obj-$(CONFIG_USB_AIRSPY) += airspy/ obj-$(CONFIG_USB_GSPCA) += gspca/ @@ -30,3 +31,4 @@ obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/ obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/ obj-$(CONFIG_VIDEO_STK1160) += stk1160/ obj-$(CONFIG_VIDEO_USBTV) += usbtv/ +# keep-sorted end diff --git a/drivers/media/v4l2-core/Makefile b/drivers/media/v4l2-core/Makefile index 2177b9d63a8ffc1127c5a70118249a2ff63cd759..8fd4a251c59b80d72264d8e3ac71468b84e1fae2 100644 --- a/drivers/media/v4l2-core/Makefile +++ b/drivers/media/v4l2-core/Makefile @@ -14,16 +14,16 @@ videodev-objs := v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \ v4l2-ctrls-request.o v4l2-ctrls-defs.o # Please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) +# keep-sorted start videodev-$(CONFIG_COMPAT) += v4l2-compat-ioctl32.o videodev-$(CONFIG_MEDIA_CONTROLLER) += v4l2-mc.o videodev-$(CONFIG_SPI) += v4l2-spi.o videodev-$(CONFIG_TRACEPOINTS) += v4l2-trace.o videodev-$(CONFIG_VIDEO_V4L2_I2C) += v4l2-i2c.o +# keep-sorted end # Please keep it alphabetically sorted by Kconfig name -# (e. g. LC_ALL=C sort Makefile) - +# keep-sorted start obj-$(CONFIG_V4L2_ASYNC) += v4l2-async.o obj-$(CONFIG_V4L2_CCI) += v4l2-cci.o obj-$(CONFIG_V4L2_FLASH_LED_CLASS) += v4l2-flash-led-class.o @@ -32,6 +32,6 @@ obj-$(CONFIG_V4L2_H264) += v4l2-h264.o obj-$(CONFIG_V4L2_JPEG_HELPER) += v4l2-jpeg.o obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o obj-$(CONFIG_V4L2_VP9) += v4l2-vp9.o - -obj-$(CONFIG_VIDEO_TUNER) += tuner.o obj-$(CONFIG_VIDEO_DEV) += v4l2-dv-timings.o videodev.o +obj-$(CONFIG_VIDEO_TUNER) += tuner.o +# keep-sorted end --- base-commit: 1b83a9f41bd13dae09fabf594918ea36a9bc0cfc change-id: 20250516-keep-sorted-makefile-ea5acc7dada6 Best regards, -- Ricardo Ribalda <ribalda@...omium.org>
Powered by blists - more mailing lists