* [PATCH 1/3] libpcre: the generated libtool uses HOST_SYS
@ 2011-08-19 21:56 Chris Larson
2011-08-19 21:56 ` [PATCH 2/3] rpm: be certain we don't prefix our binaries Chris Larson
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Chris Larson @ 2011-08-19 21:56 UTC (permalink / raw)
To: openembedded-core; +Cc: Chris Larson
From: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
meta/recipes-support/libpcre/libpcre_8.12.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-support/libpcre/libpcre_8.12.bb b/meta/recipes-support/libpcre/libpcre_8.12.bb
index 9216777..24d91c3 100644
--- a/meta/recipes-support/libpcre/libpcre_8.12.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.12.bb
@@ -30,11 +30,11 @@ EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10
do_compile () {
# stop libtool from trying to link with host libraries - fix from #33
# this resolve build problem on amd64 - #1015
- if [ -e ${S}/${TARGET_SYS}-libtool ] ; then
- sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
+ if [ -e ${S}/${HOST_SYS}-libtool ] ; then
+ sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_SYS}-libtool
else
- ln -sf ${S}/libtool ${S}/${TARGET_SYS}-libtool
- sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
+ ln -sf ${S}/libtool ${S}/${HOST_SYS}-libtool
+ sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_SYS}-libtool
fi
# The generation of dftables can lead to timestamp problems with ccache
--
1.7.3.2.430.g208247
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] rpm: be certain we don't prefix our binaries
2011-08-19 21:56 [PATCH 1/3] libpcre: the generated libtool uses HOST_SYS Chris Larson
@ 2011-08-19 21:56 ` Chris Larson
2011-08-19 21:56 ` [PATCH 3/3] image_types_uboot: add uboot mkimage fs types Chris Larson
2011-08-24 3:43 ` [PATCH 1/3] libpcre: the generated libtool uses HOST_SYS Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Chris Larson @ 2011-08-19 21:56 UTC (permalink / raw)
To: openembedded-core; +Cc: Chris Larson
From: Chris Larson <chris_larson@mentor.com>
In certain combinations of build/host/target, they can end up
inadvertently prefixed, breaking the assumptions in the recipe.
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 0882df7..b805f7d 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -162,7 +162,8 @@ EXTRA_OECONF = "--verbose \
--enable-maintainer-mode \
--with-path-macros=${rpm_macros} \
--with-path-lib=${libdir}/rpm \
- --with-bugreport=http://bugzilla.yoctoproject.org"
+ --with-bugreport=http://bugzilla.yoctoproject.org \
+ --program-prefix="
CFLAGS_append = " -DRPM_VENDOR_WINDRIVER -DRPM_VENDOR_POKY"
--
1.7.3.2.430.g208247
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] image_types_uboot: add uboot mkimage fs types
2011-08-19 21:56 [PATCH 1/3] libpcre: the generated libtool uses HOST_SYS Chris Larson
2011-08-19 21:56 ` [PATCH 2/3] rpm: be certain we don't prefix our binaries Chris Larson
@ 2011-08-19 21:56 ` Chris Larson
2011-08-24 3:43 ` [PATCH 1/3] libpcre: the generated libtool uses HOST_SYS Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Chris Larson @ 2011-08-19 21:56 UTC (permalink / raw)
To: openembedded-core; +Cc: Chris Larson
From: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
meta/classes/image_types_uboot.bbclass | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
create mode 100644 meta/classes/image_types_uboot.bbclass
diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass
new file mode 100644
index 0000000..f08ad8d
--- /dev/null
+++ b/meta/classes/image_types_uboot.bbclass
@@ -0,0 +1,21 @@
+oe_mkimage () {
+ mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C gzip -n ${IMAGE_NAME} \
+ -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
+}
+
+UBOOT_IMAGE_DEPENDS = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
+
+IMAGE_DEPENDS_ext2.gz.u-boot = "${UBOOT_IMAGE_DEPENDS}"
+IMAGE_CMD_ext2.gz.u-boot = "${IMAGE_CMD_ext2.gz}; oe_mkimage ${IMAGE_NAME}.rootfs.ext2.gz"
+IMAGE_DEPENDS_ext2.bz2.u-boot = "${UBOOT_IMAGE_DEPENDS}"
+IMAGE_CMD_ext2.bz2.u-boot = "${IMAGE_CMD_ext2.bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.ext2.bz2"
+
+IMAGE_DEPENDS_ext3.gz.u-boot = "${UBOOT_IMAGE_DEPENDS}"
+IMAGE_CMD_ext3.gz.u-boot = "${IMAGE_CMD_ext3.gz}; oe_mkimage ${IMAGE_NAME}.rootfs.ext3.gz"
+IMAGE_DEPENDS_ext3.bz2.u-boot = "${UBOOT_IMAGE_DEPENDS}"
+IMAGE_CMD_ext3.bz2.u-boot = "${IMAGE_CMD_ext3.bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.ext3.bz2"
+
+IMAGE_DEPENDS_ext4.gz.u-boot = "${UBOOT_IMAGE_DEPENDS}"
+IMAGE_CMD_ext4.gz.u-boot = "${IMAGE_CMD_ext4.gz}; oe_mkimage ${IMAGE_NAME}.rootfs.ext4.gz"
+IMAGE_DEPENDS_ext4.bz2.u-boot = "${UBOOT_IMAGE_DEPENDS}"
+IMAGE_CMD_ext4.bz2.u-boot = "${IMAGE_CMD_ext4.bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.ext4.bz2"
--
1.7.3.2.430.g208247
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/3] libpcre: the generated libtool uses HOST_SYS
2011-08-19 21:56 [PATCH 1/3] libpcre: the generated libtool uses HOST_SYS Chris Larson
2011-08-19 21:56 ` [PATCH 2/3] rpm: be certain we don't prefix our binaries Chris Larson
2011-08-19 21:56 ` [PATCH 3/3] image_types_uboot: add uboot mkimage fs types Chris Larson
@ 2011-08-24 3:43 ` Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2011-08-24 3:43 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Chris Larson
On 08/19/2011 02:56 PM, Chris Larson wrote:
> From: Chris Larson<chris_larson@mentor.com>
>
> Signed-off-by: Chris Larson<chris_larson@mentor.com>
> ---
> meta/recipes-support/libpcre/libpcre_8.12.bb | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-support/libpcre/libpcre_8.12.bb b/meta/recipes-support/libpcre/libpcre_8.12.bb
> index 9216777..24d91c3 100644
> --- a/meta/recipes-support/libpcre/libpcre_8.12.bb
> +++ b/meta/recipes-support/libpcre/libpcre_8.12.bb
> @@ -30,11 +30,11 @@ EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10
> do_compile () {
> # stop libtool from trying to link with host libraries - fix from #33
> # this resolve build problem on amd64 - #1015
> - if [ -e ${S}/${TARGET_SYS}-libtool ] ; then
> - sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
> + if [ -e ${S}/${HOST_SYS}-libtool ] ; then
> + sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_SYS}-libtool
> else
> - ln -sf ${S}/libtool ${S}/${TARGET_SYS}-libtool
> - sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool
> + ln -sf ${S}/libtool ${S}/${HOST_SYS}-libtool
> + sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_SYS}-libtool
> fi
>
> # The generation of dftables can lead to timestamp problems with ccache
This whole series was merged into OE-Core (3 of 3) total.
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-24 3:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-19 21:56 [PATCH 1/3] libpcre: the generated libtool uses HOST_SYS Chris Larson
2011-08-19 21:56 ` [PATCH 2/3] rpm: be certain we don't prefix our binaries Chris Larson
2011-08-19 21:56 ` [PATCH 3/3] image_types_uboot: add uboot mkimage fs types Chris Larson
2011-08-24 3:43 ` [PATCH 1/3] libpcre: the generated libtool uses HOST_SYS Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.