diff options
Diffstat (limited to 'conf/distro/include')
21 files changed, 408 insertions, 509 deletions
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index a63c204441..3098101d7f 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -2,8 +2,8 @@ PREFERRED_VERSION_autoconf = "2.63" PREFERRED_VERSION_autoconf-native = "2.63" PREFERRED_VERSION_automake-native = "1.10.2" PREFERRED_VERSION_busybox = "1.13.2" -PREFERRED_VERSION_cairo = "1.8.0" -PREFERRED_VERSION_dbus = "1.2.1" +PREFERRED_VERSION_cairo = "1.8.8" +PREFERRED_VERSION_dbus = "1.2.3" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" PREFERRED_VERSION_glib-2.0 = "2.22.1" @@ -11,7 +11,7 @@ PREFERRED_VERSION_glib-2.0-native = "2.22.1" PREFERRED_VERSION_glibmm = "2.22.1" PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gtk+ = "2.18.0" +PREFERRED_VERSION_gtk+ = "2.18.3" PREFERRED_VERSION_gtkmm = "2.18.1" PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" @@ -22,14 +22,14 @@ PREFERRED_VERSION_libtool-native = "2.2.6a" PREFERRED_VERSION_libtool-cross = "2.2.6a" PREFERRED_VERSION_libtool-sdk = "2.2.6a" PREFERRED_VERSION_libx11 = "1.2" -PREFERRED_VERSION_mesa = "7.2" +PREFERRED_VERSION_mesa = "7.4" PREFERRED_VERSION_pango = "1.24.4" #PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" -PREFERRED_VERSION_python = "2.6.1" -PREFERRED_VERSION_samba = "3.3.0" +PREFERRED_VERSION_python = "2.6.2" +PREFERRED_VERSION_samba = "3.3.9" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" PREFERRED_VERSION_udev = "141" diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 2a1b7b059c..69a5b23111 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -1,6 +1,8 @@ # eglibc: require conf/distro/include/eglibc.inc +ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used" + TARGET_OS = "linux" TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" @@ -13,7 +15,7 @@ TARGET_OS .= "${@['','-gnuspe'][bb.data.getVar('TARGET_ARCH',d,1) in ['ppc', 'po # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb3" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -ggdb3" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index dae149f471..c8607c6001 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -1,7 +1,7 @@ # glibc: -require conf/distro/include/glibc.inc +require conf/distro/include/glibc-${TOOLCHAIN_TYPE}.inc -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers" +ANGSTROM_BLACKLIST_pn-libiconv = "the glibc builtin iconv replacement is used" TARGET_OS = "linux" TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" @@ -11,7 +11,7 @@ TARGET_OS .= "${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'a # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb3" +FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os -ggdb3" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2" @@ -24,5 +24,8 @@ BUILD_OPTIMIZATION_pn-perl-native = "-O1 -g" TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel']]}" +# Disable -Wl,as-needed for now till all the test come back OK +#require conf/distro/include/angstrom-ldflags.inc + CXXFLAGS += "-fvisibility-inlines-hidden" diff --git a/conf/distro/include/angstrom-ldflags.inc b/conf/distro/include/angstrom-ldflags.inc new file mode 100644 index 0000000000..6c60568798 --- /dev/null +++ b/conf/distro/include/angstrom-ldflags.inc @@ -0,0 +1,26 @@ + +# Set as-need to an intermediate var... +ASNEEDED = "-Wl,--as-needed" + +# ...so we can blacklist it for recipes that break with it +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-python = "" +ASNEEDED_pn-libproxy = "" +ASNEEDED_pn-libxsettings-client = "" +ASNEEDED_pn-libmatchbox = "" +ASNEEDED_pn-faac = "" +ASNEEDED_pn-wireless-tools = "" +ASNEEDED_pn-ffmpeg = "" + +# Append it to TARGET_LDLFLAGS +TARGET_LDFLAGS += "${ASNEEDED}" + diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index 607f3cd06d..ba8cdac1f5 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -23,9 +23,11 @@ SRCREV_pn-libascenario = "${AUTOREV}" SRCREV_pn-libeflvala = "${AUTOREV}" SRCREV_pn-libfsobasics = "${AUTOREV}" SRCREV_pn-libfsoframework = "${AUTOREV}" +SRCREV_pn-libfsoresource = "${AUTOREV}" SRCREV_pn-libfsotransport = "${AUTOREV}" SRCREV_pn-libframeworkd-glib = "${AUTOREV}" SRCREV_pn-libfso-glib = "${AUTOREV}" +SRCREV_pn-libgee-native = "${AUTOREV}" SRCREV_pn-libgee = "${AUTOREV}" SRCREV_pn-libgsm0710 = "${AUTOREV}" SRCREV_pn-libgsm0710mux = "${AUTOREV}" diff --git a/conf/distro/include/glibc-external.inc b/conf/distro/include/glibc-external.inc new file mode 100644 index 0000000000..3ddedb640f --- /dev/null +++ b/conf/distro/include/glibc-external.inc @@ -0,0 +1,21 @@ +# Add glibc to the overrides. +OVERRIDES .= ":libc-glibc" + +# The things glibc can provide. We default to wanting glibc to provide them. +PREFERRED_PROVIDER_virtual/libiconv ?= "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_virtual/libintl ?= "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_virtual/libc = "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "external-toolchain-${TOOLCHAIN_BRAND}" +PREFERRED_PROVIDER_linux-libc-headers ?= "external-toolchain-${TOOLCHAIN_BRAND}" + +# glibc is configured for OLDEST_KERNEL kernel version, so we set minimal +# sane versions there + +OLDEST_KERNEL ?= "2.4.0" + +# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi" +# TARGET_OS here, not on architecture which is 'arm' in both cases +OLDEST_KERNEL_linux-gnueabi ?= "2.6.14" +OLDEST_KERNEL_sparc64 ?= "2.4.21" +OLDEST_KERNEL_ppc64 ?= "2.4.21" diff --git a/conf/distro/include/glibc-internal.inc b/conf/distro/include/glibc-internal.inc new file mode 100644 index 0000000000..d1cbd5339b --- /dev/null +++ b/conf/distro/include/glibc-internal.inc @@ -0,0 +1,21 @@ +# Add glibc to the overrides. +OVERRIDES .= ":libc-glibc" + +# The things glibc can provide. We default to wanting glibc to provide them. +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc = "glibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc" +PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers" + +# glibc is configured for OLDEST_KERNEL kernel version, so we set minimal +# sane versions there + +OLDEST_KERNEL ?= "2.4.0" + +# ARM OABI is fine with 2.4.0, EABI is not, so we override on "-gnueabi" +# TARGET_OS here, not on architecture which is 'arm' in both cases +OLDEST_KERNEL_linux-gnueabi ?= "2.6.14" +OLDEST_KERNEL_sparc64 ?= "2.4.21" +OLDEST_KERNEL_ppc64 ?= "2.4.21" diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc index ba8d587241..34f0386772 100644 --- a/conf/distro/include/kaeilos-2009-preferred-versions.inc +++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc @@ -4,7 +4,7 @@ #@NAME: KaeilOS(R) - http://www.kaeilos.com #@DESCRIPTION: KaeilOS Linux Distribution preferred version #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com> -#@VERSION: 01-07-2009 +#@VERSION: 21-10-2009 # # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia # Product website : http://www.KaeilOS.com @@ -15,31 +15,32 @@ PREFERRED_VERSION_autoconf-native = "2.63" PREFERRED_VERSION_automake-native = "1.10.2" PREFERRED_VERSION_busybox = "1.13.2" PREFERRED_VERSION_cairo = "1.8.0" -PREFERRED_VERSION_dbus = "1.2.1" +PREFERRED_VERSION_dbus = "1.2.3" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.6.0" -PREFERRED_VERSION_glib-2.0 = "2.20.0" -PREFERRED_VERSION_glib-2.0-native = "2.18.0" -PREFERRED_VERSION_glibmm = "2.18.0" -PREFERRED_VERSION_glproto = "1.4.9" +PREFERRED_VERSION_glib-2.0 = "2.22.1" +PREFERRED_VERSION_glib-2.0-native = "2.22.1" +PREFERRED_VERSION_glibmm = "2.22.1" +PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" -PREFERRED_VERSION_gtk+ = "2.16.0" -PREFERRED_VERSION_gtkmm = "2.14.1" -PREFERRED_VERSION_hal = "0.5.12" +PREFERRED_VERSION_gtk+ = "2.18.0" +PREFERRED_VERSION_gtkmm = "2.18.1" +PREFERRED_VERSION_hal = "0.5.13" PREFERRED_VERSION_libgemwidget = "1.0" PREFERRED_VERSION_libgpephone = "0.4" PREFERRED_VERSION_libsdl-x11 = "1.2.11" -PREFERRED_VERSION_libtool = "2.2.4" -PREFERRED_VERSION_libtool-native = "2.2.4" -PREFERRED_VERSION_libtool-cross = "2.2.4" -PREFERRED_VERSION_libtool-sdk = "2.2.4" +PREFERRED_VERSION_libtool = "2.2.6a" +PREFERRED_VERSION_libtool-native = "2.2.6a" +PREFERRED_VERSION_libtool-cross = "2.2.6a" +PREFERRED_VERSION_libtool-sdk = "2.2.6a" PREFERRED_VERSION_libx11 = "1.2" -PREFERRED_VERSION_mesa = "7.2" -PREFERRED_VERSION_pango = "1.24.2" +PREFERRED_VERSION_mesa = "7.4" +PREFERRED_VERSION_pango = "1.24.4" PREFERRED_VERSION_pixman = "0.13.2" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.15" +PREFERRED_VERSION_python = "2.6.1" PREFERRED_VERSION_samba = "3.3.0" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" @@ -49,7 +50,7 @@ UDEV_GE_141 = "1" PREFERRED_VERSION_usbutils = "0.82" PREFERRED_VERSION_util-macros-native = "1.2.1" PREFERRED_VERSION_util-macros = "1.2.1" -PREFERRED_VERSION_wpa-supplicant = "0.6.7" +PREFERRED_VERSION_wpa-supplicant = "0.6.9" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" PREFERRED_VERSION_xserver-xorg = "1.6.1" diff --git a/conf/distro/include/kaeilos.inc b/conf/distro/include/kaeilos.inc index fc0348da28..ad03976c67 100644 --- a/conf/distro/include/kaeilos.inc +++ b/conf/distro/include/kaeilos.inc @@ -10,17 +10,20 @@ USERDISTRO := "${DISTRO}" DISTRO = "kaeilos" DISTRO_NAME = "KaeilOS" +BUILDNAME = "KaeilOS ${DISTRO_VERSION}" + TARGET_VENDOR = "-kaeilos" # Add FEED_ARCH to overrides OVERRIDES .= ":${FEED_ARCH}" # Put links to sources in deploy/sources to make it easier for people to be GPL compliant -SRC_DIST_LOCAL ?= "symlink" INHERIT += "src_distribute_local" +SRC_DIST_LOCAL ?= "symlink" # Can be "glibc", "eglibc" or "uclibc" -LIBC ?= "glibc" +KAEILOSLIBC ?= "glibc" +LIBC ?= "${KAEILOSLIBC}" PSTAGE_EXTRAPATH = "${LIBC}" CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}" @@ -34,8 +37,8 @@ require conf/distro/include/angstrom-${LIBC}.inc # We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc ANGSTROM_ARM_INSTRUCTION_SET ?= "arm" -ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb" -ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb" +#ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb" +#ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb" ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}" @@ -72,6 +75,9 @@ INHERIT += "debian" #activate config checker INHERIT += "sanity" +#activate the blacklister +INHERIT += "angstrom" + #make devshell available as task INHERIT += "devshell" @@ -80,13 +86,25 @@ INHERIT += "angstrom-mirrors" #run QA tests on builds and packages and log them INHERIT += "insane" +# INHERIT += "packagehistory" QA_LOG = "1" +#run QA tests on recipes +INHERIT += "recipe_sanity" + +#save statistical info on images +INHERIT += "testlab" + ANGSTROM_PKG_FORMAT ?= "ipk" require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc + # We don't want to keep OABI compat ARM_KEEP_OABI = "0" +# Do keep OABI compat for om-gta01 to keep the gllin binary working +ARM_KEEP_OABI_pn-linux-openmoko-2.6.24_om-gta01 = "1" +ARM_KEEP_OABI_pn-linux-openmoko-2.6.28_om-gta01 = "1" + #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" @@ -95,8 +113,8 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1" # We only want to build UTF8 locales LOCALE_UTF8_ONLY = "1" -#qemu doesn't like armv6/eabi/vfp -ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0" +#qemu doesn't like this fp +ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0" #qemu has taken a dislike to armeb as well ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" @@ -121,158 +139,11 @@ TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t" #Set the right arch for the feeds #Alphabetically sorted -FEED_ARCH ?= "${TARGET_ARCH}" +FEED_ARCH ?= "${BASE_PACKAGE_ARCH}" #blackfin machines FEED_ARCH_bfin = "blackfin" -#armv4t machines - -FEED_ARCH_acern30 = "armv4t" -FEED_ARCH_amsdelta = "armv4t" -FEED_ARCH_ep93xx = "armv4t" -FEED_ARCH_eteng500 = "armv4t" -FEED_ARCH_om-gta01 = "armv4t" -FEED_ARCH_om-gta02 = "armv4t" -FEED_ARCH_h1940 = "armv4t" -FEED_ARCH_h6300 = "armv4t" -FEED_ARCH_kb9202 = "armv4t" -FEED_ARCH_ks8695 = "armv4t" -FEED_ARCH_rx1950 = "armv4t" -FEED_ARCH_rx3000 = "armv4t" -FEED_ARCH_sarge-at91 = "armv4t" -FEED_ARCH_smdk2440 = "armv4t" -FEED_ARCH_smdk2443 = "armv4t" - -#armv5t machines - -FEED_ARCH_a1200 = "armv5te" -FEED_ARCH_a780 = "armv5te" -FEED_ARCH_akita = "armv5te" -FEED_ARCH_asus620 = "armv5te" -FEED_ARCH_asus730 = "armv5te" -FEED_ARCH_at91sam9263ek = "armv5te" -FEED_ARCH_aximx50 = "armv5te" -FEED_ARCH_aximx50v = "armv5te" -FEED_ARCH_c7x0 = "armv5te" -FEED_ARCH_compulab-pxa270 = "armv5te" -FEED_ARCH_davinci-dvevm = "armv5te" -FEED_ARCH_devkitidp-pxa255 = "armv5te" -FEED_ARCH_e680 = "armv5te" -FEED_ARCH_er0100 = "armv5te" -FEED_ARCH_gumstix = "armv5te" -FEED_ARCH_gumstix-verdex = "armv5te" -FEED_ARCH_gumstix-connex = "armv5te" -FEED_ARCH_h1910 = "armv5te" -FEED_ARCH_h2200 = "armv5te" -FEED_ARCH_h3900 = "armv5te" -FEED_ARCH_h4000 = "armv5te" -FEED_ARCH_h5000 = "armv5te" -FEED_ARCH_htcalpine = "armv5te" -FEED_ARCH_htcapache = "armv5te" -FEED_ARCH_htcblueangel = "armv5te" -FEED_ARCH_htchimalaya = "armv5te" -FEED_ARCH_htcsable = "armv5te" -FEED_ARCH_htctornado = "armv5te" -FEED_ARCH_htcuniversal = "armv5te" -FEED_ARCH_hx2000 = "armv5te" -FEED_ARCH_hx4700 = "armv5te" -FEED_ARCH_ixp4xxle = "armv5te" -FEED_ARCH_logicpd-pxa270 = "armv5te" -FEED_ARCH_looxc550 = "armv5te" -FEED_ARCH_lsarm = "armv5te" -FEED_ARCH_magician = "armv5te" -FEED_ARCH_mainstone = "armv5te" -FEED_ARCH_mnci = "armv5te" -FEED_ARCH_mtx-3 = "armv5te" -FEED_ARCH_mx21ads = "armv5te" -FEED_ARCH_n2100 = "armv5te" -FEED_ARCH_navman-icn330 = "armv5te" -FEED_ARCH_netbook-pro = "armv5te" -FEED_ARCH_nokia770 = "armv5te" -FEED_ARCH_rokre2 = "armv5te" -FEED_ARCH_nslu2le = "armv5te" -FEED_ARCH_omap1510inn = "armv5te" -FEED_ARCH_omap1610h2 = "armv5te" -FEED_ARCH_omap1710h3 = "armv5te" -FEED_ARCH_omap5912osk = "armv5te" -FEED_ARCH_palmld = "armv5te" -FEED_ARCH_palmt650 = "armv5te" -FEED_ARCH_palmt680 = "armv5te" -FEED_ARCH_palmtc = "armv5te" -FEED_ARCH_palmtt = "armv5te" -FEED_ARCH_palmtt3 = "armv5te" -FEED_ARCH_palmtt5 = "armv5te" -FEED_ARCH_palmtx = "armv5te" -FEED_ARCH_palmz31 = "armv5te" -FEED_ARCH_palmz71 = "armv5te" -FEED_ARCH_palmz72 = "armv5te" -FEED_ARCH_poodle = "armv5te" -FEED_ARCH_qemuarm = "armv5te" -FEED_ARCH_spitz = "armv5te" -FEED_ARCH_tosa = "armv5te" -FEED_ARCH_triton = "armv5te" - -FEED_ARCH_ixp4xxbe = "armv5teb" -FEED_ARCH_nslu2be = "armv5teb" - -# armv6 - -FEED_ARCH_mx31ads = "armv6" -FEED_ARCH_mx31moboard = "armv6" -FEED_ARCH_nokia800 = "armv6" -FEED_ARCH_omap2420h4 = "armv6" -FEED_ARCH_omap2430sdp = "armv6" - -#i486 machines -FEED_ARCH_geodegx = "i486" -FEED_ARCH_geodelx = "i486" -FEED_ARCH_netvista = "i486" -FEED_ARCH_wrap = "i486" -FEED_ARCH_x86 = "i486" - -#i586 machines -FEED_ARCH_epia = "i586" -FEED_ARCH_i586-generic = "i586" -FEED_ARCH_qemux86 = "i586" - -#i686 machines - -FEED_ARCH_alix = "i686" -FEED_ARCH_colinux = "i686" -FEED_ARCH_guinness = "i686" -FEED_ARCH_i686-generic = "i686" -FEED_ARCH_progear = "i686" - -#powerpc machines - -FEED_ARCH_dht-walnut = "ppc405" -FEED_ARCH_magicbox = "ppc405" -FEED_ARCH_xilinx-ml403 = "ppc405" -FEED_ARCH_xilinx-ml410 = "ppc405" -FEED_ARCH_sequoia = "ppc440e" -FEED_ARCH_efika = "ppc603e" -FEED_ARCH_lite5200 = "ppc603e" -FEED_ARCH_lsppchd = "ppc603e" -FEED_ARCH_lsppchg = "ppc603e" -FEED_ARCH_storcenter = "ppc603e" -FEED_ARCH_turbostation = "ppc603e" -FEED_ARCH_mpc8313e-rdb = "ppce300c3" -FEED_ARCH_mpc8323e-rdb = "ppce300c2" - - -#strongarm machines, no EABI - -FEED_ARCH_collie = "arm-oabi" -FEED_ARCH_h3600 = "arm-oabi" -FEED_ARCH_h3800 = "arm-oabi" -FEED_ARCH_htcwallaby = "arm-oabi" -FEED_ARCH_jornada56x = "arm-oabi" -FEED_ARCH_jornada7xx = "arm-oabi" -FEED_ARCH_shark = "arm-oabi" -FEED_ARCH_simpad = "arm-oabi" - - #Tweak packaging for strongarm machines since they can't use EABI PACKAGE_EXTRA_ARCHS_collie = "arm-oabi" @@ -289,4 +160,53 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" # KaeilOS *always* has some form of release config, so error out if someone thinks he knows better DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" + +# Configuration for tinderbox, so people only need: +# INHERIT += "tinderclient" +# in their local.conf + +#Name of the client +TINDER_MACHINE = "${MACHINE}-${LIBC}-build-image" + +# Which lof file to write to, which tree to report to +TINDER_LOG = "${TMPDIR}/tinder.log" +TINDER_TREE = "KaeilOS" + +# HTTP posting +#TINDER_HOST ?= "ewi546.ewi.utwente.nl" +#TINDER_URL ?= "/tinderbox" + +# Which branch do we build +TINDER_BRANCH = "org.openembedded.dev" + +## Clobbing +## 0 for rebuilding everything from scratch +## 1 for incremental builds +TINDER_CLOBBER = "1" + +## Do a report at all +TINDER_REPORT = "1" + +# Configuration for seppuku autobuilder, people only need to put: +# INHERIT += "seppuku oestats-client" +# SEPPUKU_USER = "your_bugzilla@user.id" +# SEPPUKU_PASS = "your_bugzilla_password" +# OESTATS_BUILDER = "your_name" +# in their local.conf + +# seppuku bbclass +SEPPUKU_LOGIN = "http://bugs.openembedded.net/query.cgi?" +SEPPUKU_QUERY = "http://bugs.openembedded.net/buglist.cgi?" +SEPPUKU_NEWREPORT = "http://bugs.openembedded.net/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom%20unstable&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_ADDCOMMENT = "http://bugs.openembedded.net/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&" +SEPPUKU_ATTACHMENT = "http://bugs.openembedded.net/attachment.cgi?" +SEPPUKU_AUTOBUILD = "1" + +SEPPUKU_PRODUCT = "Openembedded" +SEPPUKU_COMPONENT = "org.openembedded.dev" + +OESTATS_SERVER ?= "tinderbox.openembedded.org" + + + # We want images supporting the following features (for task-base) diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc new file mode 100644 index 0000000000..a2d1992706 --- /dev/null +++ b/conf/distro/include/preferred-shr-versions.inc @@ -0,0 +1,29 @@ +# Upgraded +# use newer version then preferred by default +PREFERRED_VERSION_boost ?= "1.40.0" +PREFERRED_VERSION_dbus ?= "1.3.0" +PREFERRED_VERSION_autoconf = "2.63" +PREFERRED_VERSION_autoconf-native = "2.63" +PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2" +PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git" +PREFERRED_VERSION_strace ?= "4.5.15" + +# we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24" +PREFERRED_VERSION_linux-libc-headers = "2.6.29" + +# upgrades used in Angstrom +PREFERRED_VERSION_pixman = "0.17.1" +PREFERRED_VERSION_gtk+ = "2.18.3" +PREFERRED_VERSION_hal = "0.5.13" +PREFERRED_VERSION_libtool = "2.2.6a" +PREFERRED_VERSION_libtool-native = "2.2.6a" +PREFERRED_VERSION_libtool-cross = "2.2.6a" +PREFERRED_VERSION_libtool-sdk = "2.2.6a" +PREFERRED_VERSION_udev = "141" +PREFERRED_VERSION_usbutils = "0.82" +PREFERRED_VERSION_wpa-supplicant = "0.6.9" +UDEV_GE_141 = "1" + +# Downgraded +# python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py +PREFERRED_VERSION_python-pygtk ?= "2.10.4" diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 0eae85b686..5ec80ffeb1 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -65,3 +65,6 @@ PREFERRED_VERSION_udev ?= "118" # boost 1.36 won't build PREFERRED_VERSION_boost ?= "1.33.1" + +# pulseaudio 0.9.19 is broken (ASM errors during do_compile): +PREFERRED_VERSION_pulseaudio ?= "0.9.15" diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc index d3794834b9..6f891c47fd 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc @@ -99,7 +99,7 @@ PREFERRED_VERSION_xf86-video-ark ?= "0.7.0" PREFERRED_VERSION_xf86-video-ast ?= "0.85.0" PREFERRED_VERSION_xf86-video-ati ?= "6.9.0" PREFERRED_VERSION_xf86-video-chips ?= "1.2.0" -PREFERRED_VERSION_xf86-video-cirrus ?= "1.2.1" +PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2" PREFERRED_VERSION_xf86-video-dummy ?= "0.3.0" PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.0" PREFERRED_VERSION_xf86-video-geode ?= "2.11.4.1" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 422145c8c2..4ea318fdbb 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -41,6 +41,7 @@ SRCDATE_rdesktop ?= "20080917" SRCDATE_roadster ?= "20060814" SRCDATE_rosetta ?= "20090514" SRCDATE_sctzap ?= "20060814" +SRCDATE_squashfs ?= "20091110" SRCDATE_tslib ?= "20051101" SRCDATE_waimea ?= "20060814" SRCDATE_xcompmgr ?= "20060814" diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index aef87a62a5..78eaec4f73 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -1,39 +1,44 @@ # To be included from sane-srcrevs.inc # FSO Projects -- Cornucopia -FSO_CORNUCOPIA_SRCREV ?= "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7" -SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}" +FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226" +SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsodeviced ?= "a8abe5bbe86c5625ab4c649eae899b9a8aac4b2d" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsousaged ?= "11dbb63abb48094fab63c64de189fe99189b9f73" +SRCREV_pn-libfsobasics ?= "18d4114d295617c6fb611f3c804e1980b896fc14" SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-misc-vapi ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}" + # FSO Projects -- Misc -SRCREV_pn-dbus-hlid ?= "39e804f28808247df2573788cb99897d4d765e69" -SRCREV_pn-frameworkd ?= "a2dfde0fb46a745f5c07e6a1ab44e4b95b7dde80" -SRCREV_pn-fso-abyss ?= "8ce3c6e40c4852de7dcca502f65784f6b18ca6bf" -SRCREV_pn-fso-term ?= "e0d92222e3e5a62025089c60a625f1836c510915" -SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0" +SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb" +SRCREV_pn-frameworkd ?= "d48bd43c430322b26744e31829f9c76e9b725819" +SRCREV_pn-frameworkd-config-shr_FSO_REV = ${SRCREV_pn-frameworkd} +SRCREV_pn-fso-abyss ?= "7f271311e2e0b63235139859169bd248920ade30" +SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d" +SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6" SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" -SRCREV_pn-fso-monitord ?= "eb8fb32d52d19c5aa9284c6cc540dd40bb924c9d" -SRCREV_pn-fso-sounds ?= "cc46b55131fc07a415bf1bd62ce98f73344489cb" -SRCREV_pn-fso-specs ?= "66c992afd6c551ffd8fc63d7201c5cce269a4d77" +SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44" +SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815" +SRCREV_pn-fso-specs ?= "60eaf17a53d410c564417b226db1e6ea8ca9a2a3" SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8" -SRCREV_pn-libeflvala ?= "c566847e000fad132225aefd854b81ae713eaa82" -SRCREV_pn-libfso-glib ?= "b855b0297ff68bb505a02d9b4b13914ca558cd59" -SRCREV_pn-libframeworkd-glib ?= "680276e4cddabeb1edd088ddd421f363dd106a50" -SRCREV_pn-libgsm0710 ?= "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6" -SRCREV_pn-libgsm0710mux ?= "b74d4615374abb856441e4a416726fb3e8d7835b" -FSO_PYTHONHELPERS_SRCREV ?= "6d7f51b5189a00a07d9b88100a565f46fcb62644" +SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e" +SRCREV_pn-libfso-glib ?= "3630315a498f91106b4187e41608613520d63090" +SRCREV_pn-libframeworkd-glib ?= "f7ea17bc2a33d6f0989a71f86ccc6ed3e8051e77" +SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166" +SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693" +SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a" +FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317" SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}" SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}" -SRCREV_pn-fso-apm ?= "${FSO_PYTHONHELPERS_SRCREV}" -SRCREV_pn-vala-dbus-binding-tool-native ?= "0d221b688bfb51e0607b7f4e6e03bf96d13d5d44" -SRCREV_pn-vala-terminal ?= "2f849c5690d834a69f6c0693cc159573b3aa78d" -SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd" +SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}" +SRCREV_pn-vala-dbus-binding-tool-native ?= "324a78c0cab484535ce5a7a33436e9c62311297d" +SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad" +SRCREV_pn-vala-native ?= "2f14aed36765c842fe7b4035ba564d2c023ef0b0" SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 580702b991..9dd45fdf1e 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -12,46 +12,76 @@ # you know what that means? like... a, b, c, d, e, f, g... SRCREV_pn-accelges ?= "206" +SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02" SRCREV_pn-aircrack-ng ?= "802" +SRCREV_pn-alsa-scenarii-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1" SRCREV_pn-app-restarter ?= "4552" SRCREV_pn-assassin ?= "268" SRCREV_pn-assassin-thumbnail ?= "4690" SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768" SRCREV_pn-bfin-uclibc ?= "1857" +SRCREV_pn-blipomoko ?= "93295f36f7b45c691df247cb2a65227facf13654" SRCREV_pn-bootchart-lite ?= "4" +SRCREV_pn-bt-configure ?= "9654c88ff74bca89cf747937cbec67421d2f1cbc" SRCREV_pn-bubble-keyboard ?= "194" +SRCREV_pn-calc ?= "3f4382138b71b0c31d6722604399e12a37bcebe8" SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c" +SRCREV_pn-cdparanoia ?= "16684" +SRCREV_pn-clutter ?= "3240" SRCREV_pn-clutter-box2d ?= "3197" SRCREV_pn-clutter-cairo ?= "3210" SRCREV_pn-clutter-gst ?= "3188" +SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e" SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a" SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd" -SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e" -SRCREV_pn-clutter ?= "3240" SRCREV_pn-comic-reader ?= "54" SRCREV_pn-contact ?= "1410" SRCREV_pn-dasher-gpe ?= "1251" -SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" +SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dfu-util ?= "4160" SRCREV_pn-dfu-util-native ?= "4160" +SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953" SRCREV_pn-diversity-daemon ?= "571" SRCREV_pn-diversity-radar ?= "453" +SRCREV_pn-e-tasks ?= "14" +SRCREV_pn-e-wm- |