diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 83bb4a66b9..d640a5f5a2 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -36,7 +36,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd | |||
36 | util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ | 36 | util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ |
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" | 39 | util-linux-partx ${PN}-bash-completion util-linux-hwclock" |
40 | 40 | ||
41 | SHARED_EXTRA_OECONF = "--disable-use-tty-group \ | 41 | SHARED_EXTRA_OECONF = "--disable-use-tty-group \ |
42 | --disable-makeinstall-chown \ | 42 | --disable-makeinstall-chown \ |
@@ -78,6 +78,7 @@ FILES_util-linux-uuidgen = "${bindir}/uuidgen" | |||
78 | FILES_util-linux-uuidd = "${sbindir}/uuidd" | 78 | FILES_util-linux-uuidd = "${sbindir}/uuidd" |
79 | FILES_util-linux-reset = "${base_bindir}/reset" | 79 | FILES_util-linux-reset = "${base_bindir}/reset" |
80 | FILES_util-linux-partx = "${sbindir}/partx" | 80 | FILES_util-linux-partx = "${sbindir}/partx" |
81 | FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" | ||
81 | 82 | ||
82 | FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" | 83 | FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" |
83 | FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" | 84 | FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" |
@@ -166,7 +167,7 @@ ALTERNATIVE_PRIORITY = "100" | |||
166 | 167 | ||
167 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" | 168 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" |
168 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" | 169 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" |
169 | ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject getopt sulogin" | 170 | ALTERNATIVE_${PN} += "setsid chrt flock utmpdump eject getopt sulogin" |
170 | 171 | ||
171 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" | 172 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" |
172 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" | 173 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" |
@@ -190,6 +191,7 @@ ALTERNATIVE_LINK_NAME[sulogin.8] = "${mandir}/man8/sulogin.8" | |||
190 | ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" | 191 | ALTERNATIVE_LINK_NAME[utmpdump.1] = "${mandir}/man1/utmpdump.1" |
191 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" | 192 | ALTERNATIVE_LINK_NAME[wall.1] = "${mandir}/man1/wall.1" |
192 | 193 | ||
194 | ALTERNATIVE_util-linux-hwclock = "hwclock" | ||
193 | # There seems to be problem, atleast on nslu2, with these, untill they are | 195 | # There seems to be problem, atleast on nslu2, with these, untill they are |
194 | # fixed the busybox ones have higher priority | 196 | # fixed the busybox ones have higher priority |
195 | ALTERNATIVE_PRIORITY[hwclock] = "10" | 197 | ALTERNATIVE_PRIORITY[hwclock] = "10" |