Commit Graph

59833 Commits

Author SHA1 Message Date
Jose Quaresma
0be89e058d gstreamer1.0-plugins-bad: upgrade to version 1.18.0
* 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
      Removed since these are included in 1.18.0

PACKAGECONFIG:
 - vdpau has been removed upstream
 - vulkan needs now needs shaderc-native to build

EXTRA_OEMESON:
 - yadif has been removed upstream
 - nvdec and nvenc has been replaced with nvcodec

FILES:
 - add new files for transcode plugin

(From OE-Core rev: b4916863bc0bc685344dd3637ef890d90af15c5f)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-31 08:54:12 +00:00
Jose Quaresma
40f827d2f2 gstreamer1.0-plugins-good: add new meson option as PACKAGECONFIG
(From OE-Core rev: f27825243ccc4a7de4526d453ba60039f0b350ff)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-31 08:54:12 +00:00
Jose Quaresma
bf84b963a7 gstreamer1.0-plugins-good: disable new meson options
(From OE-Core rev: 641ac41c2f55f691b2a59c954ce787e0b06a9ad4)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-31 08:54:12 +00:00
Jose Quaresma
af090eec2b gstreamer1.0-plugins-good: upgrade to version 1.18.0
* 0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch
      Removed since these are included in 1.18.0

License-Update: remove file://common/coverage/coverage-report.pl
Upstream dont have it any more.

(From OE-Core rev: 06f51b0ae0e5a3071778f7d4134bf719b25a103f)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-31 08:54:12 +00:00
Jose Quaresma
ce6b2b57ad gstreamer1.0-plugins-base: add new meson option as PACKAGECONFIG
- gl_winsys have a new meson option to set egl

(From OE-Core rev: a54a70083cbe350d9fb6caef1567780bf4a0cbfb)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-31 08:54:12 +00:00
Jose Quaresma
4650ec0450 gstreamer1.0-plugins-base: upgrade to version 1.18.0
* 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
    * 0002-meson-Add-variables-for-gir-files.patch
      Removed since these are included in 1.18.0

License-Update: remove file://common/coverage/coverage-report.pl
Upstream dont have it any more.

    API and plugin documentation are no longer built with gtk_doc.
    The gtk_doc documentation has been removed in favour of a new unified
    documentation module built with hotdoc.
    Distributors should use the documentation release tarball instead of trying
    to package hotdoc and building the documentation from scratch.

(From OE-Core rev: 5485ecd65987f5a2c0824cf6f691ccb3f529c86e)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-31 08:54:12 +00:00
Jose Quaresma
673ca00315 gstreamer1.0: upgrade to version 1.18.0
* 0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch
      Submited
      https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/669

    * 0002-meson-build-gir-even-when-cross-compiling-if-introsp.patch
      Removed since these are included in 1.18.0

    * 0003-meson-Add-valgrind-feature.patch
      Removed because upstream don't depend anymore on valgrind
      https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/595

    * 0002-Remove-unused-valgrind-detection.patch
      Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245]
      a2cbf75523

    API and plugin documentation are no longer built with gtk_doc.
    The gtk_doc documentation has been removed in favour of a new unified
    documentation module built with hotdoc.
    Distributors should use the documentation release tarball instead of trying
    to package hotdoc and building the documentation from scratch.

(From OE-Core rev: 4d74baf4f56771215bc6350bfb37d24d327ab91b)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-31 08:54:12 +00:00
Jose Quaresma
6d4707d56d gstreamer1.0: Fix reproducibility issue around libcap
Currently gstreamer configuration depends libcap and on whether
setcap is found on the host system.

Removing libcap from DEPENDS and only use it when the 'setcap' is enabled.

    * capfix.patch
      Removed as the same goals can be achieved only with the PACKAGECONFIG 'setcap'

(From OE-Core rev: 7fc8f6a6c8c7c2c23689749084170a0bd9721841)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-31 08:54:12 +00:00
Robert P. J. Day
43e3a19c19 adt-manual: delete obsolete ADT manual, and related content
Since the ADT manual has long been superseded by the SDK manual,
remove the entire adt-manual directory, and the references to it in
the two top-level files "conf.py" and "poky.yaml".

(From yocto-docs rev: 64b2e83bddf6af0439ac7089ac95e60faa696cfc)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 16:03:19 +00:00
Alejandro Hernandez Samaniego
507717949f poky-tiny: Enable size optimization by default
Compiler size optimization reduces the size of the root
filesystem by 15%, since poky-tiny is meant to be used
on size constrained devices, enable it by default

(From meta-yocto rev: 5e3a784ec7f1456cd3a43ff235719dbfd42a17a6)

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alhe@linux.microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:26:16 +00:00
Alejandro Hernandez Samaniego
39a0775c26 poky-tiny: Reduce busybox size by 13%
Busybox has released several new verisions since this config was last
generated, they come with new features, new defaults as well as
dropping some existing features.

This patch updates the defconfig used in poky-tiny to reflect the
changes mentioned above, it also reduces some seldom used functionality,
reducing the installed size by 13%, this can certainly be reduced
further if required.

[YOCTO #12170]

(From meta-yocto rev: b03bda01316d79b53ed2cac97566e647cdaada4f)

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro.hernandez@linux.microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:26:16 +00:00
Richard Purdie
bd15b47a4c poky.conf: Post release version bump
(From meta-yocto rev: 66ecf3bcc112be5ac10c83a97e326130672ffdcb)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:26:16 +00:00
Maxime Roussin-Bélanger
31405f086e bitbake: monitordisk: remove unused function parameter
(Bitbake rev: f3f5d6d0ceae79da5e5ee46ac79dfa86eb391e97)

Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:26:16 +00:00
Maxime Roussin-Bélanger
3ef540749e bitbake: cache: remove unused variables.
(Bitbake rev: 28475ae752967b0a14ed2554c1b835e96390f850)

Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:26:16 +00:00
Richard Purdie
288e3283af bitbake: bitbake: Post release version bump
(Bitbake rev: 20ef79a328be280e8779f31924ec33c1a4ca1758)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:26:16 +00:00
Alexander Kanavin
30c4c48b8a glib-2.0: update 2.66.1 -> 2.66.2
(From OE-Core rev: c85b640fcbd0ea7c921dff02879fccb8dc60b8ee)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
354f96bf78 python: update 3.8.5 -> 3.9.0
Drop 0001-Do-not-hardcode-lib-as-location-for-site-packages-an.patch,
0001-configure.ac-fix-LIBPL.patch and 0001-python3-Do-not-hardcode-lib-for-distutils.patch
as they are all replaced by the new --platlibdir option to ./configure

Rename 0001-Lib-sysconfig.py-fix-another-place-where-lib-is-hard.patch to
0001-Lib-sysconfig.py-use-libdir-values-from-configuratio.patch
and describe the changes better.

License-Update: documentation now dual license under PSF & BSD
(not relevant for the recipe.
(From OE-Core rev: 7347556b18b45c5f9afc2cade565a75c95876914)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
bb5bfc3ac7 libxml2: add a patch to fix python 3.9 support
(From OE-Core rev: 0d0acc5fefc96ee0f0a856f7fa34caf92e03138f)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
6c9e07e650 opkg-utils: correct priority matching in update-alternatives
(From OE-Core rev: 82baab5bd5e5ec4369eaad393feeee3132f0c087)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
600cb136cd apt: remove host contamination with gtest
(From OE-Core rev: 41aa60cdb1e26617e1eeac95a6ffcdd6561c539f)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
fb55c447ad rpm: adjust MIPS64 N32 support
upstream has switched from libmagic to elfutils to determine
file 'colors', and so this adapts the existing patch accordingly.

(From OE-Core rev: 0d420c8f6a6718b54ef9a1278bfa8fec6709d3bd)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
711a89cc8e gtk-doc: upgrade 1.32 -> 1.33.0
(From OE-Core rev: 12b008386d7e546db51dbb0c871a4e6d87e34dfe)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
d3a464fd74 epiphany: upgrade 3.36.4 -> 3.38.1
libportal is a new hard dependency.

(From OE-Core rev: 118dbb137adb11a8d92bdbf60ab3696176d64aa0)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
0ec584a236 libportal: add a recipe
This is a new build requirement of epiphany browser.

(From OE-Core rev: 6a0888a146ab015c25309bafd8b2d5ebdd81b8a4)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
3d6d6cb77d libhandy: upgrade 0.0.13 -> 1.0.0
(From OE-Core rev: f6ce78a0bb50ab1411ecb8cf66a52d4e85273188)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
0dceb63e7d vte: update 0.60.3 -> 0.62.1
(From OE-Core rev: 9559873a8d9530d866c9a1f4d785b50d684d46e3)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
74da10f775 libcap: update 2.43 -> 2.44
Rebase the patches.

(From OE-Core rev: bae7cbaa7509fa2f05b8e3ef66e9b181589db032)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
96dbd86d67 gnutls: update 3.16.4 -> 3.16.5
(From OE-Core rev: 2f38d5c97abbc84a55ad22dcd328f627380e79a8)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
faee04a9cc dos2unix: update 7.4.1 -> 7.4.2
License-Update: copyright years
(From OE-Core rev: 5473f246e85c968540dd8112174c939e90479e0e)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
3846c15172 webkitgtk: update 2.28.4 -> 2.30.1
Drop 0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch and
cross-compile.patch as upstream has removed the code.

Rebase 0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch.

Add a systemd config option, subject to systemd in DISTRO_FEATURES.

(From OE-Core rev: 98d7a2b593eee33e0bc015778712cd8b68146588)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
9624092cd6 lttng-modules: update 2.12.2 -> 2.12.3
Drop a pile of backports.

(From OE-Core rev: fba843f79ac6ad2636385de2bd63e90e08c04fcd)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
6d3c1edca5 xf86-video-vesa: update 2.4.0 -> 2.5.0
(From OE-Core rev: 4b0afd5440ed49513844f98553816dc6925e9b89)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
b6da9774f3 mesa: update 20.1.8 -> 20.2.1
Build tweaks:
- drop separate dri option and the patch that adds it; just setting -Ddri-drivers='' is enough
- strip leading/trailing commas from drivers' lists, as upstream no longer allows blank entries if the list
is not empty (e.g. -Ddri-drivers=,driver1,driver2 is now producing an error).
- drop the long-obsolete llvm 3.3/3.2 logic

License-Update: reformatted into rst
(From OE-Core rev: 8682024ef029241c75e224174fd0b93835f88df3)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
afbdf052cb libsecret: update 0.20.3 -> 0.20.4
Drop the patch as it is merged upstream.

(From OE-Core rev: 05bd45017b9eaffc835d5cc42747ae21c0135fe8)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:49 +00:00
Alexander Kanavin
560e32b74f gsettings-desktop-schemas: update 3.36.1 -> 3.38.0
Drop 0001-Do-not-skip-gir-installation-for-cross-compiling.patch as
upstream has done the same change.

(From OE-Core rev: 50ecc0ae003895e416d5835b5a75ed4b246deea1)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
b443fc8207 ltp: update 20200515 -> 20200930
Drop backports.

Remove 0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch as
upstream has removed the code being patched.

(From OE-Core rev: 8d24f8e5278eedef987480bef151ce9ba7c05f1a)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
2d787812e8 ghostscript: update 9.52 -> 9.53.3
ghostscript-9.15-parallel-make.patch rebased; one of the
chunks removed upstream.

Remove bundled jpeg source, as that seems to be the only way
to get ghostscript to fall back to system jpeg library.

(From OE-Core rev: ad8c8ffc5a008872d40a36ea825da30accd6a11a)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
50feea207e elfutils: update 0.180 -> 0.181
Add a config option for client debuginfod library.

(From OE-Core rev: 2c282ee6a8961d23ae9146eb0303824e0f234933)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
d22a91051e rpm: update 4.15.1 -> 4.16.0
Drop backports.
Drop 0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch as
enabling compression support in libmagic finally allows us to use
parallel file classification.

Add a backported patch that fixes musl builds.

License-Update: formatting
(From OE-Core rev: 36c014428b8088abb024287e9841f72e7368ce5b)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
52a31bd5ba file: enable all built-in compression checkers
This allows re-enabling parallel file classification in rpm
in particular, as otherwise libmagic calls out to external
executables, which isn't implemented in a thread-safe way.

(From OE-Core rev: 0515567a846adc5302384cb0a6bfcdb6dd1d8431)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
4b495d5bd9 gnu-config: update to latest revision
(From OE-Core rev: c139c93a699b15adf6e0bf243b744f85a8e8c0ea)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
fdee18c6b0 ovmf: update edk2-stable202005 -> edk2-stable202008
(From OE-Core rev: 61cc9acb54be09a12aac7c79f4b14e7e525d5596)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
1817c97687 json-glib: upgrade 1.4.4 -> 1.6.0
(From OE-Core rev: e241f48c2eaaa7c19b1665b2d3896722553ba8a1)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
f918575ab3 gobject-introspection: upgrade 1.64.1 -> 1.66.1
Add a patch to avoid build errors if building g-i data is disabled.

(From OE-Core rev: e2c4cd1cebbd9e83e90759671147442d7f77d7c5)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
c957d02d79 libdazzle: upgrade 3.36.0 -> 3.38.0
(From OE-Core rev: f564fddd78e39cadefcd0c3a72414f263a648bbc)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
5b8cdc8ff7 python3-pygobject: upgrade 3.36.1 -> 3.38.0
(From OE-Core rev: 475134563c4a2a50972a6e4fb8e5546d4c05b2c4)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
ca3ae1bbe5 cmake: update 3.18.2 -> 3.18.4
(From OE-Core rev: 615d3b52a5447914aad0e880c89e9cf9778c07ed)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
c64ddedd6a glib-2.0: upgrade 2.64.5 -> 2.66.1
Drop the timezone changes as these are included in the upgraded version.

(From OE-Core rev: fc28a94eb67373ba2dc2d290e7caca96aabb29db)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Alexander Kanavin
b98ab561b2 systemd-boot: upgrade 246.2 -> 246.6
As systemd-boot shares SRCREV with the main systemd recipe, the version
should be kept in sync with it.

(From OE-Core rev: 16ff7f3c9d38898b936340c28fd6820c036c62d5)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00
Yann E. MORIN
0776bf6600 recipes-core/busybox: fixup licensing information
Commit 7d32417b4d (busybox: Correct the name of the bzip2 license)
changes the licesne from 'bzip2' to 'bzip2-1.0.6' on the rationale
that the 'bzip2 license was renamed from "bzip2" to "bzip2-1.0.6"
[...] to match the official SPDX identifier.'

Though the above is true for the bzip2 and pbzip2 packages, the bzip2
code bundled in busybox is a copy from the bzip2 1.0.4 version, not the
1.0.6 version.

As such, using bzip2-1.0.6 is wrong.

Unfortunately, there is no official SPDX license identifier for this
bzip2 1.0.4 version, so we just mimick the existing ones (bzip2-1.0.5
and bzip2-1.0.6) by using bzip2-1.0.4.

Also, there is a license file attached to that, so we add it to the
list.

(From OE-Core rev: 6238ee3ecd385cbadd8e75eb8b22a96d9cb13639)

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Alexandre BELLONI <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-10-30 13:22:48 +00:00