From 47c42b6c3014429886eaa66a17f38e86a33d086e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 28 Oct 2008 16:31:39 +0000 Subject: conf/distro: Create a moblin distro config file based on the Poky one Also refactor various data into common include files. --- meta/conf/distro/include/as-needed.inc | 14 ++++++++++++++ meta/conf/distro/include/poky-eabi.inc | 15 +++------------ meta/conf/distro/include/poky-moblin.inc | 26 ++++++++++++++++++++++++++ meta/conf/distro/include/world-broken.inc | 30 ++++++++++++++++++++++++++++++ meta/conf/distro/poky.conf | 30 +----------------------------- 5 files changed, 74 insertions(+), 41 deletions(-) create mode 100644 meta/conf/distro/include/as-needed.inc create mode 100644 meta/conf/distro/include/poky-moblin.inc create mode 100644 meta/conf/distro/include/world-broken.inc (limited to 'meta') diff --git a/meta/conf/distro/include/as-needed.inc b/meta/conf/distro/include/as-needed.inc new file mode 100644 index 0000000000..50a152de32 --- /dev/null +++ b/meta/conf/distro/include/as-needed.inc @@ -0,0 +1,14 @@ + +ASNEEDED = "-Wl,--as-needed" + +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 = "" + +TARGET_LDFLAGS += "${ASNEEDED}" \ No newline at end of file diff --git a/meta/conf/distro/include/poky-eabi.inc b/meta/conf/distro/include/poky-eabi.inc index e0cafbaaa9..10706b695c 100644 --- a/meta/conf/distro/include/poky-eabi.inc +++ b/meta/conf/distro/include/poky-eabi.inc @@ -35,15 +35,6 @@ PREFERRED_VERSION_glibc ?= "2.6.1" PREFERRED_VERSION_glibc-initial ?= "2.6.1" PREFERRED_VERSION_elfutils ?= "0.131" -ASNEEDED = "-Wl,--as-needed" -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 = "" - -TARGET_LDFLAGS += "${ASNEEDED}" +require conf/distro/include/as-needed.inc + + diff --git a/meta/conf/distro/include/poky-moblin.inc b/meta/conf/distro/include/poky-moblin.inc new file mode 100644 index 0000000000..45535c5540 --- /dev/null +++ b/meta/conf/distro/include/poky-moblin.inc @@ -0,0 +1,26 @@ +TARGET_VENDOR = "-poky" + +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-intermediate = "gcc-cross-intermediate" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross" + +GCCVERSION ?= "4.2.3" +BINUVERSION = "2.18" + +PREFERRED_VERSION_gcc ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross-initial ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross-intermediate ?= "${GCCVERSION}" +PREFERRED_VERSION_gcc-cross-sdk ?= "${GCCVERSION}" +PREFERRED_VERSION_binutils ?= "${BINUVERSION}" +PREFERRED_VERSION_binutils-cross ?= "${BINUVERSION}" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.24" +PREFERRED_VERSION_glibc ?= "2.6.1" +PREFERRED_VERSION_glibc-initial ?= "2.6.1" +PREFERRED_VERSION_elfutils ?= "0.131" + +require conf/distro/include/as-needed.inc + diff --git a/meta/conf/distro/include/world-broken.inc b/meta/conf/distro/include/world-broken.inc new file mode 100644 index 0000000000..e1e14880fc --- /dev/null +++ b/meta/conf/distro/include/world-broken.inc @@ -0,0 +1,30 @@ +# +# Exclude known broken packages +# +# Needs old OpenSync +EXCLUDE_FROM_WORLD_pn-libsync = "1" +EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1" +EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1" +EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1" +EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1" +EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1" +# Needs python +EXCLUDE_FROM_WORLD_pn-opkg-utils = "1" +# Needs gcc 3.x +EXCLUDE_FROM_WORLD_pn-qemu = "1" +# temporary +EXCLUDE_FROM_WORLD_pn-lirc = "1" +EXCLUDE_FROM_WORLD_pn-lirc-modules = "1" +# these applications need clutter 0.6 +EXCLUDE_FROM_WORLD_pn-aaina = "1" +EXCLUDE_FROM_WORLD_pn-table = "1" +EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1" +# Need bzr +EXCLUDE_FROM_WORLD_pn-eds-tools = "1" +# Need fixed Perl - OE bug #3403 +EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1" +# Needs libxml-parser-perl +EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1" +# Needs gtk+ <= 2.10 +EXCLUDE_FROM_WORLD_pn-gcalctool = "1" + diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 7be505765f..1abafa5d22 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -116,33 +116,5 @@ DISTRO_EXTRA_RRECOMMENDS += "kernel-module-af-packet" IMAGE_FEATURES ?= "" -# -# Exclude known broken packages -# -# Needs old OpenSync -EXCLUDE_FROM_WORLD_pn-libsync = "1" -EXCLUDE_FROM_WORLD_pn-libopensync-plugin-evo2-sync = "1" -EXCLUDE_FROM_WORLD_pn-libopensync-plugin-file-sync = "1" -EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc = "1" -EXCLUDE_FROM_WORLD_pn-libopensync-plugin-irmc-sync = "1" -EXCLUDE_FROM_WORLD_pn-libopensync-plugin-google-calendar = "1" -# Needs python -EXCLUDE_FROM_WORLD_pn-opkg-utils = "1" -# Needs gcc 3.x -EXCLUDE_FROM_WORLD_pn-qemu = "1" -# temporary -EXCLUDE_FROM_WORLD_pn-lirc = "1" -EXCLUDE_FROM_WORLD_pn-lirc-modules = "1" -# these applications need clutter 0.6 -EXCLUDE_FROM_WORLD_pn-aaina = "1" -EXCLUDE_FROM_WORLD_pn-table = "1" -EXCLUDE_FROM_WORLD_pn-task-poky-clutter = "1" -# Need bzr -EXCLUDE_FROM_WORLD_pn-eds-tools = "1" -# Need fixed Perl - OE bug #3403 -EXCLUDE_FROM_WORLD_pn-libxml-parser-perl = "1" -# Needs libxml-parser-perl -EXCLUDE_FROM_WORLD_pn-libxml-simple-perl = "1" -# Needs gtk+ <= 2.10 -EXCLUDE_FROM_WORLD_pn-gcalctool = "1" +require conf/distro/include/world-broken.inc -- cgit 1.2.3-korg