1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

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>
This commit is contained in:
Khem Raj
2012-09-24 02:38:32 +00:00
committed by Richard Purdie
parent 6a8677696e
commit a2908e20c4
+6 -2
View File
@@ -25,6 +25,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
file://MCONFIG \
file://defines.h \
file://make_include \
file://swapargs.h \
"
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
util-linux-mount util-linux-readprofile util-linux-libblkid \
util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
util-linux-mkfs util-linux-mcookie"
util-linux-mkfs util-linux-mcookie util-linux-systemd"
EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
--disable-makeinstall-chown --enable-elvtune --enable-init \
@@ -44,7 +45,7 @@ EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
usrsbin_execdir='${sbindir}' \
"
EXTRA_OECONF_class-native += "--disable-login --disable-su"
EXTRA_OECONF_append_class-native = " --disable-login --disable-su"
FILES_${PN}-doc += "${datadir}/getopt/getopt-*.*"
@@ -74,6 +75,8 @@ FILES_util-linux-blkid = "${base_sbindir}/blkid*"
RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
FILES_${PN}-systemd = "${systemd_unitdir}/system/"
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
@@ -84,6 +87,7 @@ do_compile () {
set -e
install ${WORKDIR}/MCONFIG ${S}/MCONFIG
install ${WORKDIR}/make_include ${S}/make_include
install ${WORKDIR}/swapargs.h ${S}/mount-deprecated/swapargs.h
install ${WORKDIR}/defines.h ${S}/defines.h
oe_runmake ARCH=${TARGET_ARCH} CPU= CPUOPT= 'OPT=${CFLAGS}'
}