diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 9 |
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 ffb84c4b64..a37efe904e 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 | ||
42 | SHARED_EXTRA_OECONF = "--disable-use-tty-group \ | 42 | SHARED_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" | |||
81 | FILES_util-linux-partx = "${sbindir}/partx" | 81 | FILES_util-linux-partx = "${sbindir}/partx" |
82 | FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" | 82 | FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" |
83 | FILES_util-linux-findfs = "${sbindir}/findfs" | 83 | FILES_util-linux-findfs = "${sbindir}/findfs" |
84 | FILES_util-linux-getopt = "${bindir}/getopt.${BPN}" | ||
84 | 85 | ||
85 | FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" | 86 | FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" |
86 | FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" | 87 | FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" |
@@ -169,7 +170,7 @@ ALTERNATIVE_PRIORITY = "100" | |||
169 | 170 | ||
170 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" | 171 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" |
171 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" | 172 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" |
172 | ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject getopt sulogin" | 173 | ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject sulogin" |
173 | 174 | ||
174 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" | 175 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" |
175 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" | 176 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" |
@@ -179,9 +180,7 @@ ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" | |||
179 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" | 180 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" |
180 | ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" | 181 | ALTERNATIVE_LINK_NAME[mkfs.minix] = "${base_sbindir}/mkfs.minix" |
181 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" | 182 | ALTERNATIVE_LINK_NAME[eject] = "${bindir}/eject" |
182 | ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" | ||
183 | ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" | 183 | ALTERNATIVE_LINK_NAME[sulogin] = "${base_sbindir}/sulogin" |
184 | ALTERNATIVE_TARGET[getopt] = "${bindir}/getopt" | ||
185 | 184 | ||
186 | ALTERNATIVE_${PN}-doc = "mountpoint.1 last.1 mesg.1 wall.1 sulogin.8 utmpdump.1 reset.1" | 185 | ALTERNATIVE_${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" | |||
233 | ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset" | 232 | ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset" |
234 | ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset" | 233 | ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset" |
235 | 234 | ||
235 | ALTERNATIVE_util-linux-getopt = "getopt" | ||
236 | |||
236 | BBCLASSEXTEND = "native nativesdk" | 237 | BBCLASSEXTEND = "native nativesdk" |
237 | 238 | ||
238 | python do_package_prepend () { | 239 | python do_package_prepend () { |