diff options
Diffstat (limited to 'meta-poky/conf/distro')
-rw-r--r-- | meta-poky/conf/distro/include/gcsections.inc | 48 | ||||
-rw-r--r-- | meta-poky/conf/distro/include/poky-distro-alt-test-config.inc | 10 | ||||
-rw-r--r-- | meta-poky/conf/distro/include/poky-floating-revisions.inc | 70 | ||||
-rw-r--r-- | meta-poky/conf/distro/include/poky-world-exclude.inc | 2 | ||||
-rw-r--r-- | meta-poky/conf/distro/poky-altcfg.conf | 6 | ||||
-rw-r--r-- | meta-poky/conf/distro/poky-bleeding.conf | 6 | ||||
-rw-r--r-- | meta-poky/conf/distro/poky-tiny.conf | 51 | ||||
-rw-r--r-- | meta-poky/conf/distro/poky.conf | 69 |
8 files changed, 113 insertions, 149 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" | ||