diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-25 22:29:23 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-29 23:38:21 +0100 |
commit | 9826f87cb466a85cba736529831175437dcc621a (patch) | |
tree | cbcabea97ff4d1225102495cd629888bbc384468 /meta-poky/conf/distro/include | |
parent | d41af446febd516f14f26db53e6572d9eae35b1e (diff) | |
download | poky-9826f87cb466a85cba736529831175437dcc621a.tar.gz |
meta-poky/meta-yocto-bsp: Convert to new override syntax
This converts the two layers to the new override syntax. This was done using
<oe-core>/scripts/contrib/convert-overrides.py <this-layer>
with no manual fixes.
(From meta-yocto rev: 387eab70f343966267c2a68746aea1bbb8525191)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-poky/conf/distro/include')
-rw-r--r-- | meta-poky/conf/distro/include/gcsections.inc | 44 | ||||
-rw-r--r-- | meta-poky/conf/distro/include/poky-distro-alt-test-config.inc | 4 | ||||
-rw-r--r-- | meta-poky/conf/distro/include/poky-floating-revisions.inc | 60 |
3 files changed, 54 insertions, 54 deletions
diff --git a/meta-poky/conf/distro/include/gcsections.inc b/meta-poky/conf/distro/include/gcsections.inc index 7157373aa8..886a005b34 100644 --- a/meta-poky/conf/distro/include/gcsections.inc +++ b/meta-poky/conf/distro/include/gcsections.inc | |||
@@ -2,31 +2,31 @@ CFLAGS_SECTION_REMOVAL = "-ffunction-sections -fdata-sections" | |||
2 | LDFLAGS_SECTION_REMOVAL = "-Wl,--gc-sections" | 2 | LDFLAGS_SECTION_REMOVAL = "-Wl,--gc-sections" |
3 | 3 | ||
4 | # packages with build problems using sections | 4 | # packages with build problems using sections |
5 | CFLAGS_SECTION_REMOVAL_pn-glibc = "" | 5 | CFLAGS_SECTION_REMOVAL:pn-glibc = "" |
6 | LDFLAGS_SECTION_REMOVAL_pn-glibc = "" | 6 | LDFLAGS_SECTION_REMOVAL:pn-glibc = "" |
7 | CFLAGS_SECTION_REMOVAL_pn-cairo = "" | 7 | CFLAGS_SECTION_REMOVAL:pn-cairo = "" |
8 | LDFLAGS_SECTION_REMOVAL_pn-cairo = "" | 8 | LDFLAGS_SECTION_REMOVAL:pn-cairo = "" |
9 | CFLAGS_SECTION_REMOVAL_pn-perl = "" | 9 | CFLAGS_SECTION_REMOVAL:pn-perl = "" |
10 | LDFLAGS_SECTION_REMOVAL_pn-perl = "" | 10 | LDFLAGS_SECTION_REMOVAL:pn-perl = "" |
11 | CFLAGS_SECTION_REMOVAL_pn-grub-efi = "" | 11 | CFLAGS_SECTION_REMOVAL:pn-grub-efi = "" |
12 | LDFLAGS_SECTION_REMOVAL_pn-grub-efi = "" | 12 | LDFLAGS_SECTION_REMOVAL:pn-grub-efi = "" |
13 | CFLAGS_SECTION_REMOVAL_pn-grub = "" | 13 | CFLAGS_SECTION_REMOVAL:pn-grub = "" |
14 | LDFLAGS_SECTION_REMOVAL_pn-grub = "" | 14 | LDFLAGS_SECTION_REMOVAL:pn-grub = "" |
15 | 15 | ||
16 | # SDK packages with build problems using sections | 16 | # SDK packages with build problems using sections |
17 | CFLAGS_SECTION_REMOVAL_pn-nativesdk-glibc = "" | 17 | CFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = "" |
18 | LDFLAGS_SECTION_REMOVAL_pn-nativesdk-glibc = "" | 18 | LDFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = "" |
19 | CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" | 19 | CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" |
20 | LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" | 20 | LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" |
21 | CFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" | 21 | CFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = "" |
22 | LDFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" | 22 | LDFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = "" |
23 | CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" | 23 | CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = "" |
24 | LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" | 24 | LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = "" |
25 | 25 | ||
26 | # set default for target | 26 | # set default for target |
27 | CFLAGS_append_class-target = " ${CFLAGS_SECTION_REMOVAL}" | 27 | CFLAGS:append:class-target = " ${CFLAGS_SECTION_REMOVAL}" |
28 | LDFLAGS_append_class-target = " ${LDFLAGS_SECTION_REMOVAL}" | 28 | LDFLAGS:append:class-target = " ${LDFLAGS_SECTION_REMOVAL}" |
29 | 29 | ||
30 | # set default for nativesdk | 30 | # set default for nativesdk |
31 | CFLAGS_append_class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" | 31 | CFLAGS:append:class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" |
32 | LDFLAGS_append_class-nativesdk = " ${LDFLAGS_SECTION_REMOVAL}" | 32 | LDFLAGS:append:class-nativesdk = " ${LDFLAGS_SECTION_REMOVAL}" |
diff --git a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc index 273ebfdfef..9c2d7753a1 100644 --- a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc +++ b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc | |||
@@ -1,8 +1,8 @@ | |||
1 | # Add an extra DISTRO_FEATURE | 1 | # Add an extra DISTRO_FEATURE |
2 | DISTRO_FEATURES_append = " pam" | 2 | DISTRO_FEATURES:append = " pam" |
3 | 3 | ||
4 | # Use the LTSI Kernel | 4 | # Use the LTSI Kernel |
5 | PREFERRED_VERSION_linux-yocto = "5.4%" | 5 | PREFERRED_VERSION_linux-yocto = "5.4%" |
6 | 6 | ||
7 | # Ensure the kernel nfs server is enabled | 7 | # Ensure the kernel nfs server is enabled |
8 | KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" | 8 | KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" |
diff --git a/meta-poky/conf/distro/include/poky-floating-revisions.inc b/meta-poky/conf/distro/include/poky-floating-revisions.inc index 4812959fb7..78c9e365ec 100644 --- a/meta-poky/conf/distro/include/poky-floating-revisions.inc +++ b/meta-poky/conf/distro/include/poky-floating-revisions.inc | |||
@@ -7,45 +7,45 @@ | |||
7 | #SRCREV_pn-opkg ?= "${AUTOREV}" | 7 | #SRCREV_pn-opkg ?= "${AUTOREV}" |
8 | #SRCREV_pn-opkg-utils-native ?= "${AUTOREV}" | 8 | #SRCREV_pn-opkg-utils-native ?= "${AUTOREV}" |
9 | #SRCREV_pn-opkg-utils ?= "${AUTOREV}" | 9 | #SRCREV_pn-opkg-utils ?= "${AUTOREV}" |
10 | SRCREV_pn-gconf-dbus ?= "${AUTOREV}" | 10 | SRCREV:pn-gconf-dbus ?= "${AUTOREV}" |
11 | SRCREV_pn-matchbox-common ?= "${AUTOREV}" | 11 | SRCREV:pn-matchbox-common ?= "${AUTOREV}" |
12 | SRCREV_pn-matchbox-config-gtk ?= "${AUTOREV}" | 12 | SRCREV:pn-matchbox-config-gtk ?= "${AUTOREV}" |
13 | SRCREV_pn-matchbox-desktop ?= "${AUTOREV}" | 13 | SRCREV:pn-matchbox-desktop ?= "${AUTOREV}" |
14 | SRCREV_pn-matchbox-keyboard ?= "${AUTOREV}" | 14 | SRCREV:pn-matchbox-keyboard ?= "${AUTOREV}" |
15 | SRCREV_pn-matchbox-panel-2 ?= "${AUTOREV}" | 15 | SRCREV:pn-matchbox-panel-2 ?= "${AUTOREV}" |
16 | SRCREV_pn-matchbox-themes-extra ?= "${AUTOREV}" | 16 | SRCREV:pn-matchbox-themes-extra ?= "${AUTOREV}" |
17 | SRCREV_pn-matchbox-terminal ?= "${AUTOREV}" | 17 | SRCREV:pn-matchbox-terminal ?= "${AUTOREV}" |
18 | SRCREV_pn-matchbox-wm ?= "${AUTOREV}" | 18 | SRCREV:pn-matchbox-wm ?= "${AUTOREV}" |
19 | SRCREV_pn-settings-daemon ?= "${AUTOREV}" | 19 | SRCREV:pn-settings-daemon ?= "${AUTOREV}" |
20 | SRCREV_pn-screenshot ?= "${AUTOREV}" | 20 | SRCREV:pn-screenshot ?= "${AUTOREV}" |
21 | SRCREV_pn-libfakekey ?= "${AUTOREV}" | 21 | SRCREV:pn-libfakekey ?= "${AUTOREV}" |
22 | SRCREV_pn-psplash ?= "${AUTOREV}" | 22 | SRCREV:pn-psplash ?= "${AUTOREV}" |
23 | SRCREV_pn-gtk-sato-engine ?= "${AUTOREV}" | 23 | SRCREV:pn-gtk-sato-engine ?= "${AUTOREV}" |
24 | SRCREV_pn-matchbox-theme-sato ?= "${AUTOREV}" | 24 | SRCREV:pn-matchbox-theme-sato ?= "${AUTOREV}" |
25 | SRCREV_pn-sato-icon-theme ?= "${AUTOREV}" | 25 | SRCREV:pn-sato-icon-theme ?= "${AUTOREV}" |
26 | SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}" | 26 | SRCREV:pn-matchbox-desktop-sato ?= "${AUTOREV}" |
27 | SRCREV_pn-oh-puzzles ?= "${AUTOREV}" | 27 | SRCREV:pn-oh-puzzles ?= "${AUTOREV}" |
28 | SRCREV_pn-libowl ?= "${AUTOREV}" | 28 | SRCREV:pn-libowl ?= "${AUTOREV}" |
29 | SRCREV_pn-libmatchbox ?= "${AUTOREV}" | 29 | SRCREV:pn-libmatchbox ?= "${AUTOREV}" |
30 | SRCREV_pn-ofono ?= "${AUTOREV}" | 30 | SRCREV:pn-ofono ?= "${AUTOREV}" |
31 | 31 | ||
32 | SRCREV_pn-dri2proto = "${AUTOREV}" | 32 | SRCREV:pn-dri2proto = "${AUTOREV}" |
33 | #PREFERRED_VERSION_dri2proto ?= "1.99.1+git%" | 33 | #PREFERRED_VERSION_dri2proto ?= "1.99.1+git%" |
34 | SRCREV_pn-libdrm = "${AUTOREV}" | 34 | SRCREV:pn-libdrm = "${AUTOREV}" |
35 | #PREFERRED_VERSION_libdrm ?= "2.4.0+git%" | 35 | #PREFERRED_VERSION_libdrm ?= "2.4.0+git%" |
36 | SRCREV_pn-libxcb = "${AUTOREV}" | 36 | SRCREV:pn-libxcb = "${AUTOREV}" |
37 | #PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%" | 37 | #PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%" |
38 | SRCREV_pn-lib-proto = "${AUTOREV}" | 38 | SRCREV:pn-lib-proto = "${AUTOREV}" |
39 | #PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%" | 39 | #PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%" |
40 | SRCREV_pn-libxcb-sdk = "${AUTOREV}" | 40 | SRCREV:pn-libxcb-sdk = "${AUTOREV}" |
41 | #PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%" | 41 | #PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%" |
42 | SRCREV_pn-xf86-input-evdev = "${AUTOREV}" | 42 | SRCREV:pn-xf86-input-evdev = "${AUTOREV}" |
43 | #PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" | 43 | #PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" |
44 | SRCREV_pn-xf86-input-mouse = "${AUTOREV}" | 44 | SRCREV:pn-xf86-input-mouse = "${AUTOREV}" |
45 | #PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%" | 45 | #PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%" |
46 | SRCREV_pn-xf86-input-keyboard = "${AUTOREV}" | 46 | SRCREV:pn-xf86-input-keyboard = "${AUTOREV}" |
47 | #PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%" | 47 | #PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%" |
48 | SRCREV_pn-xf86-input-synaptics = "${AUTOREV}" | 48 | SRCREV:pn-xf86-input-synaptics = "${AUTOREV}" |
49 | #PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%" | 49 | #PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%" |
50 | 50 | ||
51 | #SRCDATE_oprofile ?= "${DATE}" | 51 | #SRCDATE_oprofile ?= "${DATE}" |