[make-initrd] [PATCH v1 01/41] fork pipeline: split into 4 features (move files)

[make-initrd] [PATCH v1 01/41] fork pipeline: split into 4 features (move files)

[Leonid Krivoshein]

---
  .../data/sbin => bootchain-core/data/bin}/pipeline-sh-functions   | 0
  .../data/etc/initrd/cmdline.d/pipeline                            | 0
  .../{pipeline => bootchain-core}/data/etc/rc.d/init.d/pipeline    | 0
  .../data/lib/initrd/cmdline.d/pipeline                            | 0
  .../{pipeline => bootchain-core}/data/lib/pipeline/mountfs        | 0
  .../{pipeline => bootchain-core}/data/lib/pipeline/overlayfs      | 0
  .../{pipeline => bootchain-core}/data/lib/pipeline/rootfs         | 0
  .../features/{pipeline => bootchain-core}/data/sbin/pipelined     | 0
  .../{pipeline => bootchain-getimage}/data/lib/pipeline/getimage   | 0
  make-initrd/features/{pipeline => bootchain-waitdev}/config.mk    | 0
  .../data/etc/udev/rules.d/50-pipeline-waitdev.rules               | 0
  .../{pipeline => bootchain-waitdev}/data/lib/pipeline/waitdev     | 0
  .../data/lib/uevent/filters/pipeline-waitdev                      | 0
  make-initrd/features/{pipeline => bootchain-waitdev}/rules.mk     | 0
  14 files changed, 0 insertions(+), 0 deletions(-)
  rename make-initrd/features/{pipeline/data/sbin => 
bootchain-core/data/bin}/pipeline-sh-functions (100%)
  rename make-initrd/features/{pipeline => 
bootchain-core}/data/etc/initrd/cmdline.d/pipeline (100%)
  rename make-initrd/features/{pipeline => 
bootchain-core}/data/etc/rc.d/init.d/pipeline (100%)
  rename make-initrd/features/{pipeline => 
bootchain-core}/data/lib/initrd/cmdline.d/pipeline (100%)
  rename make-initrd/features/{pipeline => 
bootchain-core}/data/lib/pipeline/mountfs (100%)
  rename make-initrd/features/{pipeline => 
bootchain-core}/data/lib/pipeline/overlayfs (100%)
  rename make-initrd/features/{pipeline => 
bootchain-core}/data/lib/pipeline/rootfs (100%)
  rename make-initrd/features/{pipeline => 
bootchain-core}/data/sbin/pipelined (100%)
  rename make-initrd/features/{pipeline => 
bootchain-getimage}/data/lib/pipeline/getimage (100%)
  rename make-initrd/features/{pipeline => bootchain-waitdev}/config.mk 
(100%)
  rename make-initrd/features/{pipeline => 
bootchain-waitdev}/data/etc/udev/rules.d/50-pipeline-waitdev.rules (100%)
  rename make-initrd/features/{pipeline => 
bootchain-waitdev}/data/lib/pipeline/waitdev (100%)
  rename make-initrd/features/{pipeline => 
bootchain-waitdev}/data/lib/uevent/filters/pipeline-waitdev (100%)
  rename make-initrd/features/{pipeline => bootchain-waitdev}/rules.mk 
(100%)

diff --git 
a/make-initrd/features/pipeline/data/sbin/pipeline-sh-functions 
b/make-initrd/features/bootchain-core/data/bin/pipeline-sh-functions
similarity index 100%
rename from make-initrd/features/pipeline/data/sbin/pipeline-sh-functions
rename to make-initrd/features/bootchain-core/data/bin/pipeline-sh-functions
diff --git 
a/make-initrd/features/pipeline/data/etc/initrd/cmdline.d/pipeline 
b/make-initrd/features/bootchain-core/data/etc/initrd/cmdline.d/pipeline
similarity index 100%
rename from make-initrd/features/pipeline/data/etc/initrd/cmdline.d/pipeline
rename to 
make-initrd/features/bootchain-core/data/etc/initrd/cmdline.d/pipeline
diff --git a/make-initrd/features/pipeline/data/etc/rc.d/init.d/pipeline 
b/make-initrd/features/bootchain-core/data/etc/rc.d/init.d/pipeline
similarity index 100%
rename from make-initrd/features/pipeline/data/etc/rc.d/init.d/pipeline
rename to make-initrd/features/bootchain-core/data/etc/rc.d/init.d/pipeline
diff --git 
a/make-initrd/features/pipeline/data/lib/initrd/cmdline.d/pipeline 
b/make-initrd/features/bootchain-core/data/lib/initrd/cmdline.d/pipeline
similarity index 100%
rename from make-initrd/features/pipeline/data/lib/initrd/cmdline.d/pipeline
rename to 
make-initrd/features/bootchain-core/data/lib/initrd/cmdline.d/pipeline
diff --git a/make-initrd/features/pipeline/data/lib/pipeline/mountfs 
b/make-initrd/features/bootchain-core/data/lib/pipeline/mountfs
similarity index 100%
rename from make-initrd/features/pipeline/data/lib/pipeline/mountfs
rename to make-initrd/features/bootchain-core/data/lib/pipeline/mountfs
diff --git a/make-initrd/features/pipeline/data/lib/pipeline/overlayfs 
b/make-initrd/features/bootchain-core/data/lib/pipeline/overlayfs
similarity index 100%
rename from make-initrd/features/pipeline/data/lib/pipeline/overlayfs
rename to make-initrd/features/bootchain-core/data/lib/pipeline/overlayfs
diff --git a/make-initrd/features/pipeline/data/lib/pipeline/rootfs 
b/make-initrd/features/bootchain-core/data/lib/pipeline/rootfs
similarity index 100%
rename from make-initrd/features/pipeline/data/lib/pipeline/rootfs
rename to make-initrd/features/bootchain-core/data/lib/pipeline/rootfs
diff --git a/make-initrd/features/pipeline/data/sbin/pipelined 
b/make-initrd/features/bootchain-core/data/sbin/pipelined
similarity index 100%
rename from make-initrd/features/pipeline/data/sbin/pipelined
rename to make-initrd/features/bootchain-core/data/sbin/pipelined
diff --git a/make-initrd/features/pipeline/data/lib/pipeline/getimage 
b/make-initrd/features/bootchain-getimage/data/lib/pipeline/getimage
similarity index 100%
rename from make-initrd/features/pipeline/data/lib/pipeline/getimage
rename to make-initrd/features/bootchain-getimage/data/lib/pipeline/getimage
diff --git a/make-initrd/features/pipeline/config.mk 
b/make-initrd/features/bootchain-waitdev/config.mk
similarity index 100%
rename from make-initrd/features/pipeline/config.mk
rename to make-initrd/features/bootchain-waitdev/config.mk
diff --git 
a/make-initrd/features/pipeline/data/etc/udev/rules.d/50-pipeline-waitdev.rules 
b/make-initrd/features/bootchain-waitdev/data/etc/udev/rules.d/50-pipeline-waitdev.rules
similarity index 100%
rename from 
make-initrd/features/pipeline/data/etc/udev/rules.d/50-pipeline-waitdev.rules
rename to 
make-initrd/features/bootchain-waitdev/data/etc/udev/rules.d/50-pipeline-waitdev.rules
diff --git a/make-initrd/features/pipeline/data/lib/pipeline/waitdev 
b/make-initrd/features/bootchain-waitdev/data/lib/pipeline/waitdev
similarity index 100%
rename from make-initrd/features/pipeline/data/lib/pipeline/waitdev
rename to make-initrd/features/bootchain-waitdev/data/lib/pipeline/waitdev
diff --git 
a/make-initrd/features/pipeline/data/lib/uevent/filters/pipeline-waitdev 
b/make-initrd/features/bootchain-waitdev/data/lib/uevent/filters/pipeline-waitdev
similarity index 100%
rename from 
make-initrd/features/pipeline/data/lib/uevent/filters/pipeline-waitdev
rename to 
make-initrd/features/bootchain-waitdev/data/lib/uevent/filters/pipeline-waitdev
diff --git a/make-initrd/features/pipeline/rules.mk 
b/make-initrd/features/bootchain-waitdev/rules.mk
similarity index 100%
rename from make-initrd/features/pipeline/rules.mk
rename to make-initrd/features/bootchain-waitdev/rules.mk
-- 
2.21.0

Re: [make-initrd] [PATCH v1 01/41] fork pipeline: split into 4 features (move files)

[Alexey Gladkov]

On Fri, Sep 24, 2021 at 06:54:32PM +0300, Leonid Krivoshein wrote:
> ---
>  .../data/sbin => bootchain-core/data/bin}/pipeline-sh-functions   | 0
>  .../data/etc/initrd/cmdline.d/pipeline                            | 0
>  .../{pipeline => bootchain-core}/data/etc/rc.d/init.d/pipeline    | 0
>  .../data/lib/initrd/cmdline.d/pipeline                            | 0
>  .../{pipeline => bootchain-core}/data/lib/pipeline/mountfs        | 0
>  .../{pipeline => bootchain-core}/data/lib/pipeline/overlayfs      | 0
>  .../{pipeline => bootchain-core}/data/lib/pipeline/rootfs         | 0
>  .../features/{pipeline => bootchain-core}/data/sbin/pipelined     | 0
>  .../{pipeline => bootchain-getimage}/data/lib/pipeline/getimage   | 0
>  make-initrd/features/{pipeline => bootchain-waitdev}/config.mk    | 0
>  .../data/etc/udev/rules.d/50-pipeline-waitdev.rules               | 0
>  .../{pipeline => bootchain-waitdev}/data/lib/pipeline/waitdev     | 0
>  .../data/lib/uevent/filters/pipeline-waitdev                      | 0
>  make-initrd/features/{pipeline => bootchain-waitdev}/rules.mk     | 0

Напомни, а зачем ты всё попилил на разные фичи ? Это кстати, не плохо бы в 
commit message занести.

>  14 files changed, 0 insertions(+), 0 deletions(-)
>  rename make-initrd/features/{pipeline/data/sbin =>
> bootchain-core/data/bin}/pipeline-sh-functions (100%)
>  rename make-initrd/features/{pipeline =>
> bootchain-core}/data/etc/initrd/cmdline.d/pipeline (100%)
>  rename make-initrd/features/{pipeline =>
> bootchain-core}/data/etc/rc.d/init.d/pipeline (100%)
>  rename make-initrd/features/{pipeline =>
> bootchain-core}/data/lib/initrd/cmdline.d/pipeline (100%)
>  rename make-initrd/features/{pipeline =>
> bootchain-core}/data/lib/pipeline/mountfs (100%)
>  rename make-initrd/features/{pipeline =>
> bootchain-core}/data/lib/pipeline/overlayfs (100%)
>  rename make-initrd/features/{pipeline =>
> bootchain-core}/data/lib/pipeline/rootfs (100%)
>  rename make-initrd/features/{pipeline =>
> bootchain-core}/data/sbin/pipelined (100%)
>  rename make-initrd/features/{pipeline =>
> bootchain-getimage}/data/lib/pipeline/getimage (100%)
>  rename make-initrd/features/{pipeline => bootchain-waitdev}/config.mk
> (100%)
>  rename make-initrd/features/{pipeline =>
> bootchain-waitdev}/data/etc/udev/rules.d/50-pipeline-waitdev.rules (100%)
>  rename make-initrd/features/{pipeline =>
> bootchain-waitdev}/data/lib/pipeline/waitdev (100%)
>  rename make-initrd/features/{pipeline =>
> bootchain-waitdev}/data/lib/uevent/filters/pipeline-waitdev (100%)
>  rename make-initrd/features/{pipeline => bootchain-waitdev}/rules.mk (100%)
> 
> diff --git a/make-initrd/features/pipeline/data/sbin/pipeline-sh-functions
> b/make-initrd/features/bootchain-core/data/bin/pipeline-sh-functions
> similarity index 100%
> rename from make-initrd/features/pipeline/data/sbin/pipeline-sh-functions
> rename to make-initrd/features/bootchain-core/data/bin/pipeline-sh-functions
> diff --git
> a/make-initrd/features/pipeline/data/etc/initrd/cmdline.d/pipeline
> b/make-initrd/features/bootchain-core/data/etc/initrd/cmdline.d/pipeline
> similarity index 100%
> rename from make-initrd/features/pipeline/data/etc/initrd/cmdline.d/pipeline
> rename to
> make-initrd/features/bootchain-core/data/etc/initrd/cmdline.d/pipeline
> diff --git a/make-initrd/features/pipeline/data/etc/rc.d/init.d/pipeline
> b/make-initrd/features/bootchain-core/data/etc/rc.d/init.d/pipeline
> similarity index 100%
> rename from make-initrd/features/pipeline/data/etc/rc.d/init.d/pipeline
> rename to make-initrd/features/bootchain-core/data/etc/rc.d/init.d/pipeline
> diff --git
> a/make-initrd/features/pipeline/data/lib/initrd/cmdline.d/pipeline
> b/make-initrd/features/bootchain-core/data/lib/initrd/cmdline.d/pipeline
> similarity index 100%
> rename from make-initrd/features/pipeline/data/lib/initrd/cmdline.d/pipeline
> rename to
> make-initrd/features/bootchain-core/data/lib/initrd/cmdline.d/pipeline
> diff --git a/make-initrd/features/pipeline/data/lib/pipeline/mountfs
> b/make-initrd/features/bootchain-core/data/lib/pipeline/mountfs
> similarity index 100%
> rename from make-initrd/features/pipeline/data/lib/pipeline/mountfs
> rename to make-initrd/features/bootchain-core/data/lib/pipeline/mountfs
> diff --git a/make-initrd/features/pipeline/data/lib/pipeline/overlayfs
> b/make-initrd/features/bootchain-core/data/lib/pipeline/overlayfs
> similarity index 100%
> rename from make-initrd/features/pipeline/data/lib/pipeline/overlayfs
> rename to make-initrd/features/bootchain-core/data/lib/pipeline/overlayfs
> diff --git a/make-initrd/features/pipeline/data/lib/pipeline/rootfs
> b/make-initrd/features/bootchain-core/data/lib/pipeline/rootfs
> similarity index 100%
> rename from make-initrd/features/pipeline/data/lib/pipeline/rootfs
> rename to make-initrd/features/bootchain-core/data/lib/pipeline/rootfs
> diff --git a/make-initrd/features/pipeline/data/sbin/pipelined
> b/make-initrd/features/bootchain-core/data/sbin/pipelined
> similarity index 100%
> rename from make-initrd/features/pipeline/data/sbin/pipelined
> rename to make-initrd/features/bootchain-core/data/sbin/pipelined
> diff --git a/make-initrd/features/pipeline/data/lib/pipeline/getimage
> b/make-initrd/features/bootchain-getimage/data/lib/pipeline/getimage
> similarity index 100%
> rename from make-initrd/features/pipeline/data/lib/pipeline/getimage
> rename to make-initrd/features/bootchain-getimage/data/lib/pipeline/getimage
> diff --git a/make-initrd/features/pipeline/config.mk
> b/make-initrd/features/bootchain-waitdev/config.mk
> similarity index 100%
> rename from make-initrd/features/pipeline/config.mk
> rename to make-initrd/features/bootchain-waitdev/config.mk
> diff --git a/make-initrd/features/pipeline/data/etc/udev/rules.d/50-pipeline-waitdev.rules b/make-initrd/features/bootchain-waitdev/data/etc/udev/rules.d/50-pipeline-waitdev.rules
> similarity index 100%
> rename from
> make-initrd/features/pipeline/data/etc/udev/rules.d/50-pipeline-waitdev.rules
> rename to make-initrd/features/bootchain-waitdev/data/etc/udev/rules.d/50-pipeline-waitdev.rules
> diff --git a/make-initrd/features/pipeline/data/lib/pipeline/waitdev
> b/make-initrd/features/bootchain-waitdev/data/lib/pipeline/waitdev
> similarity index 100%
> rename from make-initrd/features/pipeline/data/lib/pipeline/waitdev
> rename to make-initrd/features/bootchain-waitdev/data/lib/pipeline/waitdev
> diff --git
> a/make-initrd/features/pipeline/data/lib/uevent/filters/pipeline-waitdev b/make-initrd/features/bootchain-waitdev/data/lib/uevent/filters/pipeline-waitdev
> similarity index 100%
> rename from
> make-initrd/features/pipeline/data/lib/uevent/filters/pipeline-waitdev
> rename to make-initrd/features/bootchain-waitdev/data/lib/uevent/filters/pipeline-waitdev
> diff --git a/make-initrd/features/pipeline/rules.mk
> b/make-initrd/features/bootchain-waitdev/rules.mk
> similarity index 100%
> rename from make-initrd/features/pipeline/rules.mk
> rename to make-initrd/features/bootchain-waitdev/rules.mk
> -- 
> 2.21.0
> 
> 
> _______________________________________________
> Make-initrd mailing list
> Make-initrd@lists.altlinux.org
> https://lists.altlinux.org/mailman/listinfo/make-initrd
> 

-- 
Rgrds, legion

Re: [make-initrd] [PATCH v1 01/41] fork pipeline: split into 4 features (move files)

[Leonid Krivoshein]

24.09.2021 21:34, Alexey Gladkov пишет:
> [...]
> Напомни, а зачем ты всё попилил на разные фичи ? Это кстати, не плохо бы в
> commit message занести.

Тут два момента. В форкнутом bootcahin это было сначала монолитной 
фичей, но потом я разделил на разные, чтобы минимизировать наполнение 
initramfs. Есть ядро (core), а есть методы загрузки. Например, getimage 
могла бы использовать внешний wget, я использую curl -- его точно не 
нужно во всех случаях, и его нет в busybox, кому-то нужен mount.cifs, 
ss, resolve, итд. По этому же принципу фичи делились на подпакеты... до 
сего дня.

Но при возврате в апстрим я понял, что pipeline это "фича из коробки". 
Чтобы не ломать ничего тем, у кого стоит pipeline, пришлось и эти три 
сделать частью самого make-initrd, а не make-initrd-чего-то-там. 
Варианты мы обсуждали, в частности, я предлагал сделать конфликт с фичей 
pipeline (он и был изначально), чтобы фичи друг-другу ничего не портили. 
Но ты сказал, что нет смысла оставлять pipeline, если bootchain его 
полностью заменяет. Я всё же сделал зависимость для фичи pipeline от 
bootchain'овских кусочков, но ещё не проверял, что будет, если по 
старинке поставить pipeline -- по идее разлом твои авто-тесты должны 
выловить.


-- 
Best regards,
Leonid Krivoshein.

Re: [make-initrd] [PATCH v1 01/41] fork pipeline: split into 4 features (move files)

[Leonid Krivoshein]

24.09.2021 21:34, Alexey Gladkov пишет:
> Напомни, а зачем ты всё попилил на разные фичи ? Это кстати, не плохо бы в
> commit message занести.

Да, занесу. Но из предметного осталось вот что: на данном этапе выигрыша 
от разделения пользователи pipeline не почувствуют, если будут 
использовать как раньше фичу pipeline, т.к. она всегда есть в основном 
пакете make-initrd, а запрос этой фичи приведёт к установке 
bootchain-core + bootchain-waitdev + bootchain-getimage. На вариант 
сделать pipeline отдельным под-пакетом make-initrd-pipeline я не 
решился, т.к. это потребует от пользователей pipeline ставить его явно 
(чтобы им ничего не сломать). Но вообще этот вариант более гибкий.


-- 
Best regards,
Leonid Krivoshein.