summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/angstrom-2007.1.conf150
-rw-r--r--conf/distro/include/preferred-xorg-versions.inc2
-rw-r--r--conf/distro/include/slugos.inc4
3 files changed, 119 insertions, 37 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 282b0532b9..dee674abea 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -33,62 +33,142 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}
FEED_ARCH ?= "${TARGET_ARCH}"
+#blackfin machines
+FEED_ARCH_bfin = "blackfin"
+
#armv4t machines
+FEED_ARCH_acern30 = "armv4t"
+FEED_ARCH_amsdelta = "armv4t"
FEED_ARCH_ep93xx = "armv4t"
-FEED_ARCH_h6300 = "armv4t"
-FEED_ARCH_fic-gta01 = "armv4t"
-FEED_ARCH_fic-gta02 = "armv4t"
-FEED_ARCH_fic-hxd8 = "armv4t"
+FEED_ARCH_eteng500 = "armv4t"
+FEED_ARCH_fic-gta01 = "armv4t"
+FEED_ARCH_fic-gta02 = "armv4t"
+FEED_ARCH_h1940 = "armv4t"
+FEED_ARCH_h6300 = "armv4t"
+FEED_ARCH_kb9202 = "armv4t"
+FEED_ARCH_ks8695 = "armv4t"
+FEED_ARCH_rx1950 = "armv4t"
+FEED_ARCH_rx3000 = "armv4t"
+FEED_ARCH_sarge-at91 = "armv4t"
+FEED_ARCH_smdk2440 = "armv4t"
+FEED_ARCH_smdk2443 = "armv4t"
#armv5t machines
+FEED_ARCH_a1200 = "armv5te"
FEED_ARCH_a780 = "armv5te"
-FEED_ARCH_aximx50 = "armv5te"
-FEED_ARCH_akita = "armv5te"
+FEED_ARCH_akita = "armv5te"
+FEED_ARCH_asus620 = "armv5te"
+FEED_ARCH_asus730 = "armv5te"
FEED_ARCH_at91sam9263ek = "armv5te"
-FEED_ARCH_c7x0 = "armv5te"
+FEED_ARCH_aximx50 = "armv5te"
+FEED_ARCH_aximx50v = "armv5te"
+FEED_ARCH_c7x0 = "armv5te"
FEED_ARCH_compulab-pxa270 = "armv5te"
-FEED_ARCH_h2200 = "armv5te"
-FEED_ARCH_h3900 = "armv5te"
-FEED_ARCH_h4000 = "armv5te"
-FEED_ARCH_h5000 = "armv5te"
-FEED_ARCH_htctornado = "armv5te"
+FEED_ARCH_devkitidp-pxa255 = "armv5te"
+FEED_ARCH_e680 = "armv5te"
+FEED_ARCH_er0100 = "armv5te"
+FEED_ARCH_gumstix = "armv5te"
+FEED_ARCH_h1910 = "armv5te"
+FEED_ARCH_h2200 = "armv5te"
+FEED_ARCH_h3900 = "armv5te"
+FEED_ARCH_h4000 = "armv5te"
+FEED_ARCH_h5000 = "armv5te"
+FEED_ARCH_htcalpine = "armv5te"
+FEED_ARCH_htcapache = "armv5te"
+FEED_ARCH_htcblueangel = "armv5te"
+FEED_ARCH_htchimalaya = "armv5te"
+FEED_ARCH_htcsable = "armv5te"
+FEED_ARCH_htctornado = "armv5te"
FEED_ARCH_htcuniversal = "armv5te"
-FEED_ARCH_hx2000 = "armv5te"
-FEED_ARCH_hx4700 = "armv5te"
-FEED_ARCH_ixp4xx = "armv5te"
-FEED_ARCH_ixp4xxle = "armv5te"
-FEED_ARCH_magician = "armv5te"
-FEED_ARCH_netbook-pro = "armv5te"
-FEED_ARCH_nokia770 = "armv5te"
-FEED_ARCH_omap5912osk = "armv5te"
-FEED_ARCH_poodle = "armv5te"
-FEED_ARCH_spitz = "armv5te"
-FEED_ARCH_tosa = "armv5te"
-
-
-FEED_ARCH_ixp4xxbe = "armv5teb"
+FEED_ARCH_hx2000 = "armv5te"
+FEED_ARCH_hx4700 = "armv5te"
+FEED_ARCH_ixp4xxle = "armv5te"
+FEED_ARCH_logicpd-pxa270 = "armv5te"
+FEED_ARCH_looxc550 = "armv5te"
+FEED_ARCH_lsarm = "armv5te"
+FEED_ARCH_magician = "armv5te"
+FEED_ARCH_mainstone = "armv5te"
+FEED_ARCH_mnci = "armv5te"
+FEED_ARCH_mtx-3 = "armv5te"
+FEED_ARCH_mx21ads = "armv5te"
+FEED_ARCH_n2100 = "armv5te"
+FEED_ARCH_navman-icn330 = "armv5te"
+FEED_ARCH_netbook-pro = "armv5te"
+FEED_ARCH_nokia770 = "armv5te"
+FEED_ARCH_rokre2 = "armv5te"
+FEED_ARCH_nslu2le = "armv5te"
+FEED_ARCH_omap1510inn = "armv5te"
+FEED_ARCH_omap1610h2 = "armv5te"
+FEED_ARCH_omap1710h3 = "armv5te"
+FEED_ARCH_omap5912osk = "armv5te"
+FEED_ARCH_palmld = "armv5te"
+FEED_ARCH_palmt650 = "armv5te"
+FEED_ARCH_palmt680 = "armv5te"
+FEED_ARCH_palmtc = "armv5te"
+FEED_ARCH_palmtt = "armv5te"
+FEED_ARCH_palmtt3 = "armv5te"
+FEED_ARCH_palmtt5 = "armv5te"
+FEED_ARCH_palmtx = "armv5te"
+FEED_ARCH_palmz31 = "armv5te"
+FEED_ARCH_palmz71 = "armv5te"
+FEED_ARCH_palmz72 = "armv5te"
+FEED_ARCH_poodle = "armv5te"
+FEED_ARCH_qemuarm = "armv5te"
+FEED_ARCH_spitz = "armv5te"
+FEED_ARCH_tosa = "armv5te"
+FEED_ARCH_triton = "armv5te"
+
+FEED_ARCH_ixp4xxbe = "armv5teb"
+FEED_ARCH_nslu2be = "armv5teb"
+
+#i486 machines
+FEED_ARCH_geodegx = "i486"
+FEED_ARCH_geodelx = "i486"
+FEED_ARCH_netvista = "i486"
+FEED_ARCH_wrap = "i486"
+FEED_ARCH_x86 = "i486"
#i586 machines
-FEED_ARCH_epia = "i586"
+FEED_ARCH_epia = "i586"
+FEED_ARCH_i586-generic = "i586"
+FEED_ARCH_qemux86 = "i586"
#i686 machines
-FEED_ARCH_guinness = "i686"
-FEED_ARCH_progear = "i686"
+FEED_ARCH_alix = "i686"
+FEED_ARCH_colinux = "i686"
+FEED_ARCH_guinness = "i686"
+FEED_ARCH_i686-generic = "i686"
+FEED_ARCH_progear = "i686"
#powerpc machines
-FEED_ARCH_efika = "ppc603e"
+FEED_ARCH_dht-walnut = "ppc405"
+FEED_ARCH_magicbox = "ppc405"
+FEED_ARCH_xilinx-ml403 = "ppc405"
+FEED_ARCH_xilinx-ml410 = "ppc405"
+FEED_ARCH_sequoia = "ppc440e"
+FEED_ARCH_efika = "ppc603e"
+FEED_ARCH_lite5200 = "ppc603e"
+FEED_ARCH_lsppchd = "ppc603e"
+FEED_ARCH_lsppchg = "ppc603e"
+FEED_ARCH_storcenter = "ppc603e"
+FEED_ARCH_turbostation = "ppc603e"
+
#strongarm machines, no EABI
-FEED_ARCH_collie = "arm-oabi"
-FEED_ARCH_h3600 = "arm-oabi"
-FEED_ARCH_h3800 = "arm-oabi"
-FEED_ARCH_simpad = "arm-oabi"
-FEED_ARCH_htcwallaby = "arm-oabi"
+FEED_ARCH_collie = "arm-oabi"
+FEED_ARCH_h3600 = "arm-oabi"
+FEED_ARCH_h3800 = "arm-oabi"
+FEED_ARCH_htcwallaby = "arm-oabi"
+FEED_ARCH_jornada56x = "arm-oabi"
+FEED_ARCH_jornada7xx = "arm-oabi"
+FEED_ARCH_shark = "arm-oabi"
+FEED_ARCH_simpad = "arm-oabi"
+
#Tweak packaging for strongarm machines since they can't use EABI
diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc
index 0681b01d3d..fa66d61a0a 100644
--- a/conf/distro/include/preferred-xorg-versions.inc
+++ b/conf/distro/include/preferred-xorg-versions.inc
@@ -103,7 +103,7 @@ 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_xserver-xorg = "1.3.0.0"
PREFERRED_VERSION_xset = "1.0.2"
PREFERRED_VERSION_xtrans = "1.0.3"
PREFERRED_VERSION_xtrans-native = "1.0.3"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 00b9440b1f..acfe23d742 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.5"
+SLUGOS_VERSION = "4.6"
DISTRO_REVISION ?= ""
DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
# For release (only):
@@ -145,3 +145,5 @@ IGNORE_STRIP_ERRORS = ""
#PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
PREFERRED_VERSION_linux-libc-headers = "2.6.18"
+
+PREFERRED_VERSION_openssh ?= "4.6p1"