Skip to content

Commit b8d5e40

Browse files
committed
luna-surfacemanager: don't package config files in PN-base
* in OSE it's in PN-conf, but in LuneOS we have separate luna-surfacemanager-conf recipe, so use PN-base-conf instead * this is needed to avoid confict between luna-surfacemanager-base and auto-luna-surfacemanager * check_data_file_clashes: Package auto-luna-surface-manager wants to install file /OE/build/luneos-kirkstone/webos-ports/tmp-glibc/work/qemux86_64-webos-linux/luneos-dev-image/1.0-r0/rootfs/etc/surface-manager.d/product.env But that file is already provided by package * luna-surfacemanager-base * check_data_file_clashes: Package auto-luna-surface-manager wants to install file /OE/build/luneos-kirkstone/webos-ports/tmp-glibc/work/qemux86_64-webos-linux/luneos-dev-image/1.0-r0/rootfs/usr/share/luna-service2/api-permissions.d/com.webos.surfacemanager.api.json But that file is already provided by package * luna-surfacemanager-base * check_data_file_clashes: Package auto-luna-surface-manager wants to install file /OE/build/luneos-kirkstone/webos-ports/tmp-glibc/work/qemux86_64-webos-linux/luneos-dev-image/1.0-r0/rootfs/usr/share/luna-service2/client-permissions.d/com.webos.surfacemanager.perm.json But that file is already provided by package * luna-surfacemanager-base * check_data_file_clashes: Package auto-luna-surface-manager wants to install file /OE/build/luneos-kirkstone/webos-ports/tmp-glibc/work/qemux86_64-webos-linux/luneos-dev-image/1.0-r0/rootfs/usr/share/luna-service2/groups.d/com.webos.surfacemanager.groups.json But that file is already provided by package * luna-surfacemanager-base * check_data_file_clashes: Package auto-luna-surface-manager wants to install file /OE/build/luneos-kirkstone/webos-ports/tmp-glibc/work/qemux86_64-webos-linux/luneos-dev-image/1.0-r0/rootfs/usr/share/luna-service2/roles.d/com.webos.surfacemanager.role.json But that file is already provided by package * luna-surfacemanager-base * check_data_file_clashes: Package auto-luna-surface-manager wants to install file /OE/build/luneos-kirkstone/webos-ports/tmp-glibc/work/qemux86_64-webos-linux/luneos-dev-image/1.0-r0/rootfs/usr/share/luna-service2/services.d/com.webos.surfacemanager.service But that file is already provided by package * luna-surfacemanager-base Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 parent e73b5c3 commit b8d5e40

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

meta-luneos/recipes-webos/luna-surfacemanager/luna-surfacemanager.bb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,17 @@ PACKAGECONFIG[cursor-theme] = "CONFIG+=cursor_theme,,"
7979

8080
PACKAGECONFIG = "compositor cursor-theme"
8181

82-
PACKAGES =+ "${PN}-base ${PN}-base-tests"
82+
PACKAGES =+ "${PN}-base ${PN}-base-tests ${PN}-base-conf"
8383

8484
FILES:${PN}-base += " \
8585
${OE_QMAKE_PATH_QML}/WebOSCompositorBase/ \
8686
${OE_QMAKE_PATH_QML}/WebOSCompositor/ \
8787
${OE_QMAKE_PATH_BINS}/ \
8888
${datadir}/icons/ \
8989
${datadir}/webos-keymap/webos-keymap.qmap \
90+
"
91+
92+
FILES:${PN}-base-conf += " \
9093
${sysconfdir}/surface-manager.d/ \
9194
${webos_sysbus_apipermissionsdir} \
9295
${webos_sysbus_groupsdir} \

0 commit comments

Comments
 (0)