From 7c8f742ecc69974bcf20fe6449b460a2cde6f9ef Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 14 Sep 2009 20:17:36 -0700 Subject: cross.bbclass: Override BASEPKG_HOST_SYS * BASEPKG_HOST_SYS from bitbake.conf is set as if packages were being built for target. So we need to override it for cross packages. Signed-off-by: Khem Raj Acked-by: Andrea Adami gmail.com> --- classes/cross.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 7debde6669..68e3803f3e 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -17,6 +17,7 @@ HOST_OS = "${BUILD_OS}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" HOST_EXEEXT = "${BUILD_EXEEXT}" +BASEPKG_HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}" CPPFLAGS = "${BUILD_CPPFLAGS}" CFLAGS = "${BUILD_CFLAGS}" -- cgit v1.2.3 From 55f42a3dd5b43c3ad4bb2425410f64a9e0dd924a Mon Sep 17 00:00:00 2001 From: Mario Domenech Goulart Date: Wed, 15 Jul 2009 16:52:28 -0300 Subject: Avoids overwriting Python's built-in `str' in get_devtable_list Signed-off-by: Otavio Salvador --- classes/image.bbclass | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/image.bbclass b/classes/image.bbclass index f7afbab81e..f03a115388 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -72,13 +72,11 @@ def get_devtable_list(d): devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1) if devtable != None: return devtable - str = "" devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1) if devtables == None: devtables = 'files/device_table-minimal.txt' - for devtable in devtables.split(): - str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable) - return str + return " ".join([ bb.which(bb.data.getVar('BBPATH', d, 1), devtable) + for devtable in devtables.split() ]) def get_imagecmds(d): import bb -- cgit v1.2.3 From ba4bad720fc2ea3629875bb03ae1be06ad005a18 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Fri, 18 Sep 2009 22:33:16 +0200 Subject: packaged-staging: fix populate_staging_postamble after staging-split by base package arch (introduced by f876463527bd9ae92a09159fdb4899b4a4d19121) --- classes/packaged-staging.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 33acb90a2b..3b97f593b8 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -284,7 +284,7 @@ populate_staging_postamble () { if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then exit $exitcode fi - stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross + stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH} if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then exit $exitcode fi -- cgit v1.2.3 From a95c355af46bdc395cc8e1141682ab802ac48130 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sat, 12 Sep 2009 02:28:18 +0200 Subject: package_ipk.bbclass: force recreation of DEPLOY_DIR_IPK. The dir is removed wiping tmp. --- classes/package_ipk.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index e5561082fd..b48f8781eb 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -85,6 +85,7 @@ do_package_update_index_ipk () { return fi + mkdir -p ${DEPLOY_DIR_IPK} touch ${DEPLOY_DIR_IPK}/Packages ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} -- cgit v1.2.3 From b4926ef1add65f61626ccffe715f535dc97bff4f Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Sat, 19 Sep 2009 21:45:57 +0000 Subject: kernel.bbclass: fix ownership inside the modules tarball Signed-off-by: Denys Dmytriyenko Acked-by: Koen Kooi Acked-by: Khem Raj --- classes/kernel.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index c5192d59d4..9c1f637a66 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -530,7 +530,7 @@ do_deploy() { package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin if [ -d "${D}/lib" ]; then - tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${D} lib + fakeroot tar -cvzf ${DEPLOY_DIR_IMAGE}/${MODULES_IMAGE_BASE_NAME}.tgz -C ${D} lib fi cd ${DEPLOY_DIR_IMAGE} @@ -540,5 +540,6 @@ do_deploy() { } do_deploy[dirs] = "${S}" +do_deploy[depends] += "fakeroot-native:do_populate_staging" addtask deploy before do_package after do_install -- cgit v1.2.3 From adf66c30a6946741462d0274aef624880fb40810 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 24 Sep 2009 14:51:07 +0200 Subject: enlightenment: bump SRCREV * runtime tested on angstrom/beagleboard * upgrade paths intact and working --- classes/e.bbclass | 4 +++- classes/efl.bbclass | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/e.bbclass b/classes/e.bbclass index a56cdff2e1..a6fa1d0d78 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -21,7 +21,9 @@ do_configure_append() { export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config" export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" -PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-lib" +# This construction is stupid, someone with more E knowledge should change it to =+ or something +# And it's in efl.bbclass as well.... +PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib" FILES_${PN}-lib = "${libdir}/lib*.so.*" FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so" diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 9d24a0f337..22e664ce01 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -23,7 +23,8 @@ do_stage() { autotools_stage_all } -PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-tests" +# This construction is stupid, someone with more E knowledge should change it to =+ or something +PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests" FILES_${PN} = "${libdir}/*.so.*" -- cgit v1.2.3 From 98a7d32826bc362c4ee434e7a4def7c852e75281 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Sep 2009 16:52:03 +0200 Subject: package bbclass: strip static libs as well --- classes/package.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index 5a9fa503ae..c232e3f19d 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -159,7 +159,7 @@ def runstrip(file, d): if ret: bb.error("runstrip: 'file %s' failed (forced strip)" % file) - if "not stripped" not in result: + if "not stripped" not in result and ".a" not in file: bb.debug(1, "runstrip: skip %s" % file) return 0 @@ -393,7 +393,7 @@ python populate_packages () { for root, dirs, files in os.walk(dvar): for f in files: file = os.path.join(root, f) - if not os.path.islink(file) and not os.path.isdir(file) and isexec(file): + if not os.path.islink(file) and not os.path.isdir(file) and (isexec(file) or ".a" in file): runstrip(file, d) pkgdest = bb.data.getVar('PKGDEST', d, 1) -- cgit v1.2.3 From 4a520da6d6f8501ba5fa008d9e8461b20db3220c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 2 Oct 2009 10:46:55 +0200 Subject: gnome bbclass: tweak mime packaging --- classes/gnome.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass index 3d04298ac6..2045697516 100644 --- a/classes/gnome.bbclass +++ b/classes/gnome.bbclass @@ -11,6 +11,7 @@ DEPENDS += "gnome-common" FILES_${PN} += "${datadir}/application-registry \ ${datadir}/mime-info \ ${datadir}/mime/packages \ + ${datadir}/mime/application \ ${datadir}/gnome-2.0" inherit autotools gtk-icon-cache pkgconfig gconf mime -- cgit v1.2.3 From 8fec15f70dcd0a8543b0af3ec256bf9cd108281e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 2 Oct 2009 12:06:16 +0200 Subject: package bbclass: fix static libs logic --- classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index c232e3f19d..0cba1260d8 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -159,7 +159,7 @@ def runstrip(file, d): if ret: bb.error("runstrip: 'file %s' failed (forced strip)" % file) - if "not stripped" not in result and ".a" not in file: + if "not stripped" not in result and not file.endswith(".a"): bb.debug(1, "runstrip: skip %s" % file) return 0 -- cgit v1.2.3 From 3a663867510f00548cb1d4db5d44d7df3aafb62c Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 3 Oct 2009 00:57:03 +0200 Subject: dietlibc: update to version 0.32 * switch to .inc and PR_INC --- classes/dietlibc.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/dietlibc.bbclass b/classes/dietlibc.bbclass index 7c7b5fec81..e0a657806a 100644 --- a/classes/dietlibc.bbclass +++ b/classes/dietlibc.bbclass @@ -4,8 +4,8 @@ def dietlibc_after_parse(d): import bb # Remove the NLS cfg = oe_filter_out('--(dis|en)able-nls', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d) - # Remove shared and static and set it right - cfg += " --disable-nls --disbale-shared --enable-static" + # Remove shared enable static only + cfg += " --disable-nls --disable-shared --enable-static" bb.data.setVar('EXTRA_OECONF', cfg, d) cfg = bb.data.getVar('EXTRA_OEMAKE', d, 1) or "" cfg = oe_filter_out("\'CC=", bb.data.getVar('EXTRA_OEMAKE', d, 1) or "", d) -- cgit v1.2.3 From 7f7b1e65c6371f0c73ad89e58b9080c9bd18384e Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sun, 4 Oct 2009 22:10:18 +0200 Subject: dietlibc.class: disable rewriting of configure stuff for now --- classes/dietlibc.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/dietlibc.bbclass b/classes/dietlibc.bbclass index e0a657806a..2676385197 100644 --- a/classes/dietlibc.bbclass +++ b/classes/dietlibc.bbclass @@ -9,13 +9,13 @@ def dietlibc_after_parse(d): bb.data.setVar('EXTRA_OECONF', cfg, d) cfg = bb.data.getVar('EXTRA_OEMAKE', d, 1) or "" cfg = oe_filter_out("\'CC=", bb.data.getVar('EXTRA_OEMAKE', d, 1) or "", d) - cfgtmp = "\'CC=diet ${CCACHE}" + cfgtmp = "\'CC=\"diet ${CCACHE}\"" cfgtmp += cfg bb.data.setVar('EXTRA_OEMAKE', cfgtmp, d) -python () { - dietlibc_after_parse(d) -} +#python () { +# dietlibc_after_parse(d) +#} set_dietlibc_env () { export CC="diet ${CC}" -- cgit v1.2.3 From d744bc6c4e1f50a72974d29ca58c5d861f6f7634 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 5 Oct 2009 21:45:41 -0700 Subject: siteinfo: Add common-mips site file. * After renaming the target triplet the file names needs to be renamed because they are used in get_siteinfo_list Signed-off-by: Khem Raj --- classes/siteinfo.bbclass | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'classes') diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 2bacd69488..d28093d775 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -23,14 +23,14 @@ def get_siteinfo_list(d): targetinfo = {\ "armeb-linux": "endian-big bit-32 common-linux common-glibc arm-common",\ "armeb-linux-gnu": "endian-big bit-32 common-linux common-glibc arm-common",\ - "armeb-linux-gnueabi": "endian-big bit-32 common-linux common-glibc arm-common armeb-linux",\ + "armeb-linux-gnueabi": "endian-big bit-32 common-linux common-glibc arm-common armeb-linux-gnu",\ "armeb-linux-uclibc": "endian-big bit-32 common-linux common-uclibc arm-common",\ "armeb-linux-uclibceabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\ "arm-darwin": "endian-little bit-32 common-darwin",\ "arm-darwin9": "endian-little bit-32 common-darwin",\ "arm-linux": "endian-little bit-32 common-linux common-glibc arm-common",\ "arm-linux-gnu": "endian-little bit-32 common-linux common-glibc arm-common",\ - "arm-linux-gnueabi": "endian-little bit-32 common-linux common-glibc arm-common arm-linux",\ + "arm-linux-gnueabi": "endian-little bit-32 common-linux common-glibc arm-common arm-linux-gnu",\ "arm-linux-uclibc": "endian-little bit-32 common-linux common-uclibc arm-common",\ "arm-linux-uclibceabi": "endian-little bit-32 common-linux common-uclibc arm-common arm-linux-uclibc",\ "avr32-linux-uclibc": "endian-big bit-32 common-linux common-uclibc avr32-common",\ @@ -57,17 +57,17 @@ def get_siteinfo_list(d): "i686-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "ia64-linux": "endian-little bit-64 common-linux common-glibc",\ "ia64-linux-gnu": "endian-little bit-64 common-linux common-glibc",\ - "mipsel-linux": "endian-little bit-32 common-linux common-glibc",\ - "mipsel-linux-gnu": "endian-little bit-32 common-linux common-glibc",\ - "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc",\ - "mips-linux": "endian-big bit-32 common-linux common-glibc",\ - "mips-linux-gnu": "endian-big bit-32 common-linux common-glibc",\ - "mips-linux-uclibc": "endian-big bit-32 common-linux common-uclibc",\ + "mipsel-linux": "endian-little bit-32 common-linux common-glibc mips-common",\ + "mipsel-linux-gnu": "endian-little bit-32 common-linux common-glibc mips-common",\ + "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc mips-common",\ + "mips-linux": "endian-big bit-32 common-linux common-glibc mips-common",\ + "mips-linux-gnu": "endian-big bit-32 common-linux common-glibc mips-common",\ + "mips-linux-uclibc": "endian-big bit-32 common-linux common-uclibc mips-common",\ "powerpc-darwin": "endian-big bit-32 common-darwin",\ - "ppc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\ - "ppc-linux-gnu": "endian-big bit-32 common-linux common-glibc powerpc-common",\ - "ppc64-linux": "endian-big bit-64 common-linux common-glibc powerpc-common",\ - "ppc64-linux-gnu": "endian-big bit-64 common-linux common-glibc powerpc-common",\ + "ppc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\ + "ppc-linux-gnu": "endian-big bit-32 common-linux common-glibc powerpc-common",\ + "ppc64-linux": "endian-big bit-64 common-linux common-glibc powerpc-common",\ + "ppc64-linux-gnu": "endian-big bit-64 common-linux common-glibc powerpc-common",\ "powerpc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\ "powerpc-linux-gnu": "endian-big bit-32 common-linux common-glibc powerpc-common",\ "powerpc-linux-gnuspe": "endian-big bit-32 common-linux common-glibc powerpc-common",\ @@ -89,6 +89,7 @@ def get_siteinfo_list(d): info = targetinfo[target].split() info.append(target) info.append("common") + print info return info else: bb.error("Information not available for target '%s'" % target) -- cgit v1.2.3 From 90bb8a3b49d422081a24044366ca6fbd6098d368 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Oct 2009 15:25:27 -0700 Subject: siteinfo.bbclass: Fix powerpc triplets and removed unused ones. Signed-off-by: Khem Raj --- classes/siteinfo.bbclass | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'classes') diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index d28093d775..a634125971 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -28,21 +28,17 @@ def get_siteinfo_list(d): "armeb-linux-uclibceabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\ "arm-darwin": "endian-little bit-32 common-darwin",\ "arm-darwin9": "endian-little bit-32 common-darwin",\ - "arm-linux": "endian-little bit-32 common-linux common-glibc arm-common",\ "arm-linux-gnu": "endian-little bit-32 common-linux common-glibc arm-common",\ "arm-linux-gnueabi": "endian-little bit-32 common-linux common-glibc arm-common arm-linux-gnu",\ "arm-linux-uclibc": "endian-little bit-32 common-linux common-uclibc arm-common",\ "arm-linux-uclibceabi": "endian-little bit-32 common-linux common-uclibc arm-common arm-linux-uclibc",\ "avr32-linux-uclibc": "endian-big bit-32 common-linux common-uclibc avr32-common",\ "bfin-uclinux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\ - "i386-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "i386-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "i486-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "i486-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "i586-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "i586-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "i686-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "i686-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i686-linux": "endian-little bit-32 common-linux common-glibc ix86-common i686-linux-gnu",\ "i386-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ "i486-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ "i586-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ @@ -55,35 +51,25 @@ def get_siteinfo_list(d): "i486-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "i586-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "i686-mingw32": "endian-little bit-32 common-mingw ix86-common",\ - "ia64-linux": "endian-little bit-64 common-linux common-glibc",\ "ia64-linux-gnu": "endian-little bit-64 common-linux common-glibc",\ - "mipsel-linux": "endian-little bit-32 common-linux common-glibc mips-common",\ "mipsel-linux-gnu": "endian-little bit-32 common-linux common-glibc mips-common",\ "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc mips-common",\ - "mips-linux": "endian-big bit-32 common-linux common-glibc mips-common",\ "mips-linux-gnu": "endian-big bit-32 common-linux common-glibc mips-common",\ "mips-linux-uclibc": "endian-big bit-32 common-linux common-uclibc mips-common",\ "powerpc-darwin": "endian-big bit-32 common-darwin",\ - "ppc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\ - "ppc-linux-gnu": "endian-big bit-32 common-linux common-glibc powerpc-common",\ - "ppc64-linux": "endian-big bit-64 common-linux common-glibc powerpc-common",\ - "ppc64-linux-gnu": "endian-big bit-64 common-linux common-glibc powerpc-common",\ - "powerpc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\ + "ppc-linux-gnu": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux-gnu",\ + "ppc64-linux-gnu": "endian-big bit-64 common-linux common-glibc powerpc-common powerpc64-linux-gnu",\ "powerpc-linux-gnu": "endian-big bit-32 common-linux common-glibc powerpc-common",\ - "powerpc-linux-gnuspe": "endian-big bit-32 common-linux common-glibc powerpc-common",\ + "powerpc-linux-gnuspe": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux-gnu",\ "powerpc-linux-uclibc": "endian-big bit-32 common-linux common-uclibc powerpc-common",\ - "powerpc-linux-uclibcspe": "endian-big bit-32 common-linux common-uclibc powerpc-common",\ - "sh3-linux": "endian-little bit-32 common-linux common-glibc sh-common",\ + "powerpc-linux-uclibcspe": "endian-big bit-32 common-linux common-uclibc powerpc-common powerpc-linux-uclibc",\ "sh3-linux-gnu": "endian-little bit-32 common-linux common-glibc sh-common",\ - "sh4-linux": "endian-little bit-32 common-linux common-glibc sh-common",\ "sh4-linux-gnu": "endian-little bit-32 common-linux common-glibc sh-common",\ "sh4-linux-uclibc": "endian-little bit-32 common-linux common-uclibc sh-common",\ - "sparc-linux": "endian-big bit-32 common-linux common-glibc",\ "sparc-linux-gnu": "endian-big bit-32 common-linux common-glibc",\ - "viac3-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "viac3-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "x86_64-linux": "endian-little bit-64 common-linux common-glibc",\ "x86_64-linux-gnu": "endian-little bit-64 common-linux common-glibc",\ + "x86_64-linux": "endian-little bit-64 common-linux common-glibc",\ "x86_64-linux-uclibc": "endian-little bit-64 common-linux common-uclibc"} if target in targetinfo: info = targetinfo[target].split() -- cgit v1.2.3 From 64e533c13d53941af1c87fb83a7e17c97972a6c4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Oct 2009 16:39:11 -0700 Subject: siteinfo.bbclass: Remove spurious print. Signed-off-by: Khem Raj --- classes/siteinfo.bbclass | 1 - 1 file changed, 1 deletion(-) (limited to 'classes') diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index a634125971..c3e155bc18 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -75,7 +75,6 @@ def get_siteinfo_list(d): info = targetinfo[target].split() info.append(target) info.append("common") - print info return info else: bb.error("Information not available for target '%s'" % target) -- cgit v1.2.3 From d685ab28a425740b4d6c98abb1423d7904240724 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 7 Oct 2009 12:39:04 -0700 Subject: insane.bbclass: Use linux-gnu for TARGET_OS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add linux-uclibcspe Signed-off-by: Søren Holm Signed-off-by: Khem Raj --- classes/insane.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index c41b84a4c0..a6e4b6dce8 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -34,7 +34,7 @@ def package_qa_get_machine_dict(): "darwin9" : { "arm" : (40, 0, 0, True, True), }, - "linux" : { + "linux-gnu" : { "arm" : (40, 97, 0, True, True), "armeb": (40, 97, 0, False, True), "powerpc": (20, 0, 0, False, True), @@ -80,6 +80,9 @@ def package_qa_get_machine_dict(): "linux-gnuspe" : { "powerpc": (20, 0, 0, False, True), }, + "linux-uclibcspe" : { + "powerpc": (20, 0, 0, False, True), + }, } -- cgit v1.2.3 From af8c8d14ffa9daf9f6ec19fa2d49c687cf5cff64 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 8 Oct 2009 16:03:58 -0700 Subject: conf: Decosmetize TARGET_OS * This patch reverts the cosmetic change which used linux-gnu instead of linux Signed-off-by: Khem Raj Tested-by: Holger Freyther --- classes/insane.bbclass | 4 ++-- classes/siteinfo.bbclass | 39 ++++++++++++++++++--------------------- 2 files changed, 20 insertions(+), 23 deletions(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index a6e4b6dce8..0dacaf8850 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -34,7 +34,7 @@ def package_qa_get_machine_dict(): "darwin9" : { "arm" : (40, 0, 0, True, True), }, - "linux-gnu" : { + "linux" : { "arm" : (40, 97, 0, True, True), "armeb": (40, 97, 0, False, True), "powerpc": (20, 0, 0, False, True), @@ -77,7 +77,7 @@ def package_qa_get_machine_dict(): "arm" : (40, 0, 0, True, True), "armeb" : (40, 0, 0, False, True), }, - "linux-gnuspe" : { + "linux-spe" : { "powerpc": (20, 0, 0, False, True), }, "linux-uclibcspe" : { diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index c3e155bc18..c89014abae 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -22,23 +22,21 @@ def get_siteinfo_list(d): targetinfo = {\ "armeb-linux": "endian-big bit-32 common-linux common-glibc arm-common",\ - "armeb-linux-gnu": "endian-big bit-32 common-linux common-glibc arm-common",\ - "armeb-linux-gnueabi": "endian-big bit-32 common-linux common-glibc arm-common armeb-linux-gnu",\ + "armeb-linux-gnueabi": "endian-big bit-32 common-linux common-glibc arm-common armeb-linux",\ "armeb-linux-uclibc": "endian-big bit-32 common-linux common-uclibc arm-common",\ "armeb-linux-uclibceabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\ "arm-darwin": "endian-little bit-32 common-darwin",\ "arm-darwin9": "endian-little bit-32 common-darwin",\ - "arm-linux-gnu": "endian-little bit-32 common-linux common-glibc arm-common",\ - "arm-linux-gnueabi": "endian-little bit-32 common-linux common-glibc arm-common arm-linux-gnu",\ + "arm-linux": "endian-little bit-32 common-linux common-glibc arm-common",\ + "arm-linux-gnueabi": "endian-little bit-32 common-linux common-glibc arm-common arm-linux",\ "arm-linux-uclibc": "endian-little bit-32 common-linux common-uclibc arm-common",\ "arm-linux-uclibceabi": "endian-little bit-32 common-linux common-uclibc arm-common arm-linux-uclibc",\ "avr32-linux-uclibc": "endian-big bit-32 common-linux common-uclibc avr32-common",\ "bfin-uclinux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\ - "i386-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "i486-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "i586-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "i686-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "i686-linux": "endian-little bit-32 common-linux common-glibc ix86-common i686-linux-gnu",\ + "i386-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i486-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i586-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i686-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "i386-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ "i486-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ "i586-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ @@ -51,24 +49,23 @@ def get_siteinfo_list(d): "i486-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "i586-mingw32": "endian-little bit-32 common-mingw ix86-common",\ "i686-mingw32": "endian-little bit-32 common-mingw ix86-common",\ - "ia64-linux-gnu": "endian-little bit-64 common-linux common-glibc",\ - "mipsel-linux-gnu": "endian-little bit-32 common-linux common-glibc mips-common",\ + "ia64-linux": "endian-little bit-64 common-linux common-glibc",\ + "mipsel-linux": "endian-little bit-32 common-linux common-glibc mips-common",\ "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc mips-common",\ - "mips-linux-gnu": "endian-big bit-32 common-linux common-glibc mips-common",\ + "mips-linux": "endian-big bit-32 common-linux common-glibc mips-common",\ "mips-linux-uclibc": "endian-big bit-32 common-linux common-uclibc mips-common",\ "powerpc-darwin": "endian-big bit-32 common-darwin",\ - "ppc-linux-gnu": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux-gnu",\ - "ppc64-linux-gnu": "endian-big bit-64 common-linux common-glibc powerpc-common powerpc64-linux-gnu",\ - "powerpc-linux-gnu": "endian-big bit-32 common-linux common-glibc powerpc-common",\ - "powerpc-linux-gnuspe": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux-gnu",\ + "ppc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\ + "ppc64-linux": "endian-big bit-64 common-linux common-glibc powerpc-common powerpc64-linux",\ + "powerpc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\ + "powerpc-linux-spe": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\ "powerpc-linux-uclibc": "endian-big bit-32 common-linux common-uclibc powerpc-common",\ "powerpc-linux-uclibcspe": "endian-big bit-32 common-linux common-uclibc powerpc-common powerpc-linux-uclibc",\ - "sh3-linux-gnu": "endian-little bit-32 common-linux common-glibc sh-common",\ - "sh4-linux-gnu": "endian-little bit-32 common-linux common-glibc sh-common",\ + "sh3-linux": "endian-little bit-32 common-linux common-glibc sh-common",\ + "sh4-linux": "endian-little bit-32 common-linux common-glibc sh-common",\ "sh4-linux-uclibc": "endian-little bit-32 common-linux common-uclibc sh-common",\ - "sparc-linux-gnu": "endian-big bit-32 common-linux common-glibc",\ - "viac3-linux-gnu": "endian-little bit-32 common-linux common-glibc ix86-common",\ - "x86_64-linux-gnu": "endian-little bit-64 common-linux common-glibc",\ + "sparc-linux": "endian-big bit-32 common-linux common-glibc",\ + "viac3-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ "x86_64-linux": "endian-little bit-64 common-linux common-glibc",\ "x86_64-linux-uclibc": "endian-little bit-64 common-linux common-uclibc"} if target in targetinfo: -- cgit v1.2.3 From fa20bf824d2cdb62a38e4c8dd585888a78e62f81 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 9 Oct 2009 11:21:31 -0700 Subject: classes: Use linux-gnuspe instead of non existing linux-spe Signed-off-by: Khem Raj --- classes/insane.bbclass | 2 +- classes/siteinfo.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 0dacaf8850..950bb9771e 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -77,7 +77,7 @@ def package_qa_get_machine_dict(): "arm" : (40, 0, 0, True, True), "armeb" : (40, 0, 0, False, True), }, - "linux-spe" : { + "linux-gnuspe" : { "powerpc": (20, 0, 0, False, True), }, "linux-uclibcspe" : { diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index c89014abae..5c929dffcd 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -58,7 +58,7 @@ def get_siteinfo_list(d): "ppc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\ "ppc64-linux": "endian-big bit-64 common-linux common-glibc powerpc-common powerpc64-linux",\ "powerpc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\ - "powerpc-linux-spe": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\ + "powerpc-linux-gnuspe": "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\ "powerpc-linux-uclibc": "endian-big bit-32 common-linux common-uclibc powerpc-common",\ "powerpc-linux-uclibcspe": "endian-big bit-32 common-linux common-uclibc powerpc-common powerpc-linux-uclibc",\ "sh3-linux": "endian-little bit-32 common-linux common-glibc sh-common",\ -- cgit v1.2.3