From f9697f0df1fde19b11a0c358ceca01129526cfc6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 30 Aug 2006 16:51:52 +0000 Subject: angsgrom: make TARET_FPU overridable * put TARGET_FPU="" in conf/machine/include/tune-.conf to build a hardfloat toolchain * mixing soft and hardfloat code is safe, BUT hardfloat binaries still don't run onf FPU-less systems --- conf/distro/include/angstrom.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index d9209ad23c..96bc33ede3 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -35,7 +35,8 @@ BUILD_OPTIMIZATION = "-Os" CXXFLAGS += "-fvisibility-inlines-hidden" #ARM EABI is softfloat by default, but let's make sure :) -TARGET_FPU_arm = "soft" +#make it overridable for platforms with FPU, like ep93xx or i.mx31 +TARGET_FPU_arm ?= "soft" #Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}" -- cgit v1.2.3 From ac7135e9c90c73e8c3fab13b7209b8e2f64910e7 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Wed, 30 Aug 2006 21:52:52 +0000 Subject: Update openomap distro and omap5912osk machine file with fixes to allow the OSK to boot. Includes changes to the kernel config to add TMPFS to the kernel config. The deployed fstab may need some tweaking still. --- conf/distro/openomap.conf | 3 ++- conf/machine/omap5912osk.conf | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index fb06ca7f47..71690ac62f 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -8,10 +8,11 @@ TARGET_FPU ?= "soft" # 2.4 vs 2.6 is a distro decision. MODUTILS = "26" -BOOTSTRAP_EXTRA_RDEPENDS += "udev" PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" +PREFERRED_PROVIDER_hotplug = "udev" + 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" diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index cf9e96ce19..fc17985233 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -5,6 +5,8 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv5te" +HOTPLUG = "udev" + PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" @@ -18,7 +20,7 @@ PREFERRED_VERSION_linux-omap1 = "2.6.x+git" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" # PCMCIA Modules #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia" -- cgit v1.2.3 From f520a657a9d66e5e80569cb7062527913de8b942 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 31 Aug 2006 19:23:57 +0000 Subject: angstrom: prefer 2.6.16-hh5 for machines that use it --- conf/distro/angstrom-2007.1.conf | 3 +++ 1 file changed, 3 insertions(+) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 327d4123cc..75303d2c5c 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -29,6 +29,9 @@ FEED_URIS += " \ #SRCDATE = "20060630" #SRCDATE_handhelds-pxa-2.6 = "20060622" +PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh5" + + SRCDATE_gconf-dbus = "20060719" SRCDATE_gnome-vfs-dbus = "20060803" -- cgit v1.2.3 From c96b9162381e8ee422db24ac641dcaecf0367813 Mon Sep 17 00:00:00 2001 From: Erik Hovland Date: Fri, 1 Sep 2006 18:27:21 +0000 Subject: familiar unstable: Peg glibc and busybox h3600 unstable: Peg handhelds-sa kernel version to hh42 --- conf/distro/familiar-unstable.conf | 6 ++++++ conf/machine/h3600.conf | 1 + 2 files changed, 7 insertions(+) (limited to 'conf') diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index 6ae4e9ddc3..010d3b4708 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -55,6 +55,12 @@ PREFERRED_VERSION_binutils ?= "2.15.94.0.1" PREFERRED_PROVIDER_hostap-conf = "hostap-conf" PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" require conf/distro/include/sane-srcdates.inc +PREFERRED_VERSION_busybox ?= "1.00" + +# +# GlibC +# +PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # # Opie diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 0261a84d64..5c7440403b 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -6,6 +6,7 @@ TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "ipaqsa" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa" +PREFERRED_VERSION_handhelds-sa ?= "2.4.19-rmk6-pxa1-hh42" EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}" -- cgit v1.2.3 From 70d5b55f33a0c6b0e7bfe0af67770f45c8eb3e46 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Sep 2006 21:15:27 +0000 Subject: angstrom: prefer hhpxa 2.6.16hh6 --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 75303d2c5c..859c28b95f 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -29,7 +29,7 @@ FEED_URIS += " \ #SRCDATE = "20060630" #SRCDATE_handhelds-pxa-2.6 = "20060622" -PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh5" +PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh6" SRCDATE_gconf-dbus = "20060719" -- cgit v1.2.3 From d340fede1b3d8514b5d95d453da25b8a06e14c7c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Sep 2006 21:18:26 +0000 Subject: angstrom: zaprootpw happens automagically now --- conf/distro/angstrom-2007.1.conf | 2 -- 1 file changed, 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 859c28b95f..9d14345111 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -14,8 +14,6 @@ require conf/distro/include/sane-srcdates.inc DISTRO_TYPE = "debug" #DISTRO_TYPE = "release" -#!!!!! DON'T FORGET TO ENABLE ZAPROOTPASSWD !!!!! - FEED_URIS += " \ base##${ANGSTROM_URI}/unstable/feed/base \ -- cgit v1.2.3 From e7a5d75f170eaf4eacbaea46176026d0c7ab056f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Sep 2006 21:28:48 +0000 Subject: angstrom: prefer cairo 1.2.2 --- conf/distro/angstrom-2007.1.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 9d14345111..b7350efec7 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -53,6 +53,8 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_VERSION_fontconfig = "2.3.95" PREFERRED_VERSION_freetype = "2.2.1" +#fix screen corruption issues +PREFERRED_VERSION_cairo = "1.2.2" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -- cgit v1.2.3 From 890d766f7d6e3c35309d0155e5751e9d76376aa8 Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Fri, 1 Sep 2006 21:32:31 +0000 Subject: familiar-unstable.conf: Specify a provider for dbus-glib, so it doesn't try to pull in a second, older version of dbus. --- conf/distro/familiar-unstable.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index 010d3b4708..8041ca8fb6 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -78,6 +78,7 @@ require conf/distro/include/preferred-opie-versions.inc PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += "virtual/gconf:gconf-dbus" PREFERRED_PROVIDER_virtual/libx11 = "diet-x11" +PREFERRED_PROVIDER_dbus-glib = "dbus-glib" require conf/distro/include/preferred-gpe-versions-2.8.inc # -- cgit v1.2.3 From 4c8e71488bf3b15180335d8d3adba6d497ca634f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Sep 2006 23:00:06 +0000 Subject: angstrom: tslib and/or libxcalibrate is broken in kdrive_git, so use the release for now --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index b7350efec7..829d2f23f5 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -62,7 +62,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc -PREFERRED_VERSION_xserver-kdrive = "1.1.0+git${SRCDATE}" +PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" -- cgit v1.2.3 From 6a06d9f694239db1a178f6b36fff7a6fa98f9f8c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Sep 2006 23:16:04 +0000 Subject: angstrom: hh6 has broken dependencies due to version mismatch, switch back to hh5 --- conf/distro/angstrom-2007.1.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 829d2f23f5..f3ad52beca 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -27,7 +27,7 @@ FEED_URIS += " \ #SRCDATE = "20060630" #SRCDATE_handhelds-pxa-2.6 = "20060622" -PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh6" +PREFERRED_VERSION_handhelds-pxa-2.6 = "2.6.16-hh5" SRCDATE_gconf-dbus = "20060719" -- cgit v1.2.3