diff options
Diffstat (limited to 'poky/meta-poky/conf/distro')
| -rw-r--r-- | poky/meta-poky/conf/distro/include/gcsections.inc | 2 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky-tiny.conf | 21 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 16 |
3 files changed, 19 insertions, 20 deletions
diff --git a/poky/meta-poky/conf/distro/include/gcsections.inc b/poky/meta-poky/conf/distro/include/gcsections.inc index 886a005b34..a1f8651ae9 100644 --- a/poky/meta-poky/conf/distro/include/gcsections.inc +++ b/poky/meta-poky/conf/distro/include/gcsections.inc @@ -16,6 +16,8 @@ LDFLAGS_SECTION_REMOVAL:pn-grub = "" # SDK packages with build problems using sections CFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = "" LDFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = "" +CFLAGS_SECTION_REMOVAL:pn-nativesdk-cairo = "" +LDFLAGS_SECTION_REMOVAL:pn-nativesdk-cairo = "" CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" CFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = "" diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index b6c4eeccd0..499af906a8 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -97,8 +97,7 @@ INIT_MANAGER ?= "mdev-busybox" # udev, grub, etc. These pull in gettext, which fails to build with wide # character support. IMAGE_FSTYPES = "cpio.gz" - -QB_DEFAULT_FSTYPE = "${IMAGE_FSTYPES}" +QB_DEFAULT_FSTYPE = "cpio.gz" # Drop v86d from qemu dependency list (we support serial) # Drop grub from meta-intel BSPs @@ -112,16 +111,14 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" # this script for the purposes of tiny, remove the dependency from here. RDEPENDS:${PN}-mtrace:pn-eglibc = "" -PNBLACKLIST[build-appliance-image] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-base] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-full-cmdline] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-rt] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-rt-sdk] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-sato] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-sato-dev] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-sato-sdk] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-x11] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-weston] = "not buildable with poky-tiny" +SKIP_RECIPE[build-appliance-image] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-rt] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-rt-sdk] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-sato] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-sato-dev] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-sato-sdk] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-x11] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-weston] = "not buildable with poky-tiny" # Disable python usage in opkg-utils since it won't build with tiny config PACKAGECONFIG:remove:pn-opkg-utils = "python" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 2dc3606ae5..47ef9fa2ee 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -31,14 +31,14 @@ DISTRO_EXTRA_RRECOMMENDS += "${POKY_DEFAULT_EXTRA_RRECOMMENDS}" TCLIBCAPPEND = "" PREMIRRORS ??= "\ -bzr://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -cvs://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -git://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -gitsm://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -hg://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -osc://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -p4://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -svn://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n" +bzr://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +cvs://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +git://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +gitsm://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +hg://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +osc://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +p4://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \ +svn://.*/.* https://downloads.yoctoproject.org/mirror/sources/" SANITY_TESTED_DISTROS ?= " \ poky-3.3 \n \ |