Updated mc patch and enable udev-cache

PATCH Superseded Saul Wold 3 participants 10 messages Jun 27, 2013 – Jul 1, 2013

Share & tools

Saul Wold

author

2013-06-27 22:43 UTC #0 lore raw

cover Updated mc patch and enable udev-cache

This patch set brings the mc helpers files back and packages them. It also enables the udev-cache code since there is a boot time speed up.

Sau!

Saul Wold (4):
mc: Don't remove libdir and split helpers into packages
packagegroups: Update for split mc packages
packagegroup-core-basic: remove hardcode udev
packagegroup-core-boot: used udev-cache for sysvinit

 .../packagegroups/packagegroup-core-boot.bb        |  1 +
 .../packagegroups/packagegroup-self-hosted.bb      |  4 ++++
 meta/recipes-extended/mc/mc_4.8.8.bb               | 22 +++++++++++++++++++++-
 .../packagegroups/packagegroup-core-basic.bb       |  5 ++++-
 .../packagegroups/packagegroup-core-lsb.bb         |  4 ++++
 5 files changed, 34 insertions(+), 2 deletions(-)

Signature · 1 line

1.8.1.4

Saul Wold

author

2013-06-27 22:43 UTC #1 lore raw

PATCH 1/4 mc: Don't remove libdir and split helpers into packages

It contains helper programs that are needed to make mc do the right actions for the various file formats it understands.

The helpers are perl, python and shell scripts, split them out so the core mc does not try to pull in perl and python, it will still run without these helpers.

[YOCTO #4432]

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-extended/mc/mc_4.8.8.bb | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

meta/recipes-extended/mc/mc_4.8.8.bb +21 -1

index 20ae797..b2851bb 100644
@@ -19,5 +19,25 @@ FILES_${PN}-dbg += "${libexecdir}/mc/.debug/"
 
 do_install_append () {
 	sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/*
-	rm -rf ${D}${libdir}
 }
+
+PACKAGES =+ "${BPN}-helpers-perl ${BPN}-helpers-python ${BPN}-helpers ${BPN}-fish"
+
+DESCRIPTION_${BPN}-helpers-perl = "Midnight Commander perl based helper scripts" 
+FILES_${BPN}-helpers-perl = "${libexecdir}/mc/extfs.d/a+ ${libexecdir}/mc/extfs.d/apt+ \
+                             ${libexecdir}/mc/extfs.d/deb ${libexecdir}/mc/extfs.d/deba \
+                             ${libexecdir}/mc/extfs.d/debd ${libexecdir}/mc/extfs.d/dpkg+ \
+                             ${libexecdir}/mc/extfs.d/mailfs ${libexecdir}/mc/extfs.d/patchfs \ 
+                             ${libexecdir}/mc/extfs.d/rpms+ ${libexecdir}/mc/extfs.d/ulib \ 
+                             ${libexecdir}/mc/extfs.d/uzip"
+RDEPENDS_${BPN}-helpers-perl = "perl"
+
+DESCRIPTION_${BPN}-helpers-python = "Midnight Commander python based helper scripts" 
+FILES_${BPN}-helpers-python = "${libexecdir}/mc/extfs.d/s3+ ${libexecdir}/mc/extfs.d/uc1541"
+RDEPENDS_${BPN}-helpers-python = "python"
+
+DESCRIPTION_${BPN}-helpers = "Midnight Commander shell helper scripts" 
+FILES_${BPN}-helpers = "${libexecdir}/mc/extfs.d/* ${libexecdir}/mc/ext.d/*"
+
+DESCRIPTION_${BPN}-fish = "Midnight Commander Fish scripts"
+FILES_${BPN}-fish = "${libexecdir}/mc/fish"

Signature · 1 line

1.8.1.4

Saul Wold

author

2013-06-27 22:43 UTC #2 lore raw

PATCH 2/4 packagegroups: Update for split mc packages

In reply to Saul Wold

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-core/packagegroups/packagegroup-self-hosted.bb    | 4 ++++
 meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 4 ++++
 meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb   | 4 ++++
 3 files changed, 12 insertions(+)

meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +4 -0

index ed73617..d4e89a1 100644
@@ -39,6 +39,10 @@ RDEPENDS_packagegroup-self-hosted-host-tools = "\
     iptables \
     lsb \
     mc \
+    mc-fish \
+    mc-helpers \
+    mc-helpers-perl \
+    mc-helpers-python \
     parted \
     pseudo \
     screen \

meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +4 -0

index 00405d6..47b980e 100644
@@ -59,6 +59,10 @@ RDEPENDS_packagegroup-core-basic-utils = "\
     grep \
     makedevs \
     mc \
+    mc-fish \
+    mc-helpers \
+    mc-helpers-perl \
+    mc-helpers-python \
     mktemp \
     ncurses \
     net-tools \

meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +4 -0

index ed854b8..d71db26 100644
@@ -50,6 +50,10 @@ RDEPENDS_packagegroup-core-sys-extended = "\
     lrzsz \
     lzo \
     mc \
+    mc-fish \
+    mc-helpers \
+    mc-helpers-perl \
+    mc-helpers-python \
     mdadm \
     minicom \
     neon \

Signature · 1 line

1.8.1.4

Saul Wold

author

2013-06-27 22:43 UTC #3 lore raw

PATCH 3/4 packagegroup-core-basic: remove hardcode udev

In reply to Saul Wold

udev is brought in via packagegroup-core-boot

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-extended/packagegroups/packagegroup-core-basic.bb | 1 -
 1 file changed, 1 deletion(-)

meta/recipes-extended/packagegroups/packagegroup-core-basic.bb +0 -1

index 47b980e..e802a02 100644
@@ -73,7 +73,6 @@ RDEPENDS_packagegroup-core-basic-utils = "\
     sed \
     tar \
     time \
-    udev \
     util-linux \
     zlib \
     "

Signature · 1 line

1.8.1.4

Saul Wold

author

2013-06-27 22:43 UTC #4 lore raw

PATCH 4/4 packagegroup-core-boot: used udev-cache for sysvinit

In reply to Saul Wold

Enabling this by default since it does improve boot time when using sysvinit udev

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 1 +
 1 file changed, 1 insertion(+)

meta/recipes-core/packagegroups/packagegroup-core-boot.bb +1 -0

index d69c41d..1e1ee8e 100644
@@ -43,6 +43,7 @@ RDEPENDS_${PN} = "\
     ${VIRTUAL-RUNTIME_init_manager} \
     ${VIRTUAL-RUNTIME_initscripts} \
     ${VIRTUAL-RUNTIME_dev_manager} \
+    ${@base_contains("DISTRO_FEATURES", "systemd", "", "udev-cache", d)} \
     ${VIRTUAL-RUNTIME_update-alternatives} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"

Signature · 1 line

1.8.1.4

Paul Eggleton

2013-06-28 10:21 UTC #5 lore raw

Re: [PATCH 4/4] packagegroup-core-boot: used udev-cache for sysvinit

Quoted 14 lines · On Thursday 27 June 2013 15:43:17 Saul Wold wrote:

Enabling this by default since it does improve boot time when using sysvinit udev
Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 1 +
 1 file changed, 1 insertion(+)
(quoted diff) +0 -0
b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index d69c41d..1e1ee8e 100644

meta/recipes-core/packagegroups/packagegroup-core-boot.bb RDEPENDS_${PN} = "\ · line 48

Quoted 6 lines

meta/recipes-core/packagegroups/packagegroup-core-boot.bb +1 -0

@@ -43,6 +43,7 @@ RDEPENDS_${PN} = "\
     ${VIRTUAL-RUNTIME_init_manager} \
     ${VIRTUAL-RUNTIME_initscripts} \
     ${VIRTUAL-RUNTIME_dev_manager} \
+    ${@base_contains("DISTRO_FEATURES", "systemd", "", "udev-cache", d)} \
     ${VIRTUAL-RUNTIME_update-alternatives} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"

I appreciate the intention here but I'm not sure if this is really the appropriate place to put this; packagegroup-core-boot is supposed to only directly pull in the essentials required for booting. This will cause problems for those people using alternative device managers (e.g. busybox mdev) as well.

I'm not sure where this should go, but adding it to VIRTUAL- RUNTIME_dev_manager (in the distro config?) could work. Anyone else have any better suggestion?

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre

Burton, Ross

2013-07-01 14:49 UTC #6 lore raw

Re: [PATCH 4/4] packagegroup-core-boot: used udev-cache for sysvinit

Quoted 9 lines · Paul Eggleton

I appreciate the intention here but I'm not sure if this is really the appropriate place to put this; packagegroup-core-boot is supposed to only directly pull in the essentials required for booting. This will cause problems for those people using alternative device managers (e.g. busybox mdev) as well.
I'm not sure where this should go, but adding it to VIRTUAL- RUNTIME_dev_manager (in the distro config?) could work. Anyone else have any better suggestion?

How about making udev RRECOMMEND udev-cache?

Ross

Paul Eggleton

2013-07-01 14:58 UTC #7 lore raw

Re: [PATCH 4/4] packagegroup-core-boot: used udev-cache for sysvinit

Quoted 7 lines · Ross

Quoted 6 lines · Paul Eggleton
I appreciate the intention here but I'm not sure if this is really the appropriate place to put this; packagegroup-core-boot is supposed to only directly pull in the essentials required for booting. This will cause problems for those people using alternative device managers (e.g. busybox mdev) as well.

Quoted 5 lines

Quoted 3 lines
I'm not sure where this should go, but adding it to VIRTUAL- RUNTIME_dev_manager (in the distro config?) could work. Anyone else have any better suggestion?
How about making udev RRECOMMEND udev-cache?

It's not that udev-cache might not be available, rather that packagegroup- core-boot shouldn't have any kind of reference to it. In any case unless udev is skipped somehow, an RRECOMMENDS on udev-cache will end up building udev even if you haven't selected it in VIRTUAL-RUNTIME_dev_manager so that won't help.

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre

Burton, Ross

2013-07-01 15:03 UTC #8 lore raw

Re: [PATCH 4/4] packagegroup-core-boot: used udev-cache for sysvinit

Quoted 12 lines · Paul Eggleton

Quoted 11 lines · Ross
Quoted 9 lines · Paul Eggleton
I appreciate the intention here but I'm not sure if this is really the appropriate place to put this; packagegroup-core-boot is supposed to only directly pull in the essentials required for booting. This will cause problems for those people using alternative device managers (e.g. busybox mdev) as well.
I'm not sure where this should go, but adding it to VIRTUAL- RUNTIME_dev_manager (in the distro config?) could work. Anyone else have any better suggestion?

Quoted 7 lines

Quoted 1 line
How about making udev RRECOMMEND udev-cache?
It's not that udev-cache might not be available, rather that packagegroup- core-boot shouldn't have any kind of reference to it. In any case unless udev is skipped somehow, an RRECOMMENDS on udev-cache will end up building udev even if you haven't selected it in VIRTUAL-RUNTIME_dev_manager so that won't help.

I mean add a recommends to the udev binary package itself, so you'll get udev-cache if you build udev (and keep the existing udev-selection logic as-is).

Ross

Paul Eggleton

2013-07-01 15:07 UTC #9 lore raw

Re: [PATCH 4/4] packagegroup-core-boot: used udev-cache for sysvinit

Quoted 3 lines · Ross

Quoted 2 lines · Paul Eggleton
Quoted 1 line · Ross
On 28 June 2013 11:02, Paul Eggleton <[email protected]>

Quoted 20 lines · wrote:

Quoted 12 lines
Quoted 12 lines
Quoted 11 lines
I appreciate the intention here but I'm not sure if this is really the appropriate place to put this; packagegroup-core-boot is supposed to only
directly pull in the essentials required for booting. This will cause problems for those people using alternative device managers (e.g. busybox
mdev) as well.
I'm not sure where this should go, but adding it to VIRTUAL- RUNTIME_dev_manager (in the distro config?) could work. Anyone else have any better suggestion?
Quoted 7 lines
Quoted 1 line
How about making udev RRECOMMEND udev-cache?
It's not that udev-cache might not be available, rather that packagegroup- core-boot shouldn't have any kind of reference to it. In any case unless udev is skipped somehow, an RRECOMMENDS on udev-cache will end up building udev even if you haven't selected it in VIRTUAL-RUNTIME_dev_manager so that won't help.

Quoted 3 lines

I mean add a recommends to the udev binary package itself, so you'll get udev-cache if you build udev (and keep the existing udev-selection logic as-is).

Right, that could work yes.

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre