From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [85.220.165.71]) by mx.groups.io with SMTP id smtpd.web12.4609.1605596186822319736 for ; Mon, 16 Nov 2020 22:56:27 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: pengutronix.de, ip: 85.220.165.71, mailfrom: u.oelmann@pengutronix.de) Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1keuud-0004QC-VD; Tue, 17 Nov 2020 07:56:23 +0100 Received: from uol by dude.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1keuud-0002uF-MU; Tue, 17 Nov 2020 07:56:23 +0100 References: <16417565E85E3454.9771@lists.openembedded.org> <1645C54B3A3F0288.10479@lists.openembedded.org> <6rsg99vg1j.fsf@pengutronix.de> <2885ec60-dc02-d0bf-6d52-5e055571b4ea@gmail.com> User-agent: mu4e 1.4.13; emacs 28.0.50 From: "Ulrich ?lmann" To: akuster Cc: openembedded-devel@lists.openembedded.org Subject: Re: [oe] [meta-oe][dunfell][PATCH] usb-modeswitch, usb-modeswitch-data: fix usrmerge In-reply-to: <2885ec60-dc02-d0bf-6d52-5e055571b4ea@gmail.com> Date: Tue, 17 Nov 2020 07:56:23 +0100 Message-ID: <6rpn4cv5d4.fsf@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: u.oelmann@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: openembedded-devel@lists.openembedded.org Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On Mon, Nov 16 2020 at 16:45 +0100, akuster wrote: > On 11/16/20 12:53 AM, Ulrich ?lmann wrote: >> Ping! >> > Thanks for the reminder, > > Its under test in > https://git.openembedded.org/meta-openembedded-contrib/log/?h=3Dstable/d= unfell-nut Thanks, Armin! > My build system is under powered so it takes longer. Carefully doing this job takes time - no problem. Best regards Ulrich > -armin >> On Mon, Nov 09 2020 at 08:09 +0100, Ulrich ?lmann wrote: >>> Gentle ping! >>> >>> On Mon, Oct 26 2020 at 07:00 +0100, Ulrich ?lmann wrote: >>>> Signed-off-by: Ulrich =C3=96lmann >>>> Signed-off-by: Khem Raj >>>> (cherry picked from commit 50a487fc0b0123b154db73f79bbb18b23eb234f0) >>>> Signed-off-by: Ulrich =C3=96lmann >>>> --- >>>> .../usb-modeswitch/usb-modeswitch-data_20191128.bb | 4 ++= -- >>>> .../recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb | 2 +- >>>> 2 files changed, 3 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-da= ta_20191128.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data= _20191128.bb >>>> index 938c0f9c26bd..ca970e59bb3a 100644 >>>> --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_2019= 1128.bb >>>> +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_2019= 1128.bb >>>> @@ -11,9 +11,9 @@ SRC_URI[md5sum] =3D "e8fce7eb949cbe16c61fb71bade4cc= 17" >>>> SRC_URI[sha256sum] =3D "3f039b60791c21c7cb15c7986cac89650f076dc27479= 8fa242231b910785eaf9" >>>> >>>> do_install() { >>>> - oe_runmake install DESTDIR=3D${D} >>>> + oe_runmake install DESTDIR=3D${D} RULESDIR=3D${D}/${nonarch_base= _libdir}/udev/rules.d >>>> } >>>> >>>> RDEPENDS_${PN} =3D "usb-modeswitch (>=3D 2.4.0)" >>>> -FILES_${PN} +=3D "${base_libdir}/udev/rules.d/ \ >>>> +FILES_${PN} +=3D "${nonarch_base_libdir}/udev/rules.d/ \ >>>> ${datadir}/usb_modeswitch" >>>> diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.= 6.0.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb >>>> index baad340908ac..6a5287af4959 100644 >>>> --- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb >>>> +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb >>>> @@ -19,7 +19,7 @@ RDEPENDS_${PN} =3D "tcl" >>>> RRECOMMENDS_${PN} =3D "usb-modeswitch-data" >>>> >>>> do_install() { >>>> - oe_runmake DESTDIR=3D${D} install >>>> + oe_runmake DESTDIR=3D${D} UDEVDIR=3D${D}/${nonarch_base_libdir}/= udev install >>>> if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','fals= e',d)}; then >>>> install -d ${D}/${systemd_unitdir}/system >>>> install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_u= nitdir}/system >>>> >>>> >>>> > > >=20 --=20 Pengutronix e.K. | Ulrich =C3=96lmann = | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |