Patchwork [meta-initramfs,PATCHv2] dracut: add git version

login
register
mail settings
Submitter Koen Kooi
Date Jan. 21, 2014, 11:08 a.m.
Message ID <1390302526-3333-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/65319/
State Accepted, archived
Headers show

Comments

Koen Kooi - Jan. 21, 2014, 11:08 a.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---

Changes since v1:
	Fix PV

To make it work properly in systemd mode you'll need http://patches.openembedded.org/patch/65317/ as well.

 ...-xz-lzma-option-to-use-all-cores-for-mult.patch |   39 +++++++++++++++++++
 .../recipes-devtools/dracut/dracut_git.bb          |   40 ++++++++++++++++++++
 2 files changed, 79 insertions(+)
 create mode 100644 meta-initramfs/recipes-devtools/dracut/dracut/0001-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch
 create mode 100644 meta-initramfs/recipes-devtools/dracut/dracut_git.bb
Khem Raj - Jan. 21, 2014, 6:29 p.m.
On Tuesday, January 21, 2014 12:08:46 PM Koen Kooi wrote:
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> 
> Changes since v1:
> 	Fix PV
> 
> To make it work properly in systemd mode you'll need
> http://patches.openembedded.org/patch/65317/ as well.
> 
>  ...-xz-lzma-option-to-use-all-cores-for-mult.patch |   39
> +++++++++++++++++++ .../recipes-devtools/dracut/dracut_git.bb          |  
> 40 ++++++++++++++++++++ 2 files changed, 79 insertions(+)
>  create mode 100644

recipes-devtools does not sound appropriate location maybe recipes-core is 
better ?

> meta-initramfs/recipes-devtools/dracut/dracut/0001-Use-builtin-xz-lzma-opti
> on-to-use-all-cores-for-mult.patch create mode 100644
> meta-initramfs/recipes-devtools/dracut/dracut_git.bb
> 
> diff --git
> a/meta-initramfs/recipes-devtools/dracut/dracut/0001-Use-builtin-xz-lzma-op
> tion-to-use-all-cores-for-mult.patch
> b/meta-initramfs/recipes-devtools/dracut/dracut/0001-Use-builtin-xz-lzma-op
> tion-to-use-all-cores-for-mult.patch new file mode 100644
> index 0000000..7dc62de
> --- /dev/null
> +++
> b/meta-initramfs/recipes-devtools/dracut/dracut/0001-Use-builtin-xz-lzma-op
> tion-to-use-all-cores-for-mult.patch @@ -0,0 +1,39 @@
> +From c92ea797c43aa811e98b6bd8fb4aae921fa08592 Mon Sep 17 00:00:00 2001
> +From: Koen Kooi <koen@dominion.thruhere.net>
> +Date: Fri, 10 Jan 2014 21:11:40 +0100
> +Subject: [PATCH] Use builtin xz/lzma option to use all cores for
> multihreaded + compression
> +
> +This removes the dependency on 'getconf' as well, which is not installed by
> default on my embedded systems. +
> +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> +Upstream-status: Submitted
> +
> +---
> + dracut.sh | 6 ++----
> + 1 file changed, 2 insertions(+), 4 deletions(-)
> +
> +diff --git a/dracut.sh b/dracut.sh
> +index 11dcd0e..2e6ea67 100755
> +--- a/dracut.sh
> ++++ b/dracut.sh
> +@@ -697,14 +697,12 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
> + # eliminate IFS hackery when messing with fw_dir
> + fw_dir=${fw_dir//:/ }
> +
> +-cpu_count=$(getconf _NPROCESSORS_ONLN)
> +-
> + # handle compression options.
> + [[ $compress ]] || compress="gzip"
> + case $compress in
> +     bzip2) compress="bzip2 -9";;
> +-    lzma)  compress="lzma -9 ${cpu_count:+-T$cpu_count}";;
> +-    xz)    compress="xz --check=crc32 --lzma2=dict=1MiB
> ${cpu_count:+-T$cpu_count}";; ++    lzma)  compress="lzma -9 -T0";;
> ++    xz)    compress="xz --check=crc32 --lzma2=dict=1MiB -T0";;
> +     gzip)  compress="gzip -9"; command -v pigz > /dev/null 2>&1 &&
> compress="pigz -9";; +     lzo)   compress="lzop -9";;
> +     lz4)   compress="lz4 -9";;
> +--
> +1.8.0
> +
> diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
> b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb new file mode 100644
> index 0000000..13181fe
> --- /dev/null
> +++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
> @@ -0,0 +1,40 @@
> +SUMMARY = "Initramfs generator using udev"
> +DESCRIPTION = "Dracut is an event driven initramfs infrastructure. dracut
> (the tool) is used to create an initramfs image by copying tools and files
> from an installed system and combining it with the dracut framework,
> usually found in /usr/lib/dracut/modules.d." +
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
> +
> +SRCREV = "bb1ba3a1ca9dd6284f6319eb197de4a757a7f99d"
> +SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git \
> +          
> file://0001-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch \ + 
>         "
> +
> +PV = "0.34+git${SRCPV}"
> +
> +S = "${WORKDIR}/git"
> +
> +do_configure() {
> +    ./configure --prefix=${prefix} \
> +                --libdir=${libdir} \
> +                --datadir=${datadir} \
> +                --sysconfdir=${sysconfdir} \
> +                --sbindir=${sbindir} \
> +                --disable-documentation \
> +                --bindir=${bindir} \
> +                --includedir=${includedir} \
> +                --localstatedir=${localstatedir} \
> +}
> +
> +do_install() {
> +    oe_runmake install DESTDIR=${D}
> +}
> +
> +FILES_${PN} += "${datadir}/bash-completion \
> +                ${libdir}/kernel \
> +               "
> +
> +RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid bash ldd"
> +# This could be optimized a bit, but let's avoid non-booting systems :)
> +RRECOMMENDS_${PN} = " \
> +                     kernel-modules \
> +                    "
Otavio Salvador - Jan. 22, 2014, 2:35 p.m.
On Tue, Jan 21, 2014 at 4:29 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Tuesday, January 21, 2014 12:08:46 PM Koen Kooi wrote:
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>>
>> Changes since v1:
>>       Fix PV
>>
>> To make it work properly in systemd mode you'll need
>> http://patches.openembedded.org/patch/65317/ as well.
>>
>>  ...-xz-lzma-option-to-use-all-cores-for-mult.patch |   39
>> +++++++++++++++++++ .../recipes-devtools/dracut/dracut_git.bb          |
>> 40 ++++++++++++++++++++ 2 files changed, 79 insertions(+)
>>  create mode 100644
>
> recipes-devtools does not sound appropriate location maybe recipes-core is
> better ?

I am not sure this is 'core'; maybe 'recipes-support'?
Khem Raj - Jan. 22, 2014, 5:21 p.m.
On Wed, Jan 22, 2014 at 6:35 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> I am not sure this is 'core'; maybe 'recipes-support'?


well we are in initramfs layer and dracut could be a core recipe for
initramfs layer
Otavio Salvador - Jan. 22, 2014, 5:26 p.m.
On Wed, Jan 22, 2014 at 3:21 PM, Khem Raj <raj.khem@gmail.com> wrote:
> On Wed, Jan 22, 2014 at 6:35 AM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> I am not sure this is 'core'; maybe 'recipes-support'?
>
>
> well we are in initramfs layer and dracut could be a core recipe for
> initramfs layer

Ok; agreed.
Koen Kooi - Jan. 23, 2014, 9:56 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Otavio Salvador schreef op 22-01-14 18:26:
> On Wed, Jan 22, 2014 at 3:21 PM, Khem Raj <raj.khem@gmail.com> wrote:
>> On Wed, Jan 22, 2014 at 6:35 AM, Otavio Salvador 
>> <otavio@ossystems.com.br> wrote:
>>> I am not sure this is 'core'; maybe 'recipes-support'?
>> 
>> 
>> well we are in initramfs layer and dracut could be a core recipe for 
>> initramfs layer
> 
> Ok; agreed.

I'll send a new patch for that soon.

regards,

Koen

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFS4OczMkyGM64RGpERApRoAKC5MEwEuI3vdh7FN17Y2qi48vD9AQCgkYPK
u3CEw87X2dR2NJw6us9bhoQ=
=QQ2J
-----END PGP SIGNATURE-----

Patch

diff --git a/meta-initramfs/recipes-devtools/dracut/dracut/0001-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch b/meta-initramfs/recipes-devtools/dracut/dracut/0001-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch
new file mode 100644
index 0000000..7dc62de
--- /dev/null
+++ b/meta-initramfs/recipes-devtools/dracut/dracut/0001-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch
@@ -0,0 +1,39 @@ 
+From c92ea797c43aa811e98b6bd8fb4aae921fa08592 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 10 Jan 2014 21:11:40 +0100
+Subject: [PATCH] Use builtin xz/lzma option to use all cores for multihreaded
+ compression
+
+This removes the dependency on 'getconf' as well, which is not installed by default on my embedded systems.
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+Upstream-status: Submitted
+
+---
+ dracut.sh | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 11dcd0e..2e6ea67 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -697,14 +697,12 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
+ # eliminate IFS hackery when messing with fw_dir
+ fw_dir=${fw_dir//:/ }
+ 
+-cpu_count=$(getconf _NPROCESSORS_ONLN)
+-
+ # handle compression options.
+ [[ $compress ]] || compress="gzip"
+ case $compress in
+     bzip2) compress="bzip2 -9";;
+-    lzma)  compress="lzma -9 ${cpu_count:+-T$cpu_count}";;
+-    xz)    compress="xz --check=crc32 --lzma2=dict=1MiB ${cpu_count:+-T$cpu_count}";;
++    lzma)  compress="lzma -9 -T0";;
++    xz)    compress="xz --check=crc32 --lzma2=dict=1MiB -T0";;
+     gzip)  compress="gzip -9"; command -v pigz > /dev/null 2>&1 && compress="pigz -9";;
+     lzo)   compress="lzop -9";;
+     lz4)   compress="lz4 -9";;
+-- 
+1.8.0
+
diff --git a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
new file mode 100644
index 0000000..13181fe
--- /dev/null
+++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb
@@ -0,0 +1,40 @@ 
+SUMMARY = "Initramfs generator using udev"
+DESCRIPTION = "Dracut is an event driven initramfs infrastructure. dracut (the tool) is used to create an initramfs image by copying tools and files from an installed system and combining it with the dracut framework, usually found in /usr/lib/dracut/modules.d."
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRCREV = "bb1ba3a1ca9dd6284f6319eb197de4a757a7f99d"
+SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git \
+           file://0001-Use-builtin-xz-lzma-option-to-use-all-cores-for-mult.patch \
+          "
+
+PV = "0.34+git${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+do_configure() {
+    ./configure --prefix=${prefix} \
+                --libdir=${libdir} \
+                --datadir=${datadir} \
+                --sysconfdir=${sysconfdir} \
+                --sbindir=${sbindir} \
+                --disable-documentation \
+                --bindir=${bindir} \
+                --includedir=${includedir} \
+                --localstatedir=${localstatedir} \
+}
+
+do_install() {
+    oe_runmake install DESTDIR=${D}
+}
+
+FILES_${PN} += "${datadir}/bash-completion \ 
+                ${libdir}/kernel \
+               "
+
+RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid bash ldd"
+# This could be optimized a bit, but let's avoid non-booting systems :)
+RRECOMMENDS_${PN} = " \
+                     kernel-modules \ 
+                    "