summaryrefslogtreecommitdiffstats
path: root/meta-poky/conf/distro/include
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-25 22:29:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-29 23:38:21 +0100
commit9826f87cb466a85cba736529831175437dcc621a (patch)
treecbcabea97ff4d1225102495cd629888bbc384468 /meta-poky/conf/distro/include
parentd41af446febd516f14f26db53e6572d9eae35b1e (diff)
downloadpoky-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.inc44
-rw-r--r--meta-poky/conf/distro/include/poky-distro-alt-test-config.inc4
-rw-r--r--meta-poky/conf/distro/include/poky-floating-revisions.inc60
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"
2LDFLAGS_SECTION_REMOVAL = "-Wl,--gc-sections" 2LDFLAGS_SECTION_REMOVAL = "-Wl,--gc-sections"
3 3
4# packages with build problems using sections 4# packages with build problems using sections
5CFLAGS_SECTION_REMOVAL_pn-glibc = "" 5CFLAGS_SECTION_REMOVAL:pn-glibc = ""
6LDFLAGS_SECTION_REMOVAL_pn-glibc = "" 6LDFLAGS_SECTION_REMOVAL:pn-glibc = ""
7CFLAGS_SECTION_REMOVAL_pn-cairo = "" 7CFLAGS_SECTION_REMOVAL:pn-cairo = ""
8LDFLAGS_SECTION_REMOVAL_pn-cairo = "" 8LDFLAGS_SECTION_REMOVAL:pn-cairo = ""
9CFLAGS_SECTION_REMOVAL_pn-perl = "" 9CFLAGS_SECTION_REMOVAL:pn-perl = ""
10LDFLAGS_SECTION_REMOVAL_pn-perl = "" 10LDFLAGS_SECTION_REMOVAL:pn-perl = ""
11CFLAGS_SECTION_REMOVAL_pn-grub-efi = "" 11CFLAGS_SECTION_REMOVAL:pn-grub-efi = ""
12LDFLAGS_SECTION_REMOVAL_pn-grub-efi = "" 12LDFLAGS_SECTION_REMOVAL:pn-grub-efi = ""
13CFLAGS_SECTION_REMOVAL_pn-grub = "" 13CFLAGS_SECTION_REMOVAL:pn-grub = ""
14LDFLAGS_SECTION_REMOVAL_pn-grub = "" 14LDFLAGS_SECTION_REMOVAL:pn-grub = ""
15 15
16# SDK packages with build problems using sections 16# SDK packages with build problems using sections
17CFLAGS_SECTION_REMOVAL_pn-nativesdk-glibc = "" 17CFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = ""
18LDFLAGS_SECTION_REMOVAL_pn-nativesdk-glibc = "" 18LDFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = ""
19CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" 19CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = ""
20LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" 20LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = ""
21CFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" 21CFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = ""
22LDFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" 22LDFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = ""
23CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" 23CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = ""
24LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" 24LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = ""
25 25
26# set default for target 26# set default for target
27CFLAGS_append_class-target = " ${CFLAGS_SECTION_REMOVAL}" 27CFLAGS:append:class-target = " ${CFLAGS_SECTION_REMOVAL}"
28LDFLAGS_append_class-target = " ${LDFLAGS_SECTION_REMOVAL}" 28LDFLAGS:append:class-target = " ${LDFLAGS_SECTION_REMOVAL}"
29 29
30# set default for nativesdk 30# set default for nativesdk
31CFLAGS_append_class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" 31CFLAGS:append:class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}"
32LDFLAGS_append_class-nativesdk = " ${LDFLAGS_SECTION_REMOVAL}" 32LDFLAGS: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
2DISTRO_FEATURES_append = " pam" 2DISTRO_FEATURES:append = " pam"
3 3
4# Use the LTSI Kernel 4# Use the LTSI Kernel
5PREFERRED_VERSION_linux-yocto = "5.4%" 5PREFERRED_VERSION_linux-yocto = "5.4%"
6 6
7# Ensure the kernel nfs server is enabled 7# Ensure the kernel nfs server is enabled
8KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" 8KERNEL_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}"
10SRCREV_pn-gconf-dbus ?= "${AUTOREV}" 10SRCREV:pn-gconf-dbus ?= "${AUTOREV}"
11SRCREV_pn-matchbox-common ?= "${AUTOREV}" 11SRCREV:pn-matchbox-common ?= "${AUTOREV}"
12SRCREV_pn-matchbox-config-gtk ?= "${AUTOREV}" 12SRCREV:pn-matchbox-config-gtk ?= "${AUTOREV}"
13SRCREV_pn-matchbox-desktop ?= "${AUTOREV}" 13SRCREV:pn-matchbox-desktop ?= "${AUTOREV}"
14SRCREV_pn-matchbox-keyboard ?= "${AUTOREV}" 14SRCREV:pn-matchbox-keyboard ?= "${AUTOREV}"
15SRCREV_pn-matchbox-panel-2 ?= "${AUTOREV}" 15SRCREV:pn-matchbox-panel-2 ?= "${AUTOREV}"
16SRCREV_pn-matchbox-themes-extra ?= "${AUTOREV}" 16SRCREV:pn-matchbox-themes-extra ?= "${AUTOREV}"
17SRCREV_pn-matchbox-terminal ?= "${AUTOREV}" 17SRCREV:pn-matchbox-terminal ?= "${AUTOREV}"
18SRCREV_pn-matchbox-wm ?= "${AUTOREV}" 18SRCREV:pn-matchbox-wm ?= "${AUTOREV}"
19SRCREV_pn-settings-daemon ?= "${AUTOREV}" 19SRCREV:pn-settings-daemon ?= "${AUTOREV}"
20SRCREV_pn-screenshot ?= "${AUTOREV}" 20SRCREV:pn-screenshot ?= "${AUTOREV}"
21SRCREV_pn-libfakekey ?= "${AUTOREV}" 21SRCREV:pn-libfakekey ?= "${AUTOREV}"
22SRCREV_pn-psplash ?= "${AUTOREV}" 22SRCREV:pn-psplash ?= "${AUTOREV}"
23SRCREV_pn-gtk-sato-engine ?= "${AUTOREV}" 23SRCREV:pn-gtk-sato-engine ?= "${AUTOREV}"
24SRCREV_pn-matchbox-theme-sato ?= "${AUTOREV}" 24SRCREV:pn-matchbox-theme-sato ?= "${AUTOREV}"
25SRCREV_pn-sato-icon-theme ?= "${AUTOREV}" 25SRCREV:pn-sato-icon-theme ?= "${AUTOREV}"
26SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}" 26SRCREV:pn-matchbox-desktop-sato ?= "${AUTOREV}"
27SRCREV_pn-oh-puzzles ?= "${AUTOREV}" 27SRCREV:pn-oh-puzzles ?= "${AUTOREV}"
28SRCREV_pn-libowl ?= "${AUTOREV}" 28SRCREV:pn-libowl ?= "${AUTOREV}"
29SRCREV_pn-libmatchbox ?= "${AUTOREV}" 29SRCREV:pn-libmatchbox ?= "${AUTOREV}"
30SRCREV_pn-ofono ?= "${AUTOREV}" 30SRCREV:pn-ofono ?= "${AUTOREV}"
31 31
32SRCREV_pn-dri2proto = "${AUTOREV}" 32SRCREV:pn-dri2proto = "${AUTOREV}"
33#PREFERRED_VERSION_dri2proto ?= "1.99.1+git%" 33#PREFERRED_VERSION_dri2proto ?= "1.99.1+git%"
34SRCREV_pn-libdrm = "${AUTOREV}" 34SRCREV:pn-libdrm = "${AUTOREV}"
35#PREFERRED_VERSION_libdrm ?= "2.4.0+git%" 35#PREFERRED_VERSION_libdrm ?= "2.4.0+git%"
36SRCREV_pn-libxcb = "${AUTOREV}" 36SRCREV:pn-libxcb = "${AUTOREV}"
37#PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%" 37#PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%"
38SRCREV_pn-lib-proto = "${AUTOREV}" 38SRCREV:pn-lib-proto = "${AUTOREV}"
39#PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%" 39#PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%"
40SRCREV_pn-libxcb-sdk = "${AUTOREV}" 40SRCREV:pn-libxcb-sdk = "${AUTOREV}"
41#PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%" 41#PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%"
42SRCREV_pn-xf86-input-evdev = "${AUTOREV}" 42SRCREV:pn-xf86-input-evdev = "${AUTOREV}"
43#PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" 43#PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
44SRCREV_pn-xf86-input-mouse = "${AUTOREV}" 44SRCREV: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%"
46SRCREV_pn-xf86-input-keyboard = "${AUTOREV}" 46SRCREV: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%"
48SRCREV_pn-xf86-input-synaptics = "${AUTOREV}" 48SRCREV: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}"