From a32f13d02d707d358d2c812fcd8e8d5313c900f8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Mar 2010 16:37:53 +0100 Subject: flex: add 2.5.35 with new-style checksums, staging and class extension --- recipes/flex/flex_2.5.35.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 recipes/flex/flex_2.5.35.bb diff --git a/recipes/flex/flex_2.5.35.bb b/recipes/flex/flex_2.5.35.bb new file mode 100644 index 0000000000..4099f20658 --- /dev/null +++ b/recipes/flex/flex_2.5.35.bb @@ -0,0 +1,10 @@ +require flex.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/flex/flex-${PV}.tar.bz2;name=flex \ +" + +SRC_URI[flex.md5sum] = "10714e50cea54dc7a227e3eddcd44d57" +SRC_URI[flex.sha256sum] = "0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b" + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" -- cgit v1.2.3 From 9f1b3bdace37af23d3914f47f0bf472ec0d9cdb0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Mar 2010 17:57:48 +0100 Subject: webkit-gtk: bump PR for flex-native change --- recipes/webkit/webkit-gtk_svn.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb index f0b042c938..6217e79066 100644 --- a/recipes/webkit/webkit-gtk_svn.bb +++ b/recipes/webkit/webkit-gtk_svn.bb @@ -3,6 +3,7 @@ DEPENDS = "enchant gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl icu lib SRCREV_FORMAT = "webcore-rwebkit" +PR = "r1" SRCREV = "53071" PV = "1.1.18+svnr${SRCPV}" -- cgit v1.2.3 From f8b1ae61d0887f91e762899bef83b0329dd46990 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Mar 2010 18:04:48 +0100 Subject: midori: add 0.2.3 --- recipes/gtk-webcore/midori_0.2.3.bb | 39 +++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 recipes/gtk-webcore/midori_0.2.3.bb diff --git a/recipes/gtk-webcore/midori_0.2.3.bb b/recipes/gtk-webcore/midori_0.2.3.bb new file mode 100644 index 0000000000..b8f23e4a5f --- /dev/null +++ b/recipes/gtk-webcore/midori_0.2.3.bb @@ -0,0 +1,39 @@ +require midori.inc + +DEPENDS += "python-native python-docutils-native" + +SRC_URI = "http://archive.xfce.org/src/apps/midori/0.2/midori-${PV}.tar.bz2;name=midori \ + file://waf" +SRC_URI[midori.md5sum] = "7289b170ab14925c2dc889f57a0b6a70" +SRC_URI[midori.sha256sum] = "01edb228d248dca0f3e3be6f41421a301291cb14849e9ef5a155ddf11947dfac" + +SRC_URI_append_shr = " file://config \ + " + +do_configure() { + cp -f ${WORKDIR}/waf ${S}/ + sed -i -e 's:, shell=False::g' wscript + ./configure \ + --prefix=${prefix} \ + --bindir=${bindir} \ + --sbindir=${sbindir} \ + --libexecdir=${libexecdir} \ + --datadir=${datadir} \ + --sysconfdir=${sysconfdir} \ + --sharedstatedir=${sharedstatedir} \ + --localstatedir=${localstatedir} \ + --libdir=${libdir} \ + --includedir=${includedir} \ + --infodir=${infodir} \ + --mandir=${mandir} \ + ${EXTRA_OECONF} + + sed -i /LINK_CC/d ./_build_/c4che/default.cache.py + echo "LINK_CC = '${CXX}'" >> ./_build_/c4che/default.cache.py +} + +do_install_append_shr() { + install -d ${D}${sysconfdir}/xdg/midori + install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/xdg/midori +} + -- cgit v1.2.3 From eaa2d77d79d81ceeac9b82f0c98ad86882821f80 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 1 Mar 2010 15:44:43 +0100 Subject: bison: merged Poky changes (BBEXTENDCLASS + new staging) Signed-off-by: Marcin Juszkiewicz --- recipes/bison/bison-native_2.0.bb | 21 --------------------- recipes/bison/bison-native_2.3.bb | 22 ---------------------- recipes/bison/bison_2.0.bb | 11 ++--------- recipes/bison/bison_2.3.bb | 14 ++------------ 4 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 recipes/bison/bison-native_2.0.bb delete mode 100644 recipes/bison/bison-native_2.3.bb diff --git a/recipes/bison/bison-native_2.0.bb b/recipes/bison/bison-native_2.0.bb deleted file mode 100644 index 760295db6d..0000000000 --- a/recipes/bison/bison-native_2.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -require bison_${PV}.bb -SECTION = "devel" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}" -S = "${WORKDIR}/bison-${PV}" -PR = "r2" - -inherit native autotools - -do_stage() { - rm -f ${STAGING_BINDIR}/yacc - rm -f ${STAGING_BINDIR}/bison - install -m 0755 src/bison ${STAGING_BINDIR}/ - cat >${STAGING_BINDIR}/yacc <${STAGING_BINDIR}/yacc <> bison-2.3-r0: /usr/lib/liby.a # That one is a special case: it wants to stay in the main bison package, @@ -17,4 +8,3 @@ inherit autotools # static-only library; that might be an error. FILES_${PN} += "${libdir}/liby.a" - -- cgit v1.2.3 From e329d5e021ecc3484660f6b8beab44a837913897 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 1 Mar 2010 15:58:18 +0100 Subject: file: merged Poky changes (BBEXTENDCLASS + new staging) Note that 5.04 (newest) is now default instead of 4.21. Signed-off-by: Marcin Juszkiewicz --- recipes/file/file-native_4.18.bb | 8 -------- recipes/file/file-native_4.21.bb | 6 ------ recipes/file/file_4.18.bb | 15 ++++----------- recipes/file/file_4.21.bb | 17 ++++++----------- recipes/file/file_5.04.bb | 13 ++----------- 5 files changed, 12 insertions(+), 47 deletions(-) delete mode 100644 recipes/file/file-native_4.18.bb delete mode 100644 recipes/file/file-native_4.21.bb diff --git a/recipes/file/file-native_4.18.bb b/recipes/file/file-native_4.18.bb deleted file mode 100644 index 63554b01fb..0000000000 --- a/recipes/file/file-native_4.18.bb +++ /dev/null @@ -1,8 +0,0 @@ -require file_${PV}.bb -inherit native - -# avoid dependency loop -DEPENDS = "" -PR = "r1" - -SRC_URI += "file://native-fix.diff;patch=1" diff --git a/recipes/file/file-native_4.21.bb b/recipes/file/file-native_4.21.bb deleted file mode 100644 index 734891d18d..0000000000 --- a/recipes/file/file-native_4.21.bb +++ /dev/null @@ -1,6 +0,0 @@ -require file_${PV}.bb -inherit native -DEPENDS = "zlib-native" -PR = "r0" - -SRC_URI += "file://native-fix.diff;patch=1" diff --git a/recipes/file/file_4.18.bb b/recipes/file/file_4.18.bb index a98c68009e..5433d3e9e6 100644 --- a/recipes/file/file_4.18.bb +++ b/recipes/file/file_4.18.bb @@ -1,22 +1,15 @@ -DESCRIPTION = "File attempts to classify files depending \ -on their contents and prints a description if a match is found." -SECTION = "console/utils" -LICENSE = "BSD-ADV" -DEPENDS = "file-native" +require file.inc + +PR = "${INCPR}.0" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ file://dump \ file://filesystems" -S = "${WORKDIR}/file-${PV}" -inherit autotools +SRC_URI_append_virtclass-native = " file://native-fix.diff;patch=1" do_configure_prepend() { sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am cp ${WORKDIR}/dump ${S}/magic/Magdir/ cp ${WORKDIR}/filesystems ${S}/magic/Magdir/ } - -do_stage() { - autotools_stage_all -} diff --git a/recipes/file/file_4.21.bb b/recipes/file/file_4.21.bb index 758f7f36fa..dfe6e1063a 100644 --- a/recipes/file/file_4.21.bb +++ b/recipes/file/file_4.21.bb @@ -1,18 +1,13 @@ -DESCRIPTION = "File attempts to classify files depending \ -on their contents and prints a description if a match is found." -SECTION = "console/utils" -LICENSE = "BSD-ADV" -DEPENDS = "file-native" +require file.inc + +DEPENDS_virtclass-native += "zlib-native" + +PR = "${INCPR}.0" SRC_URI = "ftp://ftp.fi.debian.org/pub/gentoo/distfiles/file-${PV}.tar.gz" -S = "${WORKDIR}/file-${PV}" -inherit autotools +SRC_URI_append_virtclass-native = " file://native-fix.diff;patch=1" do_configure_prepend() { sed -i -e 's,$(top_builddir)/src/file,file,' ${S}/magic/Makefile.am } - -do_stage() { - autotools_stage_all -} diff --git a/recipes/file/file_5.04.bb b/recipes/file/file_5.04.bb index 1fe1488dae..da14e941be 100644 --- a/recipes/file/file_5.04.bb +++ b/recipes/file/file_5.04.bb @@ -1,12 +1,3 @@ -DESCRIPTION = "File attempts to classify files depending \ -on their contents and prints a description if a match is found." -SECTION = "console/utils" -LICENSE = "BSD-ADV" -DEPENDS = "file-native" -DEPENDS_virtclass-native = "" +require file.inc -SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz" - -inherit autotools - -BBCLASSEXTEND = "native" +PR = "${INCPR}.0" -- cgit v1.2.3 From f2f02f6e4754f69b83de7613860fd580e27c0237 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 2 Mar 2010 13:27:22 +0100 Subject: base.bbclass: create tmp/legacy-staging.log file with names of recipes which need work Signed-off-by: Marcin Juszkiewicz --- classes/base.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/classes/base.bbclass b/classes/base.bbclass index 990e75ee14..358a9a2b68 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1155,6 +1155,14 @@ python do_populate_staging () { if legacy: bb.data.setVar("SYSROOT_DESTDIR", "", d) bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True)) + + try: + file = open("%s/legacy-staging.log" % bb.data.getVar("TMPDIR", d, 1), "a") + file.write("%s\n" % bb.data.getVar("FILE", d, True)) + file.close() + except: + pass + if bb.data.getVarFlags('do_stage', d) is None: bb.fatal("This recipe (%s) has a do_stage_prepend or do_stage_append and do_stage now doesn't exist. Please rename this to do_stage()" % bb.data.getVar("FILE", d, True)) lock = bb.utils.lockfile(lockfile) -- cgit v1.2.3 From 31e93854259130e20a4e08c9d803c34edc4b447e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 1 Mar 2010 11:18:28 +0000 Subject: qemu: Perform our sanity checks based on ENABLE_BINARY_LOCALE_GENERATION Perform qemu-related checks not based on if we're ARM but based on if we'll be using qemu for binary locale generation. Clarify what the first of these sanity checks does. Next, change the check for a provided qemu binary to be generic enough to work on all arches (and catch distribution or user built versions of qemu). While we're in here, correct the gcc version check code in base.bbclass. Signed-off-by: Tom Rini Acked-by: Denys Dmytriyenko Acked-by: Chris Larson --- classes/base.bbclass | 9 ++++----- classes/sanity.bbclass | 9 +++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 358a9a2b68..65ad478cbc 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1341,16 +1341,15 @@ def check_app_exists(app, d): return len(which(path, app)) != 0 def check_gcc3(data): - # Primarly used by qemu to make sure we have a workable gcc-3.4.x. - # Start by checking for the program name as we build it, was not - # all host-provided gcc-3.4's will work. - + # Primarly used by qemu to make sure we have a workable gcc-3.x. + # Start by checking for the program name as we build it as there + # are some distribtuion provided gcc-3.x's that will not work. gcc3_versions = 'gcc-3.4.6 gcc-3.4.4 gcc34 gcc-3.4 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' for gcc3 in gcc3_versions.split(): if check_app_exists(gcc3, data): return gcc3 - + return False # Patch handling diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index b66c9a9877..a78e8edf8a 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -83,8 +83,10 @@ def check_sanity(e): required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum" - if data.getVar('TARGET_ARCH', e.data, True) == "arm": - # qemu-native needs gcc 3.x + # If we'll be running qemu, perform some sanity checks + if data.getVar('ENABLE_BINARY_LOCALE_GENERATION', e.data, True): + # Some versions of qemu-native needs gcc 3.x. Do a special + # check here to allow for host 'gcc' is 3.x. if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided: gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '") @@ -93,8 +95,7 @@ def check_sanity(e): missing = missing + "gcc-3.x (needed for qemu-native)," if "qemu-native" in assume_provided: - if not check_app_exists("qemu-arm", e.data): - messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" + required_utilities += "qemu" try: if os.path.exists("/proc/sys/vm/mmap_min_addr"): -- cgit v1.2.3 From 4798f0d51e7b1a45d045c37319cb4b99eea6275f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 2 Mar 2010 10:08:00 +0100 Subject: libdrm: use the same OECONF, even when gta01 won't use glamo api Signed-off-by: Martin Jansa --- recipes/dri/libdrm_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/dri/libdrm_git.bb b/recipes/dri/libdrm_git.bb index 641f740dd0..fe15ded4cc 100644 --- a/recipes/dri/libdrm_git.bb +++ b/recipes/dri/libdrm_git.bb @@ -18,8 +18,7 @@ DEFAULT_PREFERENCE_shr = "1" S = "${WORKDIR}/git" -EXTRA_OECONF_append_om-gta02 = " --enable-glamo-experimental-api --disable-radeon --disable-intel" -EXTRA_OECONF_append_om-gta01 = " --disable-radeon --disable-intel" +EXTRA_OECONF_append_shr = " --enable-glamo-experimental-api --disable-radeon --disable-intel" inherit autotools pkgconfig -- cgit v1.2.3 From 36550d9fa84a8f29b1018027da06e289a253fc2d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 2 Mar 2010 10:08:47 +0100 Subject: e-wm: limit illume-keyboard-flow.patch to rev 46549, it was applied in 46550 Signed-off-by: Martin Jansa --- recipes/e17/e-wm_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index d74fbb546f..f1a5715872 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -21,7 +21,7 @@ SRC_URI_append_shr = " \ file://illume-disable-screensaver.patch;patch=1 \ file://wizard-module-skipping.patch;patch=1 \ file://illume-flaunch-fix.patch;patch=1 \ - file://illume-keyboard-flow.patch;patch=1 \ + file://illume-keyboard-flow.patch;patch=1;maxrev=46549 \ " EXTRA_OECONF = "\ -- cgit v1.2.3 From 5a1d574bbad4cb28f4e50fe771f865e246280600 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 2 Mar 2010 10:41:42 +0100 Subject: linux-openmoko-2.6.32: add last 2 patches from DRM branch" Signed-off-by: Martin Jansa --- ...rt-all-FB-modes-given-by-the-lower-levels.patch | 102 +++++++++++++++++++++ .../0013-Change-connector-type-to-LVDS.patch | 29 ++++++ recipes/linux/linux-openmoko-2.6.32_git.bb | 4 +- 3 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-openmoko-2.6.32/0012-Report-all-FB-modes-given-by-the-lower-levels.patch create mode 100644 recipes/linux/linux-openmoko-2.6.32/0013-Change-connector-type-to-LVDS.patch diff --git a/recipes/linux/linux-openmoko-2.6.32/0012-Report-all-FB-modes-given-by-the-lower-levels.patch b/recipes/linux/linux-openmoko-2.6.32/0012-Report-all-FB-modes-given-by-the-lower-levels.patch new file mode 100644 index 0000000000..ac19dbd5d2 --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.32/0012-Report-all-FB-modes-given-by-the-lower-levels.patch @@ -0,0 +1,102 @@ +From f8448d2b08c1e2cfd0faba0e3f3c4c58e4ecaa9f Mon Sep 17 00:00:00 2001 +From: Thomas White +Date: Mon, 1 Mar 2010 22:02:26 +0100 +Subject: [PATCH 12/13] Report all FB modes given by the lower levels + +Signed-off-by: Thomas White +Signed-off-by: Martin Jansa +--- + drivers/mfd/glamo/glamo-display.c | 70 +++++++++++++++++++++---------------- + 1 files changed, 40 insertions(+), 30 deletions(-) + +diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c +index a384c8b..bc3a2ea 100644 +--- a/drivers/mfd/glamo/glamo-display.c ++++ b/drivers/mfd/glamo/glamo-display.c +@@ -456,43 +456,53 @@ static void glamo_connector_destroy(struct drm_connector *connector) + + static int glamo_connector_get_modes(struct drm_connector *connector) + { +- struct drm_display_mode *mode; + struct glamo_fb_platform_data *fb_info; + struct glamo_output *goutput = to_glamo_output(connector); + struct glamodrm_handle *gdrm = goutput->gdrm; ++ int i; + + /* Dig out the record which will tell us about the hardware */ + fb_info = gdrm->glamo_core->pdata->fb_data; + +- mode = drm_mode_create(connector->dev); +- if (!mode) +- return 0; +- /* Fill in 'mode' here */ +- mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED; +- +- /* Convert framebuffer timings into KMS timings */ +- mode->clock = 1000000000UL / fb_info->modes[0].pixclock; /* ps -> kHz */ +- mode->clock *= 1000; /* kHz -> Hz */ +- mode->hdisplay = fb_info->modes[0].xres; +- mode->hsync_start = fb_info->modes[0].right_margin + mode->hdisplay; +- mode->hsync_end = mode->hsync_start + fb_info->modes[0].hsync_len; +- mode->htotal = mode->hsync_end + fb_info->modes[0].left_margin; +- mode->hskew = 0; +- +- mode->vdisplay = fb_info->modes[0].yres; +- mode->vsync_start = fb_info->modes[0].lower_margin + mode->vdisplay; +- mode->vsync_end = mode->vsync_start + fb_info->modes[0].vsync_len; +- mode->vtotal = mode->vsync_end + fb_info->modes[0].upper_margin; +- mode->vscan = 0; +- +- /* Physical size */ +- mode->width_mm = fb_info->width; +- mode->height_mm = fb_info->height; +- +- drm_mode_set_name(mode); +- drm_mode_probed_add(connector, mode); +- +- return 1; /* one mode, for now */ ++ for ( i=0; inum_modes; i++ ) { ++ ++ struct drm_display_mode *mode; ++ ++ mode = drm_mode_create(connector->dev); ++ if ( !mode ) continue; ++ ++ mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED; ++ ++ /* Convert framebuffer timings into KMS timings. ++ * First: ps -> kHz */ ++ mode->clock = 1000000000UL / fb_info->modes[i].pixclock; ++ mode->clock *= 1000; /* then kHz -> Hz */ ++ mode->hdisplay = fb_info->modes[i].xres; ++ mode->hsync_start = fb_info->modes[i].right_margin ++ + mode->hdisplay; ++ mode->hsync_end = mode->hsync_start ++ + fb_info->modes[i].hsync_len; ++ mode->htotal = mode->hsync_end + fb_info->modes[i].left_margin; ++ mode->hskew = 0; ++ ++ mode->vdisplay = fb_info->modes[i].yres; ++ mode->vsync_start = fb_info->modes[i].lower_margin ++ + mode->vdisplay; ++ mode->vsync_end = mode->vsync_start ++ + fb_info->modes[i].vsync_len; ++ mode->vtotal = mode->vsync_end + fb_info->modes[i].upper_margin; ++ mode->vscan = 0; ++ ++ /* Physical size */ ++ mode->width_mm = fb_info->width; ++ mode->height_mm = fb_info->height; ++ ++ drm_mode_set_name(mode); ++ drm_mode_probed_add(connector, mode); ++ ++ } ++ ++ return fb_info->num_modes; + } + + +-- +1.7.0 + diff --git a/recipes/linux/linux-openmoko-2.6.32/0013-Change-connector-type-to-LVDS.patch b/recipes/linux/linux-openmoko-2.6.32/0013-Change-connector-type-to-LVDS.patch new file mode 100644 index 0000000000..1b8c653607 --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.32/0013-Change-connector-type-to-LVDS.patch @@ -0,0 +1,29 @@ +From 3f1154d1b763f981791ad54987e61d31bde43ec7 Mon Sep 17 00:00:00 2001 +From: Thomas White +Date: Mon, 1 Mar 2010 22:07:57 +0100 +Subject: [PATCH 13/13] Change connector type to LVDS + +Not certain that this exactly describes what it is, and too lazy to check, but for sure +it's a better description than "Unknown". + +Signed-off-by: Thomas White +--- + drivers/mfd/glamo/glamo-display.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c +index bc3a2ea..5f04697 100644 +--- a/drivers/mfd/glamo/glamo-display.c ++++ b/drivers/mfd/glamo/glamo-display.c +@@ -795,7 +795,7 @@ int glamo_display_init(struct drm_device *dev) + + /* Initialise the connector */ + drm_connector_init(dev, connector, &glamo_connector_funcs, +- DRM_MODE_CONNECTOR_Unknown); ++ DRM_MODE_CONNECTOR_LVDS); + drm_sysfs_connector_add(connector); + connector->interlace_allowed = 0; + connector->doublescan_allowed = 0; +-- +1.7.0 + diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb index 52988280dd..c4369ac506 100644 --- a/recipes/linux/linux-openmoko-2.6.32_git.bb +++ b/recipes/linux/linux-openmoko-2.6.32_git.bb @@ -8,7 +8,7 @@ KERNEL_RELEASE="2.6.32.9" SRCREV = "14be1091928fcce66812a85129768fb253b36420" OEV = "oe1" PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}" -PR = "r2" +PR = "r3" SRC_URI = "\ git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-gta02-2.6.32 \ @@ -28,6 +28,8 @@ SRC_URI = "\ file://0009-A-couple-of-GEM-refcounting-fixes.patch;patch=1 \ file://0010-Simplify-the-JBT6k74-driver.patch;patch=1 \ file://0011-Don-t-choke-if-userspace-provides-a-pixel-clock-valu.patch;patch=1 \ + file://0012-Report-all-FB-modes-given-by-the-lower-levels.patch;patch=1 \ + file://0013-Change-connector-type-to-LVDS.patch;patch=1 \ " SRC_URI[stablepatch.md5sum] = "7f615dd3b4a3b19fb86e479996a2deb5" -- cgit v1.2.3 From cf44d7790c507c7a58ac1589bb5895fac5f51765 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 2 Mar 2010 11:10:59 +0100 Subject: libphone-ui-shr: drop etk dependency Signed-off-by: Martin Jansa --- recipes/shr/libphone-ui-shr_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/shr/libphone-ui-shr_git.bb b/recipes/shr/libphone-ui-shr_git.bb index c297fe3640..e9080ae713 100644 --- a/recipes/shr/libphone-ui-shr_git.bb +++ b/recipes/shr/libphone-ui-shr_git.bb @@ -1,8 +1,8 @@ DESCRIPTION = "SHR default module for the Phone UI daemon" SECTION = "e/apps" -DEPENDS += " dbus-glib libframeworkd-glib libphone-ui etk evas ecore edje edje-native elementary" +DEPENDS += " dbus-glib libframeworkd-glib libphone-ui evas ecore edje edje-native elementary" PV = "0.0.0+gitr${SRCREV}" -PR = "r4" +PR = "r5" SRC_URI = "git://shr.bearstech.com/repo/libphone-ui-shr.git;protocol=http;branch=master" S = "${WORKDIR}/git" -- cgit v1.2.3 From 0da9a5aef60779d339fde33c265e7c481bcfdae0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 2 Mar 2010 13:03:12 +0100 Subject: xboard: add checksums Signed-off-by: Martin Jansa --- recipes/xboard/xboard_4.4.1.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/xboard/xboard_4.4.1.bb b/recipes/xboard/xboard_4.4.1.bb index 0c31b9ced3..385c1d3f3b 100644 --- a/recipes/xboard/xboard_4.4.1.bb +++ b/recipes/xboard/xboard_4.4.1.bb @@ -3,9 +3,12 @@ HOMEPAGE = "http://www.tim-mann.org/xboard.html" SECTION = "games" LICENSE = "GPL" DEPENDS = "libxaw libsm libx11 libxt libxmu libxext libice" -SRC_URI = "http://ftp.gnu.org/gnu/xboard/xboard-${PV}.tar.gz \ +SRC_URI = "http://ftp.gnu.org/gnu/xboard/xboard-${PV}.tar.gz;name=archive \ file://no-strip.patch;patch=1;pnum=2" +SRC_URI[archive.md5sum] = "4623a83fdd43f410bfcc8a20e2eb1474" +SRC_URI[archive.sha256sum] = "74184fa7d5ea4ce963f7108e01256e6eb7bb2269ff6f780599fdaaf2d913950e" + inherit autotools do_configure() { -- cgit v1.2.3 From e1b0916de8bb374d7b37393aca80fe5378668b6e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 2 Mar 2010 10:49:33 -0700 Subject: eglibc-package.bbclass: Add eglibc-pic, resync eglibc-dev with glibc, bump PR Resync what goes into eglibc-dev based on what we have in glibc-dev. This includes picking up the reset of the static libraries (many are missed otherwise and static linking in SDKs fails). We also add in a eglibc-pic package to catch all of the pic stuff (some of which would otherwise be caught in -dev). Signed-off-by: Tom Rini Acked-by: Khem Raj --- recipes/eglibc/eglibc-package.bbclass | 9 +++++++-- recipes/eglibc/eglibc_2.10.bb | 2 +- recipes/eglibc/eglibc_2.11.bb | 2 +- recipes/eglibc/eglibc_2.9.bb | 2 +- recipes/eglibc/eglibc_svn.bb | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass index 3c33f9366d..6480d1699d 100644 --- a/recipes/eglibc/eglibc-package.bbclass +++ b/recipes/eglibc/eglibc-package.bbclass @@ -29,11 +29,12 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc" # Set this to zero if you don't want ldconfig in the output package USE_LDCONFIG ?= "1" -PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-dev eglibc-doc eglibc-locale libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" +PACKAGES = "eglibc-dbg eglibc catchsegv sln nscd ldd localedef eglibc-utils eglibc-pic eglibc-dev eglibc-doc eglibc-locale libcidn libmemusage libsegfault eglibc-extra-nss eglibc-thread-db eglibc-pcprofile" PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* glibc-binary-localedata-* eglibc-gconv-* eglibc-charmap-* eglibc-localedata-* eglibc-binary-localedata-* locale-base-*" RPROVIDES_eglibc = "glibc" RPROVIDES_eglibc-utils = "glibc-utils" +RPROVIDES_eglibc-pic = "glibc-pic" RPROVIDES_eglibc-dev = "glibc-dev" RPROVIDES_eglibc-doc = "glibc-doc" RPROVIDES_eglibc-locale = "glibc-locale" @@ -46,9 +47,13 @@ libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${ba FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig', '', d)}" FILES_ldd = "${bindir}/ldd" FILES_libsegfault = "${base_libdir}/libSegFault*" +FILES_libcidn = "${base_libdir}/libcidn*.so" +FILES_libmemusage = "${base_libdir}/libmemusage.so" FILES_eglibc-extra-nss = "${base_libdir}/libnss*" FILES_sln = "/sbin/sln" -FILES_eglibc-dev_append = " ${libdir}/*.o ${bindir}/rpcgen ${libdir}/libc_nonshared.a ${libdir}/libpthread_nonshared.a" +FILES_eglibc-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/" +FILES_eglibc-dev_append += "${bindir}/rpcgen ${libdir}/*.a \ + ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" FILES_nscd = "${sbindir}/nscd*" FILES_eglibc-utils = "${bindir}/* ${sbindir}/*" FILES_eglibc-gconv = "${libdir}/gconv/*" diff --git a/recipes/eglibc/eglibc_2.10.bb b/recipes/eglibc/eglibc_2.10.bb index 3907b095ff..c0098ee4d4 100644 --- a/recipes/eglibc/eglibc_2.10.bb +++ b/recipes/eglibc/eglibc_2.10.bb @@ -3,7 +3,7 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.10" -PR = "${INC_PR}.6" +PR = "${INC_PR}.7" SVN_REV="9381" EGLIBC_BRANCH="eglibc-2_10" SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};rev=${SVN_REV};proto=svn \ diff --git a/recipes/eglibc/eglibc_2.11.bb b/recipes/eglibc/eglibc_2.11.bb index 96231c5376..6ab1053dc7 100644 --- a/recipes/eglibc/eglibc_2.11.bb +++ b/recipes/eglibc/eglibc_2.11.bb @@ -4,7 +4,7 @@ DEFAULT_PREFERENCE = "-1" DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.11" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SVN_REV="9738" EGLIBC_BRANCH="eglibc-2_11" SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};rev=${SVN_REV};proto=svn \ diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb index 792ca83726..13f67e6dc2 100644 --- a/recipes/eglibc/eglibc_2.9.bb +++ b/recipes/eglibc/eglibc_2.9.bb @@ -3,7 +3,7 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" PV = "2.9" -PR = "${INC_PR}.6" +PR = "${INC_PR}.7" SVN_REV="8690" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};rev=${SVN_REV};proto=svn \ diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index 096425caec..313dca9f95 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -5,7 +5,7 @@ SRCREV = "9803" DEFAULT_PREFERENCE = "-1" FILESPATHPKG =. "eglibc-svn:" PV = "2.11+svnr${SRCPV}" -PR = "${INC_PR}.3" +PR = "${INC_PR}.4" EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=${EGLIBC_BRANCH} \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ -- cgit v1.2.3 From 2d132de5abecf53a9e340dc376bc8af4cfb07464 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 1 Mar 2010 16:34:37 +0000 Subject: Add glibc-pic package glibc-package.bbclass: Add glibc-pic package By default, in our glibc builds we don't have these libraries. They may however come from various binary toolchains, or custom source builds. Signed-off-by: Tom Rini Acked-by: Khem Raj --- classes/glibc-package.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/glibc-package.bbclass b/classes/glibc-package.bbclass index 413ed14931..af75bb53de 100644 --- a/classes/glibc-package.bbclass +++ b/classes/glibc-package.bbclass @@ -9,7 +9,7 @@ GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "ondevice" -PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-static glibc-doc glibc-locale libcidn libmemusage libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" +PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-pic glibc-dev glibc-static glibc-doc glibc-locale libcidn libmemusage libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*" INSANE_SKIP_glibc-dbg = True @@ -23,6 +23,7 @@ glibcfiles = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_condi glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \ ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \ ${libdir}/gconv/.debug ${libexecdir}/*/.debug" +glibcpicfiles = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/" glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig ${libdir}/*nonshared.a \ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" @@ -35,6 +36,8 @@ FILES_libcidn = "${base_libdir}/libcidn*.so" FILES_libmemusage = "${base_libdir}/libmemusage.so" FILES_glibc-extra-nss = "${base_libdir}/libnss*" FILES_sln = "${base_sbindir}/sln" +FILES_glibc-pic = "${glibcpicfiles}" +FILES_${PN}-pic = "${glibcpicfiles}" FILES_glibc-dev = "${glibcdevfiles}" FILES_${PN}-dev = "${glibcdevfiles}" FILES_glibc-dbg = "${glibcdbgfiles}" -- cgit v1.2.3 From aadaa1b0bfe8503e77b9ff55ac6405afbb4f1cce Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Mar 2010 19:01:46 +0100 Subject: file.inc: attempt to create proper file.inc that got missing in the earlier file commit --- recipes/file/file.inc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 recipes/file/file.inc diff --git a/recipes/file/file.inc b/recipes/file/file.inc new file mode 100644 index 0000000000..7076ae9823 --- /dev/null +++ b/recipes/file/file.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "File attempts to classify files depending \ +on their contents and prints a description if a match is found." +SECTION = "console/utils" +LICENSE = "BSD-ADV" +DEPENDS = "file-native" +DEPENDS_virtclass-native = "" + +INC_PR = "r0" + +SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz" + +inherit autotools + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" -- cgit v1.2.3 From b540bf35250b048ce072db61422df5f315e87e31 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Mar 2010 19:05:33 +0100 Subject: bison.inc: attempt to create proper file.inc that got missing in the earlier bison commit --- recipes/bison/bison.inc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 recipes/bison/bison.inc diff --git a/recipes/bison/bison.inc b/recipes/bison/bison.inc new file mode 100644 index 0000000000..c35322e405 --- /dev/null +++ b/recipes/bison/bison.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "GNU Project parser generator (yacc replacement)." +HOMEPAGE = "http://www.gnu.org/software/bison/" +LICENSE = "GPL" +SECTION = "devel" +PRIORITY = "optional" +DEPENDS = "gettext" + +SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ + file://m4.patch;patch=1" + +INC_PR = "r0" + +inherit autotools + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" -- cgit v1.2.3 From eae7f83b03cf59553c861bf92713642cda93056d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Mar 2010 19:07:48 +0100 Subject: bison/file.inc: INC_PR -> INCPR --- recipes/bison/bison.inc | 2 +- recipes/file/file.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/bison/bison.inc b/recipes/bison/bison.inc index c35322e405..c3aa25e507 100644 --- a/recipes/bison/bison.inc +++ b/recipes/bison/bison.inc @@ -8,7 +8,7 @@ DEPENDS = "gettext" SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ file://m4.patch;patch=1" -INC_PR = "r0" +INCPR = "r0" inherit autotools diff --git a/recipes/file/file.inc b/recipes/file/file.inc index 7076ae9823..0c6d0789eb 100644 --- a/recipes/file/file.inc +++ b/recipes/file/file.inc @@ -5,7 +5,7 @@ LICENSE = "BSD-ADV" DEPENDS = "file-native" DEPENDS_virtclass-native = "" -INC_PR = "r0" +INCPR = "r0" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz" -- cgit v1.2.3 From 5ab63580965a68e234cc7a5215a85b4a65125b42 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 2 Mar 2010 19:39:42 +0100 Subject: file: added forgotten files Signed-off-by: Marcin Juszkiewicz --- recipes/file/file.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/file/file.inc b/recipes/file/file.inc index 0c6d0789eb..5d4e737245 100644 --- a/recipes/file/file.inc +++ b/recipes/file/file.inc @@ -5,7 +5,7 @@ LICENSE = "BSD-ADV" DEPENDS = "file-native" DEPENDS_virtclass-native = "" -INCPR = "r0" +INCPR = "r1" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz" -- cgit v1.2.3 From b7374a40f299ac2cc6be4c63c67da7954e737580 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 2 Mar 2010 19:39:58 +0100 Subject: bison: added forgotten files Signed-off-by: Marcin Juszkiewicz --- recipes/bison/bison.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/bison/bison.inc b/recipes/bison/bison.inc index c3aa25e507..b770ffd42d 100644 --- a/recipes/bison/bison.inc +++ b/recipes/bison/bison.inc @@ -8,7 +8,7 @@ DEPENDS = "gettext" SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ file://m4.patch;patch=1" -INCPR = "r0" +INCPR = "r4" inherit autotools -- cgit v1.2.3 From 732af689fae49fb80e184f2a31c6bdba3f210f11 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 2 Mar 2010 11:30:21 +0100 Subject: sane-srcrevs.inc: bump shr-related recipes to current state Signed-off-by: Sebastian Spaeth --- conf/distro/include/sane-srcrevs.inc | 24 ++++++++++++------------ recipes/shr/libphone-utils_git.bb | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 385dd28cdb..947f3b1555 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -14,7 +14,7 @@ SRCREV_pn-accelges ?= "206" SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02" SRCREV_pn-aircrack-ng ?= "802" -SRCREV_pn-alsa-scenarii-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373" +SRCREV_pn-alsa-scenarii-shr ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca" SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1" SRCREV_pn-app-restarter ?= "4552" SRCREV_pn-assassin ?= "268" @@ -74,7 +74,7 @@ SRCREV_pn-ezxd ?= "2074" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-flashrom ?= "3682" SRCREV_pn-fltk2 ?= "6916" -SRCREV_pn-frameworkd-config-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373" +SRCREV_pn-frameworkd-config-shr ?= "2b62d1c9b02da047071105a7b5695acd6c6dbcca" SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr} SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b" SRCREV_pn-fsoraw ?= "20" @@ -121,8 +121,8 @@ SRCREV_pn-libmokopanelui2 ?= "4568" SRCREV_pn-libmokoui2 ?= "4695" SRCREV_pn-libnl2 ?= "8808743839b0f459394ecd00cb0f7c1896c0ab7a" SRCREV_pn-libowl ?= "277" -SRCREV_pn-libphone-ui ?= "c9cb5c3ddcd04c5cd2c02214fbc7734b8452981c" -SRCREV_pn-libphone-ui-shr ?= "acf4a496ed365fad77ab494bccda251141c1b57a" +SRCREV_pn-libphone-ui ?= "18e9bce8ef0cfca067674e1a1b7300949a227d57" +SRCREV_pn-libphone-ui-shr ?= "a642fc4689c8f4256b4c531aa53619dd6bc58391" SRCREV_pn-librfid ?= "2094" SRCREV_pn-libsnmp-perl ?= "17367" SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb" @@ -223,7 +223,7 @@ SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" -SRCREV_pn-opimd-utils ?= "7321c3f1a3cd781f9ed13ea3cac38879429dd420" +SRCREV_pn-opimd-utils ?= "1872cdebe1209123710259e25cb8c8b47a627112" SRCREV_pn-opkg ?= "522" SRCREV_pn-opkg-native ?= "522" SRCREV_pn-opkg-sdk ?= "522" @@ -236,9 +236,9 @@ SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f" SRCREV_pn-paroli ?= "bb9fb1969acdfbaa48b55902675a6d8949014c6d" -SRCREV_pn-phonefsod ?= "76d8cc085946e77e3fc27ef12a9d18411324747b" -SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6" -SRCREV_pn-phoneuid ?= "215e0b6e021e27cd042d675ec91d501a03211091" +SRCREV_pn-phonefsod ?= "5f6c7b084c7103546924a5da9910f0c8da0d23bf" +SRCREV_pn-phoneui-apps ?= "b3ab560b66088dbbd183e060d3166e0ebeb2c55e" +SRCREV_pn-phoneuid ?= "be0c9364a0b5e997be2151213249535d8e01f194" SRCREV_pn-portaudio-v19 ?= "1387" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "4662b55fdba528bb5b3349f83055bf236af5d63b" @@ -269,11 +269,11 @@ SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf" SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" -SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde" -SRCREV_pn-shr-launcher ?= "103" +SRCREV_pn-shr-installer ?= "8608816ea1a1ac14b6e9faaa3685dd2b6450e889" +SRCREV_pn-shr-launcher ?= "24450cba257e7057045ad576530f158a03bd0f8b103" SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" -SRCREV_pn-shr-settings ?= "ef06fe86c49958673889671c46682c0b2f1d74d7" -SRCREV_pn-shr-specs ?= "63dd65685a5ab8a304e6c9e12320f07ac58a0aca" +SRCREV_pn-shr-settings ?= "fd19508d43d8a0d990c63b329d935d2929c091dc" +SRCREV_pn-shr-specs ?= "062fb8278132ce64eeef3e488bef068387b87aff" SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-shr-splash-theme-handy ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" diff --git a/recipes/shr/libphone-utils_git.bb b/recipes/shr/libphone-utils_git.bb index eb7fb3b1cf..f842ccde17 100644 --- a/recipes/shr/libphone-utils_git.bb +++ b/recipes/shr/libphone-utils_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "phone-utils library" SECTION = "libs" -SRCREV = "8a7c719e0c3f1f8c10f77f17422da02d7177f0dd" +SRCREV = "3eb7242866543a266bd43a048d05b1a674ce94cf" PV = "0.0.2+gitr${SRCREV}" PR = "r2" -- cgit v1.2.3 From 90a13cad56ba215dc3b35046c404cc98c5b09931 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Mar 2010 09:19:04 +0100 Subject: apex-env 1.5.14: turn of QA checks, adding LDFLAGS is too hard for this --- recipes/apex/apex-env_1.5.14.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/apex/apex-env_1.5.14.bb b/recipes/apex/apex-env_1.5.14.bb index e97522e5e9..b279a5936d 100644 --- a/recipes/apex/apex-env_1.5.14.bb +++ b/recipes/apex/apex-env_1.5.14.bb @@ -3,7 +3,7 @@ SECTION = "misc" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ file://find-apex-partition.patch;patch=1 \ @@ -22,3 +22,7 @@ do_install() { install -d ${D}/${sbindir} install -m 755 ${S}/apex-env ${D}/${sbindir} } + +# Adding proper LDFLAGS support takes too much of my time, so hack around it +INSANE_SKIP_${PN} = True + -- cgit v1.2.3 From 4789ed2ce0fde708549003f6017b203fa179dff8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 3 Mar 2010 11:13:18 +0100 Subject: file: package also magic files - spotted by Koen Signed-off-by: Marcin Juszkiewicz --- recipes/file/file.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/file/file.inc b/recipes/file/file.inc index 5d4e737245..1aa4d69596 100644 --- a/recipes/file/file.inc +++ b/recipes/file/file.inc @@ -5,7 +5,7 @@ LICENSE = "BSD-ADV" DEPENDS = "file-native" DEPENDS_virtclass-native = "" -INCPR = "r1" +INCPR = "r2" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz" @@ -13,3 +13,5 @@ inherit autotools NATIVE_INSTALL_WORKS = "1" BBCLASSEXTEND = "native" + +FILES_${PN} += "${datadir}/misc/magic*" -- cgit v1.2.3 From eb7df07737ecb45d9f85e2f4276b8749071d9d4d Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 3 Mar 2010 11:58:51 +0100 Subject: pulseaudio: demote 0.9.19 and 0.9.21 for motorola ezx series and openmoko devices --- recipes/pulseaudio/pulseaudio_0.9.19.bb | 4 ++++ recipes/pulseaudio/pulseaudio_0.9.21.bb | 1 + 2 files changed, 5 insertions(+) diff --git a/recipes/pulseaudio/pulseaudio_0.9.19.bb b/recipes/pulseaudio/pulseaudio_0.9.19.bb index 272f16b6e3..4c51328a95 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.19.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.19.bb @@ -2,6 +2,10 @@ require pulseaudio.inc DEPENDS += "gdbm speex" +DEFAULT_PREFERENCE_om-gta01 = "-1" +DEFAULT_PREFERENCE_om-gta02 = "-1" +DEFAULT_PREFERENCE_motorola-ezx = "-1" + PR = "${INC_PR}.0" inherit gettext diff --git a/recipes/pulseaudio/pulseaudio_0.9.21.bb b/recipes/pulseaudio/pulseaudio_0.9.21.bb index 6ec8565a0d..c6aef2aa7c 100644 --- a/recipes/pulseaudio/pulseaudio_0.9.21.bb +++ b/recipes/pulseaudio/pulseaudio_0.9.21.bb @@ -4,6 +4,7 @@ DEPENDS += "gdbm speex" DEFAULT_PREFERENCE_om-gta01 = "-1" DEFAULT_PREFERENCE_om-gta02 = "-1" +DEFAULT_PREFERENCE_motorola-ezx = "-1" inherit gettext -- cgit v1.2.3 From b002cfb5d24acb7f8da29e3c3e7c2a6b3d321a74 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Wed, 3 Mar 2010 06:37:27 -0600 Subject: SlugOS: preferred-slugos-versions.inc: bump up libtool to latest version (Required by, at least, wireshark) --- conf/distro/include/preferred-slugos-versions.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index 204047fd63..e0ad87ddc3 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -48,10 +48,10 @@ PREFERRED_VERSION_glibc ?= "2.6.1" PREFERRED_VERSION_glibc-initial ?= "2.6.1" PREFERRED_VERSION_ipkg ?= "0.99.163" PREFERRED_VERSION_ipkg-native ?= "0.99.163" -PREFERRED_VERSION_libtool ?= "2.2.6a" -PREFERRED_VERSION_libtool-native ?= "2.2.6a" -PREFERRED_VERSION_libtool-cross ?= "2.2.6a" -PREFERRED_VERSION_libtool-sdk ?= "2.2.6a" +PREFERRED_VERSION_libtool ?= "2.2.6b" +PREFERRED_VERSION_libtool-native ?= "2.2.6b" +PREFERRED_VERSION_libtool-cross ?= "2.2.6b" +PREFERRED_VERSION_libtool-sdk ?= "2.2.6b" PREFERRED_VERSION_linux-libc-headers ?= "2.6.23" PREFERRED_VERSION_m4 ?= "1.4.8" PREFERRED_VERSION_m4-native ?= "1.4.8" -- cgit v1.2.3 From c852af3dc402c78f491c38a9dd8cd918daa90566 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Mar 2010 10:03:50 +0100 Subject: pango-native: remove 1.22.0 as it's already provided by pango_1.22.0.bb thanks to BBCLASSEXTEND from .inc file, resulting package seems the same * list of included files is the almost the same (native from pango_1.22.0.bb doesn't have tests (as removed with no-tests.patch from pango.inc). * PR changed from r0 to r2 Signed-off-by: Martin Jansa Acked-by: Koen Kooi --- recipes/pango/pango-native-1.22.0/no-tests.patch | 10 ---------- recipes/pango/pango-native_1.22.0.bb | 12 ------------ 2 files changed, 22 deletions(-) delete mode 100644 recipes/pango/pango-native-1.22.0/no-tests.patch delete mode 100644 recipes/pango/pango-native_1.22.0.bb diff --git a/recipes/pango/pango-native-1.22.0/no-tests.patch b/recipes/pango/pango-native-1.22.0/no-tests.patch deleted file mode 100644 index dafcb20c3b..0000000000 --- a/recipes/pango/pango-native-1.22.0/no-tests.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100 -+++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango modules pango-view examples docs tools tests -+SUBDIRS= pango modules pango-view examples docs tools - - EXTRA_DIST = \ - autogen.sh \ diff --git a/recipes/pango/pango-native_1.22.0.bb b/recipes/pango/pango-native_1.22.0.bb deleted file mode 100644 index ba2cf4ca3b..0000000000 --- a/recipes/pango/pango-native_1.22.0.bb +++ /dev/null @@ -1,12 +0,0 @@ - -require pango_1.22.0.bb - -inherit native - -DEPENDS += "glib-2.0-native cairo-native" -PROVIDES = "pango-native" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/pango-${PV}.tar.bz2" - -PR = "r0" - -- cgit v1.2.3 From 4f499f5ed9139cc9a0ef1a01bb988246cacc533c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Mar 2010 09:49:10 +0100 Subject: efreet: include efreet_desktop_cache_create in main package, because it's needed for e-wm start * Without it will fail with: ESTART: 0.34227 [0.00036] - efreet sh: /usr/bin/efreet_desktop_cache_create: not found <<<< Enlightenment Error >>>> Enlightenment cannot initialize the FDO desktop system. Perhaps you are out of memory? E17: Begin shutdown procedure! Signed-off-by: Martin Jansa --- recipes/efl1/efreet_svn.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/efl1/efreet_svn.bb b/recipes/efl1/efreet_svn.bb index 0d0bcdf329..ae442eefd3 100644 --- a/recipes/efl1/efreet_svn.bb +++ b/recipes/efl1/efreet_svn.bb @@ -2,10 +2,13 @@ DESCRIPTION = "The Enlightenment freedesktop.org library" DEPENDS = "ecore" LICENSE = "MIT BSD" PV = "0.5.0.060+svnr${SRCPV}" -PR = "r1" +PR = "r2" inherit efl PACKAGES =+ "${PN}-mime ${PN}-trash" FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*" FILES_${PN}-trash = "${libdir}/libefreet_trash.so.*" + +# efreet_desktop_cache_create is needed for e-wm start, don't include it in -tests +FILES_${PN} += "${bindir}/efreet_desktop_cache_create" -- cgit v1.2.3 From 3cd9ddbfa1dc88247390e02c2e5b2b950a56885f Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 26 Feb 2010 12:32:53 +0100 Subject: libxml2: migrate -native to BBCLASSEXTEND Signed-off-by: Martin Jansa --- recipes/libxml/libxml2-native.inc | 27 --------------------------- recipes/libxml/libxml2-native_2.7.3.bb | 2 -- recipes/libxml/libxml2.inc | 23 +++++++++++++++++++---- recipes/libxml/libxml2_2.7.3.bb | 2 +- 4 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 recipes/libxml/libxml2-native.inc delete mode 100644 recipes/libxml/libxml2-native_2.7.3.bb diff --git a/recipes/libxml/libxml2-native.inc b/recipes/libxml/libxml2-native.inc deleted file mode 100644 index 82d36b9f48..0000000000 --- a/recipes/libxml/libxml2-native.inc +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "GNOME XML library" -DEPENDS = "python-native" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}" - -SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz" -S = "${WORKDIR}/libxml2-${PV}" - -inherit autotools native pkgconfig distutils-native-base - -do_configure_prepend () { - EXTRA_LIBXML2_OECONF="\ - --with-python=${PYTHON_DIR} \ - --without-debug \ - --without-legacy \ - --with-catalog \ - --without-docbook \ - --with-c14n \ - " -} - -do_configure (){ - autotools_do_configure ${EXTRA_LIBXML2_OECONF} -} - -do_install_append() { - : -} diff --git a/recipes/libxml/libxml2-native_2.7.3.bb b/recipes/libxml/libxml2-native_2.7.3.bb deleted file mode 100644 index bcbfb6637b..0000000000 --- a/recipes/libxml/libxml2-native_2.7.3.bb +++ /dev/null @@ -1,2 +0,0 @@ -require libxml2-native.inc -PR = "r1" diff --git a/recipes/libxml/libxml2.inc b/recipes/libxml/libxml2.inc index b324228a2e..62c81bd2e0 100644 --- a/recipes/libxml/libxml2.inc +++ b/recipes/libxml/libxml2.inc @@ -2,14 +2,26 @@ DESCRIPTION = "GNOME XML Parser library" SECTION = "libs" PRIORITY = "optional" LICENSE = "MIT" +DEPENDS_virtclass-native = "python-native" -SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz" +SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=archive" +S = "${WORKDIR}/${BPN}-${PV}" -INC_PR = "r3" +INC_PR = "r4" -inherit autotools pkgconfig binconfig +BBCLASSEXTEND = "native" -EXTRA_OECONF = "--without-python --without-debug --without-legacy --with-catalog --with-docbook --with-c14n" +inherit autotools pkgconfig + +EXTRA_OECONF = "\ + --without-debug \ + --without-legacy \ + --with-catalog \ + --with-docbook \ + --with-c14n" + +EXTRA_OECONF_append = " --without-python" +EXTRA_OECONF_append_virtclass-native = " --with-python=${PYTHON_DIR}" export LDFLAGS += "-ldl" @@ -18,6 +30,9 @@ do_install_append() { #this is need it by php during its install install -m 0755 xml2-config ${STAGING_BINDIR_CROSS} } +do_install_append_virtclass-native() { + : +} DEBIANNAME_${PN} = "libxml2" diff --git a/recipes/libxml/libxml2_2.7.3.bb b/recipes/libxml/libxml2_2.7.3.bb index 5c92770eab..636ee91cd1 100644 --- a/recipes/libxml/libxml2_2.7.3.bb +++ b/recipes/libxml/libxml2_2.7.3.bb @@ -1,4 +1,4 @@ require libxml2.inc -PR = "${INC_PR}.1" +PR = "${INC_PR}.0" -- cgit v1.2.3 From 8e37605e4f41c9a920d0bf4786d73f3aa9b60a56 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 26 Jan 2010 23:12:28 +0100 Subject: libxml2: new version 2.7.6 Signed-off-by: Martin Jansa --- recipes/libxml/libxml2_2.7.6.bb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipes/libxml/libxml2_2.7.6.bb diff --git a/recipes/libxml/libxml2_2.7.6.bb b/recipes/libxml/libxml2_2.7.6.bb new file mode 100644 index 0000000000..4f56f73077 --- /dev/null +++ b/recipes/libxml/libxml2_2.7.6.bb @@ -0,0 +1,6 @@ +require libxml2.inc + +PR = "${INC_PR}.0" + +SRC_URI[archive.md5sum] = "7740a8ec23878a2f50120e1faa2730f2" +SRC_URI[archive.sha256sum] = "238c4f0203c012e5776522640c0fb3ac532c4064981c1ce3e74c00b75501d761" -- cgit v1.2.3 From ea8857e11221916a5256af11ddb010d9d82f8f23 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Mar 2010 14:28:16 +0100 Subject: gperf-native: convert to new style staging and BBCLASSEXTEND --- recipes/gperf/gperf-native_3.0.3.bb | 10 ---------- recipes/gperf/gperf_3.0.3.bb | 3 +++ 2 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 recipes/gperf/gperf-native_3.0.3.bb diff --git a/recipes/gperf/gperf-native_3.0.3.bb b/recipes/gperf/gperf-native_3.0.3.bb deleted file mode 100644 index 103d1aa3c2..0000000000 --- a/recipes/gperf/gperf-native_3.0.3.bb +++ /dev/null @@ -1,10 +0,0 @@ -require gperf_${PV}.bb - -S = "${WORKDIR}/gperf-${PV}" - -inherit native - -do_stage() { - install -d ${STAGING_BINDIR_NATIVE} - install ${S}/src/gperf ${STAGING_BINDIR_NATIVE} -} diff --git a/recipes/gperf/gperf_3.0.3.bb b/recipes/gperf/gperf_3.0.3.bb index 7abfb8fbfb..30b40be560 100644 --- a/recipes/gperf/gperf_3.0.3.bb +++ b/recipes/gperf/gperf_3.0.3.bb @@ -6,3 +6,6 @@ SRC_URI = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz \ file://autoreconf.patch;patch=1" inherit autotools + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" -- cgit v1.2.3 From f88f6869a98e882bdfe6c6627240009b3f67a105 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Mar 2010 15:32:10 +0100 Subject: pixman git: update to 0.17.8 + flags branch to test upcoming 0.18.x RCs --- recipes/xorg-lib/pixman_git.bb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb index 199c2fb4ca..3fdb698b66 100644 --- a/recipes/xorg-lib/pixman_git.bb +++ b/recipes/xorg-lib/pixman_git.bb @@ -3,25 +3,24 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -PV = "0.17.3" +PV = "0.17.8" PR = "r6" PR_append = "+gitr${SRCREV}" BBCLASSEXTEND="native" -SRCREV = "c97b1e803fc214e9880eaeff98410c8fa37f9ddc" +SRCREV = "7a15fa25ddb88ebb4ac00772854271f102f06e81" DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_shr = "1" -SRC_URI = "git://anongit.freedesktop.org/pixman;protocol=git \ - file://nearest-neighbour.patch;patch=1 \ - file://0001-ARM-NEON-optimized-pixman_blt.patch;patch=1 \ - file://0002-Test-program-for-pixman_blt-function.patch;patch=1 \ +SRC_URI = "git://anongit.freedesktop.org/~sandmann/pixman;protocol=git;branch=flags \ file://0003-Generic-C-implementation-of-pixman_blt-with-overlapp.patch;patch=1 \ file://0004-Support-of-overlapping-src-dst-for-pixman_blt_mmx.patch;patch=1 \ file://0005-Support-of-overlapping-src-dst-for-pixman_blt_sse2.patch;patch=1 \ file://0006-Support-of-overlapping-src-dst-for-pixman_blt_neon.patch;patch=1 \ + file://1-composite.patch;patch=1 \ + file://2-composite.patch;patch=1 \ + file://3-composite.patch;patch=1 \ " S = "${WORKDIR}/git" -- cgit v1.2.3 From 8a7dc51327aedf87418bcd3438db5b3435ba2136 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Mar 2010 16:29:38 +0100 Subject: shr: use numeric-alt keyboard in illume* config and default-numeric only in feed Signed-off-by: Martin Jansa --- recipes/shr/e-wm-config-illume-shr_git.bb | 4 ++-- recipes/shr/e-wm-config-illume2-shr_git.bb | 4 ++-- recipes/tasks/task-shr-feed.bb | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes/shr/e-wm-config-illume-shr_git.bb b/recipes/shr/e-wm-config-illume-shr_git.bb index 1a368c6fe5..80ce881fc2 100644 --- a/recipes/shr/e-wm-config-illume-shr_git.bb +++ b/recipes/shr/e-wm-config-illume-shr_git.bb @@ -3,7 +3,7 @@ SECTION = "e/utils" DEPENDS = "eet" LICENSE = "MIT BSD" PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" -PR = "r7" +PR = "r8" inherit e @@ -22,7 +22,7 @@ RRECOMMENDS_${PN} = "\ e-wm-sysactions-shr \ e-wm-menu-shr \ illume-keyboard-default-alpha \ - illume-keyboard-default-numeric \ + illume-keyboard-numeric-alt \ illume-keyboard-default-terminal \ " diff --git a/recipes/shr/e-wm-config-illume2-shr_git.bb b/recipes/shr/e-wm-config-illume2-shr_git.bb index 7f755c9902..76bf2f4c70 100644 --- a/recipes/shr/e-wm-config-illume2-shr_git.bb +++ b/recipes/shr/e-wm-config-illume2-shr_git.bb @@ -4,7 +4,7 @@ DEPENDS = "eet" LICENSE = "MIT BSD" SRCREV = "868999443054da51b198860459b92734a3b16d42" PV = "1.1-${EFL_SRCREV}+gitr${SRCREV}" -PR = "r7" +PR = "r8" inherit e @@ -22,7 +22,7 @@ RRECOMMENDS_${PN} = "\ e-wm-sysactions-shr \ e-wm-menu-shr \ illume-keyboard-default-alpha \ - illume-keyboard-default-numeric \ + illume-keyboard-numeric-alt \ illume-keyboard-default-terminal \ " diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb index 937675b1b9..1593006a99 100644 --- a/recipes/tasks/task-shr-feed.bb +++ b/recipes/tasks/task-shr-feed.bb @@ -1,5 +1,5 @@ DESCRIPTION = "SHR Feed" -PR = "r42" +PR = "r43" PV = "1.0" LICENSE = "GPL" @@ -226,6 +226,7 @@ RDEPENDS_${PN} += "\ illume-keyboard-german \ illume-keyboard-hebrew \ illume-keyboard-numeric-alt \ + illume-keyboard-default-numeric \ illume-keyboard-russian \ illume-keyboard-russian-terminal \ python-xlib \ -- cgit v1.2.3 From e6e884c834ec5b5152f237708bbc91e2feaebfb4 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 3 Mar 2010 17:16:45 +0100 Subject: shr-launcher: fix SRCREV * no idea what's revision from 732af689fae49fb80e184f2a31c6bdba3f210f11 but for svn recipe it's clearly wrong, 103 is latest Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 947f3b1555..3763deef45 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -270,7 +270,7 @@ SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf" SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-installer ?= "8608816ea1a1ac14b6e9faaa3685dd2b6450e889" -SRCREV_pn-shr-launcher ?= "24450cba257e7057045ad576530f158a03bd0f8b103" +SRCREV_pn-shr-launcher ?= "103" SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca" SRCREV_pn-shr-settings ?= "fd19508d43d8a0d990c63b329d935d2929c091dc" SRCREV_pn-shr-specs ?= "062fb8278132ce64eeef3e488bef068387b87aff" -- cgit v1.2.3 From 2e518a1a8f11b8000d151321c778fa66b376db96 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Mar 2010 18:11:22 +0100 Subject: libxml2: readd binconfig inherit that went missing --- recipes/libxml/libxml2.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/libxml/libxml2.inc b/recipes/libxml/libxml2.inc index 62c81bd2e0..207ef5b489 100644 --- a/recipes/libxml/libxml2.inc +++ b/recipes/libxml/libxml2.inc @@ -7,11 +7,11 @@ DEPENDS_virtclass-native = "python-native" SRC_URI = "ftp://xmlsoft.org/libxml2/libxml2-${PV}.tar.gz;name=archive" S = "${WORKDIR}/${BPN}-${PV}" -INC_PR = "r4" +INC_PR = "r5" BBCLASSEXTEND = "native" -inherit autotools pkgconfig +inherit autotools pkgconfig binconfig EXTRA_OECONF = "\ --without-debug \ -- cgit v1.2.3 From 8538297f89e828977eddc1539fa79cb42b8c1a96 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Mar 2010 18:21:35 +0100 Subject: libxslt 1.1.22: convert to new style staging and BBCLASSEXTEND=native --- recipes/libxslt/libxslt-native_1.1.17.bb | 4 ---- recipes/libxslt/libxslt-native_1.1.21.bb | 4 ---- recipes/libxslt/libxslt_1.1.22.bb | 9 ++++----- 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 recipes/libxslt/libxslt-native_1.1.17.bb delete mode 100644 recipes/libxslt/libxslt-native_1.1.21.bb diff --git a/recipes/libxslt/libxslt-native_1.1.17.bb b/recipes/libxslt/libxslt-native_1.1.17.bb deleted file mode 100644 index 6134b2bf57..0000000000 --- a/recipes/libxslt/libxslt-native_1.1.17.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libxslt_${PV}.bb -inherit native - -DEPENDS = "libxml2-native (>=2.6.25)" diff --git a/recipes/libxslt/libxslt-native_1.1.21.bb b/recipes/libxslt/libxslt-native_1.1.21.bb deleted file mode 100644 index 5157aaacbf..0000000000 --- a/recipes/libxslt/libxslt-native_1.1.21.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libxslt_${PV}.bb -inherit native - -DEPENDS = "libxml2-native (>=2.6.27)" diff --git a/recipes/libxslt/libxslt_1.1.22.bb b/recipes/libxslt/libxslt_1.1.22.bb index 86fe70dff2..068ff874cd 100644 --- a/recipes/libxslt/libxslt_1.1.22.bb +++ b/recipes/libxslt/libxslt_1.1.22.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "libxml2 (>=2.6.27)" LICENSE = "MIT" -PR = "r1" +PR = "r2" SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \ file://pkgconfig_fix.patch;patch=1" @@ -11,11 +11,10 @@ S = "${WORKDIR}/libxslt-${PV}" inherit autotools pkgconfig -EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" -do_stage () { - autotools_stage_all -} +EXTRA_OECONF = "--without-python --without-debug --without-mem-debug --without-crypto" PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale" -- cgit v1.2.3 From b9601a21e733d20d2dbf805609aca4b2cdc57bf1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Mar 2010 19:19:56 +0100 Subject: gecko-mediaplayer: bump PR so postinst picks up firefox 3.6 --- recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb index a9260836da..dcce29c881 100644 --- a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb +++ b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "firefox gtk+ gconf dbus-glib" RDEPENDS = "firefox gnome-mplayer" -PR = "r7" +PR = "r8" inherit autotools -- cgit v1.2.3 From 679a2367acde02f76f43f446c56c1eefed4e69c0 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 3 Mar 2010 12:05:33 -0700 Subject: firefox: Perform a number of cleanups and fix consistency issues. - parallel builds need to happen via MOZ_MAKE_FLAGS and it gripes if still passed -jN, so keep the old value before we clear it. - Move the HOST_LIBIDL stuff into configure, otherwise bad things happen when you don't have pkg-config on the buil