diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 20 | ||||
| -rw-r--r-- | conf/distro/include/preferred-slugos-versions.inc | 40 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 5 | ||||
| -rw-r--r-- | conf/distro/minimal.conf | 5 | ||||
| -rw-r--r-- | conf/machine/include/motorola-ezx-base.inc | 3 |
5 files changed, 29 insertions, 44 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 68301bc478..d8635e8ea7 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -231,9 +231,11 @@ FILES_${PN}-locale = "${datadir}/locale" export MANIFEST = "${FILESDIR}/manifest" +# file:// search paths FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}" -FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}" -FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" +FILESPATHBASE = "${FILE_DIRNAME}" +FILESPATHPKG = "${PF}:${P}:${PN}:${BP}:${BPN}:files:." +FILESPATH = "${@':'.join([os.path.normpath(os.path.join(fp, p, o)) for fp in d.getVar('FILESPATHBASE', 1).split(':') for p in d.getVar('FILESPATHPKG', 1).split(':') for o in (d.getVar('OVERRIDES', 1) + ':').split(':') if os.path.exists(os.path.join(fp, p, o))])}:${FILESDIR}" ################################################################## # General work and output directories for the build system. @@ -515,13 +517,13 @@ FETCHCMD_bzr = "/usr/bin/env bzr" FETCHCMD_hg = "/usr/bin/env hg" FETCHCOMMAND = "ERROR, this must be a BitBake bug" -FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}" -FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}" +FETCHCOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} ${URI}" +FETCHCOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}" FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}" RESUMECOMMAND = "ERROR, this must be a BitBake bug" -RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P --no-check-certificate ${DL_DIR} ${URI}" +RESUMECOMMAND_wget = "/usr/bin/env 'PATH=${PATH}' wget -c -t 5 --passive-ftp -P --no-check-certificate ${DL_DIR} ${URI}" UPDATECOMMAND = "ERROR, this must be a BitBake bug" -UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" +UPDATECOMMAND_cvs = "/usr/bin/env 'PATH=${PATH}' cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}" UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}" SRCDATE = "${DATE}" SRCREV = "1" @@ -592,6 +594,12 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}" # Globally toggle certain dependencies ENTERPRISE_DISTRO ?= "0" +# Pre-build configuration output +BUILDCFG_VARS ?= "BB_VERSION METADATA_BRANCH METADATA_REVISION TARGET_ARCH TARGET_OS MACHINE DISTRO DISTRO_VERSION" +BUILDCFG_VARS_append_arm = " TARGET_FPU" +BUILDCFG_VARS_append_armeb = " TARGET_FPU" +BUILDCFG_NEEDEDVARS ?= "TARGET_ARCH TARGET_OS" + ### ### Config file processing ### diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc index ac2250feaa..992235a4b9 100644 --- a/conf/distro/include/preferred-slugos-versions.inc +++ b/conf/distro/include/preferred-slugos-versions.inc @@ -48,10 +48,10 @@ PREFERRED_VERSION_glibc ?= "2.6.1" PREFERRED_VERSION_glibc-initial ?= "2.6.1" PREFERRED_VERSION_ipkg ?= "0.99.163" PREFERRED_VERSION_ipkg-native ?= "0.99.163" -PREFERRED_VERSION_libtool ?= "1.5.10" -PREFERRED_VERSION_libtool-native ?= "1.5.10" -PREFERRED_VERSION_libtool-cross ?= "1.5.10" -PREFERRED_VERSION_libtool-sdk ?= "1.5.10" +PREFERRED_VERSION_libtool ?= "2.2.4" +PREFERRED_VERSION_libtool-native ?= "2.2.4" +PREFERRED_VERSION_libtool-cross ?= "2.2.4" +PREFERRED_VERSION_libtool-sdk ?= "2.2.4" PREFERRED_VERSION_linux-libc-headers ?= "2.6.23" PREFERRED_VERSION_m4 ?= "1.4.8" PREFERRED_VERSION_m4-native ?= "1.4.8" @@ -63,43 +63,11 @@ PREFERRED_VERSION_udev ?= "118" ##################### Stuff with special notes, and broken stuff: -# libtool/pkgconfig victims -- these packages are locked down because -# newer versions also require newer libtool/pkgconfig versions. - -PREFERRED_VERSION_avahi ?= "0.6.23" -PREFERRED_VERSION_gstreamer ?= "0.10.17" -PREFERRED_VERSION_gst-plugins-base ?= "0.10.17" -PREFERRED_VERSION_tiff ?= "3.7.2" -PREFERRED_VERSION_fakeroot ?= "1.9.6" -PREFERRED_VERSION_fakeroot-native ?= "1.9.6" - # Hack alert - selecting this version of libusb effectively selects # the use of libusb1 and libusb-compat in the case that something # still depends on libusb. This is required because otherwise # libusb will overwrite libusb-compat in staging. PREFERRED_VERSION_libusb ?= "0.0.0" -# mtd-utils 1.2.0+git cannot be fetched, so SlugOS will stick -# with 1.1.0 for now: -PREFERRED_VERSION_mtd-utils ?= "1.1.0" - # boost 1.36 won't build PREFERRED_VERSION_boost ?= "1.33.1" - -####################### Obsolete stuff, not sure why we keep this: - -# New pango and older glib-2.0 versions don't mix, -# so specify exactly what we would like to build. -#PREFERRED_VERSION_pango ?= "1.20.5" -#PREFERRED_VERSION_glib-2.0 ?= "2.16.1" -#PREFERRED_VERSION_cairo ?= "1.4.8" -# -# Stick with an older gettext and e2fsprogs stuff -# and gnutls... (our autotools is too old at the moment) -#PREFERRED_VERSION_gnutls ?= "1.6.3" -#PREFERRED_VERSION_gettext ?= "0.14.1" -#PREFERRED_VERSION_gettext-native ?= "0.14.1" -#PREFERRED_VERSION_e2fsprogs-libs ?= "1.39" -#PREFERRED_VERSION_e2fsprogs ?= "1.38" -#PREFERRED_VERSION_e2fsprogs-native ?= "1.38" - diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 35a83ad8a2..1c01fbc43d 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -53,7 +53,7 @@ SRCREV_pn-epiphany ?= "7837" SRCREV_pn-etk-theme-ninja ?= "5" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-flashrom ?= "3682" -SRCREV_pn-frameworkd ?= "b652f9cc4efbccc1df941c0d93e156631879f174" +SRCREV_pn-frameworkd ?= "1b57e0a6bab423f4f74c0107b4bb9bd83733ee42" SRCREV_pn-frameworkd-devel ?= "858c8d58d1f7e807f2c09532787c4e7b1a5daa52" SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136" SRCREV_pn-fso-abyss ?= "6ed342f833930474ac506cbaad705c0d8beaa71f" @@ -78,6 +78,7 @@ SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181b SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" +SRCREV_pn-libeflvala ?= "f34ef380ce5c789745b249d96c3f1b7aa04fbd45" SRCREV_pn-libefso ?= "60" SRCREV_pn-libexalt ?= "78" SRCREV_pn-libexalt-dbus ?= "76" @@ -244,7 +245,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "39263" +EFL_SRCREV ?= "39502" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 56724446cf..35c3368451 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -74,6 +74,11 @@ PREFERRED_LIBC = "glibc" require conf/distro/include/sane-toolchain.inc ############################################################################# +# OVERWRITES adjusted from bitbake.conf to feature the MACHINE_CLASS +############################################################################# +OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + +############################################################################# # PREFERRED PROVIDERS ############################################################################# PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index fe28a3cb4d..75c0f42f7d 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -18,6 +18,9 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_DISPLAY_ORIENTATION = "0" MACHINE_DISPLAY_PPI = "180" +# use this for overrides +MACHINE_CLASS = "motorola-ezx" + XSERVER = "xserver-kdrive-fbdev" ROOT_FLASH_SIZE = "24" |