diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-09 18:15:40 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-01-09 18:15:40 +0000 |
| commit | c918c91a1bed5ef3e1dc38cbbfb82444ea4e897c (patch) | |
| tree | 78a2737313589cdcfdc0ede1758cc584d8cdb6a0 /conf | |
| parent | b91c9e4599944a6a64c7f853cf5080274b03ede9 (diff) | |
| parent | 747d775316d2ad2df56511c5db30f73b9ac534f3 (diff) | |
merge of '16ee14a842b8b60161751ee3f1a8963b703977c9'
and '92587fd59457797dd414b12575ca5d07d3407b3f'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/angstrom-2007.1-oabi.conf | 8 | ||||
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 4 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/conf/distro/angstrom-2007.1-oabi.conf b/conf/distro/angstrom-2007.1-oabi.conf index 2d8a27d04d..4007f203ad 100644 --- a/conf/distro/angstrom-2007.1-oabi.conf +++ b/conf/distro/angstrom-2007.1-oabi.conf @@ -11,10 +11,10 @@ PACKAGE_EXTRA_ARCHS = "arm-oabi" PREFERRED_VERSION_linux-handhelds-2.6_h3600 = "2.6.19-hh7" -FEED_ARCH_collie = "arm" -FEED_ARCH_h3600 = "arm" -FEED_ARCH_h3800 = "arm" -FEED_ARCH_simpad = "arm" +FEED_ARCH_collie = "arm-oabi" +FEED_ARCH_h3600 = "arm-oabi" +FEED_ARCH_h3800 = "arm-oabi" +FEED_ARCH_simpad = "arm-oabi" diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index b95fdb7223..b1855b0ea7 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "28" +DISTRO_REVISION = "30" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -70,7 +70,7 @@ FEED_URIS += " \ # We will lock down a SRCDATE when we go into release mode #SRCDATE = "20070303" -PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh8" +PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh9" PREFERRED_VERSION_linux-handhelds-2.6_h3900 = "2.6.19-hh7" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.18-hh1" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index b255e85488..7ca663a4d6 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -36,7 +36,7 @@ #DISTRO_TYPE # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.1" +SLUGOS_VERSION = "4.2" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): @@ -171,7 +171,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19+2.6.20-rc4" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" |