diff options
Diffstat (limited to 'conf/distro')
| -rw-r--r-- | conf/distro/familiar-unstable.conf | 4 | ||||
| -rw-r--r-- | conf/distro/preferred-gpe-versions-2.8.inc | 10 | ||||
| -rw-r--r-- | conf/distro/slugos.conf | 20 | ||||
| -rw-r--r-- | conf/distro/unslung-packages.conf | 1 | ||||
| -rw-r--r-- | conf/distro/unslung.conf | 8 |
5 files changed, 30 insertions, 13 deletions
diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index 1a5600c986..f7d941063d 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -1,6 +1,8 @@ DISTRO = "familiar" DISTRO_NAME = "Familiar Linux" DISTRO_VERSION = "unstable-${DATE}" +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +# Do not touch this file before notifying familiar-dev@handhelds.org include conf/distro/familiar.conf @@ -61,7 +63,7 @@ PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" PREFERRED_PROVIDER_x11 = "diet-x11" -include conf/distro/preferred-gpe-versions-2.7.inc +include conf/distro/preferred-gpe-versions-2.8.inc # # E diff --git a/conf/distro/preferred-gpe-versions-2.8.inc b/conf/distro/preferred-gpe-versions-2.8.inc new file mode 100644 index 0000000000..c62d0aff6e --- /dev/null +++ b/conf/distro/preferred-gpe-versions-2.8.inc @@ -0,0 +1,10 @@ +# +# Specify which versions of GPE (and related) applications to build +# + +#set some preferred providers: +PREFERRED_PROVIDER_gconf=gconf-dbus +PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus + +# - the GPE roadmap doesn't state any versions for 2.8 yet +# http://www.handhelds.org/moin/moin.cgi/GPERoadmap diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 4cc33888d7..fa74e3965c 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -7,8 +7,8 @@ # Explanation of the naming # -# nslu2-dist - the base distro configuration for an NSLU2 -# nslu2-[bl][at][gu] - a specific configuration encoded as follows: +# slugos-dist - the base distro configuration for an NSLU2 +# slugos-[bl][at][gu] - a specific configuration encoded as follows: # # b or l - big or little endian # set ARCH_BYTE_SEX to match @@ -21,10 +21,10 @@ # # The following names are deprecated: # -# openslug - the historical name of a canonical nslu2-bag distro -# also the name of a standard nslu2-bag distro with a package feed -# ucslugc - the historical (and obsolete) name of nslu2-btu -# also the name of a standard nslu2-btu distro with a package feed +# openslug - the historical name of a canonical slugos-bag distro +# also the name of a standard slugos-bag distro with a package feed +# ucslugc - the historical (and obsolete) name of slugos-btu +# also the name of a standard slugos-btu distro with a package feed # #---------------------------------------------------------------------------------- @@ -140,14 +140,14 @@ SLUGOS_EXTRA_RDEPENDS ?= "" # PACKAGE VERSION CONTROL #---------------------------------------------------------------------------------- # Select the correct versions of the compiler tools (note that there -# is also some selection in machine/nslu2.conf) +# is also some selection in machine/${MACHINE}.conf) PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" # compiler/binary/library versions (unslung uses different ones so these -# cannot be in nslu2.conf) +# cannot be in ${MACHINE}.conf) PREFERRED_VERSION_binutils ?= "2.16" PREFERRED_VERSION_binutils-cross ?= "2.16" PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" @@ -157,8 +157,8 @@ 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 ?= "nslu2-kernel" -PREFERRED_VERSION_nslu2-kernel ?= "2.6.15" +PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.15" # Built-in ethernet modules PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth" diff --git a/conf/distro/unslung-packages.conf b/conf/distro/unslung-packages.conf index 351e70d543..4cef102535 100644 --- a/conf/distro/unslung-packages.conf +++ b/conf/distro/unslung-packages.conf @@ -29,6 +29,7 @@ ${PKGDIR}/packages/mtd/*.bb \ ${PKGDIR}/packages/nslu2-binary-only/*.bb \ ${PKGDIR}/packages/pkgconfig/*.bb \ ${PKGDIR}/packages/portmap/*.bb \ +${PKGDIR}/packages/python/*.bb \ ${PKGDIR}/packages/quilt/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ ${PKGDIR}/packages/unzip/*.bb \ diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 5a88ac9c72..11445846b2 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -47,11 +47,15 @@ UNSLUNG_EXTRA_INSTALL ?= "${UNSLUNG_EXTRA_RDEPENDS}" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" +PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -PREFERRED_VERSION_glibc ?= "2.2.5" -PREFERRED_VERSION_glibc-initial ?= "2.2.5" PREFERRED_VERSION_binutils ?= "2.15.94.0.1" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" +PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" +PREFERRED_VERSION_gcc-cross ?= "3.4.4" +PREFERRED_VERSION_gcc ?= "3.4.4" +PREFERRED_VERSION_glibc ?= "2.2.5" +PREFERRED_VERSION_glibc-initial ?= "2.2.5" PREFERRED_PROVIDER_virtual/kernel ?= "unslung-kernel" PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63" |