* [PATCH 0/3] Build Fixes
@ 2012-01-05 0:46 Saul Wold
2012-01-05 0:46 ` [PATCH 1/3] image_types: Fix rootfs size calcuation Saul Wold
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Saul Wold @ 2012-01-05 0:46 UTC (permalink / raw)
To: openembedded-core
Richard,
This set fixes various know build failures on the Autobuilder.
Sau!
The following changes since commit f309769d10cb3d8b72b8c7c4f7f418dcb8422c61:
valgrind: Fix for automake update (2012-01-04 16:03:59 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Saul Wold (3):
image_types: Fix rootfs size calcuation
glib-2.0: ensure dtrace is diabled for all distro options and fix
packaging
libxp: fix cast error
meta/classes/image_types.bbclass | 2 +-
meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb | 2 +-
meta/recipes-core/glib-2.0/glib.inc | 9 +++-
.../xorg-lib/libxp/fix-cast-error.patch | 42 ++++++++++++++++++++
meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb | 4 +-
5 files changed, 53 insertions(+), 6 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libxp/fix-cast-error.patch
--
1.7.6.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] image_types: Fix rootfs size calcuation
2012-01-05 0:46 [PATCH 0/3] Build Fixes Saul Wold
@ 2012-01-05 0:46 ` Saul Wold
2012-01-05 0:46 ` [PATCH 2/3] glib-2.0: ensure dtrace is diabled for all distro options and fix packaging Saul Wold
2012-01-05 0:46 ` [PATCH 3/3] libxp: fix cast error Saul Wold
2 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2012-01-05 0:46 UTC (permalink / raw)
To: openembedded-core
The ROOTFS_SIZE calculation was not correctly taking into account
the IMAGE_ROOTFS_EXTRA_SPACE variable, it would only be applied if
the size as determined by the ((du * overhead) + extra space) was
greater than the IMAGE_ROOTFS_SIZE, so if the du * overhead was smaller
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/image_types.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index ebff0ba..3010549 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -23,7 +23,7 @@ def get_imagecmds(d):
runimagecmd () {
# Image generation code for image type ${type}
- ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{size = $1 * ${IMAGE_OVERHEAD_FACTOR} + ${IMAGE_ROOTFS_EXTRA_SPACE}; OFMT = "%.0f" ; print (size > ${IMAGE_ROOTFS_SIZE} ? size : ${IMAGE_ROOTFS_SIZE}) }'`
+ ROOTFS_SIZE=`du -ks ${IMAGE_ROOTFS}|awk '{base_size = ($1 * ${IMAGE_OVERHEAD_FACTOR}); OFMT = "%.0f" ; print ((base_size > ${IMAGE_ROOTFS_SIZE} ? base_size : ${IMAGE_ROOTFS_SIZE}) + ${IMAGE_ROOTFS_EXTRA_SPACE}) }'`
${cmd}
cd ${DEPLOY_DIR_IMAGE}/
rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${type}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] glib-2.0: ensure dtrace is diabled for all distro options and fix packaging
2012-01-05 0:46 [PATCH 0/3] Build Fixes Saul Wold
2012-01-05 0:46 ` [PATCH 1/3] image_types: Fix rootfs size calcuation Saul Wold
@ 2012-01-05 0:46 ` Saul Wold
2012-01-05 8:05 ` Phil Blundell
2012-01-05 0:46 ` [PATCH 3/3] libxp: fix cast error Saul Wold
2 siblings, 1 reply; 6+ messages in thread
From: Saul Wold @ 2012-01-05 0:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb | 2 +-
meta/recipes-core/glib-2.0/glib.inc | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb
index 9b7c229..bdf92aa 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r1"
+PR = "r2"
PE = "1"
DEPENDS += "libffi python-argparse-native zlib"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 6c8bd68..b1033ea 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -27,11 +27,14 @@ S = "${WORKDIR}/glib-${PV}"
EXTRA_OECONF = "--disable-debug --enable-included-printf=no --disable-dtrace"
EXTRA_OECONF_virtclass-native = "--disable-dtrace --disable-systemtap"
-EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no"
+EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no --disbale-dtrace"
FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
-FILES_${PN}-dev += "${libdir}/glib-2.0/include"
-FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
+FILES_${PN}-dev += "${libdir}/glib-2.0/include \
+ ${libdir}/gio/modules/lib*${SOLIBSDEV} \
+ ${libdir}/gio/modules/*.la"
+FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \
+ ${libdir}/gio/modules/.debug"
ARM_INSTRUCTION_SET = "arm"
USE_NLS = "yes"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] libxp: fix cast error
2012-01-05 0:46 [PATCH 0/3] Build Fixes Saul Wold
2012-01-05 0:46 ` [PATCH 1/3] image_types: Fix rootfs size calcuation Saul Wold
2012-01-05 0:46 ` [PATCH 2/3] glib-2.0: ensure dtrace is diabled for all distro options and fix packaging Saul Wold
@ 2012-01-05 0:46 ` Saul Wold
2 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2012-01-05 0:46 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../xorg-lib/libxp/fix-cast-error.patch | 42 ++++++++++++++++++++
meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb | 4 +-
2 files changed, 45 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libxp/fix-cast-error.patch
diff --git a/meta/recipes-graphics/xorg-lib/libxp/fix-cast-error.patch b/meta/recipes-graphics/xorg-lib/libxp/fix-cast-error.patch
new file mode 100644
index 0000000..fea18cf
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxp/fix-cast-error.patch
@@ -0,0 +1,42 @@
+This patch fixes these new errors:
+
+| XpNotifyPdm.c:234:10: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
+| XpNotifyPdm.c:271:10: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
+| XpNotifyPdm.c:286:10: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
+
+
+Upstream-Status: Pending
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: libXp-1.0.1/src/XpNotifyPdm.c
+===================================================================
+--- libXp-1.0.1.orig/src/XpNotifyPdm.c
++++ libXp-1.0.1/src/XpNotifyPdm.c
+@@ -231,7 +231,7 @@ XpGetPdmStartParams (
+ /*
+ * Error - cannot determine or establish a selection_display.
+ */
+- return( (Status) NULL );
++ return( (Status) 0 );
+ }
+
+ /*
+@@ -268,7 +268,7 @@ XpGetPdmStartParams (
+ XCloseDisplay( *selection_display );
+ *selection_display = (Display *) NULL;
+ }
+- return( (Status) NULL );
++ return( (Status) 0 );
+ }
+
+ status = XmbTextListToTextProperty( *selection_display, list, 6,
+@@ -283,7 +283,7 @@ XpGetPdmStartParams (
+ XCloseDisplay( *selection_display );
+ *selection_display = (Display *) NULL;
+ }
+- return( (Status) NULL );
++ return( (Status) 0 );
+ }
+
+ *type = text_prop.encoding;
diff --git a/meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb b/meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb
index a19f561..349dad1 100644
--- a/meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxp_1.0.1.bb
@@ -10,12 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9504a1264f5ddd4949254a57c0f8d6bb \
file://src/XpPage.c;beginline=2;endline=35;md5=2b7d3d2ba5505b19271cf31b6918997e"
DEPENDS += "libxext libxau printproto"
-PR = "r0"
+PR = "r1"
PE = "1"
XORG_PN = "libXp"
CFLAGS_append += " -I ${S}/include/X11/XprintUtil -I ${S}/include/X11/extensions"
+SRC_URI += "file://fix-cast-error.patch"
+
SRC_URI[md5sum] = "7ae1d63748e79086bd51a633da1ff1a9"
SRC_URI[sha256sum] = "71d1f260005616d646b8c8788365f2b7d93911dac57bb53b65753d9f9e6443d2"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] glib-2.0: ensure dtrace is diabled for all distro options and fix packaging
2012-01-05 0:46 ` [PATCH 2/3] glib-2.0: ensure dtrace is diabled for all distro options and fix packaging Saul Wold
@ 2012-01-05 8:05 ` Phil Blundell
2012-01-05 8:12 ` Saul Wold
0 siblings, 1 reply; 6+ messages in thread
From: Phil Blundell @ 2012-01-05 8:05 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2012-01-04 at 16:46 -0800, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
This patch seems to be missing the long checkin message.
> --disbale-dtrace"
Really?
p.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] glib-2.0: ensure dtrace is diabled for all distro options and fix packaging
2012-01-05 8:05 ` Phil Blundell
@ 2012-01-05 8:12 ` Saul Wold
0 siblings, 0 replies; 6+ messages in thread
From: Saul Wold @ 2012-01-05 8:12 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Phil Blundell
On 01/05/2012 12:05 AM, Phil Blundell wrote:
> On Wed, 2012-01-04 at 16:46 -0800, Saul Wold wrote:
>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>
> This patch seems to be missing the long checkin message.
>
>> --disbale-dtrace"
>
Dyslexia strikes again! I did check this, but redid the commit from a
different machine.
Thanks for catching this.
Sau!
> Really?
>
> p.
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-01-05 8:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-05 0:46 [PATCH 0/3] Build Fixes Saul Wold
2012-01-05 0:46 ` [PATCH 1/3] image_types: Fix rootfs size calcuation Saul Wold
2012-01-05 0:46 ` [PATCH 2/3] glib-2.0: ensure dtrace is diabled for all distro options and fix packaging Saul Wold
2012-01-05 8:05 ` Phil Blundell
2012-01-05 8:12 ` Saul Wold
2012-01-05 0:46 ` [PATCH 3/3] libxp: fix cast error Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox