diff options
Diffstat (limited to 'yocto-poky/meta/conf/distro')
12 files changed, 149 insertions, 385 deletions
diff --git a/yocto-poky/meta/conf/distro/include/as-needed.inc b/yocto-poky/meta/conf/distro/include/as-needed.inc index 4f249fd3e..114d377ea 100644 --- a/yocto-poky/meta/conf/distro/include/as-needed.inc +++ b/yocto-poky/meta/conf/distro/include/as-needed.inc @@ -6,11 +6,8 @@ ASNEEDED_pn-console-tools = "" ASNEEDED_pn-distcc = "" ASNEEDED_pn-openobex = "" ASNEEDED_pn-icu = "" -ASNEEDED_pn-xserver-kdrive-xomap = "" -ASNEEDED_pn-minimo = "" ASNEEDED_pn-pciutils = "" ASNEEDED_pn-puzzles = "" -ASNEEDED_pn-dialer = "" ASNEEDED_pn-pulseaudio = "" ASNEEDED_pn-rpm = "" diff --git a/yocto-poky/meta/conf/distro/include/default-distrovars.inc b/yocto-poky/meta/conf/distro/include/default-distrovars.inc index 836690492..fac4deb78 100644 --- a/yocto-poky/meta/conf/distro/include/default-distrovars.inc +++ b/yocto-poky/meta/conf/distro/include/default-distrovars.inc @@ -7,6 +7,7 @@ KEEPUIMAGE ??= "yes" IMAGE_LINGUAS ?= "en-us en-gb" ENABLE_BINARY_LOCALE_GENERATION ?= "1" LOCALE_UTF8_ONLY ?= "0" +LOCALE_UTF8_IS_DEFAULT ?= "1" DISTRO_FEATURES_DEFAULT ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11" DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ @@ -21,18 +22,13 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}" IMAGE_FEATURES ?= "" -# This is a list of packages that are used by the build system to build the distribution, they are not -# directly part of the distribution. -HOSTTOOLS_WHITELIST_GPL-3.0 ?= "" -WHITELIST_GPL-3.0 ?= "less" -LGPLv2_WHITELIST_GPL-3.0 ?= "libassuan gnutls libtasn1 libidn" +WHITELIST_GPL-3.0 ?= "" +LGPLv2_WHITELIST_GPL-3.0 ?= "libidn" COMMERCIAL_AUDIO_PLUGINS ?= "" # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" COMMERCIAL_VIDEO_PLUGINS ?= "" # COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" -COMMERCIAL_QT ?= "" -# COMMERCIAL_QT ?= "qmmp" # Set of common licenses used for license.bbclass COMMON_LICENSE_DIR ??= "${COREBASE}/meta/files/common-licenses" diff --git a/yocto-poky/meta/conf/distro/include/default-providers.inc b/yocto-poky/meta/conf/distro/include/default-providers.inc index 9f84d5ced..ece4d8b30 100644 --- a/yocto-poky/meta/conf/distro/include/default-providers.inc +++ b/yocto-poky/meta/conf/distro/include/default-providers.inc @@ -13,7 +13,10 @@ PREFERRED_PROVIDER_virtual/mesa ?= "mesa" PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils" PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_virtual/base-utils ?= "busybox" PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" +PREFERRED_PROVIDER_virtual/make ?= "make" +PREFERRED_PROVIDER_virtual/make-native ?= "make-native" # # Default virtual runtime providers @@ -23,6 +26,8 @@ VIRTUAL-RUNTIME_apm ?= "apm" VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools" +VIRTUAL-RUNTIME_base-utils ?= "busybox" +VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock" # # Default recipe providers @@ -40,12 +45,12 @@ PREFERRED_PROVIDER_opkg-native ?= "opkg-native" PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg" PREFERRED_PROVIDER_console-tools ?= "kbd" PREFERRED_PROVIDER_gzip-native ?= "pigz-native" -PREFERRED_PROVIDER_make ?= "make" -PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','udev',d)}" -# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details -# on this rather strange entry. -PREFERRED_PROVIDER_bluez4 ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}" -PREFERRED_PROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" +PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}" +PREFERRED_RPROVIDER_libasound-module-bluez ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez4',d)}" +PREFERRED_RPROVIDER_bluez-hcidump ?= "${@bb.utils.contains('DISTRO_FEATURES','bluetooth bluez5','bluez5','bluez-hcidump',d)}" # Alternative is ltp-ddt in meta-oe: meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb PREFERRED_PROVIDER_ltp ?= "ltp" PREFERRED_PROVIDER_getopt ?= "util-linux-getopt" +PREFERRED_PROVIDER_openssl ?= "openssl" +PREFERRED_PROVIDER_openssl-native ?= "openssl-native" +PREFERRED_PROVIDER_nativesdk-openssl ?= "nativesdk-openssl" diff --git a/yocto-poky/meta/conf/distro/include/default-versions.inc b/yocto-poky/meta/conf/distro/include/default-versions.inc index 573063edf..a04ea718b 100644 --- a/yocto-poky/meta/conf/distro/include/default-versions.inc +++ b/yocto-poky/meta/conf/distro/include/default-versions.inc @@ -4,8 +4,8 @@ # Force the python versions in one place PYTHON_BASEVERSION ?= "2.7" -PREFERRED_VERSION_python ?= "2.7.9" -PREFERRED_VERSION_python-native ?= "2.7.9" +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/yocto-poky/meta/conf/distro/include/distro_alias.inc b/yocto-poky/meta/conf/distro/include/distro_alias.inc index ca333c88c..c8f93955d 100644 --- a/yocto-poky/meta/conf/distro/include/distro_alias.inc +++ b/yocto-poky/meta/conf/distro/include/distro_alias.inc @@ -9,9 +9,6 @@ # # Please keep this list in alphabetical order. # -DISTRO_PN_ALIAS_pn-aaina = "Intel" -DISTRO_PN_ALIAS_pn-abiword-embedded = "Fedora=abiword Ubuntu=abiword" -DISTRO_PN_ALIAS_pn-adt-installer = "Intel" 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" @@ -23,9 +20,7 @@ DISTRO_PN_ALIAS_pn-bdwgc = "OSPDT" DISTRO_PN_ALIAS_pn-bigreqsproto = "Meego=xorg-x11-proto-bigreqsproto" DISTRO_PN_ALIAS_pn-bjam = "OpenSuSE=boost-jam Debina=bjam" DISTRO_PN_ALIAS_pn-blktool = "Debian=blktool Mandriva=blktool" -DISTRO_PN_ALIAS_pn-bluez4 = "Ubuntu=bluez Debian=bluez-utils" DISTRO_PN_ALIAS_pn-bluez5 = "Fedora=bluez Opensuse=bluez" -DISTRO_PN_ALIAS_pn-bluez-dtl1-workaround = "OE-Core" DISTRO_PN_ALIAS_pn-bootchart2 = "Fedora=bootchart2 Opensuse=bootchart" DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs" DISTRO_PN_ALIAS_pn-build-appliance-image = "OSPDT" @@ -35,11 +30,6 @@ DISTRO_PN_ALIAS_pn-buildtools-tarball = "OE-Core" DISTRO_PN_ALIAS_pn-calibrateproto = "OSPDT upstream=http://cgit.freedesktop.org/xorg/proto/calibrateproto" DISTRO_PN_ALIAS_pn-cdrtools = "OpenSUSE=cdrtools OSPDT" DISTRO_PN_ALIAS_pn-chkconfig-alternatives = "Mandriva=chkconfig Debian=chkconfig" -DISTRO_PN_ALIAS_pn-claws-plugin-gtkhtml2-viewer = "Fedora=claws-mail-plugins OpenSuSE=claws-mail-extra-plugins Debian=claws-mail-extra-plugins" -DISTRO_PN_ALIAS_pn-claws-plugin-maildir = "Fedora=claws-mail-plugins OpenSuSE=claws-mail-extra-plugins Debian=claws-mail-extra-plugins" -DISTRO_PN_ALIAS_pn-claws-plugin-mailmbox = "Fedora=claws-mail-plugins OpenSuSE=claws-mail-extra-plugins Debian=claws-mail-extra-plugins" -DISTRO_PN_ALIAS_pn-claws-plugin-rssyl = "Fedora=claws-mail-plugins OpenSuSE=claws-mail-extra-plugins Debian=claws-mail-extra-plugins" -DISTRO_PN_ALIAS_pn-clipboard-manager = "OpenedHand" DISTRO_PN_ALIAS_pn-clutter = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter" DISTRO_PN_ALIAS_pn-clutter-1.8 = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter" DISTRO_PN_ALIAS_pn-clutter-gst-1.0 = "Debian=clutter-gst Ubuntu=clutter-gst Fedora=clutter-gst" @@ -61,7 +51,6 @@ 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" DISTRO_PN_ALIAS_pn-core-image-lsb-dev = "OE-Core" -DISTRO_PN_ALIAS_pn-core-image-lsb-qt3 = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-lsb-sdk = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-minimal = "OE-Core" DISTRO_PN_ALIAS_pn-core-image-minimal-dev = "OE-Core" @@ -83,7 +72,6 @@ DISTRO_PN_ALIAS_pn-cryptodev-tests = "OE-Core" DISTRO_PN_ALIAS_pn-cwautomacros = "OSPDT upstream=http://cwautomacros.berlios.de/" DISTRO_PN_ALIAS_pn-damageproto = "Meego=xorg-x11-proto-damageproto" DISTRO_PN_ALIAS_pn-db = "Debian=db5.1 Ubuntu=db5.1" -DISTRO_PN_ALIAS_pn-dbus-ptest = "Fedora=dbus Ubuntu=dbus" 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" @@ -102,29 +90,17 @@ DISTRO_PN_ALIAS_pn-dri2proto = "Meego=xorg-x11-proto-dri2proto" DISTRO_PN_ALIAS_pn-dri3proto = "Fedora=dri3proto Opensuse=dri3proto-devel" DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear" DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc" -DISTRO_PN_ALIAS_pn-eds-tools = "OpenedHand" DISTRO_PN_ALIAS_pn-eee-acpi-scripts = "Debian=eeepc-acpi-scripts Ubuntu=eeepc-acpi-scripts" -DISTRO_PN_ALIAS_pn-eglibc = "OE-Core" -DISTRO_PN_ALIAS_pn-eglibc-initial = "OE-Core" -DISTRO_PN_ALIAS_pn-eglibc-locale = "OE-Core" -DISTRO_PN_ALIAS_pn-eglibc-mtrace = "OE-Core" -DISTRO_PN_ALIAS_pn-eglibc-scripts = "OE-Core" DISTRO_PN_ALIAS_pn-eglinfo-fb = "OE-Core" DISTRO_PN_ALIAS_pn-eglinfo-x11 = "OE-Core" -DISTRO_PN_ALIAS_pn-emgd-driver-bin = "Intel" DISTRO_PN_ALIAS_pn-encodings = "Ubuntu=xfonts-encodings Mandriva=x11-font-encodings Debian=xfonts-encodings" -DISTRO_PN_ALIAS_pn-evieext = "Meego=xorg-x11-proto-evieext Debian=x11proto-evie" DISTRO_PN_ALIAS_pn-fixesproto = "Meego=xorg-x11-proto-fixesproto" DISTRO_PN_ALIAS_pn-font-alias = "Fedora=xorg-x11-fonts-base Mandriva=x11-font-alias Meego=xorg-x11-fonts" DISTRO_PN_ALIAS_pn-fontcacheproto = "Meego=xorg-x11-proto-fontcacheproto" DISTRO_PN_ALIAS_pn-fontsproto = "Meego=xorg-x11-proto-fontsproto" DISTRO_PN_ALIAS_pn-font-util = "Meego=xorg-x11-font-utils Fedora=xorg-x11-font-utils Ubuntu=xfonts-utils Mandriva=x11-font-util Debian=xfonts-utils" DISTRO_PN_ALIAS_pn-formfactor = "OE-Core" -DISTRO_PN_ALIAS_pn-fotowall = "Fedora=fotowall Ubuntu=fotowall" DISTRO_PN_ALIAS_pn-fstests = "OpenedHand" -DISTRO_PN_ALIAS_pn-gail = "Fedora=gail Ubuntu=libgail-3-0" -DISTRO_PN_ALIAS_pn-gaku = "OpenedHand" -DISTRO_PN_ALIAS_pn-galago-daemon = "Debian=galago-daemon Ubuntu=galago-daemon" DISTRO_PN_ALIAS_pn-gcc-cross-initial = "OE-Core" DISTRO_PN_ALIAS_pn-gcc-cross-initial-i586 = "OE-Core" DISTRO_PN_ALIAS_pn-gcc-crosssdk-initial = "OE-Core" @@ -161,7 +137,6 @@ 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-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-theme-torturer = "OSPDT upstream=http://wiki.laptop.org/go/GTK_for_OLPC" DISTRO_PN_ALIAS_pn-gtk-icon-utils-native = "OSPDT" DISTRO_PN_ALIAS_pn-gummiboot = "Debian=gummiboot Fedora=gummiboot" DISTRO_PN_ALIAS_pn-hello-mod = "OE-Core" @@ -196,20 +171,16 @@ DISTRO_PN_ALIAS_pn-libatomics-ops = "Meego=libatomic-ops Debian=libatomic-ops Ub DISTRO_PN_ALIAS_pn-libcgroup = "Ubuntu=libcgroup1 Debian=libcgroup1" DISTRO_PN_ALIAS_pn-libcheck = "Ubuntu=check Fedora=check OpenSuSE=check" DISTRO_PN_ALIAS_pn-libclass-isa-perl = "OSPDT" -DISTRO_PN_ALIAS_pn-libdrm-poulsbo = "Debian=libdrm-intel1 Ubuntu=libdrm-intel1" DISTRO_PN_ALIAS_pn-libdumpvalue-perl = "OSPDT" DISTRO_PN_ALIAS_pn-libenv-perl = "OSPDT" DISTRO_PN_ALIAS_pn-liberation-fonts = "Ubuntu=fonts-liberation Fedora=liberation-fonts-ttf" DISTRO_PN_ALIAS_pn-libfakekey = "Meego1.0=libfakekey Debian=libfakekey" DISTRO_PN_ALIAS_pn-libfile-checktree-perl = "OSPDT" DISTRO_PN_ALIAS_pn-libfm-extra = "Opensuse=libfm-extra4 Ubuntu=libfm-extra4" -DISTRO_PN_ALIAS_pn-libfribidi = "OpenSuSE=fribidi Ubuntu=fribidi Mandriva=fribidi Debian=fribidi" DISTRO_PN_ALIAS_pn-libgcc = "Debian=libgcc4 Ubuntu=libgcc1 OpenSuSE=libgcc46" DISTRO_PN_ALIAS_pn-libgdbus = "Intel" DISTRO_PN_ALIAS_pn-libglade = "Meego=libglade2 Fedora=libglade2 OpenSuSE=libglade2 Ubuntu=libglade2 Mandriva=libglade2.0 Debian=libglade2" DISTRO_PN_ALIAS_pn-libglu = "Debian=libglu Ubuntu=libglu Opensuse=mesa-libglu" -DISTRO_PN_ALIAS_pn-libgsmd = "Fedora=gsm Ubuntu=libgsm Debian=libgsm Opensuse=libgsm" -DISTRO_PN_ALIAS_pn-libgtkstylus = "Debian=libgtkstylus Ubuntu=libgtkstylus" DISTRO_PN_ALIAS_pn-libgu = "OpenSuSE=glu OSPDT" DISTRO_PN_ALIAS_pn-libi18n-collate-perl = "OSPDT" DISTRO_PN_ALIAS_pn-libical = "Ubuntu=libical Fedora=libical" @@ -217,7 +188,6 @@ DISTRO_PN_ALIAS_pn-libiconv = "Fedora=mingw-libiconv Opensuse=cross-mingw-libico DISTRO_PN_ALIAS_pn-libinput = "Ubuntu=libinput0 Fedora=libinput0" DISTRO_PN_ALIAS_pn-libjson = "Ubuntu=libjson0-dev Debian=libjson0-dev" DISTRO_PN_ALIAS_pn-libksba = "Fedora=libksba Debian=libksba8 Ubuntu=libksba" -DISTRO_PN_ALIAS_pn-liblbxutil = "Mandriva=liblbxutil OpenSuse=xorg-x11-devel" DISTRO_PN_ALIAS_pn-libmatchbox = "Ubuntu=libmatchbox Fedora=libmatchbox" DISTRO_PN_ALIAS_pn-libmpc = "Fedora=libmpc OpenSuse=libmpc2" DISTRO_PN_ALIAS_pn-libnewt = "Debian=libnewt0.52 Fedora=newt" @@ -226,7 +196,6 @@ DISTRO_PN_ALIAS_pn-libnl = "Mandriva=libnl Fedora=libnl" DISTRO_PN_ALIAS_pn-libnss-mdns = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" DISTRO_PN_ALIAS_pn-libomxil = "OSPDT upstream=http://omxil.sourceforge.net/" DISTRO_PN_ALIAS_pn-libowl = "Debian=owl OpenedHand" -DISTRO_PN_ALIAS_pn-libowl-av = "OpenedHand" DISTRO_PN_ALIAS_pn-libpam = "Meego=pam Fedora=pam OpenSuSE=pam Ubuntu=pam Mandriva=pam Debian=pam" DISTRO_PN_ALIAS_pn-libpcre = "Mandriva=libpcre0 Fedora=pcre" DISTRO_PN_ALIAS_pn-libpng12 = "Debian=libpng12-0 Fedora=libpng" @@ -236,23 +205,18 @@ DISTRO_PN_ALIAS_pn-libsdl = "Fedora=SDL Opensuse=SDL" DISTRO_PN_ALIAS_pn-libsdl2 = "Fedora=sdl2 Opensuse=libsdl2 Ubuntu=libsdl2 Debian=libsdl2" DISTRO_PN_ALIAS_pn-libsndfile1 = "Meego=libsndfile Fedora=libsndfile OpenSuSE=libsndfile Ubuntu=libsndfile Mandriva=libsndfile Debian=libsndfile" DISTRO_PN_ALIAS_pn-libsoup-2.4 = "Meego=libsoup Fedora=libsoup OpenSuSE=libsoup Ubuntu=libsoup2.4 Mandriva=libsoup Debian=libsoup2.4" -DISTRO_PN_ALIAS_pn-libsync = "OSPDT" DISTRO_PN_ALIAS_pn-libtelepathy = "Debian=libtelepathy2 Ubuntu=libtelepathy2" DISTRO_PN_ALIAS_pn-libtimedate-perl = "Debian=libtimedate-perl Ubuntu=libtimedate-perl" DISTRO_PN_ALIAS_pn-liburcu = "Fedora=userspace-rcu Ubuntu=liburcu0" DISTRO_PN_ALIAS_pn-libusb1 = "Debian=libusb-1.0-0 Fedora=libusb1" DISTRO_PN_ALIAS_pn-libusb-compat = "OSPDT" DISTRO_PN_ALIAS_pn-libx11 = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11" -DISTRO_PN_ALIAS_pn-libx11-diet = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11" DISTRO_PN_ALIAS_pn-libxcalibrate = "OSPDT upstream=http://cgit.freedesktop.org/xorg/lib/libXCalibrate/" -DISTRO_PN_ALIAS_pn-libxfontcache = "Mandriva=libxfontcache Debian=libxfontcache" 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-libxprintapputil = "Debian=libxprintapputil Ubuntu=libxprintapputil1 Mandriva=libxprintapputil" 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-libxtrap = "Debian=libxtrap6 Fedora=libXTrap" 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" @@ -262,7 +226,6 @@ DISTRO_PN_ALIAS_pn-linux-yocto = "Debian=linux-base Ubuntu=linux" DISTRO_PN_ALIAS_pn-linux-yocto-rt = "Debian=linux-base Ubuntu=linux" DISTRO_PN_ALIAS_pn-linux-yocto-tiny = "OSPDT" DISTRO_PN_ALIAS_pn-lsbinitscripts = "Windriver" -DISTRO_PN_ALIAS_pn-lsbsetup = "Windriver" DISTRO_PN_ALIAS_pn-lsbtest = "Windriver" DISTRO_PN_ALIAS_pn-ltp = "Mandriva=ltp Ubuntu=ltp" DISTRO_PN_ALIAS_pn-lttng-modules = "OSPDT upstream=http://lttng.org/" @@ -282,43 +245,33 @@ DISTRO_PN_ALIAS_pn-matchbox-session = "OpenedHand" DISTRO_PN_ALIAS_pn-matchbox-session-sato = "OpenedHand" DISTRO_PN_ALIAS_pn-matchbox-terminal = "OpenedHand" DISTRO_PN_ALIAS_pn-matchbox-theme-sato = "OpenedHand" -DISTRO_PN_ALIAS_pn-matchbox-theme-sato-2 = "OpenedHand" DISTRO_PN_ALIAS_pn-matchbox-themes-extra = "Ubuntu=matchbox-themes-extra Mandriva=matchbox-themes-extra" DISTRO_PN_ALIAS_pn-matchbox-themes-gtk = "OpenedHand" DISTRO_PN_ALIAS_pn-matchbox-wm = "OpenedHand" -DISTRO_PN_ALIAS_pn-matchbox-wm-2 = "Mandriva=matchbox-window-manager Debian=matchbox-window-manager" DISTRO_PN_ALIAS_pn-menu-cache = "OSPDT" DISTRO_PN_ALIAS_pn-mesa = "Fedora=mesa Ubuntu=libgl1-mesa-dri" DISTRO_PN_ALIAS_pn-mesa-gl = "Fedora=mesa Ubuntu=libgl1-mesa-dri" -DISTRO_PN_ALIAS_pn-mesa-glsl = "Fedora=mesa Ubuntu=libgl1-mesa-dri" DISTRO_PN_ALIAS_pn-meta-environment-extsdk-qemux86 = "OE-Core" DISTRO_PN_ALIAS_pn-meta-environment-i586 = "OE-Core" DISTRO_PN_ALIAS_pn-meta-environment-qemux86 = "OE-Core" DISTRO_PN_ALIAS_pn-meta-environment-qemux86-64 = "OE-Core" DISTRO_PN_ALIAS_pn-meta-ide-support = "OE-Core" DISTRO_PN_ALIAS_pn-meta-toolchain = "OE-Core" -DISTRO_PN_ALIAS_pn-meta-toolchain-qt = "OE-Core" -DISTRO_PN_ALIAS_pn-meta-toolchain-qte = "OE-Core" DISTRO_PN_ALIAS_pn-mini-x-session = "OSPDT" DISTRO_PN_ALIAS_pn-mkelfimage = "Ubuntu=mkelfimage Fedora=mkelfimage" DISTRO_PN_ALIAS_pn-mkfontdir = "Mandriva=mkfontdir Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils" DISTRO_PN_ALIAS_pn-mkfontscale = "Mandriva=mkfontscale Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils" DISTRO_PN_ALIAS_pn-mktemp = "Mandriva=mktemp Fedora=mktemp" DISTRO_PN_ALIAS_pn-mmc-utils = "OE-Core" -DISTRO_PN_ALIAS_pn-moblin-proto = "OE-Core" -DISTRO_PN_ALIAS_pn-modutils-collateral = "OE-Core" DISTRO_PN_ALIAS_pn-modutils-initscripts = "OE-Core" -DISTRO_PN_ALIAS_pn-msynctool = "OpenSuse=msynctool Mandriva=msynctool" DISTRO_PN_ALIAS_pn-mtd-utils = "Debian=mtd-utils Ubuntu=mtd-utils" DISTRO_PN_ALIAS_pn-mx-1.0 = "Ubuntu=mx Debian=mx Fedora=mx" -DISTRO_PN_ALIAS_pn-n450-audio = "Intel" DISTRO_PN_ALIAS_pn-neard = "Intel" DISTRO_PN_ALIAS_pn-neon = "Fedora=neon Opensuse=neon" DISTRO_PN_ALIAS_pn-network-suspend-scripts = "OE-Core" DISTRO_PN_ALIAS_pn-nfs-export-root = "OpenedHand" DISTRO_PN_ALIAS_pn-npth = "OSPDT" DISTRO_PN_ALIAS_pn-nss-myhostname = "Meego=nss-mdns OpenSuSE=nss-mdns Ubuntu=nss-mdns Mandriva=nss_mdns Debian=nss-mdns" -DISTRO_PN_ALIAS_pn-ocf-linux = "OSPDT" DISTRO_PN_ALIAS_pn-ofono = "Debian=ofono Ubuntu=ofono" DISTRO_PN_ALIAS_pn-oh-puzzles = "OpenedHand" DISTRO_PN_ALIAS_pn-opkg = "OSPDT upstream=http://svn.openmoko.org/trunk/src/tar" @@ -331,7 +284,6 @@ 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-owl-video = "OpenedHand" DISTRO_PN_ALIAS_pn-packagegroup-base = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-boot = "OE-Core" @@ -343,8 +295,6 @@ 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" DISTRO_PN_ALIAS_pn-packagegroup-core-nfs = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-core-qt = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-core-qt4e = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-sdk = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-dropbear = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-core-ssh-openssh = "OE-Core" @@ -361,11 +311,6 @@ DISTRO_PN_ALIAS_pn-packagegroup-core-x11-xserver = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-i586 = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86 = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-cross-canadian-qemux86-64 = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-qt4e = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-host = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-qte-toolchain-target = "Intel" -DISTRO_PN_ALIAS_pn-packagegroup-qt-toolchain-host = "OE-Core" -DISTRO_PN_ALIAS_pn-packagegroup-qt-toolchain-target = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-sdk-host = "OE-Core" DISTRO_PN_ALIAS_pn-packagegroup-self-hosted = "OE-Core" DISTRO_PN_ALIAS_pn-package-index = "OE-Core" @@ -375,14 +320,12 @@ 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-poky-feed-config-opkg = "OE-Core" DISTRO_PN_ALIAS_pn-pong-clock = "OpenedHand" DISTRO_PN_ALIAS_pn-portmap = "Debian=rpcbind Fedora=rpcbind" DISTRO_PN_ALIAS_pn-postinst-intercept = "OE-Core" DISTRO_PN_ALIAS_pn-powertop = "Meego=powertop Fedora=powertop Debian=powertop OpenSuSE=powertop Mandriva=powertop" DISTRO_PN_ALIAS_pn-ppp-dialin = "OE-Core" DISTRO_PN_ALIAS_pn-presentproto = "Debian=x11proto-present-dev Fedora=xorg-x11-proto-devel" -DISTRO_PN_ALIAS_pn-printproto = "Debian=x11proto-print-dev Ubuntu=x11proto-print-dev Mandriva=x11-proto-devel" DISTRO_PN_ALIAS_pn-pseudo = "Windriver" DISTRO_PN_ALIAS_pn-psplash = "OpenedHand" DISTRO_PN_ALIAS_pn-ptest-runner = "OE-Core" @@ -392,8 +335,6 @@ DISTRO_PN_ALIAS_pn-python3 = "Fedora=python3 Debian=python3.2" DISTRO_PN_ALIAS_pn-python3-distribute = "Debian=python3-setuptools Fedora=python3-setuptools" DISTRO_PN_ALIAS_pn-python3-pip = "OpenSuSE=python3-pip Debian=python3-pip" DISTRO_PN_ALIAS_pn-python3-setuptools = "OpenSuSE=python3-setuptools Debian=python3-setuptools" -DISTRO_PN_ALIAS_pn-python-ZSI = "OE-Core" -DISTRO_PN_ALIAS_pn-python-argparse = "Fedora=python-argparse OpenSuSE=python-argparse" 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" @@ -402,7 +343,6 @@ 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-pygtk = "Debian=python-gtk2 Fedora=pygtk2 OpenSuSE=python-gtk" 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" @@ -411,15 +351,6 @@ DISTRO_PN_ALIAS_pn-qemu-config = "OpenedHand" DISTRO_PN_ALIAS_pn-qemugl = "OpenedHand" DISTRO_PN_ALIAS_pn-qemu-helper = "OpenedHand" DISTRO_PN_ALIAS_pn-qemuwrapper-cross = "OE-Core" -DISTRO_PN_ALIAS_pn-qmmp = "Fedora=qmmp Debian=qmmp" -DISTRO_PN_ALIAS_pn-qt4 = "Mandriva=libqt4-devel Ubuntu=libqt4-dev" -DISTRO_PN_ALIAS_pn-qt4e-demo-image = "OE-Core" -DISTRO_PN_ALIAS_pn-qt4-embedded = "OSPDT" -DISTRO_PN_ALIAS_pn-qt4-graphics-system = "OE-Core" -DISTRO_PN_ALIAS_pn-qt4-tools = "Mandriva=libqt4-devel Ubuntu=libqt4-dev" -DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free" -DISTRO_PN_ALIAS_pn-qt-demo-init = "OE-Core" -DISTRO_PN_ALIAS_pn-quicky = "OSPDT" DISTRO_PN_ALIAS_pn-randrproto = "Meego=xorg-x11-proto-randrproto" DISTRO_PN_ALIAS_pn-readline = "Fedora=readline Debian=readline-common" DISTRO_PN_ALIAS_pn-recordproto = "Meego=xorg-x11-proto-recordproto" @@ -440,13 +371,10 @@ DISTRO_PN_ALIAS_pn-sgml-common = "OpenSuSE=sgml-common Fedora=sgml-common" DISTRO_PN_ALIAS_pn-sgmlspl = "Debian=sgmlspl Ubuntu=sgmlspl" DISTRO_PN_ALIAS_pn-shadow-securetty = "Ubuntu=shadow Fedora=shadow" DISTRO_PN_ALIAS_pn-shadow-sysroot = "Ubuntu=shadow Fedora=shadow" -DISTRO_PN_ALIAS_pn-shasum = "OE-Core" DISTRO_PN_ALIAS_pn-shutdown-desktop = "OpenedHand" -DISTRO_PN_ALIAS_pn-signgp = "OE-Core" DISTRO_PN_ALIAS_pn-speexdsp = "Ubuntu=libspeexdsp1 Fedora=speexdsp" DISTRO_PN_ALIAS_pn-stat = "Debian=coreutils Fedora=coreutils" DISTRO_PN_ALIAS_pn-stress = "Debian=stress Fedora=stress" -DISTRO_PN_ALIAS_pn-swabber = "OE-Core" DISTRO_PN_ALIAS_pn-sysklogd = "Debian=sysklogd Mandriva=sysklogd" DISTRO_PN_ALIAS_pn-sysprof = "Fedora=sysprof Debian=sysprof" DISTRO_PN_ALIAS_pn-systemd-compat-units = "Fedora=systemd Ubuntu=systemd" @@ -454,15 +382,11 @@ DISTRO_PN_ALIAS_pn-systemd-systemctl = "OE-Core" DISTRO_PN_ALIAS_pn-systemd-systemdctl = "Fedora=systemd Ubuntu=systemd" DISTRO_PN_ALIAS_pn-systemtap-uprobes = "Ubuntu=systemtap Debian=systemtap" DISTRO_PN_ALIAS_pn-sysvinit-inittab = "OE-Core" -DISTRO_PN_ALIAS_pn-table = "Intel" DISTRO_PN_ALIAS_pn-tar-replacement = "Fedora=tar Ubuntu=tar" DISTRO_PN_ALIAS_pn-tcf-agent = "Windriver upstream=http://www.eclipse.org/dsdp/tm/" -DISTRO_PN_ALIAS_pn-telepathy-python = "Debian=telepathy-python Ubuntu=telepathy-python" DISTRO_PN_ALIAS_pn-texinfo-dummy-native = "OE-Core" DISTRO_PN_ALIAS_pn-tiny-init = "OSPDT" -DISTRO_PN_ALIAS_pn-tinylogin = "Debian=busybox Ubuntu=busybox Mandriva=busybox" DISTRO_PN_ALIAS_pn-trace-cmd = "Mandriva=trace-cmd Ubuntu=trace-cmd" -DISTRO_PN_ALIAS_pn-trapproto = "Meego=xorg-x11-proto-trapproto" 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" @@ -483,14 +407,12 @@ DISTRO_PN_ALIAS_pn-videoproto = "Meego=xorg-x11-proto-videoproto" DISTRO_PN_ALIAS_pn-waffle = "OE-Core" DISTRO_PN_ALIAS_pn-watchdog = "Debian=watchdog Ubuntu=watchdog Mandriva=watchdog" DISTRO_PN_ALIAS_pn-webkitgtk = "Fedora=webkitgtk Ubuntu=libwebkit" -DISTRO_PN_ALIAS_pn-web-webkit = "OpenedHand" DISTRO_PN_ALIAS_pn-weston = "Fedora=weston OpenSuSE=weston" DISTRO_PN_ALIAS_pn-weston-init = "OE-Core" DISTRO_PN_ALIAS_pn-which = "Mandriva=which Fedora=which" DISTRO_PN_ALIAS_pn-wpa-supplicant = "Meego=wpa_supplicant Fedora=wpa_supplicant OpenSuSE=wpa_supplicant Ubuntu=wpasupplicant Mandriva=wpa_supplicant Debian=wpasupplicant" DISTRO_PN_ALIAS_pn-x11-common = "OE-Core" DISTRO_PN_ALIAS_pn-x11perf = "Fedora=xorg-x11-apps Ubuntu=x11-apps" -DISTRO_PN_ALIAS_pn-x11vnc = "Fedora=x11vnc Ubuntu=x11vnc" DISTRO_PN_ALIAS_pn-xcb-util-image = "Debian=xcb-util Fedora=xcb-util" DISTRO_PN_ALIAS_pn-xcb-util-keysyms = "Debian=xcb-util Fedora=xcb-util" DISTRO_PN_ALIAS_pn-xcb-util-wm = "Debian=xcb-util Fedora=xcb-util" @@ -509,7 +431,6 @@ DISTRO_PN_ALIAS_pn-xf86-input-mouse = "Ubuntu=xserver-xorg-input-mouse Mandriva= DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics" DISTRO_PN_ALIAS_pn-xf86-input-vmmouse = "Fedora=xorg-x11-drv-vmmouse Ubuntu=xserver-xorg-input-vmmouse Mandriva=x11-driver-input-vmmouse Debian=xserver-xorg-input-vmmouse" DISTRO_PN_ALIAS_pn-xf86miscproto = "Meego=xorg-x11-proto-xf86miscproto" -DISTRO_PN_ALIAS_pn-xf86rushproto = "Meego=xorg-x11-proto-xf86rushproto" DISTRO_PN_ALIAS_pn-xf86-video-cirrus = "Opensuse=xf86-video-cirrus Debian=xserver-xorg-video-cirrus" DISTRO_PN_ALIAS_pn-xf86-video-fbdev = "Ubuntu=xserver-xorg-video-fbdev Debian=xserver-xorg-video-fbdev" DISTRO_PN_ALIAS_pn-xf86-video-intel = "Debian=xserver-xorg-video-intel Fedora=xorg-x11-drv-intel Mandriva=x11-driver-video-intel Meego=xorg-x11-drv-intel Ubuntu=xserver-xorg-video-intel" @@ -541,6 +462,3 @@ 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" DISTRO_PN_ALIAS_pn-xwininfo = "Fedora=xorg-x11-utils Ubuntu=x11-utils" -DISTRO_PN_ALIAS_pn-yaffs2-utils = "OSPDT upstream=http://www.yaffs.net" -DISTRO_PN_ALIAS_pn-zaurusd = "OpenedHand" -DISTRO_PN_ALIAS_pn-zeroconf = "OSPDT upstream=http://www.progsoc.org/~wildfire/zeroconf/" diff --git a/yocto-poky/meta/conf/distro/include/no-static-libs.inc b/yocto-poky/meta/conf/distro/include/no-static-libs.inc new file mode 100644 index 000000000..13a791869 --- /dev/null +++ b/yocto-poky/meta/conf/distro/include/no-static-libs.inc @@ -0,0 +1,35 @@ +DISABLE_STATIC = " --disable-static" + +# qemu aborts on unrecognised option +DISABLE_STATIC_pn-qemu = "" +DISABLE_STATIC_pn-qemu-native = "" +DISABLE_STATIC_pn-nativesdk-qemu = "" +# pciutils fails build +DISABLE_STATIC_pn-pciutils = "" +# libcap aborts on unrecognised option +DISABLE_STATIC_pn-libcap = "" +DISABLE_STATIC_pn-libcap-native = "" +DISABLE_STATIC_pn-nativesdk-libcap = "" +# libpcap aborts on unrecognised option +DISABLE_STATIC_pn-libpcap = "" +# needed by gdb +DISABLE_STATIC_pn-readline = "" +# needed by pseudo +DISABLE_STATIC_pn-sqlite3 = "" +DISABLE_STATIC_pn-sqlite3-native = "" +DISABLE_STATIC_pn-nativesdk-sqlite3 = "" +# openjade/sgml-common have build issues without static libs +DISABLE_STATIC_pn-sgml-common-native = "" +DISABLE_STATIC_pn-openjade-native = "" +# openssl has build issues without static libs +DISABLE_STATIC_pn-openssl = "" +DISABLE_STATIC_pn-openssl-native = "" +DISABLE_STATIC_pn-nativesdk-openssl = "" +# libssp-static-dev included in build-appliance +DISABLE_STATIC_pn-gcc-runtime = "" +# libusb1-native is used to build static dfu-util-native +DISABLE_STATIC_pn-libusb1-native = "" + +EXTRA_OECONF_append = "${DISABLE_STATIC}" + +EXTRA_OECMAKE_append_pn-libical = "-DSHARED_ONLY=True" diff --git a/yocto-poky/meta/conf/distro/include/package_regex.inc b/yocto-poky/meta/conf/distro/include/package_regex.inc index d12999b15..9fc115723 100644 --- a/yocto-poky/meta/conf/distro/include/package_regex.inc +++ b/yocto-poky/meta/conf/distro/include/package_regex.inc @@ -1,3 +1,5 @@ +# 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. @@ -7,272 +9,14 @@ #" # The format is as a bitbake variable override for each recipe #" -# REGEX_URI_pn-<recipe name> = "recipe_url" +# 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 -# REGEX_pn-<recipe name> = "package_regex" +# UPSTREAM_CHECK_REGEX_pn-<recipe name> = "package_regex" # - This is the regex the package checking system uses to -# parse the page found at REGEX_URI_pn-<recipe name> -# GITTAGREGEX_pn-<recipe name> = "git_tag_regex" +# 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. # - -COMMON_REGEX = "(?P<pver>(\d+[\.\-_]*)+)" - -# Generic regex don't match -REGEX_URI_pn-wireless-tools = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" -REGEX_pn-wireless-tools = "wireless_tools\.(?P<pver>(\d+)(\..*|))\.tar\.gz" - -REGEX_URI_pn-sqlite3="http://www.sqlite.org/" -REGEX_pn-sqlite3="releaselog/${COMMON_REGEX}.html" - -REGEX_URI_pn-dhcp = "ftp://ftp.isc.org/isc/dhcp/" -REGEX_pn-dhcp="(?P<pver>\d+\.\d+\.(\d+?))/" - -REGEX_pn-foomatic-filters = "foomatic-filters-(?P<pver>((\d|\d\d)\.*)+)\.tar\.gz" -REGEX_pn-xdg-utils = "xdg-utils-(?P<pver>((\d+[\.\-_]*)+)((rc|alpha|beta)\d+)?)\.(tar\.gz|tgz)" -REGEX_pn-rpm="rpm-${COMMON_REGEX}-.*$" -REGEX_pn-libtheora = "libtheora-(?P<pver>\d+(\.\d)+)\.(tar\.gz|tgz)" - -REGEX_pn-iputils="iputils-(?P<pver>s\d+).tar" -REGEX_pn-nettle = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" - -REGEX_pn-cairo = "cairo-(?P<pver>\d+(\.\d+)+)\.tar" -REGEX_pn-cmake = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" -REGEX_pn-libsdl = "SDL-(?P<pver>\d+(\.\d+)+)\.tar" -REGEX_pn-libxslt = "libxslt-(?P<pver>\d+(\.\d+)+)\.tar" - -# Exclude NC versions which lack AES encryption -REGEX_pn-db = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar" - -REGEX_URI_pn-autogen = "http://ftp.gnu.org/gnu/autogen/" -REGEX_pn-autogen = "rel(?P<pver>\d+(\.\d+)+)/" - -# python recipe is actually python 2.x -# also, exclude pre-releases for both python 2.x and 3.x -REGEX_pn-python = "[Pp]ython-(?P<pver>2(\.\d+)+).tar" -REGEX_pn-python3 = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" - -# exclude betas -REGEX_pn-tiff = "tiff-(?P<pver>\d+(\.\d+)+).tar" - -# exclude version 5.5.2 which triggers a false positive -REGEX_pn-unzip = "unzip(?P<pver>(?!552).+)\.tgz" -# similar for zip -REGEX_pn-zip = "^zip(?P<pver>(?!232).+)\.tgz" - -# Isn't possible to download with the default URI web server returns -# (403, 404, 550) -REGEX_URI_pn-dosfstools = "https://github.com/dosfstools/dosfstools/releases" -REGEX_pn-json-c = "json-c-(?P<pver>\d+(\.\d+)+).tar" -# json-c releases page is fetching the list of releases in some weird XML format -# from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/ -#REGEX_URI_pn-json-c = "https://s3.amazonaws.com/json-c_releases/releases/index.html" -REGEX_URI_pn-chrpath = "http://alioth.debian.org/frs/?group_id=31052" - -REGEX_URI_pn-powertop = "https://01.org/powertop/downloads" -REGEX_URI_pn-libsamplerate0 = "http://www.mega-nerd.com/SRC/download.html" -REGEX_URI_pn-libxkbcommon = "http://xkbcommon.org/" -REGEX_URI_pn-tslib = "https://github.com/kergoth/tslib/releases" -REGEX_URI_pn-waffle="http://www.waffle-gl.org/releases.html" -REGEX_URI_pn-lrzsz = "http://ohse.de/uwe/software/lrzsz.html" -REGEX_URI_pn-libacpi = "http://www.ngolde.de/libacpi.html" -REGEX_URI_pn-less = "http://www.greenwoodsoftware.com/less/download.html" -REGEX_URI_pn-cups = "http://www.cups.org/software.php" -REGEX_pn-cups = "cups-(?P<pver>\d+\.\d+(\.\d+)?)-source.tar" -REGEX_URI_pn-bzip2 = "http://www.bzip.org/downloads.html" -REGEX_URI_pn-minicom = "https://alioth.debian.org/frs/?group_id=30018" -REGEX_URI_pn-sysstat = "http://sebastien.godard.pagesperso-orange.fr/download.html" -REGEX_URI_pn-libical = "https://github.com/libical/libical/releases/" -REGEX_URI_pn-libmpc = "http://www.multiprecision.org/index.php?prog=mpc&page=download" -REGEX_URI_pn-taglib = "http://github.com/taglib/taglib/releases/" -REGEX_URI_pn-libevent = "http://libevent.org/" -REGEX_URI_pn-db = "http://www.oracle.com/technetwork/products/berkeleydb/downloads/index-082944.html" -REGEX_URI_pn-python-smartpm="https://launchpad.net/smart/trunk/" -REGEX_URI_pn-lsof = "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/" -REGEX_URI_pn-pbzip2 = "http://compression.ca/pbzip2/" -REGEX_URI_pn-quicky = "http://qt-apps.org/content/download.php?content=80325&id=1&tan=10417482" -REGEX_URI_pn-libwebp = "http://downloads.webmproject.org/releases/webp/index.html" - -# The engine tries to use directory versioning but is a false-positive -REGEX_URI_pn-intltool = "https://launchpad.net/intltool/trunk/" -REGEX_URI_pn-libnfsidmap = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/" -REGEX_URI_pn-mpfr = "http://www.mpfr.org/mpfr-current/" -REGEX_URI_pn-nss = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" -REGEX_pn-nss = "NSS_(?P<pver>.+)_release_notes" - -REGEX_URI_pn-docbook-sgml-dtd-3.1 = "http://www.docbook.org/sgml/" -REGEX_pn-docbook-sgml-dtd-3.1 = "(?P<pver>3\..+)/" -REGEX_URI_pn-docbook-sgml-dtd-4.1 = "http://www.docbook.org/sgml/" -REGEX_pn-docbook-sgml-dtd-4.1 = "(?P<pver>4\.1(\.\d+)*)/" - -# Qt recipes should be kept at 4.x -REGEX_URI_pn-qt4-embedded = "http://download.qt.io/official_releases/qt/4.8/" -REGEX_pn-qt4-embedded = "(?P<pver>\d+(\.\d+)+)/" -REGEX_URI_pn-qt4-x11-free = "http://download.qt.io/official_releases/qt/4.8/" -REGEX_pn-qt4-x11-free = "(?P<pver>\d+(\.\d+)+)/" -REGEX_URI_pn-nativesdk-qt4-tools = "http://download.qt.io/official_releases/qt/4.8/" -REGEX_pn-nativesdk-qt4-tools = "(?P<pver>\d+(\.\d+)+)/" -REGEX_URI_pn-qt4-native = "http://download.qt.io/official_releases/qt/4.8/" -REGEX_pn-qt4-native = "(?P<pver>\d+(\.\d+)+)/" - -# PyPI sites -REGEX_URI_pn-python-nose = "https://pypi.python.org/pypi/nose/" -REGEX_pn-python-nose = "/nose/${COMMON_REGEX}" -# python-distribute 0.7.x is a simple compatibility layer that installs Setuptools 0.7+. -# so we stick to 0.6.x series -REGEX_URI_pn-python-distribute = "https://pypi.python.org/pypi/distribute/" -REGEX_pn-python-distribute = "/distribute/(?P<pver>\d+.6.\d+)" -REGEX_URI_pn-python-gitdb = "https://pypi.python.org/pypi/gitdb/" -REGEX_URI_pn-python-async = "https://pypi.python.org/pypi/async/" -REGEX_URI_pn-python-smmap = "https://pypi.python.org/pypi/smmap/" -REGEX_pn-python-smmap = "/smmap/${COMMON_REGEX}" -REGEX_URI_pn-python-git = "https://pypi.python.org/pypi/GitPython/" -REGEX_pn-python-git = "/GitPython/${COMMON_REGEX}" -REGEX_URI_pn-python-mako = "https://pypi.python.org/pypi/mako/" -REGEX_pn-python-mako = "/Mako/${COMMON_REGEX}" -REGEX_URI_pn-python-pexpect = "https://pypi.python.org/pypi/pexpect" -REGEX_URI_pn-python3-pip = "https://pypi.python.org/pypi/pip" -REGEX_URI_pn-python3-setuptools = "https://pypi.python.org/pypi/setuptools" - -# Sourceforge sites -REGEX_URI_pn-python-scons = "http://sourceforge.net/projects/scons/files/scons/" -REGEX_pn-python-scons = "/scons/${COMMON_REGEX}/" -REGEX_URI_pn-expect = "http://sourceforge.net/projects/expect/files/Expect/" -REGEX_pn-expect = "/Expect/${COMMON_REGEX}/" -REGEX_URI_pn-docbook-xsl-stylesheets = "http://sourceforge.net/projects/docbook/files/docbook-xsl/" -REGEX_pn-docbook-xsl-stylesheets = "/docbook-xsl/${COMMON_REGEX}/" -REGEX_URI_pn-glew = "http://sourceforge.net/projects/glew/files/glew" -REGEX_pn-glew = "/glew/${COMMON_REGEX}/" -REGEX_URI_pn-menu-cache = "http://sourceforge.net/projects/lxde/files/menu-cache/1.0/" -REGEX_URI_pn-x11vnc = "http://sourceforge.net/projects/libvncserver/files/x11vnc/" -REGEX_pn-x11vnc = "/x11vnc/${COMMON_REGEX}/" -REGEX_URI_pn-quota = "http://sourceforge.net/projects/linuxquota/files/quota-tools/" -REGEX_pn-quota = "/quota-tools/${COMMON_REGEX}/" -REGEX_URI_pn-lsb = "http://sourceforge.net/projects/lsb/files/lsb_release/" -REGEX_pn-lsb = "/lsb_release/${COMMON_REGEX}/" -REGEX_URI_pn-libpcre = "http://sourceforge.net/projects/pcre/files/pcre/" -REGEX_pn-libpcre = "/pcre/${COMMON_REGEX}/" -REGEX_URI_pn-libusb-compat = "http://sourceforge.net/projects/libusb/files/libusb-compat-0.1/" -REGEX_pn-libusb-compat = "/libusb-compat-${COMMON_REGEX}/$" -REGEX_URI_pn-sysfsutils = "http://sourceforge.net/projects/linux-diag/files/sysfsutils/" -REGEX_pn-sysfsutils = "/sysfsutils/${COMMON_REGEX}/" -REGEX_URI_pn-console-tools = "http://sourceforge.net/projects/lct/files/console-tools-devel/" -REGEX_pn-console-tools = "/console-tools-devel/(?P<pver>(\d\d?\.)+\d\d?)/" -REGEX_URI_pn-watchdog = "http://sourceforge.net/projects/watchdog/files/watchdog/" -REGEX_pn-watchdog = "/watchdog/${COMMON_REGEX}/" -REGEX_URI_pn-cracklib = "http://sourceforge.net/projects/cracklib/files/cracklib/" -REGEX_pn-cracklib = "/cracklib/${COMMON_REGEX}/" -REGEX_URI_pn-gptfdisk = "http://sourceforge.net/projects/gptfdisk/files/gptfdisk/" -REGEX_pn-gptfdisk = "/gptfdisk/${COMMON_REGEX}/" -REGEX_URI_pn-libpng12 = "http://sourceforge.net/projects/libpng/files/libpng12/" -REGEX_pn-libpng12 = "/libpng12/${COMMON_REGEX}/" -REGEX_URI_pn-docbook-dsssl-stylesheets = "http://sourceforge.net/projects/docbook/files/docbook-dsssl/" -REGEX_pn-docbook-dsssl-stylesheets = "/docbook-dsssl/${COMMON_REGEX}/" - -REGEX_URI_pn-openjade = "http://openjade.sourceforge.net/download.html" -REGEX_URI_pn-libpfm4 = "http://sourceforge.net/projects/perfmon2/files/libpfm4/" -REGEX_URI_pn-liba52 = "http://liba52.sourceforge.net/downloads.html" -REGEX_URI_pn-mpeg2dec = "http://libmpeg2.sourceforge.net/downloads.html" -REGEX_URI_pn-pcmanfm = "http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/" -REGEX_URI_pn-libcgroup = "http://sourceforge.net/projects/libcg/files/libcgroup/" -REGEX_URI_pn-cdrtools = "http://sourceforge.net/projects/cdrtools/files/alpha/" - -# GIT -GITTAGREGEX_COMMON = "(?P<pver>\d+\.\d+(\.\d+)*)" - -GITTAGREGEX_pn-linux-yocto = "${GITTAGREGEX_COMMON}" -GITTAGREGEX_pn-linux-yocto-tiny = "${GITTAGREGEX_COMMON}" -GITTAGREGEX_pn-linux-yocto-dev = "${GITTAGREGEX_COMMON}" -GITTAGREGEX_pn-uclibc = "${GITTAGREGEX_COMMON}" -GITTAGREGEX_pn-glibc = "${GITTAGREGEX_COMMON}" -GITTAGREGEX_pn-cross-localedef = "${GITTAGREGEX_COMMON}" -GITTAGREGEX_pn-binutils = "binutils-(?P<pver>\d+_(\d_?)*)" -GITTAGREGEX_pn-bootchart2 = "${GITTAGREGEX_COMMON}" -GITTAGREGEX_pn-remake = "(?P<pver>(\d+(\.\d+)+)\+dbg.+)" -GITTAGREGEX_pn-tcf-agent = "(?P<pver>(\d+(\.\d+)+))" -GITTAGREGEX_pn-chkconfig-alternatives = "chkconfig-(?P<pver>(\d+(\.\d+)+))" -GITTAGREGEX_pn-sgmlspl = "(?P<pver>(\d+(\.\d+)+))" - -# Exclude x.99.x versions -GITTAGREGEX_pn-mx-1.0 = "(?P<pver>^\d+(\.(?!99)\d+)+)" - -# Blacklist a bogus tag -GITTAGREGEX_pn-file = "FILE(?P<pver>(?!6_23).+)" -GITTAGREGEX_pn-xinetd = "xinetd-(?P<pver>(?!20030122).+)" - -# Blacklist debian-specific tags -GITTAGREGEX_pn-xf86-video-omapfb = "(?P<pver>\d+(\.\d+)+)(?!-)" - -# GNOME related. -# -# GNOME2_STABLE picks stable releases in the 2.x series (so not 2.90 onwards, -# which were GNOME 3 betas. -# -# GNOME_STABLE picks the latest stable release. - -GNOME2_STABLE = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)" -GNOME_STABLE = "(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" - -REGEX_pn-glib-2.0 = "${GNOME_STABLE}" -REGEX_pn-atk = "${GNOME_STABLE}" -REGEX_pn-at-spi2-core = "${GNOME_STABLE}" -REGEX_pn-at-spi2-atk = "${GNOME_STABLE}" -REGEX_pn-gdk-pixbuf = "${GNOME_STABLE}" -REGEX_pn-pango = "${GNOME_STABLE}" -REGEX_pn-gtk+ = "${GNOME2_STABLE}" -REGEX_pn-gtk+3 = "${GNOME_STABLE}" -REGEX_pn-gtk-engines = "${GNOME2_STABLE}" -REGEX_pn-glib-networking = "${GNOME_STABLE}" -REGEX_pn-librsvg = "${GNOME_STABLE}" -REGEX_pn-libsoup-2.4 = "${GNOME_STABLE}" -REGEX_pn-vala = "${GNOME_STABLE}" -REGEX_pn-clutter-1.0 = "${GNOME_STABLE}" -REGEX_pn-clutter-gtk-1.0 = "${GNOME_STABLE}" -REGEX_pn-clutter-gst-3.0 = "${GNOME_STABLE}" -REGEX_pn-cogl-1.0 = "${GNOME_STABLE}" -REGEX_pn-adwaita-icon-theme = "${GNOME_STABLE}" -REGEX_pn-vte = "${GNOME_STABLE}" -REGEX_pn-epiphany = "${GNOME_STABLE}" -REGEX_pn-webkitgtk = "${GNOME_STABLE}" -REGEX_pn-p11-kit = "${GNOME_STABLE}" -REGEX_pn-gnome-desktop3 = "${GNOME_STABLE}" - -# not GNOME related but uses same even-minor-release-is-stable logic -REGEX_pn-dbus = "${GNOME_STABLE}" -REGEX_pn-dbus-test = "${GNOME_STABLE}" - -# same logic applies to gstreamer releases -REGEX_pn-gstreamer1.0 = "${GNOME_STABLE}" -REGEX_pn-gstreamer1.0-libav = "${GNOME_STABLE}" -REGEX_pn-gstreamer1.0-plugins-bad = "${GNOME_STABLE}" -REGEX_pn-gstreamer1.0-plugins-base = "${GNOME_STABLE}" -REGEX_pn-gstreamer1.0-plugins-good = "${GNOME_STABLE}" -REGEX_pn-gstreamer1.0-plugins-ugly = "${GNOME_STABLE}" -REGEX_pn-gstreamer1.0-rtsp-server = "${GNOME_STABLE}" - -# and perl -REGEX_pn-perl = "${GNOME_STABLE}" - -# Keep old gcc versions at their major versions -REGEX_pn-gcc-source-4.9.3 = "gcc-(?P<pver>4\.9\.\d+).tar" -REGEX_pn-gcc-source-4.8.4 = "gcc-(?P<pver>4\.8\.\d+).tar" - -# these packages are taken from snapshots.debian.org; that source is static and goes stale -# so we check the latest upstream from a directory that does get updated -REGEX_URI_pn-apt = "${DEBIAN_MIRROR}/main/a/apt/" -REGEX_URI_pn-resolvconf = "${DEBIAN_MIRROR}/main/r/resolvconf/" -REGEX_URI_pn-net-tools = "${DEBIAN_MIRROR}/main/n/net-tools/" - -# same for packages from launchpad -REGEX_URI_pn-base-passwd = "${DEBIAN_MIRROR}/main/b/base-passwd/" - -# for these packages we're mostly interested in tracking debian patches, -# and not in the upstream version where all development has effectively stopped -DEBIAN_PATCH_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)" -REGEX_pn-net-tools = "${DEBIAN_PATCH_REGEX}" -REGEX_pn-apmd = "${DEBIAN_PATCH_REGEX}" -REGEX_pn-blktool = "${DEBIAN_PATCH_REGEX}" -REGEX_pn-mailx = "${DEBIAN_PATCH_REGEX}" diff --git a/yocto-poky/meta/conf/distro/include/security_flags.inc b/yocto-poky/meta/conf/distro/include/security_flags.inc index 14ac0bf32..ff5f34e3a 100644 --- a/yocto-poky/meta/conf/distro/include/security_flags.inc +++ b/yocto-poky/meta/conf/distro/include/security_flags.inc @@ -9,14 +9,14 @@ # -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-all -pie -fpie ${lcl_maybe_fortify}" -SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-all ${lcl_maybe_fortify}" +SECURITY_CFLAGS ?= "-fstack-protector-strong -pie -fpie ${lcl_maybe_fortify}" +SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-strong ${lcl_maybe_fortify}" -SECURITY_LDFLAGS ?= "-Wl,-z,relro,-z,now" -SECURITY_X_LDFLAGS ?= "-Wl,-z,relro" +SECURITY_LDFLAGS ?= "-fstack-protector-strong -Wl,-z,relro,-z,now" +SECURITY_X_LDFLAGS ?= "-fstack-protector-strong -Wl,-z,relro" # powerpc does not get on with pie for reasons not looked into as yet -SECURITY_CFLAGS_powerpc = "-fstack-protector-all ${lcl_maybe_fortify}" +SECURITY_CFLAGS_powerpc = "-fstack-protector-strong ${lcl_maybe_fortify}" # Deal with ppc specific linker failures when using the cflags SECURITY_CFLAGS_pn-dbus_powerpc = "" SECURITY_CFLAGS_pn-dbus-ptest_powerpc = "" @@ -28,11 +28,7 @@ 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}" -# Curl seems to check for FORTIFY_SOURCE in CFLAGS, but even assigned -# to CPPFLAGS it gets picked into CFLAGS in bitbake. -#TARGET_CPPFLAGS_pn-curl += "-D_FORTIFY_SOURCE=2" SECURITY_CFLAGS_pn-cups = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-curl = "-fstack-protector-all -pie -fpie" SECURITY_CFLAGS_pn-db = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-directfb = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-glibc = "" @@ -43,8 +39,8 @@ 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_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-gcc-sanitizers = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-gcc-runtime = "" +SECURITY_CFLAGS_pn-gcc-sanitizers = "" SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gmp = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gnutls = "${SECURITY_NO_PIE_CFLAGS}" @@ -63,7 +59,7 @@ 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_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-libgcc = "" SECURITY_CFLAGS_pn-libid3tag = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libnewt = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-libglu = "${SECURITY_NO_PIE_CFLAGS}" @@ -82,18 +78,30 @@ 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 = "${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-tcl = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}" -SECURITY_CFLAGS_pn-valgrind = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-uclibc = "" +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}" -TARGET_CFLAGS_append = " ${SECURITY_CFLAGS}" -TARGET_LDFLAGS_append = " ${SECURITY_LDFLAGS}" +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}" SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}" @@ -101,3 +109,5 @@ SECURITY_LDFLAGS_pn-xf86-video-omap = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-vesa = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xf86-video-vmware = "${SECURITY_X_LDFLAGS}" SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}" + +TARGET_CC_ARCH_append_pn-binutils = " ${SECURITY_CFLAGS} ${SELECTED_OPTIMIZATION}" diff --git a/yocto-poky/meta/conf/distro/include/tclibc-musl.inc b/yocto-poky/meta/conf/distro/include/tclibc-musl.inc index 1ddd58ed5..e6b10f946 100644 --- a/yocto-poky/meta/conf/distro/include/tclibc-musl.inc +++ b/yocto-poky/meta/conf/distro/include/tclibc-musl.inc @@ -25,3 +25,7 @@ LIBC_DEPENDENCIES = "\ musl-dbg \ musl-dev \ " + +# GLib binaries trigger assertion failures and crash under qemu +# when musl is in use +DISTRO_FEATURES_BACKFILL_CONSIDERED += "gobject-introspection-data" diff --git a/yocto-poky/meta/conf/distro/include/tcmode-default.inc b/yocto-poky/meta/conf/distro/include/tcmode-default.inc index f20552494..c412420ea 100644 --- a/yocto-poky/meta/conf/distro/include/tcmode-default.inc +++ b/yocto-poky/meta/conf/distro/include/tcmode-default.inc @@ -17,18 +17,18 @@ PREFERRED_PROVIDER_virtual/${SDK_PREFIX}compilerlibs = "nativesdk-gcc-runtime" # Default libc config PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "${TCLIBC}" -PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc ?= "nativesdk-${TCLIBC}" +PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc ?= "nativesdk-glibc" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial" -PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial = "nativesdk-${TCLIBC}-initial" +PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial ?= "nativesdk-glibc-initial" PREFERRED_PROVIDER_virtual/gettext ??= "gettext" -GCCVERSION ?= "5.%" +GCCVERSION ?= "5.3%" SDKGCCVERSION ?= "${GCCVERSION}" -BINUVERSION ?= "2.25%" -GDBVERSION ?= "7.9%" -GLIBCVERSION ?= "2.22" -UCLIBCVERSION ?= "0.9.33+git%" -LINUXLIBCVERSION ?= "4.1" +BINUVERSION ?= "2.26%" +GDBVERSION ?= "7.10%" +GLIBCVERSION ?= "2.23" +UCLIBCVERSION ?= "1.0%" +LINUXLIBCVERSION ?= "4.4" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" diff --git a/yocto-poky/meta/conf/distro/include/world-broken.inc b/yocto-poky/meta/conf/distro/include/world-broken.inc index ab0c2dc86..a5f6371d3 100644 --- a/yocto-poky/meta/conf/distro/include/world-broken.inc +++ b/yocto-poky/meta/conf/distro/include/world-broken.inc @@ -2,4 +2,48 @@ # Exclude known broken packages # +# rt-tests needs PI mutex support in libc +EXCLUDE_FROM_WORLD_pn-rt-tests_libc-musl = "1" +# error: no member named 'sin_port' in 'struct sockaddr_in6' +# this is due to libtirpc using ipv6 but portmap rpc expecting ipv4 +EXCLUDE_FROM_WORLD_pn-portmap_libc-musl = "1" +EXCLUDE_FROM_WORLD_pn-unfs3_libc-musl = "1" + +# error: use of undeclared identifier '_STAT_VER' +EXCLUDE_FROM_WORLD_pn-pseudo_libc-musl = "1" + +# error: Need to implement custom I/O +EXCLUDE_FROM_WORLD_pn-libsolv_libc-musl = "1" + +# undefined reference to `pthread_tryjoin_np' +EXCLUDE_FROM_WORLD_pn-btrfs-tools_libc-musl = "1" + +# error: error.h: No such file or directory +EXCLUDE_FROM_WORLD_pn-prelink_libc-musl = "1" + +# error: use of undeclared identifier 'O_CREAT' +EXCLUDE_FROM_WORLD_pn-libbsd_libc-musl = "1" + +# error: expected declaration specifiers before '__nonnull' +EXCLUDE_FROM_WORLD_pn-lttng-ust_libc-musl = "1" +EXCLUDE_FROM_WORLD_pn-lttng-tools_libc-musl = "1" + +# error: obstack.h: No such file or directory +EXCLUDE_FROM_WORLD_pn-systemtap_libc-musl = "1" +EXCLUDE_FROM_WORLD_pn-systemtap-uprobes_libc-musl = "1" + +# error: a parameter list without types is only allowed in a function definition +# void (*_function)(sigval_t); +EXCLUDE_FROM_WORLD_pn-qemu_libc-musl = "1" + +# glibc specific funcrions +# error: storage size of 'mi' isn't known struct mallinfo mi +EXCLUDE_FROM_WORLD_pn-valgrind_libc-musl = "1" + +# error: format '%s' expects argument of type 'char *', but argument 4 has type 'int' [-Werror=format=] +# snprintf(buf, size, "%s", strerror_r(err, sbuf, sizeof(sbuf))); +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" diff --git a/yocto-poky/meta/conf/distro/include/yocto-uninative.inc b/yocto-poky/meta/conf/distro/include/yocto-uninative.inc new file mode 100644 index 000000000..85e613ac4 --- /dev/null +++ b/yocto-poky/meta/conf/distro/include/yocto-uninative.inc @@ -0,0 +1,11 @@ +# +# This include points at uninative tarballs generated and maintained +# by the Yocto Project. These file can be included by distros if they +# want to use/maintain a unified sstate feed for native/cross artefacts +# rather than the feeds having native/cross artefacts which are specific +# 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" |
