diff options
Diffstat (limited to 'conf')
24 files changed, 272 insertions, 43 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 19910d32e7..dc3378fd95 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -110,23 +110,33 @@ RPROVIDES = "" PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" FILES = "" + FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ /bin/* /sbin/* /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/* \ ${datadir}/pixmaps ${datadir}/applications \ ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ ${libdir}/bonobo/servers" -SECTION_${PN}-doc = "doc" + FILES_${PN}-doc = "${docdir} ${mandir} ${infodir} ${datadir}/gtk-doc \ ${datadir}/gnome/help" -SECTION_${PN}-dev = "devel" +SECTION_${PN}-doc = "doc" + FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ /lib/*.a /lib/*.o ${datadir}/aclocal" -FILES_${PN}-locale = "${datadir}/locale" +SECTION_${PN}-dev = "devel" +ALLOW_EMPTY_${PN}-dev = "1" +RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" + FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ /bin/.debug /sbin/.debug /lib/.debug ${libdir}/${PN}/.debug \ ${libdir}/matchbox-panel/.debug" +SECTION_${PN}-dbg = "devel" +ALLOW_EMPTY_${PN}-dbg = "1" +RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}" + +FILES_${PN}-locale = "${datadir}/locale" # File manifest @@ -142,7 +152,6 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" TMPDIR = "${TOPDIR}/tmp" CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" -DL_DIR = "${TMPDIR}/downloads" CVSDIR = "${DL_DIR}/cvs" SVNDIR = "${DL_DIR}/svn" GITDIR = "${DL_DIR}/git" @@ -414,7 +423,8 @@ SLOT = "0" # Other -export PKG_CONFIG_PATH = "${STAGING_LIBDIR}/pkgconfig" +export PKG_CONFIG_DIR = "${STAGING_LIBDIR}/pkgconfig" +export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}" export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export QMAKE_MKSPEC_PATH = "${STAGING_DIR}/${BUILD_SYS}/share/qmake" @@ -456,6 +466,7 @@ require conf/sanity.conf # Weak variables (usually to retain backwards compatibility) ################################################################## +DL_DIR ?= "${TMPDIR}/downloads" IMAGE_FSTYPES ?= "jffs2" PCMCIA_MANAGER ?= "pcmcia-cs" MACHINE_TASK_PROVIDER ?= "task-base" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index e83ef90280..282b0532b9 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -12,10 +12,6 @@ DISTRO_REVISION = "46" require conf/distro/include/sane-srcdates.inc -#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} -ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" -require conf/distro/include/angstrom${ARM_ABI}.inc - #Images built can have to modes: # 'debug': empty rootpassword, strace and gdb included # 'release' no root password, no strace and gdb by default @@ -233,7 +229,7 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.5" #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom require conf/distro/include/preferred-gpe-versions-2.8.inc require conf/distro/include/preferred-e-versions.inc -require conf/distro/include/preferred-xorg-versions-X11R7.2.inc +require conf/distro/include/preferred-xorg-versions.inc # Virtuals: @@ -261,7 +257,7 @@ PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" PREFERRED_PROVIDER_virtual/db ?= "db" PREFERRED_PROVIDER_virtual/db-native ?= "db-native" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" @@ -298,20 +294,9 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" #Silence a warning during parsing PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" - - -#Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff -# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad - - -# add altboot to compatible models, will be replaced with angstrom-bootmanager -#PREFERRED_VERSION_altboot = "1.0.8+1.0.9_pre1" -#EXTRA_STUFF_append_c7x0 += "altboot" -#EXTRA_STUFF_append_akita += "altboot" -#EXTRA_STUFF_append_poodle += "altboot" -#EXTRA_STUFF_append_tosa += "altboot" -#EXTRA_STUFF_append_spitz += "altboot" - +#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH} +ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" +require conf/distro/include/angstrom${ARM_ABI}.inc # do some task-base stuff here diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf new file mode 100644 index 0000000000..7fc656fb5e --- /dev/null +++ b/conf/distro/angstrom-2008.1.conf @@ -0,0 +1,36 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Angstrom <http://www.angstrom-distribution.org> +#@DESCRIPTION: The Linux Distribution for Kernel 2.6 based devices +#@MAINTAINER: Koen Kooi <koen@dominion.kabel.utwente.nl> +#@MAINTAINER: Michael 'Mickey' Lauer <mickey@Vanille-media.de> +#@-------------------------------------------------------------------- + +# This is a testbed for unstable and/or untested things, while angstrom-2007.1 +# is aiming for stability and a release. +# Use this at your own risk, we welcome bugreports filed at +# http://bugs.openembedded.org +# In doubt, use DISTRO="angstrom-2007.1" + +require conf/distro/angstrom-2007.1.conf + +#DISTRO_VERSION = "2008.1" +DISTRO_VERSION = "2008.1-test-${DATE}" +DISTRO_REVISION = "0" + +PREFERRED_VERSION_gcc ?= "4.2.1" +PREFERRED_VERSION_gcc-cross ?= "4.2.1" + +PREFERRED_VERSION_binutils ?= "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12" +PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.12" + +#This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against +PREFERRED_VERSION_linux-libc-headers ?= "2.6.22" + +#Prefer glibc 2.5 and uclibc 0.9.29, these have had the most testing. +PREFERRED_VERSION_glibc ?= "2.6" +PREFERRED_VERSION_glibc-intermediate ?= "2.6" +PREFERRED_VERSION_glibc-initial ?= "2.6" + + diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index 333c8c8bc9..dc3929c3a7 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -3,6 +3,16 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc = "eglibc-intermediate" +PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc = "eglibc-intermediate" + + + TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" #mess with compiler flags to use -Os instead of -O2 diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index 940568130c..acc8498262 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -24,6 +24,11 @@ PREFERRED_VERSION_libtododb ?= "0.11" PREFERRED_VERSION_libhandoff ?= "0.1" PREFERRED_VERSION_libmimedir ?= "0.4.2" PREFERRED_VERSION_libsoundgen ?= "0.6" +PREFERRED_VERSION_libdotdesktop ?= "0.11" +PREFERRED_VERSION_libeventdb ?= "0.90" +PREFERRED_VERSION_libgpelaunch ?= "0.14" +PREFERRED_VERSION_libgtkstylus ?= "0.3" +PREFERRED_VERSION_libxsettings-client ?= "0.17" PREFERRED_VERSION_gpe-icons ?= "0.25" @@ -33,20 +38,30 @@ PREFERRED_VERSION_gpe-su ?= "0.19" PREFERRED_VERSION_keylaunch ?= "2.0.10" PREFERRED_VERSION_startup-monitor ?= "0.18-2" PREFERRED_VERSION_gpe-dm ?= "0.51" +PREFERRED_VERSION_ipaq-sleep ?= "0.9" +PREFERRED_VERSION_teleport ?= "0.34" +PREFERRED_VERSION_xst ?= "0.15" +PREFERRED_VERSION_gpe-aerial ?= "0.3.0" +PREFERRED_VERSION_gpe-appmgr ?= "2.8" +PREFERRED_VERSION_gpe-autostarter ?= "0.12" PREFERRED_VERSION_gpe-todo ?= "0.56" PREFERRED_VERSION_gpe-calendar ?= "0.91" PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9" PREFERRED_VERSION_gpe-contacts ?= "0.47" PREFERRED_VERSION_gpe-beam ?= "0.2.9" PREFERRED_VERSION_gpe-bluetooth ?= "0.55" +PREFERRED_VERSION_gpe-bootsplash ?= "1.15" PREFERRED_VERSION_gpe-conf ?= "0.2.6" +PREFERRED_VERSION_gpe-confd ?= "0.16" PREFERRED_VERSION_gpe-clock ?= "0.25" PREFERRED_VERSION_gpe-mininet ?= "0.7" PREFERRED_VERSION_gpe-mixer ?= "0.42" PREFERRED_VERSION_gpe-shield ?= "0.9" PREFERRED_VERSION_gpe-taskmanager ?= "0.20" PREFERRED_VERSION_minilite ?= "0.50" +PREFERRED_VERSION_miniclipboard ?= "0.3" +PREFERRED_VERSION_minimix ?= "0.8" PREFERRED_VERSION_gpe-edit ?= "0.40" PREFERRED_VERSION_gpe-gallery ?= "0.97" PREFERRED_VERSION_gpe-calculator ?= "0.2" @@ -64,8 +79,13 @@ PREFERRED_VERSION_gpe-announce ?= "0.13" PREFERRED_VERSION_gpe-timesheet ?= "0.32" PREFERRED_VERSION_gpe-irc ?= "0.08" PREFERRED_VERSION_starling ?= "0.2" +PREFERRED_VERSION_gpe-keylock ?= "0.12" +PREFERRED_VERSION_gpe-ownerinfo ?= "0.28" +PREFERRED_VERSION_gpe-question ?= "0.04" +PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" PREFERRED_VERSION_gpe-go ?= "0.05" +PREFERRED_VERSION_gpe-julia ?= "0.0.6" PREFERRED_VERSION_gpe-lights ?= "0.13" PREFERRED_VERSION_gpe-othello ?= "0.2-1" PREFERRED_VERSION_gpe-plucker ?= "0.4" diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc new file mode 100644 index 0000000000..0681b01d3d --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions.inc @@ -0,0 +1,111 @@ +PREFERRED_VERSION_applewmproto = "1.0.3" +PREFERRED_VERSION_bigreqsproto = "1.0.2" +PREFERRED_VERSION_bigreqsproto-native = "1.0.2" +PREFERRED_VERSION_compositeproto = "0.4" +PREFERRED_VERSION_damageproto = "1.1.0" +PREFERRED_VERSION_diet-x11 = "1.1.2" +PREFERRED_VERSION_dmxproto = "2.2.2" +PREFERRED_VERSION_evieext = "1.0.2" +PREFERRED_VERSION_fixesproto = "4.0" +PREFERRED_VERSION_fontcacheproto = "0.1.2" +PREFERRED_VERSION_fontcacheproto-native = "0.1.2" +PREFERRED_VERSION_fontsproto = "2.0.2" +PREFERRED_VERSION_fontsproto-native = "2.0.2" +PREFERRED_VERSION_gccmakedep = "1.0.2" +PREFERRED_VERSION_glproto = "1.4.8" +PREFERRED_VERSION_imake = "1.0.2" +PREFERRED_VERSION_inputproto = "1.4.2" +PREFERRED_VERSION_inputproto-native = "1.4.1" +PREFERRED_VERSION_kbproto = "1.0.3" +PREFERRED_VERSION_kbproto-native = "1.0.2" +PREFERRED_VERSION_libapplewm = "1.0.0" +PREFERRED_VERSION_libdmx = "1.0.2" +PREFERRED_VERSION_libfontenc = "1.0.4" +PREFERRED_VERSION_libfontenc-native = "1.0.4" +PREFERRED_VERSION_libfs = "1.0.0" +PREFERRED_VERSION_libice = "1.0.3" +PREFERRED_VERSION_liblbxutil = "1.0.1" +PREFERRED_VERSION_liboldx = "1.0.1" +PREFERRED_VERSION_libsm = "1.0.3" +PREFERRED_VERSION_libwindowswm = "1.0.0" +PREFERRED_VERSION_libx11 = "1.1.2" +PREFERRED_VERSION_libx11-native = "1.0.1" +PREFERRED_VERSION_libxau = "1.0.3" +PREFERRED_VERSION_libxau-native = "1.0.3" +PREFERRED_VERSION_libxaw = "1.0.3" +PREFERRED_VERSION_libxcomposite = "0.4.0" +PREFERRED_VERSION_libxcursor = "1.1.8" +PREFERRED_VERSION_libxdamage = "1.1.1" +PREFERRED_VERSION_libxdmcp = "1.0.2" +PREFERRED_VERSION_libxdmcp-native = "1.0.2" +PREFERRED_VERSION_libxevie = "1.0.2" +PREFERRED_VERSION_libxext = "1.0.3" +PREFERRED_VERSION_libxfixes = "4.0.3" +PREFERRED_VERSION_libxfont = "1.3.0" +PREFERRED_VERSION_libxfont-native = "1.3.0" +PREFERRED_VERSION_libxfontcache = "1.0.4" +PREFERRED_VERSION_libxft = "2.1.12" +PREFERRED_VERSION_libxi = "1.1.2" +PREFERRED_VERSION_libxinerama = "1.0.2" +PREFERRED_VERSION_libxkbfile = "1.0.4" +PREFERRED_VERSION_libxkbui = "1.0.2" +PREFERRED_VERSION_libxmu = "1.0.3" +PREFERRED_VERSION_libxp = "1.0.0" +PREFERRED_VERSION_libxpm = "3.5.6" +PREFERRED_VERSION_libxprintapputil = "1.0.1" +PREFERRED_VERSION_libxprintutil = "1.0.1" +PREFERRED_VERSION_libxrandr = "1.2.1" +PREFERRED_VERSION_libxrender = "0.9.2" +PREFERRED_VERSION_libxres = "1.0.3" +PREFERRED_VERSION_libxscrnsaver = "1.1.2" +PREFERRED_VERSION_libxt = "1.0.5" +PREFERRED_VERSION_libxtrap = "1.0.0" +PREFERRED_VERSION_libxtst = "1.0.2" +PREFERRED_VERSION_libxv = "1.0.3" +PREFERRED_VERSION_libxvmc = "1.0.4" +PREFERRED_VERSION_libxxf86dga = "1.0.1" +PREFERRED_VERSION_libxxf86misc = "1.0.1" +PREFERRED_VERSION_libxxf86vm = "1.0.1" +PREFERRED_VERSION_lndir = "1.0.1" +PREFERRED_VERSION_makedepend = "1.0.1" +PREFERRED_VERSION_makedepend-native = "1.0.1" +PREFERRED_VERSION_printproto = "1.0.3" +PREFERRED_VERSION_randrproto = "1.2.1" +PREFERRED_VERSION_recordproto = "1.13.2" +PREFERRED_VERSION_renderproto = "0.9.2" +PREFERRED_VERSION_resourceproto = "1.0.2" +PREFERRED_VERSION_scrnsaverproto = "1.1.0" +PREFERRED_VERSION_trapproto = "3.4.3" +PREFERRED_VERSION_util-macros = "1.1.5" +PREFERRED_VERSION_util-macros-native = "1.1.5" +PREFERRED_VERSION_videoproto = "2.2.2" +PREFERRED_VERSION_windowswmproto = "1.0.3" +PREFERRED_VERSION_xauth = "1.0.2" +PREFERRED_VERSION_xcmiscproto = "1.1.2" +PREFERRED_VERSION_xcmiscproto-native = "1.1.2" +PREFERRED_VERSION_xdpyinfo = "1.0.2" +PREFERRED_VERSION_xextproto = "7.0.2" +PREFERRED_VERSION_xextproto-native = "7.0.2" +PREFERRED_VERSION_xf86bigfontproto = "1.1.2" +PREFERRED_VERSION_xf86bigfontproto-native = "1.1.2" +PREFERRED_VERSION_xf86dgaproto = "2.0.2" +PREFERRED_VERSION_xf86driproto = "2.0.3" +PREFERRED_VERSION_xf86miscproto = "0.9.2" +PREFERRED_VERSION_xf86rushproto = "1.1.2" +PREFERRED_VERSION_xf86vidmodeproto = "2.2.2" +PREFERRED_VERSION_xhost = "1.0.2" +PREFERRED_VERSION_xineramaproto = "1.1.2" +PREFERRED_VERSION_xmodmap = "1.0.2" +PREFERRED_VERSION_xorg-cf-files = "1.0.2" +PREFERRED_VERSION_xproto = "7.0.10" +PREFERRED_VERSION_xproto-native = "7.0.10" +PREFERRED_VERSION_xproxymanagementprotocol = "1.0.2" +PREFERRED_VERSION_xrandr = "1.2.2" +PREFERRED_VERSION_xrdb = "1.0.3" +PREFERRED_VERSION_xserver-kdrive = "1.3.0.0" +PREFERRED_VERSION_xserver-xorg = "1.1.0" +PREFERRED_VERSION_xset = "1.0.2" +PREFERRED_VERSION_xtrans = "1.0.3" +PREFERRED_VERSION_xtrans-native = "1.0.3" +PREFERRED_VERSION_xinit = "1.0.4" +PREFERRED_VERSION_xev = "1.0.2" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 18d5c07495..8310d47a22 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -95,7 +95,7 @@ SRCDATE_entice ?= "20070601" SRCDATE_e-utils ?= "20070601" SRCDATE_enna ?= "20070721" -# Misc apps, sorted by alphabet +# Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" SRCDATE_bl ?= "20060814" SRCDATE_dvbstream ?= "20060814" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index bb1605e41b..00b9440b1f 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.4" +SLUGOS_VERSION = "4.5" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 5d63676343..c438da25d9 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -7,15 +7,17 @@ require conf/distro/angstrom-2007.1.conf require conf/distro/include/openmoko-srcdate-now.inc - # # Header # +DISTRO = "openmoko" DISTRO_NAME = "OpenMoko" DISTRO_VERSION = ".dev-snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" +OVERRIDES = "local:${MACHINE}:${DISTRO}:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" + CVS_TARBALL_STASH = "http://downloads.openmoko.org/sources/" PREMIRRORS = "(ftp|http)://.*/.*/ http://downloads.openmoko.org/sources/" @@ -24,3 +26,4 @@ FEED_URIS = "\ all##http://buildhost.openmoko.org/tmp/deploy/ipk/all \ armv4t##http://buildhost.openmoko.org/tmp/deploy/ipk/armv4t \ fic-gta01##http://buildhost.openmoko.org/tmp/deploy/ipk/fic-gta01" + diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index fad73c53bf..de94f560f9 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -require conf/machine/include/zaurus-2.6.conf -require conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus-clamshell.inc PACKAGE_EXTRA_ARCHS += "iwmmxt" diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf new file mode 100644 index 0000000000..adb8f23fa3 --- /dev/null +++ b/conf/machine/alix.conf @@ -0,0 +1,24 @@ +#@TYPE: Machine +#@NAME: Alix +#@DESCRIPTION: Machine configuration for PC Engines Alix1c board +# +# http://pcengines.ch/alix1c.htm + +# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html +TARGET_ARCH = "i686" + +PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" + +OLDEST_KERNEL = "2.6.17" +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" + +MACHINE_FEATURES = "kernel26 usbhost ext2 pci screen alsa acpi" + +IMAGE_FSTYPES += "tar.gz" + +MACHINE_EXTRA_RRECOMMENDS = "\ + kernel-modules \ + " diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf index fe0df53cc5..ad94420196 100644 --- a/conf/machine/at91sam9263ek.conf +++ b/conf/machine/at91sam9263ek.conf @@ -11,9 +11,11 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" #don't try to access tty1 USE_VT = "0" -MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget screen" +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 098d0526f0..6862a8095f 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -require conf/machine/include/zaurus-2.6.conf -require conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus-clamshell.inc IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 19bcb7607c..4649fe130e 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -33,7 +33,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\ ROOT_FLASH_SIZE = "60" # extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # build / upload tools EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index a87222cc3e..c9e1e73814 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -32,7 +32,7 @@ SERIAL_CONSOLE = "115200 ttySAC2" ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # build / upload tools EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index 01a06b7c27..fa24a3281b 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -1 +1 @@ -require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-2.6.inc diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.inc index ada838f0d6..a9702cfce2 100644 --- a/conf/machine/include/zaurus-2.6.conf +++ b/conf/machine/include/zaurus-2.6.inc @@ -40,3 +40,30 @@ MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" GUI_MACHINE_CLASS = "bigscreen" GUI_MACHINE_CLASS_poodle = "smallscreen" + +MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit" + +zaurus_make_installkit () { + cd ${DEPLOY_DIR_IMAGE} + rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ + mkdir ${IMAGE_NAME}-installkit/ + + # Get the latest kernel using the zImage-<machine>.bin symlink + cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin + + if [ "${MACHINE}" = "spitz" ]; then + cp gnu-tar ${IMAGE_NAME}-installkit/ + cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz + else + cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin + fi + + # All zaurus machines except collie need updater.sh + if [ "${MACHINE}" != "collie" ]; then + cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh + fi + + tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/ + md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5 + rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ +} diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.inc index f66502eff1..f66502eff1 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.inc diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf index b5e8aebb54..1852455e2b 100644 --- a/conf/machine/palmt680.conf +++ b/conf/machine/palmt680.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Palm Treo 680 -#@DESCRIPTION: Machine configuration for the Palm TX +#@DESCRIPTION: Machine configuration for the Palm Treo 680 require conf/machine/include/palm.conf diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf index b1139c21fa..24d13c1381 100644 --- a/conf/machine/palmtc.conf +++ b/conf/machine/palmtc.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Palm TC -#@DESCRIPTION: Machine configuration for the Palm TX +#@DESCRIPTION: Machine configuration for the Palm Tungsten C require conf/machine/include/palm.conf diff --git a/conf/machine/palmtt.conf b/conf/machine/palmtt.conf index 72b1f310ad..1f6d5c377d 100644 --- a/conf/machine/palmtt.conf +++ b/conf/machine/palmtt.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Palm Tungsten T -#@DESCRIPTION: Machine configuration for Palm Zire 71 +#@DESCRIPTION: Machine configuration for Palm Tungsten T/T2 TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv5te" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index a548f513d3..eee1edd53e 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -2,6 +2,6 @@ #@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600 #@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices -require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-2.6.inc ROOT_FLASH_SIZE = "22" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 81c789dcc4..3199065606 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -require conf/machine/include/zaurus-2.6.conf -require conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.inc +require conf/machine/include/zaurus-clamshell.inc PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index ddaf6e03c9..83227ee0c4 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-6000 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device -require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-2.6.inc # newer kernels does not build PREFERRED_VERSION_linux-rp = "2.6.17" |