Make-initrd development discussion
 help / color / mirror / Atom feed
* [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features
@ 2026-11-12 13:55 Alexey Gladkov
  2026-11-12 13:55 ` [make-initrd] [PATCH v1 1/9] mk: Introduce guess-requires primitive for feature-triggered guess modules Alexey Gladkov
                   ` (9 more replies)
  0 siblings, 10 replies; 13+ messages in thread
From: Alexey Gladkov @ 2026-11-12 13:55 UTC (permalink / raw)
  To: make-initrd

Привет!

Давним пунктом в моём todo было устранение архитектурного артифакта в guess и
features. Когда я писал код изначально, то идея была в том, что система была
разделена на две части: фичи, которые привносисли функционал и guess-модули,
которые определяли необходимость тех или иных фич и добавляли их и модули ядра,
если нужно. Структурно guess и features имели одинаковую структуру (config.mk,
rules.mk), но были полностью независимыми.

Со временем, для features потребовался детект и автоматическое добавление. У
фичей стали появляться соответствующие части в guess/ диретории. Сейчас уже
в guess/ всего несколько модулей без однозначной ответой части в features/. 

По сути детект давно перестал работать по независимым модулям и всегда привязан
к фичам. А разделение на guess/ и features/ создаёт архитектурные трудности
детекта конфигурации.

Этот патчет устраняет архитектурное разделение на guess/ и features/. Весь
детект привязан к фичам. Работа всё также разделена на два этапа (детект
конфигурации и создание образа), но нет отдельного типа модулей.

Я постарался оставить полную совместимость со старой схемой и модули в guess/
должны работать. Также должны продолжать работать переменные AUTODETECT и
DISABLE_GUESS.

Я не ожидаю, что кто-то захочет действительно ревьювить эти патчи. Я отправляю
их в рассылку, чтобы было удобнее сохранить и приложить измененеия.


Антон, поскольку этот патчсет может тебя затронуть напрямую, то я был бы
признателен за тестирование.


Link: https://github.com/osboot/make-initrd/tree/guess-refactoring-v1


Alexey Gladkov (9):
  mk: Introduce guess-requires primitive for feature-triggered guess
    modules
  guess: Unify internal state with structured guess.tsv logging
  guess: Replace recursive Make loop with bash guess-runner
  guess: Add guess-explain tool and CLI subcommand for config provenance
  guess: Convert built-in guess modules into feature guess actions
  guess: Remove legacy guess/root and update test fixtures to
    features/rootfs
  docs: Update guess and autodetection documentation for feature-based
    architecture
  guess: Cache visited sysfs device nodes during autodetection
  guess: Add device.filter support to skip non-applicable device hooks

 Documentation/Configuration.md                |  13 +-
 Documentation/GuessConfiguration.md           | 161 ++++++++--
 Documentation/MakeInitrdArguments.md          |   4 +
 Documentation/NewFeature.md                   |  43 +++
 Documentation/manpages/make-initrd.1.md       |   7 +
 Makefile.in                                   |  20 +-
 .../acpica => features/acpica/guess}/action   |   0
 features/bcache/guess/device                  |   3 -
 features/bcache/guess/device.filter           |   6 +
 .../tests/ts0001-guess-device-light/run       |   3 +-
 .../ts0002-guess-device-light-no-bcache/run   |   3 +-
 .../bootconfig/guess}/action                  |   0
 features/clevis/guess/device                  |   2 -
 features/clevis/guess/device.filter           |   6 +
 features/devmapper/guess/device               |   3 -
 features/devmapper/guess/device.filter        |   6 +
 .../tests/ts0001-guess-device-light/run       |   3 +-
 .../tests/ts0002-guess-device-light-no-dm/run |   3 +-
 {guess/lkrg => features/lkrg/guess}/action    |   0
 features/luks/guess/device                    |   3 -
 features/luks/guess/device.filter             |   6 +
 features/lvm/guess/device                     |   3 -
 features/lvm/guess/device.filter              |   6 +
 features/lvm/tests/ts0001-guess-lvm/expect    |  54 ++--
 features/lvm/tests/ts0001-guess-lvm/run       |   4 +-
 features/mdadm/guess/device                   |   3 -
 features/mdadm/guess/device.filter            |   6 +
 .../ts0001-guess-ignore-multipath/expect      | 256 +---------------
 .../tests/ts0001-guess-ignore-multipath/run   |   2 +-
 features/modules-blockdev/README.md           |   5 +
 features/modules-blockdev/config.mk           |   2 +
 .../modules-blockdev/guess}/action            |   0
 features/modules-device-tree/README.md        |  16 +
 .../modules-device-tree}/config.mk            |   1 +
 .../modules-device-tree/guess}/action         |   0
 .../modules-device-tree/rules.mk              |   1 -
 features/modules-keyboard/README.md           |  12 +
 .../modules-keyboard}/config.mk               |   2 +
 .../modules-keyboard/guess}/action            |   2 +-
 features/modules-keyboard/rules.mk            |   2 +
 features/modules-network/README.md            |   6 +
 features/modules-network/config.mk            |   2 +
 .../modules-network/guess}/action             |   0
 features/modules-touchscreen/README.md        |  15 +
 .../config.mk                                 |   0
 .../modules-touchscreen/guess}/action         |   0
 .../modules-touchscreen/rules.mk              |   1 -
 features/multipath/guess/device               |   3 -
 features/multipath/guess/device.filter        |   6 +
 .../tests/ts0001-guess-overlayfs/expect       |   2 +-
 {guess/qemu => features/qemu/guess}/action    |   0
 .../rdshell => features/rdshell/guess}/action |   0
 features/resume/README.md                     |  13 +
 {guess/root => features/resume}/config.mk     |   2 +-
 .../resume => features/resume/guess}/action   |   3 +
 .../config.mk => features/resume/rules.mk     |   1 -
 features/rootfs/README.md                     |   7 +-
 {guess/root => features/rootfs/guess}/action  |   4 +-
 .../rootfs/tests/ts0001-guess-rootfs/expect   |  34 +--
 features/rootfs/tests/ts0001-guess-rootfs/run |   4 +-
 .../smart-card/guess}/action                  |   0
 features/sshfsroot/config.mk                  |   1 +
 features/sysfs-virtio-pci/guess/device        |   3 +-
 features/sysfs-virtio-pci/guess/device.filter |   6 +
 .../tests/ts0001-guess-device-light/run       |   5 +-
 .../run                                       |   5 +-
 {guess/ucode => features/ucode/guess}/action  |   0
 guess/acpica/README.md                        |   4 -
 guess/acpica/rules.mk                         |   9 -
 guess/bootconfig/README.md                    |   4 -
 guess/bootconfig/rules.mk                     |   9 -
 guess/common/README.md                        |   5 -
 guess/common/action                           |  10 -
 guess/common/rules.mk                         |  10 -
 guess/device-tree/README.md                   |  13 -
 guess/device-tree/rules.mk                    |   9 -
 guess/device/README.md                        |   8 -
 guess/device/rules.mk                         |   9 -
 guess/keyboard/README.md                      |   3 -
 guess/keyboard/rules.mk                       |   9 -
 guess/lkrg/README.md                          |   3 -
 guess/lkrg/rules.mk                           |   9 -
 guess/net/README.md                           |   9 -
 guess/net/config.mk                           |   8 -
 guess/net/rules.mk                            |   9 -
 guess/qemu/README.md                          |   4 -
 guess/qemu/rules.mk                           |   9 -
 guess/rdshell/README.md                       |   4 -
 guess/rdshell/rules.mk                        |   9 -
 guess/resume/README.md                        |   4 -
 guess/resume/rules.mk                         |   9 -
 guess/root/README.md                          |   9 -
 guess/root/rules.mk                           |   9 -
 guess/smart-card/README.md                    |   3 -
 guess/smart-card/config.mk                    |   4 -
 guess/smart-card/rules.mk                     |   9 -
 guess/touchscreen/README.md                   |   6 -
 guess/touchscreen/rules.mk                    |   9 -
 guess/ucode/README.md                         |   4 -
 guess/ucode/rules.mk                          |   9 -
 mk/functions.mk.in                            |  15 +
 mk/guess.mk.in                                |  63 ++--
 mk/main.mk.in                                 |  16 +-
 testing/bugreport-coverage                    |   6 +-
 testing/create-guess-test                     |  10 +-
 testing/orchestrator.py                       |  16 +-
 testing/tests/guess-feature-sh-functions      |  53 ++++
 testing/tests/guess-rootfs-sh-functions       |   4 +-
 testing/tests/ts0060-guess-config/run         |  14 +-
 testing/tests/ts0062-guess-config-tsv/run     |  14 +-
 testing/tests/ts0065-guess-explain/expect     |  23 ++
 testing/tests/ts0065-guess-explain/run        |  22 ++
 testing/tests/ts0066-guess-runner/expect      |   5 +
 testing/tests/ts0066-guess-runner/run         |  43 +++
 .../ts0067-guess-autodetect-aliases/expect    |   4 +
 .../tests/ts0067-guess-autodetect-aliases/run |  46 +++
 .../ts0068-guess-device-visited-cache/expect  |   3 +
 .../ts0068-guess-device-visited-cache/run     |  22 ++
 .../tests/ts0069-guess-device-filter/expect   |   2 +
 testing/tests/ts0069-guess-device-filter/run  |  37 +++
 tools/guess-config                            | 284 ++++++++----------
 tools/guess-explain                           | 110 +++++++
 tools/guess-functions                         |  49 ++-
 tools/guess-runner                            | 257 ++++++++++++++++
 utils/make-initrd/make-initrd.in              |   6 +-
 utils/make-wiki.sh                            |   6 +-
 126 files changed, 1315 insertions(+), 851 deletions(-)
 rename {guess/acpica => features/acpica/guess}/action (100%)
 create mode 100755 features/bcache/guess/device.filter
 rename {guess/bootconfig => features/bootconfig/guess}/action (100%)
 create mode 100755 features/clevis/guess/device.filter
 create mode 100755 features/devmapper/guess/device.filter
 rename {guess/lkrg => features/lkrg/guess}/action (100%)
 create mode 100755 features/luks/guess/device.filter
 create mode 100755 features/lvm/guess/device.filter
 create mode 100755 features/mdadm/guess/device.filter
 rename {guess/device => features/modules-blockdev/guess}/action (100%)
 create mode 100644 features/modules-device-tree/README.md
 rename {guess/device-tree => features/modules-device-tree}/config.mk (73%)
 rename {guess/device-tree => features/modules-device-tree/guess}/action (100%)
 copy guess/root/config.mk => features/modules-device-tree/rules.mk (67%)
 create mode 100644 features/modules-keyboard/README.md
 rename {guess/keyboard => features/modules-keyboard}/config.mk (81%)
 rename {guess/keyboard => features/modules-keyboard/guess}/action (97%)
 create mode 100644 features/modules-keyboard/rules.mk
 rename {guess/net => features/modules-network/guess}/action (100%)
 create mode 100644 features/modules-touchscreen/README.md
 copy features/{modules-blockdev => modules-touchscreen}/config.mk (100%)
 rename {guess/touchscreen => features/modules-touchscreen/guess}/action (100%)
 copy guess/root/config.mk => features/modules-touchscreen/rules.mk (67%)
 create mode 100755 features/multipath/guess/device.filter
 rename {guess/qemu => features/qemu/guess}/action (100%)
 rename {guess/rdshell => features/rdshell/guess}/action (100%)
 create mode 100644 features/resume/README.md
 copy {guess/root => features/resume}/config.mk (57%)
 rename {guess/resume => features/resume/guess}/action (95%)
 rename guess/root/config.mk => features/resume/rules.mk (67%)
 rename {guess/root => features/rootfs/guess}/action (98%)
 rename {guess/smart-card => features/smart-card/guess}/action (100%)
 create mode 100755 features/sysfs-virtio-pci/guess/device.filter
 rename {guess/ucode => features/ucode/guess}/action (100%)
 delete mode 100644 guess/acpica/README.md
 delete mode 100644 guess/acpica/rules.mk
 delete mode 100644 guess/bootconfig/README.md
 delete mode 100644 guess/bootconfig/rules.mk
 delete mode 100644 guess/common/README.md
 delete mode 100755 guess/common/action
 delete mode 100644 guess/common/rules.mk
 delete mode 100644 guess/device-tree/README.md
 delete mode 100644 guess/device-tree/rules.mk
 delete mode 100644 guess/device/README.md
 delete mode 100644 guess/device/rules.mk
 delete mode 100644 guess/keyboard/README.md
 delete mode 100644 guess/keyboard/rules.mk
 delete mode 100644 guess/lkrg/README.md
 delete mode 100644 guess/lkrg/rules.mk
 delete mode 100644 guess/net/README.md
 delete mode 100644 guess/net/config.mk
 delete mode 100644 guess/net/rules.mk
 delete mode 100644 guess/qemu/README.md
 delete mode 100644 guess/qemu/rules.mk
 delete mode 100644 guess/rdshell/README.md
 delete mode 100644 guess/rdshell/rules.mk
 delete mode 100644 guess/resume/README.md
 delete mode 100644 guess/resume/rules.mk
 delete mode 100644 guess/root/README.md
 delete mode 100644 guess/root/rules.mk
 delete mode 100644 guess/smart-card/README.md
 delete mode 100644 guess/smart-card/config.mk
 delete mode 100644 guess/smart-card/rules.mk
 delete mode 100644 guess/touchscreen/README.md
 delete mode 100644 guess/touchscreen/rules.mk
 delete mode 100644 guess/ucode/README.md
 delete mode 100644 guess/ucode/rules.mk
 create mode 100644 testing/tests/ts0065-guess-explain/expect
 create mode 100755 testing/tests/ts0065-guess-explain/run
 create mode 100644 testing/tests/ts0066-guess-runner/expect
 create mode 100755 testing/tests/ts0066-guess-runner/run
 create mode 100644 testing/tests/ts0067-guess-autodetect-aliases/expect
 create mode 100755 testing/tests/ts0067-guess-autodetect-aliases/run
 create mode 100644 testing/tests/ts0068-guess-device-visited-cache/expect
 create mode 100755 testing/tests/ts0068-guess-device-visited-cache/run
 create mode 100644 testing/tests/ts0069-guess-device-filter/expect
 create mode 100755 testing/tests/ts0069-guess-device-filter/run
 create mode 100755 tools/guess-explain
 create mode 100755 tools/guess-runner

-- 
2.56.0



^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2026-11-16 11:03 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-12 13:55 [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 1/9] mk: Introduce guess-requires primitive for feature-triggered guess modules Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 2/9] guess: Unify internal state with structured guess.tsv logging Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 3/9] guess: Replace recursive Make loop with bash guess-runner Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 4/9] guess: Add guess-explain tool and CLI subcommand for config provenance Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 5/9] guess: Convert built-in guess modules into feature guess actions Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 6/9] guess: Remove legacy guess/root and update test fixtures to features/rootfs Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 7/9] docs: Update guess and autodetection documentation for feature-based architecture Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 8/9] guess: Cache visited sysfs device nodes during autodetection Alexey Gladkov
2026-11-12 13:55 ` [make-initrd] [PATCH v1 9/9] guess: Add device.filter support to skip non-applicable device hooks Alexey Gladkov
2026-11-12 16:08 ` [make-initrd] [PATCH v1 0/9] Stop split-brain between guess and features Anton Midyukov
2026-11-16  4:09   ` Anton Midyukov
2026-11-16 11:03     ` Alexey Gladkov

Make-initrd development discussion

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/make-initrd/0 make-initrd/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 make-initrd make-initrd/ http://lore.altlinux.org/make-initrd \
		make-initrd@lists.altlinux.org make-initrd@lists.altlinux.ru make-initrd@lists.altlinux.com
	public-inbox-index make-initrd

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.make-initrd


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git