summaryrefslogtreecommitdiff
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-01-19 09:52:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-21 22:43:00 +0000
commit333e959448c2bc0d2c472e0b7d1dab606ab723e6 (patch)
tree4e6dba693998ac79b7719fc9cad8b75bef9d4588 /meta/recipes-core
parent2794b1cc12af051db404d46aea4db4c74e8e1fe3 (diff)
downloadopenembedded-core-333e959448c2bc0d2c472e0b7d1dab606ab723e6.tar.gz
openembedded-core-333e959448c2bc0d2c472e0b7d1dab606ab723e6.tar.bz2
openembedded-core-333e959448c2bc0d2c472e0b7d1dab606ab723e6.zip
util-linux: Fix packaging with "usrmerge"
Make sure fsck.cramfs is packaged before fsck so the latter does not steal the fsck.cramfs binary when building with usrmerge. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 708c041d20..fabdb9ebfb 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -29,9 +29,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \
util-linux-swaponoff util-linux-losetup util-linux-umount \
util-linux-mount util-linux-readprofile util-linux-uuidd \
- util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
- util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-lsblk \
- util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \
+ util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs util-linux-fsck \
+ util-linux-blkid util-linux-mkfs util-linux-mcookie util-linux-reset \
+ util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \
util-linux-partx util-linux-hwclock util-linux-mountpoint \
util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit"
PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}"