lsb: Fix PR bump, fix bashisms, correct dependency issue, tweak package description

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/tasks/task-self-hosted.bb
index 5d4e153b3886543782f6975022f672736afbe151..64e01bbc21406202d9a65496cf990e6cf5c6c02c 100644 (file)
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Create Basic Image Tasks"
-PR = "r9"
+PR = "r10"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

diff --git a/meta/recipes-extended/lsb/lsb_1.4.bb b/meta/recipes-extended/lsb/lsb_1.4.bb
index e414d93260d6bdd0719a4109c364ea6a7084bcd0..15dbeaafdf37861b581f8f3cb2050886491514d5 100644 (file)
--- a/meta/recipes-extended/lsb/lsb_1.4.bb
+++ b/meta/recipes-extended/lsb/lsb_1.4.bb
@@ -1,10 +1,11 @@
-DESCRIPTION = "LSB support for Poky Linux"
+DESCRIPTION = "LSB support for OpenEmbedded"
 SECTION = "console/utils"
 HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
 LICENSE = "GPLv2+"
-PR = "r2"
+PR = "r3"
 
-DEPENDS="util-linux"
+# lsb_release needs getopt
+RDEPENDS_${PN} += "util-linux"
 
 LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
 
@@ -27,7 +28,7 @@ do_install(){
        mkdir -p ${D}/etc/lsb-release.d
        echo -n "LSB_VERSION=\"core-4.1-noarch:" > ${D}/etc/lsb-release
        
-       if [ "${TARGET_ARCH}" == "i586" ];then
+       if [ "${TARGET_ARCH}" = "i586" ];then
                echo -n "core-4.1-ia32" >>  ${D}/etc/lsb-release
        else
                echo -n "core-4.1-${TARGET_ARCH}" >>  ${D}/etc/lsb-release
@@ -37,7 +38,7 @@ do_install(){
        echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}/etc/lsb-release
        echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}/etc/lsb-release
        
-       if [ "${TARGET_ARCH}" == "i586" ];then
+       if [ "${TARGET_ARCH}" = "i586" ];then
                mkdir -p ${D}/etc/lsb-release.d
                touch ${D}/etc/lsb-release.d/graphics-4.1-noarch
                touch ${D}/etc/lsb-release.d/graphics-${PV}-noarch
@@ -45,7 +46,7 @@ do_install(){
                touch ${D}/etc/lsb-release.d/graphics-4.1-ia32
                touch ${D}/etc/lsb-release.d/graphics-${PV}-ia32
                touch ${D}/etc/lsb-release.d/desktop-${PV}-ia32
-       elif [ "${TARGET_ARCH}" == "x86_64" ];then
+       elif [ "${TARGET_ARCH}" = "x86_64" ];then
                touch ${D}/etc/lsb-release.d/graphics-4.1-noarch
                touch ${D}/etc/lsb-release.d/graphics-4.1-amd64
                touch ${D}/etc/lsb-release.d/graphics-${PV}-amd64
@@ -72,7 +73,7 @@ do_install_append(){
            install -m 0755 ${WORKDIR}/${i} ${D}/etc/core-lsb
        done
        install -m 0755 ${WORKDIR}/init-functions ${D}/${baselib}/lsb
-       if [ "${TARGET_ARCH}" == "x86_64" ];then
+       if [ "${TARGET_ARCH}" = "x86_64" ];then
               cd ${D}
                if [ "${baselib}" != "lib64" ]; then
                    ln -sf ${baselib} lib64
@@ -81,13 +82,13 @@ do_install_append(){
                ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2
                ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3
        fi
-       if [ "${TARGET_ARCH}" == "i586" ];then
+       if [ "${TARGET_ARCH}" = "i586" ];then
               cd ${D}/${baselib}
                ln -sf ld-linux.so.2 ld-lsb.so.2
                ln -sf ld-linux.so.2 ld-lsb.so.3
        fi
  
-       if [ "${TARGET_ARCH}" == "powerpc64" ];then
+       if [ "${TARGET_ARCH}" = "powerpc64" ];then
               cd ${D}
                if [ "${baselib}" != "lib64" ]; then
                    ln -sf ${baselib} lib64
@@ -96,7 +97,7 @@ do_install_append(){
                ln -sf ld64.so.1 ld-lsb-ppc64.so.2
                ln -sf ld64.so.1 ld-lsb-ppc64.so.3
        fi
-       if [ "${TARGET_ARCH}" == "powerpc" ];then
+       if [ "${TARGET_ARCH}" = "powerpc" ];then
               cd ${D}/${baselib}
                ln -sf ld.so.1 ld-lsb-ppc32.so.2
                ln -sf ld.so.1 ld-lsb-ppc32.so.3