diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2017-11-23 10:38:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-02 11:25:33 +0000 |
commit | 7b065af680f1b26cbebebb2693a9df7695b6d903 (patch) | |
tree | 060fca0862b7cfd6b1e34202ee2d75b1ff218a55 | |
parent | 6c04d113647b872e8d0bb8d40ff475eebcbdd94d (diff) | |
download | poky-7b065af680f1b26cbebebb2693a9df7695b6d903.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: 21d5a52d86a4090f7ddb1a9eb41bb143261f890e)
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/mtd/mtd-utils_git.bb | 7 |
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+" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ | 5 | LIC_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 | ||
8 | inherit autotools pkgconfig | 8 | inherit autotools pkgconfig update-alternatives |
9 | 9 | ||
10 | DEPENDS = "zlib lzo e2fsprogs util-linux" | 10 | DEPENDS = "zlib lzo e2fsprogs util-linux" |
11 | 11 | ||
@@ -30,6 +30,11 @@ PACKAGECONFIG[xattr] = ",,acl," | |||
30 | 30 | ||
31 | EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'" | 31 | EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'" |
32 | 32 | ||
33 | ALTERNATIVE_${PN} = "flash_eraseall" | ||
34 | ALTERNATIVE_LINK_NAME[flash_eraseall] = "${sbindir}/flash_eraseall" | ||
35 | # Use higher priority than busybox's flash_eraseall (created when built with CONFIG_FLASH_ERASEALL) | ||
36 | ALTERNATIVE_PRIORITY[flash_eraseall] = "100" | ||
37 | |||
33 | do_install () { | 38 | do_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 | } |