diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2015-06-30 15:28:49 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-07 23:57:12 +0100 |
| commit | aad17a479f1047197ab6e2010226da054fb53ddb (patch) | |
| tree | fd45c9a51a671d5392cb29401290f1269d93ee70 /meta | |
| parent | 589bad6e9213136e7f30b4eafb7abfdd10070d1a (diff) | |
| download | openembedded-core-aad17a479f1047197ab6e2010226da054fb53ddb.tar.gz openembedded-core-aad17a479f1047197ab6e2010226da054fb53ddb.tar.bz2 openembedded-core-aad17a479f1047197ab6e2010226da054fb53ddb.zip | |
lsb: update i586 TARGET_ARCH tests to also handle i686
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -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(){ mkdir -p ${D}${sysconfdir}/lsb-release.d printf "LSB_VERSION=\"core-4.1-noarch:" > ${D}${sysconfdir}/lsb-release - if [ "${TARGET_ARCH}" = "i586" ];then + if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then printf "core-4.1-ia32" >> ${D}${sysconfdir}/lsb-release else printf "core-4.1-${TARGET_ARCH}" >> ${D}${sysconfdir}/lsb-release @@ -53,7 +53,7 @@ do_install(){ fi echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}${sysconfdir}/lsb-release - if [ "${TARGET_ARCH}" = "i586" ];then + if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then mkdir -p ${D}${sysconfdir}/lsb-release.d touch ${D}${sysconfdir}/lsb-release.d/graphics-${PV}-noarch touch ${D}${sysconfdir}/lsb-release.d/desktop-${PV}-noarch @@ -99,7 +99,7 @@ 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" ] || [ "${TARGET_ARCH}" = "i686" ];then cd ${D}/${baselib} ln -sf ld-linux.so.2 ld-lsb.so.2 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() { install -d ${D}/opt/lsb-test install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list install -m 0644 ${S}/session ${D}/opt/lsb-test/session - if [ "${TARGET_ARCH}" = "i586" ];then + if [ "${TARGET_ARCH}" = "i586" ] || [ "${TARGET_ARCH}" = "i686" ];then sed -i -e 's/lsbarch/ia32/g' -e 's/targetarch/i486/g' ${D}/opt/lsb-test/packages_list sed -i -e 's/targetarch/x86/g' ${D}/opt/lsb-test/session fi |