[oe] [meta-oe][PATCH] libteam: add ptest
From: Wenzong Fan The scripts/team_basic_test.py will be called as testcase. RedHat specific tests have been disabled since they are incampatible with OE. Signed-off-by: Wenzong Fan --- ...asic_test.py-disable-RedHat-specific-test.patch | 32 ++ meta-oe/recipes-support/libteam/libteam/run-ptest | 3 ++ meta-oe/recipes-support/libteam/libteam_1.27.bb| 8 +- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch create mode 100644 meta-oe/recipes-support/libteam/libteam/run-ptest diff --git a/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch new file mode 100644 index 000..468a55f --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-team_basic_test.py-disable-RedHat-specific-test.patch @@ -0,0 +1,32 @@ +From 00debe6bd4cf5a3133a8fbaab75f7447a39fa655 Mon Sep 17 00:00:00 2001 +From: Wenzong Fan +Date: Thu, 12 Apr 2018 01:54:15 + +Subject: [PATCH] team_basic_test.py: disable RedHat specific test + +The test _run_teamd_initscripts() is for RedHat ifcfg scripts which are +incompatible with OE: + /etc/sysconfig/network-scripts/ifcfg-* + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Wenzong Fan +--- + scripts/team_basic_test.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scripts/team_basic_test.py b/scripts/team_basic_test.py +index b05be9e..faabd18 100755 +--- a/scripts/team_basic_test.py b/scripts/team_basic_test.py +@@ -171,7 +171,7 @@ TEAM_PORT_CONFIG='{"prio": 10}' + try: + for mode_name in self._team_modes: + self._run_one_mode(mode_name) +-self._run_teamd_initscripts() ++#self._run_teamd_initscripts() + finally: + cmd_exec("modprobe -r team_mode_loadbalance team_mode_roundrobin team_mode_activebackup team_mode_broadcast team"); + +-- +2.13.3 + diff --git a/meta-oe/recipes-support/libteam/libteam/run-ptest b/meta-oe/recipes-support/libteam/libteam/run-ptest new file mode 100644 index 000..4ba5acf --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +python $(dirname $0)/team_basic_test.py diff --git a/meta-oe/recipes-support/libteam/libteam_1.27.bb b/meta-oe/recipes-support/libteam/libteam_1.27.bb index 3222700..442592d 100644 --- a/meta-oe/recipes-support/libteam/libteam_1.27.bb +++ b/meta-oe/recipes-support/libteam/libteam_1.27.bb @@ -10,6 +10,8 @@ DEPENDS = "libnl libdaemon jansson" SRC_URI = "git://github.com/jpirko/libteam \ file://0001-include-sys-select.h-for-fd_set-definition.patch \ file://0002-teamd-Re-adjust-include-header-order.patch \ + file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \ + file://run-ptest \ " SRCREV = "91a928a56a501daac5ce8b3c16bd9943661f1d16" @@ -18,7 +20,7 @@ SRC_URI[sha256sum] = "d65286379141db141bea33424ec0507bb0f827a0bf03d9c65004bb593e S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig ptest FILES_${PN} = "${libdir}/libteam${SOLIBS} \ " @@ -33,4 +35,8 @@ FILES_${PN}-utils = "${bindir}/bond2team \ " RDEPENDS_${PN}-utils = "bash" +RDEPENDS_${PN}-ptest = "python" +do_install_ptest() { + install ${S}/scripts/team_basic_test.py ${D}${PTEST_PATH}/ +} -- 2.8.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] xlsfonts: 1.0.5 -> 1.0.6
Upgrade xlsfonts from 1.0.5 to 1.0.6. Signed-off-by: Zheng Ruoqin --- .../xorg-app/{xlsfonts_1.0.5.bb => xlsfonts_1.0.6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-graphics/xorg-app/{xlsfonts_1.0.5.bb => xlsfonts_1.0.6.bb} (65%) diff --git a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.5.bb b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb similarity index 65% rename from meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.5.bb rename to meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb index 9feed75..76b76e4 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.5.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb @@ -6,5 +6,5 @@ SECTION = "x11/app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" -SRC_URI[md5sum] = "6f5711bef8c765857a0887a91476283b" -SRC_URI[sha256sum] = "40295bec35077cee93be2e4c26cc00268ed6ace779ae6e97766a866c1e3927fa" +SRC_URI[md5sum] = "5774fd4f518b3f338f2b28f270e04bfc" +SRC_URI[sha256sum] = "89b80b3a030006ab6cef717be286c12f2477894b227158b1e6133274f6ebd368" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] xlsclients: 1.1.3 -> 1.1.4
Upgrade xlsclients from 1.1.3 to 1.1.4 Signed-off-by: Zheng Ruoqin --- .../xorg-app/{xlsclients_1.1.3.bb => xlsclients_1.1.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-graphics/xorg-app/{xlsclients_1.1.3.bb => xlsclients_1.1.4.bb} (74%) diff --git a/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.3.bb b/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb similarity index 74% rename from meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.3.bb rename to meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb index 583a531..42bda7e 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.3.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb @@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=350e1b718a56df39cfe8ca9345ea4575" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "9fbf6b174a5138a61738a42e707ad8f5" -SRC_URI[sha256sum] = "5d9666fcc6c3de210fc70d5a841a404955af709a616fde530fe4e8f7723e3d3d" +SRC_URI[md5sum] = "4fa92377e0ddc137cd226a7a87b6b29a" +SRC_URI[sha256sum] = "773f2af49c7ea2c44fba4213bee64325875c1b3c9bc4bbcd8dac9261751809c1" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup
On 04/16/2018 01:29 AM, Andreas Müller wrote: > On Tue, Apr 10, 2018 at 5:02 PM, Andreas Müller > wrote: >> On Tue, Apr 10, 2018 at 4:53 PM, akuster808 wrote: >>> >>> On 04/09/2018 03:02 PM, Andreas Müller wrote: This adresses the comments for recent patch which updated nm to 1.10.6 and is a follow-up for [1]. >>> There is a form of this already in my stagging/master-next. Should it >>> be removed and replaced by this one? >> Please replace - with the first version I introduced a parse error! >> >> Andreas > Hi Armin, > > Just checked master-next: There is still V1 > (30b50a479c496e722d8ca590e60d3b34bcda2d67) of this patch which causes > parse errors. Your follow-up > (45cd132ff9d64902eb0152b5a3ee4c1a1c9504f5) patch fixes parsing but > breaks the logic. > > Sorry that I have to say this: Our collaboration is far from working: > I wrote this several times that V1 breaks parsing / you asked in in > this thread which patch to take but still I see you have taken the > wrong version. > > Don't misunderstand me: I don't want to criticise your work because I > know you very busy and take care of many issues - there is lots more > than checking my patches :) My misunderstanding. This is a learning experience for me. I have not been clean on when the transition for the layer maintainers was to take on full ownership of reviewing and checking patches being submitted to the list. I will only accept patches that have been ok'ed and are signed off by you for the layers you maintain. What do you think? > > Current situation causes extra efforts for both of us so what can we > do to improve the situation? > > For networkmanager: I had to learn that musl is not fixed. Although I > don't plan to use musl I suggest to send V3 with fixed musl because I > really want to get this closed. I plan on creating a 'sumo" branch this weekend. kind regards, Armin > > Andreas -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] nativesdk-qtbase: fix environment.d dir permission
Fixed an issue with the nativesdk-cmake package, which sets the permission of /opt/.../environment.d to rwxr-xr-x. nativesdk-qtbase set the permission to rwxrwxr-x, leading to a conflict: Error: Transaction check error: file /opt/poky/2.4.2/sysroots/x86_64-pokysdk-linux/environment-setup.d conflicts between attempted installs of nativesdk-cmake-3.8.2-r0.x86_64_nativesdk and nativesdk-qtbase-tools-5.9.4+git0+0d9208cecb-r0.x86_64_nativesdk Recipe nativesdk-qtbase will now set the permission to rwxr-xr-x. --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 5b20b0a..a678b19 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -171,7 +171,7 @@ do_install() { } fakeroot do_generate_qt_environment_file() { -mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d/ +install -d -m 755 ${D}${SDKPATHNATIVE}/environment-setup.d/ script=${D}${SDKPATHNATIVE}/environment-setup.d/qt5.sh echo 'export PATH=${OE_QMAKE_PATH_HOST_BINS}:$PATH' > $script -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH] python-pybluez: add missing RDEPENDS (fcntl)
From: André Draszik Signed-off-by: André Draszik --- meta-python/recipes-devtools/python/python-pybluez.inc | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-python/recipes-devtools/python/python-pybluez.inc b/meta-python/recipes-devtools/python/python-pybluez.inc index ed72716b6..399fe579f 100644 --- a/meta-python/recipes-devtools/python/python-pybluez.inc +++ b/meta-python/recipes-devtools/python/python-pybluez.inc @@ -2,7 +2,6 @@ DESCRIPTION = "Bluetooth Python extension module" HOMEPAGE = "http://karulis.github.io/pybluez/"; SECTION = "devel/python" -RDEPENDS_${PN} = "bluez5" DEPENDS = "bluez5" LICENSE = "GPL-2.0" @@ -15,3 +14,8 @@ SRC_URI[md5sum] = "49dab9d5a8f0b798c8125c7f649be3cd" SRC_URI[sha256sum] = "4ce006716a54d9d18e8186a3f1c8b12a8e6befecffe8fd5828a291fb694ce49d" S = "${WORKDIR}/PyBluez-${PV}" + +RDEPENDS_${PN} += "\ +bluez5 \ +${PYTHON_PN}-fcntl \ +" -- 2.16.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/9] networkmanager: fix gobject-introspection/musl and cleanup
On Tue, Apr 10, 2018 at 5:02 PM, Andreas Müller wrote: > On Tue, Apr 10, 2018 at 4:53 PM, akuster808 wrote: >> >> >> On 04/09/2018 03:02 PM, Andreas Müller wrote: >>> This adresses the comments for recent patch which updated nm to 1.10.6 and >>> is a >>> follow-up for [1]. >> >> There is a form of this already in my stagging/master-next. Should it >> be removed and replaced by this one? > Please replace - with the first version I introduced a parse error! > > Andreas Hi Armin, Just checked master-next: There is still V1 (30b50a479c496e722d8ca590e60d3b34bcda2d67) of this patch which causes parse errors. Your follow-up (45cd132ff9d64902eb0152b5a3ee4c1a1c9504f5) patch fixes parsing but breaks the logic. Sorry that I have to say this: Our collaboration is far from working: I wrote this several times that V1 breaks parsing / you asked in in this thread which patch to take but still I see you have taken the wrong version. Don't misunderstand me: I don't want to criticise your work because I know you very busy and take care of many issues - there is lots more than checking my patches :) Current situation causes extra efforts for both of us so what can we do to improve the situation? For networkmanager: I had to learn that musl is not fixed. Although I don't plan to use musl I suggest to send V3 with fixed musl because I really want to get this closed. Andreas -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel