diff options
Diffstat (limited to 'conf/distro/angstrom-2007.1.conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 69 |
1 files changed, 32 insertions, 37 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 87c3dde12d..11d47f11c8 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -16,14 +16,14 @@ DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" FEED_URIS += " \ - base##${ANGSTROM_URI}/unstable/feed/base \ - perl##${ANGSTROM_URI}/unstable/feed/perl \ - python##${ANGSTROM_URI}/unstable/feed/python \ - debug##${ANGSTROM_URI}/unstable/feed/debug \ - ${MACHINE}##${ANGSTROM_URI}/unstable/feed/machine/${MACHINE}" -# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/base \ -# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ -# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" + base##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/base \ + perl##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/perl \ + python##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/python \ + debug##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/debug \ + ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${TARGET_ARCH}/machine/${MACHINE}" +# base##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/base \ +# ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/machine/${MACHINE} \ +# updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${TARGET_ARCH}/updates" #SRCDATE = "20060630" #SRCDATE_handhelds-pxa-2.6 = "20060622" @@ -114,9 +114,9 @@ PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" PREFERRED_VERSION_binutils ?= "2.17" PREFERRED_VERSION_binutils-cross ?= "2.17" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" -PREFERRED_VERSION_glibc ?= "2.4" -PREFERRED_VERSION_glibc-intermediate ?= "2.4" +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" +PREFERRED_VERSION_glibc ?= "2.5" +PREFERRED_VERSION_glibc-intermediate ?= "2.5" # To use an EABI compatible version 3 series gcc, either uncomment # the lines below or set them in local.conf: @@ -139,20 +139,8 @@ PREFERRED_PROVIDER_hostap-modules_hx4700 ?= "hostap-modules" PREFERRED_VERSION_hostap-modules ?= "0.4.7" #Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff -# c7x0, akita, spitz, nokia770, h2200, h6300, ipaq-pxa270, simpad +# c7x0, akita, spitz, nokia770, h2200, h6300, hx4700, simpad -#### Bootstrap options #### - -PCMCIA_MANAGER_c7x0 = "pcmciautils" -PCMCIA_MANAGER_akita = "pcmciautils" -PCMCIA_MANAGER_spitz = "pcmciautils" -PCMCIA_MANAGER_tosa = "pcmciautils" -PCMCIA_MANAGER_poodle = "pcmciautils" -PCMCIA_MANAGER_nokia770 = "pcmciautils" -PCMCIA_MANAGER_h2200 = "pcmciautils" -PCMCIA_MANAGER_h4000 = "pcmciautils" -PCMCIA_MANAGER_h6300 = "pcmciautils" -PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" # add altboot to compatible models, will be replaced with angstrom-bootmanager #EXTRA_STUFF_append_c7x0 = "altboot" @@ -161,20 +149,27 @@ PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" #EXTRA_STUFF_append_poodle = "altboot" #EXTRA_STUFF_append_tosa = "altboot" -### GPE section ### -#Install libgtkinput in devices without a keyboard -GPE_EXTRA_INSTALL_append_ipaq-pxa270 = " libgtkinput" -GPE_EXTRA_INSTALL_append_h2200 = " libgtkinput" -GPE_EXTRA_INSTALL_append_h4000 = " libgtkinput" -GPE_EXTRA_INSTALL_append_h6300 = " libgtkinput" -GPE_EXTRA_INSTALL_append_simpad = " libgtkinput" -GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" +# do some task-base stuff here + +# We want to ship extra debug utils in the rootfs when doing a debug build +DEBUG_APPS ?= "" +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb procps",d)}' + +#this should go away soon +EXTRA_STUFF ?= "" -#As soon as a kill switch is in place we can add it to devices with a keyboard -#GPE_EXTRA_INSTALL_append_c7x0 = " libgtkinput" -#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" -#GPE_EXTRA_INSTALL_append_akita = " libgtkinput" -#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" +# Angstrom want to ship some extra stuff. This should be moved into task-base eventually +DISTRO_EXTRA_RDEPENDS = "\ + update-modules module-init-tools modutils-initscripts \ + sysvinit initscripts sysvinit-pidof \ + psplash \ + netbase dropbear \ + angstrom-version \ + ipkg ipkg-collateral \ + util-linux-mount util-linux-umount \ + ${EXTRA_STUFF} \ + ${DEBUG_APPS} \ + " |