diff options
| author |   Ulrich Ölmann <u.oelmann@pengutronix.de> | 2020-10-21 10:21:14 +0200 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2020-11-09 18:42:14 -0800 |
| commit | 8ce3a09b1341eb795c7c2846c7e19bf8d78277b5 (patch) | |
| tree | 61f442acb513b7be7785558fe2b349e100f033f2 /meta-oe/recipes-support | |
| parent | 2a5c534d2b9f01e9c0f39701fccd7fc874945b1c (diff) | |
| download | meta-openembedded-contrib-8ce3a09b1341eb795c7c2846c7e19bf8d78277b5.tar.gz | |
usb-modeswitch, usb-modeswitch-data: fix usrmerge
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: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb | 4 | ||||
| -rw-r--r-- | meta-oe/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 938c0f9c26..ca970e59bb 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 baad340908..6a5287af49 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 |