summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-09-24 02:38:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:18 +0000
commita2908e20c48cb81a2abd817e0cf2242a362f28a9 (patch)
tree8d8de4d1c91517eec278c03d0809e9be46646fb9 /meta/recipes-core
parent6a8677696e229cf28b4fe083b7028d36d75f55b6 (diff)
downloadpoky-a2908e20c48cb81a2abd817e0cf2242a362f28a9.tar.gz
util-linux: Package systemd files correctly
2.21 has some linking issues with gold on uclibc where mount program does not work. Its some sort of underlinking. 2.22 did not solve that problem completely either (From OE-Core rev: 61e7de12a8e735c36ca3285f6a77d7b7cb863207) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc8
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
30PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ 31PACKAGES =+ "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
37EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ 38EXTRA_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
47EXTRA_OECONF_class-native += "--disable-login --disable-su" 48EXTRA_OECONF_append_class-native = " --disable-login --disable-su"
48 49
49FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*" 50FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
50 51
@@ -74,6 +75,8 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid*"
74RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid" 75RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
75RREPLACES_util-linux-blkid = "e2fsprogs-blkid" 76RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
76 77
78FILES_${PN}-systemd = "${systemd_unitdir}/system/"
79
77RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" 80RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
78RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs " 81RRECOMMENDS_${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}