summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/mtd/mtd-utils_git.bb
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2017-11-23 10:38:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-06 10:13:55 +0000
commit14db4ec9b8a06742b4edd71b025a7d526a5e066d (patch)
treefeec87d8ba0b24a8d67cb2d6dc5acd352cb88a7a /meta/recipes-devtools/mtd/mtd-utils_git.bb
parent31083eff3aa6ab2395c393663462bedc7cb36846 (diff)
downloadpoky-14db4ec9b8a06742b4edd71b025a7d526a5e066d.tar.gz
mtd-utils: fix flash_eraseall installation conflict
override correctly busybox's applet when CONFIG_FLASH_ERASEALL=y is set Error: update-alternatives: not linking /builds/image/1.0-r0/rootfs/usr/ sbin/flash_eraseall to /bin/busybox.nosuid since /builds/image/1.0-r0/ rootfs/usr/sbin/flash_eraseall exists and is not a link (From OE-Core rev: 009302a350877d0e9b74df4bf0d97fe6244591d5) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 21d5a52d86a4090f7ddb1a9eb41bb143261f890e) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/mtd/mtd-utils_git.bb')
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils_git.bb7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 4fbc54f8f4..48ba2ee07a 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ 5LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
6 file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" 6 file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
7 7
8inherit autotools pkgconfig 8inherit autotools pkgconfig update-alternatives
9 9
10DEPENDS = "zlib lzo e2fsprogs util-linux" 10DEPENDS = "zlib lzo e2fsprogs util-linux"
11 11
@@ -30,6 +30,11 @@ PACKAGECONFIG[xattr] = ",,acl,"
30 30
31EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'" 31EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'"
32 32
33ALTERNATIVE_${PN} = "flash_eraseall"
34ALTERNATIVE_LINK_NAME[flash_eraseall] = "${sbindir}/flash_eraseall"
35# Use higher priority than busybox's flash_eraseall (created when built with CONFIG_FLASH_ERASEALL)
36ALTERNATIVE_PRIORITY[flash_eraseall] = "100"
37
33do_install () { 38do_install () {
34 oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir} 39 oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir}
35} 40}