summaryrefslogtreecommitdiffstats
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-22 11:35:20 +0000
commitac8db9b30d74e17e8814ea1d6e233abfe1c439b8 (patch)
tree2e639ac3c3106af55633acadefda27b1e32639c3 /meta/recipes-core
parentfada531cb2ac1ff7b6aba3749a72a3be57c0c9a9 (diff)
downloadpoky-ac8db9b30d74e17e8814ea1d6e233abfe1c439b8.tar.gz
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. (From OE-Core rev: 333e959448c2bc0d2c472e0b7d1dab606ab723e6) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@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.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
29PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \ 29PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfdisk \
30 util-linux-swaponoff util-linux-losetup util-linux-umount \ 30 util-linux-swaponoff util-linux-losetup util-linux-umount \
31 util-linux-mount util-linux-readprofile util-linux-uuidd \ 31 util-linux-mount util-linux-readprofile util-linux-uuidd \
32 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ 32 util-linux-uuidgen util-linux-lscpu util-linux-fsck.cramfs util-linux-fsck \
33 util-linux-mkfs util-linux-mcookie util-linux-reset util-linux-lsblk \ 33 util-linux-blkid util-linux-mkfs util-linux-mcookie util-linux-reset \
34 util-linux-mkfs.cramfs util-linux-fsck.cramfs util-linux-fstrim \ 34 util-linux-lsblk util-linux-mkfs.cramfs util-linux-fstrim \
35 util-linux-partx util-linux-hwclock util-linux-mountpoint \ 35 util-linux-partx util-linux-hwclock util-linux-mountpoint \
36 util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit" 36 util-linux-findfs util-linux-getopt util-linux-sulogin util-linux-prlimit"
37PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}" 37PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount', '', d)}"