Re: [oe] [meta-oe][dunfell][PATCH] usb-modeswitch, usb-modeswitch-data: fix usrmerge

["akuster" <akuster808@gmail.com>]

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=stable/dunfell-nut

My build system is under powered so it takes longer.

-armin
> On Mon, Nov 09 2020 at 08:09 +0100, Ulrich ?lmann <u.oelmann@pengutronix.de> wrote:
>> Gentle ping!
>>
>> On Mon, Oct 26 2020 at 07:00 +0100, Ulrich ?lmann <u.oelmann@pengutronix.de> wrote:
>>> Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>> (cherry picked from commit 50a487fc0b0123b154db73f79bbb18b23eb234f0)
>>> Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
>>> ---
>>>  .../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-data_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_20191128.bb
>>> +++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb
>>> @@ -11,9 +11,9 @@ SRC_URI[md5sum] = "e8fce7eb949cbe16c61fb71bade4cc17"
>>>  SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9"
>>>
>>>  do_install() {
>>> -    oe_runmake install DESTDIR=${D}
>>> +    oe_runmake install DESTDIR=${D} RULESDIR=${D}/${nonarch_base_libdir}/udev/rules.d
>>>  }
>>>
>>>  RDEPENDS_${PN} = "usb-modeswitch (>= 2.4.0)"
>>> -FILES_${PN} += "${base_libdir}/udev/rules.d/ \
>>> +FILES_${PN} += "${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} = "tcl"
>>>  RRECOMMENDS_${PN} = "usb-modeswitch-data"
>>>
>>>  do_install() {
>>> -    oe_runmake DESTDIR=${D} install
>>> +    oe_runmake DESTDIR=${D} UDEVDIR=${D}/${nonarch_base_libdir}/udev install
>>>      if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
>>>          install -d ${D}/${systemd_unitdir}/system
>>>          install -m 644 ${S}/usb_modeswitch@.service ${D}/${systemd_unitdir}/system
>>>
>>> 
>>>