From d1596684b1b1ee85d2d746a0182da8b8df0d8e47 Mon Sep 17 00:00:00 2001 From: Philippe De Swert Date: Sun, 15 Jan 2006 18:14:26 +0000 Subject: Updated gpe-mini-browser version and libgpewidget requirement for GPE 2.7 release --- conf/distro/preferred-gpe-versions-2.7.inc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'conf') diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 59567312ad..5165078c40 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -10,29 +10,29 @@ PREFERRED_PROVIDER_gconf=gconf-dbus PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus #specify versions, as the header says :) -PREFERRED_VERSION_libmatchbox ?= "1.7" -PREFERRED_VERSION_matchbox ?= "0.9.1" +#PREFERRED_VERSION_libmatchbox ?= "1.7" +#PREFERRED_VERSION_matchbox ?= "0.9.1" PREFERRED_VERSION_matchbox-common ?= "0.9.1" PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs${SRCDATE}" PREFERRED_VERSION_matchbox-panel ?= "0.9.2" PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" -PREFERRED_VERSION_atk ?= "1.9.0" -PREFERRED_VERSION_cairo ?= "0.5.2" -PREFERRED_VERSION_glib-2.0 ?= "2.6.4" -PREFERRED_VERSION_gtk+ ?= "2.6.7" -PREFERRED_VERSION_pango ?= "1.8.1" -PREFERRED_VERSION_librsvg ?= "2.6.5" -PREFERRED_VERSION_libgpewidget ?= "0.105" -PREFERRED_VERSION_libgpepimc ?= "0.5" -PREFERRED_VERSION_libgpevtype ?= "0.14" -PREFERRED_VERSION_libschedule ?= "0.15" -PREFERRED_VERSION_gpe-icons ?= "0.25" +#PREFERRED_VERSION_atk ?= "1.9.0" +#PREFERRED_VERSION_cairo ?= "0.5.2" +#PREFERRED_VERSION_glib-2.0 ?= "2.6.4" +#PREFERRED_VERSION_gtk+ ?= "2.6.7" +#PREFERRED_VERSION_pango ?= "1.8.1" +#PREFERRED_VERSION_librsvg ?= "2.6.5" +#PREFERRED_VERSION_libgpewidget ?= "0.107" +#PREFERRED_VERSION_libgpepimc ?= "0.5" +#PREFERRED_VERSION_libgpevtype ?= "0.14" +#PREFERRED_VERSION_libschedule ?= "0.15" +#PREFERRED_VERSION_gpe-icons ?= "0.25" PREFERRED_VERSION_libgsm ?= "1.0.10" PREFERRED_VERSION_diet-x11 ?= "6.2.1" PREFERRED_VERSION_xproto ?= "6.6.2" PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" -PREFERRED_VERSION_rxvt-unicode ?= "5.6" +#PREFERRED_VERSION_rxvt-unicode ?= "5.6" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.15" PREFERRED_VERSION_xextensions ?= "1.0.1" @@ -91,4 +91,4 @@ PREFERRED_VERSION_firefox ?= "1.0" PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1" PREFERRED_VERSION_poppler ?= "0.3.3" PREFERRED_VERSION_evince ?= "0.3.2" -PREFERRED_VERSION_gpe_mini_browser ?= "0.18" +PREFERRED_VERSION_gpe_mini_browser ?= "0.19" -- cgit v1.2.3 From 979da4dafc99a9e841ea59ef5a08025ae2ff7d75 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 16 Jan 2006 01:32:22 +0000 Subject: ixp4xx-kernel: create generic and machine specific images/packages in 2.6.15 - the generic ixp4xx-kernel package now creates the same generic kernel regardless of how MACHINE is set, it then appends shims to the kernel to obtain machine specific kernels and produces packages of the results. Still TBD is the command line fixup. The generic command line is the nslu2 one, this is a temporary hack to keep the NSLU2 build working. --- conf/distro/slugos.conf | 8 ++++++-- conf/machine/include/ixp4xx.conf | 4 ---- conf/machine/nas100d.conf | 6 ------ conf/machine/nslu2.conf | 6 ------ 4 files changed, 6 insertions(+), 18 deletions(-) (limited to 'conf') diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index fa74e3965c..bbacf49aa2 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -139,11 +139,15 @@ SLUGOS_EXTRA_RDEPENDS ?= "" #---------------------------------------------------------------------------------- # PACKAGE VERSION CONTROL #---------------------------------------------------------------------------------- -# Select the correct versions of the compiler tools (note that there -# is also some selection in machine/${MACHINE}.conf) +# Define how to bootstrap the system - we need cross compilers. It is also +# necessary to define which gets generated first, glibc or the kernel, and +# this is done by selecting the provider of libc (in this case it needs the +# kernel, so there has to be a non-libc gcc to build the kernel!) 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" +# Select 2.6 versions of the depmod support PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" # compiler/binary/library versions (unslung uses different ones so these diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 19a2ee0141..7239d59076 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -172,7 +172,3 @@ PREFERRED_VERSION_ipkg-native ?= "0.99.154" SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" - -# Always add the LEFIXUP - if desired this can be removed for a specific board -# if that board has an LE boot loader and therefore does not require it. -IXP4XX_LEFIXUP = "1" diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf index a628841878..29a3b04f5f 100644 --- a/conf/machine/nas100d.conf +++ b/conf/machine/nas100d.conf @@ -3,9 +3,3 @@ #@DESCRIPTION: Machine configuration for the Iomega NAS 100d product include conf/machine/include/ixp4xx.conf - -# The correct settings for the NAS100D board: -CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc" -# This following means the kernel will only run on a NAS100D board: -IXP4XX_SUFFIX = "${MACHINE}${ARCH_BYTE_SEX}" -IXP4XX_MACHID = "865" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 96b9e37ce0..b00f8a520c 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -3,9 +3,3 @@ #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product include conf/machine/include/ixp4xx.conf - -# The correct settings for the NSLU2 board: -CMDLINE_ROOT = "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc" -IXP4XX_SUFFIX = "${MACHINE}${ARCH_BYTE_SEX}" -# This following means the kernel will only run on a NSLU2: -IXP4XX_MACHID = "597" -- cgit v1.2.3 From 18c9101466353560610d720e168bc7488613a91b Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 16 Jan 2006 01:34:11 +0000 Subject: ixp4xx-kernel: unbreak nas100d build in 2.6.15 - temporarily put the CMDLINE_ROOT back in to the conf file so that nas100d kernels keep on working --- conf/machine/nas100d.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'conf') diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf index 29a3b04f5f..41836c3272 100644 --- a/conf/machine/nas100d.conf +++ b/conf/machine/nas100d.conf @@ -3,3 +3,6 @@ #@DESCRIPTION: Machine configuration for the Iomega NAS 100d product include conf/machine/include/ixp4xx.conf + +# TEMPORARY: fixup the command line for nas100d builds +CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M@0x00000000 init=/linuxrc" -- cgit v1.2.3