diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 15 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.22.1.bb | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index cd79895af6..667232c342 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -33,7 +33,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd | |||
33 | util-linux-mount util-linux-readprofile util-linux-libblkid \ | 33 | util-linux-mount util-linux-readprofile util-linux-libblkid \ |
34 | util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ | 34 | util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ |
35 | util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ | 35 | util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ |
36 | util-linux-mkfs util-linux-mcookie util-linux-systemd" | 36 | util-linux-mkfs util-linux-mcookie util-linux-systemd util-linux-reset" |
37 | 37 | ||
38 | EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ | 38 | EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ |
39 | --disable-makeinstall-chown --enable-elvtune --enable-init \ | 39 | --disable-makeinstall-chown --enable-elvtune --enable-init \ |
@@ -60,6 +60,7 @@ FILES_util-linux-mcookie = "${bindir}/mcookie" | |||
60 | FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" | 60 | FILES_util-linux-umount = "${base_bindir}/umount.${BPN}" |
61 | FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}" | 61 | FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${BPN}" |
62 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" | 62 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" |
63 | FILES_util-linux-reset = "${base_bindir}/reset" | ||
63 | 64 | ||
64 | FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" | 65 | FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" |
65 | FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" | 66 | FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.la ${includedir}/blkid ${libdir}/pkgconfig/blkid.pc" |
@@ -75,6 +76,9 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid*" | |||
75 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" | 76 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" |
76 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" | 77 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" |
77 | 78 | ||
79 | # reset calls 'tput' | ||
80 | RDEPENDS_util-linux-reset += "ncurses" | ||
81 | |||
78 | FILES_${PN}-systemd = "${systemd_unitdir}/system/" | 82 | FILES_${PN}-systemd = "${systemd_unitdir}/system/" |
79 | 83 | ||
80 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" | 84 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" |
@@ -83,6 +87,7 @@ RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-l | |||
83 | RRECOMMENDS_${PN}_class-native = "" | 87 | RRECOMMENDS_${PN}_class-native = "" |
84 | RDEPENDS_${PN}_class-native = "" | 88 | RDEPENDS_${PN}_class-native = "" |
85 | 89 | ||
90 | |||
86 | do_compile () { | 91 | do_compile () { |
87 | set -e | 92 | set -e |
88 | install ${WORKDIR}/MCONFIG ${S}/MCONFIG | 93 | install ${WORKDIR}/MCONFIG ${S}/MCONFIG |
@@ -138,15 +143,13 @@ inherit update-alternatives | |||
138 | 143 | ||
139 | ALTERNATIVE_PRIORITY = "100" | 144 | ALTERNATIVE_PRIORITY = "100" |
140 | 145 | ||
141 | ALTERNATIVE_${PN} = "dmesg kill more reset mkswap blockdev pivot_root" | 146 | ALTERNATIVE_${PN} = "dmesg kill more mkswap blockdev pivot_root" |
142 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" | 147 | ALTERNATIVE_${PN} += "mkfs.minix hexdump last logger mesg renice wall" |
143 | ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject" | 148 | ALTERNATIVE_${PN} += "setsid chrt flock hwclock utmpdump eject" |
144 | 149 | ||
145 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" | 150 | ALTERNATIVE_LINK_NAME[dmesg] = "${base_bindir}/dmesg" |
146 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" | 151 | ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill" |
147 | ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" | 152 | ALTERNATIVE_LINK_NAME[more] = "${base_bindir}/more" |
148 | ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset" | ||
149 | ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset" | ||
150 | ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" | 153 | ALTERNATIVE_LINK_NAME[mkswap] = "${base_sbindir}/mkswap" |
151 | ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" | 154 | ALTERNATIVE_LINK_NAME[blockdev] = "${base_sbindir}/blockdev" |
152 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" | 155 | ALTERNATIVE_LINK_NAME[pivot_root] = "${base_sbindir}/pivot_root" |
@@ -185,4 +188,8 @@ ALTERNATIVE_LINK_NAME[fsck] = "${base_sbindir}/fsck" | |||
185 | ALTERNATIVE_util-linux-blkid = "blkid" | 188 | ALTERNATIVE_util-linux-blkid = "blkid" |
186 | ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" | 189 | ALTERNATIVE_LINK_NAME[blkid] = "${base_sbindir}/blkid" |
187 | 190 | ||
191 | ALTERNATIVE_util-linux-reset = "reset" | ||
192 | ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset" | ||
193 | ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset" | ||
194 | |||
188 | BBCLASSEXTEND = "native" | 195 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-core/util-linux/util-linux_2.22.1.bb b/meta/recipes-core/util-linux/util-linux_2.22.1.bb index f5d777f686..d734951eda 100644 --- a/meta/recipes-core/util-linux/util-linux_2.22.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.22.1.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | MAJOR_VERSION = "2.22" | 1 | MAJOR_VERSION = "2.22" |
2 | PR = "r2" | 2 | PR = "r3" |
3 | require util-linux.inc | 3 | require util-linux.inc |
4 | 4 | ||
5 | # note that `lscpu' is under GPLv3+ | 5 | # note that `lscpu' is under GPLv3+ |