All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Ulrich ?lmann" <u.oelmann@pengutronix.de>
To: Khem Raj <raj.khem@gmail.com>
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-oe][PATCH] usb-modeswitch, usb-modeswitch-data: fix usrmerge
Date: Wed, 21 Oct 2020 10:20:35 +0200	[thread overview]
Message-ID: <6r362856ss.fsf@pengutronix.de> (raw)
In-Reply-To: <c08fc5cb-900f-3ec1-58d0-c6f2a61e2b47@gmail.com>

Hi Khem!

On Tue, Oct 20 2020 at 18:54 +0200, Khem Raj <raj.khem@gmail.com> wrote:
> On 10/20/20 2:10 AM, Ulrich ?lmann wrote:
>> 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..0143a258b01a 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
>> @@ -12,7 +12,7 @@ inherit pkgconfig systemd
>>   
>>   SYSTEMD_SERVICE_${PN} = "usb_modeswitch@.service"
>>   
>> -EXTRA_OEMAKE = "TCL=${bindir}/tclsh"
>> +EXTRA_OEMAKE = "TCL=${bindir}/tclsh UDEVDIR=${D}/${nonarch_base_libdir}/udev"
>
> Can we use STAGING_DIR_TARGET instead of D here

Good point!

As UDEVDIR is only used in the install target of usb-modeswitch's
Makefile the correct approach seems to be to stick with D, not switch to
STAGING_DIR_TARGET, but instead move the assignment of UDEVDIR to the
call of "oe_runmake ... install" in do_install() - sending v2 in a
minute.

Thanks
Ulrich


>>   
>>   FILES_${PN} = "${bindir} ${sysconfdir} ${nonarch_base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch"
>>   RDEPENDS_${PN} = "tcl"
>> 
>> 
>> 
>> 
>> 
>
> 
-- 
Pengutronix e.K.                           | Ulrich Ölmann               |
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 |

      reply	other threads:[~2020-10-21  8:20 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-20  9:10 [meta-oe][PATCH] usb-modeswitch, usb-modeswitch-data: fix usrmerge Ulrich ?lmann
2020-10-20 16:54 ` [oe] " Khem Raj
2020-10-21  8:20   ` Ulrich ?lmann [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6r362856ss.fsf@pengutronix.de \
    --to=u.oelmann@pengutronix.de \
    --cc=openembedded-devel@lists.openembedded.org \
    --cc=raj.khem@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.