diff options
22 files changed, 81 insertions, 59 deletions
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index de0cee56fa..3bff27763d 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -77,9 +77,9 @@ TARGET_OS = "linux" #<>What we want on the bootstrap image (extra) #<> #<> -BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils ncurses nano wireless-tools console-tools udev \ - e2tools e2fsprogs kernel-modules spectrum-fw keymaps \ - hotplug-ng orinoco-conf" +BOOTSTRAP_EXTRA_RDEPENDS += "ncurses nano wireless-tools console-tools \ + udev e2tools e2fsprogs kernel-modules keymaps \ + wget" #<> #<>What Qte, libqte.. versions should we use. diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index b5f8606cf5..c1f918f662 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -10,8 +10,6 @@ BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules module-init-tools" EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" -USE_DEVFS = "1" - SERIAL_CONSOLE = "115200 ttySA0" include conf/machine/include/handheld-common.conf diff --git a/packages/alsa/alsa-lib_1.0.11.bb b/packages/alsa/alsa-lib_1.0.11.bb index 0da364071b..fbf1442771 100644 --- a/packages/alsa/alsa-lib_1.0.11.bb +++ b/packages/alsa/alsa-lib_1.0.11.bb @@ -25,7 +25,8 @@ do_stage() { install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ } -PACKAGES = "libasound alsa-server alsa-conf alsa-doc alsa-dev" +PACKAGES += "libasound alsa-server alsa-conf alsa-doc alsa-dev" +PACKAGES_DYNAMIC = "libasound*" FILES_libasound = "${libdir}/libasound.so*" FILES_alsa-server = "${bindir}" FILES_alsa-conf = "${datadir}" diff --git a/packages/asterisk/asterisk_1.2.9.1.bb b/packages/asterisk/asterisk_1.2.9.1.bb index 46f24c0e35..00da4ab33f 100644 --- a/packages/asterisk/asterisk_1.2.9.1.bb +++ b/packages/asterisk/asterisk_1.2.9.1.bb @@ -2,7 +2,7 @@ DESCRIPTION="The Asterisk open source software PBX" HOMEPAGE="www.asterisk.org" LICENSE="GPL" DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis popt" -PR = "r5" +PR = "r6" SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \ file://uclibc-compat-getloadavg.patch;patch=1 \ @@ -15,8 +15,8 @@ export CROSS_COMPILE_BIN="${STAGING_BINDIR}" export CROSS_COMPILE_TARGET="${STAGING_DIR}/${HOST_SYS}" export CROSS_ARCH="Linux" -export CROSS_PROC="arm" -export SUB_PROC="xscale" + +export CROSS_PROC="${TARGET_ARCH}" export MAKECMDGOALS="dont-optimize" diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index 4b1f8f68e8..ea771a334b 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -7,6 +7,7 @@ OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" INHIBIT_PACKAGE_STRIP = "1" PACKAGES = "libgcc libstdc++ libg2c libg2c-dev libgfortran libgfortran-dev" +PACKAGES_DYNAMIC = "libgcc* libstdc* libg2c* libgfortran*" PACKAGE_ARCH_libg2c = "${TARGET_ARCH}" PACKAGE_ARCH_libg2c-dev = "${TARGET_ARCH}" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 9d44190365..0e02aff176 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -199,12 +199,7 @@ python package_do_split_gconvs () { if deps != []: bb.data.setVar('RDEPENDS_%s' % pkg, " ".join(deps), d) - use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) - if use_bin: - do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='', aux_files_pattern_verbatim=binary_locales_dir + '/%s') - else: - do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') - bb.note("generation of binary locales disabled. this may break i18n!") + do_split_packages(d, locales_dir, file_regex='(.*)', output_pattern='glibc-localedata-%s', description='locale definition for %s', hook=calc_locale_deps, extra_depends='') bb.data.setVar('PACKAGES', bb.data.getVar('PACKAGES', d) + ' glibc-gconv', d) f = open(os.path.join(bb.data.getVar('WORKDIR', d, 1), "SUPPORTED"), "r") @@ -243,8 +238,12 @@ python package_do_split_gconvs () { target_arch = bb.data.getVar("TARGET_ARCH", d, 1) qemu = "qemu-%s" % target_arch pkgname = 'locale-base-' + legitimize_package_name(name) - - bb.data.setVar('RDEPENDS_%s' % pkgname, 'glibc-localedata-%s glibc-charmap-%s' % (legitimize_package_name(locale), legitimize_package_name(encoding)), d) + m = re.match("(.*)\.(.*)", name) + if m: + glibc_name = "%s.%s" % (m.group(1), m.group(2).lower().replace("-","")) + else: + glibc_name = name + bb.data.setVar('RDEPENDS_%s' % pkgname, 'glibc-binary-localedata-%s' % glibc_name, d) rprovides = 'virtual-locale-%s' % legitimize_package_name(name) m = re.match("(.*)_(.*)", name) if m: @@ -257,7 +256,7 @@ python package_do_split_gconvs () { path = bb.data.getVar("PATH", d, 1) i18npath = os.path.join(treedir, datadir, "i18n") - localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, locale) + localedef_opts = "--force --old-style --no-archive --prefix=%s --inputfile=%s/i18n/locales/%s --charmap=%s %s" % (treedir, datadir, locale, encoding, name) cmd = "PATH=\"%s\" I18NPATH=\"%s\" %s -L %s %s/bin/localedef %s" % (path, i18npath, qemu, treedir, treedir, localedef_opts) bb.note("generating locale %s (%s)" % (locale, encoding)) if os.system(cmd): @@ -276,20 +275,33 @@ python package_do_split_gconvs () { bb.build.exec_func("do_prep_locale_tree", d) # Reshuffle names so that UTF-8 is preferred over other encodings + non_utf8 = [] for l in encodings.keys(): if len(encodings[l]) == 1: output_locale(l, l, encodings[l][0]) + if encodings[l][0] != "UTF-8": + non_utf8.append(l) else: if "UTF-8" in encodings[l]: output_locale(l, l, "UTF-8") encodings[l].remove("UTF-8") + else: + non_utf8.append(l) for e in encodings[l]: - output_locale('%s-%s' % (l, e), l, e) + output_locale('%s.%s' % (l, e), l, e) + + if non_utf8 != []: + bb.note("the following locales are supported only in legacy encodings:") + bb.note(" " + " ".join(non_utf8)) use_bin = bb.data.getVar("GLIBC_INTERNAL_USE_BINARY_LOCALE", d, 1) if use_bin: bb.note("collecting binary locales from locale tree") bb.build.exec_func("do_collect_bins_from_locale_tree", d) + do_split_packages(d, binary_locales_dir, file_regex='(.*)', output_pattern='glibc-binary-localedata-%s', description='binary locale definition for %s', extra_depends='', allow_dirs=True) + else: + bb.note("generation of binary locales disabled. this may break i18n!") + } # We want to do this indirection so that we can safely 'return' diff --git a/packages/glibc/glibc_2.2.5.bb b/packages/glibc/glibc_2.2.5.bb index b42a85ef02..fd9a356436 100644 --- a/packages/glibc/glibc_2.2.5.bb +++ b/packages/glibc/glibc_2.2.5.bb @@ -1,5 +1,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r8" +PR = "r9" DESCRIPTION = "GNU C Library" HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" diff --git a/packages/glibc/glibc_2.3.2+cvs20040726.bb b/packages/glibc/glibc_2.3.2+cvs20040726.bb index d6a8c6a276..7e064ed444 100644 --- a/packages/glibc/glibc_2.3.2+cvs20040726.bb +++ b/packages/glibc/glibc_2.3.2+cvs20040726.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r20" +PR = "r21" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.2.bb b/packages/glibc/glibc_2.3.2.bb index 288251191f..855560adf3 100644 --- a/packages/glibc/glibc_2.3.2.bb +++ b/packages/glibc/glibc_2.3.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" -PR = "r9" +PR = "r10" DEFAULT_PREFERENCE_sh3 = "-99" diff --git a/packages/glibc/glibc_2.3.3+cvs20041128.bb b/packages/glibc/glibc_2.3.3+cvs20041128.bb index 78b190d16d..05a86fd7ab 100644 --- a/packages/glibc/glibc_2.3.3+cvs20041128.bb +++ b/packages/glibc/glibc_2.3.3+cvs20041128.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r5" +PR = "r6" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.3+cvs20050221.bb b/packages/glibc/glibc_2.3.3+cvs20050221.bb index ce60ba1c01..3fe3bdbecc 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050221.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050221.bb @@ -8,7 +8,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r5" +PR = "r6" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.3+cvs20050420.bb b/packages/glibc/glibc_2.3.3+cvs20050420.bb index a3bf9bc5fa..d00c31a723 100644 --- a/packages/glibc/glibc_2.3.3+cvs20050420.bb +++ b/packages/glibc/glibc_2.3.3+cvs20050420.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE_i586 = "0" DEFAULT_PREFERENCE_sh3 = "-99" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs" -PR = "r3" +PR = "r4" GLIBC_ADDONS ?= "linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.3.3.bb b/packages/glibc/glibc_2.3.3.bb index 158fcaea83..7ade9573b2 100644 --- a/packages/glibc/glibc_2.3.3.bb +++ b/packages/glibc/glibc_2.3.3.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" DESCRIPTION = "GNU C Library" HOMEPAGE = "http://www.gnu.org/software/libc/libc.html" LICENSE = "LGPL" diff --git a/packages/glibc/glibc_2.3.5+cvs20050627.bb b/packages/glibc/glibc_2.3.5+cvs20050627.bb index 0702500204..9244c3584a 100644 --- a/packages/glibc/glibc_2.3.5+cvs20050627.bb +++ b/packages/glibc/glibc_2.3.5+cvs20050627.bb @@ -7,7 +7,7 @@ MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" SRCDATE = "20050627" -PR = "r10" +PR = "r11" GLIBC_ADDONS ?= "ports,linuxthreads" GLIBC_EXTRA_OECONF ?= "" diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index 2d37ba93fb..f138a9b807 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -4,7 +4,7 @@ LICENSE = "LGPL" SECTION = "libs" PRIORITY = "required" DEFAULT_PREFERENCE = "-1" -PR = "r8" +PR = "r9" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include" diff --git a/packages/glibc/glibc_cvs.bb b/packages/glibc/glibc_cvs.bb index c3c9fb0781..2f018ab21f 100644 --- a/packages/glibc/glibc_cvs.bb +++ b/packages/glibc/glibc_cvs.bb @@ -6,7 +6,7 @@ PRIORITY = "required" MAINTAINER = "Phil Blundell <pb@handhelds.org>" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5" -PR = "r3" +PR = "r4" PV = "2.3.5+cvs${SRCDATE}" GLIBC_ADDONS ?= "ports,linuxthreads" diff --git a/packages/gnome/libsoup_2.2.93.bb b/packages/gnome/libsoup_2.2.93.bb index 9ee030d5c9..33a4f16d06 100644 --- a/packages/gnome/libsoup_2.2.93.bb +++ b/packages/gnome/libsoup_2.2.93.bb @@ -7,9 +7,10 @@ MAINTAINER = "Chris Lord <chris@openedhand.com>" inherit autotools pkgconfig +PACKAGES_DYNAMIC = "libsoup-2.2*" FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir} ${libdir}" -FILES_${PN}-doc = "${datadir}" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" do_stage() { autotools_stage_all diff --git a/packages/gnutls/gnutls_1.4.0.bb b/packages/gnutls/gnutls_1.4.0.bb index 3c48bc95ff..7a934a8131 100644 --- a/packages/gnutls/gnutls_1.4.0.bb +++ b/packages/gnutls/gnutls_1.4.0.bb @@ -11,6 +11,7 @@ SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \ inherit autotools binconfig PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin" +PACKAGES_DYNAMIC = "libgnutls*" FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*" FILES_${PN} = "${libdir}/libgnutls.so.*" diff --git a/packages/libmimedir/libmimedir_0.4.0-20060804.bb b/packages/libmimedir/libmimedir_0.4.0-20060804.bb index f893bccaf2..f3adcc22f4 100644 --- a/packages/libmimedir/libmimedir_0.4.0-20060804.bb +++ b/packages/libmimedir/libmimedir_0.4.0-20060804.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "intltool-native glib-2.0" -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "5" SRCDATE = "20060804" PV = "0.4.0+cvs${SRCDATE}" @@ -23,6 +23,6 @@ do_stage() { autotools_stage_all } -PACKAGES += libmimedir-utils -FILES_libmimedir-utils = "${bindir}" -FILES_${PN} = "${libdir}" +PACKAGES =+ libmimedir-utils +PACKAGES_DYNAMIC = "libmimedir-0.4*" +FILES_libmimedir-utils = "${bindir}/" diff --git a/packages/linux/handhelds-sa-2.6_cvs.bb b/packages/linux/handhelds-sa-2.6_cvs.bb index bdc2f86633..41cab94908 100644 --- a/packages/linux/handhelds-sa-2.6_cvs.bb +++ b/packages/linux/handhelds-sa-2.6_cvs.bb @@ -4,7 +4,7 @@ MAINTAINER = "Alex Lange <chicken@handhelds.org>" LICENSE = "GPL" # COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = '(h3600|simpad)' +COMPATIBLE_MACHINE = '(h3600|simpad|jornada56x)' FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/handhelds-sa-${PV}" diff --git a/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime b/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime index 277a2d92d9..4572f7cf9a 100644 --- a/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime +++ b/packages/linux/linux-jlime-jornada6xx-2.6.17/defconfig_jlime @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17 -# Tue Aug 1 11:50:57 2006 +# Sun Aug 13 16:30:04 2006 # CONFIG_SUPERH=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -36,7 +36,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_INITRAMFS_SOURCE="" CONFIG_UID16=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -# CONFIG_EMBEDDED is not set +CONFIG_EMBEDDED=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y @@ -425,7 +425,7 @@ CONFIG_WIRELESS_EXT=y # Generic Driver Options # CONFIG_STANDALONE=y -CONFIG_PREVENT_FIRMWARE_BUILD=y +# CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=y # @@ -446,7 +446,13 @@ CONFIG_FW_LOADER=y # # Plug and Play support # -# CONFIG_PNP is not set +CONFIG_PNP=y +# CONFIG_PNP_DEBUG is not set + +# +# Protocols +# +# CONFIG_ISAPNP is not set # # Block devices @@ -483,6 +489,7 @@ CONFIG_BLK_DEV_IDECS=y # IDE chipset support/bugfixes # CONFIG_IDE_GENERIC=y +# CONFIG_BLK_DEV_IDEPNP is not set CONFIG_IDE_SH=y # CONFIG_IDE_ARM is not set # CONFIG_IDE_CHIPSETS is not set @@ -527,6 +534,7 @@ CONFIG_DUMMY=y # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set +# CONFIG_NET_SB1000 is not set # # ARCnet devices @@ -544,11 +552,7 @@ CONFIG_DUMMY=y CONFIG_NET_ETHERNET=y CONFIG_MII=y # CONFIG_STNIC is not set -CONFIG_NET_VENDOR_3COM=y -# CONFIG_EL1 is not set -# CONFIG_EL2 is not set -# CONFIG_EL16 is not set -# CONFIG_EL3 is not set +# CONFIG_NET_VENDOR_3COM is not set # CONFIG_NET_VENDOR_SMC is not set # CONFIG_SMC91X is not set # CONFIG_NET_VENDOR_RACAL is not set @@ -583,29 +587,33 @@ CONFIG_NET_WIRELESS_RTNETLINK=y # # CONFIG_STRIP is not set # CONFIG_ARLAN is not set -# CONFIG_WAVELAN is not set -# CONFIG_PCMCIA_WAVELAN is not set -# CONFIG_PCMCIA_NETWAVE is not set +CONFIG_WAVELAN=m +CONFIG_PCMCIA_WAVELAN=m +CONFIG_PCMCIA_NETWAVE=m # # Wireless 802.11 Frequency Hopping cards support # -# CONFIG_PCMCIA_RAYCS is not set +CONFIG_PCMCIA_RAYCS=m # # Wireless 802.11b ISA/PCI cards support # -CONFIG_HERMES=y -# CONFIG_ATMEL is not set +CONFIG_HERMES=m +CONFIG_ATMEL=m # # Wireless 802.11b Pcmcia/Cardbus cards support # -CONFIG_PCMCIA_HERMES=y -# CONFIG_PCMCIA_SPECTRUM is not set -# CONFIG_AIRO_CS is not set -# CONFIG_PCMCIA_WL3501 is not set -# CONFIG_HOSTAP is not set +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m +CONFIG_AIRO_CS=m +CONFIG_PCMCIA_ATMEL=m +CONFIG_PCMCIA_WL3501=m +CONFIG_HOSTAP=m +CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y +CONFIG_HOSTAP_CS=m CONFIG_NET_WIRELESS=y # diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index d35f07f30a..8514ceb717 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -30,7 +30,7 @@ RDEPENDS_task-sdk-base := "\ freetype-dev \ glib-2.0-dev \ gstreamer-dev \ - ice-dev \ + libice-dev \ ipkg-dev \ jpeg-dev \ libapm-dev \ @@ -43,7 +43,7 @@ RDEPENDS_task-sdk-base := "\ libgpg-error-dev \ libidl-dev \ libiw-dev \ - libmimedir-3.3-dev \ + libmimedir-0.4-dev \ libpcap-dev \ libpixman-dev \ libpng-dev \ @@ -61,7 +61,7 @@ RDEPENDS_task-sdk-base := "\ readline-dev \ sqlite-dev \ zlib-dev \ - xmu-dev" + libxmu-dev" RDEPENDS_task-sdk-x11 := "\ atk-dev \ |