diff options
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/include/zaurus-clamshell.conf | 2 |
5 files changed, 7 insertions, 5 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/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index 5e51566484..93325d253b 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -9,5 +9,5 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2 \ + ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2; \ rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" |