Commit Graph

5984 Commits

Author SHA1 Message Date
Alexander Kanavin
42e5e37984 librepo: upgrade 1.11.2 -> 1.11.3
(From OE-Core rev: 8cffbc8dbbc69cac1bd6fb3c33cb3ee1e65fb70b)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:29 +01:00
Alexander Kanavin
a948c258f6 dpkg: upgrade 1.19.7 -> 1.20.0
(From OE-Core rev: 72166e5dbbf6b2c89f890caf1c33d9e4f98cf925)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:29 +01:00
Alexander Kanavin
a863a54612 createrepo-c: upgrade 0.15.7 -> 0.15.10
(From OE-Core rev: e1cc4dbd8d37274e6fa35951c33418d50478fb38)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:29 +01:00
Alexander Kanavin
affa8050ad ccache: upgrade 3.7.7 -> 3.7.9
(From OE-Core rev: 023526213d1ecbcaa64182577e9d2269119b988b)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:29 +01:00
Alexander Kanavin
e264dd9fab build-compare: upgrade to latest revision
(From OE-Core rev: 480f3c770a8287a12fb3f038b3d82ff5f36c15e2)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:29 +01:00
Alexander Kanavin
3523ab9868 btrfs-tools: upgrade 5.4.1 -> 5.6.1
(From OE-Core rev: 00c9584c21376aa386db59f6b3ca115b531dfae1)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:29 +01:00
zangrc
2f63944eaa python3-setuptools:upgrade 45.2.0 -> 47.1.1
(From OE-Core rev: 0e106ae4ced8f51ae4e0acb829a245b9ee02b8ac)

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:29 +01:00
zangrc
6561a6a0b1 python3-pygobject:upgrade 3.34.0 -> 3.36.1
(From OE-Core rev: a0c706be1cee825744ed36ceb7464da743a6a80b)

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:29 +01:00
Wang Mingyu
37ec0f628a python3-six: upgrade 1.14.0 -> 1.15.0
(From OE-Core rev: b9a6042e210ecf5c3b5d771f95c8505deab2739b)

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-30 12:32:48 +01:00
Khem Raj
9613a72fa0 go-1.14: Update to 1.14.3 minor release
(From OE-Core rev: 97d5c2d1f2dffe2518f46bbe57cb9348eb59c633)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-30 12:32:48 +01:00
zhengruoqin
becfbe87b2 gdb: upgrade 9.1 -> 9.2
(From OE-Core rev: b40adc3f9c5a9ee480b6ea85374481d13894ca6f)

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-30 12:32:48 +01:00
zangrc
cc7f3bef22 python3-pycairo:upgrade 1.19.0 -> 1.19.1
(From OE-Core rev: dbd90a3d3b384c03ca5384dc6a8a65ae3d4b21d9)

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-30 12:32:47 +01:00
Alexander Kanavin
7561eb32a0 qemu: enable virglrenderer and glx options subject to 'opengl' DISTRO_FEATURE
Note that to actually use accelerated GL passthrough, there are two options

1) a suitable frontend need to be also enabled - gtk+ and SDL both seem to work well.
Previously I struggled to make SDL work, but now it seems fine.

2) it is also possible to render off-screen with -display egl-headless option,
and see the output with a VNC viewer (for which, qemu needs to be started
with a VNC server):

$ runqemu kvm egl-headless publicvnc

(From OE-Core rev: 662c688e635f4490aac0d6d34ce7a7b31d73f5c5)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-27 11:04:47 +01:00
Richard Purdie
edbf8d3999 multilib/recipes: Use new RecipePostKeyExpansion event
There are issues with multilib due to the ordering of events where some
functions see the remapped multilib dependencies and some do not. A significant
problem is that the multilib class needs to make some changes before key expansion
and some afterwards but by using existing event handlers, some code sees things
in a partially translated state, leading to bugs.

This patch changes things to use a new event handler from bitbake which makes the
ordering of the changes explcit.

The challenge in doing this is that it breaks some existing anonymous python and
dyanmic assignments. In some cases these used to be translated and no longer are,
meaning MLPREFIX has to be added. In some cases these are now translated and the
MLPREFIX can be removed.

This change does now make it very clear when MLPREFIX is required and when it is
not, its just the migration path which is harder. The patch changes the small number
of cases where fixes are needed.

In particular, where a variable like RDEPENDS is conditionally extended (e.g.
with an override), MLPREFIX is now required.

This patch also reverts:
base: Revert 'base.bbclass: considering multilib when setting LICENSE_EXCLUSION'

This reverts 6597130256a1609c3e05ec5891aceaf549c37985 as the changes
to multilib datastore handling mean its no longer necessary.

(From OE-Core rev: b3fda056a674889cd9697e779de023d4f993d3ce)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-27 10:47:05 +01:00
Otavio Salvador
1838b0df75 go-dep: Avoid use of 'go mod' support
dep utility must not use 'go mod' support, so we explicitly disable it.

(From OE-Core rev: b34000ae3dd6e0a1d7fc332efb35c5da84cf2275)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-26 23:07:12 +01:00
Otavio Salvador
030978c955 glide: Avoid use of 'go mod' support
Glide utility must not use 'go mod' support, so we explicitly disable
it.

(From OE-Core rev: b5a4369ba606677285b0a89a78c040b38f57767f)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-26 23:07:12 +01:00
zhengruoqin
8f123a5301 ruby: upgrade 2.7.0 -> 2.7.1
(From OE-Core rev: 8d9b48bdf25363fb115a6311b031a7e5da8e0d4d)

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-24 23:56:03 +01:00
Joshua Watt
945cf5f02a python3-magic: upgrade 0.4.15 -> 0.4.18
(From OE-Core rev: e8446a7c9af325be952f8edaef5a299b556ac635)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-24 23:56:03 +01:00
Jan-Simon Moeller
3c28c19791 file: add bzip2-replacement-native to DEPENDS to fix sstate issue
file-native when built on a Debian 10 host will embed a dependency to
'libbz2.so.1.0' (instead of 'libbz2.so.1'). This can cause issues
when sharing the sstate between hosts e.g.:

 recipe-sysroot-native/usr/lib/rpm/rpmdeps:
      error while loading shared libraries: libbz2.so.1.0: \
        cannot open shared object file: No such file or directory

To avoid this situation, let's add the bzip2-replacement-native to the
file recipe's DEPENDS_class-native .

Details in https://bugzilla.yoctoproject.org/show_bug.cgi?id=13915 .

(From OE-Core rev: 4a996574464028bd5d57b90920d0887d1a81e9e9)

Signed-off-by: Jan-Simon Moeller <dl9pf@gmx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-22 17:07:44 +01:00
Lee Chee Yang
6cb7107d86 qemu: fix CVE-2020-11869
(From OE-Core rev: 586061c469a3340ec3a60ff59dae2e9ee33c3398)

Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-19 22:57:27 +01:00
Anuj Mittal
dea64f0514 mtools: upgrade 4.0.23 -> 4.0.24
(From OE-Core rev: 375fadf46406b7021168a832d99d385b227f10d0)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-19 22:57:26 +01:00
Mingli Yu
78d1faf939 python3-setuptools: add the missing rdepends
Add the missing rdepends to fix below error:
 # python3
 [snip]
 >>> import setuptools.lib2to3_ex
 [snip]
 ModuleNotFoundError: No module named 'lib2to3'
 ModuleNotFoundError: No module named 'pickle'

(From OE-Core rev: 24f3414b718d6edd218544e3b348f6f73053b625)

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-19 22:57:26 +01:00
Adrian Bunk
329c600411 gcc: Remove mudflap remnants
mudflap was removed in gcc 4.9.

(From OE-Core rev: 6d649a07cfa0a89448caa67e4ca0a990973961b9)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-19 22:57:26 +01:00
Khem Raj
b62b82c02d valgrind: Backport upstream patch to fix __getauxval needs
Drop disabling outline-atomics since that was added to fix this issue in
particular

(From OE-Core rev: 702a1ae29c6a0f920bd67b7a7a41b886ac52a751)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-18 06:33:36 +01:00
Khem Raj
3ad495ba92 syslinux: Fix build with gcc10
Bring in a patch from fedora to fix -fno-common issue

(From OE-Core rev: f635bd89d53cc8c110b18aa593babc55eeffc511)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-18 06:33:36 +01:00
Joshua Watt
7ebe299c00 python3-pyelftools: Upgrade 0.25 -> 0.26
(From OE-Core rev: 0323e12624ef45e64e7a8ba6384c06e4d42df064)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-18 06:33:36 +01:00
Joshua Watt
cb94d9019b python3-pycryptodome(x): Upgrade 3.9.4 -> 3.9.7
Also splits apart the SRC_URI checksums to make automatic upgrades
easier

(From OE-Core rev: ae1f210546396b761ea86d9e32bf90c0867ff845)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-18 06:33:36 +01:00
Joshua Watt
1e327abcc9 pyelftools: Import from meta-python
Imports the pyelftools recipes from meta-python, as of 7c02c7d41
("gnome-themes-extra: correct the recipe name").

This recipe is commonly used by other layers, so moving it into
OE-core helps to cut down on layer dependencies.

(From OE-Core rev: 910ffaf5beed42936588c95b0c7c1b1ad67f99d3)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-18 06:33:36 +01:00
Joshua Watt
d52929ee35 pycryptodome: Import from meta-python
Imports the pycryptodome recipes from meta-python, as of 7c02c7d41
("gnome-themes-extra: correct the recipe name").

These recipes are commonly used by other layers, so moving them into
OE-core helps to cut down on layer dependencies.

(From OE-Core rev: a96f815c53364b119b5743b8b7100eb5588d5cf5)

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-18 06:33:35 +01:00
Jacob Kroon
448dadd32c squashfs-tools: Backport fix for compiling with gcc 10
(From OE-Core rev: bae1603a27fadcfa7257801167f28db3ff02dc97)

Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-15 16:31:45 +01:00
Khem Raj
b6dc3c1d8c gcc: Drop reverting __getauxval patch
Issue has been fixed in valgrind itself

(From OE-Core rev: c4070f3d76e0170cf6ee672a8a9a38e4cdbbcad9)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-15 16:31:45 +01:00
Khem Raj
3799c960c2 valgrind: Do not use outline-atomics on aarch64
This avoids the __getauxval undefined reference error seen with gcc10 on
doing static linking with -nodefaultlibs, which is uncommon usecase
anyway, disabling outline-atomics is not a huge deal for OE in terms of
performance as we already use -mcpu which is tuned enough to the SOC the
code is being generated for

(From OE-Core rev: 3952738d083b888e5b898ed3d63a0ed9a4dd3712)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-15 16:31:45 +01:00
Mingli Yu
7d8dae11b9 bison: fix the parallel build
Explicitly make the BUILT_SOURCES which
are the generated headers such as stdio.h,
fcntl.h and etc to be the dependencies of
the gl_LIBOBJS such as libbison_a-sprintf.o,
libbison_a-printf.o and etc to guarantee the
BUILT_SOURCES is generated before begin to
compile EXTRA_lib_libbison_a_SOURCES such as
fprintf.c in parallel builid, otherwise there
may come below error:
 | muscle-tab.c:(.text+0x77a): undefined reference to `rpl_sprintf'

It does the same for src_bison_OBJECTS and
lib_libbison_a_OBJECTS to make sure BUILT_SOURCES
generated before begin to compile src_bison_SOURCES
which contains AnnotationList.c and etc.

BTW, the MOSTLYCLEANFILES also contains the
generated header needs to be created early
in the build process, so add it also in to
avoid below error:
 | ./lib/uniwidth/width.c:21:10: fatal error: uniwidth.h: No such file or directory

[YOCTO #13825]

(From OE-Core rev: d4a0cbf132cf6a821e3efe7db3d9afd014cc9bc6)

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-15 16:31:44 +01:00
Adrian Bunk
72c2164fc5 apt: The C.UTF-8 locale is not portable
(From OE-Core rev: 1df7f2874de6af8846ca218d0467369768a56aa0)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-15 16:31:44 +01:00
Adrian Bunk
e992ffd162 apt: Remove workarounds for host gcc < 5
(From OE-Core rev: f905eabaeb6b32ac9f3d6d8695fe9f8628c1bec5)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-15 16:31:44 +01:00
Khem Raj
18f718cefd gcc: Do not set -march for arm64 for libatomic
libatomic has mind of its own when it comes to setting -march for arm64
which conflicts with -mcpu option we pass from environment in some cases
since we always pass -march/-mcpu in OE, its safe to remove this option

mcpu removal from cortex-a55 is no longer needed since the option
conflict is now removed from libatomic instead

(From OE-Core rev: a5331c5a8bbe63c6c2e56ebec496b28968d4663d)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-15 16:31:44 +01:00
Peter Kjellerstedt
d708afc6df file: Remove unneccessary override of PACKAGECONFIG for native
There is no reason to set PACKAGECONFIG_class-native to the same value
as the default PACKAGECONFIG.

(From OE-Core rev: 276a21cbbfc929f718fd758b64e3e0567534fd41)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-14 14:15:11 +01:00
Adrian Bunk
08f93d2cd6 python-numpy: Remove workaround for host gcc < 5
(From OE-Core rev: 170ff91c90c17fe6615c1616c4298a9948b818a9)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-14 14:15:11 +01:00
Khem Raj
5757286da1 gcc10: Revert using __getauxval in libgcc
This was added recently, but it seems be chewing more than what it
should and causes non glibc packages also depend on it.

(From OE-Core rev: 595d2df62b049e463568ab97cfe26d6df96a18a9)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-14 14:15:11 +01:00
Khem Raj
d8981bb2eb gcc10: Default back to -fcommon
For time being change back to -fcommon as default, helps us iron
out other issues, eventually this should be removed as we fix the
packages to work with -fno-common

(From OE-Core rev: 951e859b1e8297970278c539e989b8a6d06a9cb3)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-14 14:15:11 +01:00
Khem Raj
d8d7d9e8f0 gcc10: Update to GCC 10.1 Release
* Package new gomp header acc_prof.h
* Package lto-dump which is a new tool in gcc10
* All Changes are here [1]
* Porting apps to gcc 10 help is here [2]
* Backport a patch to fix CET errors on cross builds
* Add patch to fix mingw libstdc++

[1] https://gcc.gnu.org/gcc-10/changes.html
[2] https://gcc.gnu.org/gcc-10/porting_to.html

(From OE-Core rev: 44c3881b18f74eb64379818fc150f94398fb8a49)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-14 14:15:11 +01:00
Adrian Bunk
b23cc4a8f1 llvm: Remove -fcommon
I cannot reproduce the problem.

(From OE-Core rev: 80cc6e60b98da7c9de9e9da629353cf1fb687197)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-14 14:15:11 +01:00
Konrad Weihmann
17b80b70ba file: add PACKAGECONFIG for auto options
A few options of file configure are set to auto, which can lead to
unpredictable effects when something in the sysroot does provide
things that satisfy the autotools checks.
In the worst case this will lead to package-qa failures as libraries are
not set in RDEPENDS but configured for the tool.

To mitigate changes of accidental configure set explicit options via
newly introduced PACKAGECONFIG variables for bzip, lzma and zlib
support, where the default is just zlib, as it was before

(From OE-Core rev: a2236917395239eba7a8358ca4de61fd0d25b27f)

Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-12 15:20:43 +01:00
Khem Raj
9e44438a9d gcc-runtime: Avoid march conflicts with newer cortex-a55 CPUs
gcc-runtime/libatomic explicitly add -march=armv8-a+lse for all arch64
but cortex-a55 is armv8.2-a, which essentially conflicts, so let gcc
override it by not forcing the -mcpu option from TUNE_CCARGS

(From OE-Core rev: 882df891e13ce5c64718c364efb9ef2bf189eabf)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-12 15:20:43 +01:00
Richard Leitner
b692f04101 binutils: add patch to fix issues with gcc 10
gcc 10 introduced "-fno-common" as default. Therefore backport the
according binutils patch to fix this issue.

(From OE-Core rev: fbeb572e1872cf64786d01d5c6408a6765f814ce)

Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-12 15:20:42 +01:00
Richard Leitner
11fff92f7a libcomps: update to 0.1.15
In this update the 0001-Make-__comps_objmrtree_all-static-inline.patch
was mainlined by commit 18f52cb.

Furthermore mainline commit 3237f44 fixes a build problem with the
default "-fno-common" of gcc 10.

(From OE-Core rev: 90b942d01decbcff3b883ee6fb4bba67fb446817)

Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-12 15:20:42 +01:00
Jacob Kroon
b4e1ce1b93 pseudo: Fix enum typedef
'pseudo_access_t' is a type, so use typedef.

Fixes building pseudo with gcc 10 where -fno-common is the default.

(From OE-Core rev: a7d519f742aadc9110c2401f359254210a784f6b)

Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-12 15:20:42 +01:00
Kai Kang
6c6b2e9b52 python3-git: 3.0.5 -> 3.1.2
(From OE-Core rev: 8cf74d626d562aa83acf0b05597b85392e4943c5)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-12 15:20:42 +01:00
Mingli Yu
51790fa49c python3-setuptools: add the missing rdepends
Add the missing rdepends to fix below error:
 # python3
 [snip]
 >>> import setuptools
 [snip]
 ModuleNotFoundError: No module named 'json'

(From OE-Core rev: f1dce04d2643352cd7a2c5a91eefc01d52926ecd)

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-09 18:57:21 +01:00
Changqing Li
07083caab6 rpm: fix file conflicts for MIPS64 N32
The following error occurred when prefer_color set to 2:
Error: Transaction check error:
  file /sbin/ldconfig conflicts between attempted installs of
ldconfig-2.31+git0+71f2b249a2-r0.mips64_n32 and
lib32-ldconfig-2.31+git0+71f2b249a2-r0.mips32r2
  file /usr/bin/gencat conflicts between attempted installs of
lib32-libc6-utils-2.31+git0+71f2b249a2-r0.mips32r2
...

This was because:
transactions_color = 001 (ELF32) & 010 (ELF64) & 100 (ELF32 N32 MIPS64)
FColor = Current file color (001) & transaction_color (111)
oFcolor = Previous file color (100) & transaction_color (111)

when "neither preferred" happened, handled as conflicts. this is too
restrictive for three way conflicts(mips64/mips64 n32/mips(32)).
Fixed by  perform a 'last-in-wins' resolution when "neither is preferred".

refer:
https://github.com/rpm-software-management/rpm/issues/193
https://git.openembedded.org/openembedded-core/commit/meta/recipes-devtools/rpm?id=36c225704daa58b98a4b7f2ef315eb944d8628b5

(From OE-Core rev: f94511fe5c163de8fb34d00ff3ba995437c3922c)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-09 18:57:21 +01:00