summaryrefslogtreecommitdiffstats
path: root/meta-poky/conf/distro/include
diff options
context:
space:
mode:
Diffstat (limited to 'meta-poky/conf/distro/include')
-rw-r--r--meta-poky/conf/distro/include/gcsections.inc48
-rw-r--r--meta-poky/conf/distro/include/poky-distro-alt-test-config.inc10
-rw-r--r--meta-poky/conf/distro/include/poky-floating-revisions.inc70
-rw-r--r--meta-poky/conf/distro/include/poky-world-exclude.inc2
4 files changed, 50 insertions, 80 deletions
diff --git a/meta-poky/conf/distro/include/gcsections.inc b/meta-poky/conf/distro/include/gcsections.inc
index 7157373aa8..0e7bd2efff 100644
--- a/meta-poky/conf/distro/include/gcsections.inc
+++ b/meta-poky/conf/distro/include/gcsections.inc
@@ -2,31 +2,35 @@ 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-cairo = ""
20LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" 20LDFLAGS_SECTION_REMOVAL:pn-nativesdk-cairo = ""
21CFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" 21CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = ""
22LDFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" 22LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = ""
23CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" 23CFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = ""
24LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" 24LDFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = ""
25CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = ""
26LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = ""
25 27
26# set default for target 28# set default for target
27CFLAGS_append_class-target = " ${CFLAGS_SECTION_REMOVAL}" 29CFLAGS:append:class-target = " ${CFLAGS_SECTION_REMOVAL}"
28LDFLAGS_append_class-target = " ${LDFLAGS_SECTION_REMOVAL}" 30CXXFLAGS:append:class-target = " ${CFLAGS_SECTION_REMOVAL}"
31LDFLAGS:append:class-target = " ${LDFLAGS_SECTION_REMOVAL}"
29 32
30# set default for nativesdk 33# set default for nativesdk
31CFLAGS_append_class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" 34CFLAGS:append:class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}"
32LDFLAGS_append_class-nativesdk = " ${LDFLAGS_SECTION_REMOVAL}" 35CXXFLAGS:append:class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}"
36LDFLAGS: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..3e10251e8b 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 extra DISTRO_FEATUREs
2DISTRO_FEATURES_append = " pam" 2DISTRO_FEATURES:append = " pam usrmerge"
3 3
4# Use the LTSI Kernel 4# Use our alternate kernel version
5PREFERRED_VERSION_linux-yocto = "5.4%" 5PREFERRED_VERSION_linux-yocto = "6.6%"
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 1fc5045920..0721a718bd 100644
--- a/meta-poky/conf/distro/include/poky-floating-revisions.inc
+++ b/meta-poky/conf/distro/include/poky-floating-revisions.inc
@@ -1,56 +1,22 @@
1# 1#
2# Package Versions for cutting edge testing: 2# Set recipe versions to auto-rev for cutting edge testing
3# 3#
4 4
5#SRCREV_pn-opkg-native ?= "${AUTOREV}" 5INHERIT += "poky-bleeding"
6#SRCREV_pn-opkg-sdk ?= "${AUTOREV}"
7#SRCREV_pn-opkg ?= "${AUTOREV}"
8#SRCREV_pn-opkg-utils-native ?= "${AUTOREV}"
9#SRCREV_pn-opkg-utils ?= "${AUTOREV}"
10SRCREV_pn-gconf-dbus ?= "${AUTOREV}"
11SRCREV_pn-matchbox-common ?= "${AUTOREV}"
12SRCREV_pn-matchbox-config-gtk ?= "${AUTOREV}"
13SRCREV_pn-matchbox-desktop ?= "${AUTOREV}"
14SRCREV_pn-matchbox-keyboard ?= "${AUTOREV}"
15SRCREV_pn-matchbox-panel-2 ?= "${AUTOREV}"
16SRCREV_pn-matchbox-themes-extra ?= "${AUTOREV}"
17SRCREV_pn-matchbox-terminal ?= "${AUTOREV}"
18SRCREV_pn-matchbox-wm ?= "${AUTOREV}"
19SRCREV_pn-settings-daemon ?= "${AUTOREV}"
20SRCREV_pn-screenshot ?= "${AUTOREV}"
21SRCREV_pn-libfakekey ?= "${AUTOREV}"
22SRCREV_pn-psplash ?= "${AUTOREV}"
23SRCREV_pn-gtk-sato-engine ?= "${AUTOREV}"
24SRCREV_pn-matchbox-theme-sato ?= "${AUTOREV}"
25SRCREV_pn-sato-icon-theme ?= "${AUTOREV}"
26SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}"
27SRCREV_pn-oh-puzzles ?= "${AUTOREV}"
28SRCREV_pn-libowl ?= "${AUTOREV}"
29SRCREV_pn-clutter ?= "${AUTOREV}"
30SRCREV_pn-clutter-gst ?= "${AUTOREV}"
31SRCREV_pn-libmatchbox ?= "${AUTOREV}"
32SRCREV_pn-ofono ?= "${AUTOREV}"
33
34SRCREV_pn-dri2proto = "${AUTOREV}"
35#PREFERRED_VERSION_dri2proto ?= "1.99.1+git%"
36SRCREV_pn-libdrm = "${AUTOREV}"
37#PREFERRED_VERSION_libdrm ?= "2.4.0+git%"
38SRCREV_pn-libxcb = "${AUTOREV}"
39#PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%"
40SRCREV_pn-lib-proto = "${AUTOREV}"
41#PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%"
42SRCREV_pn-libxcb-sdk = "${AUTOREV}"
43#PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%"
44SRCREV_pn-xf86-input-evdev = "${AUTOREV}"
45#PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4"
46SRCREV_pn-xf86-input-mouse = "${AUTOREV}"
47#PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%"
48SRCREV_pn-xf86-input-keyboard = "${AUTOREV}"
49#PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%"
50SRCREV_pn-xf86-input-synaptics = "${AUTOREV}"
51#PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%"
52
53#SRCDATE_oprofile ?= "${DATE}"
54
55PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}"
56 6
7POKY_AUTOREV_RECIPES = "\
8 libmatchbox \
9 opkg-utils \
10 matchbox-config-gtk \
11 matchbox-desktop \
12 matchbox-keyboard \
13 matchbox-panel-2 \
14 matchbox-terminal \
15 matchbox-theme-sato \
16 matchbox-wm \
17 pseudo \
18 puzzles \
19 sato-icon-theme \
20 sato-screenshot \
21 settings-daemon \
22"
diff --git a/meta-poky/conf/distro/include/poky-world-exclude.inc b/meta-poky/conf/distro/include/poky-world-exclude.inc
index 1a2dea5859..f3ac59c519 100644
--- a/meta-poky/conf/distro/include/poky-world-exclude.inc
+++ b/meta-poky/conf/distro/include/poky-world-exclude.inc
@@ -1,4 +1,4 @@
1# 1#
2# Things we exlude fromw world testing within the reference distro 2# Things we exlude from world testing within the reference distro
3# 3#
4 4