From a0cdc9273d0d04c9adb075850206f7634d3658b9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Sep 2007 08:29:48 +0000 Subject: bitbake.conf/image.bbclass: Set IMAGE_BASENAME to a better default and export correctly, add BZR fetcher config (from poky) --- classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/image.bbclass b/classes/image.bbclass index 04e26e4b35..3420e3f53a 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -4,7 +4,7 @@ LICENSE = "MIT" PACKAGES = "" RDEPENDS += "${IMAGE_INSTALL}" -export IMAGE_BASENAME ?= "${PN}" +IMAGE_BASENAME[export] = "1" export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}" # We need to recursively follow RDEPENDS and RRECOMMENDS for images -- cgit v1.2.3 From b8c7a56f1407155f1df69ce942ebef1a585d47dd Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 5 Sep 2007 09:03:04 +0000 Subject: classes/base.bbclass : change to make sure ${D} gets removed before do_install_prepend. Will activate in a future bitbake version. do_install_prepend became do_install[cleandirs] = "${D}" --- classes/base.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 9bcf212e95..d4b327e266 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -375,10 +375,7 @@ oe_machinstall() { } # Remove and re-create ${D} so that is it guaranteed to be empty -do_install_prepend() { - rm -rf ${D} - mkdir -p ${D} -} +do_install[cleandirs] = "${D}" addtask listtasks do_listtasks[nostamp] = "1" -- cgit v1.2.3 From a27560d30d78ec8c4d8ea66423b3934ef4a9f86c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Sep 2007 21:36:26 +0000 Subject: package_ipk.bbclass: Add sdk Packages files and fix ipkf-sdk.conf (fixing meta-toolchain) (from poky) --- classes/package_ipk.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index e9e21456dd..31e42cd836 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -82,6 +82,10 @@ package_update_index_ipk () { touch ${DEPLOY_DIR_IPK}/$arch/Packages ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/ fi + if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ ] ; then + touch ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages + ipkg-make-index -r ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -p ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages -l ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages.filelist -m ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/ + fi done } @@ -102,7 +106,7 @@ package_generate_ipkg_conf () { priority=$(expr $priority + 5) if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} - echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_SDK} + echo "src oe-${BUILD_ARCH}-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${IPKGCONF_SDK} fi done } -- cgit v1.2.3 From cd413adf1ba62cb4dc83f418998338be601ee912 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Sep 2007 21:40:03 +0000 Subject: package_ipk.bbclass: Improve directory existance check (from poky) --- classes/package_ipk.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'classes') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 31e42cd836..0b7f274a96 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -106,6 +106,8 @@ package_generate_ipkg_conf () { priority=$(expr $priority + 5) if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${IPKGCONF_TARGET} + fi + if [ -e ${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk/Packages ] ; then echo "src oe-${BUILD_ARCH}-$arch-sdk file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}-$arch-sdk" >> ${IPKGCONF_SDK} fi done -- cgit v1.2.3 From bac41779243a6e5e38769684af9b6f7c14ae9268 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 6 Sep 2007 16:19:29 +0000 Subject: siteinfo.bbclass: Add mips (MSB) architecture --- classes/siteinfo.bbclass | 2 ++ 1 file changed, 2 insertions(+) (limited to 'classes') diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 4191f4edc1..c41a3ff369 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -42,6 +42,8 @@ def get_siteinfo_list(d): "i686-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ "mipsel-linux": "endian-little bit-32 common-glibc",\ "mipsel-linux-uclibc": "endian-little bit-32 common-uclibc",\ + "mips-linux": "endian-big bit-32 common-glibc",\ + "mips-linux-uclibc": "endian-big bit-32 common-uclibc",\ "powerpc-darwin": "endian-big bit-32 common-darwin",\ "ppc-linux": "endian-big bit-32 common-glibc powerpc-common",\ "powerpc-linux": "endian-big bit-32 common-glibc powerpc-common",\ -- cgit v1.2.3 From 8a00555b71e47ee86e8449a8f44b7e16c3cef1ae Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 7 Sep 2007 20:22:38 +0000 Subject: base.bbclass: change message about lack of checksums.ini entry for URI to something easier to understand --- classes/base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index d4b327e266..999d409914 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -487,9 +487,9 @@ python base_do_fetch() { try: if not base_chk_file(parser, pn, pv,uri, localpath, d): if type != "file": - bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri)) + bb.note("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri)) else: - bb.debug("%s-%s-%s has no section, not checking URI" % (pn,pv,uri)) + bb.debug("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri)) except Exception: raise bb.build.FuncFailed("Checksum of '%s' failed" % uri) } -- cgit v1.2.3 From 42a372d72247596d89ad70f3a2ec3b00dd6b412c Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 8 Sep 2007 23:41:17 +0000 Subject: qmake-base.bbclass: Rename to qmake_base.bbclass. * Hyphens are bad in function names. * Fixes OPIE build. --- classes/qmake-base.bbclass | 88 ---------------------------------------------- classes/qmake.bbclass | 2 +- classes/qmake2.bbclass | 2 +- classes/qmake_base.bbclass | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 classes/qmake-base.bbclass create mode 100644 classes/qmake_base.bbclass (limited to 'classes') diff --git a/classes/qmake-base.bbclass b/classes/qmake-base.bbclass deleted file mode 100644 index 52f6d830a0..0000000000 --- a/classes/qmake-base.bbclass +++ /dev/null @@ -1,88 +0,0 @@ - -OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" -QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" - -# We override this completely to eliminate the -e normally passed in -EXTRA_OEMAKE = ' MAKEFLAGS= ' - -export OE_QMAKE_CC="${CC}" -export OE_QMAKE_CFLAGS="${CFLAGS}" -export OE_QMAKE_CXX="${CXX}" -export OE_QMAKE_LDFLAGS="${LDFLAGS}" -export OE_QMAKE_AR="${AR}" -export OE_QMAKE_STRIP="echo" -export OE_QMAKE_RPATH="-Wl,-rpath-link," - -# default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 - -oe_qmake_mkspecs () { - mkdir -p mkspecs/${OE_QMAKE_PLATFORM} - for f in ${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}/*; do - if [ -L $f ]; then - lnk=`readlink $f` - if [ -f mkspecs/${OE_QMAKE_PLATFORM}/$lnk ]; then - ln -s $lnk mkspecs/${OE_QMAKE_PLATFORM}/`basename $f` - else - cp $f mkspecs/${OE_QMAKE_PLATFORM}/ - fi - else - cp $f mkspecs/${OE_QMAKE_PLATFORM}/ - fi - done -} - -qmake-base_do_configure() { - case ${QMAKESPEC} in - *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++) - ;; - *-oe-g++) - die Unsupported target ${TARGET_OS} for oe-g++ qmake spec - ;; - *) - oenote Searching for qmake spec file - paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++" - paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths" - - if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then - paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-x86-g++ $paths" - fi - for i in $paths; do - if test -e $i; then - export QMAKESPEC=$i - break - fi - done - ;; - esac - - oenote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'" - - if [ -z "${QMAKE_PROFILES}" ]; then - PROFILES="`ls *.pro`" - else - PROFILES="${QMAKE_PROFILES}" - fi - - if [ -z "$PROFILES" ]; then - die "QMAKE_PROFILES not set and no profiles found in $PWD" - fi - - if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then - AFTER="-after" - QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}" - oenote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}" - fi - - if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then - QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}" - oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" - fi - -#oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" - unset QMAKESPEC || true - ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES" -} - -EXPORT_FUNCTIONS do_configure - -addtask configure after do_unpack do_patch before do_compile diff --git a/classes/qmake.bbclass b/classes/qmake.bbclass index b45e54ca6a..34f59ef9f7 100644 --- a/classes/qmake.bbclass +++ b/classes/qmake.bbclass @@ -1,4 +1,4 @@ -inherit qmake-base +inherit qmake_base DEPENDS_prepend = "qmake-native " diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 86f1439b30..d0f59d2cd4 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -1,7 +1,7 @@ # # QMake variables for Qt4 # -inherit qmake-base +inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " diff --git a/classes/qmake_base.bbclass b/classes/qmake_base.bbclass new file mode 100644 index 0000000000..ea8903c278 --- /dev/null +++ b/classes/qmake_base.bbclass @@ -0,0 +1,88 @@ + +OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" +QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" + +# We override this completely to eliminate the -e normally passed in +EXTRA_OEMAKE = ' MAKEFLAGS= ' + +export OE_QMAKE_CC="${CC}" +export OE_QMAKE_CFLAGS="${CFLAGS}" +export OE_QMAKE_CXX="${CXX}" +export OE_QMAKE_LDFLAGS="${LDFLAGS}" +export OE_QMAKE_AR="${AR}" +export OE_QMAKE_STRIP="echo" +export OE_QMAKE_RPATH="-Wl,-rpath-link," + +# default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11 + +oe_qmake_mkspecs () { + mkdir -p mkspecs/${OE_QMAKE_PLATFORM} + for f in ${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}/*; do + if [ -L $f ]; then + lnk=`readlink $f` + if [ -f mkspecs/${OE_QMAKE_PLATFORM}/$lnk ]; then + ln -s $lnk mkspecs/${OE_QMAKE_PLATFORM}/`basename $f` + else + cp $f mkspecs/${OE_QMAKE_PLATFORM}/ + fi + else + cp $f mkspecs/${OE_QMAKE_PLATFORM}/ + fi + done +} + +qmake_base_do_configure() { + case ${QMAKESPEC} in + *linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++) + ;; + *-oe-g++) + die Unsupported target ${TARGET_OS} for oe-g++ qmake spec + ;; + *) + oenote Searching for qmake spec file + paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++" + paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths" + + if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then + paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-x86-g++ $paths" + fi + for i in $paths; do + if test -e $i; then + export QMAKESPEC=$i + break + fi + done + ;; + esac + + oenote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'" + + if [ -z "${QMAKE_PROFILES}" ]; then + PROFILES="`ls *.pro`" + else + PROFILES="${QMAKE_PROFILES}" + fi + + if [ -z "$PROFILES" ]; then + die "QMAKE_PROFILES not set and no profiles found in $PWD" + fi + + if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then + AFTER="-after" + QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}" + oenote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}" + fi + + if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then + QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}" + oenote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}" + fi + +#oenote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'" + unset QMAKESPEC || true + ${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES" +} + +EXPORT_FUNCTIONS do_configure + +addtask configure after do_unpack do_patch before do_compile -- cgit v1.2.3 From 0ab24892b0ac70a43d7fb8cd22ae9271a382127a Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 8 Sep 2007 23:59:05 +0000 Subject: qt3e.bbclass, qt3x11.bbclass: Follow qmake-base rename. --- classes/qt3e.bbclass | 2 +- classes/qt3x11.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/qt3e.bbclass b/classes/qt3e.bbclass index 58a6779af6..98c47adb90 100644 --- a/classes/qt3e.bbclass +++ b/classes/qt3e.bbclass @@ -1,5 +1,5 @@ # -# override variables set by qmake-base to compile Qt/X11 apps +# override variables set by qmake_base to compile Qt/X11 apps # export QTDIR="${STAGING_DIR}/${HOST_SYS}/qte3" export QTEDIR="${STAGING_DIR}/${HOST_SYS}/qte3" diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 95ed4f538a..67f2cf7348 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -1,7 +1,7 @@ DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}" EXTRA_QMAKEVARS_POST += "CONFIG+=thread" # -# override variables set by qmake-base to compile Qt/X11 apps +# override variables set by qmake_base to compile Qt/X11 apps # export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3" -- cgit v1.2.3