diff options
32 files changed, 586 insertions, 180 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 1794382699..7526dff65e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -315,7 +315,9 @@ oe_libinstall() { # stop libtool using the final directory name for libraries # in staging: __runcmd rm -f $destpath/$libname.la - __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la + __runcmd sed -e 's/^installed=yes$/installed=no/' \ + -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \ + $dotlai >$destpath/$libname.la else __runcmd install -m 0644 $dotlai $destpath/$libname.la fi @@ -702,7 +704,7 @@ do_populate_staging[dirs] = "${STAGING_DIR_TARGET}/${layout_bindir} ${STAGING_DI addtask populate_staging after do_install python do_populate_staging () { - bb.build.exec_func('do_stage', d) + bb.build.exec_func('do_stage', d) } addtask install after do_compile @@ -744,7 +746,7 @@ def explode_deps(s): def packaged(pkg, d): import os, bb - return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK) + return os.access(get_subpkgedata_fn(pkg, d) + '.packaged', os.R_OK) def read_pkgdatafile(fn): pkgdata = {} @@ -768,16 +770,23 @@ def read_pkgdatafile(fn): return pkgdata +def get_subpkgedata_fn(pkg, d): + import bb, os + archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ") + archs.reverse() + for arch in archs: + fn = bb.data.expand('${STAGING_DIR}/pkgdata/' + arch + '${TARGET_VENDOR}-${TARGET_OS}/runtime/%s' % pkg, d) + if os.path.exists(fn): + return fn + return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) + def has_subpkgdata(pkg, d): import bb, os - fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) - return os.access(fn, os.R_OK) + return os.access(get_subpkgedata_fn(pkg, d), os.R_OK) def read_subpkgdata(pkg, d): import bb, os - fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) - return read_pkgdatafile(fn) - + return read_pkgdatafile(get_subpkgedata_fn(pkg, d)) def has_pkgdata(pn, d): import bb, os diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 6e5480a2a0..89cb3e9569 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -20,6 +20,8 @@ CXXFLAGS = "${BUILD_CFLAGS}" LDFLAGS = "${BUILD_LDFLAGS}" LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}" +TOOLCHAIN_OPTIONS = "" + # Overrides for paths # Path prefixes diff --git a/classes/debian.bbclass b/classes/debian.bbclass index a38f10d629..dd0789adae 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -1,5 +1,3 @@ -STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian" - # Debian package renaming only occurs when a package is built # We therefore have to make sure we build all runtime packages # before building the current package to make the packages runtime diff --git a/classes/package.bbclass b/classes/package.bbclass index 6c61f7bdda..67aeb33a13 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -34,9 +34,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst return packages = bb.data.getVar('PACKAGES', d, 1).split() - if not packages: - # nothing to do - return if postinst: postinst = '#!/bin/sh\n' + postinst + '\n' @@ -189,42 +186,15 @@ def runstrip(file, d): # Package data handling routines # -STAGING_PKGMAPS_DIR ?= "${STAGING_DIR}/pkgmaps" - -def add_package_mapping (pkg, new_name, d): - import bb, os - - def encode(str): - import codecs - c = codecs.getencoder("string_escape") - return c(str)[0] - - pmap_dir = bb.data.getVar('STAGING_PKGMAPS_DIR', d, 1) - - bb.mkdirhier(pmap_dir) - - data_file = os.path.join(pmap_dir, pkg) - - f = open(data_file, 'w') - f.write("%s\n" % encode(new_name)) - f.close() - def get_package_mapping (pkg, d): import bb, os - def decode(str): - import codecs - c = codecs.getdecoder("string_escape") - return c(str)[0] + data = read_subpkgdata(pkg, d) + key = "PKG_%s" % pkg - data_file = bb.data.expand("${STAGING_PKGMAPS_DIR}/%s" % pkg, d) + if key in data: + return data[key] - if os.access(data_file, os.R_OK): - f = file(data_file, 'r') - lines = f.readlines() - f.close() - for l in lines: - return decode(l).strip() return pkg def runtime_mapping_rename (varname, d): @@ -258,9 +228,6 @@ python package_do_split_locales() { return packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() - if not packages: - bb.debug(1, "no packages to build; not splitting locales") - return datadir = bb.data.getVar('datadir', d, 1) if not datadir: @@ -410,9 +377,6 @@ python populate_packages () { bb.mkdirhier(dvar) packages = bb.data.getVar('PACKAGES', d, 1) - if not packages: - bb.debug(1, "PACKAGES not defined, nothing to package") - return pn = bb.data.getVar('PN', d, 1) if not pn: @@ -516,8 +480,6 @@ python populate_packages () { pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1) if pkgname is None: bb.data.setVar('PKG_%s' % pkg, pkg, d) - else: - add_package_mapping(pkg, pkgname, d) dangling_links = {} pkg_files = {} @@ -604,6 +566,8 @@ python emit_pkgdata() { sf.close() allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, 1) + if not allow_empty: + allow_empty = bb.data.getVar('ALLOW_EMPTY', d, 1) root = "%s/install/%s" % (workdir, pkg) os.chdir(root) g = glob('*') @@ -903,10 +867,7 @@ python package_depchains() { prefixes = (bb.data.getVar('DEPCHAIN_PRE', d, 1) or '').split() def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d): - def packaged(pkg, d): - return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK) - - #bb.note('rdepends for %s is %s' % (base, rdepends)) + #bb.note('rdepends for %s is %s' % (base, rdepends)) rreclist = explode_deps(bb.data.getVar('RRECOMMENDS_' + pkg, d, 1) or bb.data.getVar('RRECOMMENDS', d, 1) or "") diff --git a/classes/packaged-staging2.bbclass b/classes/packaged-staging2.bbclass new file mode 100644 index 0000000000..29ce72d65c --- /dev/null +++ b/classes/packaged-staging2.bbclass @@ -0,0 +1,229 @@ +# +# Populate builds using prebuilt packages where possible to speed up builds +# and allow staging to be reconstructed. +# +# To use it add that line to conf/local.conf: +# +# INHERIT = "packaged-staging" + +python () { + import bb + if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('image', d) and not bb.data.inherits_class('cross', d) and not bb.data.inherits_class('sdk', d): + deps = bb.data.getVarFlag('do_populate_staging', 'depends', d) or "" + deps += " stagemanager-native:do_populate_staging" + bb.data.setVarFlag('do_populate_staging', 'depends', deps, d) + + deps = bb.data.getVarFlag('do_prepackaged_stage', 'depends', d) or "" + deps += " ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" + bb.data.setVarFlag('do_prepackaged_stage', 'depends', deps, d) + else: + bb.data.setVar("PSTAGING_DISABLED", "1", d) +} + +export PSTAGING_DISABLED = "0" + +DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage" + +PSTAGE_BUILD_CMD = "${IPKGBUILDCMD}" +PSTAGE_INSTALL_CMD = "ipkg-cl install -force-depends -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}" +PSTAGE_UPDATE_CMD = "ipkg-cl update -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}" +PSTAGE_REMOVE_CMD = "ipkg-cl remove -force-depends -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}" +PSTAGE_LIST_CMD = "ipkg-cl list_installed -f ${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf -o ${TMPDIR}" +PSTAGE_PKGNAME = "staging-${PN}_${PV}-${PR}_${MULTIMACH_ARCH}.ipk" + +PSTAGE_TMPDIR_STAGE = "${WORKDIR}/staging-pkg" + +do_clean_append() { + """ + Clear the build and temp directories + """ + bb.note("Uninstalling package from staging...") + path = bb.data.getVar("PATH", d, 1) + removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1) + removepkg = bb.data.expand("staging-${PN}", d) + ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg)) + if ret != 0: + bb.note("Failure removing staging package") + + stagepkg = bb.data.expand("${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME}", d) + bb.note("Removing staging package %s" % stagepkg) + #os.system('rm -rf ' + stagepkg) +} + +staging_helper () { + #assemble appropriate ipkg.conf + conffile=${DEPLOY_DIR_PSTAGE}/ipkg-${MACHINE}.conf + mkdir -p ${DEPLOY_DIR_PSTAGE}/pstaging_lists + if [ ! -e $conffile ]; then + ipkgarchs="${BUILD_ARCH} all any noarch ${TARGET_ARCH} ${PACKAGE_ARCHS} ${PACKAGE_EXTRA_ARCHS} ${MACHINE}" + priority=1 + for arch in $ipkgarchs; do + echo "arch $arch $priority" >> $conffile + priority=$(expr $priority + 5) + done + echo "src oe-staging file:${DEPLOY_DIR_PSTAGE}" >> $conffile + + OLD_PWD=`pwd` + cd ${DEPLOY_DIR_PSTAGE} + ipkg-make-index -p Packages . + cd ${OLD_PWD} + + ${PSTAGE_UPDATE_CMD} + fi +} + +python do_prepackaged_stage () { + import os + + if bb.data.getVar("PSTAGING_DISABLED", d, 1) == "1": + bb.build.make_stamp("do_prepackaged_stage", d) + return + + bb.note("Uninstalling any existing package from staging...") + path = bb.data.getVar("PATH", d, 1) + removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1) + removepkg = bb.data.expand("staging-${PN}", d) + lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) + ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, removepkg)) + bb.utils.unlockfile(lf) + if ret != 0: + bb.note("Failure attempting to remove staging package") + + stagepkg = bb.data.expand("${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME}", d) + + if os.path.exists(stagepkg): + bb.note("Following speedup\n") + path = bb.data.getVar("PATH", d, 1) + installcmd = bb.data.getVar("PSTAGE_INSTALL_CMD", d, 1) + + bb.build.exec_func("staging_helper", d) + + bb.debug(1, "Staging stuff already packaged, using that instead") + lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) + ret = os.system("PATH=\"%s\" %s %s" % (path, installcmd, stagepkg)) + bb.utils.unlockfile(lf) + if ret != 0: + bb.note("Failure installing prestage package") + + bb.build.make_stamp("do_prepackaged_stage", d) + bb.build.make_stamp("do_fetch", d) + bb.build.make_stamp("do_unpack", d) + bb.build.make_stamp("do_munge", d) + bb.build.make_stamp("do_patch", d) + bb.build.make_stamp("do_configure", d) + bb.build.make_stamp("do_qa_configure", d) + bb.build.make_stamp("do_rig_locales", d) + bb.build.make_stamp("do_compile", d) + bb.build.make_stamp("do_install", d) + bb.build.make_stamp("do_deploy", d) + bb.build.make_stamp("do_package", d) + bb.build.make_stamp("do_populate_staging", d) + bb.build.make_stamp("do_package_write_deb", d) + bb.build.make_stamp("do_package_write_ipk", d) + bb.build.make_stamp("do_package_write", d) + bb.build.make_stamp("do_package_stage", d) + bb.build.make_stamp("do_qa_staging", d) + + else: + bb.build.make_stamp("do_prepackaged_stage", d) +} +do_prepackaged_stage[cleandirs] = "${PSTAGE_TMPDIR_STAGE}" +do_prepackaged_stage[selfstamp] = "1" +addtask prepackaged_stage before do_fetch + +populate_staging_preamble () { + if [ "$PSTAGING_DISABLED" != "1" ]; then + #mkdir -p ${DEPLOY_DIR_PSTAGE} + + stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u + stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u + fi +} + +populate_staging_postamble () { + if [ "$PSTAGING_DISABLED" != "1" ]; then + # list the packages currently installed in staging + ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list + + set +e + stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u -d ${PSTAGE_TMPDIR_STAGE}/staging + stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross + set -e + fi +} + +do_populate_staging[lockfiles] = "${STAGING_DIR}/staging.lock" +do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}" +python do_populate_staging_prepend() { + bb.build.exec_func("populate_staging_preamble", d) +} + +python do_populate_staging_append() { + bb.build.exec_func("populate_staging_postamble", d) +} + + +staging_packager () { + + mkdir -p ${PSTAGE_TMPDIR_STAGE}/CONTROL + + echo "Package: staging-${PN}" > ${PSTAGE_TMPDIR_STAGE}/CONTROL/control + echo "Version: ${PV}-${PR}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control + echo "Description: ${DESCRIPTION}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control + echo "Section: ${SECTION}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control + echo "Priority: Optional" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control + echo "Maintainer: ${MAINTAINER}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control + echo "Architecture: ${MULTIMACH_ARCH}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control + echo "Source: ${SRC_URI}" >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control + + ${PSTAGE_BUILD_CMD} ${PSTAGE_TMPDIR_STAGE} ${DEPLOY_DIR_PSTAGE} + ${PSTAGE_INSTALL_CMD} ${DEPLOY_DIR_PSTAGE}/${PSTAGE_PKGNAME} +} + +python do_package_stage () { + if bb.data.getVar("PSTAGING_DISABLED", d, 1) == "1": + return + + bb.build.exec_func("read_subpackage_metadata", d) + packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() + if len(packages) > 0: + stagepath = bb.data.getVar("PSTAGE_TMPDIR_STAGE", d, 1) + if bb.data.inherits_class('package_ipk', d): + ipkpath = os.path.join(stagepath, "deploy", "ipk") + bb.mkdirhier(ipkpath) + if bb.data.inherits_class('package_deb', d): + debpath = os.path.join(stagepath, "deploy", "deb") + bb.mkdirhier(debpath) + + for pkg in packages: + pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1) + if not pkgname: + pkgname = pkg + arch = bb.data.getVar('PACKAGE_ARCH_%s' % pkg, d, 1) + if not arch: + arch = bb.data.getVar('PACKAGE_ARCH', d, 1) + if not packaged(pkg, d): + continue + if bb.data.inherits_class('package_ipk', d): + srcname = bb.data.expand(pkgname + "_${PV}-${PR}_" + arch + ".ipk", d) + srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d) + if not os.path.exists(srcfile): + bb.fatal("Package %s does not exist yet it should" % srcfile) + bb.copyfile(srcfile, ipkpath + "/" + srcname) + if bb.data.inherits_class('package_deb', d): + if arch == 'all': + srcname = bb.data.expand(pkgname + "_${PV}-${PR}_all.deb", d) + else: + srcname = bb.data.expand(pkgname + "_${PV}-${PR}_${DPKG_ARCH}.deb", d) + srcfile = bb.data.expand("${DEPLOY_DIR_DEB}/" + arch + "/" + srcname, d) + if not os.path.exists(srcfile): + bb.fatal("Package %s does not exist yet it should" % srcfile) + bb.copyfile(srcfile, debpath + "/" + srcname) + bb.build.exec_func("staging_helper", d) + lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d)) + bb.build.exec_func("staging_packager", d) + bb.utils.unlockfile(lf) +} + +addtask package_stage after do_package_write_ipk do_package_write_deb do_package_write do_populate_staging before do_build + diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index c41a3ff369..a3b67b5798 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -25,6 +25,7 @@ def get_siteinfo_list(d): "armeb-linux-gnueabi": "endian-big bit-32 common-glibc arm-common armeb-linux",\ "armeb-linux-uclibc": "endian-big bit-32 common-uclibc arm-common",\ "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\ + "arm-darwin": "endian-little bit-32 common-darwin",\ "arm-linux": "endian-little bit-32 common-glibc arm-common",\ "arm-linux-gnueabi": "endian-little bit-32 common-glibc arm-common arm-linux",\ "arm-linux-uclibc": "endian-little bit-32 common-uclibc arm-common",\ diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9d5d54bfb8..123d9ce7a7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -311,12 +311,13 @@ export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbi ################################################################## CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}" +TOOLCHAIN_OPTIONS = "" -export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" -export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}" -export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}" -export CPP = "${HOST_PREFIX}gcc -E" -export LD = "${HOST_PREFIX}ld" +export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS}" +export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS}" export CCLD = "${CC}" export AR = "${HOST_PREFIX}ar" export AS = "${HOST_PREFIX}as" diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc index bc3b49c7c1..743b7ad362 100644 --- a/conf/machine/include/ixp4xx.inc +++ b/conf/machine/include/ixp4xx.inc @@ -3,7 +3,7 @@ #@DESCRIPTION: genric machine configuration for ixp4xx platforms # Set default for nslu2 - can be overridden for machines with other features. -MACHINE_FEATURES ?= "kernel26 usbhost ext2" +MACHINE_FEATURES ?= "kernel26 usbhost ext2 redboot apex" PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx" PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}" @@ -21,9 +21,12 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \ kernel-module-via-velocity \ " -# Set default for nslu2 - can be overridden for machines with more flash. +# Set default for 16MB machines - can be overridden for more or less flash. ROOT_FLASH_SIZE ?= "12" +# Allow for rootfs loaded direct from internal hard disk +IMAGE_FSTYPES ?= "jffs2 tar.gz" + # Set default for nslu2, nas100d, dsmg600 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n" diff --git a/packages/git/git-native_1.5.3.bb b/packages/git/git-native_1.5.3.bb new file mode 100644 index 0000000000..935c773c1c --- /dev/null +++ b/packages/git/git-native_1.5.3.bb @@ -0,0 +1,4 @@ +require git.inc +inherit native +DEPENDS = "openssl-native curl-native zlib-native expat-native" +PR = "r1" diff --git a/packages/git/git.inc b/packages/git/git.inc new file mode 100644 index 0000000000..7115d44b35 --- /dev/null +++ b/packages/git/git.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "The git revision control system used by the Linux kernel developers" +SECTION = "console/utils" +LICENSE = "GPL" + +SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \ + file://autotools.patch;patch=1" +S = "${WORKDIR}/git-${PV}" + +EXTRA_OEMAKE = "NO_TCLTL=1" + +inherit autotools + +do_install () { + oe_runmake install prefix=${D} bindir=${D}${bindir} \ + template_dir=${D}${datadir}/git-core/templates \ + GIT_PYTHON_DIR=${D}${datadir}/git-core/python +} + +FILES_${PN} += "${datadir}/git-core" diff --git a/packages/images/essential-image.bb b/packages/images/essential-image.bb deleted file mode 100644 index 8b566af6ec..0000000000 --- a/packages/images/essential-image.bb +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: MIT (see COPYING.MIT) -# -# Filename: essential-image.bb -# Date: 23-Apr-06 - -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" - -DEPENDS = "task-essential-to-boot" -IMAGE_LINGUAS = "" -IMAGE_INSTALL = "task-essential-to-boot" - -inherit image - diff --git a/packages/images/essential-machine-image.bb b/packages/images/essential-machine-image.bb deleted file mode 100644 index b74dec5e35..0000000000 --- a/packages/images/essential-machine-image.bb +++ /dev/null @@ -1,23 +0,0 @@ -# -# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 -# License: MIT (see COPYING.MIT) -# -# Filename: essential-machine-image.bb -# Date: 24-Apr-06 - -DESCRIPTION = "<description>" -HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" - -DEPENDS = "task-essential-to-boot task-essential-parts" - -MACHINE_TASKS_akita = "task-essential-to-boot \ - task-essential-pcmcia task-essential-userspace \ - task-essential-usbhost task-essential-usbclient \ - task-essential-sound task-essential-irda \ - task-essential-sd" - -IMAGE_LINGUAS = "" -IMAGE_INSTALL = "${MACHINE_TASKS}" -export IMAGE_BASENAME = "essential-image" - -inherit image
\ No newline at end of file diff --git a/packages/ipkg/files/ipkg_bugfix.patch b/packages/ipkg/files/ipkg_bugfix.patch new file mode 100644 index 0000000000..51eccbb2bd --- /dev/null +++ b/packages/ipkg/files/ipkg_bugfix.patch @@ -0,0 +1,44 @@ +Index: C/ipkg_conf.c +=================================================================== +--- C.orig/ipkg_conf.c 2005-06-21 13:59:32.000000000 +0000 ++++ C/ipkg_conf.c 2007-11-27 01:11:17.000000000 +0000 +@@ -423,6 +423,7 @@ + nv_pair_t *nv_pair; + pkg_dest_t *dest; + char *root_dir; ++ char *list_dir2; + + for (iter = nv_pair_list->head; iter; iter = iter->next) { + nv_pair = iter->data; +@@ -432,8 +433,14 @@ + } else { + root_dir = strdup(nv_pair->value); + } +- dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir); ++ if (conf->offline_root) { ++ sprintf_alloc(&list_dir2, "%s%s", conf->offline_root, lists_dir); ++ } else { ++ list_dir2 = strdup(lists_dir); ++ } ++ dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, list_dir2); + free(root_dir); ++ free(list_dir2); + if (dest == NULL) { + continue; + } +@@ -562,13 +569,13 @@ + } else if (strcmp(type, "dest") == 0) { + nv_pair_list_append(tmp_dest_nv_pair_list, name, value); + } else if (strcmp(type, "lists_dir") == 0) { +- *lists_dir = realloc(*lists_dir,strlen(value)+1); ++ *lists_dir = realloc(*lists_dir,strlen(name)+1); + if (*lists_dir == NULL) { + ipkg_message(conf, IPKG_ERROR, "ERROR: Not enough memory\n"); + free(options); + return EINVAL; + } +- sprintf (*lists_dir,"%s",value); ++ sprintf (*lists_dir,"%s", name); + } else if (strcmp(type, "arch") == 0) { + ipkg_message(conf, IPKG_INFO, "supported arch %s priority (%s)\n", name, value); + if (!value) { diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb index 13609c9037..c8e7d08588 100644 --- a/packages/ipkg/ipkg-native_0.99.163.bb +++ b/packages/ipkg/ipkg-native_0.99.163.bb @@ -2,7 +2,7 @@ S = "${WORKDIR}/ipkg-${PV}" #require ipkg_${PV}.bb require ipkg-native.inc -PR = "r2" +PR = "r3" inherit autotools pkgconfig native @@ -10,5 +10,6 @@ SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \ file://is-processing.patch;patch=1 \ file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \ file://2-pkg-vec--Optimize-gross-inefficiency.patch;patch=1 \ + file://ipkg_bugfix.patch;patch=1 \ " diff --git a/packages/libtool/libtool-1.5.10/libdir-la2.patch b/packages/libtool/libtool-1.5.10/libdir-la2.patch new file mode 100644 index 0000000000..0d5d261203 --- /dev/null +++ b/packages/libtool/libtool-1.5.10/libdir-la2.patch @@ -0,0 +1,64 @@ +OE changes to installed=no which means we can't run the original test +and just look in $objdir. We therefore look in both, preferring +$objdir if it exists - RP 29/11/2007 + +--- libtool-1.5.10/ltmain.in.orig ++++ libtool-1.5.10/ltmain.in +@@ -3105,8 +3105,11 @@ + fi + ;; + esac +- if grep "^installed=no" $deplib > /dev/null; then +- path="$absdir/$objdir" ++# OE changes to installed=no which means we can't run the original test ++# and just look in $objdir. We therefore look in both, preferring ++# $objdir if it exists, see below. - RP 29/11/2007 ++# if grep "^installed=no" $deplib > /dev/null; then ++# path="$absdir/$objdir" + # This interferes with crosscompilation. -CL + # else + # eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` +@@ -3117,7 +3120,7 @@ + # if test "$absdir" != "$libdir"; then + # $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 + # fi +- else ++ if ! grep "^installed=no" $deplib > /dev/null; then + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + if test -z "$libdir"; then + $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 +@@ -3138,9 +3141,17 @@ + for tmp in $deplibrary_names ; do + depdepl=$tmp + done +- if test -f "$path/$depdepl" ; then +- depdepl="$path/$depdepl" ++ ++ if test -f "$absdir/$objdir/$depdepl" ; then ++ depdepl="$absdir/$objdir/$depdepl" ++ path="$absdir/$objdir" ++ elif test -f "$absdir/$depdepl" ; then ++ depdepl="$absdir/$depdepl" ++ path="$absdir" ++ else ++ path="$absdir/$objdir" + fi ++ + # do not add paths which are already there + case " $newlib_search_path " in + *" $path "*) ;; +@@ -3150,7 +3161,13 @@ + path="" + ;; + *) +- path="-L$path" ++ if test -d "$absdir/$objdir" ; then ++ path="-L$absdir/$objdir" ++ elif test -d "$absdir" ; then ++ path="-L$absdir" ++ else ++ path="-L$absdir/$objdir" ++ fi + ;; + esac + ;; diff --git a/packages/libtool/libtool-1.5.10/nmedit_fix.patch b/packages/libtool/libtool-1.5.10/nmedit_fix.patch new file mode 100644 index 0000000000..673f3a9a28 --- /dev/null +++ b/packages/libtool/libtool-1.5.10/nmedit_fix.patch @@ -0,0 +1,56 @@ +Fix so instead of calling "nmedit" it gets prefixed with the host triplet. + +RP - 30/11/2007 + +Index: libtool-1.5.10/libtool.m4 +=================================================================== +--- libtool-1.5.10.orig/libtool.m4 2007-11-29 19:27:31.000000000 +0000 ++++ libtool-1.5.10/libtool.m4 2007-11-29 19:29:09.000000000 +0000 +@@ -2927,11 +2927,11 @@ + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case "$cc_basename" in + xlc*) +@@ -2939,8 +2939,8 @@ + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -5474,8 +5474,8 @@ + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + else + case "$cc_basename" in + xlc*) +@@ -5483,8 +5483,8 @@ + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' + # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~$host-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + ;; + *) + _LT_AC_TAGVAR(ld_shlibs, $1)=no diff --git a/packages/libtool/libtool-1.5.10/nousrlib.patch b/packages/libtool/libtool-1.5.10/nousrlib.patch new file mode 100644 index 0000000000..e97b45578d --- /dev/null +++ b/packages/libtool/libtool-1.5.10/nousrlib.patch @@ -0,0 +1,11 @@ +--- libtool-1.5.10.orig/ltmain.in ++++ libtool-1.5.10/ltmain.in +@@ -2637,8 +2637,6 @@ + add="$libdir/$linklib" + fi + else +- # We cannot seem to hardcode it, guess we'll fake it. +- add_dir="-L$libdir" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case "$libdir" in diff --git a/packages/libtool/libtool-1.5.10/tag1.patch b/packages/libtool/libtool-1.5.10/tag1.patch deleted file mode 100644 index 6fefd6266d..0000000000 --- a/packages/libtool/libtool-1.5.10/tag1.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libtool-1.5.10/libltdl/ltmain.sh -=================================================================== ---- libtool-1.5.10.orig/libltdl/ltmain.sh 2004-09-19 13:34:44.000000000 +0100 -+++ libtool-1.5.10/libltdl/ltmain.sh 2006-05-25 15:28:39.000000000 +0100 -@@ -232,7 +232,7 @@ - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 -- exit $EXIT_FAILURE -+# exit $EXIT_FAILURE - # else - # $echo "$modename: using $tagname tagged configuration" - fi diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb index 4c1b7c2e1f..5f15c56a97 100644 --- a/packages/libtool/libtool-cross_1.5.10.bb +++ b/packages/libtool/libtool-cross_1.5.10.bb @@ -1,14 +1,17 @@ SECTION = "devel" require libtool_${PV}.bb -PR = "r6" +PR = "r9" PACKAGES = "" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://libdir-la.patch;patch=1 \ + file://libdir-la2.patch;patch=1 \ file://prefix.patch;patch=1 \ file://tag.patch;patch=1 \ - file://tag1.patch;patch=1 \ - file://install-path-check.patch;patch=1" + file://install-path-check.patch;patch=1 \ + file://nmedit_fix.patch;patch=1 \ + file://nousrlib.patch;patch=1" + S = "${WORKDIR}/libtool-${PV}" prefix = "${STAGING_DIR_NATIVE}${layout_prefix}" @@ -16,7 +19,13 @@ exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}" bindir = "${STAGING_BINDIR_NATIVE}" do_compile () { - : + rm -f ltmain.shT + date=`/bin/sh ./mkstamp < ./ChangeLog` && \ + sed -e 's/@''PACKAGE@/libtool/' -e 's/@''VERSION@/1.5.10/' \ + -e "s%@""TIMESTAMP@%$date%" ./ltmain.in > ltmain.shT + mv -f ltmain.shT ltmain.sh || \ + (rm -f ltmain.sh && cp ltmain.shT ltmain.sh && rm -f ltmain.shT) + cp ltmain.sh ./libltdl/ } do_stage () { diff --git a/packages/libtool/libtool-native_1.5.10.bb b/packages/libtool/libtool-native_1.5.10.bb index 2780ef64ff..e21a20b85d 100644 --- a/packages/libtool/libtool-native_1.5.10.bb +++ b/packages/libtool/libtool-native_1.5.10.bb @@ -1,14 +1,16 @@ SECTION = "devel" require libtool_${PV}.bb -PR = "r6" +PR = "r9" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://libdir-la.patch;patch=1 \ + file://libdir-la2.patch;patch=1 \ file://prefix.patch;patch=1 \ file://tag.patch;patch=1 \ - file://tag1.patch;patch=1 \ file://install-path-check.patch;patch=1 \ + file://nousrlib.patch;patch=1 \ file://rpath-control.patch;patch=1" + S = "${WORKDIR}/libtool-${PV}" inherit native diff --git a/packages/libtool/libtool_1.5.10.bb b/packages/libtool/libtool_1.5.10.bb index 20929a7fa2..35cebfa5c2 100644 --- a/packages/libtool/libtool_1.5.10.bb +++ b/packages/libtool/libtool_1.5.10.bb @@ -5,7 +5,7 @@ libraries) behind a consistent interface." HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" LICENSE = "GPL" SECTION = "devel" -PR = "r3" +PR = "r5" SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://autotools.patch;patch=1 \ @@ -13,10 +13,11 @@ SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://3figures.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -PACKAGES = "libltdl libltdl-dev ${PN}" +PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" FILES_${PN} += "${datadir}/aclocal*" FILES_libltdl = "${libdir}/libltdl.so.*" FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h" +FILES_libltdl-dbg = "${libdir}/.debug/" inherit autotools diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.21.6 b/packages/linux/linux-ixp4xx/defconfig-2.6.21.6 index 42527b3dfc..b7da2803fb 100644 --- a/packages/linux/linux-ixp4xx/defconfig-2.6.21.6 +++ b/packages/linux/linux-ixp4xx/defconfig-2.6.21.6 @@ -222,7 +222,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE=" noirqdebug console=ttyS0,115200n8" +CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs ip=dhcp noirqdebug console=ttyS0,115200n8" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y @@ -271,7 +271,10 @@ CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set CONFIG_IP_FIB_HASH=y -# CONFIG_IP_PNP is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +# CONFIG_IP_PNP_BOOTP is not set +# CONFIG_IP_PNP_RARP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_ARPD is not set @@ -769,7 +772,7 @@ CONFIG_ISCSI_TCP=m # # Serial ATA (prod) and Parallel ATA (experimental) drivers # -CONFIG_ATA=m +CONFIG_ATA=y # CONFIG_ATA_NONSTANDARD is not set # CONFIG_SATA_AHCI is not set # CONFIG_SATA_SVW is not set @@ -784,12 +787,12 @@ CONFIG_ATA=m # CONFIG_SATA_SIL24 is not set # CONFIG_SATA_SIS is not set # CONFIG_SATA_ULI is not set -CONFIG_SATA_VIA=m +CONFIG_SATA_VIA=y # CONFIG_SATA_VITESSE is not set # CONFIG_SATA_INIC162X is not set # CONFIG_PATA_ALI is not set # CONFIG_PATA_AMD is not set -CONFIG_PATA_ARTOP=m +CONFIG_PATA_ARTOP=y # CONFIG_PATA_ATIIXP is not set # CONFIG_PATA_CMD64X is not set # CONFIG_PATA_CS5520 is not set @@ -823,7 +826,7 @@ CONFIG_PATA_ARTOP=m # CONFIG_PATA_VIA is not set # CONFIG_PATA_WINBOND is not set # CONFIG_PATA_PLATFORM is not set -CONFIG_PATA_IXP4XX_CF=m +CONFIG_PATA_IXP4XX_CF=y # # Multi-device support (RAID and LVM) @@ -888,12 +891,12 @@ CONFIG_TUN=m # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y -CONFIG_MII=m -CONFIG_IXP4XX_QMGR=m +CONFIG_MII=y +CONFIG_IXP4XX_QMGR=y CONFIG_IXP4XX_NPE=y CONFIG_IXP4XX_NPE_FW_LOAD=y CONFIG_IXP4XX_NPE_FW_MTD=y -CONFIG_IXP4XX_MAC=m +CONFIG_IXP4XX_MAC=y CONFIG_IXP4XX_CRYPTO=m # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set @@ -944,7 +947,7 @@ CONFIG_R8169_VLAN=y # CONFIG_SKGE is not set # CONFIG_SKY2 is not set # CONFIG_SK98LIN is not set -CONFIG_VIA_VELOCITY=m +CONFIG_VIA_VELOCITY=y # CONFIG_TIGON3 is not set # CONFIG_BNX2 is not set # CONFIG_QLA3XXX is not set @@ -1557,17 +1560,17 @@ CONFIG_USB_DEVICEFS=y # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_SPLIT_ISO=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y # CONFIG_USB_EHCI_BIG_ENDIAN_MMIO is not set # CONFIG_USB_ISP116X_HCD is not set -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=m +CONFIG_USB_UHCI_HCD=y # CONFIG_USB_U132_HCD is not set # CONFIG_USB_SL811_HCD is not set @@ -1795,20 +1798,20 @@ CONFIG_RTC_DRV_PCF8563=y # # File systems # -CONFIG_EXT2_FS=m +CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y # CONFIG_EXT2_FS_XIP is not set -CONFIG_EXT3_FS=m +CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y # CONFIG_EXT4DEV_FS is not set -CONFIG_JBD=m +CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set -CONFIG_FS_MBCACHE=m -CONFIG_REISERFS_FS=m +CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=y # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set CONFIG_REISERFS_FS_XATTR=y @@ -1895,7 +1898,7 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 # # Network File Systems # -CONFIG_NFS_FS=m +CONFIG_NFS_FS=y CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set # CONFIG_NFS_V4 is not set @@ -1905,13 +1908,14 @@ CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set CONFIG_NFSD_V4=y CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m +CONFIG_ROOT_NFS=y +CONFIG_LOCKD=y CONFIG_LOCKD_V4=y CONFIG_EXPORTFS=m CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set diff --git a/packages/linux/linux-ixp4xx_2.6.21.6.bb b/packages/linux/linux-ixp4xx_2.6.21.6.bb index 7eacf2b8eb..b6f285e1d1 100644 --- a/packages/linux/linux-ixp4xx_2.6.21.6.bb +++ b/packages/linux/linux-ixp4xx_2.6.21.6.bb @@ -5,7 +5,7 @@ VANILLA_VERSION = "2.6.21" KERNEL_RELEASE = "2.6.21.6" PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r0" +PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 92fded00af..8f366001e1 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -62,18 +62,18 @@ do_populate_sdk() { mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host rm -Rf ${SDK_OUTPUT}/usr/lib - # extract and store ipks, pkgdata, pkgmaps and shlibs data + # extract and store ipks, pkgdata and shlibs data target_pkgs=`cat ${SDK_OUTPUT}/${prefix}/package-status | grep Package: | cut -f 2 -d ' '` mkdir -p ${SDK_OUTPUT}/${prefix}/ipk/ mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/runtime/ - mkdir -p ${SDK_OUTPUT}/${prefix}/pkgmaps/debian/ mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ for pkg in $target_pkgs ; do for arch in $revipkgarchs; do - if [ -e ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk ]; then - echo "Found ${DEPLOY_DIR_IPK}/$arch/${pkg}_$arch.ipk" - cp ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk ${SDK_OUTPUT}/${prefix}/ipk/ - orig_pkg=`ipkg-list-fields ${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk | grep OE: | cut -d ' ' -f2` + pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk + if [ -e $pkgnames ]; then + echo "Found $pkgnames" + cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/ + orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ @@ -83,9 +83,6 @@ do_populate_sdk() { if [ -e ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ];then cp ${STAGING_DIR}/pkgdata/$pkg_subdir/runtime/$subpkg.packaged ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime/ fi - if [ -e ${STAGING_DIR}/pkgmaps/debian/$subpkg ]; then - cp ${STAGING_DIR}/pkgmaps/debian/$subpkg ${SDK_OUTPUT}/${prefix}/pkgmaps/debian/ - fi if [ -e ${STAGING_DIR_TARGET}/shlibs/$subpkg.list ]; then cp ${STAGING_DIR_TARGET}/shlibs/$subpkg.* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/shlibs/ fi @@ -97,6 +94,8 @@ do_populate_sdk() { # add missing link to libgcc_s.so.1 # libgcc-dev should be responsible for that, but it's not getting built + # RP: it gets smashed up depending on the order that gcc, gcc-cross and + # gcc-cross-sdk get built :( (30/11/07) ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so # remove unwanted executables diff --git a/packages/shasum/shasum-native.bb b/packages/shasum/shasum-native.bb index 2b9dd9a09d..a28d5ac967 100644 --- a/packages/shasum/shasum-native.bb +++ b/packages/shasum/shasum-native.bb @@ -6,6 +6,7 @@ INHIBIT_DEFAULT_DEPS = "1" PATCHTOOL = "patch" do_fetch[depends] = "" -do_populate_staging() { +do_stage() { + install -d ${STAGING_BINDIR} install ${S}/oe_sha256sum ${STAGING_BINDIR} } diff --git a/packages/stage-manager/files/stage-manager b/packages/stage-manager/files/stage-manager index c5b6d17a56..35453992f4 100755 --- a/packages/stage-manager/files/stage-manager +++ b/packages/stage-manager/files/stage-manager @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (C) 2006 Richard Purdie +# Copyright (C) 2006-2007 Richard Purdie # # This program is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License version 2 as published by the Free @@ -79,33 +79,54 @@ if __name__ == "__main__": found = False + def updateCache(path, fstamp): + cache[path] = {} + cache[path]['ts'] = fstamp[stat.ST_MTIME] + cache[path]['size'] = fstamp[stat.ST_SIZE] + found = True + + def copyfile(path): + if options.copydir: + copypath = os.path.join(options.copydir, path.replace(options.parentdir, '', 1)) + mkdirhier(os.path.split(copypath)[0]) + os.system("cp -dp " + path + " " + copypath) + + def copydir(path, fstamp): + if options.copydir: + copypath = os.path.join(options.copydir, path.replace(options.parentdir, '', 1)) + if os.path.islink(path): + os.symlink(os.readlink(path), copypath) + else: + mkdirhier(copypath) + os.utime(copypath, (fstamp[stat.ST_ATIME], fstamp[stat.ST_MTIME])) + for root, dirs, files in os.walk(options.parentdir): for f in files: path = os.path.join(root, f) if not os.access(path, os.R_OK): continue - fstamp = os.stat(path) + fstamp = os.lstat(path) if path not in cache: print "new file %s" % path - cache[path] = {} - cache[path]['ts'] = fstamp[stat.ST_MTIME] - cache[path]['size'] = fstamp[stat.ST_SIZE] - if options.copydir: - copypath = os.path.join(options.copydir, path.replace(options.parentdir, '', 1)) - mkdirhier(os.path.split(copypath)[0]) - os.system("mv " + path + " " + copypath) - found = True + updateCache(path, fstamp) + copyfile(path) else: if cache[path]['ts'] != fstamp[stat.ST_MTIME] or cache[path]['size'] != fstamp[stat.ST_SIZE]: print "file %s changed" % path - cache[path] = {} - cache[path]['ts'] = fstamp[stat.ST_MTIME] - cache[path]['size'] = fstamp[stat.ST_SIZE] - if options.copydir: - copypath = os.path.join(options.copydir, path.replace(options.parentdir, '', 1)) - mkdirhier(os.path.split(copypath)[0]) - os.system("mv " + path + " " + copypath) - found = True + updateCache(path, fstamp) + copyfile(path) + for d in dirs: + path = os.path.join(root, d) + fstamp = os.lstat(path) + if path not in cache: + print "new dir %s" % path + updateCache(path, fstamp) + copydir(path, fstamp) + else: + if cache[path]['ts'] != fstamp[stat.ST_MTIME]: + print "dir %s changed" % path + updateCache(path, fstamp) + copydir(path, fstamp) if options.update: print "Updating" diff --git a/packages/stage-manager/stagemanager-native_0.0.1.bb b/packages/stage-manager/stagemanager-native_0.0.1.bb index 7074d37307..828af1fbb5 100644 --- a/packages/stage-manager/stagemanager-native_0.0.1.bb +++ b/packages/stage-manager/stagemanager-native_0.0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Helper script for packaged-staging.bbclass" -PR = "r1" +PR = "r7" SRC_URI = "file://stage-manager" LICENSE = "GPLv2" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 07de84c8c2..c0b39d34ff 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r45" +PR = "r46" inherit task @@ -27,6 +27,9 @@ PACKAGES = ' \ task-base-usbgadget \ task-base-usbhost \ task-base-wifi \ + task-base-uboot \ + task-base-redboot \ + task-base-apex \ \ task-base-cramfs \ task-base-ipsec \ @@ -34,6 +37,7 @@ PACKAGES = ' \ task-base-nfs \ task-base-ppp \ task-base-smbfs \ + task-base-raid \ \ ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \ ' @@ -96,6 +100,7 @@ RDEPENDS_task-base = "\ ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \ ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \ ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \ \ ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \ ${@base_contains('DISTRO_FEATURES', 'cramfs', 'task-base-cramfs', '',d)} \ @@ -298,6 +303,9 @@ RDEPENDS_task-base-uboot = "\ RDEPENDS_task-base-redboot = "\ fis" +RDEPENDS_task-base-apex = "\ + apex-env" + RDEPENDS_task-base-ppp = "\ ppp \ ppp-dialin" diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index fb09ad1a83..0435c2aa62 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r41" +PR = "r42" inherit task diff --git a/packages/x11vnc/x11vnc_0.9.3.bb b/packages/x11vnc/x11vnc_0.9.3.bb index edd165374f..04ac87b444 100644 --- a/packages/x11vnc/x11vnc_0.9.3.bb +++ b/packages/x11vnc/x11vnc_0.9.3.bb @@ -3,7 +3,7 @@ SECTION = "x11/utils" HOMEPAGE = "http://www.karlrunge.com/x11vnc/" AUTHOR = "Karl Runge" LICENSE = "GPL" -DEPENDS = "openssl virtual/libx11 libxext avahi jpeg-62 zlib" +DEPENDS = "openssl virtual/libx11 libxext avahi jpeg zlib" SRC_URI = "http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz" diff --git a/site/arm-darwin b/site/arm-darwin new file mode 100644 index 0000000000..77a46dc862 --- /dev/null +++ b/site/arm-darwin @@ -0,0 +1,5 @@ +ac_cv_lib_m_sin=${ac_cv_lib_m_sin=yes} +ac_cv_func_posix_spawn=${ac_cv_func_posix_spawn=no} +glib_cv_stack_grows=${glib_cv_stack_grows=no} +glib_cv_uscore=${glib_cv_uscore=no} +ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} diff --git a/site/common-glibc b/site/common-glibc index 1f9c967dff..0ec53423f1 100644 --- a/site/common-glibc +++ b/site/common-glibc @@ -33,10 +33,14 @@ mono_cv_uscore=${mono_cv_uscore=no} # guile ac_cv_func_pthread_attr_getstack=${ac_cv_func_pthread_attr_getstack=yes} +#gcc-zlib +ac_cv_func_getpagesize=${ac_cv_func_getpagesize=yes} +ac_cv_func_memcpy=${ac_cv_func_memcpy=yes} +ac_cv_func_strerror=${ac_cv_func_strerror=yes} + # squid ac_cv_af_unix_large_dgram=${ac_cv_af_unix_large_dgram=yes} ac_cv_func_setresuid=${ac_cv_func_setresuid=yes} ac_cv_func_va_copy=${ac_cv_func_va_copy=yes} ac_cv_func___va_copy=${ac_cv_func___va_copy=yes} ac_cv_epoll_works=${ac_cv_epoll_works=yes} - |