* [meta-oe][PATCH] usb-modeswitch, usb-modeswitch-data: fix usrmerge
@ 2020-10-20 9:10 Ulrich ?lmann
2020-10-20 16:54 ` [oe] " Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Ulrich ?lmann @ 2020-10-20 9:10 UTC (permalink / raw)
To: openembedded-devel; +Cc: Ulrich Ölmann
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"
FILES_${PN} = "${bindir} ${sysconfdir} ${nonarch_base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch"
RDEPENDS_${PN} = "tcl"
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [oe] [meta-oe][PATCH] usb-modeswitch, usb-modeswitch-data: fix usrmerge
2020-10-20 9:10 [meta-oe][PATCH] usb-modeswitch, usb-modeswitch-data: fix usrmerge Ulrich ?lmann
@ 2020-10-20 16:54 ` Khem Raj
2020-10-21 8:20 ` Ulrich ?lmann
0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2020-10-20 16:54 UTC (permalink / raw)
To: Ulrich ?lmann, openembedded-devel
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
>
> FILES_${PN} = "${bindir} ${sysconfdir} ${nonarch_base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch"
> RDEPENDS_${PN} = "tcl"
>
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [oe] [meta-oe][PATCH] usb-modeswitch, usb-modeswitch-data: fix usrmerge
2020-10-20 16:54 ` [oe] " Khem Raj
@ 2020-10-21 8:20 ` Ulrich ?lmann
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich ?lmann @ 2020-10-21 8:20 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-devel
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 |
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-21 8:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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.