From 8410d61f39efb52ffab1dc89efb05ca3ae837907 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 25 Nov 2019 09:40:59 -0500 Subject: meta-openembedded: subtree update:53d431639a..e4ac09169d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Andreas Müller (9): file-roller: add gsettings to inherit tracker: add gsettings to inherit nautilus: add gsettings to inherit libgweather: add gsetings & upstream-version-is-even to inherit gnome-settings-daemon: add gsettings to inherit gnome-terminal: add gsettings to inherit parole: upgrade 1.0.4 -> 1.0.5 exo: upgrade 0.12.8 -> 0.12.9 gedit: add gsettings to inherit Changqing Li (1): dnsmasq.conf: fix dnsmasq path Denys Dmytriyenko (1): recipes: rename distro_features_check to features_check Jan Luebbe (6): openct: merge do_install and do_install_append pcsc-lite: add support for native builds opensc: use pcsc-lite instead of openct by default opensc: add support for native builds libp11: add support for native builds softhsm: add recipe Kai Kang (1): mariadb: replace dependency readline with libedit Khem Raj (6): dlm: Drop -fstack-clash-protection for clang ruli: Fix install step and build samples too libkcapi: Update patch to upstream submitted one sanlock: Use python3 and add sanlock user/group sanlock: Replace cp -a with cp -R --no-dereference nodejs: libatomic patch should be target specific Lei YU (1): googletest: move to release 1.10.0 Nicola Lunghi (4): python3-importlib-metadata: fix class-target overriding default dependencies python-configparser: Add native and nativesdk to BBCLASSEXTEND python-contextlib2: Add native and nativesdk to BBCLASSEXTEND python-scandir: Add native and nativesdk to BBCLASSEXTEND Paul Barker (1): liblockfile: Rename patch Qi.Chen@windriver.com (1): python-jsonschema: add missing dependency Ross Burton (1): python-babel: add BBCLASSEXTEND for native/nativesdk Rouven Czerwinski (1): python-pyelftools: add recipes Stefan Agner (2): haveged: use the Fedora service file available from upstream networkmanager: do not deploy unnecessary udev rule file Wang Mingyu (3): mcelog: upgrade 1.65 -> 1.66 hwdata: upgrade 0.328 -> 0.329 libdev-checklib-perl: upgrade 1.13 -> 1.14 Zang Ruochen (17): python-zopeinterface: upgrade 4.6.0 -> 4.7.1 python-yappi: upgrade 0.98 -> 1.0 python-xstatic: upgrade 1.0.1 -> 1.0.2 python-xlrd: upgrade 1.1.0 -> 1.2.0 python-urllib3: upgrade 1.25.6 -> 1.25.7 python-tzlocal: upgrade 1.5.1 -> 2.0.0 python-twitter: upgrade 3.7.0 -> 3.8.0 python-twisted: upgrade 19.7.0 -> 19.10.0 python3-meh: upgrade 0.47 -> 0.48 python-pyephem: upgrade 3.7.6.0 -> 3.7.7.0 python3-pykickstart: upgrade 3.20 -> 3.22 python-pyparted: upgrade 3.11.2 -> 3.11.3 libextutils-cppguess-perl: upgrade 0.12 -> 0.20 libmoo-perl: upgrade 2.003004 -> 2.003006 libdbd-sqlite-perl: upgrade 1.62 -> 1.64 libclass-method-modifiers-perl: upgrade 2.12 -> 2.13 librole-tiny-perl: upgrade 2.000006 -> 2.001004 niko.mauno@vaisala.com (2): gitpkgv.bbclass: Use --git-dir option gitpkgv.bbclass: Support also lightweight tags Change-Id: I00fb24df7bb3849ed0c9337a66623d9b4cba5999 Signed-off-by: Brad Bishop --- meta-openembedded/meta-oe/classes/gitpkgv.bbclass | 15 +++---- .../recipes-benchmark/glmark2/glmark2_git.bb | 2 +- .../recipes-connectivity/hostapd/hostapd_2.9.bb | 2 +- .../obex/obex-data-server_0.4.6.bb | 2 +- .../meta-oe/recipes-core/dbus/dbus-broker_21.bb | 2 +- ...e-__builtin_bswap32-on-Clang-if-supported.patch | 39 +++++++++++++++++ .../libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch | 24 +++++----- .../recipes-crypto/libkcapi/libkcapi_git.bb | 1 + .../meta-oe/recipes-dbs/mysql/mariadb.inc | 1 - .../meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb | 2 +- .../recipes-devtools/geany/geany-plugins_1.36.bb | 2 +- .../meta-oe/recipes-devtools/geany/geany_1.36.bb | 2 +- .../meta-oe/recipes-devtools/glade/glade_3.22.1.bb | 2 +- .../recipes-devtools/nodejs/nodejs_10.17.0.bb | 2 +- .../perl/libdev-checklib-perl_1.13.bb | 21 --------- .../perl/libdev-checklib-perl_1.14.bb | 21 +++++++++ .../meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb | 2 +- .../recipes-extended/boinc/boinc-client_7.12.bb | 2 +- .../recipes-extended/gnuplot/gnuplot_5.2.2.bb | 2 +- .../recipes-extended/haveged/haveged_1.9.6.bb | 2 +- .../meta-oe/recipes-extended/icewm/icewm_1.5.5.bb | 2 +- .../recipes-extended/libgxim/libgxim_0.5.0.bb | 2 +- .../0001-Makefile.in-install-nfslock-libs.patch | 31 +++++++++++++ ...le.in-install-nfslock.so-and-nfslock.so.0.patch | 31 ------------- .../liblockfile/liblockfile_1.14.bb | 2 +- .../recipes-extended/libreport/libreport_2.10.0.bb | 2 +- .../recipes-extended/libwmf/libwmf_0.2.8.4.bb | 2 +- .../meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb | 2 +- .../recipes-extended/openwsman/openwsman_2.6.11.bb | 2 +- .../recipes-extended/pam/pam-plugin-ccreds_11.bb | 2 +- .../recipes-extended/pam/pam-plugin-ldapdb_1.3.bb | 2 +- .../pam/pam-ssh-agent-auth_0.10.3.bb | 2 +- .../recipes-extended/polkit/polkit-group-rule.inc | 2 +- .../recipes-extended/polkit/polkit_0.116.bb | 2 +- ...lace-cp-a-with-cp-R-no-dereference-preser.patch | 51 ++++++++++++++++++++++ .../recipes-extended/sanlock/sanlock_3.8.0.bb | 14 +++++- .../sblim-sfcb/sblim-sfcb_1.4.9.bb | 2 +- .../meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb | 2 +- .../gnome-themes/gnome-themes-standard_3.28.bb | 2 +- .../meta-oe/recipes-gnome/gtk+/gtk+.inc | 2 +- .../meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb | 2 +- .../meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb | 2 +- .../meta-oe/recipes-gnome/vte9/vte9.inc | 2 +- .../fontforge/fontforge_20190801.bb | 2 +- .../recipes-graphics/freeglut/freeglut_3.0.0.bb | 2 +- .../recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb | 2 +- .../meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb | 2 +- .../meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb | 2 +- .../meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb | 2 +- .../recipes-graphics/gtkperf/gtkperf_0.40.bb | 2 +- .../recipes-graphics/gtkwave/gtkwave_3.3.102.bb | 2 +- .../recipes-graphics/libforms/libforms_1.2.3.bb | 2 +- .../recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb | 2 +- .../meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | 2 +- .../recipes-graphics/numlockx/numlockx_1.2.bb | 2 +- .../recipes-graphics/openbox/openbox_3.6.1.bb | 2 +- .../recipes-graphics/pango/pangomm_2.42.0.bb | 2 +- .../recipes-graphics/renderdoc/renderdoc_1.4.bb | 2 +- .../meta-oe/recipes-graphics/surf/surf_2.0.bb | 2 +- .../recipes-graphics/tigervnc/tigervnc_1.9.0.bb | 2 +- .../unclutter-xfixes/unclutter-xfixes_1.5.bb | 2 +- .../meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb | 2 +- .../recipes-graphics/x11vnc/x11vnc_0.9.16.bb | 2 +- .../xcursorgen/xcursorgen_1.0.7.bb | 2 +- .../xdotool/xdotool_1.20100416.2809.bb | 2 +- .../xorg-data/xorg-data-common.inc | 2 +- .../xorg-driver/xf86-video-ati_19.0.1.bb | 2 +- .../xorg-driver/xf86-video-nouveau_1.0.16.bb | 2 +- .../xorg-font/font-adobe-100dpi_1.0.3.bb | 2 +- .../xorg-font/font-adobe-utopia-100dpi_1.0.4.bb | 2 +- .../xorg-font/font-bh-100dpi_1.0.3.bb | 2 +- .../font-bh-lucidatypewriter-100dpi_1.0.3.bb | 2 +- .../xorg-font/font-bitstream-100dpi_1.0.3.bb | 2 +- .../xorg-font/font-cursor-misc_1.0.3.bb | 2 +- .../xorg-font/font-misc-misc_1.1.2.bb | 2 +- .../xorg-font/xorg-fonts-100dpi.bb | 2 +- .../xscreensaver/xscreensaver_5.39.bb | 2 +- .../xserver-common/xserver-common_1.34.bb | 2 +- .../recipes-multimedia/mplayer/mpv_0.26.0.bb | 2 +- .../pulseaudio/pavucontrol_4.0.bb | 2 +- .../recipes-multimedia/xpext/xpext_1.0-5.bb | 2 +- .../meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb | 2 +- .../recipes-navigation/orrery/orrery_2.7.bb | 2 +- .../recipes-security/passwdqc/passwdqc_1.3.1.bb | 2 +- .../recipes-security/softhsm/softhsm_git.bb | 18 ++++++++ .../canonical-multitouch/geis_2.2.17.bb | 2 +- .../meta-oe/recipes-support/colord/colord.bb | 2 +- .../meta-oe/recipes-support/fltk/fltk.bb | 2 +- .../meta-oe/recipes-support/hwdata/hwdata_git.bb | 4 +- .../recipes-support/libp11/libp11_0.4.10.bb | 2 + .../recipes-support/links/links-x11_2.16.bb | 2 +- .../meta-oe/recipes-support/mcelog/mcelog_165.bb | 35 --------------- .../meta-oe/recipes-support/mcelog/mcelog_166.bb | 35 +++++++++++++++ .../recipes-support/openct/openct_0.6.20.bb | 6 +-- .../recipes-support/opensc/opensc_0.19.0.bb | 11 +++-- .../recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb | 9 ++-- .../recipes-support/pidgin/pidgin-otr_4.0.2.bb | 2 +- .../recipes-support/remmina/remmina_1.3.6.bb | 2 +- .../meta-oe/recipes-support/synergy/synergy_git.bb | 2 +- .../recipes-support/toscoterm/toscoterm_git.bb | 2 +- .../meta-oe/recipes-support/udisks/udisks2_git.bb | 2 +- .../meta-oe/recipes-support/uim/uim_1.8.8.bb | 2 +- .../recipes-support/upower/upower_0.99.11.bb | 2 +- .../recipes-support/utouch/utouch-mtview_git.bb | 2 +- .../recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb | 2 +- .../meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb | 2 +- .../recipes-test/googletest/googletest_1.8.1.bb | 21 --------- .../recipes-test/googletest/googletest_git.bb | 21 +++++++++ 108 files changed, 355 insertions(+), 230 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Use-__builtin_bswap32-on-Clang-if-supported.patch delete mode 100644 meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb create mode 100644 meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.14.bb create mode 100644 meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch delete mode 100644 meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch create mode 100644 meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch create mode 100644 meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_165.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_166.bb delete mode 100644 meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.8.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb (limited to 'meta-openembedded/meta-oe') diff --git a/meta-openembedded/meta-oe/classes/gitpkgv.bbclass b/meta-openembedded/meta-oe/classes/gitpkgv.bbclass index 2d9680a35c..ab591bd45c 100644 --- a/meta-openembedded/meta-oe/classes/gitpkgv.bbclass +++ b/meta-openembedded/meta-oe/classes/gitpkgv.bbclass @@ -7,8 +7,8 @@ # NN equals the total number of revs up to SRCREV # GITHASH is SRCREV's (full) hash # -# - GITPKGVTAG which is the output of 'git describe' allowing for -# automatic versioning +# - GITPKGVTAG which is the output of 'git describe --tags --exact-match' +# allowing for automatic versioning # # gitpkgv.bbclass assumes the git repository has been cloned, and # contains SRCREV. So ${GITPKGV} and ${GITPKGVTAG} should never be @@ -87,10 +87,8 @@ def get_git_pkgv(d, use_tags): if not os.path.exists(rev_file) or os.path.getsize(rev_file)==0: commits = bb.fetch2.runfetchcmd( - "cd %(repodir)s && " - "git rev-list %(rev)s -- 2> /dev/null " - "| wc -l" % vars, - d, quiet=True).strip().lstrip('0') + "git --git-dir=%(repodir)s rev-list %(rev)s -- 2>/dev/null | wc -l" + % vars, d, quiet=True).strip().lstrip('0') if commits != "": oe.path.remove(rev_file, recurse=False) @@ -105,9 +103,8 @@ def get_git_pkgv(d, use_tags): if use_tags: try: output = bb.fetch2.runfetchcmd( - "cd %(repodir)s && " - "git describe %(rev)s 2>/dev/null" % vars, - d, quiet=True).strip() + "git --git-dir=%(repodir)s describe %(rev)s --tags --exact-match 2>/dev/null" + % vars, d, quiet=True).strip() ver = gitpkgv_drop_tag_prefix(output) except Exception: ver = "0.0-%s-g%s" % (commits, vars['rev'][:7]) diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 605417634a..d590b0501b 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -19,7 +19,7 @@ SRCREV = "c17fd14505f30d9e4dbad276f7aa956fd21a637b" S = "${WORKDIR}/git" -inherit waf pkgconfig distro_features_check +inherit waf pkgconfig features_check REQUIRED_DISTRO_FEATURES += "opengl" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb index e26a6ff86c..982514f5df 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.9.bb @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "881d7d6a90b2428479288d64233151448f8990ab4958e0ecaca7eeb3c9 S = "${WORKDIR}/hostapd-${PV}" B = "${WORKDIR}/hostapd-${PV}/hostapd" -inherit update-rc.d systemd pkgconfig distro_features_check +inherit update-rc.d systemd pkgconfig features_check CONFLICT_DISTRO_FEATURES = "openssl-no-weak-ciphers" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb b/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb index c201c86510..8763709355 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/obex/obex-data-server_0.4.6.bb @@ -10,7 +10,7 @@ SRC_URI = "http://tadas.dailyda.com/software/obex-data-server-${PV}.tar.gz \ SRC_URI[md5sum] = "961ca5db6fe9c97024e133cc6203cc4d" SRC_URI[sha256sum] = "b399465ddbd6d0217abedd9411d9d74a820effa0a6a142adc448268d3920094f" -inherit distro_features_check autotools-brokensep pkgconfig +inherit features_check autotools-brokensep pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb index d639abb429..98c50c4b21 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_21.bb @@ -14,7 +14,7 @@ SRC_URI += " file://0004-launcher-fix-build-with-musl-libc.patch" SRC_URI[md5sum] = "a17886a92ab1e0bc2e4b1a274339e388" SRC_URI[sha256sum] = "6fff9a831a514659e2c7d704e76867ce31ebcf43e8d7a62e080c6656f64cd39e" -inherit meson pkgconfig systemd distro_features_check +inherit meson pkgconfig systemd features_check DEPENDS = "expat systemd" DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Use-__builtin_bswap32-on-Clang-if-supported.patch b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Use-__builtin_bswap32-on-Clang-if-supported.patch new file mode 100644 index 0000000000..e713665ab3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-Use-__builtin_bswap32-on-Clang-if-supported.patch @@ -0,0 +1,39 @@ +From 7b5dd67fee58f9f54c8a676abe2131776c0a3c52 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 20 Nov 2019 13:41:39 -0800 +Subject: [PATCH] Use __builtin_bswap32 on Clang if supported + +clang pretends to be gcc 4.2.1 so GCC_VERSION macro will decide that +__builtin_bswap32 is not supported on clang, whereas in reality it might +so its better to add a check for enquiring clang if it supports +__builtin_bswap32 or not + +Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/83] +Signed-off-by: Khem Raj +--- + lib/kcapi-kdf.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/kcapi-kdf.c b/lib/kcapi-kdf.c +index 9e53a0b..f32fbe9 100644 +--- a/lib/kcapi-kdf.c ++++ b/lib/kcapi-kdf.c +@@ -54,10 +54,14 @@ + #include "kcapi.h" + #include "internal.h" + ++#ifndef __has_builtin ++# define __has_builtin(x) 0 ++#endif ++ + #define GCC_VERSION (__GNUC__ * 10000 \ + + __GNUC_MINOR__ * 100 \ + + __GNUC_PATCHLEVEL__) +-#if GCC_VERSION >= 40400 ++#if GCC_VERSION >= 40400 || (defined(__clang__) && __has_builtin(__builtin_bswap32)) + # define __HAVE_BUILTIN_BSWAP32__ + #endif + +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch index 3dd7ea7f9b..7ed9caf096 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi/0001-kcapi-kdf-Move-code-to-fix.patch @@ -1,4 +1,4 @@ -From 00c1654e368f728b213c4e3782045d54098edb25 Mon Sep 17 00:00:00 2001 +From 8f961521add49278b48c9721fc53e05ee3543b74 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 16 Nov 2019 23:03:51 -0800 Subject: [PATCH] kcapi-kdf: Move code to fix @@ -6,13 +6,14 @@ Subject: [PATCH] kcapi-kdf: Move code to fix Fixes clang build unused function '_bswap32' [-Werror,-Wunused-function] +Upstream-Status: Submitted [https://github.com/smuellerDD/libkcapi/pull/83] Signed-off-by: Khem Raj --- - lib/kcapi-kdf.c | 36 ++++++++++++++++-------------------- - 1 file changed, 16 insertions(+), 20 deletions(-) + lib/kcapi-kdf.c | 37 +++++++++++++++++-------------------- + 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/lib/kcapi-kdf.c b/lib/kcapi-kdf.c -index ea39846..8e4a636 100644 +index ea39846..9e53a0b 100644 --- a/lib/kcapi-kdf.c +++ b/lib/kcapi-kdf.c @@ -54,6 +54,20 @@ @@ -26,17 +27,17 @@ index ea39846..8e4a636 100644 +# define __HAVE_BUILTIN_BSWAP32__ +#endif + -+#ifdef __HAVE_BUILTIN_BSWAP32__ -+# define be_bswap32(x) (uint32_t)__builtin_bswap32((uint32_t)(x)) +/* Endian dependent byte swap operations. */ -+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +# define be_bswap32(x) ((uint32_t)(x)) +#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -+ ++# ifdef __HAVE_BUILTIN_BSWAP32__ ++# define be_bswap32(x) (uint32_t)__builtin_bswap32((uint32_t)(x)) ++# else static inline uint32_t rol32(uint32_t x, int n) { return ( (x << (n&(32-1))) | (x >> ((32-n)&(32-1))) ); -@@ -68,27 +82,9 @@ static inline uint32_t _bswap32(uint32_t x) +@@ -68,27 +82,10 @@ static inline uint32_t _bswap32(uint32_t x) { return ((rol32(x, 8) & 0x00ff00ffL) | (ror32(x, 8) & 0xff00ff00L)); } @@ -59,10 +60,11 @@ index ea39846..8e4a636 100644 -# define be_bswap32(x) ((uint32_t)(x)) -#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -# define be_bswap32(x) _swap32(x) -+# define be_bswap32(x) _bswap32(x) ++# define be_bswap32(x) _bswap32(x) ++# endif #else -#error "Endianess not defined" -+# error "Neither builtin_bswap32 nor endianess defined" ++# error "endianess not defined" #endif DSO_PUBLIC diff --git a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb index aa438e5859..4e217a351d 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/libkcapi/libkcapi_git.bb @@ -11,6 +11,7 @@ PV = "1.1.5" SRC_URI = " \ git://github.com/smuellerDD/libkcapi.git \ file://0001-kcapi-kdf-Move-code-to-fix.patch \ + file://0001-Use-__builtin_bswap32-on-Clang-if-supported.patch \ " inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index e1ae58ae7a..ec5ac11ef0 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -58,7 +58,6 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} setupdb" PACKAGECONFIG_class-native = "" PACKAGECONFIG[pam] = ",-DWITHOUT_AUTH_PAM=TRUE,libpam" PACKAGECONFIG[valgrind] = "-DWITH_VALGRIND=TRUE,-DWITH_VALGRIND=FALSE,valgrind" -PACKAGECONFIG[libedit] = "-DLIBEDIT_INTERFACE=TRUE,-DLIBEDIT_INTERFACE=FALSE,libedit" PACKAGECONFIG[krb5] = ", ,krb5" PACKAGECONFIG[setupdb] = ", ,,${PN}-setupdb" diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb index de24c920f0..c0b53379d9 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.3.18.bb @@ -2,7 +2,7 @@ require mariadb.inc EXTRA_OECMAKE += "-DSTACK_DIRECTION=-1" -DEPENDS += "mariadb-native bison-native openssl ncurses zlib readline libaio libevent libxml2" +DEPENDS += "mariadb-native bison-native openssl ncurses zlib libaio libedit libevent libxml2" PROVIDES += "mysql5 libmysqlclient" diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb index f768998450..c43d23b347 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany-plugins_1.36.bb @@ -24,7 +24,7 @@ DEPENDS = " \ libgit2 \ " -inherit distro_features_check autotools pkgconfig gtk-icon-cache +inherit features_check autotools pkgconfig gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb index 193c198a18..0d29b138a9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.36.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5" DEPENDS = "gtk+3 libxml-parser-perl-native python3-docutils-native intltool-native" -inherit distro_features_check autotools pkgconfig perlnative pythonnative gettext +inherit features_check autotools pkgconfig perlnative pythonnative gettext REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.1.bb b/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.1.bb index bd4b586f1b..cdd7057b39 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.1.bb @@ -9,7 +9,7 @@ DEPENDS = "gtk+ gtk+3 glib-2.0 libxml2 intltool-native \ " -inherit distro_features_check autotools pkgconfig gnomebase gobject-introspection +inherit features_check autotools pkgconfig gnomebase gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index 8c690ae7dc..e36995c258 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb @@ -18,10 +18,10 @@ COMPATIBLE_HOST_riscv32 = "null" SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ file://0004-Make-compatibility-with-gcc-4.8.patch \ - file://0005-Link-atomic-library.patch \ file://0007-v8-don-t-override-ARM-CFLAGS.patch \ " SRC_URI_append_class-target = " \ + file://0005-Link-atomic-library.patch \ file://0002-Using-native-torque.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb deleted file mode 100644 index f5bdb2087f..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.13.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "A Perl module that checks whether a particular C library and its headers are available" -DESCRIPTION = "This module provides a way of checking whether a particular library \ -and its headers are available, by attempting to compile a simple program and \ -link against it." -HOMEPAGE = "https://metacpan.org/pod/Devel::CheckLib" -SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" - -LIC_FILES_CHKSUM = "file://README;md5=7911cdbb572d25c5f2e2ea17f669efc2" - -SRC_URI = "https://cpan.metacpan.org/modules/by-module/Devel/Devel-CheckLib-${PV}.tar.gz \ - file://0001-CheckLib.pm-don-t-execute-the-binary.patch \ -" -SRC_URI[md5sum] = "930216c5abc0f016df8a7539d48c891a" -SRC_URI[sha256sum] = "24adfd908705dfac4bb320711763f37126b75cf54b3566c2c27c7cdef9c429a8" - -S = "${WORKDIR}/Devel-CheckLib-${PV}" - -inherit cpan - -BBCLASSEXTEND="native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.14.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.14.bb new file mode 100644 index 0000000000..a96e3adc77 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libdev-checklib-perl_1.14.bb @@ -0,0 +1,21 @@ +SUMMARY = "A Perl module that checks whether a particular C library and its headers are available" +DESCRIPTION = "This module provides a way of checking whether a particular library \ +and its headers are available, by attempting to compile a simple program and \ +link against it." +HOMEPAGE = "https://metacpan.org/pod/Devel::CheckLib" +SECTION = "libs" +LICENSE = "Artistic-1.0 | GPL-1.0+" + +LIC_FILES_CHKSUM = "file://README;md5=7911cdbb572d25c5f2e2ea17f669efc2" + +SRC_URI = "https://cpan.metacpan.org/modules/by-module/Devel/Devel-CheckLib-${PV}.tar.gz \ + file://0001-CheckLib.pm-don-t-execute-the-binary.patch \ +" +SRC_URI[md5sum] = "3519cbf9fe5ec3404449d5330ee5537f" +SRC_URI[sha256sum] = "f21c5e299ad3ce0fdc0cb0f41378dca85a70e8d6c9a7599f0e56a957200ec294" + +S = "${WORKDIR}/Devel-CheckLib-${PV}" + +inherit cpan + +BBCLASSEXTEND="native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb index 459ae8253b..3d77670749 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb @@ -35,7 +35,7 @@ S = "${WORKDIR}/${BPN}${PV}/unix" VER = "${@os.path.splitext(d.getVar('PV'))[0]}" LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" -inherit autotools distro_features_check +inherit autotools features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb index e505bb4c5f..d472d3269e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.12.bb @@ -37,7 +37,7 @@ SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ file://gtk-configure.patch \ " -inherit gettext autotools pkgconfig distro_features_check systemd +inherit gettext autotools pkgconfig features_check systemd REQUIRED_DISTRO_FEATURES += "opengl" diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb index f9fd8ae88e..898627bc17 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.2.2.bb @@ -7,7 +7,7 @@ LICENSE = "gnuplot" LIC_FILES_CHKSUM = "file://Copyright;md5=243a186fc2fd3b992125d60d5b1bab8f" DEPENDS = "${BPN}-native virtual/libx11 gd readline" -inherit autotools distro_features_check +inherit autotools features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb index a2f0d07f24..e5b9bc9476 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.6.bb @@ -22,7 +22,7 @@ EXTRA_OECONF = "\ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "--enable-init=service.redhat --enable-initdir=${systemd_system_unitdir}, --enable-init=sysv.redhat, systemd" +PACKAGECONFIG[systemd] = "--enable-init=service.fedora --enable-initdir=${systemd_system_unitdir}, --enable-init=sysv.redhat, systemd" INITSCRIPT_PACKAGES = "${PN}" INITSCRIPT_NAME = "haveged" diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb index 63fca1dd11..fe6de008f9 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_1.5.5.bb @@ -8,7 +8,7 @@ SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV} SRC_URI[md5sum] = "6eba94a7935a0531d2c14eeb1426aeef" SRC_URI[sha256sum] = "f1c1344b20a9e8635143f70ee27930b55f813c15ca61f84d77584d311b6ac027" -inherit autotools pkgconfig gettext perlnative distro_features_check qemu +inherit autotools pkgconfig gettext perlnative features_check qemu REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ diff --git a/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb index 7e4c330a19..8a2886b8cd 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libgxim/libgxim_0.5.0.bb @@ -26,6 +26,6 @@ file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" EXTRA_OECONF = " --disable-static --disable-rebuilds --enable-compile-warnings=minimum" DEPENDS += "gtk+ glib-2.0 glib-2.0-native ruby-native intltool-native gnome-common-native" -inherit distro_features_check autotools pkgconfig gettext +inherit features_check autotools pkgconfig gettext REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch new file mode 100644 index 0000000000..a6b297b592 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock-libs.patch @@ -0,0 +1,31 @@ +From 631d46efff2a6d8970e202ba5422ebedd17a8d2f Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Thu, 19 Jul 2018 01:00:10 -0700 +Subject: [PATCH] Makefile.in: install nfslock.so and nfslock.so.0 + +* install the missing soname library + +Upstream-Status: Pending + +Signed-off-by: Jackie Huang +Signed-off-by: Mingli Yu +--- + Makefile.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile.in b/Makefile.in +index 1e4130e..0f1b506 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -77,6 +77,8 @@ install_common: + install_nfslib: nfslib + install -d -m 755 -g root -p $(nfslockdir) + install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) ++ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so ++ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 + if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi + + clean: +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch deleted file mode 100644 index a6b297b592..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile/0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 631d46efff2a6d8970e202ba5422ebedd17a8d2f Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Thu, 19 Jul 2018 01:00:10 -0700 -Subject: [PATCH] Makefile.in: install nfslock.so and nfslock.so.0 - -* install the missing soname library - -Upstream-Status: Pending - -Signed-off-by: Jackie Huang -Signed-off-by: Mingli Yu ---- - Makefile.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.in b/Makefile.in -index 1e4130e..0f1b506 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -77,6 +77,8 @@ install_common: - install_nfslib: nfslib - install -d -m 755 -g root -p $(nfslockdir) - install -m 755 nfslock.so.$(NFSVER) $(nfslockdir) -+ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so -+ ln -sf nfslock.so.$(NFSVER) $(libdir)/nfslock.so.0 - if test "$(DESTDIR)" = ""; then @LDCONFIG@; fi - - clean: --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb index de2c1e36d3..10d88a3b5a 100644 --- a/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/liblockfile/liblockfile_1.14.bb @@ -8,7 +8,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14.orig.tar.gz \ ${DEBIAN_MIRROR}/main/libl/liblockfile/liblockfile_1.14-1.debian.tar.bz2;name=1.14-1 \ file://configure.patch \ file://0001-Makefile.in-add-DESTDIR.patch \ - file://0001-Makefile.in-install-nfslock.so-and-nfslock.so.0.patch \ + file://0001-Makefile.in-install-nfslock-libs.patch \ file://liblockfile-fix-install-so-to-man-dir.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb index e50226e276..4276c49173 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libreport/libreport_2.10.0.bb @@ -23,7 +23,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "systemd" inherit gettext autotools python3native pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb index 2c31a21c0e..401c2c4dab 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb @@ -12,7 +12,7 @@ DEPENDS = "freetype libpng jpeg expat gtk+" BBCLASSEXTEND = "native" -inherit distro_features_check autotools pkgconfig +inherit features_check autotools pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb index 33142d6fe5..41a79daf4c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs_60.5.2.bb @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "f51039c997415fd0f13f8e01966b4a8ff80cbf90deb8b14c18827104a3 inherit autotools pkgconfig perlnative pythonnative -inherit distro_features_check +inherit features_check CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" DEPENDS += "nspr zlib python-six-native python-pytoml-native \ diff --git a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb index 16a83a4be3..9d5a2307e7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/openwsman/openwsman_2.6.11.bb @@ -12,7 +12,7 @@ SECTION = "Applications/System" DEPENDS = "curl libxml2 openssl libpam" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "d8eba6cb6682b59d84ca1da67a523520b879ade6" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb index 95d879dc67..9838e75ef5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libpam openssl db" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "e2145df09469bf84878e4729b4ecd814efb797d1" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb index 2fdadcbc9f..6864cc3174 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ldapdb_1.3.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=41ab94182d94be9bb35e2a8b933f1e7d" DEPENDS = "libpam openldap" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRCREV = "84d7b260f1ae6857ae36e014c9a5968e8aa1cbe8" diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index ac7fa4bbf7..41b4d0d309 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f DEPENDS += "libpam openssl" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" # This gets us ssh-agent, which we are almost certain to want. diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc index 8ced8abe59..e38e344c14 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc @@ -1,7 +1,7 @@ # polkit must prepare polkitd group DEPENDS += "polkit" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "polkit" inherit useradd diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb index 8754383efa..ad1973b136 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_0.116.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb \ DEPENDS = "expat glib-2.0 intltool-native mozjs" -inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection distro_features_check +inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection features_check REQUIRED_DISTRO_FEATURES = "polkit" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch new file mode 100644 index 0000000000..a0b721c466 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock/0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch @@ -0,0 +1,51 @@ +From 78a9cffb1c760466933bbbcbae7ecb9b30a3e6a5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Nov 2019 13:47:42 -0800 +Subject: [PATCH] sanlock: Replace "cp -a" with "cp -R --no-dereference + --preserve=mode, links" + +Using "cp -a" leaks UID of user running the builds + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/Makefile | 8 ++++---- + wdmd/Makefile | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 533dd79..2fc9ba5 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -127,9 +127,9 @@ install: all + $(INSTALL) -c -m 755 $(LIBSO_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(LIBPC_ENTIRE_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig + $(INSTALL) -c -m 644 $(LIBPC_CLIENT_TARGET) $(DESTDIR)/$(LIBDIR)/pkgconfig +- cp -a $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_ENTIRE_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_CLIENT_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) + $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8/ +diff --git a/wdmd/Makefile b/wdmd/Makefile +index 5849efc..4894517 100644 +--- a/wdmd/Makefile ++++ b/wdmd/Makefile +@@ -68,7 +68,7 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(MANDIR)/man8 + $(INSTALL) -c -m 755 $(CMD_TARGET) $(DESTDIR)/$(BINDIR) + $(INSTALL) -c -m 755 $(SHLIB_TARGET) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_TARGET).so.$(SOMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 644 $(HEADER_TARGET) $(DESTDIR)/$(HEADIR) + $(INSTALL) -m 644 $(MAN_TARGET) $(DESTDIR)/$(MANDIR)/man8 +-- +2.24.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb index 9f7ce9c570..bf7eaf4111 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.8.0.bb @@ -11,13 +11,15 @@ SECTION = "utils" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" LIC_FILES_CHKSUM = "file://README.license;md5=60487bf0bf429d6b5aa72b6d37a0eb22" -SRC_URI = "git://pagure.io/sanlock.git;protocol=http" +SRC_URI = "git://pagure.io/sanlock.git;protocol=http \ + file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ + " SRCREV = "7afe0e66f5c7f24894896fad20ffa6f39733d80f" S = "${WORKDIR}/git" DEPENDS = "libaio util-linux" -inherit distutils +inherit distutils3 useradd do_configure[noexec] = "1" @@ -32,3 +34,11 @@ do_install_prepend () { oe_runmake -C src DESTDIR=${D} LIBDIR=${libdir} install cd ${S}/python } + +SANLOCKGROUP ?= "sanlock" +SANLOCKUSER ?= "sanlock" +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system ${SANLOCKGROUP}" +USERADD_PARAM_${PN} = "--system -g ${SANLOCKGROUP} -G disk \ + --home-dir /run/${SANLOCKUSER} --no-create-home \ + --shell /sbin/nologin ${SANLOCKUSER}" diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index 91c50027d8..a527f773a6 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -11,7 +11,7 @@ LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" DEPENDS = "curl libpam openssl sblim-sfc-common unzip-native" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ diff --git a/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb b/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb index e587e2a109..0e09c3a64b 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/atk/atkmm_2.28.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ DEPENDS = "atk glibmm" -inherit distro_features_check gnomebase autotools pkgconfig +inherit features_check gnomebase autotools pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb index 53eb32be90..2fa754e79d 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-standard_3.28.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1" # Upstream renamed this package to gnome-themes-extra at some point BPN = "gnome-themes-extra" -inherit gnomebase gettext gtk-icon-cache upstream-version-is-even distro_features_check +inherit gnomebase gettext gtk-icon-cache upstream-version-is-even features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+.inc b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+.inc index d6d14a79d5..ccbcfc8da4 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+.inc +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" SECTION = "libs" -inherit distro_features_check +inherit features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" # This picks stable releases in the 2.x series (but not 2.90 onwards, diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb index 4ded679012..adc38d8cff 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm3_3.24.2.bb @@ -10,7 +10,7 @@ DEPENDS = "atkmm pangomm glibmm gtk+3 cairomm" BPN = "gtkmm" -inherit gnomebase distro_features_check +inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb index b780d09bc3..bb179447b8 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtkmm_2.24.5.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ DEPENDS = "atkmm pangomm glibmm gtk+ cairomm" -inherit gnomebase distro_features_check +inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc b/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc index d860d44e24..14d194004e 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc +++ b/meta-openembedded/meta-oe/recipes-gnome/vte9/vte9.inc @@ -8,7 +8,7 @@ RDEPENDS_libvte = "vte-termcap" GNOMEBN = "vte" S = "${WORKDIR}/vte-${PV}" -inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection +inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" EXTRA_OECONF = "--disable-python" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb index 25c2ce81f8..99c108da10 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/fontforge_20190801.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash gettext-native" DEPENDS_append_class-target = " libxi" -inherit autotools pkgconfig pythonnative distro_features_check gettext gtk-icon-cache mime +inherit autotools pkgconfig pythonnative features_check gettext gtk-icon-cache mime REQUIRED_DISTRO_FEATURES_append_class-target = " x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb index d54fafc8d4..3b540bb789 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/freeglut/freeglut_3.0.0.bb @@ -7,7 +7,7 @@ SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${P SRC_URI[md5sum] = "90c3ca4dd9d51cf32276bc5344ec9754" SRC_URI[sha256sum] = "2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2" -inherit cmake distro_features_check +inherit cmake features_check # depends on virtual/libx11, virtual/libgl REQUIRED_DISTRO_FEATURES = "x11 opengl" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb index 343c983c3d..65f72747cc 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://sourceforge.net/projects/ftgl/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check REQUIRED_DISTRO_FEATURES = "opengl x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb index e1c3158bb0..b3cb01aaa7 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.6.8.bb @@ -42,7 +42,7 @@ SRCREV = "dc6a396bfe5cd6c53eb1df103c3af505d0899f90" S = "${WORKDIR}/git" -inherit autotools gettext update-alternatives pkgconfig pythonnative perlnative distro_features_check +inherit autotools gettext update-alternatives pkgconfig pythonnative perlnative features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb b/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb index 0053c0c689..0db0f793d5 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gegl/gegl_0.3.18.bb @@ -5,7 +5,7 @@ DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual EXTRA_OECONF = "--disable-docs" -inherit distro_features_check gnomebase vala gobject-introspection +inherit features_check gnomebase vala gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb index 1d64910fd8..024534508c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gimp/gimp_2.8.22.bb @@ -25,7 +25,7 @@ DEPENDS = " \ " DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" -inherit distro_features_check gnomebase gtk-icon-cache gtk-doc +inherit features_check gnomebase gtk-icon-cache gtk-doc REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb index 4094513b29..6fe258271d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb @@ -16,7 +16,7 @@ DEPENDS = "gtk+" S = "${WORKDIR}/${BPN}" -inherit distro_features_check autotools binconfig pkgconfig gettext +inherit features_check autotools binconfig pkgconfig gettext REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb index 1644e38daf..cd3b6629e4 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.102.bb @@ -15,7 +15,7 @@ DEPENDS = "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" RDEPENDS_${PN} = "tk-lib" # depends on gtk+ which has this restriction -inherit distro_features_check +inherit features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb index 5d33185900..999d53d4a9 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb @@ -14,7 +14,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar. SRC_URI[md5sum] = "235720a758a8b8d9e6e452dc67190e9b" SRC_URI[sha256sum] = "7989b39598c769820ad451ad91e5cb0de29946940c8240aac94ca8238c2def61" -inherit autotools distro_features_check +inherit autotools features_check REQUIRED_DISTRO_FEATURES = "opengl x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb index 4601593ad8..6224ad3e75 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.0.14.bb @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62f S = "${WORKDIR}/SDL2_ttf-${PV}" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # links to libGL.so REQUIRED_DISTRO_FEATURES += "x11 opengl" diff --git a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index 701266bccd..db4767bb30 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb @@ -22,7 +22,7 @@ DEPENDS_append_libc-musl = " libexecinfo" # combine oe-core way with angstrom DISTRO_TYPE DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" -inherit autotools pkgconfig gettext systemd distro_features_check +inherit autotools pkgconfig gettext systemd features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb b/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb index 08d7f5b52a..ac2634d8ed 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/numlockx/numlockx_1.2.bb @@ -10,7 +10,7 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/numlockx/numlockx-${PV}.tar.g SRC_URI[md5sum] = "be9109370447eae23f6f3f8527bb1a67" SRC_URI[sha256sum] = "e468eb9121c94c9089dc6a287eeb347e900ce04a14be37da29d7696cbce772e4" -inherit autotools distro_features_check +inherit autotools features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index 9af3798aa1..33f34e4282 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -12,7 +12,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "b72794996c6a3ad94634727b95f9d204" SRC_URI[sha256sum] = "8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7" -inherit autotools gettext update-alternatives pkgconfig distro_features_check +inherit autotools gettext update-alternatives pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.0.bb b/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.0.bb index 8a85db4754..35e71ab42e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/pango/pangomm_2.42.0.bb @@ -12,7 +12,7 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${ SRC_URI[md5sum] = "6cffedf2225c4e72645a7d757fb5b832" SRC_URI[sha256sum] = "ca6da067ff93a6445780c0b4b226eb84f484ab104b8391fb744a45cbc7edbf56" -inherit distro_features_check autotools pkgconfig +inherit features_check autotools pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb index 684a204ead..784f6fbb8c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.4.bb @@ -14,7 +14,7 @@ DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms vim-native" RDEPENDS_${PN} = "libxcb xcb-util-keysyms" -inherit cmake python3native distro_features_check +inherit cmake python3native features_check REQUIRED_DISTRO_FEATURES = "x11 opengl" diff --git a/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb b/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb index 5b03f8bcef..9932d0a1c4 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb @@ -16,7 +16,7 @@ SRCREV = "b814567e2bf8bda07cea8de1c7a062f4aa437b65" S = "${WORKDIR}/git" -inherit pkgconfig distro_features_check +inherit pkgconfig features_check TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb index f3dc89972c..d0ee2a50ec 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.9.0.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3" S = "${WORKDIR}/git" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "x11" inherit autotools cmake diff --git a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb index a566bc18a3..7e22038f24 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.5.bb @@ -9,7 +9,7 @@ SRC_URI = "git://github.com/Airblader/unclutter-xfixes.git \ file://0001-build-use-autotools.patch" SRCREV = "10fd337bb77e4e93c3380f630a0555372778a948" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb index d96b50186a..240949f55c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vdpau/libvdpau_1.3.bb @@ -10,7 +10,7 @@ SRC_URI = "git://anongit.freedesktop.org/vdpau/libvdpau" S = "${WORKDIR}/git" -inherit distro_features_check meson +inherit features_check meson REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index e4a0321357..d0c9f774fe 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -23,7 +23,7 @@ DEPENDS = "\ zlib \ " -inherit pkgconfig autotools distro_features_check +inherit pkgconfig autotools features_check ANY_OF_DISTRO_FEATURES = "x11 fbdev" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb b/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb index 3f4bfaaf19..936d71b101 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb @@ -7,7 +7,7 @@ SRC_URI = "http://xorg.freedesktop.org/archive/individual/app/${BPN}-${PV}.tar.b SRC_URI[md5sum] = "25cc7ca1ce5dcbb61c2b471c55e686b5" SRC_URI[sha256sum] = "35b6f844b24f1776e9006c880a745728800764dbe3b327a128772b4610d8eb3d" -inherit distro_features_check autotools pkgconfig +inherit features_check autotools pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb b/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb index b68e994ab2..aeae071dcb 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb @@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libxtst" PR = "r1" -inherit distro_features_check pkgconfig +inherit features_check pkgconfig # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc b/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc index cb6b5ac773..958fecc116 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc @@ -7,6 +7,6 @@ XORG_PN = "${BPN}" SRC_URI = "${XORG_MIRROR}/individual/data/${BP}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" -inherit distro_features_check autotools pkgconfig +inherit features_check autotools pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb index 971de731a2..4042150b1a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.0.1.bb @@ -9,7 +9,7 @@ DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics" DEPENDS += "virtual/libx11 libxvmc drm \ virtual/libgl xorgproto libpciaccess" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES += "opengl" SRC_URI[md5sum] = "47eccf71823206ade9629cba69de7ef6" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb index 3966867ee3..5c9061a058 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.16.bb @@ -10,7 +10,7 @@ DEPENDS += "virtual/libx11 libxvmc drm xorgproto \ virtual/libgl libpciaccess" RDEPENDS_${PN} += "xserver-xorg-module-exa" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES += "opengl" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb index 29229bb510..d7dd109322 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-100dpi_1.0.3.bb @@ -10,7 +10,7 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native font-util" RDEPENDS_${PN} = "encodings font-util" RDEPENDS_${PN}_class-native = "font-util-native" -inherit distro_features_check +inherit features_check # depends on bdftopcf-native -> virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb index 898850bbca..5c00b4b6ad 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-adobe-utopia-100dpi_1.0.4.bb @@ -10,7 +10,7 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native font-util" RDEPENDS_${PN} = "encodings font-util" RDEPENDS_${PN}_class-native = "font-util-native" -inherit distro_features_check +inherit features_check # depends on bdftopcf-native -> virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb index 4976e527f2..f9bdaf366a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-100dpi_1.0.3.bb @@ -10,7 +10,7 @@ DEPENDS += "util-macros-native font-util-native bdftopcf-native font-util" RDEPENDS_${PN} = "encodings font-util" RDEPENDS_${PN}_class-native = "font-util-native" -inherit distro_features_check +inherit features_check # depends on bdftopcf-native -> virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb index 6e0b33ca31..872ef4d016 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bh-lucidatypewriter-100dpi_1.0.3.bb @@ -10,7 +10,7 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native font-util" RDEPENDS_${PN} = "encodings font-util" RDEPENDS_${PN}_class-native = "font-util-native" -inherit distro_features_check +inherit features_check # depends on bdftopcf-native -> virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb index e8cfb615a9..a4ae91a388 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-bitstream-100dpi_1.0.3.bb @@ -10,7 +10,7 @@ DEPENDS = "util-macros-native font-util-native bdftopcf-native" RDEPENDS_${PN} = "encodings font-util" RDEPENDS_${PN}_class-native = "font-util-native" -inherit distro_features_check +inherit features_check # depends on bdftopcf-native -> virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb index d425ce5157..ee8cb360ad 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-cursor-misc_1.0.3.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8b32ccac3ad25e75e68478deb7780265" DEPENDS = "util-macros-native font-util-native bdftopcf-native" RDEPENDS_${PN} = "encodings font-util" -inherit distro_features_check +inherit features_check # depends on bdftopcf-native -> virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb index e4cd90a7af..355fb528f8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/font-misc-misc_1.1.2.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=200c507f595ee97008c7c5c3e94ab9a8" DEPENDS = "util-macros-native font-util-native bdftopcf-native font-util" RDEPENDS_${PN} = "encodings font-util" -inherit distro_features_check +inherit features_check # depends on bdftopcf-native -> virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb index ae9704050c..06778b3e81 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-font/xorg-fonts-100dpi.bb @@ -1,7 +1,7 @@ SUMMARY = "Xorg 100 DPI font set" LICENSE = "MIT" -inherit packagegroup distro_features_check +inherit packagegroup features_check # rdepends on font recipes with this restriction REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb index 62f00563cd..b8c1881d97 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb @@ -17,7 +17,7 @@ DEPENDS = "intltool-native libx11 libxext libxt libxft glib-2.0-native bc-native # These are only needed as part of the stopgap screensaver implementation: RDEPENDS_${PN} += "liberation-fonts" -inherit systemd perlnative pkgconfig gettext autotools-brokensep distro_features_check +inherit systemd perlnative pkgconfig gettext autotools-brokensep features_check EXTRA_OECONF += "--with-x-app-defaults=${datadir}/X11/app-defaults" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index a5ed21d458..2c09a4853c 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" PR = "r9" # we are using a gpe-style Makefile -inherit distro_features_check gpe +inherit features_check gpe REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb index d334956a8f..1ba9f0f6c8 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb @@ -24,7 +24,7 @@ SRC_URI[waf.sha256sum] = "01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f2 S = "${WORKDIR}/git" -inherit waf pkgconfig pythonnative distro_features_check +inherit waf pkgconfig pythonnative features_check LUA ?= "lua" LUA_mips64 = "" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb index 3588ce7233..51d7e2a2ed 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_4.0.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" # mind when doing version upgrades). DEPENDS = "intltool-native glib-2.0-native gtkmm3 libcanberra pulseaudio" -inherit autotools distro_features_check +inherit autotools features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb b/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb index 526659e451..b6aafdee19 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/xpext/xpext_1.0-5.bb @@ -9,7 +9,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/${BPN}/${BPN}_${ file://auxdir.patch;striplevel=0" S = "${WORKDIR}/xpext-1.0" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb b/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb index c7a068df38..c611da48c0 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb @@ -7,7 +7,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/x/xsp/${BPN}_${PV} file://xsp-fix-pc.patch" S = "${WORKDIR}/Xsp" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb index 010f65fb9b..589fc5f7c8 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/orrery/orrery_2.7.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://orrery.c;endline=25;md5=d792bdf2b591972da175aecc38d88cfe" DEPENDS = "gtk+" -inherit distro_features_check autotools-brokensep pkgconfig +inherit features_check autotools-brokensep pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb index ed90352fc1..504ac1537e 100644 --- a/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb @@ -21,7 +21,7 @@ SECTION = "System Environment/Base" DEPENDS += "libpam" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" LICENSE = "BSD-1-Clause" diff --git a/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_git.bb b/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_git.bb new file mode 100644 index 0000000000..3236cb9a60 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "PKCS#11 HSM/Token Emulator" +HOMEPAGE = "https://www.opendnssec.org/softhsm/" +LICENSE = "BSD-2-Clause & ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ef3f77a3507c3d91e75b9f2bdaee4210" +DEPENDS = "openssl" +PV = "2.5.0" + +SRC_URI = "git://github.com/opendnssec/SoftHSMv2.git;branch=master" +SRCREV = "369df0383d101bc8952692c2a368ac8bc887d1b4" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +# EdDSA requires OpenSSL >= 1.1.1 +EXTRA_OECONF = "--enable-eddsa --disable-gost" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb index 30d41a16e6..9362a5c110 100644 --- a/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb +++ b/meta-openembedded/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=f27defe1e96c2e1ecd4e0c9be8967949 \ " -inherit autotools pkgconfig python3native lib_package distro_features_check +inherit autotools pkgconfig python3native lib_package features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb index aa5d1d129b..df86708e2b 100644 --- a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb @@ -1,6 +1,6 @@ require ${BPN}.inc -inherit meson gobject-introspection gsettings gettext bash-completion systemd distro_features_check useradd +inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd # polkit and gobject-introspection are mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb index ec9e04bed6..7ad4ac70a9 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb @@ -2,7 +2,7 @@ require ${BPN}.inc DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" -inherit distro_features_check binconfig lib_package gtk-icon-cache mime +inherit features_check binconfig lib_package gtk-icon-cache mime REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb index cd21950ff5..a8479466a8 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_git.bb @@ -5,8 +5,8 @@ SECTION = "System/Base" LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -PV = "0.328" -SRCREV = "9f3125deb78a2e275b1285f935235d34ceda641d" +PV = "0.329" +SRCREV = "3b93b226177b6a8d219fa5edee2a417758cf74db" SRC_URI = "git://github.com/vcrhonek/${BPN}.git" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb index b40223e8ab..655db49073 100644 --- a/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/libp11/libp11_0.4.10.bb @@ -24,3 +24,5 @@ do_install_append () { FILES_${PN} += "${libdir}/engines*/pkcs11.so" FILES_${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb index f55a6fc7b3..90fa200845 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links-x11_2.16.bb @@ -25,7 +25,7 @@ require links.inc DEPENDS += "virtual/libx11" RCONFLICTS_${PN} = "links" -inherit distro_features_check +inherit features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_165.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_165.bb deleted file mode 100644 index 8af919fea8..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_165.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." -DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ -and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ -and should run on all Linux systems that need error handling." -HOMEPAGE = "http://mcelog.org/" -SECTION = "System Environment/Base" - -SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ - file://run-ptest \ -" - -SRCREV = "6b6a8a571b5b0967cadbee770bf444f4e8634cca" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" - -S = "${WORKDIR}/git" - -inherit autotools-brokensep ptest - -COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' - -do_install_append() { - install -d ${D}${sysconfdir}/cron.hourly - install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ - sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH} - cp -r ${S}/tests ${S}/input ${D}${PTEST_PATH} - sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test -} - -RDEPENDS_${PN}-ptest += "make bash mce-inject" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_166.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_166.bb new file mode 100644 index 0000000000..3b4ea1f67a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_166.bb @@ -0,0 +1,35 @@ +SUMMARY = "mcelog daemon accounts memory and some other errors in various ways." +DESCRIPTION = "mcelog is required by both 32bit x86 Linux kernels (since 2.6.30) \ +and 64bit Linux kernels (since early 2.6 kernel releases) to log machine checks \ +and should run on all Linux systems that need error handling." +HOMEPAGE = "http://mcelog.org/" +SECTION = "System Environment/Base" + +SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http; \ + file://run-ptest \ +" + +SRCREV = "ee90ff20ce6a4d5e016aa249ce8b37f359f9fda4" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep ptest + +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' + +do_install_append() { + install -d ${D}${sysconfdir}/cron.hourly + install -m 0755 ${S}/mcelog.cron ${D}${sysconfdir}/cron.hourly/ + sed -i 's/bash/sh/' ${D}${sysconfdir}/cron.hourly/mcelog.cron +} + +do_install_ptest() { + install -d ${D}${PTEST_PATH} + cp -r ${S}/tests ${S}/input ${D}${PTEST_PATH} + sed -i 's#../../mcelog#mcelog#' ${D}${PTEST_PATH}/tests/test +} + +RDEPENDS_${PN}-ptest += "make bash mce-inject" diff --git a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb index 67b7c29753..08b2e3c232 100644 --- a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -56,10 +56,6 @@ FILES_${PN}-dbg += " \ INSANE_SKIP_${PN} += "dev-deps" -do_install_append() { - rm -r ${D}/${localstatedir}/run -} - do_install () { rm -rf ${D} install -d ${D}/etc @@ -87,4 +83,6 @@ do_install () { install -dm 755 ${D}${localstatedir}/run/openct touch ${D}${localstatedir}/run/openct/status chmod 644 ${D}${localstatedir}/run/openct/status + + rm -r ${D}/${localstatedir}/run } diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.19.0.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.19.0.bb index bc1722e394..a1e29dd46d 100644 --- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.19.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.19.0.bb @@ -16,20 +16,23 @@ SRCREV = "f1691fc91fc113191c3a8aaf5facd6983334ec47" SRC_URI = "git://github.com/OpenSC/OpenSC \ file://0001-Remove-redundant-logging.patch \ " -DEPENDS = "openct pcsc-lite virtual/libiconv openssl" +DEPENDS = "virtual/libiconv openssl" S = "${WORKDIR}/git" inherit autotools pkgconfig bash-completion EXTRA_OECONF = " \ --disable-static \ - --enable-openct \ - --disable-pcsc \ --disable-ctapi \ --disable-doc \ " EXTRA_OEMAKE = "DESTDIR=${D}" +PACKAGECONFIG ??= "pcsc" + +PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct" +PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite" + RDEPENDS_${PN} = "readline" FILES_${PN} += "\ @@ -42,3 +45,5 @@ FILES_${PN}-dev += "\ ${libdir}/pkcs11/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11/pkcs11-spy.so \ " + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb index a87c228a83..6869e2cf9a 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-lite/pcsc-lite_1.8.25.bb @@ -9,7 +9,6 @@ LICENSE_${PN}-dbg = "BSD & GPLv3+" LICENSE_${PN}-spy = "GPLv3+" LICENSE_${PN}-spy-dev = "GPLv3+" LIC_FILES_CHKSUM = "file://COPYING;md5=628c01ba985ecfa21677f5ee2d5202f6" -DEPENDS = "udev" SRC_URI = "https://pcsclite.apdu.fr/files/${BP}.tar.bz2" SRC_URI[md5sum] = "c20650a36062ab1689f37f3302c988f2" @@ -19,19 +18,21 @@ inherit autotools systemd pkgconfig EXTRA_OECONF = " \ --disable-libusb \ - --enable-libudev \ --enable-usbdropdir=${libdir}/pcsc/drivers \ " S = "${WORKDIR}/pcsc-lite-${PV}" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} udev" +PACKAGECONFIG_class-native ??= "" PACKAGECONFIG[systemd] = ",--disable-libsystemd,systemd," +PACKAGECONFIG[udev] = "--enable-libudev,--disable-libudev,udev" PACKAGES = "${PN} ${PN}-dbg ${PN}-dev ${PN}-lib ${PN}-doc ${PN}-spy ${PN}-spy-dev" RRECOMMENDS_${PN} = "ccid" +RRECOMMENDS_${PN}_class-native = "" FILES_${PN} = "${sbindir}/pcscd" FILES_${PN}-lib = "${libdir}/libpcsclite*${SOLIBS}" @@ -50,3 +51,5 @@ RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "pcscd.socket" RDEPENDS_${PN}-spy +="python" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb index 5a21cd3fc9..04133c1b3d 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb @@ -12,4 +12,4 @@ SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf572 FILES_${PN} = "${libdir}/pidgin/*" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb index 82b803a4d2..14fbc94b21 100644 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.3.6.bb @@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "fbed745438bb0c21467b60cbd67c8148a9289b5ebc7482d06db443bea5 S = "${WORKDIR}/Remmina-v${PV}" -inherit cmake distro_features_check +inherit cmake features_check # depends on avahi-ui with this restriction ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb index f5518bd8c1..dba89d181c 100644 --- a/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/synergy/synergy_git.bb @@ -17,7 +17,7 @@ PV = "1.10.1+git${SRCPV}" S = "${WORKDIR}/git" -inherit cmake distro_features_check +inherit cmake features_check EXTRA_OECMAKE += "-DSYNERGY_BUILD_LEGACY_GUI=OFF" diff --git a/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb b/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb index 879b67b7f5..aba485e1a4 100644 --- a/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/toscoterm/toscoterm_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/OSSystems/toscoterm.git" S = "${WORKDIR}/git" -inherit distro_features_check gitpkgv pkgconfig +inherit features_check gitpkgv pkgconfig REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb index 9c9e5e52a6..f0aad95384 100644 --- a/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/udisks/udisks2_git.bb @@ -26,7 +26,7 @@ S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" -inherit autotools systemd gtk-doc gobject-introspection gettext distro_features_check +inherit autotools systemd gtk-doc gobject-introspection gettext features_check REQUIRED_DISTRO_FEATURES = "polkit" diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb index 8948ebf30f..c1136cd998 100644 --- a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb +++ b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.8.bb @@ -25,7 +25,7 @@ LEAD_SONAME = "libuim.so.1" COMPATIBLE_HOST_riscv64 = "null" COMPATIBLE_HOST_riscv32 = "null" -inherit distro_features_check autotools pkgconfig gettext qemu gtk-immodules-cache +inherit features_check autotools pkgconfig gettext qemu gtk-immodules-cache REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb index c4cc627116..6408417920 100644 --- a/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/upower/upower_0.99.11.bb @@ -10,7 +10,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "abe6acb617f11f2e8dbd9846fcf86e24" SRC_URI[sha256sum] = "64b5ffbfccd5bdb15d925777979a4dbee1a957f9eaeb158dc76175267eddbdef" -inherit autotools pkgconfig gettext gobject-introspection systemd distro_features_check +inherit autotools pkgconfig gettext gobject-introspection systemd features_check PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[idevice] = "--with-idevice,--without-idevice,libimobiledevice libplist" diff --git a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb index 8cb180dc8b..5f07bf28ee 100644 --- a/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/utouch/utouch-mtview_git.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://bitmath.org/code/mtview/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=4c61b8950dc1aab4d2aa7c2ae6b1cfb3" -inherit autotools pkgconfig distro_features_check +inherit autotools pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb b/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb index 0bdafdf3bd..481e7303b3 100644 --- a/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.2.5.bb @@ -7,7 +7,7 @@ inherit autotools pkgconfig DEPENDS = "virtual/libx11 xserver-xorg xrdp nasm-native" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "x11 pam" SRC_URI = "git://github.com/neutrinolabs/xorgxrdp.git" diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb index 75caf8d6bb..deda0fd1b5 100644 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.11.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=72cfbe4e7bd33a0a1de9630c91195c21 \ " -inherit distro_features_check autotools pkgconfig useradd systemd +inherit features_check autotools pkgconfig useradd systemd DEPENDS = "openssl virtual/libx11 libxfixes libxrandr libpam nasm-native" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.8.1.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.8.1.bb deleted file mode 100644 index 362d69ff99..0000000000 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.8.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Google's framework for writing C++ tests" -HOMEPAGE = "https://github.com/google/googletest" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ - file://googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" - -PROVIDES += "gmock gtest" - -S = "${WORKDIR}/git" -SRCREV = "2fe3bd994b3189899d93f1d5a881e725e046fdc2" -SRC_URI = "git://github.com/google/googletest.git" - -inherit cmake - -ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-dbg = "1" - -RDEPENDS_${PN}-dev += "${PN}-staticdev" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb new file mode 100644 index 0000000000..e1df9b6e28 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Google's framework for writing C++ tests" +HOMEPAGE = "https://github.com/google/googletest" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://googlemock/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \ + file://googletest/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" + +PROVIDES += "gmock gtest" + +S = "${WORKDIR}/git" +SRCREV = "703bd9caab50b139428cea1aaff9974ebee5742e" +SRC_URI = "git://github.com/google/googletest.git" + +inherit cmake + +ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY_${PN}-dbg = "1" + +RDEPENDS_${PN}-dev += "${PN}-staticdev" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3