summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2007-05-07 17:41:27 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2007-05-07 17:41:27 +0000
commitfb01830e8e9b67757c41c31b547fc7d39ff7778d (patch)
tree22d781fca407cc26bf716046addec8ed4d5e61fb
parent32eac857b106e0bcc42c792499917950a2c64d4b (diff)
parent6114ba8eaa8d149324204d27d574462f43c52856 (diff)
merge of '80f7f84f9356a16a8a92b8c33d7297b74324541a'
and 'e4adba489997dfbf5204f63e11aa16515e13e7b2'
-rw-r--r--packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb3
-rw-r--r--packages/openssl/openssl-native_0.9.7g.bb2
-rw-r--r--packages/openssl/openssl.inc4
-rw-r--r--packages/openssl/openssl_0.9.7e.bb2
-rw-r--r--packages/openssl/openssl_0.9.7g.bb2
-rw-r--r--packages/xcb/libxcb_0.9.93.bb4
6 files changed, 9 insertions, 8 deletions
diff --git a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
index 81c359f7fa..4c39b0fc90 100644
--- a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
+++ b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
@@ -51,6 +51,7 @@ do_deploy() {
do_deploy[dirs] = "${S}"
-addtask deploy before do_build after do_compile
+addtask deploy before do_package after do_install
+
diff --git a/packages/openssl/openssl-native_0.9.7g.bb b/packages/openssl/openssl-native_0.9.7g.bb
index dd4ba1a5ef..115d4011d9 100644
--- a/packages/openssl/openssl-native_0.9.7g.bb
+++ b/packages/openssl/openssl-native_0.9.7g.bb
@@ -2,7 +2,7 @@ inherit pkgconfig native
require openssl.inc
-PR = "r0"
+PR = "r1"
SRC_URI += "file://debian.patch;patch=1 \
file://armeb.patch;patch=1;pnum=0 \
diff --git a/packages/openssl/openssl.inc b/packages/openssl/openssl.inc
index e7e3b37e3c..9c648f0ba8 100644
--- a/packages/openssl/openssl.inc
+++ b/packages/openssl/openssl.inc
@@ -18,8 +18,8 @@ export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
export AS = "${CC} -c"
PACKAGES =+ "libcrypto libssl"
-FILES_libcrypto = "${libdir}/libcrypto.so*"
-FILES_libssl = "${libdir}/libssl.so*"
+FILES_libcrypto = "${libdir}/libcrypto.so.*"
+FILES_libssl = "${libdir}/libssl.so.*"
do_compile () {
cd util
diff --git a/packages/openssl/openssl_0.9.7e.bb b/packages/openssl/openssl_0.9.7e.bb
index d9b8d91cdc..a7d3670758 100644
--- a/packages/openssl/openssl_0.9.7e.bb
+++ b/packages/openssl/openssl_0.9.7e.bb
@@ -1,6 +1,6 @@
require openssl.inc
-PR = "r4"
+PR = "r5"
SRC_URI += "file://debian.patch;patch=1 \
file://armeb.patch;patch=1 \
diff --git a/packages/openssl/openssl_0.9.7g.bb b/packages/openssl/openssl_0.9.7g.bb
index 4af1fbfd48..cc9162c1cf 100644
--- a/packages/openssl/openssl_0.9.7g.bb
+++ b/packages/openssl/openssl_0.9.7g.bb
@@ -2,7 +2,7 @@ inherit pkgconfig
require openssl.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://debian.patch;patch=1 \
file://armeb.patch;patch=1;pnum=0 \
diff --git a/packages/xcb/libxcb_0.9.93.bb b/packages/xcb/libxcb_0.9.93.bb
index 5f5f870482..5b926d093f 100644
--- a/packages/xcb/libxcb_0.9.93.bb
+++ b/packages/xcb/libxcb_0.9.93.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "XCB: an X protocol C binding"
SECTION = "x11/libs"
LICENSE = "MIT-X"
HOMEPAGE = "http://xcb.freedesktop.org"
-PR = "r1"
+PR = "r2"
PARALLEL_MAKE = ""
DEPENDS = "xcb-proto libxau libxslt-native"
@@ -18,7 +18,7 @@ PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \
FILES_${PN} = "${libdir}/libxcb.so.*"
#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h"
-FILES_libxcb-composite = "${libdir}/libxcb-composite.so*"
+FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*"
FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*"
FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*"
FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*"