CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

usb-modeswitch, usb-modeswitch-data: fix usrmerge

Browse Source 
Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 50a487fc0b)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Ulrich Ölmann 2020-10-21 10:21:14 +02:00 committed by Armin Kuster
parent 2a5c534d2b
commit 8ce3a09b13
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb
View File

@ -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"

2
meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.0.bb
View File

@ -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