diff options
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 30d80e5fc5..cd79895af6 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc | |||
@@ -25,6 +25,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin | |||
25 | file://MCONFIG \ | 25 | file://MCONFIG \ |
26 | file://defines.h \ | 26 | file://defines.h \ |
27 | file://make_include \ | 27 | file://make_include \ |
28 | file://swapargs.h \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ | 31 | PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ |
@@ -32,7 +33,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd | |||
32 | util-linux-mount util-linux-readprofile util-linux-libblkid \ | 33 | util-linux-mount util-linux-readprofile util-linux-libblkid \ |
33 | util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ | 34 | util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ |
34 | 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 \ |
35 | util-linux-mkfs util-linux-mcookie" | 36 | util-linux-mkfs util-linux-mcookie util-linux-systemd" |
36 | 37 | ||
37 | EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ | 38 | EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ |
38 | --disable-makeinstall-chown --enable-elvtune --enable-init \ | 39 | --disable-makeinstall-chown --enable-elvtune --enable-init \ |
@@ -44,7 +45,7 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ | |||
44 | usrsbin_execdir='${sbindir}' \ | 45 | usrsbin_execdir='${sbindir}' \ |
45 | " | 46 | " |
46 | 47 | ||
47 | EXTRA_OECONF_class-native += "--disable-login --disable-su" | 48 | EXTRA_OECONF_append_class-native = " --disable-login --disable-su" |
48 | 49 | ||
49 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" | 50 | FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" |
50 | 51 | ||
@@ -74,6 +75,8 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid*" | |||
74 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" | 75 | RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" |
75 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" | 76 | RREPLACES_util-linux-blkid = "e2fsprogs-blkid" |
76 | 77 | ||
78 | FILES_${PN}-systemd = "${systemd_unitdir}/system/" | ||
79 | |||
77 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" | 80 | RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" |
78 | RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs " | 81 | RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs " |
79 | 82 | ||
@@ -84,6 +87,7 @@ do_compile () { | |||
84 | set -e | 87 | set -e |
85 | install ${WORKDIR}/MCONFIG ${S}/MCONFIG | 88 | install ${WORKDIR}/MCONFIG ${S}/MCONFIG |
86 | install ${WORKDIR}/make_include ${S}/make_include | 89 | install ${WORKDIR}/make_include ${S}/make_include |
90 | install ${WORKDIR}/swapargs.h ${S}/mount-deprecated/swapargs.h | ||
87 | install ${WORKDIR}/defines.h ${S}/defines.h | 91 | install ${WORKDIR}/defines.h ${S}/defines.h |
88 | oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' | 92 | oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}' |
89 | } | 93 | } |