diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/conf/distro')
9 files changed, 45 insertions, 100 deletions
diff --git a/import-layers/yocto-poky/meta/conf/distro/include/default-distrovars.inc b/import-layers/yocto-poky/meta/conf/distro/include/default-distrovars.inc index fac4deb78..f7ed943c9 100644 --- a/import-layers/yocto-poky/meta/conf/distro/include/default-distrovars.inc +++ b/import-layers/yocto-poky/meta/conf/distro/include/default-distrovars.inc @@ -23,7 +23,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}" IMAGE_FEATURES ?= "" WHITELIST_GPL-3.0 ?= "" -LGPLv2_WHITELIST_GPL-3.0 ?= "libidn" +LGPLv2_WHITELIST_GPL-3.0 ?= "" COMMERCIAL_AUDIO_PLUGINS ?= "" # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" diff --git a/import-layers/yocto-poky/meta/conf/distro/include/default-versions.inc b/import-layers/yocto-poky/meta/conf/distro/include/default-versions.inc index a04ea718b..cc8c533d4 100644 --- a/import-layers/yocto-poky/meta/conf/distro/include/default-versions.inc +++ b/import-layers/yocto-poky/meta/conf/distro/include/default-versions.inc @@ -2,11 +2,6 @@ # Default preferred versions # -# Force the python versions in one place -PYTHON_BASEVERSION ?= "2.7" -PREFERRED_VERSION_python ?= "2.7.11" -PREFERRED_VERSION_python-native ?= "2.7.11" - # Force the older version of liberation-fonts until we fix the fontforge issue PREFERRED_VERSION_liberation-fonts ?= "1.04" diff --git a/import-layers/yocto-poky/meta/conf/distro/include/distro_alias.inc b/import-layers/yocto-poky/meta/conf/distro/include/distro_alias.inc index c8f93955d..10efb096f 100644 --- a/import-layers/yocto-poky/meta/conf/distro/include/distro_alias.inc +++ b/import-layers/yocto-poky/meta/conf/distro/include/distro_alias.inc @@ -13,7 +13,6 @@ DISTRO_PN_ALIAS_pn-alsa-state = "OE-Core" DISTRO_PN_ALIAS_pn-alsa-utils-alsaconf = "OE-Core" DISTRO_PN_ALIAS_pn-alsa-utils-scripts = "OE-Core" DISTRO_PN_ALIAS_pn-atk = "Fedora=atk OpenSuSE=atk" -DISTRO_PN_ALIAS_pn-augeas = "Ubuntu=libaugeas0 Debian=libaugeas0" DISTRO_PN_ALIAS_pn-avahi-ui = "Ubuntu=avahi-discover Debian=avahi-discover" DISTRO_PN_ALIAS_pn-babeltrace = "OSPDT" DISTRO_PN_ALIAS_pn-bdwgc = "OSPDT" @@ -46,7 +45,6 @@ DISTRO_PN_ALIAS_pn-connman-gnome = "Intel" DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools" DISTRO_PN_ALIAS_pn-core-image-base = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-clutter = "OE-Core" -DISTRO_PN_ALIAS_pn-core-image-directfb = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-full-cmdline = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-kernel-dev = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-lsb = "OE-Core" @@ -75,7 +73,6 @@ DISTRO_PN_ALIAS_pn-db = "Debian=db5.1 Ubuntu=db5.1" DISTRO_PN_ALIAS_pn-dbus-test = "Fedora=dbus Ubuntu=dbus" DISTRO_PN_ALIAS_pn-dbus-wait = "OpenedHand" DISTRO_PN_ALIAS_pn-depmodwrapper-cross = "OE-Core" -DISTRO_PN_ALIAS_pn-directfb-examples = "Debian=directfb Fedora=directfb" DISTRO_PN_ALIAS_pn-distcc = "Debian=distcc Fedora=distcc" DISTRO_PN_ALIAS_pn-distcc-config = "OpenedHand" DISTRO_PN_ALIAS_pn-dmxproto = "Meego=xorg-x11-proto-dmxproto Ubuntu=x11proto-dmx Debian=x11proto-dmx" @@ -134,7 +131,7 @@ DISTRO_PN_ALIAS_pn-gstreamer1.0-plugins-good = "Debian=gstreamer1.0-plugins-good DISTRO_PN_ALIAS_pn-gstreamer1.0-rtsp-server = "Ubuntu=gstreamer0.10-rtsp Fedora=gstreamer-rtsp" DISTRO_PN_ALIAS_pn-gtk+ = "Meego=gtk2 Fedora=gtk2 OpenSuSE=gtk2 Ubuntu=gtk+2.0 Mandriva=gtk+2.0 Debian=gtk+2.0" DISTRO_PN_ALIAS_pn-gtk+3 = "Ubuntu=gtk+3.0 Debian=gtk+3.0 Fedora=gtk3" -DISTRO_PN_ALIAS_pn-gtk-doc-stub = "Fedora=gtk-doc Ubuntu=gtk-doc" +DISTRO_PN_ALIAS_pn-gtk-doc = "Fedora=gtk-doc Ubuntu=gtk-doc" DISTRO_PN_ALIAS_pn-gtk-engines = "Fedora=gtk2-engines OpenSuSE=gtk2-engines Ubuntu=gtk2-engines Mandriva=gtk-engines2 Debian=gtk2-engines" DISTRO_PN_ALIAS_pn-gtk-sato-engine = "OpenedHand" DISTRO_PN_ALIAS_pn-gtk-icon-utils-native = "OSPDT" @@ -216,7 +213,6 @@ DISTRO_PN_ALIAS_pn-libxft = "Mandriva=libxft Debian=libxft2 Ubuntu=libxft2" DISTRO_PN_ALIAS_pn-libxi = "Ubuntu=libxi Fedora=libXi" DISTRO_PN_ALIAS_pn-libxkbcommon = "Fedora=libxkbcommon Debian=libxkbcommon" DISTRO_PN_ALIAS_pn-libxscrnsaver = "Fedora=libXScrnSaver Ubuntu=libxss1 Mandriva=libxscrnsaver" -DISTRO_PN_ALIAS_pn-libxsettings-client = "Debian=libxsettings-client0 Ubuntu=libxsettings-client0 Mandriva=libXsettings-client0" DISTRO_PN_ALIAS_pn-libxxf86misc = "Mandriva=libxxf86misc Fedora=libXxf86misc" DISTRO_PN_ALIAS_pn-linux-dummy = "Intel" DISTRO_PN_ALIAS_pn-linux-firmware = "Fedora=linux-firmware Ubuntu=linux-firmware" @@ -281,8 +277,6 @@ DISTRO_PN_ALIAS_pn-opkg-keyrings = "OSPDT upstream=git://git.yoctoproject.org/op DISTRO_PN_ALIAS_pn-opkg-nogpg = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" DISTRO_PN_ALIAS_pn-opkg-utils = "OSPDT upstream=git://git.yoctoproject.org/opkg-utils" DISTRO_PN_ALIAS_pn-oprofile = "Debian=oprofile Fedora=oprofile" -DISTRO_PN_ALIAS_pn-oprofileui = "Fedora=oprofileui Ubuntu=oprofile-gui Debian=oprofile-gui" -DISTRO_PN_ALIAS_pn-oprofileui-server = "Fedora=oprofileui Ubuntu=oprofile-gui Debian=oprofile-gui" DISTRO_PN_ALIAS_pn-os-release = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core" @@ -290,7 +284,6 @@ DISTRO_PN_ALIAS_pn-packagegroup-core-boot = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-buildessential = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-clutter = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-device-devel = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-core-directfb = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-eclipse-debug = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-full-cmdline = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-lsb = "OE-Core" @@ -318,7 +311,6 @@ DISTRO_PN_ALIAS_pn-patchelf = "Opensuse=patchelf Fedora=patchelf" DISTRO_PN_ALIAS_pn-perf = "OSPDT" DISTRO_PN_ALIAS_pn-piglit = "OE-Core" DISTRO_PN_ALIAS_pn-pkgconfig = "Ubuntu=pkg-config Fedora=pkgconfig" -DISTRO_PN_ALIAS_pn-pointercal = "OE-Core" DISTRO_PN_ALIAS_pn-pointercal-xinput = "OE-Core" DISTRO_PN_ALIAS_pn-pong-clock = "OpenedHand" DISTRO_PN_ALIAS_pn-portmap = "Debian=rpcbind Fedora=rpcbind" @@ -338,12 +330,10 @@ DISTRO_PN_ALIAS_pn-python3-setuptools = "OpenSuSE=python3-setuptools Debian=pyth DISTRO_PN_ALIAS_pn-python-dbus = "Ubuntu=python-dbus Debian=python-dbus Mandriva=python-dbus" DISTRO_PN_ALIAS_pn-python-distribute = "Opensuse=python-setuptools Fedora=python-setuptools" DISTRO_PN_ALIAS_pn-python-git = "Debian=python-git Fedora=GitPython" -DISTRO_PN_ALIAS_pn-python-imaging = "Mandriva=python-imaging Debian=python-imaging" DISTRO_PN_ALIAS_pn-python-mako = "Fedora=python-mako Opensuse=python-Mako" DISTRO_PN_ALIAS_pn-python-pycairo = "Meego=pycairo Fedora=pycairo Ubuntu=pycairo Debian=pycairo" DISTRO_PN_ALIAS_pn-python-pycurl = "Debian=python-pycurl Ubuntu=python-pycurl" DISTRO_PN_ALIAS_pn-python-pygobject = "Meego=pygobject2 Fedora=pygobject2 Ubuntu=pygobject Debian=pygobject" -DISTRO_PN_ALIAS_pn-python-pyrex = "Mandriva=python-pyrex Ubuntu=python-pyrex" DISTRO_PN_ALIAS_pn-python-scons = "Fedora=scons OpenSuSE=scons Ubuntu=scons Mandriva=scons Debian=scons" DISTRO_PN_ALIAS_pn-python-setuptools = "Mandriva=python-setup OpenSuSE=python-setup-git" DISTRO_PN_ALIAS_pn-python-smartpm = "Debian=smart OpenSuSE=smart" @@ -388,7 +378,6 @@ DISTRO_PN_ALIAS_pn-texinfo-dummy-native = "OE-Core" DISTRO_PN_ALIAS_pn-tiny-init = "OSPDT" DISTRO_PN_ALIAS_pn-trace-cmd = "Mandriva=trace-cmd Ubuntu=trace-cmd" DISTRO_PN_ALIAS_pn-tremor = "OSPDT upstream=http://www.xiph.org/vorbis/" -DISTRO_PN_ALIAS_pn-tslib = "Debian=tslib Ubuntu=tslib" DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera Ubuntu=ttf-bitstream-vera" DISTRO_PN_ALIAS_pn-tzcode = "OSPDT" DISTRO_PN_ALIAS_pn-u-boot-fw-utils = "Ubuntu=u-boot-tools Debian=u-boot-tools" @@ -457,7 +446,6 @@ DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserve DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg" DISTRO_PN_ALIAS_pn-xset = "Fedora=xorg-x11-server-utils Ubuntu=x11-xserver-utils Debian=x11-xserver-utils Opensuse=xorg-x11" -DISTRO_PN_ALIAS_pn-xtscal = "OSPDT upstream=http://gpe.linuxtogo.org/download/source/" DISTRO_PN_ALIAS_pn-xuser-account = "OE-Core" DISTRO_PN_ALIAS_pn-xvideo-tests = "OpenedHand" DISTRO_PN_ALIAS_pn-xvinfo = "Fedora=xorg-x11-utils Ubuntu=x11-utils" diff --git a/import-layers/yocto-poky/meta/conf/distro/include/package_regex.inc b/import-layers/yocto-poky/meta/conf/distro/include/package_regex.inc deleted file mode 100644 index 9fc115723..000000000 --- a/import-layers/yocto-poky/meta/conf/distro/include/package_regex.inc +++ /dev/null @@ -1,22 +0,0 @@ -# NOTE: THIS FILE IS DEPRECATED. Please add new entries to the recipes themselves. -# -# package_regex.inc - This file contains data that tracks -# upstream project associated with a given recipe. This list is needed -# for recipes that version information can not be automagically discovered. -# As we automate this checking, this file will slowly be reduced. -#" -# This data is used by the package reporting system (packages.yoctoproject.org) -#" -# The format is as a bitbake variable override for each recipe -#" -# UPSTREAM_CHECK_URI_pn-<recipe name> = "recipe_url" -# - This is the url used by the package checking system to -# get the latest version of the package -# UPSTREAM_CHECK_REGEX_pn-<recipe name> = "package_regex" -# - This is the regex the package checking system uses to -# parse the page found at UPSTREAM_CHECK_URI_pn-<recipe name> -# UPSTREAM_CHECK_GITTAGREGEX_pn-<recipe name> = "git_tag_regex" -# - When source code is fetched from git, git tags are used to -# determine the upstream release version. This regex can be used -# to filter only relevant tags. -# diff --git a/import-layers/yocto-poky/meta/conf/distro/include/security_flags.inc b/import-layers/yocto-poky/meta/conf/distro/include/security_flags.inc index ff5f34e3a..eca835e3a 100644 --- a/import-layers/yocto-poky/meta/conf/distro/include/security_flags.inc +++ b/import-layers/yocto-poky/meta/conf/distro/include/security_flags.inc @@ -9,8 +9,11 @@ # -O0 which then results in a compiler warning. lcl_maybe_fortify = "${@base_conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=2',d)}" -SECURITY_CFLAGS ?= "-fstack-protector-strong -pie -fpie ${lcl_maybe_fortify}" -SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-strong ${lcl_maybe_fortify}" +# Error on use of format strings that represent possible security problems +SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security" + +SECURITY_CFLAGS ?= "-fstack-protector-strong -pie -fpie ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}" +SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-strong ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}" SECURITY_LDFLAGS ?= "-fstack-protector-strong -Wl,-z,relro,-z,now" SECURITY_X_LDFLAGS ?= "-fstack-protector-strong -Wl,-z,relro" @@ -26,7 +29,6 @@ SECURITY_CFLAGS_pn-libmatchbox_powerpc = "" SECURITY_CFLAGS_pn-lttng-tools_arm = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-aspell = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-beecrypt = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-blktrace = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-coreutils = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-cups = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-db = "${SECURITY_NO_PIE_CFLAGS}" @@ -37,10 +39,9 @@ SECURITY_CFLAGS_pn-elfutils = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-enchant = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-expect = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-flex = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gcc = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gcc-runtime = "" -SECURITY_CFLAGS_pn-gcc-sanitizers = "" +SECURITY_CFLAGS_pn-gcc-sanitizers = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gmp = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gnutls = "${SECURITY_NO_PIE_CFLAGS}" @@ -50,8 +51,6 @@ SECURITY_CFLAGS_pn-grub-efi-native = "" SECURITY_CFLAGS_pn-grub-efi-x86-native = "" SECURITY_CFLAGS_pn-grub-efi-i586-native = "" SECURITY_CFLAGS_pn-grub-efi-x86-64-native = "" -SECURITY_CFLAGS_pn-gst-plugins-bad = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-gst-plugins-gl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gstreamer1.0-plugins-bad = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gstreamer1.0-plugins-good = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-harfbuzz = "${SECURITY_NO_PIE_CFLAGS}" @@ -59,28 +58,30 @@ SECURITY_CFLAGS_pn-kexec-tools = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-iptables = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libaio = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libcap = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-libgcc = "" +SECURITY_CFLAGS_pn-libgcc = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libid3tag = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-libnewt = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-libnewt-python = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libpcap = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libpcre = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libproxy = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-lttng-ust = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-mesa = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-mesa-gl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-openssl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-opensp = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-ppp = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-python-imaging = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python-pycurl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python-smartpm = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python-numpy = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-python3-numpy = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-python3-pycairo = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-python3 = "${SECURITY_NO_PIE_CFLAGS}" # Revert RPM to using internally supported values SECURITY_CFLAGS_pn-rpm = "${lcl_maybe_fortify} -fstack-protector" SECURITY_CFLAGS_pn-syslinux = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-slang = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-source-highlight = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-uclibc = "" @@ -88,18 +89,22 @@ SECURITY_CFLAGS_pn-uclibc-initial = "" SECURITY_CFLAGS_pn-valgrind = "" SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}" -# These 2 have text relco errors with the pie options enabled -SECURITY_CFLAGS_pn-ltp = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-pulseaudio = "${SECURITY_NO_PIE_CFLAGS}" +# Recipes which fail to compile when elevating -Wformat-security to an error +SECURITY_STRINGFORMAT_pn-busybox = "" +SECURITY_STRINGFORMAT_pn-console-tools = "" +SECURITY_STRINGFORMAT_pn-cmake = "" +SECURITY_STRINGFORMAT_pn-expect = "" +SECURITY_STRINGFORMAT_pn-gcc = "" +SECURITY_STRINGFORMAT_pn-gettext = "" +SECURITY_STRINGFORMAT_pn-kexec-tools = "" +SECURITY_STRINGFORMAT_pn-oh-puzzles = "" TARGET_CFLAGS_append_class-target = " ${SECURITY_CFLAGS}" TARGET_LDFLAGS_append_class-target = " ${SECURITY_LDFLAGS}" SECURITY_LDFLAGS_remove_pn-gcc-runtime = "-fstack-protector-strong" -SECURITY_LDFLAGS_remove_pn-gcc-sanitizers = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-glibc-initial = "-fstack-protector-strong" -SECURITY_LDFLAGS_remove_pn-libgcc = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-uclibc = "-fstack-protector-strong" SECURITY_LDFLAGS_remove_pn-uclibc-initial = "-fstack-protector-strong" SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}" diff --git a/import-layers/yocto-poky/meta/conf/distro/include/tclibc-uclibc.inc b/import-layers/yocto-poky/meta/conf/distro/include/tclibc-uclibc.inc deleted file mode 100644 index 14c3cdbb8..000000000 --- a/import-layers/yocto-poky/meta/conf/distro/include/tclibc-uclibc.inc +++ /dev/null @@ -1,28 +0,0 @@ -# -# uclibc specific configuration -# - -LIBCEXTENSION = "-uclibc" - -# Add uclibc overrides to the overrides. -LIBCOVERRIDE = ":libc-uclibc" -OVERRIDES .= "${LIBCOVERRIDE}" - -PREFERRED_PROVIDER_virtual/libc ?= "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" -PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" -PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" - -USE_NLS ?= "no" - -CXXFLAGS += "-fvisibility-inlines-hidden" - -IMAGE_LINGUAS = "" - -LIBC_DEPENDENCIES = "\ - uclibc \ - uclibc-dbg \ - uclibc-dev \ - uclibc-thread-db \ - " diff --git a/import-layers/yocto-poky/meta/conf/distro/include/tcmode-default.inc b/import-layers/yocto-poky/meta/conf/distro/include/tcmode-default.inc index c412420ea..ca3c5ec90 100644 --- a/import-layers/yocto-poky/meta/conf/distro/include/tcmode-default.inc +++ b/import-layers/yocto-poky/meta/conf/distro/include/tcmode-default.inc @@ -9,10 +9,10 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross-${TARGET_ARCH}" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs = "gcc-runtime" PREFERRED_PROVIDER_gdb = "gdb" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils-crosssdk ?= "binutils-crosssdk-${SDK_ARCH}" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc-initial = "gcc-crosssdk-initial-${SDK_ARCH}" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc = "gcc-crosssdk-${SDK_ARCH}" -PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_ARCH}" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils-crosssdk ?= "binutils-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc-initial = "gcc-crosssdk-initial-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}gcc = "gcc-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/${SDK_PREFIX}g++ = "gcc-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" # Default libc config @@ -22,19 +22,19 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial" PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial ?= "nativesdk-glibc-initial" PREFERRED_PROVIDER_virtual/gettext ??= "gettext" -GCCVERSION ?= "5.3%" +GCCVERSION ?= "6.2%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.26%" -GDBVERSION ?= "7.10%" -GLIBCVERSION ?= "2.23" +BINUVERSION ?= "2.27%" +GDBVERSION ?= "7.11%" +GLIBCVERSION ?= "2.24" UCLIBCVERSION ?= "1.0%" -LINUXLIBCVERSION ?= "4.4" +LINUXLIBCVERSION ?= "4.8%" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-initial-${TARGET_ARCH} ?= "${GCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk-${SDK_ARCH} ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_ARCH} ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_gcc-crosssdk-${SDK_SYS} ?= "${SDKGCCVERSION}" +PREFERRED_VERSION_gcc-crosssdk-initial-${SDK_SYS} ?= "${SDKGCCVERSION}" PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" @@ -68,7 +68,7 @@ PREFERRED_VERSION_uclibc ?= "${UCLIBCVERSION}" PREFERRED_VERSION_uclibc-initial ?= "${UCLIBCVERSION}" # don't use version earlier than 1.4 for gzip-native, as it's necessary for # some packages using an archive format incompatible with earlier gzip -PREFERRED_VERSION_gzip-native ?= "1.6" +PREFERRED_VERSION_gzip-native ?= "1.8" # Setup suitable toolchain flags require conf/distro/include/as-needed.inc diff --git a/import-layers/yocto-poky/meta/conf/distro/include/world-broken.inc b/import-layers/yocto-poky/meta/conf/distro/include/world-broken.inc index a5f6371d3..d4bdddfcf 100644 --- a/import-layers/yocto-poky/meta/conf/distro/include/world-broken.inc +++ b/import-layers/yocto-poky/meta/conf/distro/include/world-broken.inc @@ -47,3 +47,10 @@ EXCLUDE_FROM_WORLD_pn-perf_libc-musl = "1" # error: 'RTLD_NEXT' was not declared in this scope EXCLUDE_FROM_WORLD_pn-gcc-sanitizers_libc-musl = "1" + +# gcc fails to build when libuwind is staged before building gcc since +# it then finds the unwind.h header from libunwind and not from libgcc +# and on arm specially they are different since libgcc defines some functions +# as macros which are functions in libunwind and it fails during linking +# libbacktrace/backtrace.c:76: undefined reference to `_Unwind_GetIP' +EXCLUDE_FROM_WORLD_pn-libunwind_libc-musl_arm = "1" diff --git a/import-layers/yocto-poky/meta/conf/distro/include/yocto-uninative.inc b/import-layers/yocto-poky/meta/conf/distro/include/yocto-uninative.inc index 85e613ac4..975edec9c 100644 --- a/import-layers/yocto-poky/meta/conf/distro/include/yocto-uninative.inc +++ b/import-layers/yocto-poky/meta/conf/distro/include/yocto-uninative.inc @@ -6,6 +6,6 @@ # to the distro running on the build machine. # -UNINATIVE_URL = "http://downloads.yoctoproject.org/releases/uninative/0.95/" -UNINATIVE_CHECKSUM[i686] ?= "5f27d7e0f4dd2ed80a7ff6a0d88af107b08e00765b31ed3aa180cc5ce15b0811" -UNINATIVE_CHECKSUM[x86_64] ?= "26d46c61ad88cc245e31c88549717c0092a838d111b93ec169d88b08cc027581" +UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/1.4/" +UNINATIVE_CHECKSUM[i686] ?= "b4bc60511ce479736808273ffa043df4ed2a225407dd7ca150ae6220d9ce76d5" +UNINATIVE_CHECKSUM[x86_64] ?= "101ff8f2580c193488db9e76f9646fb6ed38b65fb76f403acb0e2178ce7127ca" |
