diff options
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux.inc')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 5445f4f7cd..6e568a42a1 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -17,7 +17,6 @@ inherit autotools gettext pkgconfig | |||
17 | DEPENDS = "zlib ncurses" | 17 | DEPENDS = "zlib ncurses" |
18 | DEPENDS_virtclass-native = " lzo-native" | 18 | DEPENDS_virtclass-native = " lzo-native" |
19 | 19 | ||
20 | |||
21 | SRC_URI = "ftp://ftp.infradead.org/pub/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ | 20 | SRC_URI = "ftp://ftp.infradead.org/pub/util-linux/v${MAJOR_VERSION}/util-linux-${PV}.tar.bz2 \ |
22 | file://MCONFIG \ | 21 | file://MCONFIG \ |
23 | file://swapargs.h \ | 22 | file://swapargs.h \ |
@@ -30,11 +29,14 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd | |||
30 | util-linux-mount util-linux-readprofile util-linux-libblkid \ | 29 | util-linux-mount util-linux-readprofile util-linux-libblkid \ |
31 | util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ | 30 | util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ |
32 | util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ | 31 | util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ |
33 | util-linux-chkdupexe util-linux-mkfs util-linux-mcookie" | 32 | util-linux-chkdupexe util-linux-mkfs util-linux-mcookie" |
34 | 33 | ||
35 | EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown --enable-elvtune --enable-init --enable-kill --enable-last \ | 34 | EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ |
36 | --enable-mesg --enable-partx --enable-raw --enable-rdev --enable-reset \ | 35 | --disable-makeinstall-chown --enable-elvtune --enable-init \ |
37 | --disable-login-utils --enable-write --enable-arch --enable-mount --with-fsprobe=builtin --enable-libuuid --enable-libblkid --enable-fsck" | 36 | --enable-kill --enable-last --enable-mesg --enable-partx \ |
37 | --enable-raw --enable-rdev --enable-reset --disable-login-utils \ | ||
38 | --enable-write --enable-arch --enable-mount --with-fsprobe=builtin \ | ||
39 | --enable-libuuid --enable-libblkid --enable-fsck" | ||
38 | 40 | ||
39 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" | 41 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" |
40 | 42 | ||
@@ -50,10 +52,10 @@ FILES_util-linux-umount = "${base_bindir}/umount.${PN}" | |||
50 | FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${PN}" | 52 | FILES_util-linux-readprofile = "${base_sbindir}/readprofile.${PN}" |
51 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" | 53 | FILES_util-linux-uuidgen = "${bindir}/uuidgen" |
52 | 54 | ||
53 | FILES_util-linux-libblkid = "${libdir}/libblkid.so.*" | 55 | FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" |
54 | FILES_util-linux-libblkid-dev = "${libdir}/libblkid.so ${libdir}/libblkid.a ${libdir}/libblkid.la ${includedir}/blkid" | 56 | FILES_util-linux-libblkid-dev = "${base_libdir}/libblkid.so ${base_libdir}/libblkid.a ${base_libdir}/libblkid.la ${includedir}/blkid" |
55 | FILES_util-linux-libuuid = "${libdir}/libuuid.so.*" | 57 | FILES_util-linux-libuuid = "${base_libdir}/libuuid.so.*" |
56 | FILES_util-linux-libuuid-dev = "${libdir}/libuuid.so ${libdir}/libuuid.a ${libdir}/libuuid.la ${includedir}/uuid" | 58 | FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so ${base_libdir}/libuuid.a ${base_libdir}/libuuid.la ${includedir}/uuid" |
57 | FILES_util-linux-lscpu = "${bindir}/lscpu" | 59 | FILES_util-linux-lscpu = "${bindir}/lscpu" |
58 | 60 | ||
59 | FILES_util-linux-fsck = "${base_sbindir}/fsck*" | 61 | FILES_util-linux-fsck = "${base_sbindir}/fsck*" |