Commit Graph

41 Commits

Author SHA1 Message Date
Peter Kjellerstedt
83766c9fff meta, meta-selftest: Replace more non-SPDX license identifiers
In commit ceda3238 (meta/meta-selftest/meta-skeleton: Update LICENSE
variable to use SPDX license identifiers) all LICENSE variables were
updated to only use SPDX license identifiers.

This does the same for comments and other variables where it is
appropriate to use the official SPDX license identifiers. There are
still references to, e.g., "GPLv3", but they are then typically in
descriptive text where they refer to the license in a generic sense.

(From OE-Core rev: 165759dced7fbe73b1db2ede67047896071dc6d0)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-03-01 23:44:59 +00:00
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
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
Dorinda
a7854ce174 meta/recipes-core: Add HOMEPAGE / DESCRIPTION
Added HOMEPAGE and DESCRIPTION for recipes with missing decriptions or homepage

[YOCTO #13471]

(From OE-Core rev: be8d3d0fa6bbc2924ffbdbaa66e9ffaef2b96de6)

Signed-off-by: Dorinda Bassey <dorindabassey@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-02-26 15:21:21 +00:00
Mingli Yu
c8910dd028 kbd: fix transaction conflict
After kdb upgrades to 2.4.0, vlock.pamd will be copied to /etc/pam.d/vlock
when install as [1].

And it will result in below Transaction error during do_rootfs when both
vlock and kbd installed:
| Transaction test error: file /etc/pam.d/vlock conflicts between attempted installs of vlock-2.2.3-r0.corei7_64 and kbd-2.4.0-r0.corei7_64

So rename vlock to vlock.kbd to fix the gap.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git/commit/?id=b9cbb05038e01a7c4b3899589c591734e643a281

(From OE-Core rev: 315f2453515a4cd0f1cc2d1bdddeb0c385aee2d4)

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-01-08 10:10:15 +00:00
Alexander Kanavin
4c16258770 kbd: upgrade 2.3.0 -> 2.4.0
(From OE-Core rev: 0bb9e942a6919990fc0f9491d754fe49b7f6aeaf)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-12-30 14:01:06 +00:00
Alexander Kanavin
65525a3c6a kbd: update 2.2.0 -> 2.3.0
Drop ptest support: upstream has rewritten the tests in GNU autotest,
which is another m4 monstrosity entirely incompatible with the idea of
installing tests to the target system.

All dropped patches are either merged upstream, or made for ptest.

(From OE-Core rev: 79f456da4b752f897bb5546d9ec291cdf4196ae8)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-08-02 14:42:08 +01:00
Richard Purdie
820a9b52f2 kbd: Fix build reproducibility issue
Our CFLAGS were being lost which was breaking reproducibile builds due to
losee of the debug prefix remapping flags. Fix this.

(From OE-Core rev: 037bef5c7dfe82642d19f07b38f6ccc783958e41)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-01-27 16:48:10 +00:00
Mingde (Matthew) Zeng
1e709614b5 kbd: make libkbdfile-test08 ptest work for multilib
This patch fixes kbd ptest libkbdfile-test08 failure in 64-bit images.

```sh
root@intel-x86-64:/usr/lib64/kbd/ptest# ./run-ptest
make: Entering directory '/usr/lib64/kbd/ptest/tests'
make[1]: Entering directory '/usr/lib64/kbd/ptest/tests'
PASS: libkbdfile-test01
PASS: libkbdfile-test02
PASS: libkbdfile-test03
PASS: libkbdfile-test04
PASS: libkbdfile-test05
PASS: libkbdfile-test06
PASS: libkbdfile-test07
FAIL: libkbdfile-test08
PASS: libkbdfile-test09
...
```

`DATADIR` and `ABS_DATADIR` are compile flags defined in
./kbd/tests/Makefile.am. `DATADIR` is the relative directory of
kbd, i.e `./kbd/ptest/tests` whereas `ABS_DATADIR` is the full
directory path, i.e `/usr/lib/kbd/ptest/tests`. The latter has a
problem when building ptests for a 64-bit image, because the tests
folder is located at `/usr/lib64/kbd/ptest/tests` instead.

Therefore `ABS_DATADIR` is changed to `DATADIR`, also consistent with
what *every other* kbd test is doing.

The test searches DATADIR recursively for a file named `test0.map`,
but it finds the wrong file at
    `/findfile/test_0/keymaps/test0.map`,
while it actually needs
    `/findfile/test_0/keymaps/i386/qwerty/test0.map`.

Thus appending `/i386` to `dirpath` so that `libkbdfile-test08.c`
    finds the right test file.

(From OE-Core rev: bdcda2c4ff3c96f686b8bd30cd17361ff3722a0f)

Signed-off-by: Matthew Zeng<Matthew.Zeng@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-01-27 16:48:08 +00:00
Alexander Kanavin
4024100f5b kbd: fix failing ptests
Some assumptions about where data files are needs to be adjusted.

(From OE-Core rev: ae39de0119ac1d21512fe64f7f7969790e396819)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-01-10 21:18:22 +00:00
Kai Kang
5ed831f45b kbd: fix ptest can NOT run issue
After kbd updated to 2.2.0, it fails to run ptest:

| make: *** No rule to make target 'libkbdfile-test01.c', needed by 'libkbdfile-test01'.

Update sed expression to fix such kind of issues. And also make target
dumpkeys-bkeymap and dumpkeys-bkeymap which are required by ptest.

(From OE-Core rev: 2fb86f46baed43316086ce10de635c326e073c2d)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-12-30 08:47:12 +00:00
Hongxu Jia
c26566e44b kbd: avoid vlock conflict with busybox
busybox as well as vlock utility from meta-oe provides vlock utility
which can conflict when with kbd if pam is a enabled distro_feature

Fixes image build errors

update-alternatives: Error: not linking <rootfs>/usr/bin/vlock to /bin/busybox.suid since <rootfs>/usr/bin/vlock exists and is not a link

ERROR: yoe-qt5-wayland-image-1.0-r0 do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot,
then please place them into pkg_postinst_ontarget_${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.

(From OE-Core rev: 08636708f6ca677a6ee6c88fa2999c7b70b7d474)

Signed-off-by: Khem Raj <raj.khem@gmail.com>

The vlock doesn't exist if PAM isn't enabled.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-12-15 09:10:46 +00:00
Alexander Kanavin
7c8a6cbf42 kbd: update to 2.2.0
Rebase set-proper-path-of-resources.patch

Add a patch to address a string format error; as it modifies
a .l file, add a dependency on flex which is processing that into
C source code.

License-Update: file with copyright statements was replaced with original GPLv2 text
(From OE-Core rev: 729ac34dce472378cec5447c366a28de2081e7de)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-12-09 12:00:42 +00:00
Pascal Bach
cf4232212e kbd: avoid conflict with busybox
showkey can also be provided by busybox

(From OE-Core rev: cddf0a6233cfae1f069c617213b93d4945197eec)

Signed-off-by: Pascal Bach <pascal.bach@siemens.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
Ross Burton
46a2d5ef5c kbd: 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: b1fa565ffa02796eaa55f5ac6700f1a932d62957)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-03-07 06:34:50 -08:00
Anuj Mittal
b0d9ce473f kbd: build tests only when ptest is enabled
Also include the libcheck dependency only when tests are to be built.

(From OE-Core rev: f4fbdc8cc19be843f733701fc6fa2ac8cf5c3699)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-03-04 11:35:40 +00:00
Hongxu Jia
b678d594ba kbd-ptest: improve reproducibility
Remove remaining build host references of ptest's Makefile.

(From OE-Core rev: 9de3c2568d63fffb12604c201c5f0fa64e14a2cc)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-02-16 18:05:39 +00:00
Huang Qiyu
d8192aa009 kbd: Add HOMEPAGE info into recipe file.
(From OE-Core rev: 5b5153961965d02e07ba78713ecd6ff7dd3861a3)

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-09-21 09:05:49 +01:00
Alexander Kanavin
22c56bd982 kbd: update to 2.0.4
(From OE-Core rev: 40b19c1710aff449b8c7cf93f2b635b44fa85e7d)

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>
2017-03-01 23:27:09 +00:00
Peter Kjellerstedt
254bfb1071 recipes: Make use of the new bb.utils.filter() function
(From OE-Core rev: 0a1427bf9aeeda6bee2cc0af8da4ea5fd90aef6f)

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-03-01 11:17:45 +00:00
Kai Kang
1ab3a23739 kbd: create ptest sub-package
Create kbd-ptest sub-package:

* add file run-ptest and runtime dependency make
* modify installed Makefile to disable remake Makefile and the test
  cases when run the ptest
* add patch to set proper path for test cases to get resource files

(From OE-Core rev: 901ccb3e70e9036112c51acc6d18d05025f6e1bb)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-10-01 21:45:56 +01:00
Robert Yang
e7ec6cf27c kbd: remove PARALLEL_MAKEINST = ""
There isn't anything wrong when looked into its Makefile, I guess that
it had been fixed during ugprade, and I've applied this patch locally
for more than 2 months, there isn't anything wrong.

(From OE-Core rev: 53687cadaab307fc843768d61973ed1630eb28af)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-08-20 16:06:03 +01:00
Maxin B. John
e912c46887 kbd: remove uclibc-stdarg.patch
Remove uclibc-stdarg.patch as it is already available in kbd 2.0.3
release.

commit id: b8ef7897867cb1ba1b9f87d004674133c291b1b0
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Mon Jan 6 10:27:56 2014 -0500
  libkeymap: include stdarg.h where used

(From OE-Core rev: 12414813221830b33982337092b3a7bed92a2980)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-13 10:12:53 +01:00
Alexander Kanavin
fef0ec64d6 kbd: update to 2.0.3
0003-Only-inluclude-kernel-headers-with-glibc.patch is handling #include lines that
are no longer present in the upstream source so it was dropped.

(From OE-Core rev: 3232c56c01631953445429d1eb7ab532404d6271)

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-12-16 12:12:17 +00:00
Maxin B. John
acdc2db899 kbd: provide a workaround for build failures
An easy workaround for kbd build failure is to disable
parallel make install for now.

[YOCTO #7436]

(From OE-Core rev: eb8bed1a5eb9690462f8724c5b00a5d7044eba4c)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-10-12 14:36:28 +01:00
Khem Raj
683942be6f kbd: Mark glibc headers under __GLIBC__
Change-Id: I4e91038ea8b05defbb9d574c61eea96ccc064e51
(From OE-Core rev: f4ad72e6e46e481d3fad920be9bb417fd175a991)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-13 22:33:23 +01:00
Saul Wold
4971febcdf kbd: Upgrade to 2.0.2
Tarball compression type changed to zx

(From OE-Core rev: 12b3b7191c14a0151977a9e9b66ba446228074bf)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-07-17 12:28:51 +01:00
Richard Purdie
e5cf31cf93 recipes: Add missing pkgconfig class inherits
These recipes all use pkg-config in some way but were missing
dependencies on the tool, this patch adds them.

(From OE-Core rev: 2543b14dd0ca13005be0df027543431fc8e882ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-06-03 16:49:19 +01:00
Otavio Salvador
4c14b09498 Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.

(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-25 17:19:19 +01: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
Khem Raj
4fdc3d77d4 kbd: Fix stdarg related errors on uclibc
It does not get stdarg.h included indirectly as it happens
on uclibc due to different include chain

(From OE-Core rev: eac8cb7cacab7f2fb392128aa5ebc2046ca4a793)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-08 17:31:36 +00:00
Saul Wold
41f55f4370 kbd: upgrade to 2.0.1
(From OE-Core rev: e1dc714593d3773f27973b4c9cc09495fa00e013)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-08 17:25:36 +00:00
Saul Wold
d5552611ce kbd: Use libcheck instead of check
(From OE-Core rev: 8ed44adc5ad4f54acc985f1f76af554d8ddf1a44)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-26 15:59:15 +01:00
Saul Wold
81b08526c0 kbd: Update to 2.0.0
Removed patch that is now included upstream, add DEPENDS on check since it
is now used to create. Additional added PACKAGECONFIG for PAM and --disbale-vlock

License checksum updated to reflect additional Copyright owners names.

(From OE-Core rev: 48621dc693b5f63419e042ab5dd21ea12ce05f67)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-18 15:49:58 +01:00
Li Zhijian
7d6094489c kbd: Allow resizecons on x86_64
(From OE-Core rev: cec49d5083f749d9886207e88648ddd4c12fbc87)

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-17 14:35:18 +01:00
Li Zhijian
0af5853de2 kbd: Fix coding sytle
(From OE-Core rev: 2ababaf74255e7ad43cc951f2f2bc569ef955837)

Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-09-17 14:35:18 +01:00
Saul Wold
80e764e610 kbd: cleanup update-alternatives deprecated code
(From OE-Core rev: 8240556c40a499aff5a405de3e28e1ed749e8ef5)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-15 14:26:27 +01:00
Mark Hatle
a253b0e85e kbd: Use update-alternatives
Change to use ALTERNATIVE_LINKS from update-alternatives.  This ensures
the links are created consistently and the package provides are
correct.

(From OE-Core rev: 728569a3db005a935e6b08d6aac3e23e88d486df)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:09 +01:00
Martin Jansa
dc80635ae3 kbd: use u-a for chvt, deallocvt, fgconssole, openvt, conflicts with busybox
(From OE-Core rev: c7d8bae47ea80f02af18e67b33e5ac6d1508432a)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-15 12:05:27 +00:00
Martin Jansa
e6c97842bf kbd: add RREPLACES/RCONFLICTS/RPROVIDES for upgradeable path from console-tools
(From OE-Core rev: 9065a75d4a29b2528b5558d91bcd500ca51baa84)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 12:08:58 +00:00
Martin Jansa
18e61c6b32 kbd: import from meta-oe
* replaces console-tools used in keymaps

(From OE-Core rev: 53ba913e7df79da8735baef54891ebe47bbb159d)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 12:08:58 +00:00