From f9759b2de5d48cc6941c7b39a9b93f51e8dc440f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Jan 2007 09:28:42 +0000 Subject: angstrom: prefer gconf-dbus --- conf/distro/angstrom-2007.1.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index dc0cc22fc0..d937144af1 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "30" +DISTRO_REVISION = "31" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -135,6 +135,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" PREFERRED_PROVIDER_gnome-vfs ?= "gnome-vfs" +PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs" PREFERRED_PROVIDER_tslib ?= "tslib" PREFERRED_PROVIDER_tslib-conf ?= "tslib" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" -- cgit v1.2.3 From 58ef4fd8dd044c7671e52f8fe48da84c89df3c31 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Jan 2007 10:02:21 +0000 Subject: epia: cleanup and adapt to task-base --- conf/machine/epia.conf | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'conf') diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 189021747a..86e9429506 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -1,13 +1,12 @@ TARGET_ARCH = "i586" -TARGET_VENDOR = "-oe" +PACKAGE_EXTRA_ARCHS = "i386 i486" + PREFERRED_PROVIDER_virtual/kernel = "linux-epia" -IMAGE_FSTYPES = "ext2.gz" -BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev kernel-modules" -udevdir = "/dev" OLDEST_KERNEL = "2.6.5" -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" -PACKAGE_EXTRA_ARCHS = "i386" + +IMAGE_FSTYPES = "ext2.gz" + +MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" require conf/machine/include/tune-c3.conf -- cgit v1.2.3 From 41071d2a7a6996a9df0d5b211399dcbba1c52926 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 12 Jan 2007 10:03:57 +0000 Subject: angstrom: add feed arch for epia --- conf/distro/angstrom-2007.1.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index d937144af1..3d56e18331 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.3" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "31" +DISTRO_REVISION = "32" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -46,6 +46,10 @@ FEED_ARCH_poodle = "armv5te" FEED_ARCH_spitz = "armv5te" FEED_ARCH_tosa = "armv5te" + +#i586 machines +FEED_ARCH_epia = "i586" + #i686 machines FEED_ARCH_guinness = "i686" -- cgit v1.2.3 From cd535280b32d1c1e045055608a965646985a1fc8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 12 Jan 2007 16:07:30 +0000 Subject: include/preferred-gpe-versions.inc, sane-srcdates.inc: catch up with removal of gnome-vfs-dbus. NOTE: may need to adjust SRCDATE for gnome-vfs? --- conf/distro/include/preferred-gpe-versions-2.7.inc | 2 +- conf/distro/include/preferred-gpe-versions-2.8.inc | 2 +- conf/distro/include/preferred-gpe-versions.inc | 2 +- conf/distro/include/sane-srcdates.inc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-gpe-versions-2.7.inc b/conf/distro/include/preferred-gpe-versions-2.7.inc index 662dfc386f..cbdaec0a21 100644 --- a/conf/distro/include/preferred-gpe-versions-2.7.inc +++ b/conf/distro/include/preferred-gpe-versions-2.7.inc @@ -7,7 +7,7 @@ #set some preferred providers: PREFERRED_PROVIDER_gconf="gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs" #specify versions, as the header says :) PREFERRED_VERSION_libmatchbox ?= "1.7" diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc index bf00aa8d01..a246633e07 100644 --- a/conf/distro/include/preferred-gpe-versions-2.8.inc +++ b/conf/distro/include/preferred-gpe-versions-2.8.inc @@ -4,7 +4,7 @@ #set some preferred providers: PREFERRED_PROVIDER_gconf="gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs" PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" diff --git a/conf/distro/include/preferred-gpe-versions.inc b/conf/distro/include/preferred-gpe-versions.inc index 7d4efea06e..5db9d7f06a 100644 --- a/conf/distro/include/preferred-gpe-versions.inc +++ b/conf/distro/include/preferred-gpe-versions.inc @@ -7,7 +7,7 @@ #set some preferred providers: PREFERRED_PROVIDER_gconf="gconf-dbus" -PREFERRED_PROVIDER_gnome-vfs="gnome-vfs-dbus" +PREFERRED_PROVIDER_gnome-vfs="gnome-vfs" #specify versions, as the header says :) #PREFERRED_VERSION_libmatchbox ?= "1.6" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index f73fa22e34..866741479f 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -46,7 +46,7 @@ SRCDATE_gpesyncd ?= "20061128" # GNOME SRCDATE_gconf-dbus ?= "20060719" -SRCDATE_gnome-vfs-dbus ?= "20060119" +SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" #Misc apps, sorted by alphabet -- cgit v1.2.3