diff options
53 files changed, 118 insertions, 111 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 1a3739f383..9bcf212e95 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -374,6 +374,12 @@ oe_machinstall() { fi } +# Remove and re-create ${D} so that is it guaranteed to be empty +do_install_prepend() { + rm -rf ${D} + mkdir -p ${D} +} + addtask listtasks do_listtasks[nostamp] = "1" python do_listtasks() { @@ -576,10 +582,6 @@ python base_do_unpack() { local = bb.data.expand(bb.fetch.localpath(url, localdata), localdata) except bb.MalformedUrl, e: raise FuncFailed('Unable to generate local path for malformed uri: %s' % e) - # dont need any parameters for extraction, strip them off - # RP: Insane. localpath shouldn't have parameters - # RP: Scehdule for removal with bitbake 1.8.8 - local = re.sub(';.*$', '', local) local = os.path.realpath(local) ret = oe_unpack_file(local, localdata, url) if not ret: @@ -871,14 +873,6 @@ python () { base_after_parse(d) } -# Remove me when we switch to bitbake 1.8.8 -def base_get_srcrev(d): - import bb - - if hasattr(bb.fetch, "get_srcrev"): - return bb.fetch.get_srcrev(d) - return "NOT IMPLEMENTED" - # Patch handling inherit patch diff --git a/classes/debian.bbclass b/classes/debian.bbclass index 403c38c752..a38f10d629 100644 --- a/classes/debian.bbclass +++ b/classes/debian.bbclass @@ -7,7 +7,10 @@ STAGING_PKGMAPS_DIR = "${STAGING_DIR}/pkgmaps/debian" # # Better expressed as ensure all RDEPENDS package before we package # This means we can't have circular RDEPENDS/RRECOMMENDS -do_package_write[rdeptask] = "do_package" +do_package_write_ipk[rdeptask] = "do_package" +do_package_write_deb[rdeptask] = "do_package" +do_package_write_tar[rdeptask] = "do_package" +do_package_write_rpm[rdeptask] = "do_package" python debian_package_name_hook () { import glob, copy, stat, errno, re diff --git a/classes/multimachine.bbclass b/classes/multimachine.bbclass index 0286a29515..945d22bfe0 100644 --- a/classes/multimachine.bbclass +++ b/classes/multimachine.bbclass @@ -1,9 +1,7 @@ STAMP = "${TMPDIR}/stamps/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" WORKDIR = "${TMPDIR}/work/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/${PF}" STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel" -# Enable me to fix pkgdata problems with multimachine -# Requires all install tasks to rerun (wipe all install stamps from tmp/stamps/ -#PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +PKGDATA_DIR = "${STAGING_DIR}/pkgdata/${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" # Find any machine specific sub packages and if present, mark the # whole package as machine specific for multimachine purposes. diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass index 872dd4915c..ef734e4311 100644 --- a/classes/openmoko2.bbclass +++ b/classes/openmoko2.bbclass @@ -29,5 +29,5 @@ S = "${WORKDIR}/${PN}" FILES_${PN} += "${datadir}/icons" -# SVNREV = "r${SRCREV}" -SVNREV = "${SRCDATE}" +SVNREV = "r${SRCREV}" +#SVNREV = "${SRCDATE}" diff --git a/classes/package.bbclass b/classes/package.bbclass index fe48ec6afd..5233fa363c 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -2,6 +2,8 @@ # General packaging help functions # +PKGDEST = "${WORKDIR}/install" + def legitimize_package_name(s): """ Make sure package names are legitimate strings @@ -120,18 +122,12 @@ PACKAGE_DEPENDS += "file-native" python () { import bb - if bb.data.getVar('PACKAGES', d, True) != '': deps = bb.data.getVarFlag('do_package', 'depends', d) or "" for dep in (bb.data.getVar('PACKAGE_DEPENDS', d, True) or "").split(): deps += " %s:do_populate_staging" % dep bb.data.setVarFlag('do_package', 'depends', deps, d) - deps = bb.data.getVarFlag('do_package_write', 'depends', d) or "" - for dep in (bb.data.getVar('PACKAGE_EXTRA_DEPENDS', d, True) or "").split(): - deps += " %s:do_populate_staging" % dep - bb.data.setVarFlag('do_package_write', 'depends', deps, d) - # shlibs requires any DEPENDS to have already packaged for the *.list files bb.data.setVarFlag('do_package', 'deptask', 'do_package', d) } @@ -380,25 +376,21 @@ python populate_packages () { if not os.path.islink(file) and not os.path.isdir(file) and isexec(file): runstrip(file, d) + pkgdest = bb.data.getVar('PKGDEST', d, 1) + os.system('rm -rf %s' % pkgdest) + for pkg in package_list: localdata = bb.data.createCopy(d) - root = os.path.join(workdir, "install", pkg) - - os.system('rm -rf %s' % root) + root = os.path.join(pkgdest, pkg) + bb.mkdirhier(root) - bb.data.setVar('ROOT', '', localdata) - bb.data.setVar('ROOT_%s' % pkg, root, localdata) bb.data.setVar('PKG', pkg, localdata) - overrides = bb.data.getVar('OVERRIDES', localdata, 1) if not overrides: raise bb.build.FuncFailed('OVERRIDES not defined') - bb.data.setVar('OVERRIDES', overrides+':'+pkg, localdata) - + bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) bb.data.update_data(localdata) - root = bb.data.getVar('ROOT', localdata, 1) - bb.mkdirhier(root) filesvar = bb.data.getVar('FILES', localdata, 1) or "" files = filesvar.split() for file in files: @@ -451,7 +443,7 @@ python populate_packages () { for pkg in package_list: dangling_links[pkg] = [] pkg_files[pkg] = [] - inst_root = os.path.join(workdir, "install", pkg) + inst_root = os.path.join(pkgdest, pkg) for root, dirs, files in os.walk(inst_root): for f in files: path = os.path.join(root, f) @@ -572,6 +564,8 @@ python package_do_shlibs() { bb.error("TARGET_SYS not defined") return + pkgdest = bb.data.getVar('PKGDEST', d, 1) + shlibs_dir = os.path.join(staging, target_sys, "shlibs") old_shlibs_dir = os.path.join(staging, "shlibs") bb.mkdirhier(shlibs_dir) @@ -584,7 +578,7 @@ python package_do_shlibs() { needed[pkg] = [] sonames = list() - top = os.path.join(workdir, "install", pkg) + top = os.path.join(pkgdest, pkg) for root, dirs, files in os.walk(top): for file in files: soname = None @@ -670,7 +664,7 @@ python package_do_shlibs() { else: bb.note("Couldn't find shared library provider for %s" % n) - deps_file = os.path.join(workdir, "install", pkg + ".shlibdeps") + deps_file = os.path.join(pkgdest, pkg + ".shlibdeps") if os.path.exists(deps_file): os.remove(deps_file) if len(deps): @@ -703,6 +697,8 @@ python package_do_pkgconfig () { bb.error("TARGET_SYS not defined") return + pkgdest = bb.data.getVar('PKGDEST', d, 1) + shlibs_dir = os.path.join(staging, target_sys, "shlibs") old_shlibs_dir = os.path.join(staging, "shlibs") bb.mkdirhier(shlibs_dir) @@ -716,7 +712,7 @@ python package_do_pkgconfig () { for pkg in packages.split(): pkgconfig_provided[pkg] = [] pkgconfig_needed[pkg] = [] - top = os.path.join(workdir, "install", pkg) + top = os.path.join(pkgdest, pkg) for root, dirs, files in os.walk(top): for file in files: m = pc_re.match(file) @@ -779,7 +775,7 @@ python package_do_pkgconfig () { found = True if found == False: bb.note("couldn't find pkgconfig module '%s' in any package" % n) - deps_file = os.path.join(workdir, "install", pkg + ".pcdeps") + deps_file = os.path.join(pkgdest, pkg + ".pcdeps") if os.path.exists(deps_file): os.remove(deps_file) if len(deps): @@ -793,14 +789,14 @@ python read_shlibdeps () { packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() for pkg in packages: rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "") - shlibsfile = bb.data.expand("${WORKDIR}/install/" + pkg + ".shlibdeps", d) + shlibsfile = bb.data.expand("${PKGDEST}/" + pkg + ".shlibdeps", d) if os.access(shlibsfile, os.R_OK): fd = file(shlibsfile) lines = fd.readlines() fd.close() for l in lines: rdepends.append(l.rstrip()) - pcfile = bb.data.expand("${WORKDIR}/install/" + pkg + ".pcdeps", d) + pcfile = bb.data.expand("${PKGDEST}/" + pkg + ".pcdeps", d) if os.access(pcfile, os.R_OK): fd = file(pcfile) lines = fd.readlines() @@ -906,21 +902,14 @@ python package_do_package () { do_package[dirs] = "${D}" addtask package before do_build after do_install - - -PACKAGE_WRITE_FUNCS ?= "read_subpackage_metadata" - -python package_do_package_write () { - for f in (bb.data.getVar('PACKAGE_WRITE_FUNCS', d, 1) or '').split(): - bb.build.exec_func(f, d) +# Dummy task to mark when all packaging is complete +do_package_write () { + : } -do_package_write[dirs] = "${D}" addtask package_write before do_build after do_package - EXPORT_FUNCTIONS do_package do_package_write - # # Helper functions for the package writing classes # diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 94db9238c2..2ab537f174 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -4,11 +4,8 @@ inherit package -PACKAGE_EXTRA_DEPENDS += "dpkg-native fakeroot-native" - BOOTSTRAP_EXTRA_RDEPENDS += "dpkg" DISTRO_EXTRA_RDEPENDS += "dpkg" -PACKAGE_WRITE_FUNCS += "do_package_deb" IMAGE_PKGTYPE ?= "deb" python package_deb_fn () { @@ -271,5 +268,5 @@ python do_package_write_deb () { bb.build.exec_func("do_package_deb", d) } do_package_write_deb[dirs] = "${D}" -#addtask package_write_deb before do_package_write after do_package +addtask package_write_deb before do_package_write after do_package diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 3468680882..e9e21456dd 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -1,9 +1,6 @@ inherit package -PACKAGE_EXTRA_DEPENDS += "ipkg-utils-native fakeroot-native" - BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg" -PACKAGE_WRITE_FUNCS += "do_package_ipk" IMAGE_PKGTYPE ?= "ipk" IPKGCONF_TARGET = "${STAGING_ETCDIR_NATIVE}/ipkg.conf" @@ -313,4 +310,4 @@ python do_package_write_ipk () { bb.build.exec_func("do_package_ipk", d) } do_package_write_ipk[dirs] = "${D}" - +addtask package_write_ipk before do_package_write after do_package diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass index bd4a0c2798..7fc5e8ea96 100644 --- a/classes/package_rpm.bbclass +++ b/classes/package_rpm.bbclass @@ -2,7 +2,6 @@ inherit package inherit rpm_core RPMBUILD="rpmbuild --short-circuit ${RPMOPTS}" -PACKAGE_WRITE_FUNCS += "do_package_rpm" IMAGE_PKGTYPE ?= "rpm" python write_specfile() { @@ -144,4 +143,4 @@ python do_package_write_rpm () { bb.build.exec_func("do_package_rpm", d) } do_package_write_rpm[dirs] = "${D}" -#addtask package_write_rpm before do_build after do_package +addtask package_write_rpm before do_build after do_package diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass index a56f2e2b00..cb4c42b261 100644 --- a/classes/package_tar.bbclass +++ b/classes/package_tar.bbclass @@ -1,8 +1,5 @@ inherit package -PACKAGE_EXTRA_DEPENDS += "tar-native" - -PACKAGE_WRITE_FUNCS += "do_package_tar" IMAGE_PKGTYPE ?= "tar" python package_tar_fn () { @@ -111,4 +108,4 @@ python do_package_write_tar () { bb.build.exec_func("do_package_tar", d) } do_package_write_tar[dirs] = "${D}" -#addtask package_write_tar before do_build after do_package +addtask package_write_tar before do_build after do_package diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass index 2ec7d305f2..8569148212 100644 --- a/classes/rm_work.bbclass +++ b/classes/rm_work.bbclass @@ -20,9 +20,7 @@ do_rm_work () { fi done } -# Uncomment me when we can use bitbake 1.8.8 -#addtask rm_work after do_${RMWORK_ORIG_TASK} -addtask rm_work after do_build +addtask rm_work after do_${RMWORK_ORIG_TASK} do_rm_work_all () { : diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index 6db02fa150..d3e5832251 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -3,7 +3,7 @@ # do_rootfs[depends] += "dpkg-native:do_populate_staging apt-native:do_populate_staging" -do_rootfs[recrdeptask] += "do_package_write" +do_rootfs[recrdeptask] += "do_package_write_deb" fakeroot rootfs_deb_do_rootfs () { set +e diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 8154318311..6babee30a2 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -6,7 +6,7 @@ # do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" -do_rootfs[recrdeptask] += "do_package_write" +do_rootfs[recrdeptask] += "do_package_write_ipk" IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}" diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 5f8f91240d..a72dd75fdc 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -383,7 +383,7 @@ UPDATECOMMAND = "ERROR, this must be a BitBake bug" UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" SRCDATE = "${DATE}" -SRCREV = "${@base_get_srcrev(d)}" +SRCREV = "${@bb.fetch.get_srcrev(d)}" AUTOREV = "${@bb.fetch.get_srcrev(d)}" SRC_URI = "file://${FILE}" diff --git a/conf/sanity.conf b/conf/sanity.conf index 163b63195e..fe1e2282e4 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -3,6 +3,6 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.8.5" +BB_MIN_VERSION = "1.8.8" INHERIT += "sanity" diff --git a/packages/dfu-util/dfu-util_svn.bb b/packages/dfu-util/dfu-util_svn.bb index 6f2e050569..9be5b92979 100644 --- a/packages/dfu-util/dfu-util_svn.bb +++ b/packages/dfu-util/dfu-util_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "USB Device Firmware Upgrade utility" SECTION = "devel" AUTHOR = "Harald Welte" LICENSE = "GPL" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r0" DEPENDS = "libusb" diff --git a/packages/ezx/opentapi_svn.bb b/packages/ezx/opentapi_svn.bb index e27b2fbe6c..7426dfe853 100644 --- a/packages/ezx/opentapi_svn.bb +++ b/packages/ezx/opentapi_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" SECTION = "devel" AUTHOR = "Daniel Willmann" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r3" SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=opentapi;proto=http \ diff --git a/packages/gnuradio/gnuradio_svn.bb b/packages/gnuradio/gnuradio_svn.bb index e40d151acb..c84a8a2121 100644 --- a/packages/gnuradio/gnuradio_svn.bb +++ b/packages/gnuradio/gnuradio_svn.bb @@ -1,8 +1,8 @@ require gnuradio.inc -DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE = "1" -PV = "3.0.4+svn${SRCDATE}" +PV = "3.0.4+svnr${SRCREV}" PR = "r2" SRC_URI = "svn://gnuradio.org/svn/gnuradio;module=trunk;proto=http \ diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 5862ea6d48..914520ad8a 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.openmoko.org" LICENSE = "GPL LGPL" SECTION = "libs/gsm" PROVIDES += "gsmd" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r22" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ diff --git a/packages/gtk-webcore/osb-browser_svn.bb b/packages/gtk-webcore/osb-browser_svn.bb index cbeebbcdc3..912215cfbd 100644 --- a/packages/gtk-webcore/osb-browser_svn.bb +++ b/packages/gtk-webcore/osb-browser_svn.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade" RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png" -PV = "0.5.0+svn${SRCDATE}" +PV = "0.5.0+svnr${SRCREV}" PR = "r0" inherit autotools diff --git a/packages/gtk-webcore/osb-jscore_svn.bb b/packages/gtk-webcore/osb-jscore_svn.bb index 51597b0908..a504be42fa 100644 --- a/packages/gtk-webcore/osb-jscore_svn.bb +++ b/packages/gtk-webcore/osb-jscore_svn.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" DEFAULT_PREFERENCE = "-1" -PV = "0.5.2+svn${SRCDATE}" +PV = "0.5.2+svnr${SRCREV}" PR = "r1" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ diff --git a/packages/gtk-webcore/osb-nrcit_svn.bb b/packages/gtk-webcore/osb-nrcit_svn.bb index 78f3af7b6f..2cab1101ca 100644 --- a/packages/gtk-webcore/osb-nrcit_svn.bb +++ b/packages/gtk-webcore/osb-nrcit_svn.bb @@ -4,7 +4,7 @@ LICENSE = "nokia" PRIORITY = "optional" SECTION = "gpe" -PV = "0.5.2+svn${SRCDATE}" +PV = "0.5.2+svnr${SRCREV}" PR = "r0" DEPENDS = "curl librsvg osb-nrcore pango" diff --git a/packages/gtk-webcore/osb-nrcore_svn.bb b/packages/gtk-webcore/osb-nrcore_svn.bb index b9af57ad52..402638d28e 100644 --- a/packages/gtk-webcore/osb-nrcore_svn.bb +++ b/packages/gtk-webcore/osb-nrcore_svn.bb @@ -2,7 +2,7 @@ require osb-nrcore.inc DEFAULT_PREFERENCE = "-1" -PV = "0.5.2+svn${SRCDATE}" +PV = "0.5.2+svnr${SRCREV}" PR = "r1" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \ diff --git a/packages/maemo3/hildon-1/.mtn2git_empty b/packages/maemo3/hildon-1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/maemo3/hildon-1/.mtn2git_empty diff --git a/packages/maemo3/hildon-1/buttonbox.patch b/packages/maemo3/hildon-1/buttonbox.patch new file mode 100644 index 0000000000..cfea60d000 --- /dev/null +++ b/packages/maemo3/hildon-1/buttonbox.patch @@ -0,0 +1,11 @@ +--- /tmp/hildon-code-dialog.c 2007-08-07 11:46:03.000000000 +0200 ++++ hildon-1/src/hildon-code-dialog.c 2007-08-07 11:46:16.468400000 +0200 +@@ -277,7 +277,7 @@ + gtk_container_add (GTK_CONTAINER (priv->buttons[3][2]), image1); + dialog_action_area1 = GTK_DIALOG (dialog)->action_area; + gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), +- GTK_BUTTONBOX_CENTER); ++ GTK_BUTTONBOX_DEFAULT); + + okButton = gtk_dialog_add_button (GTK_DIALOG (dialog) ,DEVICELOCK_OK, + GTK_RESPONSE_OK); diff --git a/packages/maemo3/hildon-1_svn.bb b/packages/maemo3/hildon-1_svn.bb new file mode 100644 index 0000000000..c5c01792ca --- /dev/null +++ b/packages/maemo3/hildon-1_svn.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Hildon widget library" +LICENSE = "LGPL" + +DEPENDS = "gconf-dbus esound gtk+" + +PV = "1.0.12+svnr${SRCREV}" + +SRC_URI = "svn://stage.maemo.org/svn/maemo/projects/haf/trunk;module=hildon-1;proto=https \ + file://buttonbox.patch;patch=1 " +S = "${WORKDIR}/hildon-1" + +inherit autotools pkgconfig lib_package + +EXTRA_OECONF = "--with-maemo-gtk=no" + + +do_stage() { + autotools_stage_all +} + diff --git a/packages/maemo3/libosso_1.20.bb b/packages/maemo3/libosso_1.20.bb index 13daf0b10c..d5489c7e95 100644 --- a/packages/maemo3/libosso_1.20.bb +++ b/packages/maemo3/libosso_1.20.bb @@ -1,10 +1,13 @@ LICENSE = "LGPL" +DESCRIPTION = "Nokia osso library" -DEPENDS = "dbus-glib glib-2.0 outo" +DEPENDS = "hildon-1 dbus-glib glib-2.0 outo" + +PR = "r1" SRC_URI = "http://repository.maemo.org/pool/bora/free/source/${PN}_${PV}-1.tar.gz" -inherit autotools pkgconfig +inherit autotools pkgconfig lib_package do_configure_prepend() { diff --git a/packages/openmoko-apps/openmoko-appmanager_svn.bb b/packages/openmoko-apps/openmoko-appmanager_svn.bb index d7a708b85c..a38341016b 100644 --- a/packages/openmoko-apps/openmoko-appmanager_svn.bb +++ b/packages/openmoko-apps/openmoko-appmanager_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Application Manager" SECTION = "openmoko/applications" DEPENDS += "ipkg" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-calculator_svn.bb b/packages/openmoko-apps/openmoko-calculator_svn.bb index 19f3ed9e45..4650af0da0 100644 --- a/packages/openmoko-apps/openmoko-calculator_svn.bb +++ b/packages/openmoko-apps/openmoko-calculator_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The OpenMoko Calculator Application" SECTION = "openmoko/applications" AUTHOR = "Rodolphe Ortalo <rodolphe.ortalo@free.fr>" -PV = "0.0.3+svn${SRCDATE}" +PV = "0.0.3+svnr${SRCREV}" PR = "r0" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-dialer_svn.bb b/packages/openmoko-apps/openmoko-dialer_svn.bb index 75abce2274..04baaba393 100644 --- a/packages/openmoko-apps/openmoko-dialer_svn.bb +++ b/packages/openmoko-apps/openmoko-dialer_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/applications" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-footer_svn.bb b/packages/openmoko-apps/openmoko-footer_svn.bb index fed6f99455..c606bb6be8 100644 --- a/packages/openmoko-apps/openmoko-footer_svn.bb +++ b/packages/openmoko-apps/openmoko-footer_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Footer" SECTION = "openmoko/applications" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-messages_svn.bb b/packages/openmoko-apps/openmoko-messages_svn.bb index 948560bd52..729cd4df80 100644 --- a/packages/openmoko-apps/openmoko-messages_svn.bb +++ b/packages/openmoko-apps/openmoko-messages_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Messaging Application" SECTION = "openmoko/applications" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" PR = "r2" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb b/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb index 0d1456541d..2378c8ce44 100644 --- a/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb +++ b/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The OpenMoko Media Player" SECTION = "openmoko/applications" DEPENDS += "alsa-lib dbus-glib id3lib libvorbis" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" PR = "r1" inherit openmoko diff --git a/packages/openmoko-apps/openmoko-taskmanager_svn.bb b/packages/openmoko-apps/openmoko-taskmanager_svn.bb index 5f313f170e..f81bae1c88 100644 --- a/packages/openmoko-apps/openmoko-taskmanager_svn.bb +++ b/packages/openmoko-apps/openmoko-taskmanager_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Task Manager" SECTION = "openmoko/applications" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-base/openmoko-common_svn.bb b/packages/openmoko-base/openmoko-common_svn.bb index e72d325bb9..8dc1cae549 100644 --- a/packages/openmoko-base/openmoko-common_svn.bb +++ b/packages/openmoko-base/openmoko-common_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Common files for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r1" inherit openmoko-base diff --git a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb index a7f62b31c0..e98d0076c8 100644 --- a/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-icon-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ icon theme for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r1" inherit openmoko-base autotools diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb index a7b5387a99..d3dbeb0e1f 100644 --- a/packages/openmoko-base/openmoko-libs_svn.bb +++ b/packages/openmoko-base/openmoko-libs_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based app SECTION = "openmoko/libs" LICENSE = "LGPL" DEPENDS += "gtk+ eds-dbus libgsmd libxosd" -PV = "0.4+svn${SRCDATE}" +PV = "0.4+svnr${SRCREV}" PR = "r0" inherit openmoko diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb index 7acc8fae1c..128473eae3 100644 --- a/packages/openmoko-base/openmoko-session_svn.bb +++ b/packages/openmoko-base/openmoko-session_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko" SECTION = "openmoko/base" RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r0" inherit openmoko-base diff --git a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb index 39b1e8d143..f521fe1de6 100644 --- a/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-sound-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard sound theme for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r0" inherit openmoko-base autotools diff --git a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb index 44c296f258..0c2c8da9a8 100644 --- a/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb +++ b/packages/openmoko-base/openmoko-theme-standard-qvga_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution, qvga version" SECTION = "openmoko/base" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r0" inherit openmoko-base diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb index 8bf59ac707..542e80fc7e 100644 --- a/packages/openmoko-base/openmoko-theme-standard_svn.bb +++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ theme for the OpenMoko distribution" SECTION = "openmoko/base" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r5" inherit openmoko-base diff --git a/packages/openmoko-examples/openmoko-finger-demo_svn.bb b/packages/openmoko-examples/openmoko-finger-demo_svn.bb index e54f8c06bc..7d0af4c04f 100644 --- a/packages/openmoko-examples/openmoko-finger-demo_svn.bb +++ b/packages/openmoko-examples/openmoko-finger-demo_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "An example finger application for OpenMoko" SECTION = "openmoko/examples" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb index 9f80fbf7dc..0df3a1968a 100644 --- a/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb +++ b/packages/openmoko-examples/openmoko-panel-demo-simple_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A simple example panel plugin for OpenMoko" SECTION = "openmoko/examples" DEPENDS += "libmatchbox" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" PR = "r1" diff --git a/packages/openmoko-examples/openmoko-panel-demo_svn.bb b/packages/openmoko-examples/openmoko-panel-demo_svn.bb index 6121bcccbc..5c346f8bb9 100644 --- a/packages/openmoko-examples/openmoko-panel-demo_svn.bb +++ b/packages/openmoko-examples/openmoko-panel-demo_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "An example panel plugin for OpenMoko" SECTION = "openmoko/examples" DEPENDS += "libmatchbox" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb b/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb index 1ba2f95072..8701cc18e8 100644 --- a/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb +++ b/packages/openmoko-examples/openmoko-stylus-demo-simple_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A simple stylus application example for OpenMoko" SECTION = "openmoko/examples" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-examples/openmoko-stylus-demo_svn.bb b/packages/openmoko-examples/openmoko-stylus-demo_svn.bb index a0ec4721c2..6ba32215a5 100644 --- a/packages/openmoko-examples/openmoko-stylus-demo_svn.bb +++ b/packages/openmoko-examples/openmoko-stylus-demo_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "An example stylus application for OpenMoko" SECTION = "openmoko/examples" -PV = "0.0.1+svn${SRCDATE}" +PV = "0.0.1+svnr${SRCREV}" inherit openmoko diff --git a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb index 58f25ab0b6..2231e22db1 100644 --- a/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb +++ b/packages/openmoko-inputmethods/openmoko-keyboard_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox virtual keyboard for X11 - OpenMoko fork" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft" SECTION = "openmoko/inputmethods" -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r1" inherit openmoko autotools pkgconfig gettext diff --git a/packages/openmoko-pim/openmoko-contacts_svn.bb b/packages/openmoko-pim/openmoko-contacts_svn.bb index 0ee27ef73c..bdcbeaf519 100644 --- a/packages/openmoko-pim/openmoko-contacts_svn.bb +++ b/packages/openmoko-pim/openmoko-contacts_svn.bb @@ -4,7 +4,7 @@ SECTION = "openmoko/pim" DEPENDS += "glib-2.0 gtk+ libglade eds-dbus gnome-vfs openmoko-libs" RDEPENDS = "gnome-vfs-plugin-file libedata-book" RRECOMMENDS = "gnome-vfs-plugin-http" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r3" inherit openmoko diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb index 5d52871ecd..7bfd42c3b6 100644 --- a/packages/openmoko-pim/openmoko-dates_svn.bb +++ b/packages/openmoko-pim/openmoko-dates_svn.bb @@ -3,7 +3,7 @@ SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" RDEPENDS = "libedata-cal" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r9" inherit gnome autotools pkgconfig gtk-icon-cache diff --git a/packages/openmoko-pim/openmoko-tasks_svn.bb b/packages/openmoko-pim/openmoko-tasks_svn.bb index b3c627e621..ca2385ff78 100644 --- a/packages/openmoko-pim/openmoko-tasks_svn.bb +++ b/packages/openmoko-pim/openmoko-tasks_svn.bb @@ -3,7 +3,7 @@ SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" RDEPENDS = "libedata-cal" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" PR = "r0" inherit gnome autotools pkgconfig gtk-icon-cache diff --git a/packages/openmoko-pim/openmoko-today_svn.bb b/packages/openmoko-pim/openmoko-today_svn.bb index da5a961671..4e2b2ef374 100644 --- a/packages/openmoko-pim/openmoko-today_svn.bb +++ b/packages/openmoko-pim/openmoko-today_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko Today application." SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "openmoko-libs eds-dbus startup-notification" -PV = "0.1+svn${SRCDATE}" +PV = "0.1+svnr${SRCREV}" inherit autotools pkgconfig gtk-icon-cache openmoko diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 127754ffb8..b35e71374d 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.scummvm.org" SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2" @@ -11,7 +11,7 @@ inherit autotools EXTRA_OECONF = "--host=${HOST_SYS} \ --backend=sdl \ - --with-sdl-prefix=${STAGING_BINDIR_NATIVE}/.. \ + --with-sdl-prefix=${STAGING_BINDIR_CROSS} \ --disable-alsa \ --prefix=${prefix} \ --with-ogg-prefix=${STAGING_LIBDIR}/.. \ diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 8607c571b2..d19c986a7d 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PV = "${UCLIBC_BASE}+svn${SRCDATE}" +PV = "${UCLIBC_BASE}+svnr${SRCREV}" PR = "r5" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 112c45c1e3..7ec07c3816 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -1,7 +1,8 @@ DEPENDS = "flex-native gperf-native gperf perl-native curl icu libxml2 sqlite3 cairo libxslt libidn gnutls gtk+" +SRCREV_FORMAT = "webcore-rwebkit" # Yes, this is wrong... -PV = "0.0+svn${SRCDATE}" +PV = "0.0+svnr${SRCREV}" PR = "r1" inherit qmake2 pkgconfig |