diff options
| -rw-r--r-- | classes/debian.bbclass | 10 | ||||
| -rw-r--r-- | classes/package.bbclass | 74 | ||||
| -rw-r--r-- | classes/package_ipk.bbclass | 3 | ||||
| -rw-r--r-- | conf/distro/preferred-gpe-versions-2.6.inc | 2 | ||||
| -rw-r--r-- | conf/distro/preferred-gpe-versions-2.7.inc | 4 | ||||
| -rw-r--r-- | packages/eds/eds-dbus_svn.bb | 4 | ||||
| -rw-r--r-- | packages/fontconfig/fontconfig_2.2.95.bb | 8 | ||||
| -rw-r--r-- | packages/galago/galago-daemon_0.3.4.bb | 4 | ||||
| -rw-r--r-- | packages/gcc/gcc-cross_3.3.4.bb | 97 | ||||
| -rw-r--r-- | packages/libmatchbox/libmatchbox_svn.bb | 3 | ||||
| -rw-r--r-- | packages/python/python-2.4.2-manifest.inc | 10 | ||||
| -rw-r--r-- | packages/python/python_2.4.2.bb | 2 |
12 files changed, 108 insertions, 113 deletions
diff --git a/classes/debian.bbclass b/classes/debian.bbclass index d66c1fc763..5688dad93b 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -1,3 +1,11 @@ +STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian" + +# Debain 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 +# depends are correct +BUILD_ALL_DEPS = "1" + python debian_package_name_hook () { import glob, copy, stat, errno, re @@ -74,7 +82,7 @@ python debian_package_name_hook () { if soname_result: (pkgname, devname) = soname_result for pkg in packages.split(): - if (bb.data.getVar('PKG_' + pkg, d)): + if (bb.data.getVar('PKG_' + pkg, d) or bb.data.getVar('DEBIAN_NOAUTONAME_' + pkg, d)): continue if pkg == orig_pkg: newpkg = pkgname diff --git a/classes/package.bbclass b/classes/package.bbclass index fd8d1b7b09..ab1cea37c0 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -1,6 +1,73 @@ def legitimize_package_name(s): return s.lower().replace('_', '-').replace('@', '+').replace(',', '+').replace('/', '-') +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_file = bb.data.expand("${STAGING_PKGMAPS_DIR}/%s" % pkg, d) + + 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): + import bb, os + + #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, 1))) + + new_depends = [] + for depend in explode_deps(bb.data.getVar(varname, d, 1) or ""): + # Have to be careful with any version component of the depend + split_depend = depend.split(' (') + new_depend = get_package_mapping(split_depend[0].strip(), d) + if len(split_depend) > 1: + new_depends.append("%s (%s" % (new_depend, split_depend[1])) + else: + new_depends.append(new_depend) + + bb.data.setVar(varname, " ".join(new_depends) or None, d) + + #bb.note("%s after: %s" % (varname, bb.data.getVar(varname, d, 1))) + +python package_mapping_rename_hook () { + runtime_mapping_rename("RDEPENDS", d) + runtime_mapping_rename("RRECOMMENDS", d) + runtime_mapping_rename("RSUGGESTS", d) + runtime_mapping_rename("RPROVIDES", d) + runtime_mapping_rename("RREPLACES", d) + runtime_mapping_rename("RCONFLICTS", d) +} + + def do_split_packages(d, root, file_regex, output_pattern, description, postinst=None, recursive=False, hook=None, extra_depends=None, aux_files_pattern=None, postrm=None, allow_dirs=False, prepend=False, match_path=False): import os, os.path, bb @@ -240,8 +307,11 @@ python populate_packages () { bb.build.exec_func("package_name_hook", d) for pkg in packages.split(): - if bb.data.getVar('PKG_%s' % pkg, d, 1) is None: + 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 = {} @@ -641,5 +711,5 @@ python package_do_package () { do_package[dirs] = "${D}" populate_packages[dirs] = "${D}" -EXPORT_FUNCTIONS do_package do_shlibs do_split_locales +EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook addtask package before do_build after do_populate_staging diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index a70b1e8cdd..9ae526bb3b 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -165,6 +165,9 @@ python do_package_ipk () { ctrlfile.close() raise bb.build.FuncFailed("Missing field for ipk generation: %s" % value) # more fields + + bb.build.exec_func("mapping_rename_hook", localdata) + rdepends = explode_deps(bb.data.getVar("RDEPENDS", localdata, 1) or "") rrecommends = explode_deps(bb.data.getVar("RRECOMMENDS", localdata, 1) or "") rsuggests = (bb.data.getVar("RSUGGESTS", localdata, 1) or "").split() diff --git a/conf/distro/preferred-gpe-versions-2.6.inc b/conf/distro/preferred-gpe-versions-2.6.inc index d4422e86e9..1d09ae6051 100644 --- a/conf/distro/preferred-gpe-versions-2.6.inc +++ b/conf/distro/preferred-gpe-versions-2.6.inc @@ -79,7 +79,7 @@ PREFERRED_VERSION_xdemineur ?= "2.1.1" PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index ea0ab62610..933195977d 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -14,7 +14,7 @@ PREFERRED_VERSION_libmatchbox ?= "1.7" PREFERRED_VERSION_matchbox ?= "0.9.1" PREFERRED_VERSION_matchbox-common ?= "0.9.1" PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" -PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs${SRCDATE}" +PREFERRED_VERSION_matchbox-wm ?= "0.9.5+svn${SRCDATE}" PREFERRED_VERSION_matchbox-panel ?= "0.9.2" PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" PREFERRED_VERSION_atk ?= "1.9.0" @@ -86,7 +86,7 @@ PREFERRED_VERSION_xdemineur ?= "2.1.1" PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" diff --git a/packages/eds/eds-dbus_svn.bb b/packages/eds/eds-dbus_svn.bb index 3337970fee..1b427604a8 100644 --- a/packages/eds/eds-dbus_svn.bb +++ b/packages/eds/eds-dbus_svn.bb @@ -1,9 +1,9 @@ LICENSE = "LGPL" DEPENDS = "glib-2.0 gtk+ gconf dbus db gnome-common libglade libiconv" -RDEPENDS = "gconf dbus-1 db libiconv" +RDEPENDS = "gconf dbus db libiconv" MAINTAINER = "Richard Purdie <richard@openedhand.com>" DESCRIPTION = "Evolution database backend server" -PV = "1.4.0+cvs${SRCDATE}" +PV = "1.4.0+svn${SRCDATE}" PR = "r14" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ diff --git a/packages/fontconfig/fontconfig_2.2.95.bb b/packages/fontconfig/fontconfig_2.2.95.bb index ecf871504b..5fdf825fc5 100644 --- a/packages/fontconfig/fontconfig_2.2.95.bb +++ b/packages/fontconfig/fontconfig_2.2.95.bb @@ -6,14 +6,14 @@ DEPENDS = "expat freetype freetype-native zlib fontconfig-native" SRC_URI = "http://pdx.freedesktop.org/fontconfig/release/fontconfig-${PV}.tar.gz \ file://fc-glyphname.patch;patch=1 \ file://fc-lang.patch;patch=1" -PR = "r4" +PR = "r5" PACKAGES =+ "fontconfig-utils" FILES_fontconfig-utils = "${bindir}/*" -# Hacks to work around broken debian.bbclass -RPROVIDES = "libfontconfig-utils" -PKG_fontconfig-utils = "fontconfig-utils" +# Work around past breakage in debian.bbclass +RPROVIDES_fontconfig-utils = "libfontconfig-utils" +DEBIAN_NOAUTONAME_fontconfig-utils = "1" S = "${WORKDIR}/fontconfig-${PV}" diff --git a/packages/galago/galago-daemon_0.3.4.bb b/packages/galago/galago-daemon_0.3.4.bb index 610b9f7128..22257b6f44 100644 --- a/packages/galago/galago-daemon_0.3.4.bb +++ b/packages/galago/galago-daemon_0.3.4.bb @@ -3,11 +3,13 @@ HOMEPAGE = "http://www.galago-project.org/" MAINTAINER = "Koen Kooi <koen@handhelds.org>" LICENSE = "GPL" DEPENDS = "gettext libgalago dbus glib-2.0" - +PR = "r1" SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \ file://no-check.patch;patch=1" EXTRA_OECONF = "--disable-binreloc" +FILES_${PN} += "${datadir}/dbus-1/services/" + inherit autotools pkgconfig diff --git a/packages/gcc/gcc-cross_3.3.4.bb b/packages/gcc/gcc-cross_3.3.4.bb index b08112874a..597b47fba8 100644 --- a/packages/gcc/gcc-cross_3.3.4.bb +++ b/packages/gcc/gcc-cross_3.3.4.bb @@ -1,100 +1,13 @@ SECTION = "devel" include gcc_${PV}.bb +include gcc-paths-cross.inc inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" +PR="r3" + DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" -# Files for these are defined in the main gcc.oe -PACKAGES = "libgcc libstdc++ libg2c" -OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" -INHIBIT_PACKAGE_STRIP = "1" - -EXTRA_OECONF_PATHS = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ - --with-gxx-include-dir=${CROSS_DIR}/${TARGET_SYS}/include/c++" - -export CPPFLAGS = "" -export CXXFLAGS = "" -export CFLAGS = "" -export LDFLAGS = "" - -do_configure () { - export CC="${BUILD_CC}" - export AR="${TARGET_SYS}-ar" - export RANLIB="${TARGET_SYS}-ranlib" - export LD="${TARGET_SYS}-ld" - export NM="${TARGET_SYS}-nm" - rm -f ${CROSS_DIR}/lib/gcc-lib/${TARGET_SYS}/${PV}/libgcc_eh.a - (cd ${S} && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} - -do_compile_prepend () { - export CC="${BUILD_CC}" - export AR_FOR_TARGET="${TARGET_SYS}-ar" - export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib" - export LD_FOR_TARGET="${TARGET_SYS}-ld" - export NM_FOR_TARGET="${TARGET_SYS}-nm" - export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc" -} - -do_stage_append () { - for d in info man share/doc share/locale ; do - rm -rf ${CROSS_DIR}/$d - done - - # These aren't useful on the cross toolchain - rm -f ${CROSS_DIR}/bin/*gcov - rm -f ${CROSS_DIR}/bin/*gccbug - - # Fix a few include links so cross builds are happier - if [ ! -e ${STAGING_INCDIR}/c++ ]; then - mkdir -p ${STAGING_INCDIR} - rm -f ${STAGING_INCDIR}/c++ - ln -sf ${CROSS_DIR}/${TARGET_SYS}/include/c++ \ - ${STAGING_INCDIR}/ - fi - - # We use libiberty from binutils - rm -f ${CROSS_DIR}/lib/libiberty.a - - # We probably don't need these - rmdir ${CROSS_DIR}/include || : - - # We don't really need to keep this around - rm -rf ${CROSS_DIR}/share -} - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_libgcc', 'libgcc1', d) - bb.build.exec_func('package_do_package', d) -} - -do_install () { - oe_runmake 'DESTDIR=${D}' install - - # Move libgcc_s into /lib - mkdir -p ${D}${base_libdir} - if [ "${BUILD_SYS}" == "${TARGET_SYS}" ]; then - # native builds drop one pathname component - mv -f ${D}${prefix}/lib/libgcc_s.so.* ${D}${base_libdir} - else - mv -f ${D}${prefix}/*/lib/libgcc_s.so.* ${D}${base_libdir} - fi - - # Move libstdc++ and libg2c into libdir (resetting our prefix to /usr - TGT_LIBDIR=`echo ${libdir} | sed -e 's,${CROSS_DIR},/usr,'` - mkdir -p ${D}${TGT_LIBDIR} - mv -f ${D}${prefix}/*/lib/libstdc++.so.* ${D}${TGT_LIBDIR} - mv -f ${D}${prefix}/*/lib/libg2c.so.* ${D}${TGT_LIBDIR} - - # Manually run the target stripper since we won't get it run by - # the packaging. - if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then - ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libstdc++.so.* - ${TARGET_PREFIX}strip ${D}${TGT_LIBDIR}/libg2c.so.* - ${TARGET_PREFIX}strip ${D}${base_libdir}/libgcc_s.so.* - fi -} +include gcc3-build-cross.inc +include gcc-package-cross.inc
\ No newline at end of file diff --git a/packages/libmatchbox/libmatchbox_svn.bb b/packages/libmatchbox/libmatchbox_svn.bb index 9a49853fe1..90debcd87b 100644 --- a/packages/libmatchbox/libmatchbox_svn.bb +++ b/packages/libmatchbox/libmatchbox_svn.bb @@ -1,7 +1,6 @@ include libmatchbox.inc -#Remove the dash below when 1.7 changes in PV -PV = "1.7+cvs-${SRCDATE}" +PV = "1.7+svn${SRCDATE}" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\ diff --git a/packages/python/python-2.4.2-manifest.inc b/packages/python/python-2.4.2-manifest.inc index 5020070667..6d3696b754 100644 --- a/packages/python/python-2.4.2-manifest.inc +++ b/packages/python/python-2.4.2-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Mon Oct 10 14:45:24 2005 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Sun Feb 12 19:58:10 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -61,8 +61,8 @@ RDEPENDS_python-compression="python-core python-zlib" FILES_python-compression="${libdir}/python2.4/gzip.* ${libdir}/python2.4/zipfile.* " DESCRIPTION_python-re="Python Regular Expression APIs" -PR_python-re="ml1" -RDEPENDS_python-re="python-core python-stringold" +PR_python-re="ml2" +RDEPENDS_python-re="python-core" FILES_python-re="${libdir}/python2.4/re.* ${libdir}/python2.4/sre.* ${libdir}/python2.4/sre_compile.* ${libdir}/python2.4/sre_constants* ${libdir}/python2.4/sre_parse.* " DESCRIPTION_python-xmlrpc="Python XMLRPC Support" @@ -191,8 +191,8 @@ RDEPENDS_python-unittest="python-core python-stringold python-lang" FILES_python-unittest="${libdir}/python2.4/unittest.* " DESCRIPTION_python-stringold="Python Deprecated String APIs" -PR_python-stringold="ml1" -RDEPENDS_python-stringold="python-core" +PR_python-stringold="ml2" +RDEPENDS_python-stringold="python-core python-re" FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* " DESCRIPTION_python-lib-old-and-deprecated="Python Deprecated Libraries" diff --git a/packages/python/python_2.4.2.bb b/packages/python/python_2.4.2.bb index aad93d0d59..3e2ef849fd 100644 --- a/packages/python/python_2.4.2.bb +++ b/packages/python/python_2.4.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" PROVIDES = "python python-core" DEPENDS = "python-native readline zlib gdbm openssl tcl tk" -PR = "ml2" +PR = "ml3" PYTHON_MAJMIN = "2.4" |