diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-08 00:48:04 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-08 00:48:04 +0000 |
| commit | 6e3975e7442e24e52879f265e834ea0c249c4630 (patch) | |
| tree | 4533b46732f7baf1fab3e8cbf412a1d8856ecfd7 /conf | |
| parent | 8afb6c6f4dbcb8c14f42d9c95cc761a8a4cee422 (diff) | |
| parent | 9a2e603ebcf3db0c0fdf20dd99d0016d18270543 (diff) | |
merge of '064f6cf6a9c7a0c7bf6771ce35e295ba8a56535c'
and '68b3b556b8787e3175c7900ad3a0038e45b4f4b8'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 3 | ||||
| -rw-r--r-- | conf/distro/include/angstrom.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/slugos.inc | 2 | ||||
| -rw-r--r-- | conf/machine/h5000.conf | 4 | ||||
| -rw-r--r-- | conf/machine/progear.conf | 1 |
5 files changed, 7 insertions, 4 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 3eb3ab436f..fd4830d849 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -320,8 +320,9 @@ export palmqtdir = "/opt/QtPalmtop" GNU_MIRROR = "ftp://ftp.gnu.org/gnu" DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool" -SOURCEFORGE_MIRROR = "http://downloads.sourceforge.net" +SOURCEFORGE_MIRROR = "http://surfnet.dl.sourceforge.net" GPE_MIRROR = "http://gpe.linuxtogo.org/download/source" +GPEPHONE_MIRROR = "http://gpephone.linuxtogo.org/download/gpephone" GPE_SVN = "svn://projects.linuxtogo.org/svn/gpe/trunk/base;module=${PN}" XLIBS_MIRROR = "http://xlibs.freedesktop.org/release" XORG_MIRROR = "http://xorg.freedesktop.org/releases" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index c057d1a05e..79ec27af72 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -50,3 +50,4 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci" +DISTRO_FEATURES_nslu2le = "nfs smbfs alsa bluetooth ext2 usbhost pci" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index ba61355ba8..c0401d93d3 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -35,7 +35,7 @@ #DISTRO_TYPE # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.2" +SLUGOS_VERSION = "4.3" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf index ecc2e679d9..8645df3555 100644 --- a/conf/machine/h5000.conf +++ b/conf/machine/h5000.conf @@ -23,8 +23,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootfs.jffs2 - root' >> ${DEPLOY_DIR_IMAGE}/reflash.ctl" MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" -MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ - kernel-module-h5400_battery" +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \ + kernel-module-h5400-battery" # # Modules autoload and other boot properties diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf index 4cad129a9d..71eac0d6c5 100644 --- a/conf/machine/progear.conf +++ b/conf/machine/progear.conf @@ -7,6 +7,7 @@ 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" |