diff options
Diffstat (limited to 'meta-poky/conf')
15 files changed, 167 insertions, 195 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" | |||
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-cairo = "" |
20 | LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" | 20 | LDFLAGS_SECTION_REMOVAL:pn-nativesdk-cairo = "" |
21 | CFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" | 21 | CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" |
22 | LDFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" | 22 | LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" |
23 | CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" | 23 | CFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = "" |
24 | LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" | 24 | LDFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = "" |
25 | CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = "" | ||
26 | LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = "" | ||
25 | 27 | ||
26 | # set default for target | 28 | # set default for target |
27 | CFLAGS_append_class-target = " ${CFLAGS_SECTION_REMOVAL}" | 29 | CFLAGS:append:class-target = " ${CFLAGS_SECTION_REMOVAL}" |
28 | LDFLAGS_append_class-target = " ${LDFLAGS_SECTION_REMOVAL}" | 30 | CXXFLAGS:append:class-target = " ${CFLAGS_SECTION_REMOVAL}" |
31 | LDFLAGS:append:class-target = " ${LDFLAGS_SECTION_REMOVAL}" | ||
29 | 32 | ||
30 | # set default for nativesdk | 33 | # set default for nativesdk |
31 | CFLAGS_append_class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" | 34 | CFLAGS:append:class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" |
32 | LDFLAGS_append_class-nativesdk = " ${LDFLAGS_SECTION_REMOVAL}" | 35 | CXXFLAGS:append:class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" |
36 | 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..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 |
2 | DISTRO_FEATURES_append = " pam" | 2 | DISTRO_FEATURES:append = " pam usrmerge" |
3 | 3 | ||
4 | # Use the LTSI Kernel | 4 | # Use our alternate kernel version |
5 | PREFERRED_VERSION_linux-yocto = "5.4%" | 5 | PREFERRED_VERSION_linux-yocto = "6.6%" |
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 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}" | 5 | INHERIT += "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}" | ||
10 | SRCREV_pn-gconf-dbus ?= "${AUTOREV}" | ||
11 | SRCREV_pn-matchbox-common ?= "${AUTOREV}" | ||
12 | SRCREV_pn-matchbox-config-gtk ?= "${AUTOREV}" | ||
13 | SRCREV_pn-matchbox-desktop ?= "${AUTOREV}" | ||
14 | SRCREV_pn-matchbox-keyboard ?= "${AUTOREV}" | ||
15 | SRCREV_pn-matchbox-panel-2 ?= "${AUTOREV}" | ||
16 | SRCREV_pn-matchbox-themes-extra ?= "${AUTOREV}" | ||
17 | SRCREV_pn-matchbox-terminal ?= "${AUTOREV}" | ||
18 | SRCREV_pn-matchbox-wm ?= "${AUTOREV}" | ||
19 | SRCREV_pn-settings-daemon ?= "${AUTOREV}" | ||
20 | SRCREV_pn-screenshot ?= "${AUTOREV}" | ||
21 | SRCREV_pn-libfakekey ?= "${AUTOREV}" | ||
22 | SRCREV_pn-psplash ?= "${AUTOREV}" | ||
23 | SRCREV_pn-gtk-sato-engine ?= "${AUTOREV}" | ||
24 | SRCREV_pn-matchbox-theme-sato ?= "${AUTOREV}" | ||
25 | SRCREV_pn-sato-icon-theme ?= "${AUTOREV}" | ||
26 | SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}" | ||
27 | SRCREV_pn-oh-puzzles ?= "${AUTOREV}" | ||
28 | SRCREV_pn-libowl ?= "${AUTOREV}" | ||
29 | SRCREV_pn-clutter ?= "${AUTOREV}" | ||
30 | SRCREV_pn-clutter-gst ?= "${AUTOREV}" | ||
31 | SRCREV_pn-libmatchbox ?= "${AUTOREV}" | ||
32 | SRCREV_pn-ofono ?= "${AUTOREV}" | ||
33 | |||
34 | SRCREV_pn-dri2proto = "${AUTOREV}" | ||
35 | #PREFERRED_VERSION_dri2proto ?= "1.99.1+git%" | ||
36 | SRCREV_pn-libdrm = "${AUTOREV}" | ||
37 | #PREFERRED_VERSION_libdrm ?= "2.4.0+git%" | ||
38 | SRCREV_pn-libxcb = "${AUTOREV}" | ||
39 | #PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%" | ||
40 | SRCREV_pn-lib-proto = "${AUTOREV}" | ||
41 | #PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%" | ||
42 | SRCREV_pn-libxcb-sdk = "${AUTOREV}" | ||
43 | #PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%" | ||
44 | SRCREV_pn-xf86-input-evdev = "${AUTOREV}" | ||
45 | #PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" | ||
46 | SRCREV_pn-xf86-input-mouse = "${AUTOREV}" | ||
47 | #PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%" | ||
48 | SRCREV_pn-xf86-input-keyboard = "${AUTOREV}" | ||
49 | #PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%" | ||
50 | SRCREV_pn-xf86-input-synaptics = "${AUTOREV}" | ||
51 | #PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%" | ||
52 | |||
53 | #SRCDATE_oprofile ?= "${DATE}" | ||
54 | |||
55 | PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}" | ||
56 | 6 | ||
7 | POKY_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 | ||
diff --git a/meta-poky/conf/distro/poky-altcfg.conf b/meta-poky/conf/distro/poky-altcfg.conf index 177bf8d184..3d64bdd1fe 100644 --- a/meta-poky/conf/distro/poky-altcfg.conf +++ b/meta-poky/conf/distro/poky-altcfg.conf | |||
@@ -2,14 +2,16 @@ | |||
2 | # An example of subclassing a distro, primarily used for testing alternate configuration | 2 | # An example of subclassing a distro, primarily used for testing alternate configuration |
3 | # combinations on the Yocto Project autobuilder | 3 | # combinations on the Yocto Project autobuilder |
4 | # | 4 | # |
5 | |||
6 | PACKAGE_CLASSES ?= "package_ipk" | ||
5 | require conf/distro/poky.conf | 7 | require conf/distro/poky.conf |
6 | 8 | ||
7 | DISTRO = "poky-altcfg" | 9 | DISTRO = "poky-altcfg" |
8 | DISTROOVERRIDES = "poky:poky-altcfg" | 10 | DISTROOVERRIDES = "poky:poky-altcfg" |
9 | #DISTROOVERRIDES = "poky:linuxstdbase" | 11 | #DISTROOVERRIDES = "poky:linuxstdbase" |
10 | 12 | ||
11 | INIT_MANAGER ?= "systemd" | 13 | POKY_INIT_MANAGER:poky-altcfg = "systemd" |
12 | # systemd isn't suitable with musl | 14 | # systemd isn't suitable with musl |
13 | INIT_MANAGER_libc-musl ?= "sysvinit" | 15 | POKY_INIT_MANAGER:poky-altcfg:libc-musl = "sysvinit" |
14 | 16 | ||
15 | require conf/distro/include/poky-distro-alt-test-config.inc | 17 | require conf/distro/include/poky-distro-alt-test-config.inc |
diff --git a/meta-poky/conf/distro/poky-bleeding.conf b/meta-poky/conf/distro/poky-bleeding.conf index 2d3e046a45..8cbf2284d0 100644 --- a/meta-poky/conf/distro/poky-bleeding.conf +++ b/meta-poky/conf/distro/poky-bleeding.conf | |||
@@ -1,8 +1,4 @@ | |||
1 | PREFERRED_VERSION_glib-2.0 ?= "2.17.4" | 1 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" |
2 | PREFERRED_VERSION_glib-2.0-native ?= "2.17.4" | ||
3 | PREFERRED_VERSION_atk ?= "1.22.0" | ||
4 | PREFERRED_VERSION_pango ?= "1.21.2" | ||
5 | PREFERRED_VERSION_gtk+ ?= "2.13.3" | ||
6 | 2 | ||
7 | require conf/distro/include/poky-floating-revisions.inc | 3 | require conf/distro/include/poky-floating-revisions.inc |
8 | require conf/distro/poky.conf | 4 | require conf/distro/poky.conf |
diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf index 5a867b1de5..f3dfa8107a 100644 --- a/meta-poky/conf/distro/poky-tiny.conf +++ b/meta-poky/conf/distro/poky-tiny.conf | |||
@@ -26,12 +26,13 @@ | |||
26 | # [ ] Drop ldconfig from the installation | 26 | # [ ] Drop ldconfig from the installation |
27 | # [ ] Modify the runqemu scripts to work with ext2 parameter: | 27 | # [ ] Modify the runqemu scripts to work with ext2 parameter: |
28 | # runqemu qemux86 qemuparams="-nographic" bootparams="console=ttyS0,115200 root=0800" | 28 | # runqemu qemux86 qemuparams="-nographic" bootparams="console=ttyS0,115200 root=0800" |
29 | # [ ] Modify busybox to allow for DISTRO_FEATURES-like confiruration | 29 | # [ ] Modify busybox to allow for DISTRO_FEATURES-like configuration |
30 | 30 | ||
31 | require conf/distro/poky.conf | 31 | require conf/distro/poky.conf |
32 | require conf/distro/include/gcsections.inc | 32 | require conf/distro/include/gcsections.inc |
33 | 33 | ||
34 | DISTRO = "poky-tiny" | 34 | DISTRO = "poky-tiny" |
35 | DISTRO_NAME = "Poky Tiny" | ||
35 | DISTROOVERRIDES = "poky:poky-tiny" | 36 | DISTROOVERRIDES = "poky:poky-tiny" |
36 | TCLIBC = "musl" | 37 | TCLIBC = "musl" |
37 | 38 | ||
@@ -43,7 +44,7 @@ FULL_OPTIMIZATION="-Os -pipe ${DEBUG_FLAGS}" | |||
43 | # Distro config is evaluated after the machine config, so we have to explicitly | 44 | # Distro config is evaluated after the machine config, so we have to explicitly |
44 | # set the kernel provider to override a machine config. | 45 | # set the kernel provider to override a machine config. |
45 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" | 46 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" |
46 | PREFERRED_VERSION_linux-yocto-tiny ?= "5.10%" | 47 | PREFERRED_VERSION_linux-yocto-tiny ?= "6.6%" |
47 | 48 | ||
48 | # We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny | 49 | # We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny |
49 | #POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot" | 50 | #POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot" |
@@ -57,11 +58,13 @@ TCLIBCAPPEND = "" | |||
57 | # in the LIBC features below. | 58 | # in the LIBC features below. |
58 | # Leave native enable to avoid build failures | 59 | # Leave native enable to avoid build failures |
59 | ENABLE_WIDEC = "false" | 60 | ENABLE_WIDEC = "false" |
60 | ENABLE_WIDEC_class-native = "true" | 61 | ENABLE_WIDEC:class-native = "true" |
61 | 62 | ||
62 | # Drop native language support. This removes the | 63 | # Drop native language support. This removes the |
63 | # eglibc->bash->gettext->libc-posix-clang-wchar dependency. | 64 | # eglibc->bash->gettext->libc-posix-clang-wchar dependency. |
64 | USE_NLS="no" | 65 | USE_NLS="no" |
66 | # As we don't have native language support, don't install locales into images | ||
67 | IMAGE_LINGUAS = "" | ||
65 | 68 | ||
66 | # Comment out any of the lines below to disable them in the build | 69 | # Comment out any of the lines below to disable them in the build |
67 | # DISTRO_FEATURES options: | 70 | # DISTRO_FEATURES options: |
@@ -79,15 +82,11 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \ | |||
79 | ${DISTRO_FEATURES_WIFI} \ | 82 | ${DISTRO_FEATURES_WIFI} \ |
80 | " | 83 | " |
81 | 84 | ||
82 | # Enable LFS - see bug YOCTO #5865 | 85 | DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" |
83 | DISTRO_FEATURES_append_libc-uclibc = " largefile" | 86 | DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" |
84 | DISTRO_FEATURES_append_libc-musl = " largefile" | ||
85 | |||
86 | DISTRO_FEATURES_class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" | ||
87 | DISTRO_FEATURES_class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" | ||
88 | 87 | ||
89 | # enable mdev/busybox for init | 88 | # enable mdev/busybox for init |
90 | INIT_MANAGER ?= "mdev-busybox" | 89 | POKY_INIT_MANAGER:poky-tiny = "mdev-busybox" |
91 | 90 | ||
92 | # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in | 91 | # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in |
93 | # packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and | 92 | # packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and |
@@ -98,8 +97,7 @@ INIT_MANAGER ?= "mdev-busybox" | |||
98 | # udev, grub, etc. These pull in gettext, which fails to build with wide | 97 | # udev, grub, etc. These pull in gettext, which fails to build with wide |
99 | # character support. | 98 | # character support. |
100 | IMAGE_FSTYPES = "cpio.gz" | 99 | IMAGE_FSTYPES = "cpio.gz" |
101 | 100 | QB_DEFAULT_FSTYPE = "cpio.gz" | |
102 | QB_DEFAULT_FSTYPE = "${IMAGE_FSTYPES}" | ||
103 | 101 | ||
104 | # Drop v86d from qemu dependency list (we support serial) | 102 | # Drop v86d from qemu dependency list (we support serial) |
105 | # Drop grub from meta-intel BSPs | 103 | # Drop grub from meta-intel BSPs |
@@ -111,19 +109,20 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" | |||
111 | # The mtrace script included by eglibc is a perl script. This means the system | 109 | # The mtrace script included by eglibc is a perl script. This means the system |
112 | # will build perl in case this package is installed. Since we don't care about | 110 | # will build perl in case this package is installed. Since we don't care about |
113 | # this script for the purposes of tiny, remove the dependency from here. | 111 | # this script for the purposes of tiny, remove the dependency from here. |
114 | RDEPENDS_${PN}-mtrace_pn-eglibc = "" | 112 | RDEPENDS:${PN}-mtrace:pn-eglibc = "" |
115 | 113 | ||
116 | PNBLACKLIST[build-appliance-image] = "not buildable with poky-tiny" | 114 | SKIP_RECIPE[build-appliance-image] = "not buildable with poky-tiny" |
117 | PNBLACKLIST[core-image-base] = "not buildable with poky-tiny" | 115 | SKIP_RECIPE[core-image-rt] = "not buildable with poky-tiny" |
118 | PNBLACKLIST[core-image-clutter] = "not buildable with poky-tiny" | 116 | SKIP_RECIPE[core-image-rt-sdk] = "not buildable with poky-tiny" |
119 | PNBLACKLIST[core-image-full-cmdline] = "not buildable with poky-tiny" | 117 | SKIP_RECIPE[core-image-sato] = "not buildable with poky-tiny" |
120 | PNBLACKLIST[core-image-rt] = "not buildable with poky-tiny" | 118 | SKIP_RECIPE[core-image-sato-dev] = "not buildable with poky-tiny" |
121 | PNBLACKLIST[core-image-rt-sdk] = "not buildable with poky-tiny" | 119 | SKIP_RECIPE[core-image-sato-sdk] = "not buildable with poky-tiny" |
122 | PNBLACKLIST[core-image-sato] = "not buildable with poky-tiny" | 120 | SKIP_RECIPE[core-image-x11] = "not buildable with poky-tiny" |
123 | PNBLACKLIST[core-image-sato-dev] = "not buildable with poky-tiny" | 121 | SKIP_RECIPE[core-image-weston] = "not buildable with poky-tiny" |
124 | PNBLACKLIST[core-image-sato-sdk] = "not buildable with poky-tiny" | ||
125 | PNBLACKLIST[core-image-x11] = "not buildable with poky-tiny" | ||
126 | PNBLACKLIST[core-image-weston] = "not buildable with poky-tiny" | ||
127 | 122 | ||
128 | # Disable python usage in opkg-utils since it won't build with tiny config | 123 | # Disable python usage in opkg-utils since it won't build with tiny config |
129 | PACKAGECONFIG_remove_pn-opkg-utils = "python" | 124 | PACKAGECONFIG:remove:pn-opkg-utils = "python" |
125 | |||
126 | # If shadow-base is brought into the image, logins will fail because it | ||
127 | # doesn't have the heuristics to work when CONFIG_MULTIUSER is unset. | ||
128 | PACKAGE_EXCLUDE += "shadow-base" | ||
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index 623f39da66..5285753c31 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf | |||
@@ -1,62 +1,52 @@ | |||
1 | DISTRO = "poky" | 1 | DISTRO = "poky" |
2 | DISTRO_NAME = "Poky (Yocto Project Reference Distro)" | 2 | DISTRO_NAME = "Poky (Yocto Project Reference Distro)" |
3 | DISTRO_VERSION = "3.2+snapshot-${METADATA_REVISION}" | 3 | DISTRO_VERSION = "5.0+snapshot-${METADATA_REVISION}" |
4 | DISTRO_CODENAME = "master" | 4 | DISTRO_CODENAME = "styhead" |
5 | SDK_VENDOR = "-pokysdk" | 5 | SDK_VENDOR = "-pokysdk" |
6 | SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" | 6 | SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" |
7 | SDK_VERSION[vardepvalue] = "${SDK_VERSION}" | 7 | SDK_VERSION[vardepvalue] = "${SDK_VERSION}" |
8 | 8 | ||
9 | MAINTAINER = "Poky <poky@lists.yoctoproject.org>" | 9 | MAINTAINER = "Poky Maintainers <poky@lists.yoctoproject.org>" |
10 | 10 | ||
11 | TARGET_VENDOR = "-poky" | 11 | TARGET_VENDOR = "-poky" |
12 | 12 | ||
13 | LOCALCONF_VERSION = "1" | 13 | LOCALCONF_VERSION = "2" |
14 | 14 | ||
15 | # Override these in poky based distros | 15 | # Override these in poky based distros |
16 | POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan" | 16 | POKY_DEFAULT_DISTRO_FEATURES = "opengl ptest multiarch wayland vulkan" |
17 | POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" | 17 | POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" |
18 | POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" | 18 | POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" |
19 | 19 | ||
20 | DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" | 20 | DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" |
21 | 21 | ||
22 | PREFERRED_VERSION_linux-yocto ?= "5.10%" | 22 | PREFERRED_VERSION_linux-yocto ?= "6.6%" |
23 | PREFERRED_VERSION_linux-yocto-rt ?= "5.10%" | 23 | PREFERRED_VERSION_linux-yocto-rt ?= "6.6%" |
24 | 24 | ||
25 | SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" | 25 | SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" |
26 | SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" | 26 | SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" |
27 | 27 | ||
28 | DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" | 28 | DISTRO_EXTRA_RDEPENDS += "${POKY_DEFAULT_EXTRA_RDEPENDS}" |
29 | DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" | 29 | DISTRO_EXTRA_RRECOMMENDS += "${POKY_DEFAULT_EXTRA_RRECOMMENDS}" |
30 | 30 | ||
31 | TCLIBCAPPEND = "" | 31 | TCLIBCAPPEND = "" |
32 | 32 | ||
33 | PREMIRRORS ??= "\ | 33 | PACKAGE_CLASSES ?= "package_rpm" |
34 | bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | ||
35 | cvs://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | ||
36 | git://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | ||
37 | gitsm://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | ||
38 | hg://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | ||
39 | osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | ||
40 | p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ | ||
41 | svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" | ||
42 | 34 | ||
43 | SANITY_TESTED_DISTROS ?= " \ | 35 | SANITY_TESTED_DISTROS ?= " \ |
44 | poky-3.0 \n \ | 36 | poky-4.3 \n \ |
45 | poky-3.1 \n \ | 37 | poky-5.0 \n \ |
46 | poky-3.2 \n \ | ||
47 | ubuntu-16.04 \n \ | ||
48 | ubuntu-18.04 \n \ | ||
49 | ubuntu-20.04 \n \ | 38 | ubuntu-20.04 \n \ |
50 | fedora-31 \n \ | 39 | ubuntu-22.04 \n \ |
51 | fedora-32 \n \ | 40 | ubuntu-23.04 \n \ |
52 | fedora-33 \n \ | 41 | fedora-38 \n \ |
53 | centos-7 \n \ | 42 | fedora-39 \n \ |
54 | centos-8 \n \ | 43 | centosstream-8 \n \ |
55 | debian-8 \n \ | 44 | debian-11 \n \ |
56 | debian-9 \n \ | 45 | debian-12 \n \ |
57 | debian-10 \n \ | 46 | opensuseleap-15.4 \n \ |
58 | opensuseleap-15.1 \n \ | 47 | almalinux-8.8 \n \ |
59 | opensuseleap-15.2 \n \ | 48 | almalinux-9.2 \n \ |
49 | rocky-9 \n \ | ||
60 | " | 50 | " |
61 | # add poky sanity bbclass | 51 | # add poky sanity bbclass |
62 | INHERIT += "poky-sanity" | 52 | INHERIT += "poky-sanity" |
@@ -73,7 +63,14 @@ require conf/distro/include/yocto-uninative.inc | |||
73 | require conf/distro/include/security_flags.inc | 63 | require conf/distro/include/security_flags.inc |
74 | INHERIT += "uninative" | 64 | INHERIT += "uninative" |
75 | 65 | ||
76 | INHERIT += "reproducible_build" | ||
77 | |||
78 | BB_SIGNATURE_HANDLER ?= "OEEquivHash" | 66 | BB_SIGNATURE_HANDLER ?= "OEEquivHash" |
79 | BB_HASHSERVE ??= "auto" | 67 | BB_HASHSERVE ??= "auto" |
68 | |||
69 | POKY_INIT_MANAGER = "sysvinit" | ||
70 | INIT_MANAGER ?= "${POKY_INIT_MANAGER}" | ||
71 | |||
72 | # We need debug symbols so that SPDX license manifests for the kernel work | ||
73 | KERNEL_EXTRA_FEATURES:append = " features/debug/debug-kernel.scc" | ||
74 | |||
75 | # Enable creation of SPDX manifests by default | ||
76 | INHERIT += "create-spdx" | ||
diff --git a/meta-poky/conf/layer.conf b/meta-poky/conf/layer.conf index 7241af02e4..13bba953a0 100644 --- a/meta-poky/conf/layer.conf +++ b/meta-poky/conf/layer.conf | |||
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "yocto" | |||
9 | BBFILE_PATTERN_yocto = "^${LAYERDIR}/" | 9 | BBFILE_PATTERN_yocto = "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_yocto = "5" | 10 | BBFILE_PRIORITY_yocto = "5" |
11 | 11 | ||
12 | LAYERSERIES_COMPAT_yocto = "gatesgarth" | 12 | LAYERSERIES_COMPAT_yocto = "scarthgap" |
13 | 13 | ||
14 | # This should only be incremented on significant changes that will | 14 | # This should only be incremented on significant changes that will |
15 | # cause compatibility issues with other layers | 15 | # cause compatibility issues with other layers |
diff --git a/meta-poky/conf/bblayers.conf.sample b/meta-poky/conf/templates/default/bblayers.conf.sample index 8b1cbdfc5c..8b1cbdfc5c 100644 --- a/meta-poky/conf/bblayers.conf.sample +++ b/meta-poky/conf/templates/default/bblayers.conf.sample | |||
diff --git a/meta-poky/conf/conf-notes.txt b/meta-poky/conf/templates/default/conf-notes.txt index 084cc98369..cfd1f1977b 100644 --- a/meta-poky/conf/conf-notes.txt +++ b/meta-poky/conf/templates/default/conf-notes.txt | |||
@@ -11,7 +11,7 @@ Common targets are: | |||
11 | meta-toolchain | 11 | meta-toolchain |
12 | meta-ide-support | 12 | meta-ide-support |
13 | 13 | ||
14 | You can also run generated qemu images with a command like 'runqemu qemux86' | 14 | You can also run generated qemu images with a command like 'runqemu qemux86-64'. |
15 | 15 | ||
16 | Other commonly useful commands are: | 16 | Other commonly useful commands are: |
17 | - 'devtool' and 'recipetool' handle common recipe tasks | 17 | - 'devtool' and 'recipetool' handle common recipe tasks |
diff --git a/meta-poky/conf/templates/default/conf-summary.txt b/meta-poky/conf/templates/default/conf-summary.txt new file mode 100644 index 0000000000..8fc03030c7 --- /dev/null +++ b/meta-poky/conf/templates/default/conf-summary.txt | |||
@@ -0,0 +1 @@ | |||
This is the default build configuration for the Poky reference distribution. | |||
diff --git a/meta-poky/conf/local.conf.sample b/meta-poky/conf/templates/default/local.conf.sample index 096359ee8a..1a93c9bdcf 100644 --- a/meta-poky/conf/local.conf.sample +++ b/meta-poky/conf/templates/default/local.conf.sample | |||
@@ -2,9 +2,11 @@ | |||
2 | # This file is your local configuration file and is where all local user settings | 2 | # This file is your local configuration file and is where all local user settings |
3 | # are placed. The comments in this file give some guide to the options a new user | 3 | # are placed. The comments in this file give some guide to the options a new user |
4 | # to the system might want to change but pretty much any configuration option can | 4 | # to the system might want to change but pretty much any configuration option can |
5 | # be set in this file. More adventurous users can look at local.conf.extended | 5 | # be set in this file. More adventurous users can look at |
6 | # which contains other examples of configuration which can be placed in this file | 6 | # local.conf.sample.extended which contains other examples of configuration which |
7 | # but new users likely won't need any of them initially. | 7 | # can be placed in this file but new users likely won't need any of them |
8 | # initially. There's also site.conf.sample which contains examples of site specific | ||
9 | # information such as proxy server addresses. | ||
8 | # | 10 | # |
9 | # Lines starting with the '#' character are commented out and in some cases the | 11 | # Lines starting with the '#' character are commented out and in some cases the |
10 | # default values are provided as comments to show people example syntax. Enabling | 12 | # default values are provided as comments to show people example syntax. Enabling |
@@ -29,13 +31,17 @@ | |||
29 | # demonstration purposes: | 31 | # demonstration purposes: |
30 | # | 32 | # |
31 | #MACHINE ?= "beaglebone-yocto" | 33 | #MACHINE ?= "beaglebone-yocto" |
34 | #MACHINE ?= "genericarm64" | ||
32 | #MACHINE ?= "genericx86" | 35 | #MACHINE ?= "genericx86" |
33 | #MACHINE ?= "genericx86-64" | 36 | #MACHINE ?= "genericx86-64" |
34 | #MACHINE ?= "edgerouter" | ||
35 | # | 37 | # |
36 | # This sets the default machine to be qemux86-64 if no other machine is selected: | 38 | # This sets the default machine to be qemux86-64 if no other machine is selected: |
37 | MACHINE ??= "qemux86-64" | 39 | MACHINE ??= "qemux86-64" |
38 | 40 | ||
41 | # These are some of the more commonly used values. Looking at the files in the | ||
42 | # meta/conf/machine directory, or the conf/machine directory of any additional layers | ||
43 | # you add in will show all the available machines. | ||
44 | |||
39 | # | 45 | # |
40 | # Where to place downloads | 46 | # Where to place downloads |
41 | # | 47 | # |
@@ -103,8 +109,8 @@ DISTRO ?= "poky" | |||
103 | # - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) | 109 | # - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager) |
104 | # - 'package_rpm' for rpm style packages | 110 | # - 'package_rpm' for rpm style packages |
105 | # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" | 111 | # E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk" |
106 | # We default to rpm: | 112 | # OE-Core defaults to ipkg, whilst Poky defaults to rpm: |
107 | PACKAGE_CLASSES ?= "package_rpm" | 113 | # PACKAGE_CLASSES ?= "package_rpm" |
108 | 114 | ||
109 | # | 115 | # |
110 | # SDK target architecture | 116 | # SDK target architecture |
@@ -137,7 +143,8 @@ PACKAGE_CLASSES ?= "package_rpm" | |||
137 | # "debug-tweaks" - make an image suitable for development | 143 | # "debug-tweaks" - make an image suitable for development |
138 | # e.g. ssh root access has a blank password | 144 | # e.g. ssh root access has a blank password |
139 | # There are other application targets that can be used here too, see | 145 | # There are other application targets that can be used here too, see |
140 | # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details. | 146 | # meta/classes-recipe/image.bbclass and |
147 | # meta/classes-recipe/core-image.bbclass for more details. | ||
141 | # We default to enabling the debugging tweaks. | 148 | # We default to enabling the debugging tweaks. |
142 | EXTRA_IMAGE_FEATURES ?= "debug-tweaks" | 149 | EXTRA_IMAGE_FEATURES ?= "debug-tweaks" |
143 | 150 | ||
@@ -148,11 +155,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks" | |||
148 | # enable extra features. Some available options which can be included in this variable | 155 | # enable extra features. Some available options which can be included in this variable |
149 | # are: | 156 | # are: |
150 | # - 'buildstats' collect build statistics | 157 | # - 'buildstats' collect build statistics |
151 | # - 'image-mklibs' to reduce shared library files size for an image | 158 | USER_CLASSES ?= "buildstats" |
152 | # - 'image-prelink' in order to prelink the filesystem image | ||
153 | # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink | ||
154 | # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended | ||
155 | USER_CLASSES ?= "buildstats image-mklibs image-prelink" | ||
156 | 159 | ||
157 | # | 160 | # |
158 | # Runtime testing of images | 161 | # Runtime testing of images |
@@ -160,9 +163,9 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink" | |||
160 | # The build system can test booting virtual machine images under qemu (an emulator) | 163 | # The build system can test booting virtual machine images under qemu (an emulator) |
161 | # after any root filesystems are created and run tests against those images. It can also | 164 | # after any root filesystems are created and run tests against those images. It can also |
162 | # run tests against any SDK that are built. To enable this uncomment these lines. | 165 | # run tests against any SDK that are built. To enable this uncomment these lines. |
163 | # See classes/test{image,sdk}.bbclass for further details. | 166 | # See meta/classes-recipe/test{image,sdk}.bbclass for further details. |
164 | #IMAGE_CLASSES += "testimage testsdk" | 167 | #IMAGE_CLASSES += "testimage testsdk" |
165 | #TESTIMAGE_AUTO_qemuall = "1" | 168 | #TESTIMAGE_AUTO:qemuall = "1" |
166 | 169 | ||
167 | # | 170 | # |
168 | # Interactive shell configuration | 171 | # Interactive shell configuration |
@@ -188,7 +191,7 @@ PATCHRESOLVE = "noop" | |||
188 | # | 191 | # |
189 | # Monitor the disk space during the build. If there is less that 1GB of space or less | 192 | # Monitor the disk space during the build. If there is less that 1GB of space or less |
190 | # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully | 193 | # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully |
191 | # shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort | 194 | # shutdown the build. If there is less than 100MB or 1K inodes, perform a hard halt |
192 | # of the build. The reason for this is that running completely out of space can corrupt | 195 | # of the build. The reason for this is that running completely out of space can corrupt |
193 | # files and damages the build in ways which may not be easily recoverable. | 196 | # files and damages the build in ways which may not be easily recoverable. |
194 | # It's necessary to monitor /tmp, if there is no space left the build will fail | 197 | # It's necessary to monitor /tmp, if there is no space left the build will fail |
@@ -198,19 +201,19 @@ BB_DISKMON_DIRS ??= "\ | |||
198 | STOPTASKS,${DL_DIR},1G,100K \ | 201 | STOPTASKS,${DL_DIR},1G,100K \ |
199 | STOPTASKS,${SSTATE_DIR},1G,100K \ | 202 | STOPTASKS,${SSTATE_DIR},1G,100K \ |
200 | STOPTASKS,/tmp,100M,100K \ | 203 | STOPTASKS,/tmp,100M,100K \ |
201 | ABORT,${TMPDIR},100M,1K \ | 204 | HALT,${TMPDIR},100M,1K \ |
202 | ABORT,${DL_DIR},100M,1K \ | 205 | HALT,${DL_DIR},100M,1K \ |
203 | ABORT,${SSTATE_DIR},100M,1K \ | 206 | HALT,${SSTATE_DIR},100M,1K \ |
204 | ABORT,/tmp,10M,1K" | 207 | HALT,/tmp,10M,1K" |
205 | 208 | ||
206 | # | 209 | # |
207 | # Shared-state files from other locations | 210 | # Shared-state files from other locations |
208 | # | 211 | # |
209 | # As mentioned above, shared state files are prebuilt cache data objects which can | 212 | # As mentioned above, shared state files are prebuilt cache data objects which can be |
210 | # used to accelerate build time. This variable can be used to configure the system | 213 | # used to accelerate build time. This variable can be used to configure the system |
211 | # to search other mirror locations for these objects before it builds the data itself. | 214 | # to search other mirror locations for these objects before it builds the data itself. |
212 | # | 215 | # |
213 | # This can be a filesystem directory, or a remote url such as http or ftp. These | 216 | # This can be a filesystem directory, or a remote url such as https or ftp. These |
214 | # would contain the sstate-cache results from previous builds (possibly from other | 217 | # would contain the sstate-cache results from previous builds (possibly from other |
215 | # machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the | 218 | # machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the |
216 | # cache locations to check for the shared objects. | 219 | # cache locations to check for the shared objects. |
@@ -218,34 +221,42 @@ BB_DISKMON_DIRS ??= "\ | |||
218 | # at the end as shown in the examples below. This will be substituted with the | 221 | # at the end as shown in the examples below. This will be substituted with the |
219 | # correct path within the directory structure. | 222 | # correct path within the directory structure. |
220 | #SSTATE_MIRRORS ?= "\ | 223 | #SSTATE_MIRRORS ?= "\ |
221 | #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \ | 224 | #file://.* https://someserver.tld/share/sstate/PATH;downloadfilename=PATH \ |
222 | #file://.* file:///some/local/dir/sstate/PATH" | 225 | #file://.* file:///some/local/dir/sstate/PATH" |
223 | 226 | ||
224 | # | 227 | # |
225 | # Yocto Project SState Mirror | 228 | # Yocto Project SState Mirror |
226 | # | 229 | # |
227 | # The Yocto Project has prebuilt artefacts available for its releases, you can enable | 230 | # The Yocto Project has prebuilt artefacts available for its releases, you can enable |
228 | # use of these by uncommenting the following line. This will mean the build uses | 231 | # use of these by uncommenting some of the following lines. This will mean the build uses |
229 | # the network to check for artefacts at the start of builds, which does slow it down | 232 | # the network to check for artefacts at the start of builds, which does slow it down |
230 | # equally, it will also speed up the builds by not having to build things if they are | 233 | # initially but it will then speed up the builds by not having to build things if they are |
231 | # present in the cache. It assumes you can download something faster than you can build it | 234 | # present in the cache. It assumes you can download something faster than you can build it |
232 | # which will depend on your network. | 235 | # which will depend on your network. |
236 | # Note: For this to work you also need hash-equivalence passthrough to the matching server | ||
237 | # There is a choice between our sstate server directly and a faster content delivery network | ||
238 | # (CDN) kindly provided by JSDelivr, uncomment one of the SSTATE_MIRRORS lines, not both. | ||
239 | # Using the CDN rather than the yoctoproject.org address is suggested/preferred. | ||
240 | # | ||
241 | #BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687" | ||
242 | #SSTATE_MIRRORS ?= "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH" | ||
233 | # | 243 | # |
234 | #SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/2.5/PATH;downloadfilename=PATH" | 244 | ###SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH" |
245 | |||
235 | 246 | ||
236 | # | 247 | # |
237 | # Qemu configuration | 248 | # Qemu configuration |
238 | # | 249 | # |
239 | # By default native qemu will build with a builtin VNC server where graphical output can be | 250 | # By default native qemu will build with a builtin VNC server where graphical output can be |
240 | # seen. The line below enables the SDL UI frontend too. | 251 | # seen. The line below enables the SDL UI frontend too. |
241 | PACKAGECONFIG_append_pn-qemu-system-native = " sdl" | 252 | PACKAGECONFIG:append:pn-qemu-system-native = " sdl" |
242 | # By default libsdl2-native will be built, if you want to use your host's libSDL instead of | 253 | # By default libsdl2-native will be built, if you want to use your host's libSDL instead of |
243 | # the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. | 254 | # the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. |
244 | #ASSUME_PROVIDED += "libsdl2-native" | 255 | #ASSUME_PROVIDED += "libsdl2-native" |
245 | 256 | ||
246 | # You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds | 257 | # You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds |
247 | # a handy set of menus for controlling the emulator. | 258 | # a handy set of menus for controlling the emulator. |
248 | #PACKAGECONFIG_append_pn-qemu-system-native = " gtk+" | 259 | #PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" |
249 | 260 | ||
250 | # | 261 | # |
251 | # Hash Equivalence | 262 | # Hash Equivalence |
@@ -274,4 +285,4 @@ PACKAGECONFIG_append_pn-qemu-system-native = " sdl" | |||
274 | # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to | 285 | # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to |
275 | # track the version of this file when it was generated. This can safely be ignored if | 286 | # track the version of this file when it was generated. This can safely be ignored if |
276 | # this doesn't mean anything to you. | 287 | # this doesn't mean anything to you. |
277 | CONF_VERSION = "1" | 288 | CONF_VERSION = "2" |
diff --git a/meta-poky/conf/local.conf.sample.extended b/meta-poky/conf/templates/default/local.conf.sample.extended index ba1d0973b5..bc2dec9f52 100644 --- a/meta-poky/conf/local.conf.sample.extended +++ b/meta-poky/conf/templates/default/local.conf.sample.extended | |||
@@ -33,8 +33,8 @@ | |||
33 | 33 | ||
34 | # If you want to get an image based on directfb without x11 alter | 34 | # If you want to get an image based on directfb without x11 alter |
35 | # DISTRO_FEATURES: | 35 | # DISTRO_FEATURES: |
36 | DISTRO_FEATURES_append = " directfb" | 36 | DISTRO_FEATURES:append = " directfb" |
37 | DISTRO_FEATURES_remove = "x11" | 37 | DISTRO_FEATURES:remove = "x11" |
38 | 38 | ||
39 | # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale | 39 | # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale |
40 | # packages at build time using qemu-native. Disabling it (by setting it to 0) | 40 | # packages at build time using qemu-native. Disabling it (by setting it to 0) |
@@ -119,15 +119,6 @@ DISTRO_FEATURES_remove = "x11" | |||
119 | # | 119 | # |
120 | # TCMODE ?= "external-sourcery" | 120 | # TCMODE ?= "external-sourcery" |
121 | 121 | ||
122 | # mklibs library size optimization is more useful to smaller images, | ||
123 | # and less useful for bigger images. Also mklibs library optimization | ||
124 | # can break the ABI compatibility, so should not be applied to the | ||
125 | # images which are to be extended or upgraded later. | ||
126 | #This enabled mklibs library size optimization just for the specified image. | ||
127 | #MKLIBS_OPTIMIZED_IMAGES ?= "core-image-minimal" | ||
128 | #This enable mklibs library size optimization will be for all the images. | ||
129 | #MKLIBS_OPTIMIZED_IMAGES ?= "all" | ||
130 | |||
131 | # This value is currently used by pseudo to determine if the recipe should | 122 | # This value is currently used by pseudo to determine if the recipe should |
132 | # build both the 32-bit and 64-bit wrapper libraries on a 64-bit build system. | 123 | # build both the 32-bit and 64-bit wrapper libraries on a 64-bit build system. |
133 | # | 124 | # |
@@ -144,7 +135,7 @@ DISTRO_FEATURES_remove = "x11" | |||
144 | # Uncomment the following lines to enable multilib builds | 135 | # Uncomment the following lines to enable multilib builds |
145 | #require conf/multilib.conf | 136 | #require conf/multilib.conf |
146 | #MULTILIBS = "multilib:lib32" | 137 | #MULTILIBS = "multilib:lib32" |
147 | #DEFAULTTUNE_virtclass-multilib-lib32 = "x86" | 138 | #DEFAULTTUNE:virtclass-multilib-lib32 = "x86" |
148 | 139 | ||
149 | # Set RPM_PREFER_ELF_ARCH to configure preferred ABI when using rpm packaging | 140 | # Set RPM_PREFER_ELF_ARCH to configure preferred ABI when using rpm packaging |
150 | # backend to generate a rootfs, choices are: | 141 | # backend to generate a rootfs, choices are: |
@@ -186,7 +177,7 @@ DISTRO_FEATURES_remove = "x11" | |||
186 | # product. If shipped as part of an image these packages may have | 177 | # product. If shipped as part of an image these packages may have |
187 | # implications so they are disabled by default. To enable them, | 178 | # implications so they are disabled by default. To enable them, |
188 | # un-comment the below as appropriate. | 179 | # un-comment the below as appropriate. |
189 | #LICENSE_FLAGS_WHITELIST = "commercial_gst-fluendo-mp3 \ | 180 | #LICENSE_FLAGS_ACCEPTED = "commercial_gst-fluendo-mp3 \ |
190 | # commercial_gst-openmax \ | 181 | # commercial_gst-openmax \ |
191 | # commercial_gst-plugins-ugly \ | 182 | # commercial_gst-plugins-ugly \ |
192 | # commercial_lame \ | 183 | # commercial_lame \ |
@@ -204,7 +195,7 @@ DISTRO_FEATURES_remove = "x11" | |||
204 | # "action,directory,minimum_space,minimum_free_inode" | 195 | # "action,directory,minimum_space,minimum_free_inode" |
205 | # | 196 | # |
206 | # The "action" must be set and should be one of: | 197 | # The "action" must be set and should be one of: |
207 | # ABORT: Immediately abort | 198 | # HALT: Immediately halt |
208 | # STOPTASKS: The new tasks can't be executed any more, will stop the build | 199 | # STOPTASKS: The new tasks can't be executed any more, will stop the build |
209 | # when the running tasks have been done. | 200 | # when the running tasks have been done. |
210 | # WARN: show warnings (see BB_DISKMON_WARNINTERVAL for more information) | 201 | # WARN: show warnings (see BB_DISKMON_WARNINTERVAL for more information) |
@@ -322,7 +313,7 @@ DISTRO_FEATURES_remove = "x11" | |||
322 | # Note this is not officially supported and is just illustrated here to | 313 | # Note this is not officially supported and is just illustrated here to |
323 | # show an example of how it can be done | 314 | # show an example of how it can be done |
324 | # You'll also need your fortran recipe to depend on libgfortran | 315 | # You'll also need your fortran recipe to depend on libgfortran |
325 | #FORTRAN_forcevariable = ",fortran" | 316 | #FORTRAN:forcevariable = ",fortran" |
326 | 317 | ||
327 | # | 318 | # |
328 | # Kernel image features | 319 | # Kernel image features |
@@ -389,4 +380,9 @@ DISTRO_FEATURES_remove = "x11" | |||
389 | # Enable LTO system-wide | 380 | # Enable LTO system-wide |
390 | # | 381 | # |
391 | #require conf/distro/include/lto.inc | 382 | #require conf/distro/include/lto.inc |
392 | #DISTRO_FEATURES_append = " lto" | 383 | #DISTRO_FEATURES:append = " lto" |
384 | |||
385 | # | ||
386 | # Set PS1 for SDK | ||
387 | # | ||
388 | #SDK_PS1 ?= "${SDK_NAME}${SDK_VENDOR}:\$ " | ||
diff --git a/meta-poky/conf/site.conf.sample b/meta-poky/conf/templates/default/site.conf.sample index 5164fedf63..5164fedf63 100644 --- a/meta-poky/conf/site.conf.sample +++ b/meta-poky/conf/templates/default/site.conf.sample | |||