* [PATCH 1/3] util-linux: break out util-linux-getopt
@ 2014-11-05 21:26 Ben Shelton
2014-11-05 21:26 ` [PATCH 2/3] default-providers.inc: define VIRTUAL-RUNTIME_getopt Ben Shelton
2014-11-05 21:26 ` [PATCH 3/3] lsb: update RDEPENDS for broken-out util-linux-getopt Ben Shelton
0 siblings, 2 replies; 3+ messages in thread
From: Ben Shelton @ 2014-11-05 21:26 UTC (permalink / raw
To: openembedded-core
From: Richard Tollerton <rich.tollerton@ni.com>
The getopt binary itself is only a few kb, while the util-linux package
is much larger. The lsb package is very small and depends only on
getopt. Break it out into util-linux-getopt in order to reduce the disk
requirements of lsb on systems that don't otherwise bring in util-linux.
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Acked-by: Ken Sharp <ken.sharp@ni.com>
Acked-by: Ben Shelton <ben.shelton@ni.com
Acked-by: Brad Mouring <brad.mouring@ni.com>
---
meta/recipes-core/util-linux/util-linux.inc | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index ffb84c4..a37efe9 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -37,7 +37,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
util-linux-mkfs util-linux-mcookie util-linux-reset \
util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
util-linux-partx ${PN}-bash-completion util-linux-hwclock \
- util-linux-findfs"
+ util-linux-findfs util-linux-getopt"
SHARED_EXTRA_OECONF = "--disable-use-tty-group \
--disable-makeinstall-chown \
@@ -81,6 +81,7 @@ FILES_util-linux-reset = "${base_bindir}/reset"
FILES_util-linux-partx = "${sbindir}/partx"
FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}"
FILES_util-linux-findfs = "${sbindir}/findfs"
+FILES_util-linux-getopt = "${bindir}/getopt.${BPN}"
FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
FILES_util-linux-libmount = "${base_libdir}/libmount.so.*"
@@ -169,7 +170,7 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root"
ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
-ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject getopt sulogin"
+ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject sulogin"
ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -179,9 +180,7 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
-ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt"
ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
-ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt"
ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1"
@@ -233,6 +232,8 @@ ALTERNATIVE_util-linux-reset = "reset"
ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset"
ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
+ALTERNATIVE_util-linux-getopt = "getopt"
+
BBCLASSEXTEND = "native nativesdk"
python do_package_prepend () {
--
2.1.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/3] default-providers.inc: define VIRTUAL-RUNTIME_getopt
2014-11-05 21:26 [PATCH 1/3] util-linux: break out util-linux-getopt Ben Shelton
@ 2014-11-05 21:26 ` Ben Shelton
2014-11-05 21:26 ` [PATCH 3/3] lsb: update RDEPENDS for broken-out util-linux-getopt Ben Shelton
1 sibling, 0 replies; 3+ messages in thread
From: Ben Shelton @ 2014-11-05 21:26 UTC (permalink / raw
To: openembedded-core
From: Richard Tollerton <rich.tollerton@ni.com>
getopt can be provided by either util-linux or busybox. Allow the
distro to control which implementation is used, and default it to
util-linux.
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Acked-by: Ken Sharp <ken.sharp@ni.com>
Acked-by: Ben Shelton <ben.shelton@ni.com
Acked-by: Brad Mouring <brad.mouring@ni.com>
---
meta/conf/distro/include/default-providers.inc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index a1167fd..e15794f 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -21,6 +21,7 @@ PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel"
VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg"
VIRTUAL-RUNTIME_apm ?= "apm"
VIRTUAL-RUNTIME_alsa-state ?= "alsa-state"
+VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt"
#
# Default recipe providers
@@ -45,3 +46,4 @@ PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','sy
PREFERRED_PROVIDER_bluez4 ?= "bluez4"
# Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
PREFERRED_PROVIDER_ltp ?= "ltp"
+PREFERRED_PROVIDER_getopt ?= "util-linux-getopt"
--
2.1.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 3/3] lsb: update RDEPENDS for broken-out util-linux-getopt
2014-11-05 21:26 [PATCH 1/3] util-linux: break out util-linux-getopt Ben Shelton
2014-11-05 21:26 ` [PATCH 2/3] default-providers.inc: define VIRTUAL-RUNTIME_getopt Ben Shelton
@ 2014-11-05 21:26 ` Ben Shelton
1 sibling, 0 replies; 3+ messages in thread
From: Ben Shelton @ 2014-11-05 21:26 UTC (permalink / raw
To: openembedded-core
From: Richard Tollerton <rich.tollerton@ni.com>
lsb currently depends on util-linux solely for getopt, but that has now
been broken out into util-linux-getopt. Update RDEPENDS accordingly.
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Acked-by: Ken Sharp <ken.sharp@ni.com>
Acked-by: Ben Shelton <ben.shelton@ni.com
Acked-by: Brad Mouring <brad.mouring@ni.com>
---
meta/recipes-extended/lsb/lsb_4.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb
index d265731..d583399 100644
--- a/meta/recipes-extended/lsb/lsb_4.1.bb
+++ b/meta/recipes-extended/lsb/lsb_4.1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2+"
PR = "r2"
# lsb_release needs getopt
-RDEPENDS_${PN} += "util-linux"
+RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_getopt}"
LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
--
2.1.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-11-05 21:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-05 21:26 [PATCH 1/3] util-linux: break out util-linux-getopt Ben Shelton
2014-11-05 21:26 ` [PATCH 2/3] default-providers.inc: define VIRTUAL-RUNTIME_getopt Ben Shelton
2014-11-05 21:26 ` [PATCH 3/3] lsb: update RDEPENDS for broken-out util-linux-getopt Ben Shelton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.