diff options
author | jmbills <jason.m.bills@intel.com> | 2021-10-04 22:42:48 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-04 22:42:48 +0300 |
commit | 0c9e31989c615598b5d042ffab385606660c93c0 (patch) | |
tree | 8019999b0ca042482e5193d6cabc06220c71d776 /meta-openembedded/meta-oe/recipes-graphics/openbox | |
parent | 04cd92067d2481643df5010cb39b2134b648cf4d (diff) | |
parent | ffe6d597d9e3d4407cf8062b5d6505a80ce08f41 (diff) | |
download | openbmc-0c9e31989c615598b5d042ffab385606660c93c0.tar.xz |
Update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/openbox')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb index 53c589821..bb1e7528e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/obconf_git.bb @@ -24,10 +24,10 @@ REQUIRED_DISTRO_FEATURES = "x11" EXTRA_AUTORECONF = "" -FILES_${PN} += "\ +FILES:${PN} += "\ ${datadir}/mime \ " -do_install_append () { +do_install:append () { rm -rf ${D}${datadir}/mimelnk } diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index e269a264f..6ada9b7d2 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -17,7 +17,7 @@ inherit autotools gettext update-alternatives pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -ALTERNATIVE_${PN}-core = "x-window-manager x-session-manager" +ALTERNATIVE:${PN}-core = "x-window-manager x-session-manager" ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox" ALTERNATIVE_PRIORITY[x-window-manager] = "10" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/openbox-session" @@ -34,25 +34,25 @@ PACKAGES =+ "${PN}-core ${PN}-lxde ${PN}-gnome ${PN}-config" PACKAGES_DYNAMIC += "^${PN}-theme-.*" -python populate_packages_prepend() { +python populate_packages:prepend() { theme_dir = d.expand('${datadir}/themes/') theme_name = d.expand('${PN}-theme-%s') do_split_packages(d, theme_dir, '(.*)', theme_name, '${PN} theme for %s', extra_depends='', allow_dirs=True) } -FILES_${PN}-core = "${bindir}/openbox ${bindir}/openbox-session ${libdir}/*${SOLIBS}" +FILES:${PN}-core = "${bindir}/openbox ${bindir}/openbox-session ${libdir}/*${SOLIBS}" -FILES_${PN}-lxde += "${datadir}/lxde/ \ +FILES:${PN}-lxde += "${datadir}/lxde/ \ ${datadir}/lxpanel \ ${datadir}/xsessions \ ${datadir}/icons" -FILES_${PN}-gnome += " \ +FILES:${PN}-gnome += " \ ${bindir}/openbox-gnome-session \ ${datadir}/gnome \ ${datadir}/gnome-session \ " -FILES_${PN}-config += "${sysconfdir}" +FILES:${PN}-config += "${sysconfdir}" -RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks python3 python3-shell pyxdg" +RDEPENDS:${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks python3 python3-shell pyxdg" |