diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-sato | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
19 files changed, 76 insertions, 76 deletions
diff --git a/meta/recipes-sato/images/core-image-sato.bb b/meta/recipes-sato/images/core-image-sato.bb index e50b24a476..35d0667737 100644 --- a/meta/recipes-sato/images/core-image-sato.bb +++ b/meta/recipes-sato/images/core-image-sato.bb | |||
@@ -9,8 +9,8 @@ LICENSE = "MIT" | |||
9 | 9 | ||
10 | inherit core-image | 10 | inherit core-image |
11 | 11 | ||
12 | TOOLCHAIN_HOST_TASK_append = " nativesdk-intltool nativesdk-glib-2.0" | 12 | TOOLCHAIN_HOST_TASK:append = " nativesdk-intltool nativesdk-glib-2.0" |
13 | TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" | 13 | TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = " nativesdk-intltool nativesdk-glib-2.0" |
14 | 14 | ||
15 | QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' | 15 | QB_MEM = '${@bb.utils.contains("DISTRO_FEATURES", "opengl", "-m 512", "-m 256", d)}' |
16 | QB_MEM_qemumips = "-m 256" | 16 | QB_MEM:qemumips = "-m 256" |
diff --git a/meta/recipes-sato/l3afpad/l3afpad_git.bb b/meta/recipes-sato/l3afpad/l3afpad_git.bb index 85c2c500ea..f19d03896b 100644 --- a/meta/recipes-sato/l3afpad/l3afpad_git.bb +++ b/meta/recipes-sato/l3afpad/l3afpad_git.bb | |||
@@ -26,4 +26,4 @@ inherit autotools pkgconfig features_check mime-xdg | |||
26 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 26 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
27 | 27 | ||
28 | EXTRA_OECONF = "--disable-emacs --disable-print" | 28 | EXTRA_OECONF = "--disable-emacs --disable-print" |
29 | FILES_${PN} += "${datadir}/icons" | 29 | FILES:${PN} += "${datadir}/icons" |
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb index 547e851c15..d5fe9b5dce 100644 --- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb +++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | |||
7 | file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" | 7 | file://appearance/mb-appearance.c;endline=25;md5=ea92333cf8a6802639d62d874c114a28" |
8 | 8 | ||
9 | DEPENDS = "gconf gtk+3" | 9 | DEPENDS = "gconf gtk+3" |
10 | RDEPENDS_${PN} = "settings-daemon" | 10 | RDEPENDS:${PN} = "settings-daemon" |
11 | 11 | ||
12 | # SRCREV tagged 0.2 | 12 | # SRCREV tagged 0.2 |
13 | SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa" | 13 | SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa" |
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb index d775b5c651..79ccb0391b 100644 --- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb +++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb | |||
@@ -26,9 +26,9 @@ inherit autotools pkgconfig features_check | |||
26 | # The startup-notification requires x11 in DISTRO_FEATURES | 26 | # The startup-notification requires x11 in DISTRO_FEATURES |
27 | REQUIRED_DISTRO_FEATURES = "x11" | 27 | REQUIRED_DISTRO_FEATURES = "x11" |
28 | 28 | ||
29 | do_install_append() { | 29 | do_install:append() { |
30 | install -d ${D}${datadir}/matchbox/vfolders/ | 30 | install -d ${D}${datadir}/matchbox/vfolders/ |
31 | install -m 0644 ${WORKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/ | 31 | install -m 0644 ${WORKDIR}/vfolders/* ${D}${datadir}/matchbox/vfolders/ |
32 | } | 32 | } |
33 | 33 | ||
34 | FILES_${PN} += "${datadir}/matchbox/vfolders/" | 34 | FILES:${PN} += "${datadir}/matchbox/vfolders/" |
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb index 49e37bd77c..a878411814 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb | |||
@@ -33,19 +33,19 @@ PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3" | |||
33 | 33 | ||
34 | PACKAGES += "${PN}-im ${PN}-applet" | 34 | PACKAGES += "${PN}-im ${PN}-applet" |
35 | 35 | ||
36 | FILES_${PN} = "${bindir}/ \ | 36 | FILES:${PN} = "${bindir}/ \ |
37 | ${sysconfdir} \ | 37 | ${sysconfdir} \ |
38 | ${datadir}/applications \ | 38 | ${datadir}/applications \ |
39 | ${datadir}/pixmaps \ | 39 | ${datadir}/pixmaps \ |
40 | ${datadir}/matchbox-keyboard" | 40 | ${datadir}/matchbox-keyboard" |
41 | 41 | ||
42 | FILES_${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \ | 42 | FILES:${PN}-im = "${libdir}/gtk-2.0/*/immodules/*.so \ |
43 | ${libdir}/gtk-3.0/*/immodules/*.so" | 43 | ${libdir}/gtk-3.0/*/immodules/*.so" |
44 | 44 | ||
45 | FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so" | 45 | FILES:${PN}-applet = "${libdir}/matchbox-panel/*.so" |
46 | 46 | ||
47 | 47 | ||
48 | do_install_append () { | 48 | do_install:append () { |
49 | install -d ${D}/${sysconfdir}/X11/Xsession.d/ | 49 | install -d ${D}/${sysconfdir}/X11/Xsession.d/ |
50 | install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ | 50 | install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/ |
51 | 51 | ||
@@ -56,5 +56,5 @@ do_install_append () { | |||
56 | 56 | ||
57 | GTKIMMODULES_PACKAGES = "${PN}-im" | 57 | GTKIMMODULES_PACKAGES = "${PN}-im" |
58 | 58 | ||
59 | RDEPENDS_${PN} = "formfactor dbus-wait" | 59 | RDEPENDS:${PN} = "formfactor dbus-wait" |
60 | RRECOMMENDS_${PN} = "${PN}-applet" | 60 | RRECOMMENDS:${PN} = "${PN}-applet" |
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb index c659964a2b..c6de14e34e 100644 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.11.bb | |||
@@ -19,9 +19,9 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
19 | # SRCREV tagged 2.11 plus some autotools fixes | 19 | # SRCREV tagged 2.11 plus some autotools fixes |
20 | SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" | 20 | SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7" |
21 | 21 | ||
22 | RPROVIDES_${PN} = "matchbox-panel" | 22 | RPROVIDES:${PN} = "matchbox-panel" |
23 | RREPLACES_${PN} = "matchbox-panel" | 23 | RREPLACES:${PN} = "matchbox-panel" |
24 | RCONFLICTS_${PN} = "matchbox-panel" | 24 | RCONFLICTS:${PN} = "matchbox-panel" |
25 | 25 | ||
26 | SRC_URI = "git://git.yoctoproject.org/${BPN} \ | 26 | SRC_URI = "git://git.yoctoproject.org/${BPN} \ |
27 | file://0001-applets-systray-Allow-icons-to-be-smaller.patch \ | 27 | file://0001-applets-systray-Allow-icons-to-be-smaller.patch \ |
@@ -33,10 +33,10 @@ EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-batter | |||
33 | 33 | ||
34 | S = "${WORKDIR}/git" | 34 | S = "${WORKDIR}/git" |
35 | 35 | ||
36 | FILES_${PN} += "${libdir}/matchbox-panel/*.so \ | 36 | FILES:${PN} += "${libdir}/matchbox-panel/*.so \ |
37 | ${datadir}/matchbox-panel/brightness/*.png \ | 37 | ${datadir}/matchbox-panel/brightness/*.png \ |
38 | ${datadir}/matchbox-panel/startup/*.png \ | 38 | ${datadir}/matchbox-panel/startup/*.png \ |
39 | ${datadir}/icons/" | 39 | ${datadir}/icons/" |
40 | FILES_${PN}-dev += "${libdir}/matchbox-panel/*.la" | 40 | FILES:${PN}-dev += "${libdir}/matchbox-panel/*.la" |
41 | 41 | ||
42 | inherit autotools pkgconfig features_check gettext | 42 | inherit autotools pkgconfig features_check gettext |
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb index 966c5b5b92..7af11c2f50 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb | |||
@@ -6,7 +6,7 @@ LICENSE = "GPLv2.0+" | |||
6 | LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" | 6 | LIC_FILES_CHKSUM = "file://session;endline=3;md5=f8a5c5b9c279e52dc094d10e11c2be63" |
7 | 7 | ||
8 | SECTION = "x11" | 8 | SECTION = "x11" |
9 | RDEPENDS_${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop matchbox-session gconf" | 9 | RDEPENDS:${PN} = "formfactor matchbox-theme-sato matchbox-panel-2 matchbox-desktop matchbox-session gconf" |
10 | PR = "r30" | 10 | PR = "r30" |
11 | 11 | ||
12 | # This package is architecture specific because the session script is modified | 12 | # This package is architecture specific because the session script is modified |
@@ -22,7 +22,7 @@ SRC_URI = "file://session \ | |||
22 | file://index.theme" | 22 | file://index.theme" |
23 | S = "${WORKDIR}" | 23 | S = "${WORKDIR}" |
24 | 24 | ||
25 | FILES_${PN} += "${datadir}/themes/Sato/index.theme" | 25 | FILES:${PN} += "${datadir}/themes/Sato/index.theme" |
26 | 26 | ||
27 | do_install() { | 27 | do_install() { |
28 | # This is the set of machine features that the script has markers for | 28 | # This is the set of machine features that the script has markers for |
@@ -43,7 +43,7 @@ do_install() { | |||
43 | } | 43 | } |
44 | 44 | ||
45 | PACKAGE_WRITE_DEPS += "gconf-native" | 45 | PACKAGE_WRITE_DEPS += "gconf-native" |
46 | pkg_postinst_${PN} () { | 46 | pkg_postinst:${PN} () { |
47 | set_value() { | 47 | set_value() { |
48 | #type, name, value | 48 | #type, name, value |
49 | gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type $1 --set /desktop/poky/interface/$2 "$3" | 49 | gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type $1 --set /desktop/poky/interface/$2 "$3" |
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc index ce683e9630..bd680111d9 100644 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato.inc | |||
@@ -10,7 +10,7 @@ SECTION = "x11/wm" | |||
10 | 10 | ||
11 | inherit autotools pkgconfig features_check | 11 | inherit autotools pkgconfig features_check |
12 | 12 | ||
13 | FILES_${PN} += "${datadir}/themes" | 13 | FILES:${PN} += "${datadir}/themes" |
14 | 14 | ||
15 | # The matchbox-wm requires x11 in DISTRO_FEATURES | 15 | # The matchbox-wm requires x11 in DISTRO_FEATURES |
16 | REQUIRED_DISTRO_FEATURES = "x11" | 16 | REQUIRED_DISTRO_FEATURES = "x11" |
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb index 25725e078d..cfa301a58d 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | |||
@@ -14,7 +14,7 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
14 | 14 | ||
15 | PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" | 15 | PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" |
16 | 16 | ||
17 | RDEPENDS_${PN} = "\ | 17 | RDEPENDS:${PN} = "\ |
18 | ${PN}-base \ | 18 | ${PN}-base \ |
19 | ${PN}-apps \ | 19 | ${PN}-apps \ |
20 | ${PN}-games \ | 20 | ${PN}-games \ |
@@ -22,8 +22,8 @@ RDEPENDS_${PN} = "\ | |||
22 | 22 | ||
23 | NETWORK_MANAGER ?= "connman-gnome" | 23 | NETWORK_MANAGER ?= "connman-gnome" |
24 | 24 | ||
25 | SUMMARY_${PN}-base = "Sato desktop - base packages" | 25 | SUMMARY:${PN}-base = "Sato desktop - base packages" |
26 | RDEPENDS_${PN}-base = "\ | 26 | RDEPENDS:${PN}-base = "\ |
27 | matchbox-desktop \ | 27 | matchbox-desktop \ |
28 | matchbox-session-sato \ | 28 | matchbox-session-sato \ |
29 | matchbox-keyboard \ | 29 | matchbox-keyboard \ |
@@ -45,10 +45,10 @@ WEB ?= "" | |||
45 | #WEB = "epiphany" | 45 | #WEB = "epiphany" |
46 | 46 | ||
47 | GSTEXAMPLES ?= "gst-examples" | 47 | GSTEXAMPLES ?= "gst-examples" |
48 | GSTEXAMPLES_riscv64 = "" | 48 | GSTEXAMPLES:riscv64 = "" |
49 | 49 | ||
50 | SUMMARY_${PN}-apps = "Sato desktop - applications" | 50 | SUMMARY:${PN}-apps = "Sato desktop - applications" |
51 | RDEPENDS_${PN}-apps = "\ | 51 | RDEPENDS:${PN}-apps = "\ |
52 | l3afpad \ | 52 | l3afpad \ |
53 | matchbox-terminal \ | 53 | matchbox-terminal \ |
54 | sato-screenshot \ | 54 | sato-screenshot \ |
@@ -57,7 +57,7 @@ RDEPENDS_${PN}-apps = "\ | |||
57 | ${WEB} \ | 57 | ${WEB} \ |
58 | " | 58 | " |
59 | 59 | ||
60 | SUMMARY_${PN}-games = "Sato desktop - games" | 60 | SUMMARY:${PN}-games = "Sato desktop - games" |
61 | RDEPENDS_${PN}-games = "\ | 61 | RDEPENDS:${PN}-games = "\ |
62 | puzzles \ | 62 | puzzles \ |
63 | " | 63 | " |
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb index d3a9b84227..aa1ac77e16 100644 --- a/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb +++ b/meta/recipes-sato/pcmanfm/pcmanfm_1.3.2.bb | |||
@@ -28,13 +28,13 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
28 | 28 | ||
29 | EXTRA_OECONF = "--with-gtk=3" | 29 | EXTRA_OECONF = "--with-gtk=3" |
30 | 30 | ||
31 | do_install_append () { | 31 | do_install:append () { |
32 | install -d ${D}/${datadir} | 32 | install -d ${D}/${datadir} |
33 | install -d ${D}/${datadir}/pixmaps/ | 33 | install -d ${D}/${datadir}/pixmaps/ |
34 | 34 | ||
35 | install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps | 35 | install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps |
36 | } | 36 | } |
37 | 37 | ||
38 | FILES_${PN} += "${libdir}/pcmanfm" | 38 | FILES:${PN} += "${libdir}/pcmanfm" |
39 | 39 | ||
40 | RRECOMMENDS_${PN} += "adwaita-icon-theme" | 40 | RRECOMMENDS:${PN} += "adwaita-icon-theme" |
diff --git a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb index e27339fb46..ec187ed9bd 100644 --- a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb +++ b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb | |||
@@ -13,5 +13,5 @@ do_install() { | |||
13 | install -m 0644 ${S}/50-sato.conf ${D}${sysconfdir}/pulse/client.conf.d/50-sato.conf | 13 | install -m 0644 ${S}/50-sato.conf ${D}${sysconfdir}/pulse/client.conf.d/50-sato.conf |
14 | } | 14 | } |
15 | 15 | ||
16 | FILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" | 16 | FILES:${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" |
17 | CONFFILES_${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" | 17 | CONFFILES:${PN} = "${sysconfdir}/pulse/client.conf.d/50-sato.conf" |
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb index 44fa597008..298e29f559 100644 --- a/meta/recipes-sato/puzzles/puzzles_git.bb +++ b/meta/recipes-sato/puzzles/puzzles_git.bb | |||
@@ -27,7 +27,7 @@ inherit cmake features_check pkgconfig | |||
27 | 27 | ||
28 | DEPENDS += "gtk+3" | 28 | DEPENDS += "gtk+3" |
29 | 29 | ||
30 | do_install_append () { | 30 | do_install:append () { |
31 | # net conflicts with Samba, so rename it | 31 | # net conflicts with Samba, so rename it |
32 | mv ${D}${bindir}/net ${D}${bindir}/puzzles-net | 32 | mv ${D}${bindir}/net ${D}${bindir}/puzzles-net |
33 | 33 | ||
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc index ff2c8f009d..69b8a659ed 100644 --- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | |||
@@ -16,10 +16,10 @@ SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 | |||
16 | inherit autotools pkgconfig update-alternatives | 16 | inherit autotools pkgconfig update-alternatives |
17 | 17 | ||
18 | PROVIDES = "virtual/x-terminal-emulator" | 18 | PROVIDES = "virtual/x-terminal-emulator" |
19 | ALTERNATIVE_${PN} = "x-terminal-emulator" | 19 | ALTERNATIVE:${PN} = "x-terminal-emulator" |
20 | ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" | 20 | ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/rxvt" |
21 | 21 | ||
22 | CFLAGS_append = " -fpermissive" | 22 | CFLAGS:append = " -fpermissive" |
23 | 23 | ||
24 | EXTRA_OECONF = "--enable-xim \ | 24 | EXTRA_OECONF = "--enable-xim \ |
25 | --enable-utmp --enable-wtmp --enable-lastlog \ | 25 | --enable-utmp --enable-wtmp --enable-lastlog \ |
@@ -31,25 +31,25 @@ EXTRA_OECONF = "--enable-xim \ | |||
31 | --enable-combining --disable-perl \ | 31 | --enable-combining --disable-perl \ |
32 | --with-x=${STAGING_DIR_HOST}${prefix}" | 32 | --with-x=${STAGING_DIR_HOST}${prefix}" |
33 | 33 | ||
34 | EXTRA_OECONF_append_libc-musl = " --disable-wtmp --disable-lastlog" | 34 | EXTRA_OECONF:append:libc-musl = " --disable-wtmp --disable-lastlog" |
35 | 35 | ||
36 | PACKAGECONFIG ??= "" | 36 | PACKAGECONFIG ??= "" |
37 | PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," | 37 | PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification," |
38 | 38 | ||
39 | do_configure_prepend () { | 39 | do_configure:prepend () { |
40 | if [ ! -e ${S}/acinclude.m4 ]; then | 40 | if [ ! -e ${S}/acinclude.m4 ]; then |
41 | cp ${S}/aclocal.m4 ${S}/acinclude.m4 | 41 | cp ${S}/aclocal.m4 ${S}/acinclude.m4 |
42 | fi | 42 | fi |
43 | } | 43 | } |
44 | 44 | ||
45 | do_compile_prepend () { | 45 | do_compile:prepend () { |
46 | echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h | 46 | echo '#define UTMP_FILE "${localstatedir}/run/utmp"' >> config.h |
47 | echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h | 47 | echo '#define WTMP_FILE "${localstatedir}/log/wtmp"' >> config.h |
48 | echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h | 48 | echo '#define LASTLOG_FILE "${localstatedir}/log/lastlog"' >> config.h |
49 | echo '#define HAVE_XLOCALE 1' >> config.h | 49 | echo '#define HAVE_XLOCALE 1' >> config.h |
50 | } | 50 | } |
51 | 51 | ||
52 | do_install_append () { | 52 | do_install:append () { |
53 | install -d ${D}/${datadir} | 53 | install -d ${D}/${datadir} |
54 | install -d ${D}/${datadir}/applications | 54 | install -d ${D}/${datadir}/applications |
55 | install -d ${D}/${datadir}/pixmaps/ | 55 | install -d ${D}/${datadir}/pixmaps/ |
@@ -58,4 +58,4 @@ do_install_append () { | |||
58 | install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications | 58 | install -m 0644 ${WORKDIR}/rxvt.desktop ${D}/${datadir}/applications |
59 | } | 59 | } |
60 | 60 | ||
61 | FILES_${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" | 61 | FILES:${PN} += "${datadir}/applications/rxvt.desktop ${datadir}/pixmaps/rxvt.png" |
diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb index 2b1f513f1c..b2913b4ed5 100644 --- a/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb +++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb | |||
@@ -18,9 +18,9 @@ S = "${WORKDIR}/git" | |||
18 | 18 | ||
19 | inherit autotools pkgconfig features_check | 19 | inherit autotools pkgconfig features_check |
20 | 20 | ||
21 | FILES_${PN} += "${libdir}/matchbox-panel/*.so" | 21 | FILES:${PN} += "${libdir}/matchbox-panel/*.so" |
22 | 22 | ||
23 | do_install_append () { | 23 | do_install:append () { |
24 | rm -f ${D}${libdir}/matchbox-panel/*.la | 24 | rm -f ${D}${libdir}/matchbox-panel/*.la |
25 | } | 25 | } |
26 | 26 | ||
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb index d01177f9b9..742364f699 100644 --- a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb +++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb | |||
@@ -19,12 +19,12 @@ S = "${WORKDIR}/git" | |||
19 | 19 | ||
20 | inherit autotools pkgconfig gconf features_check | 20 | inherit autotools pkgconfig gconf features_check |
21 | 21 | ||
22 | FILES_${PN} = "${bindir}/* ${sysconfdir}" | 22 | FILES:${PN} = "${bindir}/* ${sysconfdir}" |
23 | 23 | ||
24 | # Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES | 24 | # Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES |
25 | REQUIRED_DISTRO_FEATURES = "x11" | 25 | REQUIRED_DISTRO_FEATURES = "x11" |
26 | 26 | ||
27 | do_install_append () { | 27 | do_install:append () { |
28 | install -d ${D}/${sysconfdir}/X11/Xsession.d | 28 | install -d ${D}/${sysconfdir}/X11/Xsession.d |
29 | install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ | 29 | install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ |
30 | } | 30 | } |
diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb index 28d5096023..4bb896fc7b 100644 --- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb +++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop.bb | |||
@@ -15,7 +15,7 @@ do_install() { | |||
15 | sed -i ${D}${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#' | 15 | sed -i ${D}${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)#Exec=${base_sbindir}/\1#' |
16 | } | 16 | } |
17 | 17 | ||
18 | pkg_postinst_${PN} () { | 18 | pkg_postinst:${PN} () { |
19 | grep -q qemuarm $D${sysconfdir}/hostname && \ | 19 | grep -q qemuarm $D${sysconfdir}/hostname && \ |
20 | sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)/halt#Exec=\1/reboot#' \ | 20 | sed -i $D${datadir}/applications/shutdown.desktop -e 's#^Exec=\(.*\)/halt#Exec=\1/reboot#' \ |
21 | || true | 21 | || true |
diff --git a/meta/recipes-sato/webkit/libwpe_1.10.1.bb b/meta/recipes-sato/webkit/libwpe_1.10.1.bb index 4680c1e95e..22fff93cab 100644 --- a/meta/recipes-sato/webkit/libwpe_1.10.1.bb +++ b/meta/recipes-sato/webkit/libwpe_1.10.1.bb | |||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=371a616eb4903c6cb79e9893a5f615cc" | |||
7 | DEPENDS = "virtual/egl libxkbcommon" | 7 | DEPENDS = "virtual/egl libxkbcommon" |
8 | 8 | ||
9 | # Workaround build issue with RPi userland EGL libraries. | 9 | # Workaround build issue with RPi userland EGL libraries. |
10 | CFLAGS_append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" | 10 | CFLAGS:append_rpi = " ${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '', '-D_GNU_SOURCE', d)}" |
11 | 11 | ||
12 | inherit cmake features_check | 12 | inherit cmake features_check |
13 | 13 | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb index 96b6cab49c..89b13314e5 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.32.2.bb | |||
@@ -79,61 +79,61 @@ EXTRA_OECMAKE = " \ | |||
79 | " | 79 | " |
80 | 80 | ||
81 | # Javascript JIT is not supported on ARC | 81 | # Javascript JIT is not supported on ARC |
82 | EXTRA_OECMAKE_append_arc = " -DENABLE_JIT=OFF " | 82 | EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " |
83 | # By default 25-bit "medium" calls are used on ARC | 83 | # By default 25-bit "medium" calls are used on ARC |
84 | # which is not enough for binaries larger than 32 MiB | 84 | # which is not enough for binaries larger than 32 MiB |
85 | CFLAGS_append_arc = " -mlong-calls" | 85 | CFLAGS:append:arc = " -mlong-calls" |
86 | CXXFLAGS_append_arc = " -mlong-calls" | 86 | CXXFLAGS:append:arc = " -mlong-calls" |
87 | 87 | ||
88 | # Javascript JIT is not supported on powerpc | 88 | # Javascript JIT is not supported on powerpc |
89 | EXTRA_OECMAKE_append_powerpc = " -DENABLE_JIT=OFF " | 89 | EXTRA_OECMAKE:append:powerpc = " -DENABLE_JIT=OFF " |
90 | EXTRA_OECMAKE_append_powerpc64 = " -DENABLE_JIT=OFF " | 90 | EXTRA_OECMAKE:append:powerpc64 = " -DENABLE_JIT=OFF " |
91 | 91 | ||
92 | # ARM JIT code does not build on ARMv4/5/6 anymore | 92 | # ARM JIT code does not build on ARMv4/5/6 anymore |
93 | EXTRA_OECMAKE_append_armv5 = " -DENABLE_JIT=OFF " | 93 | EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " |
94 | EXTRA_OECMAKE_append_armv6 = " -DENABLE_JIT=OFF " | 94 | EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " |
95 | EXTRA_OECMAKE_append_armv4 = " -DENABLE_JIT=OFF " | 95 | EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " |
96 | 96 | ||
97 | EXTRA_OECMAKE_append_mipsarch = " -DUSE_LD_GOLD=OFF " | 97 | EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " |
98 | EXTRA_OECMAKE_append_powerpc = " -DUSE_LD_GOLD=OFF " | 98 | EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " |
99 | 99 | ||
100 | # JIT and gold linker does not work on RISCV | 100 | # JIT and gold linker does not work on RISCV |
101 | EXTRA_OECMAKE_append_riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" | 101 | EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" |
102 | EXTRA_OECMAKE_append_riscv64 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" | 102 | EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" |
103 | 103 | ||
104 | # JIT not supported on MIPS either | 104 | # JIT not supported on MIPS either |
105 | EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " | 105 | EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " |
106 | 106 | ||
107 | # JIT not supported on X32 | 107 | # JIT not supported on X32 |
108 | # An attempt was made to upstream JIT support for x32 in | 108 | # An attempt was made to upstream JIT support for x32 in |
109 | # https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as | 109 | # https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as |
110 | # unresolved due to limited X32 adoption. | 110 | # unresolved due to limited X32 adoption. |
111 | EXTRA_OECMAKE_append_x86-x32 = " -DENABLE_JIT=OFF " | 111 | EXTRA_OECMAKE:append:x86-x32 = " -DENABLE_JIT=OFF " |
112 | 112 | ||
113 | SECURITY_CFLAGS_remove_aarch64 = "-fpie" | 113 | SECURITY_CFLAGS:remove:aarch64 = "-fpie" |
114 | SECURITY_CFLAGS_append_aarch64 = " -fPIE" | 114 | SECURITY_CFLAGS:append:aarch64 = " -fPIE" |
115 | 115 | ||
116 | FILES_${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" | 116 | FILES:${PN} += "${libdir}/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so" |
117 | 117 | ||
118 | RRECOMMENDS_${PN} += "ca-certificates shared-mime-info" | 118 | RRECOMMENDS:${PN} += "ca-certificates shared-mime-info" |
119 | 119 | ||
120 | # http://errors.yoctoproject.org/Errors/Details/20370/ | 120 | # http://errors.yoctoproject.org/Errors/Details/20370/ |
121 | ARM_INSTRUCTION_SET_armv4 = "arm" | 121 | ARM_INSTRUCTION_SET:armv4 = "arm" |
122 | ARM_INSTRUCTION_SET_armv5 = "arm" | 122 | ARM_INSTRUCTION_SET:armv5 = "arm" |
123 | ARM_INSTRUCTION_SET_armv6 = "arm" | 123 | ARM_INSTRUCTION_SET:armv6 = "arm" |
124 | 124 | ||
125 | # https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 | 125 | # https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 |
126 | # https://bugs.webkit.org/show_bug.cgi?id=159880 | 126 | # https://bugs.webkit.org/show_bug.cgi?id=159880 |
127 | # JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. | 127 | # JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. |
128 | # Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). | 128 | # Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). |
129 | ARM_INSTRUCTION_SET_armv7a = "thumb" | 129 | ARM_INSTRUCTION_SET:armv7a = "thumb" |
130 | ARM_INSTRUCTION_SET_armv7r = "thumb" | 130 | ARM_INSTRUCTION_SET:armv7r = "thumb" |
131 | ARM_INSTRUCTION_SET_armv7ve = "thumb" | 131 | ARM_INSTRUCTION_SET:armv7ve = "thumb" |
132 | 132 | ||
133 | # introspection inside qemu-arm hangs forever on musl/arm builds | 133 | # introspection inside qemu-arm hangs forever on musl/arm builds |
134 | # therefore disable GI_DATA | 134 | # therefore disable GI_DATA |
135 | GI_DATA_ENABLED_libc-musl_armv7a = "False" | 135 | GI_DATA_ENABLED:libc-musl:armv7a = "False" |
136 | GI_DATA_ENABLED_libc-musl_armv7ve = "False" | 136 | GI_DATA_ENABLED:libc-musl:armv7ve = "False" |
137 | 137 | ||
138 | # Can't be built with ccache | 138 | # Can't be built with ccache |
139 | CCACHE_DISABLE = "1" | 139 | CCACHE_DISABLE = "1" |
diff --git a/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb b/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb index 38a32dad16..4588ee10ea 100644 --- a/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb +++ b/meta/recipes-sato/webkit/wpebackend-fdo_1.10.0.bb | |||
@@ -6,7 +6,7 @@ LICENSE = "BSD" | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=1f62cef2e3645e3e74eb05fd389d7a66" |
7 | DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe libepoxy" | 7 | DEPENDS = "glib-2.0 libxkbcommon wayland virtual/egl libwpe libepoxy" |
8 | 8 | ||
9 | DEPENDS_append_class-target = " wayland-native" | 9 | DEPENDS:append:class-target = " wayland-native" |
10 | 10 | ||
11 | inherit meson features_check | 11 | inherit meson features_check |
12 | 12 | ||