diff options
Diffstat (limited to 'meta-openembedded/meta-oe/dynamic-layers')
9 files changed, 12 insertions, 113 deletions
diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb index ac197a631e..98184b2236 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb @@ -16,6 +16,7 @@ SRC_URI = " \ file://fix-menu-generation.patch \ " SRC_URI[sha256sum] = "824e099928aab2fb628f0fa4870ef7bba10b95581e47c2d8fa216709a0f399b3" +UPSTREAM_CHECK_URI="https://launchpad.net/openbox-xdgmenu/" inherit pkgconfig features_check # depends on openbox, which is X11-only diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0002-meson.build-do-not-use-Werror.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch index 663a80ecde..663a80ecde 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0002-meson.build-do-not-use-Werror.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch deleted file mode 100644 index 4f385e917a..0000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d3aa30f5cd7ba375e006a755752acbcfcd619452 Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Wed, 6 Mar 2024 19:27:15 +0800 -Subject: [PATCH] meson.build: drop unnecessary build dependencies - -The pytest and pycoverage are required by meson test but not for -building. Mark them as 'required: false' to get rid of unnecessary -build dependencies. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - meson.build | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 9556836a..30f33fe2 100644 ---- a/meson.build -+++ b/meson.build -@@ -25,8 +25,8 @@ bash_completions_dir = completions.get_variable(pkgconfig: 'completionsdir', def - # Order: Fedora/Mageia/openSUSE || Debian/Ubuntu - pyflakes = find_program('pyflakes-3', 'pyflakes3', required: false) - pycodestyle = find_program('pycodestyle-3', 'pycodestyle', 'pep8', required: false) --pytest = find_program('pytest-3', 'pytest3') # also requires the pytest-cov plugin --pycoverage = find_program('coverage-3', 'python3-coverage') -+pytest = find_program('pytest-3', 'pytest3', required: false) # also requires the pytest-cov plugin -+pycoverage = find_program('coverage-3', 'python3-coverage', required: false) - pandoc = find_program('pandoc', required: false) - find = find_program('find') - -@@ -75,6 +75,7 @@ if get_option('unit_testing') - endif - - #FIXME: exclude doc/env/ -+if pyflakes.found() and pycodestyle.found() - test('linting', - pyflakes, - timeout: 100, -@@ -91,7 +92,9 @@ test('legacy-tests', - find_program('tests/cli_legacy.py'), - timeout: 600, - env: test_env) -+endif - #TODO: split out dbus tests into own test() instance, to run in parallel -+if pycoverage.found() - test('unit-tests', - pycoverage, - args: ['run', '-a', '-m', 'pytest', '-s', '-v', '--cov-append', meson.current_source_dir()], -@@ -143,4 +146,5 @@ if get_option('b_coverage') - priority: -99, # run last - is_parallel: false) - endif -+endif - --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch deleted file mode 100644 index 9f01108a20..0000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6e3dd61bf90a7ca8c36c5b95943cbff7c1ad3c2d Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Wed, 6 Mar 2024 16:12:31 +0800 -Subject: [PATCH] networkd.c: define scope specific to case statement - -Per [1], define a scope specific to case statement to fix build with -clang. - -Fixes: -../git/src/networkd.c:544:13: error: expected expression - 544 | gchar* first = g_strcmp0(def->id, def->veth_peer_link->id) < 0 ? def->id : def->veth_peer_link->id; - | ^ -../git/src/networkd.c:545:17: error: use of undeclared identifier 'first' - 545 | if (first != def->id) { - | ^ - -[1] https://stackoverflow.com/questions/92396/why-cant-variables-be-declared-in-a-switch-statement - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - src/networkd.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/networkd.c b/src/networkd.c -index 25121c48..5eb9c0fe 100644 ---- a/src/networkd.c -+++ b/src/networkd.c -@@ -541,12 +541,14 @@ write_netdev_file(const NetplanNetDefinition* def, const char* rootdir, const ch - * and, if the selected name is the name of the netdef being written, we generate - * the .netdev file. Otherwise we skip the netdef. - */ -+ { - gchar* first = g_strcmp0(def->id, def->veth_peer_link->id) < 0 ? def->id : def->veth_peer_link->id; - if (first != def->id) { - g_string_free(s, TRUE); - return; - } - g_string_append_printf(s, "Kind=veth\n\n[Peer]\nName=%s\n", def->veth_peer_link->id); -+ } - break; - - case NETPLAN_DEF_TYPE_TUNNEL: --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.bb index 229414718c..40d72caa0e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.bb @@ -15,14 +15,12 @@ inherit meson pkgconfig systemd python3targetconfig features_check REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ - file://0001-meson.build-drop-unnecessary-build-dependencies.patch \ - file://0002-meson.build-do-not-use-Werror.patch \ + file://0001-meson.build-do-not-use-Werror.patch \ " SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" -SRC_URI:append:toolchain-clang = " file://0001-networkd.c-define-scope-specific-to-case-statement.patch" -SRCREV = "45f7cd1569896d9e316c130bf5c60b7ccfc8211d" +SRCREV = "d27f32305f7f06de449b32239a89969e6ff2be31" S = "${WORKDIR}/git" @@ -30,10 +28,11 @@ DEPENDS = "glib-2.0 libyaml util-linux-libuuid \ systemd python3-cffi-native \ " -EXTRA_OEMESON = "-Dunit_testing=false" +EXTRA_OEMESON = "-Dtesting=false -Dunit_testing=false" RDEPENDS:${PN} = "python3-core python3-netifaces python3-pyyaml \ python3-dbus python3-rich python3-cffi \ + python3-json python3-fcntl \ util-linux-libuuid libnetplan \ " diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.1.bb index 2c749eeba7..7f2859186e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "6505d94d3173e2469950b03d5b99dac4210af7b659a3a1a3b58da35b2a984da6" +SRC_URI[sha256sum] = "3d4ae3026b76be94aef67eba7d7e3a64e436ba9556d74ad142ba8988e4e4b253" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb index cb2ff672e3..b98c70db77 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb @@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "file://android-gadget-setup" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${bindir} install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service index ddf8d7f74e..b6661f2e39 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service @@ -1,6 +1,6 @@ [Unit] Description=Android Debug Bridge -ConditionPathExists=/var/usb-debugging-enabled +ConditionPathExists=/etc/usb-debugging-enabled Before=android-system.service [Service] diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb index 456c7400ef..d2680b4578 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb @@ -68,6 +68,7 @@ COMPATIBLE_HOST:powerpc64le = "(null)" inherit systemd +SYSTEMD_PACKAGES = "${PN}-adbd" SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service" # Find libbsd headers during native builds @@ -189,7 +190,7 @@ FILES:${PN} += "${libdir}/android ${libdir}/android/*" BBCLASSEXTEND = "native" android_tools_enable_devmode() { - touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled + touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled } ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" |