summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc16
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.19.1.bb2
2 files changed, 14 insertions, 4 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index afce673029..8762ac628e 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,7 +29,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
29 util-linux-swaponoff util-linux-losetup util-linux-umount \ 29 util-linux-swaponoff util-linux-losetup util-linux-umount \
30 util-linux-mount util-linux-readprofile util-linux-libblkid \ 30 util-linux-mount util-linux-readprofile util-linux-libblkid \
31 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ 31 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
32 util-linux-uuidgen util-linux-lscpu" 32 util-linux-uuidgen util-linux-lscpu util-linux-fsck"
33 33
34EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \ 34EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \
35 --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \ 35 --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \
@@ -54,6 +54,8 @@ FILES_util-linux-libuuid = "${libdir}/libuuid.so.*"
54FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid" 54FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid"
55FILES_util-linux-lscpu = "${bindir}/lscpu" 55FILES_util-linux-lscpu = "${bindir}/lscpu"
56 56
57FILES_util-linux-fsck = "${base_sbindir}/fsck*"
58
57RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " 59RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile "
58RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup perl" 60RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup perl"
59 61
@@ -172,7 +174,6 @@ pkg_postinst_${PN} () {
172 update-alternatives --install ${base_sbindir}/pivot_root pivot_root pivot_root.${PN} 100 174 update-alternatives --install ${base_sbindir}/pivot_root pivot_root pivot_root.${PN} 100
173# update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100 175# update-alternatives --install ${base_sbindir}/sln sln sln.${PN} 100
174 update-alternatives --install ${base_sbindir}/mkfs.minix mkfs.minix mkfs.minix.${PN} 100 176 update-alternatives --install ${base_sbindir}/mkfs.minix mkfs.minix mkfs.minix.${PN} 100
175 update-alternatives --install ${base_sbindir}/fsck.minix fsck.minix fsck.minix.${PN} 100
176 update-alternatives --install ${bindir}/hexdump hexdump hexdump.${PN} 100 177 update-alternatives --install ${bindir}/hexdump hexdump hexdump.${PN} 100
177 update-alternatives --install ${bindir}/last last last.${PN} 100 178 update-alternatives --install ${bindir}/last last last.${PN} 100
178 update-alternatives --install ${bindir}/logger logger logger.${PN} 100 179 update-alternatives --install ${bindir}/logger logger logger.${PN} 100
@@ -201,7 +202,6 @@ pkg_prerm_${PN} () {
201 update-alternatives --remove shutdown shutdown.${PN} 202 update-alternatives --remove shutdown shutdown.${PN}
202# update-alternatives --remove sln sln.${PN} 203# update-alternatives --remove sln sln.${PN}
203 update-alternatives --remove mkfs.minix mkfs.minix.${PN} 204 update-alternatives --remove mkfs.minix mkfs.minix.${PN}
204 update-alternatives --remove fsck.minix fsck.minix.${PN}
205 update-alternatives --remove hexdump hexdump.${PN} 205 update-alternatives --remove hexdump hexdump.${PN}
206 update-alternatives --remove last last.${PN} 206 update-alternatives --remove last last.${PN}
207 update-alternatives --remove logger logger.${PN} 207 update-alternatives --remove logger logger.${PN}
@@ -252,4 +252,14 @@ pkg_prerm_util-linux-swaponoff () {
252 update-alternatives --remove swapon swapon.${PN} 252 update-alternatives --remove swapon swapon.${PN}
253} 253}
254 254
255pkg_postinst_util-linux-fsck () {
256 update-alternatives --install ${base_sbindir}/fsck.minix fsck.minix fsck.minix.${PN} 100
257 update-alternatives --install ${base_sbindir}/fsck fsck fsck.${PN} 100
258}
259
260pkg_prerm_util-linux-fsck () {
261 update-alternatives --remove fsck.minix fsck.minix.${PN}
262 update-alternatives --remove fsck fsck.${PN}
263}
264
255BBCLASSEXTEND = "native" 265BBCLASSEXTEND = "native"
diff --git a/meta/recipes-core/util-linux/util-linux_2.19.1.bb b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
index 5b327cbaf4..39ff68c8d2 100644
--- a/meta/recipes-core/util-linux/util-linux_2.19.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.19.1.bb
@@ -1,5 +1,5 @@
1MAJOR_VERSION = "2.19" 1MAJOR_VERSION = "2.19"
2PR = "r5" 2PR = "r7"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+