summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2014-11-05 21:26:15 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-20 14:08:11 (GMT)
commit92afbaee1e7dd4db2fb4e10f2e02827f1466e91e (patch)
treeea87552b8501f15606f9e23a7e71d992688c5c1f /meta
parent318730be2eafe9da368f5121316888387202efb8 (diff)
downloadpoky-92afbaee1e7dd4db2fb4e10f2e02827f1466e91e.tar.gz
util-linux: break out util-linux-getopt
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. (From OE-Core rev: 3626e8df78ffecd29735c1e79eb3ccccec54a663) 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> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc9
1 files 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
37 util-linux-mkfs util-linux-mcookie util-linux-reset \ 37 util-linux-mkfs util-linux-mcookie util-linux-reset \
38 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ 38 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
39 util-linux-partx ${PN}-bash-completion util-linux-hwclock \ 39 util-linux-partx ${PN}-bash-completion util-linux-hwclock \
40 util-linux-findfs" 40 util-linux-findfs util-linux-getopt"
41 41
42SHARED_EXTRA_OECONF = "--disable-use-tty-group \ 42SHARED_EXTRA_OECONF = "--disable-use-tty-group \
43 --disable-makeinstall-chown \ 43 --disable-makeinstall-chown \
@@ -81,6 +81,7 @@ FILES_util-linux-reset = "${base_bindir}/reset"
81FILES_util-linux-partx = "${sbindir}/partx" 81FILES_util-linux-partx = "${sbindir}/partx"
82FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" 82FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}"
83FILES_util-linux-findfs = "${sbindir}/findfs" 83FILES_util-linux-findfs = "${sbindir}/findfs"
84FILES_util-linux-getopt = "${bindir}/getopt.${BPN}"
84 85
85FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" 86FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*"
86FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" 87FILES_util-linux-libmount = "${base_libdir}/libmount.so.*"
@@ -169,7 +170,7 @@ ALTERNATIVE_PRIORITY = "100"
169 170
170ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" 171ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root"
171ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" 172ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall"
172ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject getopt sulogin" 173ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject sulogin"
173 174
174ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" 175ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg"
175ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" 176ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
@@ -179,9 +180,7 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev"
179ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" 180ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root"
180ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" 181ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix"
181ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" 182ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject"
182ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt"
183ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" 183ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin"
184ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt"
185 184
186ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1" 185ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1"
187 186
@@ -233,6 +232,8 @@ ALTERNATIVE_util-linux-reset = "reset"
233ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset" 232ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset"
234ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset" 233ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset"
235 234
235ALTERNATIVE_util-linux-getopt = "getopt"
236
236BBCLASSEXTEND = "native nativesdk" 237BBCLASSEXTEND = "native nativesdk"
237 238
238python do_package_prepend () { 239python do_package_prepend () {