merge of '198a1c8502da246aeea1c3db2cd3085a2722f68c'

     and '809713f0b5b1318f67dcabcdf56c11ff54d37604'

7 files changed, 18 insertions, 11 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 13381740a1..9c7ff8a207 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -163,11 +163,11 @@ kernel_do_configure() {
 }
 
 pkg_postinst_kernel () {
-	update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
+	cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true
 }
 
 pkg_postrm_kernel () {
-	update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_RELEASE} || true
+	cd /${KERNEL_IMAGEDEST}; update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_RELEASE} || true
 }
 
 inherit cml1
diff --git a/packages/busybox/busybox-1.2.1/angstrom/defconfig b/packages/busybox/busybox-1.2.1/angstrom/defconfig
index 981b7d7c71..7308eead76 100644
--- a/packages/busybox/busybox-1.2.1/angstrom/defconfig
+++ b/packages/busybox/busybox-1.2.1/angstrom/defconfig
@@ -171,7 +171,7 @@ CONFIG_MKNOD=y
 CONFIG_MV=y
 # CONFIG_FEATURE_MV_LONG_OPTIONS is not set
 # CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
+CONFIG_NOHUP=y
 CONFIG_OD=y
 # CONFIG_PRINTENV is not set
 CONFIG_PRINTF=y
diff --git a/packages/busybox/busybox-1.2.1/defconfig b/packages/busybox/busybox-1.2.1/defconfig
index 981b7d7c71..7308eead76 100644
--- a/packages/busybox/busybox-1.2.1/defconfig
+++ b/packages/busybox/busybox-1.2.1/defconfig
@@ -171,7 +171,7 @@ CONFIG_MKNOD=y
 CONFIG_MV=y
 # CONFIG_FEATURE_MV_LONG_OPTIONS is not set
 # CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
+CONFIG_NOHUP=y
 CONFIG_OD=y
 # CONFIG_PRINTENV is not set
 CONFIG_PRINTF=y
diff --git a/packages/busybox/busybox-1.2.2/angstrom/defconfig b/packages/busybox/busybox-1.2.2/angstrom/defconfig
index 981b7d7c71..7308eead76 100644
--- a/packages/busybox/busybox-1.2.2/angstrom/defconfig
+++ b/packages/busybox/busybox-1.2.2/angstrom/defconfig
@@ -171,7 +171,7 @@ CONFIG_MKNOD=y
 CONFIG_MV=y
 # CONFIG_FEATURE_MV_LONG_OPTIONS is not set
 # CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
+CONFIG_NOHUP=y
 CONFIG_OD=y
 # CONFIG_PRINTENV is not set
 CONFIG_PRINTF=y
diff --git a/packages/busybox/busybox-1.2.2/defconfig b/packages/busybox/busybox-1.2.2/defconfig
index 981b7d7c71..7308eead76 100644
--- a/packages/busybox/busybox-1.2.2/defconfig
+++ b/packages/busybox/busybox-1.2.2/defconfig
@@ -171,7 +171,7 @@ CONFIG_MKNOD=y
 CONFIG_MV=y
 # CONFIG_FEATURE_MV_LONG_OPTIONS is not set
 # CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
+CONFIG_NOHUP=y
 CONFIG_OD=y
 # CONFIG_PRINTENV is not set
 CONFIG_PRINTF=y
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index d7d28ffeb2..fb26407cd6 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI += "file://wget-long-options.patch;patch=1 \
 	   file://df_rootfs.patch;patch=1 \
diff --git a/packages/curl/curl_7.16.0.bb b/packages/curl/curl_7.16.0.bb
index ae42cb42e3..df98a6b4f2 100644
--- a/packages/curl/curl_7.16.0.bb
+++ b/packages/curl/curl_7.16.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Command line tool and library for client-side URL transfers."
 LICENSE = "MIT"
 DEPENDS = "zlib gnutls"
 SECTION = "console/network"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
 S = "${WORKDIR}/curl-${PV}"
@@ -27,11 +27,17 @@ do_stage () {
 	oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
 }
 
-PACKAGES += "libcurl libcurl-dev libcurl-doc"
-FILES_${PN} = "${bindir}/curl \
-               ${datadir}/curl/curl-ca-bundle.crt"
+PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
+
+FILES_${PN} = "${bindir}/curl"
+
+FILES_${PN}-certs = "${datadir}/curl/curl-*"
+PACKAGE_ARCH_${PN}-certs = "all"
+
 FILES_${PN}-doc = "${mandir}/man1/curl.1"
+
 FILES_lib${PN} = "${libdir}/lib*.so.*"
+RRECOMMENDS_lib${PN} += "${PN}-certs"
 FILES_lib${PN}-dev = "${includedir} \
                       ${libdir}/lib*.so \
                       ${libdir}/lib*.a \
@@ -39,6 +45,7 @@ FILES_lib${PN}-dev = "${includedir} \
                       ${libdir}/pkgconfig \
                       ${datadir}/aclocal \
                       ${bindir}/*-config"
+
 FILES_lib${PN}-doc = "${mandir}/man3 \
                       ${mandir}/man1/curl-config.1"