Commit Graph

4743 Commits

Author SHA1 Message Date
Daniel McGregor
5da9408672 krb5: fix uninitialized variable warning
On some targets clang erroniously detects an uninitialized variable.
Backport the fix from upstream.

Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-19 12:02:39 +02:00
Yang Shi
87084feb1e libhugetlbfs: enable build for x86-32
Backported commit e3928d572b12f4e85a2a989482ac2d68c1bc2734
("Force text segment alignment to 0x08000000 for i386 with gold linker")
from libhugetlbfs -next branch to fix the build failure with gold linker.

And, enable x86-32 in COMPATIBLE_HOST.

Signed-off-by: Yang Shi <yang.shi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-19 12:02:39 +02:00
Hongxu Jia
c9c82d313e efivar: fix unknown option while gold linker used
- Use '-fPIC' to replace 'PIC';

- Use 'pie' to replace 'PIE'

- Remove unknown '--add-needed'

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-19 12:02:39 +02:00
Hongxu Jia
beac69f84e efibootmgr: sync with upstream while efivar upgraded to 0.23
Sync with upstream to have the following fix:
...
commit 53aa9cdf7f0746f91f39521d020b024103041384
Author: Peter Jones <pjones@redhat.com>
Date:   Thu Mar 3 09:50:03 2016 -0500

    Explicitly pass a mode to efi_set_variable() in all cases.

    We'll have to do this for efivar-0.24 .

    Signed-off-by: Peter Jones <pjones@redhat.com>
...

It fixed compile failure:
...
efibootmgr.c: In function 'make_boot_var':
efibootmgr.c:305:7: error: too few arguments to function 'efi_set_variable'
  rc = efi_set_variable(boot->guid, boot->name, boot->data,
       ^
...

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-19 12:02:39 +02:00
Hongxu Jia
f0a1e61c47 efivar: fix do_install failed
It fixes efivar.pc not found:
...
| install -d -m 755 efivar/0.23-r0/image/usr/lib/pkgconfig/
| install -m 644 efivar.pc efivar/0.23-r0/image/usr/lib/pkgconfig/
;  install -m 644 efiboot.pc efivar/0.23-r0/image/usr/lib/pkgconfig/
;
| install: cannot stat 'efivar.pc': No such file or directory
| install: cannot stat 'efiboot.pc': No such file or directory
| make[1]: *** [install] Error 1
| make[1]: Leaving directory `efivar/0.23-r0/git/src'
| make: *** [install] Error 2
| ERROR: oe_runmake failed
...

Also sync with latest upstream

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-19 12:02:39 +02:00
Koen Kooi
d68c687673 efibootmgr: update and unblacklist
Also fix style issues.

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-19 12:02:38 +02:00
Koen Kooi
fe4cb8b072 efivar: update to 0.23
Upstream removed the use of the nvme headers completely,
so no more conflicts. Also drop gcc options patch, ubuntu
12.04 is too old to support in meta-oe/master.

Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-19 12:02:38 +02:00
Ioan-Adrian Ratiu
bee16ff1fb gnulib: bump git revision
The revision currently used is quite ancient (beginning of 2014) and we
need bugfixes commited since then. Rather than backport patches it's
cleaner to uprev.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-19 12:02:38 +02:00
Jack Mitchell
44a13e69ba libsoc: update to 0.8.1
- New python bindings supported
- New board config options supported
- PACKAGECONFIG options added for other configure flags

Signed-off-by: Jack Mitchell <jack@embed.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-19 12:02:38 +02:00
Armin Kuster
901b9a2ec8 libxkbui: Fix license WARNING
WARNING: libxkbui-1_1.0.2-r10 do_populate_lic: libxkbui: No generic license file exists for: GPL in any provider

sources have:
Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.

so picked "SGI-1"

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-19 12:02:38 +02:00
Paul Gortmaker
00ec8bc10d autotools-bootstrap: make bootstrap package specific.
The theory behind this bbclass was reasonable, with the primary
goal being to avoid multiple downloads of gnulib, but it neglected
the fact that packages would be shipping a specific version of the
./bootstrap which will support some flags but maybe not all the
latest ones from the latest gnulib/build-aux/bootstrap file.

I attempted to simply update the two pkgs to use the latest copy
of bootstrap from gnulib but this of course triggers the descent
into autoconf hell that we all know and love.  Rather than futzing
with the packages configure.ac and deviating from what the pkg
maintainers intended and tested, we can just let the packages have
independent calls to ./bootstrap with whatever flags are needed.

The goal of this commit is to move the prepend out to the packages
and then delete the class without any real functional change ; i.e.
a purely mechanical change.  Then we can adjust each package to
ensure it will still build with a modern host, in an independent
fashion, while keeping the main advantage of not fetching gnulib
two extra times for netcf and fontforge.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
2016-05-12 11:53:30 -04:00
Jonathan Liu
2f3a4997c7 nodejs: update to 4.4.4
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-10 20:19:29 +02:00
Armin Kuster
3384b4133c upower: fix WARNING
WARNING: upower-0.9.14-r2 do_configure: Missing DEPENDS on intltool-native

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-10 20:19:29 +02:00
Armin Kuster
ef735bb13c acpitests: Fix license issue
WARNING: acpitests-20140828-r0 do_populate_lic: acpitests: No generic license file exists for: Intel in any provider

this was copied from the acpitest web page

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-10 20:18:57 +02:00
Noor Ahsan
1bc1405b0a libnice, farsight2: unblacklist as libnice's nice.pc issue fixed.
* Update do_compile_append where it was updating *.pc from ${S} and
  removing staging dir folder. Now we have seperate build folder
  where packages get build. We have to search pc in ${B} not in ${S}.
  After updating the tmp dir path is removed from nice.pc file.
* Remove PNBLACKLIST for libnice and farsight2 recipes.

Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-10 20:18:56 +02:00
Kinsella, Ray
786ab843f0 wvstreams: fixing segfault with new gcc optimizations
Recent GCC optimizations -ftree-dce and -foptimize-sibling-calls are causing
a segfault in the wvstream stackmaster. Fedora had the same problem and
resolved the issue by removing these optimizations.

See: https://bugzilla.redhat.com/show_bug.cgi?id=812651

Signed-off-by: Ray Kinsella <ray.kinsella@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-10 20:18:56 +02:00
Martin Jansa
102e699864 llvm3.3: Disable auto -dbg packages
* set NOAUTOPACKAGEDEBUG to disable automatic creation of -dbg FILES split
* it doesn't work well with our do_split_packages calls and in the end breaks
  installing llvm3.3-dbg (e.g. when you enable IMAGE_GEN_DEBUGFS)
* it shows a bit ugly error where multiple messages are written over
  each other:
WARNING: [log_check] In line: [ConfiCollected errors:
]
WARNING: [log_check] luneos-dev-image: found an error message in the logfile (keyword 'Collected errors'):
[log_check] ConfiCollected errors:

ERROR:
ConfiCollected errors:

 * satisfy_dependencies_for: Cannot satisfy the following dependencies for llvm3.3-dbg:

 *      libllvm3.3-lto-dbg *    libllvm3.3-llvm-3.3-dbg *

 * opkg_install: Cannot install package llvm3.3-dbg.

guring gstreamer1.0-libav-dbg.

  but the main point is that do_split_packages returns some package
  names of packages which in the end aren't created, because there
  are no files in them after other -dbg packages eat them all due
  to automatic -dbg creation

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-10 20:18:56 +02:00
Ann Thornton
5397ae5d57 packagegroup-tools-bluetooth: Selects the tools appropriate for the version of bluez being used.
Signed-off-by: Ann Thornton <ann.thornton@nxp.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-10 20:18:55 +02:00
Roy Li
4adec181e7 lmbench: avoid gcc optimize-away multiplication
Change expression used in do_integer_mul and do_uint64_mul
benchmarks so GCC doesn't optimize-away the loops,

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-10 20:18:30 +02:00
Derek Straka
35c7a5b63b leptonica: add PACAKGECONFIG for openjpeg
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-10 20:18:30 +02:00
Derek Straka
f3472205e8 leptonica: update to version 1.73
updated to be compatible with giflib 5.1.x

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-10 20:18:30 +02:00
Derek Straka
904fd8d955 giflib: update to version 5.1.4
- Remove EXTRA_OECONF to disable X11 support since direct X11 window rendering has been retired
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-10 20:18:29 +02:00
Martin Jansa
a6c172e271 poppler: add --std=c++11 to fix build with Qt 5.7
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:28 +02:00
Martin Jansa
9087a59b1c pidgin: use pkg-config instead of hardcoded paths or python-config
* also fix following QA warning:
WARNING: pidgin-2.10.12-r0 do_package: QA Issue: pidgin: Files/directories were installed but not shipped in any package:
  /usr/share/appdata
  /usr/share/appdata/pidgin.appdata.xml
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
pidgin: 2 installed and not shipped files. [installed-vs-shipped]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:27 +02:00
Martin Jansa
fc1ee271f4 pidgin: add PACKAGECONFIGs
* disable gstreamer and vv, because gstreamer 0.10 is in meta-multimedia now
* disable farsight2/farstream, because farsight2 is blacklisted
* don't enable X11 support without x11 in DISTRO_FEATURES
* allow to disable all UI, useful for DISTROs who want just the purple libraries
  like LuneOS

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:27 +02:00
Herrie
2ff8e7e86a pidgin: Update to 2.10.12
Which is compatible with GnuTLS that's included in Krogoth.

Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
2016-05-06 12:40:27 +02:00
Paul Barker
09806901be toybox: Upgrade to 0.7.0
Add additional patches to fix issues seen during testing on qemux86.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:27 +02:00
Paul Barker
3391c2e65c toybox: Remove out-of-date patch
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:27 +02:00
Qi.Chen@windriver.com
be3d4c05e3 rrdtool: fix do_configure failure on some hosts
On some hosts, when building rrdtool, we would meet do_configure error like
below.

| *** Module name IN: /usr/lib64/perl/5.22.0/POSIX.pm
| *** p1: /usr/lib64/  p3: perl/5.22.0/  p5: POSIX.pm
| *** Module name OUT: /path/to/builddir/tmp/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.22.1/POSIX.pm
| POSIX object version 1.53_01 does not match $POSIX::VERSION 1.53 at /usr/lib64/perl/5.22.0/XSLoader.pm line 108.

Set PERLHOSTLIB to "" to fix the above error.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:26 +02:00
Otavio Salvador
3132af1d1d opencv: Fix metapkg dependencies for opencv-java and opencv-locales
The opencv-java is not always generated so we ought to include it,
only if it is available. The opencv-locales is not available and ought
to be skipped.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:26 +02:00
eu@felipetonello.com
821414a07d protobuf: split package to main and compiler packages
Protobuf has two main features, a compiler and a library. Run-time
applications only need the libraries to run.

Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:26 +02:00
eu@felipetonello.com
3bae88a2ee protobuf: add protobuf-c recipe
replaces/obsoletes: commit 0d31f8448412 [Added protobuf-c criu dependency]
in meta-virtualization

This version of the recipe also adds a separated package for the compiler.

Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:25 +02:00
Ann Thornton
a78aebb606 packagegroup-tools-bluetooth.bb: Selects the tools appropriate for the version of bluez being used.
Signed-off-by: Ann Thornton <ann.thornton@nxp.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:25 +02:00
Neena Busireddy
c7265a61d7 glmark2: wl_surface should be destoryed after destroying wl_window
If wl_surface is destroyed while work thread is still running,
segmentation fault occurs.

Signed-off-by: Neena Busireddy <neenareddy.busireddy@nxp.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:25 +02:00
Paul Barker
c31ccabca5 vim: Upgrade to v7.4.1689
v7.4.1689 is currently used in Debian Testing and Arch Linux.

The tags file used as an index to vim's documentation is not correctly created
when cross compiling in v7.4.1689. Patch 7.4.1733 is backported to fix this
issue.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:24 +02:00
Derek Straka
6c0caad9ed tinymembench: update to version 0.4.0 plus bug fixes
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:24 +02:00
Derek Straka
c1ede4830a iperf3: update to version 3.1.2 plus bug fixes
license md5 updated for copyright date modifications

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:23 +02:00
Derek Straka
3df07600f3 iozone3: update to version 434
Update the license start and end to account for release notes

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:23 +02:00
Derek Straka
a29cece382 fio: update to version 2.9
Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:23 +02:00
Derek Straka
4a4773856b fribidi: update to version 0.19.7
* license copyright entities were updated

Signed-off-by: Derek Straka <derek@asterius.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:23 +02:00
Ioan-Adrian Ratiu
03071511d5 syslog-ng.inc: fix prerm script & class includes
The order of class includes is very important because it's the order in
which classes are evaluated. Both update-rc.d and update-alternatives
write to the prerm script, so the class order decides the script code
ordering. As they are now, prerm is:

 #!/bin/sh
        update-alternatives --remove  syslog-init /etc/init.d/syslog.syslog-ng
if [ -z "$D" ]; then
        /etc/init.d/syslog stop
fi

This causes errors because when syslog-ng is the only alternative it is
removed and then the script tries to stop it (No such file or directory)
but even if there are other alternatives, the script tries to stop
something other than syslog-ng which was removed.

By reversing the include order, prerm gets generated correctly and it
tries to stop syslog-ng before removing it:

if [ -z "$D" ]; then
        /etc/init.d/syslog stop
fi
update-alternatives --remove  syslog-init /etc/init.d/syslog.syslog-ng

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:22 +02:00
Martin Jansa
1bd027eba4 sblim-sfcb: add missing dependency on unzip-native
* otherwise configure fails with:
  | checking whether to build shared libraries... yes
  | checking whether to build static libraries... no
  | checking for unzip... no
  | configure: error: Could not find unzip
  | NOTE: The following config.log files may provide further information.
  | NOTE: /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/sblim-sfcb/1.4.9-r0/build/config.log
  | ERROR: configure failed
  | ERROR: Function failed: do_configure (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/sblim-sfcb/1.4.9-r0/temp/log.do_configure.9838)
  NOTE: recipe sblim-sfcb-1.4.9-r0: task do_configure: Failed
  ERROR: Task 5 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb, do_configure) failed with exit code '1'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:40:22 +02:00
Bruno Bottazzini
c22af995a3 libmicrohttpd: update to 0.9.49
This patch removes the flag --disable-spdy since libmicrospdy was dropped from
libmicrohttpd as it is possible to see in the following commit.

Revision: 36708 ID:36708 140774ce-b5e7-0310-ab8b-a85725594a96
URL: https://gnunet.org/svn/libmicrohttpd

Signed-off-by: Bruno Bottazzini <bruno.bottazzini@intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:38:33 +02:00
Eduardo Silva
c16b6e686b fluentbit: add new recipe
Fluent Bit is an open source data collector for Embedded Linux, this
patch adds the recipe for version 0.7.2.

  Project web site: http://fluentbit.io
  Documentation   : http://fluentbit.io/documentation/

Signed-off-by: Eduardo Silva <eduardo@monkey.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:38:33 +02:00
Christopher Larson
cdd326f7a6 fbida: use separate builddir
Separate builddir from the sourcedir.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Sujith H <sujith.h@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:38:33 +02:00
Khem Raj
831f710eca ltrace: Remove deprecated readdir_r()
New glibc >= 2.24 will remove it

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:38:32 +02:00
Li xin
a61cb51425 ltrace: Error Fix for ARM
1) The error is as following:
     root # ltrace ls
     __libc_start_main(0xb6fbc018, 1, 0xbed8fdc4, 0xb6fd0b88PTRACE_SINGLESTEP: Input/output error
     2747 couldn't continue when handling __libc_start_main (0xb6fbbde0) at 0xb6fbbde0
   The master branch fix it.

2) remove unused patch:
     --0001-ltrace-fix-gcc-5-logical-not-parentheses.patch
     --ltrace-0.7.2-unused-typedef.patch

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:38:31 +02:00
Philip Balister
53adf32f49 thrift: Add recipe for Apache Thrift.
* Run tested cpp bindings with GNU Radio Control Port.
 * The patch forcible removes Qt5 from configure. The disable is correct,
   but doesn't prevent a cmake error looking for qmake during configure.
   We do not need Qt5, so remove check. I suspect the issue might be in
   Qt5 cmake files.

Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-05-06 12:38:31 +02:00
Mark Asselstine
6fbaf07c2b mozjs: fix configure host contamination
When building mozjs the following error was observed

| Traceback (most recent call last):
|   File "./config.status", line 9, in <module>
|     from ConfigStatus import config_status
|   File "/build/bitbake_build/tmp/work/corei7-64-wrs-linux/mozjs/17.0.0-r0/mozjs17.0.0/js/src/build/ConfigStatus.py", line 11, in <module>
|     import sys, re, os, posixpath, ntpath
|   File "/usr/lib/python2.7/ntpath.py", line 15, in <module>
|     from genericpath import _unicode
| ImportError: cannot import name _unicode
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_configure (log file is located at /build//bitbake_build/tmp/work/corei7-64-wrs-linux/mozjs/17.0.0-r0/temp/do_configure/log.do_configure.1056

Note the host paths found in the error msg. Further this issue can be
explored using the host python, which will not error when attempting
the above import, and the python in the sysroot, which will fail when
we attempt the import.

By inheriting pythonnative we ensure the proper paths are set to avoid
this host contamination.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-04-28 10:38:56 +02:00
Li xin
b5a7dfbea5 mariadb: Fix rootfs creation errors
error: file /usr/share/doc/README from install of mariadb-leftovers-5.5.46-*
conflicts with file from package dmidecode-doc-2.12-*

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2016-04-28 10:38:56 +02:00