* [PATCH 02/13] docbook-utils-native: Fix case where ${B} != ${S}
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
2013-03-18 2:05 ` [PATCH 03/13] e2fsprogs: " Richard Purdie
` (10 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Fix out of tree builds by using full paths to source and built
objects as appropriate.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../docbook-utils/docbook-utils-native_0.6.14.bb | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb b/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
index 5e1384d..78034dd 100644
--- a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
+++ b/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb
@@ -22,12 +22,12 @@ inherit autotools native
do_configure_prepend() {
# Fix hard-coded references to /etc/sgml
if [ ! -e ${S}/.sed_done ]; then
- sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" bin/jw.in
- sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/man/Makefile.am
- sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" doc/HTML/Makefile.am
+ sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" ${S}/bin/jw.in
+ sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" ${S}/doc/man/Makefile.am
+ sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" ${S}/doc/HTML/Makefile.am
# Point jw to the native sysroot catalog
- sed -i -e 's|^SGML_EXTRA_CATALOGS=""|SGML_EXTRA_CATALOGS=":${sysconfdir}/sgml/catalog"|g' bin/jw.in
+ sed -i -e 's|^SGML_EXTRA_CATALOGS=""|SGML_EXTRA_CATALOGS=":${sysconfdir}/sgml/catalog"|g' ${S}/bin/jw.in
touch ${S}/.sed_done
fi
}
@@ -44,14 +44,15 @@ do_install() {
ln -sf docbook2$doctype ${D}${bindir}/docbook-to-$doctype
done
- install -m 0755 ${S}/bin/jw ${D}${bindir}/
- for i in backends/dvi backends/html backends/man \
- backends/pdf backends/ps backends/rtf backends/tex \
- backends/texi backends/txt frontends/docbook \
- helpers/docbook2man-spec.pl helpers/docbook2texi-spec.pl \
- docbook-utils.dsl
+ install -m 0755 ${B}/bin/jw ${D}${bindir}/
+ for i in ${S}/backends/dvi ${S}/backends/html ${B}/backends/man \
+ ${S}/backends/pdf ${S}/backends/ps ${S}/backends/rtf ${S}/backends/tex \
+ ${B}/backends/texi ${S}/backends/txt ${B}/frontends/docbook \
+ ${S}/helpers/docbook2man-spec.pl ${S}/helpers/docbook2texi-spec.pl \
+ ${S}/docbook-utils.dsl
do
install -d ${D}${datadir}/sgml/docbook/utils-${PV}/`dirname $i`
- install ${S}/$i ${D}${datadir}/sgml/docbook/utils-${PV}/$i
+ install $i ${D}${datadir}/sgml/docbook/utils-${PV}/$i
done
+
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 03/13] e2fsprogs: Fix case where ${B} != ${S}
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
2013-03-18 2:05 ` [PATCH 02/13] docbook-utils-native: " Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
2013-03-18 2:05 ` [PATCH 04/13] distcc: " Richard Purdie
` (9 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Fix out of tree builds by placing built objects in the correct
location.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.7.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.7.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.7.bb
index 9e22563..3a4f5a8 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.7.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.7.bb
@@ -19,7 +19,7 @@ do_configure_prepend () {
do_compile_prepend () {
find ./ -print | grep -v ./patches | xargs chmod u=rwX
- ( cd ${S}/util; ${BUILD_CC} subst.c -o subst )
+ ( cd ${S}/util; ${BUILD_CC} subst.c -o ${B}/util/subst )
}
do_install () {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 04/13] distcc: Fix case where ${B} != ${S}
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
2013-03-18 2:05 ` [PATCH 02/13] docbook-utils-native: " Richard Purdie
2013-03-18 2:05 ` [PATCH 03/13] e2fsprogs: " Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
2013-03-18 2:14 ` Richard Purdie
2013-03-18 2:05 ` [PATCH 05/13] sudo: " Richard Purdie
` (8 subsequent siblings)
11 siblings, 1 reply; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Add patch to fix out of tree build failures.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/distcc/distcc_3.1.bb | 1 +
.../distcc/files/separatebuilddir.patch | 19 +++++++++++++++++++
2 files changed, 20 insertions(+)
create mode 100644 meta/recipes-devtools/distcc/files/separatebuilddir.patch
diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb
index eeda054..cb5d696 100644
--- a/meta/recipes-devtools/distcc/distcc_3.1.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.1.bb
@@ -17,6 +17,7 @@ PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+"
RRECOMMENDS_${PN} = "avahi-daemon"
SRC_URI = "http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \
+ file://separatebuilddir.patch \
file://default \
file://distccmon-gnome.desktop \
file://distcc"
diff --git a/meta/recipes-devtools/distcc/files/separatebuilddir.patch b/meta/recipes-devtools/distcc/files/separatebuilddir.patch
new file mode 100644
index 0000000..d945b9b
--- /dev/null
+++ b/meta/recipes-devtools/distcc/files/separatebuilddir.patch
@@ -0,0 +1,19 @@
+When building with a separate build directory, make install fails,
+unable to find the gnome_data files. This patch corrects the
+patch and ensures the build works in this case.
+
+RP 2013/3/8
+
+Index: distcc-3.1/Makefile.in
+===================================================================
+--- distcc-3.1.orig/Makefile.in 2008-12-02 21:50:31.000000000 +0000
++++ distcc-3.1/Makefile.in 2013-03-08 10:49:24.224400937 +0000
+@@ -1088,7 +1088,7 @@
+ install-gnome-data: $(gnome_data)
+ $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)"
+ for p in $(gnome_data); do \
+- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \
++ $(INSTALL_DATA) "$(srcdir)/$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \
+ done
+
+ install-conf: $(conf_files) $(default_files)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 04/13] distcc: Fix case where ${B} != ${S}
2013-03-18 2:05 ` [PATCH 04/13] distcc: " Richard Purdie
@ 2013-03-18 2:14 ` Richard Purdie
0 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:14 UTC (permalink / raw)
To: openembedded-core
On Mon, 2013-03-18 at 02:05 +0000, Richard Purdie wrote:
> Add patch to fix out of tree build failures.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> meta/recipes-devtools/distcc/distcc_3.1.bb | 1 +
> .../distcc/files/separatebuilddir.patch | 19 +++++++++++++++++++
> 2 files changed, 20 insertions(+)
> create mode 100644 meta/recipes-devtools/distcc/files/separatebuilddir.patch
I sent the version before I squashed an Upstream-Status into the patch,
final version will have that...
Cheers,
Richard
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 05/13] sudo: Fix case where ${B} != ${S}
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
` (2 preceding siblings ...)
2013-03-18 2:05 ` [PATCH 04/13] distcc: " Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
2013-03-18 2:05 ` [PATCH 06/13] lttng-ust: " Richard Purdie
` (7 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Fix out of tree builds by using full path to files in ${S} and remove
cwd assumptions.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-extended/sudo/sudo.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index babea37..7721cd5 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -16,8 +16,8 @@ inherit autotools
EXTRA_OECONF = "--with-editor=/bin/vi --with-env-editor"
do_configure_prepend () {
- if [ ! -e acinclude.m4 ]; then
- cat aclocal.m4 > acinclude.m4
+ if [ ! -e ${S}/acinclude.m4 ]; then
+ cat ${S}/aclocal.m4 > ${S}/acinclude.m4
fi
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 06/13] lttng-ust: Fix case where ${B} != ${S}
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
` (3 preceding siblings ...)
2013-03-18 2:05 ` [PATCH 05/13] sudo: " Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
2013-03-18 2:05 ` [PATCH 07/13] icu: " Richard Purdie
` (6 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Fix out of tree builds by ensuring bootstrap is executed in ${S}.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-kernel/lttng/lttng-ust_2.1.1.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.1.1.bb b/meta/recipes-kernel/lttng/lttng-ust_2.1.1.bb
index 2117981..8f8bbc7 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.1.1.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.1.1.bb
@@ -29,7 +29,7 @@ SRC_URI = "git://git.lttng.org/lttng-ust.git;protocol=git \
S = "${WORKDIR}/git"
do_configure_prepend () {
- ${S}/bootstrap
+ ( cd ${S}; ${S}/bootstrap )
}
# Due to liburcu not building for MIPS currently this recipe needs to
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 07/13] icu: Fix case where ${B} != ${S}
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
` (4 preceding siblings ...)
2013-03-18 2:05 ` [PATCH 06/13] lttng-ust: " Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
2013-03-18 2:05 ` [PATCH 08/13] nasm: Fix case where ${B} != ${S} (partial) Richard Purdie
` (5 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Fix out of tree builds by fixing cwd assumptions and using correct
full paths where needed, or just simply the correct paths.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-support/icu/icu.inc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-support/icu/icu.inc b/meta/recipes-support/icu/icu.inc
index 64b3edf..d7cb84a 100644
--- a/meta/recipes-support/icu/icu.inc
+++ b/meta/recipes-support/icu/icu.inc
@@ -27,15 +27,15 @@ EXTRA_OECONF_class-native = ""
# This is a bug of ICU. See bug reference:
# http://bugs.icu-project.org/trac/ticket/9790
do_configure_prepend() {
- [ -f acinclude.m4 ] || cp aclocal.m4 acinclude.m4
+ [ -f ${S}/acinclude.m4 ] || cp ${S}/aclocal.m4 ${S}/acinclude.m4
}
do_install_append_class-native() {
mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config
- cp -r ${S}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config
- cp -r ${S}/lib ${D}/${STAGING_ICU_DIR_NATIVE}
- cp -r ${S}/bin ${D}/${STAGING_ICU_DIR_NATIVE}
- cp -r ${S}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
+ cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config
+ cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE}
+ cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE}
+ cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE}
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 08/13] nasm: Fix case where ${B} != ${S} (partial)
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
` (5 preceding siblings ...)
2013-03-18 2:05 ` [PATCH 07/13] icu: " Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
2013-03-18 2:05 ` [PATCH 09/13] diffstat: Fix case where ${B} != ${S} Richard Purdie
` (4 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Fix out of tree build by fixing cwd assumptions.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/nasm/nasm_2.10.07.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/nasm/nasm_2.10.07.bb b/meta/recipes-devtools/nasm/nasm_2.10.07.bb
index 1c95ed8..bcecce4 100644
--- a/meta/recipes-devtools/nasm/nasm_2.10.07.bb
+++ b/meta/recipes-devtools/nasm/nasm_2.10.07.bb
@@ -13,8 +13,8 @@ SRC_URI[sha256sum] = "c056e2abc83816892e448f9e9e95a3d21e9e096f44341b9d4853f62a44
inherit autotools
do_configure_prepend () {
- if [ -f aclocal.m4 ] && [ ! -f acinclude.m4 ]; then
- mv aclocal.m4 acinclude.m4
+ if [ -f ${S}/aclocal.m4 ] && [ ! -f ${S}/acinclude.m4 ]; then
+ mv ${S}/aclocal.m4 ${S}/acinclude.m4
fi
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 09/13] diffstat: Fix case where ${B} != ${S}
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
` (6 preceding siblings ...)
2013-03-18 2:05 ` [PATCH 08/13] nasm: Fix case where ${B} != ${S} (partial) Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
2013-03-18 2:05 ` [PATCH 10/13] libfakekey: Update to new revision to fix ${B} != ${S} issues Richard Purdie
` (3 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Fix out of tree builds by fixing cwd assumptions.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/diffstat/diffstat_1.55.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.55.bb b/meta/recipes-devtools/diffstat/diffstat_1.55.bb
index fdc2967..9b347e8 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.55.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.55.bb
@@ -19,8 +19,8 @@ S = "${WORKDIR}/diffstat-${PV}"
inherit autotools gettext
do_configure () {
- if [ ! -e acinclude.m4 ]; then
- mv aclocal.m4 acinclude.m4
+ if [ ! -e ${S}/acinclude.m4 ]; then
+ mv ${S}/aclocal.m4 ${S}/acinclude.m4
fi
autotools_do_configure
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 10/13] libfakekey: Update to new revision to fix ${B} != ${S} issues
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
` (7 preceding siblings ...)
2013-03-18 2:05 ` [PATCH 09/13] diffstat: Fix case where ${B} != ${S} Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
2013-03-18 2:05 ` [PATCH 11/13] libsdl: Fix " Richard Purdie
` (2 subsequent siblings)
11 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Upgrade to new upstream revision which includes out of tree build
fixes.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-graphics/libfakekey/libfakekey_git.bb | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/libfakekey/libfakekey_git.bb b/meta/recipes-graphics/libfakekey/libfakekey_git.bb
index 6109ea0..b72f911 100644
--- a/meta/recipes-graphics/libfakekey/libfakekey_git.bb
+++ b/meta/recipes-graphics/libfakekey/libfakekey_git.bb
@@ -10,9 +10,8 @@ LIC_FILES_CHKSUM = "file://src/libfakekey.c;endline=30;md5=602b5ccd48f6440751086
DEPENDS = "libxtst"
SECTION = "x11/wm"
-SRCREV = "e8c2e412ea4a417afc1f30e32cb7bdc508b1dccc"
+SRCREV = "e327ff049b8503af2dadffa84370a0860b9fb682"
PV = "0.0+git${SRCPV}"
-PR = "r0"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 11/13] libsdl: Fix ${B} != ${S} issues
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
` (8 preceding siblings ...)
2013-03-18 2:05 ` [PATCH 10/13] libfakekey: Update to new revision to fix ${B} != ${S} issues Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
2013-03-18 2:05 ` [PATCH 12/13] xcursor-transparent-theme: Refresh patches and ${B} != ${S} fixes Richard Purdie
2013-03-18 2:05 ` [PATCH 13/13] libnewt: Fix ${B} != ${S} (partial) Richard Purdie
11 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Fix out of tree builds by remvoing cwd assumption.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index 5776617..1bee364 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -57,7 +57,7 @@ do_configure_prepend() {
# Remove old libtool macros.
MACROS="libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4"
for i in ${MACROS}; do
- rm -f acinclude/$i
+ rm -f ${S}/acinclude/$i
done
export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 12/13] xcursor-transparent-theme: Refresh patches and ${B} != ${S} fixes
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
` (9 preceding siblings ...)
2013-03-18 2:05 ` [PATCH 11/13] libsdl: Fix " Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
2013-03-18 2:05 ` [PATCH 13/13] libnewt: Fix ${B} != ${S} (partial) Richard Purdie
11 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Refresh the patches and fix out of tree build issue.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../fix_watch_cursor.patch | 23 ++++++-------------
.../use-relative-symlinks.patch | 24 +++++++++++++++-----
2 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
index 722bda3..cfac55c 100644
--- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
+++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch
@@ -1,8 +1,11 @@
-Upstream-Status: Inappropriate [configuration]
+Fix typo in Makefile
-diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
---- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am 2003-10-30 13:13:59.000000000 +0100
-+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2005-12-20 23:35:17.000000000 +0100
+Upstream-Status: Pending
+
+Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am
+===================================================================
+--- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:04.001435305 +0000
++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:04.061435302 +0000
@@ -79,7 +79,7 @@
ul_angle \
ur_angle \
@@ -12,15 +15,3 @@ diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.am xcursor-tran
xterm
CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
-diff -NurP xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in xcursor-transparent-theme-0.1.1/cursors/Makefile.in
---- xcursor-transparent-theme-0.1.1-orig/cursors/Makefile.in 2003-10-31 15:31:13.000000000 +0100
-+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.in 2005-12-20 23:35:36.000000000 +0100
-@@ -67,7 +67,7 @@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
-
--CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_!
arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow watcha xterm
-+CURSOR_NAMES = 00008160000006810000408080010102 028006030e0e7ebffc7f7070c0600140 03b6e0fcb3499374a867c041f52298f0 08e8e1c95fe2fc01f976f1e063a24ccd 14fef782d02440884392942c11205230 2870a09082c103050810ffdffffe0204 3ecb610c1bf2410f44200f48c40d3599 4498f0e0c1937ffe01fd06f973665830 9d800788f1b08800ae810202380a0822 c7088f0f3e6c8088236ef8e1e3e70000 d9ce0ab605698f320427677b458ad60b e29285e634086352946a0e7090d73106 fcf1c3c7cd4491d801f1e1c78f100000 X_cursor arrow base_arrow_down base_arrow_up based_arrow_down based_arrow_up bd_double_arrow boat bottom_left_corner bottom_right_corner bottom_side bottom_tee center_ptr circle cross cross_reverse crossed_circle crosshair dot dot_box_mask dotbox double_arrow draft_large draft_small draped_box exchange fd_double_arrow fleur gumby h_double_arrow hand hand1 hand2 left_ptr left_ptr_watch left_side left_tee ll_angle lr_angle move pencil pirate plus question_!
arrow right_ptr right_side right_tee sailboat sb_down_arrow sb_h_double_arrow sb_left_arrow sb_right_arrow sb_up_arrow sb_v_double_arrow shuttle sizing target tcross top_left_arrow top_left_corner top_right_corner top_side top_tee trek ul_angle ur_angle v_double_arrow watch xterm
-
-
- CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors
diff --git a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
index ae9640c..5028fd6 100644
--- a/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
+++ b/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch
@@ -1,10 +1,22 @@
-Upstream-Status: Inappropriate [configuration]
+Use relative symlink for link rather than absolute path which
+doesn't work well in DESTDIR setting.
-diff -ur xcursor-transparent-theme-0.1.1~/cursors/Makefile.am xcursor-transparent-theme-0.1.1/cursors/Makefile.am
---- xcursor-transparent-theme-0.1.1~/cursors/Makefile.am 2003-10-30 12:13:59.000000000 +0000
-+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2004-07-27 12:56:24.000000000 +0100
-@@ -91,6 +91,6 @@
- $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/
+Also fix out of tree builds to use correct srcdir.
+
+Upstream-Status: Pending
+
+RP 2013/3/8
+
+Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am
+===================================================================
+--- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:03.933435307 +0000
++++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:27.293434755 +0000
+@@ -88,9 +88,9 @@
+
+ install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(CURSOR_DIR);
+- $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/
++ $(INSTALL_DATA) $(srcdir)/$(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/
for CURSOR in $(CURSOR_NAMES); do \
echo '-- Installing cursor '$$CURSOR; \
- ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 13/13] libnewt: Fix ${B} != ${S} (partial)
2013-03-18 2:04 [PATCH 01/13] chrpath: Fix case where ${B} != ${S} Richard Purdie
` (10 preceding siblings ...)
2013-03-18 2:05 ` [PATCH 12/13] xcursor-transparent-theme: Refresh patches and ${B} != ${S} fixes Richard Purdie
@ 2013-03-18 2:05 ` Richard Purdie
11 siblings, 0 replies; 14+ messages in thread
From: Richard Purdie @ 2013-03-18 2:05 UTC (permalink / raw)
To: openembedded-core
Fix low hanging out of tree build issue but others remain.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-extended/newt/libnewt_0.52.14.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/newt/libnewt_0.52.14.bb b/meta/recipes-extended/newt/libnewt_0.52.14.bb
index c1ec029..54da15d 100644
--- a/meta/recipes-extended/newt/libnewt_0.52.14.bb
+++ b/meta/recipes-extended/newt/libnewt_0.52.14.bb
@@ -45,7 +45,7 @@ export HOST_SYS
PACKAGES_prepend = "whiptail ${PN}-python "
do_configure_prepend() {
- sh autogen.sh
+ ( cd ${S}; sh autogen.sh )
}
FILES_whiptail = "${bindir}/whiptail"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 14+ messages in thread