Merge branch 'master' of ssh://gitserver@git.pokylinux.org/poky

This commit is contained in:
Richard Purdie
2010-01-07 17:01:35 +00:00
14 changed files with 1903 additions and 17 deletions

View File

@@ -510,5 +510,6 @@ Rerun configure task after fixing this. The path was '%s'""" % root)
for config in configs:
gnu = "grep \"^[[:space:]]*AM_GNU_GETTEXT\" %s >/dev/null" % config
if os.system(gnu) == 0:
bb.fatal("Gettext required but not in DEPENDS for file %s" % config)
bb.fatal("""Gettext required but not in DEPENDS for file %s.
Missing inherit gettext?""" % config)
}

View File

@@ -0,0 +1 @@
TARGET_CC_ARCH = "-march=mips32"

View File

@@ -0,0 +1,15 @@
#@TYPE: Machine
#@NAME: qemu MIPS (big-endian) Emulator setup
#@DESCRIPTION: Machine configuration for running an MIPS r4k platform system under qemu emulation
TARGET_ARCH = "mips"
require conf/machine/include/qemu.inc
require conf/machine/include/tune-mips32.inc
KERNEL_IMAGETYPE = "vmlinux.bin"
SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"

View File

@@ -2,9 +2,9 @@ LICENSE = "LGPL"
DESCRIPTION = "Implementation of the Stringprep, Punycode and IDNA specifications defined by the IETF Internationalized Domain Names (IDN) working group."
SECTION = "libs"
PRIORITY = "optional"
PR = "r0"
PR = "r1"
inherit pkgconfig autotools_stage
inherit pkgconfig autotools gettext
SRC_URI = "http://josefsson.org/libidn/releases/${P}.tar.gz"

File diff suppressed because it is too large Load Diff

View File

@@ -14,8 +14,8 @@ BASRC = "http://www.orca.cx/zaurus/patches"
CHSRC = "http://oz.drigon.com/patches"
TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches"
COMPATIBLE_HOST = "(arm|i.86).*-linux"
COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86|bootcdx86|htcuniversal|zylonite)'
COMPATIBLE_HOST = "(arm|i.86|mips).*-linux"
COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86|qemumips|bootcdx86|htcuniversal|zylonite)'
KERNEL_CUSTOM_NAME ?= ""
KERNEL_DEPLOY_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${KERNEL_CUSTOM_NAME}${MACHINE}-${DATETIME}.bin"

View File

@@ -1,11 +1,12 @@
require linux-rp.inc
PR = "r11"
PR = "r12"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_qemux86 = "1"
DEFAULT_PREFERENCE_qemumips = "1"
COMPATIBLE_MACHINE = '(qemux86)'
COMPATIBLE_MACHINE = '(qemux86|qemumips)'
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -19,6 +20,7 @@ COMPATIBLE_MACHINE = '(qemux86)'
# Patches submitted upstream are towards top of this list
# Hacks should clearly named and at the bottom
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 \
file://defconfig-qemux86"
file://defconfig-qemux86 \
file://defconfig-qemumips"
S = "${WORKDIR}/linux-2.6.29"

View File

@@ -1,5 +1,5 @@
HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/"
PR = "r7"
PR = "r8"
SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-1.0.2.tar.bz2 \
file://disable_crossbinary.patch;patch=1 "
@@ -12,7 +12,7 @@ CFLAGS_append = " -fPIC "
S = "${WORKDIR}/Linux-PAM-${PV}"
inherit autotools_stage pkgconfig
inherit autotools pkgconfig gettext
FILES_${PN}-dbg += "${base_libdir}/security/.debug"
FILES_${PN}-dbg += "${base_libdir}/security/pam_filter/.debug"

View File

@@ -4,7 +4,7 @@ LICENSE = "MIT-X"
HOMEPAGE = "http://xcb.freedesktop.org"
PARALLEL_MAKE = ""
DEPENDS = "xcb-proto xproto libxau libxslt-native"
DEPENDS = "xcb-proto xproto libxau libxslt-native xcb-proto-native"
# DEPENDS += "xsltproc-native gperf-native"
SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2"
@@ -40,7 +40,7 @@ FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*"
FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*"
FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*"
inherit autotools_stage pkgconfig
inherit autotools pkgconfig
# XCBPROTO_XCBINCLUDEDIR is setup based on `pkg-config --variable=xcbincludedir xcb-proto`
# but the xcbincludedir variable doesn't point into the staging area, so it needs some

View File

@@ -5,9 +5,12 @@ HOMEPAGE = "http://xcb.freedesktop.org"
SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2"
inherit autotools_stage pkgconfig
inherit autotools pkgconfig
FILES_${PN}-dev += "${datadir}/xcb/*.xml"
RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})"
DEPENDS_append_virtclass-native = " python-native"
BBCLASSEXTEND = "native"

View File

@@ -1,2 +1,2 @@
include xcb-proto.inc
PR = "r1"
PR = "r2"

View File

@@ -2,9 +2,7 @@ DEFAULT_PREFERENCE = "-1"
include xcb-proto.inc
PV = "1.2+gitr${SRCREV}"
PR = "r1"
SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto;protocol=git"
S = "${WORKDIR}/git"
DEPENDS_append_virtclass-native = " python-native"
BBCLASSEXTEND = "native"

27
meta/site/mips-common Normal file
View File

@@ -0,0 +1,27 @@
ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes}
ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
# screen
screen_cv_sys_bcopy_overlap=${screen_cv_sys_bcopy_overlap=no}
screen_cv_sys_memcpy_overlap=${screen_cv_sys_memcpy_overlap=no}
screen_cv_sys_memmove_overlap=${screen_cv_sys_memmove_overlap=no}
screen_cv_sys_fifo_broken_impl=${screen_cv_sys_fifo_broken_impl=yes}
screen_cv_sys_fifo_usable=${screen_cv_sys_fifo_usable=yes}
screen_cv_sys_select_broken_retval=${screen_cv_sys_select_broken_retval=no}
screen_cv_sys_sockets_nofs=${screen_cv_sys_sockets_nofs=no}
screen_cv_sys_sockets_usable=${screen_cv_sys_sockets_usable=yes}
screen_cv_sys_terminfo_used=${screen_cv_sys_terminfo_used=yes}
# ORBit2
ac_cv_alignof_CORBA_octet=1
ac_cv_alignof_CORBA_boolean=1
ac_cv_alignof_CORBA_char=1
ac_cv_alignof_CORBA_wchar=2
ac_cv_alignof_CORBA_short=2
ac_cv_alignof_CORBA_long=4
ac_cv_alignof_CORBA_long_long=8
ac_cv_alignof_CORBA_float=4
ac_cv_alignof_CORBA_double=8
ac_cv_alignof_CORBA_long_double=8
ac_cv_alignof_CORBA_pointer=4
ac_cv_alignof_CORBA_struct=1

119
meta/site/mips-linux Normal file
View File

@@ -0,0 +1,119 @@
ac_cv_func_getpgrp_void=${ac_cv_func_getpgrp_void=yes}
ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
# tslib, others
ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes}
# bash
ac_cv_c_long_double=${ac_cv_c_long_double=no}
bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
# openssh
ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no}
ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no}
ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes}
ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=no}
ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_have_space_d_name_in_struct_dirent=yes}
# fget
compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes}
# glib
glib_cv___va_copy=${glib_cv___va_copy=yes}
glib_cv_has__inline=${glib_cv_has__inline=yes}
glib_cv_has__inline__=${glib_cv_has__inline__=yes}
glib_cv_hasinline=${glib_cv_hasinline=yes}
glib_cv_long_long_format=${glib_cv_long_long_format=ll}
glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=no}
glib_cv_sane_realloc=${glib_cv_sane_realloc=yes}
glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24}
glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4}
glib_cv_stack_grows=${glib_cv_stack_grows=no}
glib_cv_uscore=${glib_cv_uscore=no}
glib_cv_va_copy=${glib_cv_va_copy=yes}
glib_cv_va_val_copy=${glib_cv_va_val_copy=yes}
# glib-2.0
glib_cv_stack_grows=${glib_cv_stack_grows=no}
utils_cv_sys_open_max=${utils_cv_sys_open_max=1015}
ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes}
ac_cv_func_posix_getgrgid_r=${ac_cv_func_posix_getgrgid_r=yes}
# libpcap
ac_cv_linux_vers=${ac_cv_linux_vers=2}
ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes}
# slrn
slrn_cv___va_copy=${slrn_cv___va_copy=yes}
slrn_cv_va_copy=${slrn_cv_va_copy=yes}
slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes}
# startup-notification
lf_cv_sane_realloc=${lf_cv_sane_realloc=yes}
# libidl
libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll}
# ncftp
ac_cv_func_setpgrp_void=${ac_cv_func_setpgrp_void=yes}
wi_cv_struct_timeval_tv_sec=${wi_cv_struct_timeval_tv_sec=long}
wi_cv_struct_timeval_tv_usec=${wi_cv_struct_timeval_tv_usec=long}
wi_cv_unix_domain_sockets=${wi_cv_unix_domain_sockets=yes}
# rp-pppoe
rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev}
# db3
db_cv_align_t=${db_cv_align_t='unsigned long long'}
db_cv_alignp_t=${db_cv_alignp_t='unsigned long'}
db_cv_mutex=${db_cv_mutex=POSIX/pthreads/library}
db_cv_posixmutexes=${db_cv_posixmutexes=no}
db_cv_uimutexes=${db_cv_uimutexes=no}
db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes}
db_cv_sprintf_count=${db_cv_sprintf_count=yes}
db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar}
db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod}
db_cv_path_cp=${db_cv_path_cp=/bin/cp}
db_cv_path_ln=${db_cv_path_ln=/bin/ln}
db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir}
db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib}
db_cv_path_rm=${db_cv_path_rm=/bin/rm}
db_cv_path_sh=${db_cv_path_sh=/bin/sh}
db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip}
# rrdtool
rd_cv_ieee_works=${rd_cv_ieee_works=yes}
# ac_cv_path_PERL=${ac_cv_path_PERL=no}
# gettext
am_cv_func_working_getline=${am_cv_func_working_getline=yes}
# samba
samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes}
# vim
ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
# sudo
sudo_cv_uid_t_len=${sudo_cv_uid_t_len=10}
# intercom
ac_cv_func_fnmatch_works=${ac_cv_func_fnmatch_works=yes}
# lmbench
ac_cv_uint=${ac_cv_unit=yes}
# D-BUS
ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes}
# mono
cv_mono_sizeof_sunpath=108
mono_cv_sizeof_sunpath=108
mono_cv_uscore=${mono_cv_uscore=no}
# popt
ac_cv_va_copy=${ac_cv_va_copy=yes}
ac_cv___va_copy=${ac_cv___va_copy=yes}