Commit Graph

45 Commits

Author SHA1 Message Date
Richard Purdie
b0130fcf91 meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX license identifiers
An automated conversion using scripts/contrib/convert-spdx-licenses.py to
convert to use the standard SPDX license identifiers. Two recipes in meta-selftest
were not converted as they're that way specifically for testing. A change in
linux-firmware was also skipped and may need a more manual tweak.

(From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-20 16:45:25 +00:00
Alexander Kanavin
bd2368d2bf shared-mime-info: fix meson 0.60 builds
(From OE-Core rev: 268400236a73ebdb1b6acf75fdd0a4a6d7965a7c)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-11-11 17:09:16 +00:00
Richard Purdie
ddcf16d1f7 meta: Add explict branch to git SRC_URIs
There is uncertainty about the default branch name in git going forward.
To try and cover the different possible outcomes, add branch names to all
git:// and gitsm:// SRC_URI entries.

This update was made with the script added to contrib in this patch which
aims to help others convert other layers.

(From OE-Core rev: b51c405faf6f8c0365f7533bfaf470d79152a463)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-10-30 18:56:47 +01:00
Ross Burton
300b51ac6b shared-mime-info: use a more concise description
For example we don't need to talk about historic build dependencies.

(From OE-Core rev: b67ae98ef803b889fceb5713c539504d48f1a926)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-09-21 23:44:08 +01:00
Richard Purdie
bb6ddc3691 Convert to new override syntax
This is the result of automated script conversion:

scripts/contrib/convert-overrides.py <oe-core directory>

converting the metadata to use ":" as the override character instead of "_".

(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:10 +01:00
Meh Mbeh Ida Delphine
c8075ed8f1 recipes-support: Add missing HOMEPAGE and DESCRIPTION for recipes
Fixes: [YOCTO #13471]

(From OE-Core rev: 6db24928d62aeb093a0e6da6619713eaca57a96f)

Signed-off-by: Ida Delphine <idadelm@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-03-02 20:39:36 +00:00
Wang Mingyu
d031768d95 shared-mime-info: upgrade 2.0 -> 2.1
(From OE-Core rev: 1bd182144e8454fa66d6870ddfb0352f5425e348)

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-10 12:34:40 +00:00
Alexander Kanavin
2a3a105eaf shared-mime-info: upgrade 1.15 -> 2.0
Convert to meson, replace custom call to
update-mime-database with a built-in meson option.

(From OE-Core rev: eeb6de06d2e6b3a7edf03c17e830aafc935e6f20)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-09 13:14:00 +01:00
Alexander Kanavin
fbfe2836ef shared-mime-info: fix upstream version check
Upstream has tagged a new 2.0 release properly,
so no special arrangements are needed to pick that up.

(From OE-Core rev: 6bf01986a07084a825db9189e26fc7cb0e588821)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:31 +01:00
Alexander Kanavin
46908b5655 shared-mime-info: fix (sort of) upstream version check
Upstream is using - to separate version components which
version checker at the moment can't deal with (i.e 1-15-1 when
1.15.1 is meant).

(From OE-Core rev: fe38a5df23a341ecc18f81b96a9b7628dc4b5a61)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-02-03 13:03:31 +00:00
Ross Burton
3f0f75fe03 shared-mime-info: actually depends on itstool-native
shared-mime-info needs itstool-native, not itstool.  Fixing this removes itstool
from the rdepends of shared-mime-info-dev.

(From OE-Core rev: c3cafc69340d5bc4ec6840e71d63f54283c44960)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-01-27 16:48:08 +00:00
Andreas Müller
d1de93077e shared-mime-info: add mime to inherit
shared-mime-info-data: is the base for mime database

(From OE-Core rev: 316b14b883ebbee1841d21af6ba538792a78ba9b)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-01-19 13:24:38 +00:00
Andreas Müller
3d3f59d2c8 shared-mime-info: upgrade 1.10 -> 1.15
* sources/development moved to freedesktop's gitlab
* patches do not apply any more due to major changes in Makefile.am
* give up bb/inc separation

(From OE-Core rev: 09ef7f8e4b9742b17a0bf7a48970ece2298eaeba)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-01-19 13:24:38 +00:00
Alexander Kanavin
afc016553b shared-mime-info: update the database also in native builds
Otherwise glib-compile-resources fails when building gtk+3-native.

(From OE-Core rev: 06451327a777e481d5328c3eeb6b9225c8724ac1)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-01-28 23:14:10 +00:00
Ross Burton
44bc1ba5f5 shared-mime-info: upgrade 1.9 -> 1.10
(From OE-Core rev: bd14918a01af2d88511443b03edf4efe99a61fe6)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-07-24 11:52:26 +01:00
Ross Burton
21a9066b1b shared-mime-info: fix license statement
The freedesktop.org.xml data and the update-mime-database tool are both GPLv2 as
per COPYING, so change LICENSE to GPLv2.

test-mime-magic.c is LGPLv2+ but we don't install that so isn't relevant.

(From OE-Core rev: 4ca838097c43755e19f8ffc66436f9ad773fcd39)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-06-07 08:52:55 +01:00
Ross Burton
1059e17036 shared-mime-info: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

(From OE-Core rev: f42195493b85fbd9bdc1ae0089084669c8cd558d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-03-09 09:17:02 -08:00
Alexander Kanavin
85772dc4bd shared-mime-info: update to 1.9
(From OE-Core rev: 5d1c0d9a54aff15ef5283cdfecc222405d2cf9ca)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-11-09 12:33:17 +00:00
Ross Burton
c1cf8a18ce shared-mime-info: enable nativesdk builds
Also remove the redundant DEPENDS_class-native, as the native class generates
this value automatically.

(From OE-Core rev: 7d2d73bf5e9fba30ae79e535adff256b94248e62)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-09-11 17:30:29 +01:00
Zheng Ruoqin
77f008c4bc shared-mime-info 1.6 -> 1.8
Upgrade shared-mime-info from 1.6 to 1.8

(From OE-Core rev: e97b75ff0838fb3eb044adae1ffa5d28acb90eed)

Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-12-22 08:50:17 +00:00
Alexander Kanavin
f4e17c6619 shared-mime-info: update to 1.6
(From OE-Core rev: 6e5976d302f5bc4cdfcbf40458d2a5fa7cd4a321)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-28 11:33:05 +00:00
Jussi Kukkonen
79b823a1af shared-mime-info: Upgrade 1.4 -> 1.5
(From OE-Core rev: 5452ed4021b8175ca6b9001150ca3897f36c8902)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-08 10:20:49 +00:00
Alexander Kanavin
1ef03d5a9d shared-mime-info: reorder SRC_URI lines to fix upstream version check
Upstream tarball should be listed first.

(From OE-Core rev: 81cb34c9e468afb2cd8f257603932fd11fad3166)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-08-01 07:34:08 +01:00
Jussi Kukkonen
c4359d1d82 shared-mime-info: Upgrade 1.3 -> 1.4
(From OE-Core rev: 7564be25990612b97f9ac55ad0bcf80609ac2fc7)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-05 22:15:17 +01:00
Ross Burton
050cbac72b shared-mime-info: upgrade to 1.3
(From OE-Core rev: 8abd1d0d605cec77faca1f21663feb4ad9e27d1d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-25 15:33:59 +01:00
Paul Eggleton
cb4500a98f Tweak SUMMARY
For these recipes, I took the opportunity to fix up the new SUMMARY
values as the originals needed tweaking. I've tried to make them
concisely explain the function of the recipe / package where possible.

(From OE-Core rev: a414d49f04541122e16469eca9e5d1770141f7cc)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 22:39:23 +00:00
Paul Eggleton
cec8b230cf Replace one-line DESCRIPTION with SUMMARY
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.

(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-02 12:50:18 +00:00
Valentin Popa
1d8cfc7fea shared-mime-info: upgrade to 1.2
Adapted parallelmake.patch to the new Makefile.am.

(From OE-Core rev: 30a3dba92f38b8877954e2c7da0c9c18be420d8a)

Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-30 17:33:13 +00:00
Richard Purdie
5e42796675 recipes: Remove PR = r0 from all recipes
Remove all PR = "r0" from all .bb files in oe-core. This was done
with the command sed -e '/^PR.*=.*r0\"/d' recipes*/*/*.bb -i

We've switching to the PR server, PR bumps are no longer needed and
this saves people either accidentally bumping them or forgetting to
remove the lines (r0 is the default anyway).

(From OE-Core rev: 58ae94f1b06d0e6234413dbf9869bde85f154c85)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-30 14:52:04 +00:00
Constantin Musca
e4d204412e shared-mime-info: upgrade to 1.1
(From OE-Core rev: eed45b5e22e5fa7b7d6ea7ccf2db36b80f90cd4e)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-22 06:09:21 -08:00
Constantin Musca
9fc0588ad4 shared-mime-info: upgrade to 1.0
parallelmake.patch: adapt to the new version

(From OE-Core rev: 07b0425a937cc36874909a47daa4def92d0bfe82)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-31 09:43:23 +00:00
Robert Yang
5ddf8570a1 recipes-support: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.

NOTE:
There were 2 errors in libcap.inc, the BUILD_LDFLAGS_virtclass_native
should be BUILD_LDFLAGS_virtclass-native (the "_" should be "-"),
otherwise it doesn't work, and the value was: "-Wl,rpath=...", this is
incorrect, it shoudl be: "-Wl,-rpath=..." (lacked a - ), but we don't
need this line, since it is already in the default BUILD_LDFLAGS. Remove
it and we don't need to bump the PR since we just removed a unused line.

[YOCTO #3297]

(From OE-Core rev: cafb550fe9034754933f1708446dde155dcc3d51)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-02 16:18:28 +00:00
Richard Purdie
e4f0176b67 gettext/shared-mime-info: Add missing patch upstream status field
(From OE-Core rev: d87ffe7bf7812c8732e792ee8720fe1626813a1d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-08 11:43:23 +01:00
Joe Slater
5094da3232 shared-mime-info: fix build race condition
The definition of install-data-hook in Makefile.am leads
to multiple, overlapping, executions of the install-binPROGRAMS
target.  We modify the definition to avoid that.

(From OE-Core rev: 6fef8f73143fdeed6da15444c11bce9a8b35668b)

Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-08 11:43:21 +01:00
Saul Wold
ca848609cb Fix Upstream-Status entries
(From OE-Core rev: 0cd9314ef95168ba5452a01ed8d923585c8d54ae)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-24 11:54:16 +00:00
Koen Kooi
983ce7f1b4 shared-mime-info: fix ordering of PACKAGES
(From OE-Core rev: 79ee0f8c849cd5de16b6ae1b3dd6c43bbad472b2)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-18 14:27:08 +00:00
Joshua Lock
cb1bc7668e shared-mime-info: package runtime data separately
The freedesktop.org.xml is required when updating the mime database but
otherwise not much use. Therefore package it separately, rather than
removing it completely, so that it can be used as required for on-device
updates without adding almost 2MB to every image which hase shared-mime-info.

(From OE-Core rev: 07ee2d7e6b2f571fe405464838e376cf03e5e8e6)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 11:37:10 +00:00
Richard Purdie
7dfb9ce398 shared-mime-info: Fix a parallel make race
(From OE-Core rev: 486b17af3e4cced76e9852e7634f75ea87433db2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:38 +01:00
Khem Raj
3a1fa7dd59 shared-mime-info: Upgrade recipes from 0.90 -> 0.91
The parallel build problems are solved upstream therefore removed

License file has been corrected to use 'GNU Lesser GPL' instead of
'GNU library GPL' and some indentation changes

The license is LGPLv2+ therefore mark it so

(From OE-Core rev: 30e8ceb8d78d9dd0a381dd4e47da2ec6c449beaf)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-10 10:00:10 +01:00
Khem Raj
859e21aac1 shared-mime-info_0.90.bb: Fix more parallel build issues
While building for beagleboard with -j4 I ended up failures in
generating and checking xml files. This is a backport from upstream that
fixes the issue.

(From OE-Core rev: b56d984d59b5ea682f115b8ceeb04fbffe01f13c)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-27 16:55:16 +01:00
Qing He
f61514e3d8 shared-mime-info: upgrade to version 0.90
from 0.80
 - parallel build with 0.9 is buggy, disable part of the check for now

(From OE-Core rev: 122f8e4af98a049de01526a6d09e7eb422494b9a)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-04 00:54:43 +01:00
Saul Wold
3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Qing He
f9c840f427 shared-mime-info: upgrade to version 0.80
from 0.71

also move PR out of .inc file

Signed-off-by: Qing He <qing.he@intel.com>
2010-11-14 16:50:18 -08:00
Richard Purdie
20b4aa30c9 shared-mime-info: Don't run the util for the native version of the package
The whole point of building a native version of this package is
to provide the share-mime-info binary so using it in do_install
of the native package is incorrect. Add a modified do_install for
the native version of the package to avoid this.

[BUGID #466]

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-10-15 16:30:41 +01:00
Richard Purdie
d62ee7eaf2 packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-01 19:09:57 +01:00