diff options
| -rw-r--r-- | meta/recipes-extended/lsb/lsb_4.1.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-extended/lsb/lsbtest_1.0.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-extended/lsb/lsb_4.1.bb b/meta/recipes-extended/lsb/lsb_4.1.bb index 7b2ee78e72..6215b62d80 100644 --- a/meta/recipes-extended/lsb/lsb_4.1.bb +++ b/meta/recipes-extended/lsb/lsb_4.1.bb | |||
| @@ -40,7 +40,7 @@ do_install(){ | |||
| 40 | mkdir -p ${D}${sysconfdir}/lsb-release.d | 40 | mkdir -p ${D}${sysconfdir}/lsb-release.d |
| 41 | printf "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release | 41 | printf "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release |
| 42 | 42 | ||
| 43 | if [ "${TARGET_ARCH}" = "i586" ];then | 43 | if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then |
| 44 | printf "core-4.1-ia32" >> ${D}${sysconfdir}/lsb-release | 44 | printf "core-4.1-ia32" >> ${D}${sysconfdir}/lsb-release |
| 45 | else | 45 | else |
| 46 | printf "core-4.1-${TARGET_ARCH}" >> ${D}${sysconfdir}/lsb-release | 46 | printf "core-4.1-${TARGET_ARCH}" >> ${D}${sysconfdir}/lsb-release |
| @@ -53,7 +53,7 @@ do_install(){ | |||
| 53 | fi | 53 | fi |
| 54 | echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release | 54 | echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release |
| 55 | 55 | ||
| 56 | if [ "${TARGET_ARCH}" = "i586" ];then | 56 | if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then |
| 57 | mkdir -p ${D}${sysconfdir}/lsb-release.d | 57 | mkdir -p ${D}${sysconfdir}/lsb-release.d |
| 58 | touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch | 58 | touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch |
| 59 | touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-noarch | 59 | touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-noarch |
| @@ -99,7 +99,7 @@ do_install_append(){ | |||
| 99 | ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2 | 99 | ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.2 |
| 100 | ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3 | 100 | ln -sf ld-linux-x86-64.so.2 ld-lsb-x86-64.so.3 |
| 101 | fi | 101 | fi |
| 102 | if [ "${TARGET_ARCH}" = "i586" ];then | 102 | if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then |
| 103 | cd ${D}/${baselib} | 103 | cd ${D}/${baselib} |
| 104 | ln -sf ld-linux.so.2 ld-lsb.so.2 | 104 | ln -sf ld-linux.so.2 ld-lsb.so.2 |
| 105 | ln -sf ld-linux.so.2 ld-lsb.so.3 | 105 | ln -sf ld-linux.so.2 ld-lsb.so.3 |
diff --git a/meta/recipes-extended/lsb/lsbtest_1.0.bb b/meta/recipes-extended/lsb/lsbtest_1.0.bb index f61251e2aa..ea12502dc8 100644 --- a/meta/recipes-extended/lsb/lsbtest_1.0.bb +++ b/meta/recipes-extended/lsb/lsbtest_1.0.bb | |||
| @@ -19,7 +19,7 @@ do_install() { | |||
| 19 | install -d ${D}/opt/lsb-test | 19 | install -d ${D}/opt/lsb-test |
| 20 | install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list | 20 | install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list |
| 21 | install -m 0644 ${S}/session ${D}/opt/lsb-test/session | 21 | install -m 0644 ${S}/session ${D}/opt/lsb-test/session |
| 22 | if [ "${TARGET_ARCH}" = "i586" ];then | 22 | if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then |
| 23 | sed -i -e 's/lsbarch/ia32/g' -e 's/targetarch/i486/g' ${D}/opt/lsb-test/packages_list | 23 | sed -i -e 's/lsbarch/ia32/g' -e 's/targetarch/i486/g' ${D}/opt/lsb-test/packages_list |
| 24 | sed -i -e 's/targetarch/x86/g' ${D}/opt/lsb-test/session | 24 | sed -i -e 's/targetarch/x86/g' ${D}/opt/lsb-test/session |
| 25 | fi | 25 | fi |
