* [PATCH 1/2] mono-xsp: Fix parse warnings
@ 2014-02-04 18:44 Khem Raj
2014-02-04 18:44 ` [PATCH 2/2] mono: Fix the recipes for patch paths Khem Raj
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Khem Raj @ 2014-02-04 18:44 UTC (permalink / raw)
To: ajlennon, yocto
WARNING: Variable key FILES_${PN}-dev (${includedir} ${FILES_SOLIBSDEV}
${libdir}/*.la ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig
${datadir}/aclocal ${base_libdir}/*.o ${libdir}/${BPN}/*.la
${base_libdir}/*.la) replaces original key FILES_mono-xsp-dev (
/usr/lib/pkgconfig/xsp.pc /usr/lib/pkgconfig/xsp-2.pc ).
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes-mono/mono-xsp/mono-xsp_1.2.5.bb | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/recipes-mono/mono-xsp/mono-xsp_1.2.5.bb b/recipes-mono/mono-xsp/mono-xsp_1.2.5.bb
index b27e74e..648477a 100644
--- a/recipes-mono/mono-xsp/mono-xsp_1.2.5.bb
+++ b/recipes-mono/mono-xsp/mono-xsp_1.2.5.bb
@@ -7,7 +7,6 @@ SECTION = "devel/mono"
# - scripts in /usr/bin contain the wrong paths
#
-
PR = "r5"
DEPENDS = "mono"
@@ -21,16 +20,14 @@ SRC_URI = "http://go-mono.com/sources/xsp/xsp-${PV}.tar.bz2"
S = "${WORKDIR}/xsp-${PV}"
-PACKAGES = "${PN}-dbg \
+PACKAGES += "\
libmono-webserver1.0-cil \
libmono-webserver2.0-cil \
mono-xsp \
- mono-xsp2 \
- mono-xsp-test \
+ ${PN}2 \
+ ${PN}-test \
mono-mod-mono-server \
mono-mod-mono-server2 \
- mono-xsp-doc \
- mono-xsp-dev \
"
FILES_libmono-webserver1.0-cil-dbg += " \
@@ -91,11 +88,11 @@ FILES_mono-mod-mono-server2 = "\
/usr/lib/mono/2.0/mod-mono-server2.exe \
/usr/bin/mod-mono-server2 \
"
-FILES_mono-xsp-dev = "\
+FILES_${PN}-dev = "\
/usr/lib/pkgconfig/xsp.pc \
/usr/lib/pkgconfig/xsp-2.pc \
"
-FILES_mono-xsp-test = " \
+FILES_${PN}-test = " \
/usr/lib/xsp/test/1.1/authtest/index.aspx \
/usr/lib/xsp/test/1.1/authtest/login.aspx \
/usr/lib/xsp/test/1.1/authtest/web.config \
@@ -228,7 +225,5 @@ FILES_mono-xsp-test = " \
/usr/lib/xsp/test/2.0/masterpages/content2.aspx \
"
-
-
SRC_URI[md5sum] = "adb7871e5ebeefcf8ed959523442c0fb"
SRC_URI[sha256sum] = "25c246b7ed3e82a5f3562c2c15db551332830de4c238a53e3260ab7d40cd015a"
--
1.8.5.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] mono: Fix the recipes for patch paths
2014-02-04 18:44 [PATCH 1/2] mono-xsp: Fix parse warnings Khem Raj
@ 2014-02-04 18:44 ` Khem Raj
2014-02-05 11:43 ` [PATCH 1/2] mono-xsp: Fix parse warnings Paul Eggleton
2014-02-26 20:59 ` Alex J Lennon
2 siblings, 0 replies; 4+ messages in thread
From: Khem Raj @ 2014-02-04 18:44 UTC (permalink / raw)
To: ajlennon, yocto
Remove redundant patches, use PV where possible and
remove hardcoding
Reorganise the patch directories
Fixes parse warnings like
WARNING: Unable to get checksum for mono SRC_URI entry Makefile.am.diff:
file could not be found
WARNING: Unable to get checksum for mono-native SRC_URI entry
Makefile.am.diff: file could not be found
WARNING: Unable to get checksum for mono SRC_URI entry config.in.diff:
file could not be found
WARNING: Unable to get checksum for mono-native SRC_URI entry
config.in.diff: file could not be found
WARNING: Unable to get checksum for mono-native SRC_URI entry
Makefile.diff: file could not be found
WARNING: Unable to get checksum for mono SRC_URI entry Makefile.diff:
file could not be found
done.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../files/patch-mono-native-atomic-armv6.patch | 66 ----------------------
recipes-mono/mono/mono-2.10.8.1.inc | 6 +-
recipes-mono/mono/mono-2.11.inc | 6 +-
.../mono/{files => }/mono-2.11/Makefile.am.diff | 0
.../mono/{files => }/mono-2.11/data/config.in.diff | 0
.../patch-mono-atomic-armv6.patch | 0
recipes-mono/mono/mono-native_2.10.8.1.bb | 10 ++--
recipes-mono/mono/mono-native_2.11.bb | 15 ++---
recipes-mono/mono/mono_2.10.8.1.bb | 2 +-
recipes-mono/mono/mono_2.11.bb | 8 +--
10 files changed, 21 insertions(+), 92 deletions(-)
delete mode 100644 recipes-mono/mono/files/patch-mono-native-atomic-armv6.patch
rename recipes-mono/mono/{files => }/mono-2.11/Makefile.am.diff (100%)
rename recipes-mono/mono/{files => }/mono-2.11/data/config.in.diff (100%)
rename recipes-mono/mono/{files => mono-2.11}/patch-mono-atomic-armv6.patch (100%)
diff --git a/recipes-mono/mono/files/patch-mono-native-atomic-armv6.patch b/recipes-mono/mono/files/patch-mono-native-atomic-armv6.patch
deleted file mode 100644
index a825d68..0000000
--- a/recipes-mono/mono/files/patch-mono-native-atomic-armv6.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru mono-2.11.org/mono/io-layer/atomic.h mono-2.11/mono/io-layer/atomic.h
---- mono-2.11.org/mono/io-layer/atomic.h 2012-12-23 18:06:38.924514678 +0000
-+++ mono-2.11/mono/io-layer/atomic.h 2012-12-23 18:08:03.864516082 +0000
-@@ -752,7 +752,7 @@
-
- static inline gint32 InterlockedCompareExchange(volatile gint32 *dest, gint32 exch, gint32 comp)
- {
--#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
-+#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
- gint32 ret, tmp;
- __asm__ __volatile__ ( "1:\n"
- "dmb\n"
-@@ -792,7 +792,7 @@
-
- static inline gpointer InterlockedCompareExchangePointer(volatile gpointer *dest, gpointer exch, gpointer comp)
- {
--#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
-+#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
- gpointer ret, tmp;
- __asm__ __volatile__ (
- "dmb\n"
-@@ -833,7 +833,7 @@
-
- static inline gint32 InterlockedIncrement(volatile gint32 *dest)
- {
--#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
-+#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
- gint32 ret, flag;
- __asm__ __volatile__ (
- "dmb\n"
-@@ -869,7 +869,7 @@
-
- static inline gint32 InterlockedDecrement(volatile gint32 *dest)
- {
--#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
-+#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
- gint32 ret, flag;
- __asm__ __volatile__ (
- "dmb\n"
-@@ -905,7 +905,7 @@
-
- static inline gint32 InterlockedExchange(volatile gint32 *dest, gint32 exch)
- {
--#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
-+#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
- gint32 ret, flag;
- __asm__ __volatile__ (
- "dmb\n"
-@@ -932,7 +932,7 @@
-
- static inline gpointer InterlockedExchangePointer(volatile gpointer *dest, gpointer exch)
- {
--#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
-+#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
- gpointer ret, flag;
- __asm__ __volatile__ (
- "dmb\n"
-@@ -959,7 +959,7 @@
-
- static inline gint32 InterlockedExchangeAdd(volatile gint32 *dest, gint32 add)
- {
--#if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
-+#if defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7__)
- gint32 ret, tmp, flag;
- __asm__ __volatile__ (
- "dmb\n"
diff --git a/recipes-mono/mono/mono-2.10.8.1.inc b/recipes-mono/mono/mono-2.10.8.1.inc
index 79f1b3e..ad481fd 100644
--- a/recipes-mono/mono/mono-2.10.8.1.inc
+++ b/recipes-mono/mono/mono-2.10.8.1.inc
@@ -7,9 +7,9 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=80862f3fd0e11a5fa0318070c54461ce"
SRC_URI = "http://download.mono-project.com/sources/mono/mono-${PV}.tar.gz \
- file://mono-2.10.8.1/Makefile.am.diff \
- file://mono-2.10.8.1/data/config.in.diff \
- file://mono-2.10.8.1/mcs/class/Makefile.diff"
+ file://Makefile.am.diff \
+ file://data/config.in.diff \
+ file://mcs/class/Makefile.diff"
SRC_URI[md5sum] = "c7fd34d59f67e2a13e5421ba2441bc9d"
SRC_URI[sha256sum] = "1dfc666f8b6e90079d9b290d7f9cf63c15bdbce23f0223cad3163c9c926c9040"
diff --git a/recipes-mono/mono/mono-2.11.inc b/recipes-mono/mono/mono-2.11.inc
index 6d7578c..a618fa6 100644
--- a/recipes-mono/mono/mono-2.11.inc
+++ b/recipes-mono/mono/mono-2.11.inc
@@ -7,8 +7,10 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=80862f3fd0e11a5fa0318070c54461ce"
SRC_URI = "http://download.mono-project.com/sources/mono/mono-${PV}.0.tar.bz2 \
- file://mono-2.11/Makefile.am.diff \
- file://mono-2.11/data/config.in.diff"
+ file://Makefile.am.diff \
+ file://patch-mono-atomic-armv6.patch \
+ file://data/config.in.diff \
+ "
SRC_URI[md5sum] = "8f31f366da9f7e4b69ee23e8bf5b6b3d"
SRC_URI[sha256sum] = "de6515a4e1f73229711eaa5557009ec59a676554f8d48c45fc88944afd720f85"
diff --git a/recipes-mono/mono/files/mono-2.11/Makefile.am.diff b/recipes-mono/mono/mono-2.11/Makefile.am.diff
similarity index 100%
rename from recipes-mono/mono/files/mono-2.11/Makefile.am.diff
rename to recipes-mono/mono/mono-2.11/Makefile.am.diff
diff --git a/recipes-mono/mono/files/mono-2.11/data/config.in.diff b/recipes-mono/mono/mono-2.11/data/config.in.diff
similarity index 100%
rename from recipes-mono/mono/files/mono-2.11/data/config.in.diff
rename to recipes-mono/mono/mono-2.11/data/config.in.diff
diff --git a/recipes-mono/mono/files/patch-mono-atomic-armv6.patch b/recipes-mono/mono/mono-2.11/patch-mono-atomic-armv6.patch
similarity index 100%
rename from recipes-mono/mono/files/patch-mono-atomic-armv6.patch
rename to recipes-mono/mono/mono-2.11/patch-mono-atomic-armv6.patch
diff --git a/recipes-mono/mono/mono-native_2.10.8.1.bb b/recipes-mono/mono/mono-native_2.10.8.1.bb
index a73152f..f0c8df7 100644
--- a/recipes-mono/mono/mono-native_2.10.8.1.bb
+++ b/recipes-mono/mono/mono-native_2.10.8.1.bb
@@ -1,15 +1,17 @@
-require mono-2.10.8.1.inc
+require mono-${PV}.inc
inherit native autotools
+FILESPATH =. "${FILE_DIRNAME}/mono-${PV}:"
+
PR = "r1"
EXTRA_OECONF += "mono_cv_uscore=no --with-tls=pthread --with-sigaltstack=no --with-mcs-docs=no"
do_configure_prepend() {
- autoreconf -Wcross --verbose --install --force || bbnote "mono-native failed to autoreconf"
- sed -e "s/libtool/${BUILD_SYS}-libtool/" -i runtime/monodis-wrapper.in
- sed -e "s/libtool/${BUILD_SYS}-libtool/" -i runtime/mono-wrapper.in
+ autoreconf -Wcross --verbose --install --force || bbnote "mono-native failed to autoreconf"
+ sed -e "s/libtool/${BUILD_SYS}-libtool/" -i runtime/monodis-wrapper.in
+ sed -e "s/libtool/${BUILD_SYS}-libtool/" -i runtime/mono-wrapper.in
sed -e "s/slash\}libtool/slash\}${HOST_SYS}-libtool/" -i acinclude.m4
sed -e "s/slash\}libtool/slash\}${HOST_SYS}-libtool/" -i libgc/acinclude.m4
sed -e "s/slash\}libtool/slash\}${HOST_SYS}-libtool/" -i eglib/acinclude.m4
diff --git a/recipes-mono/mono/mono-native_2.11.bb b/recipes-mono/mono/mono-native_2.11.bb
index 8b4f9f6..a64f9f8 100644
--- a/recipes-mono/mono/mono-native_2.11.bb
+++ b/recipes-mono/mono/mono-native_2.11.bb
@@ -1,21 +1,18 @@
-require mono-2.11.inc
+require mono-${PV}.inc
inherit native autotools
+FILESPATH =. "${FILE_DIRNAME}/mono-${PV}:"
+
PR = "r1"
EXTRA_OECONF += "mono_cv_uscore=no --with-tls=pthread --with-sigaltstack=no --with-mcs-docs=no"
do_configure_prepend() {
- autoreconf -Wcross --verbose --install --force || bbnote "mono-native failed to autoreconf"
- sed -e "s/libtool/${BUILD_SYS}-libtool/" -i runtime/monodis-wrapper.in
- sed -e "s/libtool/${BUILD_SYS}-libtool/" -i runtime/mono-wrapper.in
+ autoreconf -Wcross --verbose --install --force || bbnote "mono-native failed to autoreconf"
+ sed -e "s/libtool/${BUILD_SYS}-libtool/" -i runtime/monodis-wrapper.in
+ sed -e "s/libtool/${BUILD_SYS}-libtool/" -i runtime/mono-wrapper.in
sed -e "s/slash\}libtool/slash\}${HOST_SYS}-libtool/" -i acinclude.m4
sed -e "s/slash\}libtool/slash\}${HOST_SYS}-libtool/" -i libgc/acinclude.m4
sed -e "s/slash\}libtool/slash\}${HOST_SYS}-libtool/" -i eglib/acinclude.m4
}
-
-#
-# Add patch to remove armv6 define() in atomic.h (breaks compiler for armv6)
-#
-SRC_URI += "file://patch-mono-native-atomic-armv6.patch"
diff --git a/recipes-mono/mono/mono_2.10.8.1.bb b/recipes-mono/mono/mono_2.10.8.1.bb
index 394d9ff..59c1048 100644
--- a/recipes-mono/mono/mono_2.10.8.1.bb
+++ b/recipes-mono/mono/mono_2.10.8.1.bb
@@ -1,4 +1,4 @@
-require mono-2.10.8.1.inc
+require mono-${PV}.inc
inherit autotools pkgconfig
diff --git a/recipes-mono/mono/mono_2.11.bb b/recipes-mono/mono/mono_2.11.bb
index fa55e1b..a5fdbcf 100644
--- a/recipes-mono/mono/mono_2.11.bb
+++ b/recipes-mono/mono/mono_2.11.bb
@@ -1,4 +1,4 @@
-require mono-2.11.inc
+require mono-${PV}.inc
inherit autotools pkgconfig
@@ -29,9 +29,3 @@ FILES_${PN} += "${libdir}/libMonoPosixHelper.so"
FILES_${PN} += "${libdir}/libMonoSupportW.so"
INSANE_SKIP_${PN} = "arch dev-so debug-files"
-
-#
-# Add patch to remove armv6 define() in atomic.h (breaks compiler for armv6)
-#
-SRC_URI += " file://patch-mono-atomic-armv6.patch"
-
--
1.8.5.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] mono-xsp: Fix parse warnings
2014-02-04 18:44 [PATCH 1/2] mono-xsp: Fix parse warnings Khem Raj
2014-02-04 18:44 ` [PATCH 2/2] mono: Fix the recipes for patch paths Khem Raj
@ 2014-02-05 11:43 ` Paul Eggleton
2014-02-26 20:59 ` Alex J Lennon
2 siblings, 0 replies; 4+ messages in thread
From: Paul Eggleton @ 2014-02-05 11:43 UTC (permalink / raw)
To: Khem Raj; +Cc: yocto, ajlennon
Hi Khem,
On Tuesday 04 February 2014 10:44:57 Khem Raj wrote:
> WARNING: Variable key FILES_${PN}-dev (${includedir} ${FILES_SOLIBSDEV}
> ${libdir}/*.la ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig
> ${datadir}/aclocal ${base_libdir}/*.o ${libdir}/${BPN}/*.la
> ${base_libdir}/*.la) replaces original key FILES_mono-xsp-dev (
> /usr/lib/pkgconfig/xsp.pc /usr/lib/pkgconfig/xsp-2.pc ).
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes-mono/mono-xsp/mono-xsp_1.2.5.bb | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/recipes-mono/mono-xsp/mono-xsp_1.2.5.bb
> b/recipes-mono/mono-xsp/mono-xsp_1.2.5.bb index b27e74e..648477a 100644
> --- a/recipes-mono/mono-xsp/mono-xsp_1.2.5.bb
> +++ b/recipes-mono/mono-xsp/mono-xsp_1.2.5.bb
> @@ -7,7 +7,6 @@ SECTION = "devel/mono"
> # - scripts in /usr/bin contain the wrong paths
> #
>
> -
> PR = "r5"
>
> DEPENDS = "mono"
> @@ -21,16 +20,14 @@ SRC_URI =
> "http://go-mono.com/sources/xsp/xsp-${PV}.tar.bz2"
>
> S = "${WORKDIR}/xsp-${PV}"
>
> -PACKAGES = "${PN}-dbg \
> +PACKAGES += "\
Should this be += or =+ ?
> libmono-webserver1.0-cil \
> libmono-webserver2.0-cil \
> mono-xsp \
> - mono-xsp2 \
> - mono-xsp-test \
> + ${PN}2 \
> + ${PN}-test \
Er, so you've changed it to modify instead of set PACKAGES above, so shouldn't
the "mono-xsp" entry be removed as well since ${PN} is already in the default
value of PACKAGES?
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] mono-xsp: Fix parse warnings
2014-02-04 18:44 [PATCH 1/2] mono-xsp: Fix parse warnings Khem Raj
2014-02-04 18:44 ` [PATCH 2/2] mono: Fix the recipes for patch paths Khem Raj
2014-02-05 11:43 ` [PATCH 1/2] mono-xsp: Fix parse warnings Paul Eggleton
@ 2014-02-26 20:59 ` Alex J Lennon
2 siblings, 0 replies; 4+ messages in thread
From: Alex J Lennon @ 2014-02-26 20:59 UTC (permalink / raw)
To: Khem Raj, yocto
On 04/02/2014 18:44, Khem Raj wrote:
> WARNING: Variable key FILES_${PN}-dev (${includedir} ${FILES_SOLIBSDEV}
> ${libdir}/*.la ${libdir}/*.o ${libdir}/pkgconfig ${datadir}/pkgconfig
> ${datadir}/aclocal ${base_libdir}/*.o ${libdir}/${BPN}/*.la
> ${base_libdir}/*.la) replaces original key FILES_mono-xsp-dev (
> /usr/lib/pkgconfig/xsp.pc /usr/lib/pkgconfig/xsp-2.pc ).
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Committed to meta-mono master, many thanks Khem
Alex
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-26 20:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-04 18:44 [PATCH 1/2] mono-xsp: Fix parse warnings Khem Raj
2014-02-04 18:44 ` [PATCH 2/2] mono: Fix the recipes for patch paths Khem Raj
2014-02-05 11:43 ` [PATCH 1/2] mono-xsp: Fix parse warnings Paul Eggleton
2014-02-26 20:59 ` Alex J Lennon
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.