diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 12 | ||||
| -rw-r--r-- | conf/checksums.ini | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs-fso.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/tune-atom.inc | 8 | ||||
| -rw-r--r-- | conf/machine/ion.conf | 23 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf | 3 |
7 files changed, 48 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 4435fdd8bd..b69b6757db 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -651,10 +651,16 @@ BUILDCFG_NEEDEDVARS ?= "TARGET_ARCH TARGET_OS" ### Config file processing ### +# Overrides are processed left to right, so the ones that are named later take precedence. +# You generally want them to go from least to most specific. +# # This means that an envionment variable named '<foo>_arm' overrides an -# environment variable '<foo>' (when ${TARGET_ARCH} is arm). And the same: an -# environment variable '<foo>_ramses' overrides both '<foo>' and '<foo>_arm -# when ${MACHINE} is 'ramses'. And finally '<foo>_local' overrides anything. +# environment variable '<foo>' (when ${TARGET_ARCH} is arm). +# an environment variable '<foo>_ramses' overrides '<foo>' but doesn't override +# '<foo>_arm' when ${MACHINE} is 'ramses'. +# If you use combination ie '<foo>_arm_ramses', then '<foo>_arm_ramses' will override +# '<foo>_arm' and then '<foo>' will be overriden with that value from '<foo>_arm'. +# And finally '<foo>_local' overrides anything, but with lowest priority. # # This works for functions as well, they are really just environment variables. # Default OVERRIDES to make compilation fail fast in case of build system misconfiguration. diff --git a/conf/checksums.ini b/conf/checksums.ini index 39cd260979..b2bc05b06f 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16550,6 +16550,10 @@ sha256=20b3cbdb4b05322d470404a7d2e8cdae1e0ce5372113218ae3cada3b29da70f7 md5=478646358c49f34aedcce58948793619 sha256=6eb7040048e35448fe224fa3fd993eb4e49a905c57893886082f1674d43b0e73 +[http://downloads.sourceforge.net/libwbxml/libwbxml-0.10.7.tar.gz] +md5=ef3e66df3c4223ce5ce0a70ded5c5221 +sha256=24112231e70c21f90348cefeea362de36aa7bace4088355efcbf4efe0dd242d0 + [http://downloads.sourceforge.net/libwiimote/libwiimote-0.4.tgz] md5=0d8d61dc989d8ad83e1005a26136d388 sha256=a1e9d45a0d4dd367f1371dd477e30ecaa95e59b9fb8635dc9e7f26e4eb231d90 diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 78eaec4f73..0fa5efbde3 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -8,7 +8,7 @@ SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsogpsd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsousaged ?= "11dbb63abb48094fab63c64de189fe99189b9f73" +SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d" SRCREV_pn-libfsobasics ?= "18d4114d295617c6fb611f3c804e1980b896fc14" SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3143ecbbd2..9dd45fdf1e 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -46,7 +46,7 @@ SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953" SRCREV_pn-diversity-daemon ?= "571" SRCREV_pn-diversity-radar ?= "453" SRCREV_pn-e-tasks ?= "14" -SRCREV_pn-e-wm-config-illume-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5" +SRCREV_pn-e-wm-config-illume-shr ?= "0c5028ccfda72c36b2880382139cb4565a1625ca" SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-sysactions-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" diff --git a/conf/machine/include/tune-atom.inc b/conf/machine/include/tune-atom.inc new file mode 100644 index 0000000000..b1f6453526 --- /dev/null +++ b/conf/machine/include/tune-atom.inc @@ -0,0 +1,8 @@ +# GCC 4.3.0- (see Poky) +# TARGET_CC_ARCH = "-march=i586" +# +# GCC 4.3.1+ (see Gentoo) +#TARGET_CC_ARCH = "-march=core2" + +# GCC 4.4.2+ (see Fedora 12) +TARGET_CC_ARCH = "-march=i686 -mtune=atom" diff --git a/conf/machine/ion.conf b/conf/machine/ion.conf new file mode 100644 index 0000000000..f58219bd1a --- /dev/null +++ b/conf/machine/ion.conf @@ -0,0 +1,23 @@ +#@TYPE: Machine +#@NAME: Ion + +#@DESCRIPTION: Machine configuration for NVidia Ion based machines. +#Point of View ION, Asrock 330, etc. + +TARGET_ARCH = "i686" + +#MACHINE_ARCH = "core2" + +PACKAGE_EXTRA_ARCHS = "x86" + +include conf/machine/include/tune-atom.inc + +MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \ + acpi" + +KERNEL_IMAGETYPE = "bzImage" + +PREFERRED_PROVIDER_virtual/kernel ?= "linux" + +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 5882019e19..d47320e59d 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -36,7 +36,8 @@ XSERVER ?= "xserver-xorg \ # fbreader specific READER_RESOLUTION = "480x640" -READER_ARCH = "openzaurus" +READER_ARCH = "desktop" +READER_UI = "gtk" # package machine specific modules MACHINE_EXTRA_RRECOMMENDS = "\ |