From 033c08104afc48752ca44149e2ba3589b337f60f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 24 Nov 2009 10:06:16 +0100 Subject: shr.conf: merge minimal.conf to shr.conf directly, remove all preferred-xorg-versions includes (7.4 as well as 7.5) Signed-off-by: Martin Jansa Acked-By: Sebastian Spaeth --- conf/distro/shr.conf | 153 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 134 insertions(+), 19 deletions(-) (limited to 'conf/distro') diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 79c07afbe6..6740e24feb 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -15,12 +15,9 @@ TOOLCHAIN_BRAND ?= "" #LIBC = "glibc" -require conf/distro/include/preferred-xorg-versions-X11R7.5.inc require conf/distro/include/preferred-shr-versions.inc require conf/distro/include/shr-autorev.inc -include conf/distro/minimal.conf - # # Header # @@ -33,7 +30,6 @@ DISTRO_TYPE = "debug" DISTRO = "shr" #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable -PREFERRED_PROVIDER_qemu-native = "qemu-native" ENABLE_BINARY_LOCALE_GENERATION ?= "1" # We only want to build UTF8 locales @@ -75,6 +71,89 @@ PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t" PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t" PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t" +# Helper to say what image we built +SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version" +ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;" +ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;" +ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;" +ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${SHR_VERSION_FILE};" +ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${SHR_VERSION_FILE};" + +#Package customization +EXTRA_OECONF-pn_qemu += " --target-list=arm-linux-user,arm-softmmu" + +#Illume settings +ILLUME_CONFIG = "e-wm-config-illume-shr" +ILLUME_THEME = "e-wm-theme-illume-gry" + +# From minimal.conf + +############################################################################# +# FEATURE SELECTION +############################################################################# +# Use bluetooth 4.0 +DISTRO_BLUETOOTH_MANAGER = "bluez4" +# We want images supporting the following features (for task-base) +DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci" +# Following features are for ARM and E500 based machines +DISTRO_FEATURES += "eabi" + +############################################################################# +# LIBRARY NAMES +############################################################################# +# libfoo -> libfoo0-2 (etc) +INHERIT += "debian" + +############################################################################# +# STAGING AREA +############################################################################# +# Controlled by packaging system +INHERIT += "packaged-staging" + +############################################################################# +# PACKAGING & FEEDS +############################################################################# +# Chose the packaging system +INHERIT += "package_ipk" +IMAGE_FSTYPES ?= "tar.gz jffs2" + +require conf/distro/include/sane-feed.inc +PREFERRED_PKG_FORMAT ?= "ipk" +require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc + +############################################################################# +# IMAGES +############################################################################# +# Name the generated images in a sane way +IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" +CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}" +DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}" +DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" + +# increase inode/block ratio for ext2 filesystem +EXTRA_IMAGECMD_ext2 = "-i 8192" + +############################################################################# +# KERNEL +############################################################################# +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +############################################################################# +# OVERWRITES adjusted from bitbake.conf to feature the MACHINE_CLASS +############################################################################# +OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + +############################################################################# +# TOOLCHAIN +############################################################################# +LIBC ?= "eglibc" +require conf/distro/include/sane-toolchain.inc + +############################################################################# +# PREFERRED PROVIDERS +############################################################################# +PREFERRED_PROVIDER_qemu-native = "qemu-native" PREFERRED_PROVIDER_gconf = "gconf" PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-logo" PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" @@ -93,18 +172,54 @@ PREFERRED_PROVIDER_opkg = "opkg" PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" PREFERRED_PROVIDER_atd = "atd-over-fso" PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free" - -# Helper to say what image we built -SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version" -ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;" -ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;" -ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;" -ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${SHR_VERSION_FILE};" -ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${SHR_VERSION_FILE};" - -#Package customization -EXTRA_OECONF-pn_qemu += " --target-list=arm-linux-user,arm-softmmu" - -#Illume settings -ILLUME_CONFIG = "e-wm-config-illume-shr" -ILLUME_THEME = "e-wm-theme-illume-gry" +PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +PREFERRED_PROVIDER_avahi = "avahi" +PREFERRED_PROVIDER_gtk+ = "gtk+" +PREFERRED_PROVIDER_libgpewidget = "libgpewidget" +PREFERRED_PROVIDER_virtual/db = "db3" +PREFERRED_PROVIDER_virtual/db-native = "db3-native" +PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb" + +############################################################################# +# PREFERRED VERSIONS +############################################################################# +require conf/distro/include/sane-srcdates.inc +require conf/distro/include/sane-srcrevs.inc +require conf/distro/include/preferred-e-versions.inc +require conf/distro/include/preferred-opie-versions-1.2.4.inc +#Use newest available (X11R7.5 now) +#require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc +#require conf/distro/include/preferred-xorg-versions-X11R7.4.inc + +############################################################################# +# CONTENTS +############################################################################# + +# Ship extra debug utils in the rootfs when doing a debug build +DISTRO_EXTRA_APPS ?= "" +DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}' + +# Additional content I (only valid if you include task-base) +# distro-feed-configs: configuration files for the online feeds +# util-linux-ng-mount util-linux-ng-umount: busybox mount is broken +# angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink +DISTRO_EXTRA_RDEPENDS += "\ + distro-feed-configs \ + util-linux-ng-mount util-linux-ng-umount \ + angstrom-libc-fixup-hack \ + ${DISTRO_EXTRA_APPS} \ +" + +# Additional content II (can be masked with BAD_RECOMMENDATIONS) +DISTRO_EXTRA_RRECOMMENDS += " \ + kernel-module-vfat \ + kernel-module-ext2 \ + kernel-module-ext3 \ + kernel-module-af-packet \ + openssh-sftp-server \ +" + +# avahi-daemon \ +# avahi-autoipd \ -- cgit v1.2.3