diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 17:04:53 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 10:21:25 -0700 |
| commit | c61dc077bbd81260e4f167fa2251643ba0ba6974 (patch) | |
| tree | 66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-oe/recipes-graphics/lxdm | |
| parent | c5f7cfb8db54cfa4257797db5bd87828dea43296 (diff) | |
| download | meta-openembedded-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz | |
Convert to new override syntax
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/lxdm')
| -rw-r--r-- | meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index 216bbb624a..2a8a8859b7 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb | |||
| @@ -26,7 +26,7 @@ PE = "1" | |||
| 26 | 26 | ||
| 27 | DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+3 virtual/libx11 libxcb pango iso-codes" | 27 | DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+3 virtual/libx11 libxcb pango iso-codes" |
| 28 | DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" | 28 | DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" |
| 29 | DEPENDS_append_libc-musl = " libexecinfo" | 29 | DEPENDS:append:libc-musl = " libexecinfo" |
| 30 | 30 | ||
| 31 | # combine oe-core way with angstrom DISTRO_TYPE | 31 | # combine oe-core way with angstrom DISTRO_TYPE |
| 32 | DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" | 32 | DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" |
| @@ -35,19 +35,19 @@ inherit autotools pkgconfig gettext systemd features_check | |||
| 35 | # depends on virtual/libx11 | 35 | # depends on virtual/libx11 |
| 36 | REQUIRED_DISTRO_FEATURES = "x11" | 36 | REQUIRED_DISTRO_FEATURES = "x11" |
| 37 | 37 | ||
| 38 | CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " | 38 | CFLAGS:append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " |
| 39 | LDFLAGS_append_libc-musl = " -lexecinfo" | 39 | LDFLAGS:append:libc-musl = " -lexecinfo" |
| 40 | 40 | ||
| 41 | EXTRA_OECONF += "--enable-gtk3=yes --enable-password=yes --with-x -with-xconn=xcb \ | 41 | EXTRA_OECONF += "--enable-gtk3=yes --enable-password=yes --with-x -with-xconn=xcb \ |
| 42 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ | 42 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ |
| 43 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ | 43 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ |
| 44 | " | 44 | " |
| 45 | 45 | ||
| 46 | do_configure_prepend() { | 46 | do_configure:prepend() { |
| 47 | cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po/ | 47 | cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po/ |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | do_compile_append() { | 50 | do_compile:append() { |
| 51 | # default background configured not available / no password field available / no default screensaver | 51 | # default background configured not available / no password field available / no default screensaver |
| 52 | sed -i -e 's,bg=,# bg=,g' \ | 52 | sed -i -e 's,bg=,# bg=,g' \ |
| 53 | -e 's,# skip_password=,skip_password=,g' \ | 53 | -e 's,# skip_password=,skip_password=,g' \ |
| @@ -57,7 +57,7 @@ do_compile_append() { | |||
| 57 | oe_runmake -C ${B}/data lxdm.conf | 57 | oe_runmake -C ${B}/data lxdm.conf |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | do_install_append() { | 60 | do_install:append() { |
| 61 | install -d ${D}${localstatedir}/lib/lxdm | 61 | install -d ${D}${localstatedir}/lib/lxdm |
| 62 | install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm | 62 | install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm |
| 63 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then | 63 | if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then |
| @@ -69,7 +69,7 @@ do_install_append() { | |||
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | # make installed languages choosable | 71 | # make installed languages choosable |
| 72 | pkg_postinst_${PN} () { | 72 | pkg_postinst:${PN} () { |
| 73 | langs="" | 73 | langs="" |
| 74 | for lang in `find $D${libdir}/locale -maxdepth 1 | grep _ | sort`; do | 74 | for lang in `find $D${libdir}/locale -maxdepth 1 | grep _ | sort`; do |
| 75 | lang=`basename $lang` | 75 | lang=`basename $lang` |
| @@ -82,9 +82,9 @@ done | |||
| 82 | sed -i "s:last_langs=.*$:last_langs=$langs:g" $D${localstatedir}/lib/lxdm/lxdm.conf | 82 | sed -i "s:last_langs=.*$:last_langs=$langs:g" $D${localstatedir}/lib/lxdm/lxdm.conf |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-loginuid', '', d)} setxkbmap bash librsvg-gtk" | 85 | RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-loginuid', '', d)} setxkbmap bash librsvg-gtk" |
| 86 | 86 | ||
| 87 | RPROVIDES_${PN} += "${PN}-systemd" | 87 | RPROVIDES:${PN} += "${PN}-systemd" |
| 88 | RREPLACES_${PN} += "${PN}-systemd" | 88 | RREPLACES:${PN} += "${PN}-systemd" |
| 89 | RCONFLICTS_${PN} += "${PN}-systemd" | 89 | RCONFLICTS:${PN} += "${PN}-systemd" |
| 90 | SYSTEMD_SERVICE_${PN} = "lxdm.service" | 90 | SYSTEMD_SERVICE:${PN} = "lxdm.service" |
