Skip to contentSkip to conversation

dracut: recipe cleanup

PATCH In review Dan McGregor 2 participants 6 messages Feb 4, 2015 – Feb 6, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 5/5 dracut: recipe cleanup

From: Dan McGregor <[email protected]>

Split out bash-completion data
Update RDEPENDS: getopt is util-linux-getopt now
Use distro_features_check to require systemd
Recommend busybox

---
 .../recipes-devtools/dracut/dracut_git.bb          | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)
meta-initramfs/recipes-devtools/dracut/dracut_git.bb +19 -6
index ea55a4d..8ef0749 100644
@@ -4,6 +4,8 @@ DESCRIPTION = "Dracut is an event driven initramfs infrastructure. dracut (the t
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
+PACKAGES =+ "${PN}-bash-completion"
+
 PE = "1"
 PV = "038"
 
@@ -13,8 +15,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git"
 
 S = "${WORKDIR}/git"
 
-do_configure() {
-    ./configure --prefix=${prefix} \
+inherit distro_features_check
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+EXTRA_OECONF = "--prefix=${prefix} \
                 --libdir=${libdir} \
                 --datadir=${datadir} \
                 --sysconfdir=${sysconfdir} \
@@ -23,20 +27,29 @@ do_configure() {
                 --bindir=${bindir} \
                 --includedir=${includedir} \
                 --localstatedir=${localstatedir} \
+                --systemdsystemunitdir=${systemd_unitdir}/system"
+
+do_configure() {
+    ./configure ${EXTRA_OECONF}
 }
 
 do_install() {
     oe_runmake install DESTDIR=${D}
 }
 
-FILES_${PN} += "${datadir}/bash-completion \ 
-                ${libdir}/kernel \
+FILES_${PN}-bash-completion = "${datadir}/bash-completion"
+
+FILES_${PN} += " ${libdir}/kernel \
+                ${systemd_unitdir} \
                "
+CONFFILES_${PN} += "${sysconfdir}/dracut.conf"
+
+RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd"
+RDEPENDS_${PN}-bash-completion = "bash-completion"
 
-# 'getopt' is in the util-linux main package
-RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux bash ldd"
 # This could be optimized a bit, but let's avoid non-booting systems :)
 RRECOMMENDS_${PN} = " \
                      kernel-modules \
+                     busybox \
                      coreutils \ 
                     "
Signature · 1 line
2.1.0
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Dan McGregor schreef op 04-02-15 om 19:40:

Quoted 19 lines

From: Dan McGregor <[email protected]>

Split out bash-completion data Update RDEPENDS: getopt is util-linux-getopt now Use distro_features_check to require systemd Recommend busybox

.../recipes-devtools/dracut/dracut_git.bb | 25
++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)

(quoted diff) +0 -0

b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index ea55a4d..8ef0749 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -4,6 +4,8 @@ DESCRIPTION = "Dracut is an event driven initramfs infrastructure. dracut (the t LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"

Quoted 1 line

+PACKAGES =+ "${PN}-bash-completion"

PACKAGES is runtime, so move that below do_install

Quoted 26 lines

+ PE = "1" PV = "038"

(quoted diff) +0 -0
@@ -13,8 +15,10 @@ SRC_URI =

"git://git.kernel.org/pub/scm/boot/dracut/dracut.git"

S = "${WORKDIR}/git"

-do_configure() { - ./configure --prefix=${prefix} \ +inherit
distro_features_check +REQUIRED_DISTRO_FEATURES = "systemd" + +EXTRA_OECONF = "--prefix=${prefix} \ --libdir=${libdir} \
--datadir=${datadir} \ --sysconfdir=${sysconfdir} \ @@ -23,20 +27,29 @@ do_configure() { --bindir=${bindir} \ --includedir=${includedir} \
--localstatedir=${localstatedir} \ + --systemdsystemunitdir=${systemd_unitdir}/system" + +do_configure() { + ./configure ${EXTRA_OECONF} }

do_install() { oe_runmake install DESTDIR=${D} }

-FILES_${PN} += "${datadir}/bash-completion \ - ${libdir}/kernel \ +FILES_${PN}-bash-completion = "${datadir}/bash-completion" + +FILES_${PN} += " ${libdir}/kernel \ + ${systemd_unitdir} \ " +CONFFILES_${PN} += "${sysconfdir}/dracut.conf" + +RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd" +RDEPENDS_${PN}-bash-completion = "bash-completion"

Quoted 5 lines

-# 'getopt' is in the util-linux main package -RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux bash ldd" # This could be optimized a bit, but let's avoid non-booting systems :) RRECOMMENDS_${PN}
= " \ kernel-modules \ + busybox \ coreutils \ "

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

iD8DBQFU03M0MkyGM64RGpERAsSgAJ4sxWUVqtCD2DKYpzAca3LK73vuXgCgnww/ s7RbVFpxvlWMqI2+kurk6E8=
=GmZH
-----END PGP SIGNATURE-----

#2 lore raw

PATCH v2 5/5 dracut: recipe cleanup

From: Dan McGregor <[email protected]>

Split out bash-completion data
Update RDEPENDS: getopt is util-linux-getopt now
Use distro_features_check to require systemd
Recommend busybox

---
 .../recipes-devtools/dracut/dracut_git.bb          | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)
meta-initramfs/recipes-devtools/dracut/dracut_git.bb +19 -6
index ea55a4d..e425845 100644
@@ -13,8 +13,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git"
 
 S = "${WORKDIR}/git"
 
-do_configure() {
-    ./configure --prefix=${prefix} \
+inherit distro_features_check
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+EXTRA_OECONF = "--prefix=${prefix} \
                 --libdir=${libdir} \
                 --datadir=${datadir} \
                 --sysconfdir=${sysconfdir} \
@@ -23,20 +25,31 @@ do_configure() {
                 --bindir=${bindir} \
                 --includedir=${includedir} \
                 --localstatedir=${localstatedir} \
+                --systemdsystemunitdir=${systemd_unitdir}/system"
+
+do_configure() {
+    ./configure ${EXTRA_OECONF}
 }
 
 do_install() {
     oe_runmake install DESTDIR=${D}
 }
 
-FILES_${PN} += "${datadir}/bash-completion \ 
-                ${libdir}/kernel \
+PACKAGES =+ "${PN}-bash-completion"
+
+FILES_${PN}-bash-completion = "${datadir}/bash-completion"
+
+FILES_${PN} += " ${libdir}/kernel \
+                ${systemd_unitdir} \
                "
+CONFFILES_${PN} += "${sysconfdir}/dracut.conf"
+
+RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd"
+RDEPENDS_${PN}-bash-completion = "bash-completion"
 
-# 'getopt' is in the util-linux main package
-RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux bash ldd"
 # This could be optimized a bit, but let's avoid non-booting systems :)
 RRECOMMENDS_${PN} = " \
                      kernel-modules \
+                     busybox \
                      coreutils \ 
                     "
Signature · 1 line
2.1.0
#3 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Dan McGregor schreef op 05-02-15 om 17:29:

Quoted 4 lines

From: Dan McGregor <[email protected]>

Split out bash-completion data Update RDEPENDS: getopt is util-linux-getopt now

So the blanket 'util-linux' RDEPENDS can go away, right?

Quoted 34 lines

Use distro_features_check to require systemd Recommend busybox

.../recipes-devtools/dracut/dracut_git.bb | 25
++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)

(quoted diff) +0 -0

b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index ea55a4d..e425845 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -13,8 +13,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git"

S = "${WORKDIR}/git"

-do_configure() { - ./configure --prefix=${prefix} \ +inherit
distro_features_check +REQUIRED_DISTRO_FEATURES = "systemd" + +EXTRA_OECONF = "--prefix=${prefix} \ --libdir=${libdir} \
--datadir=${datadir} \ --sysconfdir=${sysconfdir} \ @@ -23,20 +25,31 @@ do_configure() { --bindir=${bindir} \ --includedir=${includedir} \
--localstatedir=${localstatedir} \ + --systemdsystemunitdir=${systemd_unitdir}/system" + +do_configure() { + ./configure ${EXTRA_OECONF} }

do_install() { oe_runmake install DESTDIR=${D} }

-FILES_${PN} += "${datadir}/bash-completion \ - ${libdir}/kernel \ +PACKAGES =+ "${PN}-bash-completion" +

(quoted diff) +2 -0
+FILES_${PN}-bash-completion = "${datadir}/bash-completion" + 
+FILES_${PN} += " ${libdir}/kernel \ +                ${systemd_unitdir}

\ " +CONFFILES_${PN} += "${sysconfdir}/dracut.conf" + +RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd" +RDEPENDS_${PN}-bash-completion = "bash-completion"

Quoted 5 lines

-# 'getopt' is in the util-linux main package -RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux bash ldd" # This could be optimized a bit, but let's avoid non-booting systems :) RRECOMMENDS_${PN}
= " \ kernel-modules \ + busybox \ coreutils \ "

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

iD8DBQFU07n/MkyGM64RGpERAuZ6AKCK1aT62H7XvOeZU2+9RCZnMeMSqACfc/Ej 8ubI00/FGsDFssxdkXURRY0=
=SpL4
-----END PGP SIGNATURE-----

#4 lore raw
Quoted 10 lines · Koen Kooi

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Dan McGregor schreef op 05-02-15 om 17:29:

Quoted 4 lines

From: Dan McGregor <[email protected]>

Split out bash-completion data Update RDEPENDS: getopt is util-linux-getopt now

So the blanket 'util-linux' RDEPENDS can go away, right?

Yep. I just confirmed that it can. A new version of this is on its way.

Quoted 54 lines
Quoted 35 lines

Use distro_features_check to require systemd Recommend busybox

.../recipes-devtools/dracut/dracut_git.bb | 25
++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)

(quoted diff) +0 -0

b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index ea55a4d..e425845 100644 --- a/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -13,8 +13,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git"

S = "${WORKDIR}/git"

-do_configure() { - ./configure --prefix=${prefix} \ +inherit
distro_features_check +REQUIRED_DISTRO_FEATURES = "systemd" + +EXTRA_OECONF = "--prefix=${prefix} \ --libdir=${libdir} \
--datadir=${datadir} \ --sysconfdir=${sysconfdir} \ @@ -23,20 +25,31 @@ do_configure() { --bindir=${bindir} \ --includedir=${includedir} \
--localstatedir=${localstatedir} \ + --systemdsystemunitdir=${systemd_unitdir}/system" + +do_configure() { + ./configure ${EXTRA_OECONF} }

do_install() { oe_runmake install DESTDIR=${D} }

-FILES_${PN} += "${datadir}/bash-completion \ - ${libdir}/kernel \ +PACKAGES =+ "${PN}-bash-completion" +

(quoted diff) +2 -0
+FILES_${PN}-bash-completion = "${datadir}/bash-completion" +
+FILES_${PN} += " ${libdir}/kernel \ +                ${systemd_unitdir}

\ " +CONFFILES_${PN} += "${sysconfdir}/dracut.conf" + +RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd" +RDEPENDS_${PN}-bash-completion = "bash-completion"

Quoted 5 lines

-# 'getopt' is in the util-linux main package -RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux bash ldd" # This could be optimized a bit, but let's avoid non-booting systems :) RRECOMMENDS_${PN}
= " \ kernel-modules \ + busybox \ coreutils \ "

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

iD8DBQFU07n/MkyGM64RGpERAuZ6AKCK1aT62H7XvOeZU2+9RCZnMeMSqACfc/Ej 8ubI00/FGsDFssxdkXURRY0=
=SpL4
-----END PGP SIGNATURE-----
--
_______________________________________________
Openembedded-devel mailing list [email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#5 lore raw

PATCH v3 5/5 dracut: recipe cleanup

In reply to Koen Kooi

From: Dan McGregor <[email protected]>

Split out bash-completion data
Update RDEPENDS: getopt is util-linux-getopt now
Use distro_features_check to require systemd
Recommend busybox

---
 .../recipes-devtools/dracut/dracut_git.bb          | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)
meta-initramfs/recipes-devtools/dracut/dracut_git.bb +19 -6
index ea55a4d..e425845 100644
@@ -13,8 +13,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git"
 
 S = "${WORKDIR}/git"
 
-do_configure() {
-    ./configure --prefix=${prefix} \
+inherit distro_features_check
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+EXTRA_OECONF = "--prefix=${prefix} \
                 --libdir=${libdir} \
                 --datadir=${datadir} \
                 --sysconfdir=${sysconfdir} \
@@ -23,20 +25,31 @@ do_configure() {
                 --bindir=${bindir} \
                 --includedir=${includedir} \
                 --localstatedir=${localstatedir} \
+                --systemdsystemunitdir=${systemd_unitdir}/system"
+
+do_configure() {
+    ./configure ${EXTRA_OECONF}
 }
 
 do_install() {
     oe_runmake install DESTDIR=${D}
 }
 
-FILES_${PN} += "${datadir}/bash-completion \ 
-                ${libdir}/kernel \
+PACKAGES =+ "${PN}-bash-completion"
+
+FILES_${PN}-bash-completion = "${datadir}/bash-completion"
+
+FILES_${PN} += " ${libdir}/kernel \
+                ${systemd_unitdir} \
                "
+CONFFILES_${PN} += "${sysconfdir}/dracut.conf"
+
+RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux-getopt bash ldd"
+RDEPENDS_${PN}-bash-completion = "bash-completion"
 
-# 'getopt' is in the util-linux main package
-RDEPENDS_${PN} = "systemd findutils cpio util-linux-blkid util-linux bash ldd"
 # This could be optimized a bit, but let's avoid non-booting systems :)
 RRECOMMENDS_${PN} = " \
                      kernel-modules \
+                     busybox \
                      coreutils \ 
                     "
Signature · 1 line
2.1.0