summaryrefslogtreecommitdiff
path: root/conf/distro/yogurt.conf
diff options
context:
space:
mode:
authorStefan Müller-Klieser <s.mueller-klieser@phytec.de>2014-09-09 15:25:02 +0200
committerStefan Müller-Klieser <s.mueller-klieser@phytec.de>2014-09-09 16:20:19 +0200
commit2cdad298a75ca85094d57ec49c04cb9f36cc8d8c (patch)
treefa4a541c151ac0c08e33e1e2d45770344995061e /conf/distro/yogurt.conf
parentb128143b32a07d5d84ded6809c770468b7d9a1dd (diff)
downloadmeta-yogurt-2cdad298a75ca85094d57ec49c04cb9f36cc8d8c.tar.bz2
meta-yogurt-2cdad298a75ca85094d57ec49c04cb9f36cc8d8c.zip
distro prepare
Signed-off-by: Stefan Müller-Klieser <s.mueller-klieser@phytec.de>
Diffstat (limited to 'conf/distro/yogurt.conf')
-rw-r--r--conf/distro/yogurt.conf76
1 files changed, 2 insertions, 74 deletions
diff --git a/conf/distro/yogurt.conf b/conf/distro/yogurt.conf
index a9392b2..9e663e9 100644
--- a/conf/distro/yogurt.conf
+++ b/conf/distro/yogurt.conf
@@ -19,10 +19,6 @@ DISTRO_VERSION = ""
OLDEST_KERNEL = "2.6.16"
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/sane-srcrevs.inc
-require conf/distro/include/yogurt-preferred-versions.inc
-
#Images built can have to modes:
# 'debug': empty rootpassword, strace included
# 'release' no root password, no strace and gdb by default
@@ -44,68 +40,6 @@ TOOLCHAIN_BRAND ?= ""
ROOT_FLASH_SIZE ??= "32"
IMAGE_LINGUAS ?= '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}'
-# set feed path variables
-FEED_BASEPATH = "feeds/${DISTRO_VERSION}/${YOGURT_PKG_FORMAT}/${TCLIBC}/"
-
-#This is unrelated to the kernel version, but userspace apps (e.g. udev/systemd) require a recent version to build against
-LINUX_LIBC_HEADERS_VERSION ?= "3.14%"
-PREFERRED_VERSION_linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}"
-PREFERRED_VERSION_linux-libc-headers-native = "${LINUX_LIBC_HEADERS_VERSION}"
-PREFERRED_VERSION_nativesdk-linux-libc-headers = "${LINUX_LIBC_HEADERS_VERSION}"
-
-#use Linaro tools for ARM
-YOGURT_GCC_VERSION_arm ?= "linaro-4.8%"
-YOGURT_GCC_VERSION_aarch64 ?= "linaro-4.8%"
-#YOGURT_BINUTILS_VERSION_arm ?= "linaro-2.24%"
-YOGURT_GDB_VERSION_arm ?= "linaro-7.6%"
-
-#Everybody else can just use this:
-YOGURT_GCC_VERSION ?= "4.8%"
-YOGURT_NATIVE_GCC_VERSION ?= "4.8%"
-YOGURT_BINUTILS_VERSION ?= "2.24%"
-YOGURT_NATIVE_BINUTILS_VERSION ?= "2.24%"
-YOGURT_GDB_VERSION ?= "7.6%"
-
-YOGURT_QEMU_VERSION ?= "1.7.0"
-
-PREFERRED_VERSION_binutils ?= "${YOGURT_BINUTILS_VERSION}"
-PREFERRED_VERSION_binutils-cross ?= "${YOGURT_BINUTILS_VERSION}"
-PREFERRED_VERSION_binutils-crosssdk ?= "${YOGURT_BINUTILS_VERSION}"
-PREFERRED_VERSION_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${YOGURT_BINUTILS_VERSION}"
-PREFERRED_VERSION_binutils-native ?= "${YOGURT_NATIVE_BINUTILS_VERSION}"
-
-PREFERRED_VERSION_gcc ?= "${YOGURT_GCC_VERSION}"
-PREFERRED_VERSION_gcc-cross ?= "${YOGURT_GCC_VERSION}"
-PREFERRED_VERSION_gcc-cross-initial ?= "${YOGURT_GCC_VERSION}"
-PREFERRED_VERSION_gcc-cross-intermediate ?= "${YOGURT_GCC_VERSION}"
-PREFERRED_VERSION_gcc-cross-canadian ?= "${YOGURT_GCC_VERSION}"
-PREFERRED_VERSION_gcc-crosssdk ?= "${YOGURT_NATIVE_GCC_VERSION}"
-PREFERRED_VERSION_gcc-crosssdk-initial ?= "${YOGURT_NATIVE_GCC_VERSION}"
-PREFERRED_VERSION_gcc-crosssdk-intermediate ?= "${YOGURT_NATIVE_GCC_VERSION}"
-PREFERRED_VERSION_gcc-runtime ?= "${YOGURT_GCC_VERSION}"
-PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${YOGURT_GCC_VERSION}"
-PREFERRED_VERSION_libgcc ?= "${YOGURT_GCC_VERSION}"
-PREFERRED_VERSION_nativesdk-libgcc ?= "${YOGURT_GCC_VERSION}"
-PREFERRED_VERSION_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${YOGURT_GCC_VERSION}"
-
-PREFERRED_VERSION_gdb ?= "${YOGURT_GDB_VERSION}"
-PREFERRED_VERSION_gdb-cross ?= "${YOGURT_GDB_VERSION}"
-PREFERRED_VERSION_gdb-cross-canadian ?= "${YOGURT_GDB_VERSION}"
-PREFERRED_VERSION_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "${YOGURT_GDB_VERSION}"
-
-PREFERRED_VERSION_qemu = "${YOGURT_QEMU_VERSION}"
-PREFERRED_VERSION_qemu-native = "${YOGURT_QEMU_VERSION}"
-PREFERRED_VERSION_nativesdk-qemu = "${YOGURT_QEMU_VERSION}"
-
-PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
-PREFERRED_PROVIDER-gconf-dbus = "gconf"
-PREFERRED_PROVIDER_hotplug = "systemd"
-PREFERRED_PROVIDER_opkg ?= "opkg"
-PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
-
-# Prefer gummiboot over grub
-EFI_PROVIDER = "gummiboot"
-
# blacklist policy
PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough"
@@ -115,7 +49,7 @@ PNBLACKLIST[ffmpeg] = "libav is preferred over ffmpeg"
# Define splash before it gets set to empty in yogurt-core-tweaks.inc:
SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "dietsplash", "",d)}'
-require conf/distro/include/yogurt.inc
+require yogurt.inc
# Prefer openssh over dropbear
TASK_BASIC_SSHDAEMON = "openssh-ssh openssh-sshd openssh-scp openssh-sftp openssh-sftp-server"
@@ -124,12 +58,10 @@ TASK_BASIC_SSHDAEMON = "openssh-ssh openssh-sshd openssh-scp openssh-sftp openss
require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
# Processor specific tunes like hard float ABI
include conf/distro/include/${TARGET_ARCH}-defaults.inc
-# Set DISTRO_FEED_CONFIGS to our config var, assigned in the above .inc
-DISTRO_FEED_CONFIGS = "${YOGURT_FEED_CONFIGS}"
# If we're using an .ipk based rootfs, we want to have opkg installed so postinst script can run
# We also take this opportunity to inject yogurt-version and the feed configs into the rootfs
-IPKG_VARIANT = "opkg yogurt-version ${YOGURT_FEED_CONFIGS}"
+IPKG_VARIANT = "opkg yogurt-version"
# Select xserver-xorg as default, since kdrive has been EOL'ed
XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev"
@@ -149,14 +81,10 @@ DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps"
# This hooks into packagegroup-base, so it won't do anything if your images doesn't include packagegroup-base.
# yogurt-version: ship this to have an identifiable rootfs so user can report bugs against a specific version
-# YOGURT_FEED_CONFIGS: configfiles for the online feeds
# util-linux-mount util-linux-umount: busybox mount is broken
-# yogurt-libc-fixup-hack: fixes an obscure bug with libc.so symlink
DISTRO_EXTRA_RDEPENDS += "\
yogurt-version \
- ${YOGURT_FEED_CONFIGS} \
util-linux-mount util-linux-umount \
- yogurt-libc-fixup-hack \
"
# This also hooks into packagegroup-base, but isn't mandatory.