diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2011-01-22 13:10:33 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2011-01-22 13:10:33 -0800 |
| commit | a1701b5b1153822c976e675dfea2f4cef653e835 (patch) | |
| tree | 86f24916c67c470b0346ec5abc00f3cf0449cb5e /recipes/mono | |
| parent | 89342ad3fde2f5330b0a20a511224872dab449f5 (diff) | |
| download | openembedded-a1701b5b1153822c976e675dfea2f4cef653e835.tar.gz | |
mono_2.6.3.bb: Fix install error and Bugzilla/5501
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/mono')
| -rw-r--r-- | recipes/mono/mono_2.6.3.bb | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/recipes/mono/mono_2.6.3.bb b/recipes/mono/mono_2.6.3.bb index dbbe67951e..15622d18cc 100644 --- a/recipes/mono/mono_2.6.3.bb +++ b/recipes/mono/mono_2.6.3.bb @@ -2,7 +2,7 @@ require mono.inc DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" # mono makes use of non-thumb-compatible inline asm. ARM_INSTRUCTION_SET = "arm" @@ -16,9 +16,7 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} - pushd ${D} - tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz - popd + (cd ${D}; tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz) } do_install_append() { @@ -26,11 +24,10 @@ do_install_append() { # however, jay is not being cross-compiled and thus only # available for the buildhost architecture, so remove it # entirely - pushd ${D} + (cd ${D}; rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ ./usr/share/jay/README.jay \ - ./usr/bin/jay - popd + ./usr/bin/jay) # Not packaged with the default rules and apparently # not used for anything @@ -65,7 +62,7 @@ FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-nat # Packages not included in Debian PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \ libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \ - libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil" + libmono-db2-1.0-cil-dev" FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll" FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc" |