From bdbeafd6707c45f347b98c43c91236c48fc2d8c8 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 20 Mar 2007 19:39:12 +0000 Subject: foonas: Update config, moving more stuff away from foonas-image.bb --- conf/distro/foonas.conf | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'conf') diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index b43090202d..d21e5cfe6f 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -1,3 +1,4 @@ + # # FooNAS distribution - a NAS-centric distribution # based on openprotium @@ -20,6 +21,12 @@ FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage" FOONAS_SUPPORT_n2100 += "fis" BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" +IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" +FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" + + # Various defines for QNAP Turbostation FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ kernel-module-usb-storage" @@ -36,6 +43,8 @@ FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} IMAGE_FSTYPES_lsppchd = "tar.gz" IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd} +IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;' + # # Naming schemes # -- cgit v1.2.3 From 5159493694eb43b75253759374604e9f1ed8f898 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 20 Mar 2007 19:40:28 +0000 Subject: turbostation,n2100: Update machine definitions --- conf/machine/n2100.conf | 3 ++- conf/machine/turbostation.conf | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index 6aee9f1b71..fe1f396254 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -7,9 +7,10 @@ SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost" +MACHINE_FEATURES= "kernel26 usbhost pci ext2" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.20" +MACHINE_TASK_PROVIDER = "task-base" # We want udev support in the image udevdir = "/dev" diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index a3856dbaf1..ef09fa72cd 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -9,8 +9,9 @@ SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost" +MACHINE_FEATURES= "kernel26 usbhost pci ext2" PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation" +MACHINE_TASK_PROVIDER = "task-base" # We want udev support in the image udevdir = "/dev" -- cgit v1.2.3 From bbc4eb7e941b003801d564b9a6cd959f29181d03 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 20 Mar 2007 19:41:48 +0000 Subject: n2100, turbostation, linkstation: Move more stuff away from foonas-image to machine configs --- conf/machine/lsppchd.conf | 1 + conf/machine/lsppchg.conf | 1 + conf/machine/n2100.conf | 7 +++++++ conf/machine/turbostation.conf | 4 ++++ 4 files changed, 13 insertions(+) (limited to 'conf') diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf index 52d58ded5b..51d0186dbe 100644 --- a/conf/machine/lsppchd.conf +++ b/conf/machine/lsppchd.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD UBOOT_MACHINE = "linkstation_HDLAN" +IMAGE_FSTYPES = "tar.gz" require conf/machine/include/linkstationppc.conf diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf index b7ceb6fc95..516a3aaa98 100644 --- a/conf/machine/lsppchg.conf +++ b/conf/machine/lsppchg.conf @@ -3,5 +3,6 @@ #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG UBOOT_MACHINE = "linkstation_HGLAN" +IMAGE_FSTYPES = "tar.gz" require conf/machine/include/linkstationppc.conf diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index fe1f396254..c84bf352da 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -15,4 +15,11 @@ MACHINE_TASK_PROVIDER = "task-base" # We want udev support in the image udevdir = "/dev" +ERASEBLOCK_SIZE = "0x20000" +IMAGE_FSTYPES = "jffs2" +EXTRA_IMAGECMD = "--little-endian" +# Creating an image that works with the webinterface required encrypting it +# So we'll need openssl +EXTRA_IMAGEDEPENDS = "openssl-native" + require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index ef09fa72cd..ffa44207cd 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -16,4 +16,8 @@ MACHINE_TASK_PROVIDER = "task-base" # We want udev support in the image udevdir = "/dev" +EXTRA_IMAGECMD = "--big-endian" +ERASEBLOCK_SIZE = "0x20000" +IMAGE_FSTYPES = "jffs2" + require conf/machine/include/tune-ppc603e.conf -- cgit v1.2.3 From 33c2929e38f8a4271be33ab99f41ef861f7e6d22 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 21 Mar 2007 11:37:59 +0000 Subject: angstrom: bump some versions apparently "NOTE: consider defining a PREFERRED_PROVIDER to match runtime gdk-pixbuf-loader-png" is not clear enough, any suggestions for a better message? --- conf/distro/angstrom-2007.1.conf | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 4f603f4534..e4951dbf2b 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 = "36" +DISTRO_REVISION = "37" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -107,16 +107,14 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_esound ?= "pulseaudio" +PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.3.1" PREFERRED_VERSION_freetype-native = "2.2.1" -PREFERRED_VERSION_cairo = "1.4.0" - -#work around a segfault in gcc for armv4t -PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3" -PREFERRED_VERSION_glib-2.0_h6300 = "2.12.3" +PREFERRED_VERSION_cairo = "1.4.2" +PREFERRED_VERSION_glib-2.0 = "2.12.10" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -- cgit v1.2.3 From e9bbd9be346cf246f6899c4a9644b63a3eb1880f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 21 Mar 2007 18:54:12 +0000 Subject: angstrom: prefer gtk 2.10.10 --- 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 e4951dbf2b..097b1c9b0d 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -123,7 +123,7 @@ PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" -PREFERRED_VERSION_gtk+ = "2.10.9" +PREFERRED_VERSION_gtk+ = "2.10.10" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" -- cgit v1.2.3 From 4b1c0a49e0d956895fb798f7b89058ca29b5d15e Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 22 Mar 2007 06:27:56 +0000 Subject: slugos.conf: Fix FULL_OPTIMIZATION, cause it broke the wireshark package by using gcc 4 specific options. --- conf/distro/include/slugos.inc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 8bb143dbba..d64cb2c917 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -43,13 +43,7 @@ INHERIT += "package_ipk debian multimachine" # FULL_OPTIMIZATION # Optimization settings. Os works fine and is significantly better than O2. -# The other settings are somewhat arbitrary. The optimisations chosen here -# include the ones which 'break' symbolic debugging (because the compiler does -# not include enough information to allow the debugger to know where given -# values are.) The -fno options are an attempt to cancel explicit use of space -# consuming options found in some packages (this isn't a complete list, this is -# just the ones which package writers seem to know about and abuse). -FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers -fno-unroll-loops -fno-inline-functions -fweb -funit-at-a-time" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" #---------------------------------------------------------------------------------- # FEEDS -- cgit v1.2.3 From bfdba7f2444913404db171124f76616cb5da933d Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Thu, 22 Mar 2007 15:49:37 +0000 Subject: angstrom: add PREFERRED_VERSION for libgnomeui-2.16.1 (bug #2029) --- conf/distro/angstrom-2007.1.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 097b1c9b0d..37781fc315 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -124,6 +124,7 @@ require conf/distro/include/preferred-xorg-versions-X11R7.1.inc PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" PREFERRED_VERSION_gtk+ = "2.10.10" +PREFERRED_VERSION_libgnomeui = "2.16.1" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" -- cgit v1.2.3 From c5ffadf37129d5ee78fa1b145d36c035ae92d358 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 23 Mar 2007 08:43:47 +0000 Subject: Angstrom: ship avahi daemon by default (http://www.hrw.one.pl/2007/03/23/avahi-looks-interesting/) and some small updates --- conf/distro/angstrom-2007.1.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 37781fc315..97f32f81dc 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -6,9 +6,9 @@ #@MAINTAINER: Michael 'Mickey' Lauer #@-------------------------------------------------------------------- -#DISTRO_VERSION = "2007.3" +#DISTRO_VERSION = "2007.4" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "37" +DISTRO_REVISION = "38" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -247,6 +247,7 @@ EXTRA_STUFF ?= "" # Angstrom want to ship some extra stuff. This should be moved into task-base eventually +# contains ipkg specific stuff as well :( DISTRO_EXTRA_RDEPENDS += "\ update-modules module-init-tools modutils-initscripts \ sysvinit initscripts sysvinit-pidof \ @@ -255,10 +256,12 @@ DISTRO_EXTRA_RDEPENDS += "\ angstrom-version \ ipkg ipkg-collateral \ util-linux-mount util-linux-umount \ + avahi-daemon \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ " DISTRO_EXTRA_RRECOMMENDS += " \ kernel-module-vfat \ + kernel-module-ext2 \ " -- cgit v1.2.3 From 625f8c960f78727f95adcfb96e2ec436d9eb9641 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 23 Mar 2007 10:44:08 +0000 Subject: angstrom: prefer dbus-glib 0.72 --- 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 97f32f81dc..cd4631bc0d 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -212,7 +212,7 @@ PREFERRED_VERSION_busybox = "1.2.1" PCMCIA_MANAGER = "pcmciautils" PREFERRED_VERSION_dbus ?= "1.0.2" -PREFERRED_VERSION_dbus-glib ?= "0.71" +PREFERRED_VERSION_dbus-glib ?= "0.72" PREFERRED_VERSION_gstreamer ?= "0.10.11" -- cgit v1.2.3 From 97fb19ffc8d0dd9e0fe1d7dce49843dbe50cd04d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 23 Mar 2007 10:52:51 +0000 Subject: angstrom: some more preferred providers --- conf/distro/angstrom-2007.1.conf | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index cd4631bc0d..503a07aaea 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -107,7 +107,25 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib" PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_esound ?= "pulseaudio" -PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" + + +# we don't ship gtk-directfb by default +PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" + + + PREFERRED_VERSION_fontconfig = "2.4.1" -- cgit v1.2.3 From 11596b065278a600dd829020447219cdb4768df7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 23 Mar 2007 15:57:51 +0000 Subject: openmoko: we use GTK not GTK-DirectFB --- conf/distro/include/openmoko.inc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'conf') diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc index 168d9bb6a2..4c728e1922 100644 --- a/conf/distro/include/openmoko.inc +++ b/conf/distro/include/openmoko.inc @@ -89,6 +89,20 @@ PREFERRED_VERSION_gtk-engines = "2.6.5" PREFERRED_VERSION_fontconfig = "2.4.1" +# we don't ship gtk-directfb by default +PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" # # GPE # -- cgit v1.2.3 From b7b2f07b086e749e7cd6aae62f862d5a0f7452a4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 24 Mar 2007 17:36:42 +0000 Subject: angstrom: add a provider for gtk+ on Holgers advice --- conf/distro/angstrom-2007.1.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 503a07aaea..8d74633821 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -110,6 +110,7 @@ PREFERRED_PROVIDER_esound ?= "pulseaudio" # we don't ship gtk-directfb by default +PREFERRED_PROVIDER_gtk+ ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -- cgit v1.2.3 From 95e68956c2863f790de0bdef7c6373403912b9b5 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 24 Mar 2007 09:52:11 +0000 Subject: openmoko.inc: Added PREFERRED_PROVIDER_gtk+ like in angstrom. --- conf/distro/include/openmoko.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc index 4c728e1922..c41f993884 100644 --- a/conf/distro/include/openmoko.inc +++ b/conf/distro/include/openmoko.inc @@ -90,6 +90,7 @@ PREFERRED_VERSION_gtk-engines = "2.6.5" PREFERRED_VERSION_fontconfig = "2.4.1" # we don't ship gtk-directfb by default +PREFERRED_PROVIDER_gtk+ ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" -- cgit v1.2.3 From 1d0b59559c37157b629a886a6fce4ec0c4311899 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 25 Mar 2007 16:45:58 +0000 Subject: zaurus-clamshell: Fix jffs2 commandline, enable lzo compression --- conf/machine/include/zaurus-clamshell.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'conf') diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index 93325d253b..f66502eff1 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -1,13 +1,13 @@ EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" -IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ - --output=${T}/${IMAGE_NAME}.rootfs.jffs2; \ - sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ +IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ + --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ + && sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ --eraseblock=${ERASEBLOCKSIZE} -l -p; \ - cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ + cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ + ${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;" -- cgit v1.2.3 From f9a697a2fd26e5ca7f0ea4eb153d4a3c2aafdbbe Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 25 Mar 2007 18:06:11 +0000 Subject: glibc, local.conf.sample: Introduce and handle new OE variable, GLIBC_GENERATE_LOCALES to limit set of generated binary locales. * If ENABLE_BINARY_LOCALE_GENERATION is set to "1", you can limit locales generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge time-savior for developmental builds. Format: list of locale.encoding pairs with spaces as separators, e.g.: GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 de_DE.UTF-8" * Check your distro for minimal set of locales required. Old-time default is "en_GB.UTF-8 de_DE.UTF-8 fr_FR.UTF-8". * Angstrom requires en_GB only. * This commit does not changes the default, which is still generation of all available locales. * Closes #1966. --- conf/local.conf.sample | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'conf') diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 02d54686f8..daffdda6de 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -90,6 +90,12 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # ENABLE_BINARY_LOCALE_GENERATION = "0" # ASSUME_PROVIDED += "qemu-native" +# If ENABLE_BINARY_LOCALE_GENERATION is set to "1", you can limit locales +# generated to the list provided by GLIBC_GENERATE_LOCALES. This is huge +# time-savior for developmental builds. Format: list of locale.encoding pairs +# with spaces as separators. +# GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 de_DE.UTF-8" + # Uncomment this to select a particular major kernel version if the MACHINE setting # supports more than one major kernel version. Currently this is suported by the # following MACHINE types: poodle, tosa and simpad. -- cgit v1.2.3 From 9c4d351f915c57dbe2452c19e7843a44ba601a02 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sun, 25 Mar 2007 18:41:10 +0000 Subject: bitbake.conf: Make IMAGE_CMD_tar build uncompressed archives. Regression fix. --- conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9f6814e526..947afc3018 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -198,7 +198,7 @@ IMAGE_CMD_ext3 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_ IMAGE_CMD_ext3.gz = "rm -rf ${DEPLOY_DIR_IMAGE}/tmp.gz && mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" -IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." +IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ." IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)" -- cgit v1.2.3 From 66b3afb24f9d07959106ad5883253cf95f580644 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 05:20:49 +0000 Subject: nslu2[bl]e.conf: Inherit NSLU2 image creation class --- conf/machine/nslu2be.conf | 1 + conf/machine/nslu2le.conf | 2 ++ 2 files changed, 3 insertions(+) (limited to 'conf') diff --git a/conf/machine/nslu2be.conf b/conf/machine/nslu2be.conf index 87fab62b65..104bbdb397 100644 --- a/conf/machine/nslu2be.conf +++ b/conf/machine/nslu2be.conf @@ -16,3 +16,4 @@ require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += "--big-endian" +INHERIT += "nslu2-image" diff --git a/conf/machine/nslu2le.conf b/conf/machine/nslu2le.conf index 16114a80fa..86c4ce7a31 100644 --- a/conf/machine/nslu2le.conf +++ b/conf/machine/nslu2le.conf @@ -15,3 +15,5 @@ ROOT_FLASH_SIZE ?= "6" require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += "--little-endian" + +INHERIT += "nslu2-image" -- cgit v1.2.3 From e0c83af72bea72797ebeba598318670f86d842cb Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 26 Mar 2007 23:05:23 +0000 Subject: foonas: Update foonas distro --- conf/distro/foonas.conf | 11 +++++++---- conf/distro/include/foonas-glibc.inc | 23 +++++++++++++++++++++++ conf/distro/include/foonas-uclibc.inc | 22 ++++++++++++++++++++++ conf/distro/include/foonas.inc | 32 ++++++++++++-------------------- 4 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 conf/distro/include/foonas-glibc.inc create mode 100644 conf/distro/include/foonas-uclibc.inc (limited to 'conf') diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index d21e5cfe6f..7608e298ab 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -10,10 +10,9 @@ DISTRO_NAME = "foonas" DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" DISTRO_TYPE = "alpha" # These should be merged once the bogofeed change has been committed. -FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/packages" -FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/kernel" +FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/packages" +FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/kernel" -TARGET_OS = "linux" HOTPLUG = "udev" # Various defines for Thecus N2100 @@ -24,8 +23,8 @@ BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm" IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" -FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" +FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" # Various defines for QNAP Turbostation FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ @@ -43,6 +42,10 @@ FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} IMAGE_FSTYPES_lsppchd = "tar.gz" IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd} +FOONAS_KERNEL_storcenter = "kernel-module-dummy \ + kernel-module-af-packet " +FOONAS_SUPPORT_storcenter = "uboot-utils" + IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;' # diff --git a/conf/distro/include/foonas-glibc.inc b/conf/distro/include/foonas-glibc.inc new file mode 100644 index 0000000000..7ad71bf503 --- /dev/null +++ b/conf/distro/include/foonas-glibc.inc @@ -0,0 +1,23 @@ +# glibc: +PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" +PREFERRED_PROVIDER_virtual/libintl ?= "glibc" +PREFERRED_PROVIDER_virtual/libc ?= "glibc" + +TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" + +#mess with compiler flags to use -Os instead of -O2 +#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info +# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616 + +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" + +BUILD_OPTIMIZATION = "-Os" +BUILD_OPTIMIZATION_pn-perl = "-O1" + +CXXFLAGS += "-fvisibility-inlines-hidden" + +PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" +GLIBC_ADDONS ?= "ports,nptl,libidn" +GLIBC_EXTRA_OECONF = "--with-tls" + diff --git a/conf/distro/include/foonas-uclibc.inc b/conf/distro/include/foonas-uclibc.inc new file mode 100644 index 0000000000..8315341b7e --- /dev/null +++ b/conf/distro/include/foonas-uclibc.inc @@ -0,0 +1,22 @@ +# uclibc: +#fix some iconv issues, needs to be adjusted when doing uclibc builds +PREFERRED_PROVIDER_virtual/libc = "uclibc" +PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" +PREFERRED_PROVIDER_virtual/libintl ?= "gettext" + +USE_NLS ?= "no" + +TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" + +#mess with compiler flags to use -Os instead of -O2 +#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" +BUILD_OPTIMIZATION = "-Os" +CXXFLAGS += "-fvisibility-inlines-hidden" + +SRCDATE_uclibc ?= "20070320" +PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}" +PREFERRED_VERSION_uclibc-initial ?= "0.9.28+svn${SRCDATE_uclibc}" + +PREFERRED_VERSION_linux-libc-headers = "2.6.18" +#PREFERRED_VERSION_linux-libc-headers_powerpc = "2.6.15.99" \ No newline at end of file diff --git a/conf/distro/include/foonas.inc b/conf/distro/include/foonas.inc index 189b932716..b904e15d5a 100644 --- a/conf/distro/include/foonas.inc +++ b/conf/distro/include/foonas.inc @@ -1,6 +1,17 @@ # # binutils and compilers # +# Can be "glibc" and "uclibc" +FOONAS_MODE ?= "glibc" + +#DEPLOY_DIR = "${TMPDIR}/deploy/${FOONAS_MODE}" +require conf/distro/include/foonas-${FOONAS_MODE}.inc + +INHERIT += "package_ipk debian sanity devshell" + +#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable +PREFERRED_PROVIDER_qemu-native = "qemu-native" +ENABLE_BINARY_LOCALE_GENERATION ?= "0" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" @@ -12,20 +23,6 @@ PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermedia #PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" #PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate" -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616 - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" - -BUILD_OPTIMIZATION = "-Os" -BUILD_OPTIMIZATION_pn-perl = "-O1" - -CXXFLAGS += "-fvisibility-inlines-hidden" - 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" @@ -36,8 +33,6 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate" PREFERRED_PROVIDER_virtual/libx11 = "libx11" -PREFERRED_PROVIDER_virtual/libiconv = "glibc" -PREFERRED_PROVIDER_virtual/libintl = "glibc" PREFERRED_PROVIDER_virtual/db = "db" PREFERRED_PROVIDER_virtual/db-native = "db-native" @@ -53,8 +48,5 @@ PREFERRED_VERSION_gcc-cross-initial = "4.1.1" PREFERRED_VERSION_glibc = "2.5" PREFERRED_VERSION_glibc-intermediate = "2.5" PREFERRED_VERSION_glibc-initial = "2.5" -GLIBC_EXTRA_OECONF = "--with-tls" - -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" -GLIBC_ADDONS ?= "ports,nptl,libidn" +PREFERRED_VERSION_openlink = "svn" -- cgit v1.2.3 From 20541a166c40e317a61c118d0a022c267fd0e257 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 26 Mar 2007 23:06:47 +0000 Subject: storcenter: Make storcenter work with foonas --- conf/machine/storcenter.conf | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'conf') diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index 7463bc77d0..bb7c8f1bef 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -1,18 +1,23 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" TARGET_FPU = "hard" -# TARGET_VENDOR = "oe" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" +MACHINE_TASK_PROVIDER = "task-base" + # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_TASK_PROVIDER = "task-base" -MACHINE_FEATURES= "kernel26 usbhost" -# don't go udev until kernel >=2.6.13 -#BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" -BOOTSTRAP_EXTRA_RDEPENDS = "mdadm" +MACHINE_FEATURES= "kernel26 usbhost pci ext2" PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter" +MACHINE_TASK_PROVIDER = "task-base" + +# We want udev support in the image +udevdir = "/dev" + +EXTRA_IMAGECMD = "--big-endian" +ERASEBLOCK_SIZE = "0x10000" +IMAGE_FSTYPES = "jffs2" require conf/machine/include/tune-ppc603e.conf -- cgit v1.2.3 From fd1d2273561a890605e83d657995b0e0771488ce Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 25 Mar 2007 11:40:57 +0000 Subject: mokoslug: Added sysconf utility --- conf/distro/mokoslug.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf index 5598694397..7278b62565 100644 --- a/conf/distro/mokoslug.conf +++ b/conf/distro/mokoslug.conf @@ -14,7 +14,7 @@ DISTRO_VERSION = "1.0-alpha" DISTRO_REVISION = "1" DISTRO_TYPE = "debug" -MACHINE_TASK_PROVIDER = "task-base task-mokogateway-everything" +MACHINE_TASK_PROVIDER = "task-base sysconf" # Even though the NSLU2 does not have built-in bluetooth, # we assume that a MokoSlug gateway has a bluetooth dongle. @@ -25,5 +25,3 @@ DEBUG_APPS_nslu2 = "" # No room for a kernel image on an NSLU2. IMAGE_PREPROCESS_COMMAND_append_nslu2 = "rm ${IMAGE_ROOTFS}/boot/zImage*;" - -INHERIT_append_nslu2 = "nslu2-image" \ No newline at end of file -- cgit v1.2.3 From 14f7610da247ed0b20aaac405f80a69942379311 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 27 Mar 2007 21:26:31 +0000 Subject: foonas: use dtc snapshot, git is currently fudged. Thanks to timtimred --- conf/distro/include/foonas.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/distro/include/foonas.inc b/conf/distro/include/foonas.inc index b904e15d5a..ad020b8501 100644 --- a/conf/distro/include/foonas.inc +++ b/conf/distro/include/foonas.inc @@ -50,3 +50,5 @@ PREFERRED_VERSION_glibc-intermediate = "2.5" PREFERRED_VERSION_glibc-initial = "2.5" PREFERRED_VERSION_openlink = "svn" +PREFERRED_VERSION_dtc = "20070216" +PREFERRED_VERSION_dtc-native = "20070216" -- cgit v1.2.3 From 4ccd0fb768192afa674c52fc467b5dc25df069a0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Wed, 28 Mar 2007 10:08:23 +0000 Subject: X11R7.2 preparation: add preferred-xorg-versions-X11R7.2.inc --- .../include/preferred-xorg-versions-X11R7.2.inc | 270 +++++++++++++++++++++ 1 file changed, 270 insertions(+) create mode 100644 conf/distro/include/preferred-xorg-versions-X11R7.2.inc (limited to 'conf') diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc new file mode 100644 index 0000000000..be6813369e --- /dev/null +++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc @@ -0,0 +1,270 @@ +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" + +PREFERRED_PROVIDER_libxext ?= "libxext" +PREFERRED_PROVIDER_xext ?= "libxext" +PREFERRED_PROVIDER_libxi ?= "libxi" +PREFERRED_PROVIDER_libxft ?= "libxft" +PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_libxpm ?= "libxpm" +PREFERRED_PROVIDER_xpm ?= "libxpm" +PREFERRED_PROVIDER_libxt ?= "libxt" +PREFERRED_PROVIDER_libxaw ?= "libxaw" +PREFERRED_PROVIDER_libice ?= "libice" +PREFERRED_PROVIDER_libxrender ?= "libxrender" +PREFERRED_PROVIDER_libxcursor ?= "libxcursor" +PREFERRED_PROVIDER_xextensions ?= "xextensions" +PREFERRED_PROVIDER_xproto ?= "xproto" +PREFERRED_PROVIDER_x11 ?= "libx11" +PREFERRED_PROVIDER_libxv ?= "libxv" +PREFERRED_PROVIDER_xft ?= "libxft" +PREFERRED_PROVIDER_libxrandr ?= "libxrandr" +PREFERRED_PROVIDER_libxdamage ?= "libxdamage" +PREFERRED_PROVIDER_libxcomposite ?= "libxcomposite" +PREFERRED_PROVIDER_libxfixes ?= "libxfixes" +PREFERRED_PROVIDER_libxinerama ?= "libxinerama" +PREFERRED_PROVIDER_libxxf86vm ?= "libxxf86vm" +PREFERRED_PROVIDER_libxmu ?= "libxmu" +PREFERRED_PROVIDER_libsm ?= "libsm" +PREFERRED_PROVIDER_xrandr ?= "xrandr" +PREFERRED_PROVIDER_xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xorg ?= "xserver-xorg" + +PREFERRED_VERSION_task-xorg ?= "X11R7.2" + +# app +PREFERRED_VERSION_appres ?= "1.0.1" +PREFERRED_VERSION_bdftopcf ?= "X11R7.0-1.0.0" +PREFERRED_VERSION_beforelight ?= "1.0.2" +PREFERRED_VERSION_bitmap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_editres ?= "1.0.2" +PREFERRED_VERSION_fontosfnt ?= "1.0.3" +PREFERRED_VERSION_fslsfonts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_fstobdf ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_iceauth ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_ico ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_lbxproxy ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_listres ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_luit ?= "1.0.2" +PREFERRED_VERSION_mkfontdir-native ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontdir ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_mkfontscale ?= "1.0.3" +PREFERRED_VERSION_oclock ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_proxymngr ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_rgb ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_rstart ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_scripts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_sessreg ?= "1.0.2" +PREFERRED_VERSION_setxkbmap ?= "1.0.3" +PREFERRED_VERSION_smproxy ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_twm ?= "1.0.3" +PREFERRED_VERSION_viewres ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_x11perf ?= "X11R7.1-1.4.1" +PREFERRED_VERSION_xauth ?= "1.0.2" +PREFERRED_VERSION_xbiff ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xcalc ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xclipboard ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xclock ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xcmsdb ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xconsole ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xcursorgen ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xdbedizzy ?= "1.0.2" +PREFERRED_VERSION_xditview ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xdm ?= "1.1.3" +PREFERRED_VERSION_xdpyinfo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xdriinfo ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xedit ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xev ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xeyes ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xxf86dga ?= "1.0.2" +PREFERRED_VERSION_xfd ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfindproxy ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfontsel ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfs ?= "1.0.4" +PREFERRED_VERSION_xfsinfo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xfwp ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xgamma ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xgc ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xhost ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xinit ?= "1.0.3" +PREFERRED_VERSION_xkbcomp ?= "1.0.3" +PREFERRED_VERSION_xkbevd ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xkbprint ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xkbutils ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xkill ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xload ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlogo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlsatoms ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlsclients ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xlsfonts ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmag ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xman ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xmessage ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmh ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xmodmap ?= "1.0.2" +PREFERRED_VERSION_xmore ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xphelloworld ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xplsprinters ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xpr ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xprehashprinterlist ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xprop ?= "1.0.2" +PREFERRED_VERSION_xrandr ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrdb ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrefresh ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xrx ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xset ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xsetmode ?= "X11R7.0-1.0.0" +PREFERRED_VERSION_xsetpointer ?= "X11R7.0-1.0.0" +PREFERRED_VERSION_xsetroot ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xsm ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xstdcmap ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xtrap ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xvidtune ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xvinfo ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xwd ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xwininfo ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_xwud ?= "X11R7.0-1.0.1" + +#data +PREFERRED_VERSION_xbitmaps ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_xcursor-themes ?= "X11R7.0-1.0.1" + +# doc +PREFERRED_VERSION_xorg-docs ?= "X11R7.1-1.2" +PREFERRED_VERSION_xorg-sgml-doctools ?= "1.1.1" + +# driver +PREFERRED_VERSION_xf86-input-acecad ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-aiptek ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xf86-input-calcomp ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-citron ?= "X11R7.1-2.2.0" +PREFERRED_VERSION_xf86-input-digitaledge ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dmc ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-dynapro ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-elo2300 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-elographics ?= "X11R7.0-1.0.0.5" +PREFERRED_VERSION_xf86-input-evdev ?= "X11R7.1-1.1.2" +PREFERRED_VERSION_xf86-input-fpit ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-hyperpen ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-jamstudio ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-joystick ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-keyboard ?= "1.1.1" +PREFERRED_VERSION_xf86-input-magellan ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-magictouch ?= "X11R7.1-1.0.0.5" +PREFERRED_VERSION_xf86-input-microtouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-mouse ?= "1.1.2" +PREFERRED_VERSION_xf86-input-mutouch ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-palmax ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0" +PREFERRED_VERSION_xf86-input-spaceorb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-summa ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-tek4957 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-ur98 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-input-vmmouse ?= "X11R7.1-12.4.0" +PREFERRED_VERSION_xf86-input-void ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-apm ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-ark ?= "X11R7.1-0.6.0" +PREFERRED_VERSION_xf86-video-ast ?= "X11R7.1-0.81.0" +PREFERRED_VERSION_xf86-video-ati ?= "6.6.3" +PREFERRED_VERSION_xf86-video-chips ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-cirrus ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-cyrix ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-dummy ?= "X11R7.1-0.2.0" +PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1" +PREFERRED_VERSION_xf86-video-glint ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6" +PREFERRED_VERSION_xf86-video-i740 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5" +PREFERRED_VERSION_xf86-video-imstt ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-mga ?= "1.4.6.1" +PREFERRED_VERSION_xf86-video-neomagic ?= "X11R7.1-1.1.1" +PREFERRED_VERSION_xf86-video-newport ?= "0.2.1" +PREFERRED_VERSION_xf86-video-nsc ?= "2.8.2" +PREFERRED_VERSION_xf86-video-nv ?= "1.2.2.1" +PREFERRED_VERSION_xf86-video-rendition ?= "4.1.3" +PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0" +PREFERRED_VERSION_xf86-video-s3virge ?= "X11R7.1-1.9.1" +PREFERRED_VERSION_xf86-video-savage ?= "2.1.2" +PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.4.2" +PREFERRED_VERSION_xf86-video-sis ?= "0.9.3" +PREFERRED_VERSION_xf86-video-sisusb ?= "X11R7.1-0.8.1" +PREFERRED_VERSION_xf86-video-sunbw2 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg14 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg3 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suncg6 ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunffb ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-sunleo ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-suntcx ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0" +PREFERRED_VERSION_xf86-video-tga ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xf86-video-trident ?= "1.2.3" +PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1" +PREFERRED_VERSION_xf86-video-v4l ?= "X11R7.1-0.1.1" +PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0" +PREFERRED_VERSION_xf86-video-vga ?= "X11R7.1-4.1.0" +PREFERRED_VERSION_xf86-video-via ?= "0.2.2" +PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1" +PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1" + +# font +PREFERRED_VERSION_encodings ?= "1.0.2" +PREFERRED_VERSION_font-screen-cyrillic ?= "1.0.1" +PREFERRED_VERSION_font-util-native ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_font-util ?= "X11R7.1-1.0.1" + +# lib +PREFERRED_VERSION_diet-x11 ?= "1.1.1" +PREFERRED_VERSION_libdmx ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libfontenc ?= "1.0.4" +PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libsm ?= "1.0.2" +PREFERRED_VERSION_libx11 ?= "1.1.1" +PREFERRED_VERSION_libxau ?= "1.0.3" +PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxcomposite ?= "0.3.1" +PREFERRED_VERSION_libxcursor ?= "1.1.8" +PREFERRED_VERSION_libxdamage ?= "1.0.4" +PREFERRED_VERSION_libxdmcp-native ?= "1.0.2" +PREFERRED_VERSION_libxdmcp ?= "1.0.2" +PREFERRED_VERSION_libxevie ?= "1.0.2" +PREFERRED_VERSION_libxext ?= "1.0.2" +PREFERRED_VERSION_libxfixes ?= "4.0.3" +PREFERRED_VERSION_libxfont ?= "1.2.7" +PREFERRED_VERSION_libxfontcache ?= "1.0.4" +PREFERRED_VERSION_libxi ?= "1.0.2" +PREFERRED_VERSION_libxinerama ?= "X11R7.0-1.0.1" +PREFERRED_VERSION_libxkbfile ?= "1.0.4" +PREFERRED_VERSION_libxkbui ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_libxmu ?= "1.0.3" +PREFERRED_VERSION_libxpm ?= "3.5.6" +PREFERRED_VERSION_libxrandr ?= "1.1.2" +PREFERRED_VERSION_libxrender ?= "0.9.2" +PREFERRED_VERSION_libxres ?= "1.0.3" +PREFERRED_VERSION_libxscrnsaver ?= "1.1.2" +PREFERRED_VERSION_libxt ?= "1.0.4" +PREFERRED_VERSION_libxvmc ?= "1.0.4" +PREFERRED_VERSION_libxxf86dga ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86misc ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_libxxf86vm ?= "X11R7.1-1.0.1" +PREFERRED_VERSION_xtrans ?= "1.0.3" + +# proto +PREFERRED_VERSION_compositeproto ?= "X11R7.1-0.3.1" +PREFERRED_VERSION_fixesproto ?= "X11R7.1-4.0" +PREFERRED_VERSION_glproto ?= "1.4.8" +PREFERRED_VERSION_kbproto ?= "X11R7.1-1.0.3" +PREFERRED_VERSION_scrnsaverproto ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_xproto-native ?= "7.0.10" +PREFERRED_VERSION_xproto ?= "7.0.10" + +# util +PREFERRED_VERSION_gccmakedep ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_imake ?= "X11R7.1-1.0.2" +PREFERRED_VERSION_util-macros-native ?= "X11R7.1-1.1.5" +PREFERRED_VERSION_util-macros ?= "X11R7.1-1.1.5" +PREFERRED_VERSION_xorg-cf-files ?= "X11R7.1-1.0.2" + +# xserver +PREFERRED_VERSION_xserver-kdrive ?= "1.2.0" +PREFERRED_VERSION_xserver-xorg ?= "1.2.0" + -- cgit v1.2.3 From c5c5c124b4ebd197faf32ab0c57738f14c6d604e Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Wed, 28 Mar 2007 17:36:41 +0000 Subject: openzaurus.inc: add PREFERRED_PROVIDER for qemu-native --- conf/distro/include/openzaurus.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/distro/include/openzaurus.inc b/conf/distro/include/openzaurus.inc index 4cdb68b4e3..4cf6fe1ead 100644 --- a/conf/distro/include/openzaurus.inc +++ b/conf/distro/include/openzaurus.inc @@ -21,3 +21,5 @@ INHERIT += "sanity" # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost" + +PREFERRED_PROVIDER_qemu-native ?= "qemu-native" -- cgit v1.2.3 From 427c202b3f3419a517b12a75774d6ad2837243e3 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:50:43 +0000 Subject: bitbake.conf: add epoch support --- conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 947afc3018..12f663ae4b 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -82,7 +82,8 @@ ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-nati PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" -PF = "${PN}-${PV}-${PR}" +PF = "${PN}-${EXTENDPE}${PV}-${PR}" +EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" P = "${PN}-${PV}" # Package info. -- cgit v1.2.3 From dd4760f7cedf0fd50bde55efd565c88e7d794cc8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 29 Mar 2007 12:54:23 +0000 Subject: X11R7.1: prefer libxfont-native 1.2.0 as we use freetype 2.3.x --- conf/distro/include/preferred-xorg-versions-X11R7.1.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc index 27a6164e54..782549589d 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.1.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.1.inc @@ -153,7 +153,7 @@ PREFERRED_VERSION_libxdmcp ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxevie ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxext ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libxfixes ?= "X11R7.1-4.0.1" -PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.1.0" +PREFERRED_VERSION_libxfont-native ?= "X11R7.1-1.2.0" PREFERRED_VERSION_libxfont ?= "X11R7.1-1.2.0" PREFERRED_VERSION_libxfontcache ?= "X11R7.1-1.0.2" PREFERRED_VERSION_libxi ?= "X11R7.1-1.0.1" -- cgit v1.2.3 From d3e02ad77748dffa0c1027ba0dcd45ca34e3c0c0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:30:19 +0000 Subject: magician.conf: add ohci-hcd kernel module, don't build jffs2 images for now --- conf/machine/magician.conf | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'conf') diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 3d1b602def..f2505dcab5 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -19,6 +19,11 @@ VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget" +# +# We don't support jffs2 installations (yet). +# +IMAGE_FSTYPES = "tar.bz2" + # # Software/packages selection # @@ -34,6 +39,7 @@ MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-pxaficp-ir \ kernel-module-uinput \ kernel-module-hci-usb \ + kernel-module-ohci-hcd \ kernel-module-magician-flash \ kernel-module-magician-ds1wm \ kernel-module-magician-battery \ -- cgit v1.2.3 From 831e97601a7bd95f3e71567a51ce31dab5eaa2a6 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:38:19 +0000 Subject: fic-gta01.conf: remove obsolete padding --- conf/machine/fic-gta01.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 9bb24874a9..dcf3409723 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -32,7 +32,7 @@ MACHINE_TASK_PROVIDER = "task-base" ROOT_FLASH_SIZE = "60" # extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad=0x3C00000 -n" +EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n" # build tools EXTRA_IMAGEDEPENDS += "sjf2410-linux-native" -- cgit v1.2.3 From 470f71b8affaf52c3676124b985cba5ae27eb11b Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:43:13 +0000 Subject: magician.conf: add usbhost MACHINE_FEATURE, drop kernel modules that are taken care of by task-base --- conf/machine/magician.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'conf') diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index f2505dcab5..02fdea6c59 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -17,7 +17,7 @@ require conf/machine/include/tune-xscale.conf ROOT_FLASH_SIZE = "80" VOLATILE_STORAGE_SIZE = "64" GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget" +MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost" # # We don't support jffs2 installations (yet). @@ -36,10 +36,6 @@ PREFERRED_VERSION_orinoco-modules = "0.15rc1" MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-leds-magician \ kernel-module-magician-ts \ - kernel-module-pxaficp-ir \ - kernel-module-uinput \ - kernel-module-hci-usb \ - kernel-module-ohci-hcd \ kernel-module-magician-flash \ kernel-module-magician-ds1wm \ kernel-module-magician-battery \ -- cgit v1.2.3 From ffd5a7ccc05c74b7229cb250f4d9f5031208dd65 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:55:37 +0000 Subject: angstrom-2007.1.conf: add avahi-autoipd --- conf/distro/angstrom-2007.1.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 8d74633821..59a65de663 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -85,7 +85,7 @@ FEED_URIS += " \ # We will lock down a SRCDATE when we go into release mode #SRCDATE = "20070303" -PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" +#PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13" @@ -139,9 +139,9 @@ PREFERRED_VERSION_glib-2.0 = "2.12.10" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -require conf/distro/include/preferred-xorg-versions-X11R7.1.inc +require conf/distro/include/preferred-xorg-versions-X11R7.2.inc -PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" +#PREFERRED_VERSION_xserver-kdrive = "1.2.0" PREFERRED_VERSION_gtk+ = "2.10.10" PREFERRED_VERSION_libgnomeui = "2.16.1" @@ -276,6 +276,7 @@ DISTRO_EXTRA_RDEPENDS += "\ ipkg ipkg-collateral \ util-linux-mount util-linux-umount \ avahi-daemon \ + avahi-autoipd \ ${EXTRA_STUFF} \ ${DEBUG_APPS} \ " -- cgit v1.2.3 From eb367035f82d95592a20b7c6c2aa73cbfd40394f Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 14:17:12 +0000 Subject: magician: add N_TIHTC to handhelds-linux-2.6 defconfig and machine.conf --- conf/machine/magician.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 02fdea6c59..4f62b5535b 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -40,6 +40,7 @@ MACHINE_EXTRA_RRECOMMENDS = " \ kernel-module-magician-ds1wm \ kernel-module-magician-battery \ kernel-module-magician-phone \ + kernel-module-n-tihtc \ kernel-module-snd-soc-magician" # -- cgit v1.2.3 From 8ad6ed721feab92844b72800b6e9a09430170dd9 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 14:25:18 +0000 Subject: magician.conf: autoload n_tihtc.ko --- conf/machine/magician.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 4f62b5535b..719c9a5b03 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -54,6 +54,7 @@ module_autoload_pxa27x_udc = "pxa27x_udc" module_autoload_magician_ds1wm = "magician_ds1wm" module_autoload_magician-battery = "magician-battery" module_autoload_magician_phone = "magician_phone" +module_autoload_n_tihtc = "n_tihtc" module_autoload_snd-soc-magician = "snd-soc-magician" module_autoload_hci_usb = "hci_usb" -- cgit v1.2.3 From 9c9e5bcc93e10bdded1460e2bec0117185a708a3 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 14:31:30 +0000 Subject: hx4700.conf: add voltage switching, bluetooth modules --- conf/machine/hx4700.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 482c8c0d8a..52eb09b933 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -35,8 +35,10 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ kernel-module-af-key \ kernel-module-i2c-pxa \ - kernel-module-hx4700-voltage \ + kernel-module-pxa27x-voltage \ + kernel-module-pxa27x-voltage-max158xx \ kernel-module-hx4700-acx \ + kernel-module-hx4700-bt \ kernel-module-snd-hx4700-audio" #write out a reflash.ctl with the appriate entries for the rootfs, the ones for the kernel should already be there -- cgit v1.2.3 From 2e8c09716712fdd9ea2c8f373259d18dec1901b0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 29 Mar 2007 15:57:34 +0000 Subject: angstrom: prefer gcc 4.1.2 as native compiler (cross versions are still 4.1.1) --- conf/distro/angstrom-2007.1.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 59a65de663..37d2f1b9df 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.4" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "38" +DISTRO_REVISION = "39" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -195,7 +195,7 @@ PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc = "ucli PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uclibc-initial" #use EABI toolchain -PREFERRED_VERSION_gcc ?= "4.1.1" +PREFERRED_VERSION_gcc ?= "4.1.2" PREFERRED_VERSION_gcc-cross ?= "4.1.1" PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -- cgit v1.2.3 From e2bbae32a7d4c8a5894e9938cd014bc9eb3e0065 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 11:29:01 +0000 Subject: sane-src-dates: bump psplash --- conf/distro/include/sane-srcdates.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 7b888b9d5f..eef4c4d06f 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -36,7 +36,7 @@ SRCDATE_matchbox-themes-extra ?= "20060612" SRCDATE_matchbox-wm ?= "20060612" SRCDATE_libmatchbox ?= "20060612" SRCDATE_libfakekey ?= "20051101" -SRCDATE_psplash ?= "20061207" +SRCDATE_psplash ?= "20070330" SRCDATE_web ?= "20060613" SRCDATE_zaurusd ?= "20060628" -- cgit v1.2.3 From 34d49080a92782619d025c78fb8c05512386acca Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 13:33:48 +0000 Subject: preferred-opie-versions-1.2.3-pre.inc: Bump to cvs20070328. --- conf/distro/include/preferred-opie-versions-1.2.3-pre.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc index fa1edcc64c..ea5d6b1153 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc @@ -3,7 +3,7 @@ QTE_VERSION ?= "2.3.10" PALMTOP_USE_MULTITHREADED_QT ?= "yes" -OPIE_SRCDATE ?= "20070308" +OPIE_SRCDATE ?= "20070328" OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}" OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}" -- cgit v1.2.3 From e87448d5d177f82a81b31f4e9e4d32da83d476fb Mon Sep 17 00:00:00 2001 From: Justin Patrin Date: Fri, 30 Mar 2007 15:15:42 +0000 Subject: openzaurus-3.5.5: add PREFERRED_VERSION_gtk-engines ?= 2.6.5 as 2.7.* won't work with the gtk version built --- conf/distro/openzaurus-3.5.5.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/distro/openzaurus-3.5.5.conf b/conf/distro/openzaurus-3.5.5.conf index b5dba1ffed..42ae98fab1 100644 --- a/conf/distro/openzaurus-3.5.5.conf +++ b/conf/distro/openzaurus-3.5.5.conf @@ -140,6 +140,8 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.7" PREFERRED_VERSION_hostap-utils ?= "0.4.7" PREFERRED_VERSION_hostap-modules ?= "0.4.7" +PREFERRED_VERSION_gtk-engines ?= "2.6.5" + # # We do not use qte-mt to keep compatibility with older OZ # -- cgit v1.2.3 From c8a049e0a95ec18e8c6e612d0f86949bea72d092 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:07:54 +0000 Subject: lsppc: Move linkstationppc.conf to lsppc.conf --- conf/machine/include/linkstationppc.conf | 26 -------------------------- conf/machine/include/lsppc.conf | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 conf/machine/include/linkstationppc.conf create mode 100644 conf/machine/include/lsppc.conf (limited to 'conf') diff --git a/conf/machine/include/linkstationppc.conf b/conf/machine/include/linkstationppc.conf deleted file mode 100644 index 620a6931eb..0000000000 --- a/conf/machine/include/linkstationppc.conf +++ /dev/null @@ -1,26 +0,0 @@ -#@TYPE: Machine configuration -#@Name: Buffalo PPC Linkstations -#@DESCRIPTION: Generic Machine configuration for ppc based linkstations - - -TARGET_ARCH = "powerpc" -PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_FEATURES = "kernel26 usbhost ext2" -TARGET_FPU = "hard" - -USE_DEVFS = "0" - -BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules" -FEED_URIS = "openlink##http://ipkg.linkstationwiki.net/2007.1/powerpc/" -PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationppc" - -#don't try to access tty1 -USE_VT = "0" - -HOTPLUG = "udev" -udevdir = "/dev" - -IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" - -#tune for the MPC5200B cpu -require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.conf new file mode 100644 index 0000000000..161f3ad8c1 --- /dev/null +++ b/conf/machine/include/lsppc.conf @@ -0,0 +1,27 @@ +#@TYPE: Machine configuration +#@Name: Buffalo PPC Linkstations +#@DESCRIPTION: Generic Machine configuration for ppc based linkstations + + +TARGET_ARCH = "powerpc" +PACKAGE_EXTRA_ARCHS = "ppc ppc603e" +MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot" +TARGET_FPU = "hard" +MACHINE_TASK_PROVIDER = "task-base" + +USE_DEVFS = "0" + +BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules" +PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationppc" + +#don't try to access tty1 +USE_VT = "0" + +HOTPLUG = "udev" +udevdir = "/dev" + +IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" +IMAGE_FSTYPES = "tar.gz" + +#tune for the MPC5200B cpu +require conf/machine/include/tune-ppc603e.conf -- cgit v1.2.3 From 5e2a192b08ece4c07f931029fb69abba9861e5b4 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:10:00 +0000 Subject: n2100: Update machine features, clean up --- conf/machine/n2100.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf index c84bf352da..2acfe812b0 100644 --- a/conf/machine/n2100.conf +++ b/conf/machine/n2100.conf @@ -3,11 +3,13 @@ TARGET_OS = "linux" TARGET_FPU = "soft" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +INHERIT += "n2100-image" + SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2" +MACHINE_FEATURES= "kernel26 usbhost pci ext2 redboot" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.20" MACHINE_TASK_PROVIDER = "task-base" -- cgit v1.2.3 From 218dbd434d3fd6d5fbc6694af78e78f89e411ca2 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:10:42 +0000 Subject: turbostation: Add uboot-support --- conf/machine/turbostation.conf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index ffa44207cd..2c1a9d70b5 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -2,14 +2,18 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_TASK_PROVIDER = "task-base" + +INHERIT += "turbostation-image" # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2" +MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot" +UBOOT_MACHINE = "qnap_config" +PREFERRED_VERSION_u-boot = "1.2.0" + PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation" MACHINE_TASK_PROVIDER = "task-base" -- cgit v1.2.3 From 1289f63fdf5d0e46a25824c0edd4bda6dc8e16d6 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:11:37 +0000 Subject: lsppchd/hg: Update machine support --- conf/machine/lsppchd.conf | 4 +--- conf/machine/lsppchg.conf | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'conf') diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf index 51d0186dbe..bf59929b02 100644 --- a/conf/machine/lsppchd.conf +++ b/conf/machine/lsppchd.conf @@ -1,8 +1,6 @@ #@TYPE: Machine #@NAME: HD Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD - UBOOT_MACHINE = "linkstation_HDLAN" IMAGE_FSTYPES = "tar.gz" - -require conf/machine/include/linkstationppc.conf +require conf/machine/include/lsppc.conf \ No newline at end of file diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf index 516a3aaa98..6040010176 100644 --- a/conf/machine/lsppchg.conf +++ b/conf/machine/lsppchg.conf @@ -1,8 +1,6 @@ #@TYPE: Machine #@NAME: HG Linkstation #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG - UBOOT_MACHINE = "linkstation_HGLAN" IMAGE_FSTYPES = "tar.gz" - -require conf/machine/include/linkstationppc.conf +require conf/machine/include/lsppc.conf \ No newline at end of file -- cgit v1.2.3 From 7ec2d50001e60b2c2cde0bb26900041449fa364a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:12:07 +0000 Subject: lsppc: Remove image_device_tables --- conf/machine/include/lsppc.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.conf index 161f3ad8c1..ad94a0f029 100644 --- a/conf/machine/include/lsppc.conf +++ b/conf/machine/include/lsppc.conf @@ -20,7 +20,6 @@ USE_VT = "0" HOTPLUG = "udev" udevdir = "/dev" -IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt" IMAGE_FSTYPES = "tar.gz" #tune for the MPC5200B cpu -- cgit v1.2.3 From 72fba47ca94d593030d0a90982f7cb40ca3caac4 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:12:43 +0000 Subject: storcenter: Add uboot machine_feature, clean up --- conf/machine/storcenter.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index bb7c8f1bef..ea59349c07 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -2,14 +2,15 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" TARGET_FPU = "hard" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" -MACHINE_TASK_PROVIDER = "task-base" + +INHERIT += "storcenter-image" # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_FEATURES= "kernel26 usbhost pci ext2" +MACHINE_FEATURES= "kernel26 usbhost pci ext2 uboot" PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter" MACHINE_TASK_PROVIDER = "task-base" -- cgit v1.2.3 From 3babc0df8755fcecb299d4fa830d054234222678 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:13:32 +0000 Subject: foonas: Make foonas use task-base --- conf/distro/foonas.conf | 95 ++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 48 deletions(-) (limited to 'conf') diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf index 7608e298ab..becad95786 100644 --- a/conf/distro/foonas.conf +++ b/conf/distro/foonas.conf @@ -1,64 +1,63 @@ -# -# FooNAS distribution - a NAS-centric distribution -# based on openprotium -# - +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: foonas +#@DESCRIPTION: A nas-centric distribution +#@MAINTAINER: Øyvind Repvik +#@-------------------------------------------------------------------- + +FOONAS_MODE ?= "glibc" +ANGSTROM_MODE = ${FOONAS_MODE} +require conf/distro/angstrom-2007.1.conf + +DISTRO = "foonas" DISTRO_NAME = "foonas" +DISTRO_VERSION = "1.0-dev" +DISTRO_REVISION = "1" +DISTRO_TYPE = "debug" -# This is only changed for a release -DISTRO_VERSION = ".dev-snapshot-${SRCDATE}" -DISTRO_TYPE = "alpha" -# These should be merged once the bogofeed change has been committed. -FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/packages" -FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/kernel" +DISTRO_FEATURES = "uboot redboot" +DISTRO_FEATURES_n2100 += "raid" +DISTRO_FEATURES_storcenter += "raid" +DISTRO_FEATURES_lsppchd += "raid" +DISTRO_FEATURES_lsppchg += "raid" +ENABLE_BINARY_LOCALE_GENERATION = "0" HOTPLUG = "udev" -# Various defines for Thecus N2100 -FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage" -FOONAS_SUPPORT_n2100 += "fis" -BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm" +# No room for debug apps on an NSLU2. +DEBUG_APPS = "" + +FEED_URIS = "foonas##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/" IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;" IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;" IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;" +IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/*" +IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/*" +IMAGE_POSTPROCESS_COMMAND += "${MACHINE}_pack_image;" +IMAGE_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" -FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}" - -# Various defines for QNAP Turbostation -FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ - kernel-module-usb-storage" -FOONAS_SUPPORT_turbostation += "uboot-utils" -BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm" - -# Various defines for Linkstations -FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \ - kernel-module-raid0 kernel-module-raid456 \ - kernel-module-multipath" -FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}" -FOONAS_SUPPORT_lsppchd = "uboot-utils dtc" -FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} -IMAGE_FSTYPES_lsppchd = "tar.gz" -IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd} - -FOONAS_KERNEL_storcenter = "kernel-module-dummy \ - kernel-module-af-packet " -FOONAS_SUPPORT_storcenter = "uboot-utils" - -IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;' +require conf/distro/include/sane-srcdates.inc +PREFERRED_VERSION_openlink = "svn" +PREFERRED_VERSION_dtc = "20070216" +PREFERRED_VERSION_dtc-native = "20070216" -# -# Naming schemes -# -INHERIT += "debian" +# Various defines for QNAP Turbostation +#FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \ +# kernel-module-usb-storage" +#FOONAS_SUPPORT_turbostation += "uboot-utils" +#BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm" # -# Packaging and output format +# Various defines for Linkstations +#FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \ +# kernel-module-raid0 kernel-module-raid456 \ +# kernel-module-multipath" +#FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}" +#FOONAS_SUPPORT_lsppchd = "uboot-utils dtc" +#FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd} # +#FOONAS_KERNEL_storcenter = "kernel-module-dummy \ +# kernel-module-af-packet " -INHERIT += "package_ipk" -IMAGE_BASENAME = "foonas" - -require conf/distro/include/sane-srcdates.inc -require conf/distro/include/foonas.inc -- cgit v1.2.3 From f543080d647c94ec79569084cc3545410836aa73 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:14:02 +0000 Subject: foonas: Remove leftover files, use angstrom instead --- conf/distro/include/foonas-glibc.inc | 23 --------------- conf/distro/include/foonas-uclibc.inc | 22 -------------- conf/distro/include/foonas.inc | 54 ----------------------------------- 3 files changed, 99 deletions(-) delete mode 100644 conf/distro/include/foonas-glibc.inc delete mode 100644 conf/distro/include/foonas-uclibc.inc delete mode 100644 conf/distro/include/foonas.inc (limited to 'conf') diff --git a/conf/distro/include/foonas-glibc.inc b/conf/distro/include/foonas-glibc.inc deleted file mode 100644 index 7ad71bf503..0000000000 --- a/conf/distro/include/foonas-glibc.inc +++ /dev/null @@ -1,23 +0,0 @@ -# glibc: -PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" -PREFERRED_PROVIDER_virtual/libintl ?= "glibc" -PREFERRED_PROVIDER_virtual/libc ?= "glibc" - -TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616 - -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" - -BUILD_OPTIMIZATION = "-Os" -BUILD_OPTIMIZATION_pn-perl = "-O1" - -CXXFLAGS += "-fvisibility-inlines-hidden" - -PREFERRED_VERSION_linux-libc-headers ?= "2.6.18" -GLIBC_ADDONS ?= "ports,nptl,libidn" -GLIBC_EXTRA_OECONF = "--with-tls" - diff --git a/conf/distro/include/foonas-uclibc.inc b/conf/distro/include/foonas-uclibc.inc deleted file mode 100644 index 8315341b7e..0000000000 --- a/conf/distro/include/foonas-uclibc.inc +++ /dev/null @@ -1,22 +0,0 @@ -# uclibc: -#fix some iconv issues, needs to be adjusted when doing uclibc builds -PREFERRED_PROVIDER_virtual/libc = "uclibc" -PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv" -PREFERRED_PROVIDER_virtual/libintl ?= "gettext" - -USE_NLS ?= "no" - -TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}" - -#mess with compiler flags to use -Os instead of -O2 -#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info -FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os" -BUILD_OPTIMIZATION = "-Os" -CXXFLAGS += "-fvisibility-inlines-hidden" - -SRCDATE_uclibc ?= "20070320" -PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}" -PREFERRED_VERSION_uclibc-initial ?= "0.9.28+svn${SRCDATE_uclibc}" - -PREFERRED_VERSION_linux-libc-headers = "2.6.18" -#PREFERRED_VERSION_linux-libc-headers_powerpc = "2.6.15.99" \ No newline at end of file diff --git a/conf/distro/include/foonas.inc b/conf/distro/include/foonas.inc deleted file mode 100644 index ad020b8501..0000000000 --- a/conf/distro/include/foonas.inc +++ /dev/null @@ -1,54 +0,0 @@ -# -# binutils and compilers -# -# Can be "glibc" and "uclibc" -FOONAS_MODE ?= "glibc" - -#DEPLOY_DIR = "${TMPDIR}/deploy/${FOONAS_MODE}" -require conf/distro/include/foonas-${FOONAS_MODE}.inc - -INHERIT += "package_ipk debian sanity devshell" - -#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable -PREFERRED_PROVIDER_qemu-native = "qemu-native" -ENABLE_BINARY_LOCALE_GENERATION ?= "0" - -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate" - -# not used yet -#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate" - -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" -#conflict between this and the last below. -#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" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate" - -PREFERRED_PROVIDER_virtual/libx11 = "libx11" - -PREFERRED_PROVIDER_virtual/db = "db" -PREFERRED_PROVIDER_virtual/db-native = "db-native" - -PREFERRED_VERSION_binutils = "2.17.50.0.12" -PREFERRED_VERSION_binutils-cross = "2.17.50.0.12" - -PREFERRED_VERSION_gcc = "4.1.1" -PREFERRED_VERSION_gcc-cross = "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial = "4.1.1" - -PREFERRED_VERSION_glibc = "2.5" -PREFERRED_VERSION_glibc-intermediate = "2.5" -PREFERRED_VERSION_glibc-initial = "2.5" - -PREFERRED_VERSION_openlink = "svn" -PREFERRED_VERSION_dtc = "20070216" -PREFERRED_VERSION_dtc-native = "20070216" -- cgit v1.2.3 From f995e0a4f5a60f4a1b80449d8eb7f64d0efebfef Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 31 Mar 2007 20:15:44 +0000 Subject: classes/base.bbclass: Add checksum.py code to verify md5/sha256 sums on do_fetch This code uses the checksum.py from contrib/qa/checksum to verify md5sum and sha256 on do_fetch task. This code would even allow to checksum certain local patches. --- conf/checksums.ini | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 conf/checksums.ini (limited to 'conf') diff --git a/conf/checksums.ini b/conf/checksums.ini new file mode 100644 index 0000000000..f3a6a660e3 --- /dev/null +++ b/conf/checksums.ini @@ -0,0 +1,3 @@ +[file-native-4.20] +md5=1 +sha256=1 -- cgit v1.2.3 From 8e2d1b42f56902f87817efed2a8df169d31014a4 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 31 Mar 2007 20:31:20 +0000 Subject: classes/base.bbclass: Make the checksum code work and test it with file-native conf/checksums.ini: Provide an example on how this can be used --- conf/checksums.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/checksums.ini b/conf/checksums.ini index f3a6a660e3..81b92ad069 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1,3 +1,3 @@ -[file-native-4.20] -md5=1 -sha256=1 +[file-native-4.20-ftp://ftp.astron.com/pub/file/file-4.20.tar.gz] +md5=402bdb26356791bd5d277099adacc006 +sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7 -- cgit v1.2.3 From d8825d643238771237cce78aa3610184cd6c971b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 08:05:55 +0000 Subject: angstrom: prefer a prismstumbler that actually builds --- conf/distro/angstrom-2007.1.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 9322bb97d8..ab5f3b8f72 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -127,10 +127,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" - - - - PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.3.1" PREFERRED_VERSION_freetype-native = "2.2.1" @@ -147,6 +143,8 @@ require conf/distro/include/preferred-xorg-versions-X11R7.2.inc PREFERRED_VERSION_gtk+ = "2.10.10" PREFERRED_VERSION_libgnomeui = "2.16.1" +PREFERRED_VERSION_prismstumbler = "0.7.3" + #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" -- cgit v1.2.3 From acc990526106b6ed000907c6dc0d3605679c71c5 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 31 Mar 2007 13:58:49 +0000 Subject: angstrom-2007.1.conf: bump hx4700 and magician kernel version to 2.6.20-hh5 --- 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 37d2f1b9df..9322bb97d8 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -88,6 +88,8 @@ FEED_URIS += " \ #PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13" +PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh5" +PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh5" PREFERRED_VERSION_file = "4.18" PREFERRED_VERSION_file_native = "4.18" -- cgit v1.2.3 From 5169569841cb1c92c6f47ce73aaaaff63a95d76a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 1 Apr 2007 13:43:16 +0000 Subject: zaurus-2.6.conf: Disable lzo compression by default in the same way as the default jffs2 commandline, fixing problems with old kernels on tosa --- conf/machine/include/zaurus-2.6.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf index 4e9e6a2ad9..1f3313c9b5 100644 --- a/conf/machine/include/zaurus-2.6.conf +++ b/conf/machine/include/zaurus-2.6.conf @@ -11,7 +11,7 @@ ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" +IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" EXTRA_IMAGEDEPENDS += "zaurus-updater" -- cgit v1.2.3 From 703beee4dc3ddb0cefb50c5bef7f0f456e0da505 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 1 Apr 2007 17:33:25 +0000 Subject: conf/checksums.ini: Remove the PN/PV from the section and only use the SRC_URI --- conf/checksums.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/checksums.ini b/conf/checksums.ini index 81b92ad069..92a2bb74f0 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1,3 +1,3 @@ -[file-native-4.20-ftp://ftp.astron.com/pub/file/file-4.20.tar.gz] +[ftp://ftp.astron.com/pub/file/file-4.20.tar.gz] md5=402bdb26356791bd5d277099adacc006 sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7 -- cgit v1.2.3 From ed04b33fd238b6cdae27bcba812adf4a296b4da0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 1 Apr 2007 17:56:33 +0000 Subject: libmimedir: switch to svn, remove SRCDATE from sane-srcdates.inc --- conf/distro/include/sane-srcdates.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index eef4c4d06f..fdac29e398 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -43,7 +43,6 @@ SRCDATE_zaurusd ?= "20060628" # GPE SRCDATE_dasher-gpe ?= "20060814" SRCDATE_rosetta ?= "20060804" -SRCDATE_libmimedir ?= "20060804" SRCDATE_gpesyncd ?= "20061128" # GNOME -- cgit v1.2.3 From afc1acb3dba12c57813ce66d73ade56c993a0b18 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 1 Apr 2007 18:00:25 +0000 Subject: pckages/{libmrss|libnxml}: Remove the md5sum and add md5sum/shasum to the config file --- conf/checksums.ini | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'conf') diff --git a/conf/checksums.ini b/conf/checksums.ini index 92a2bb74f0..f73fc47571 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1,3 +1,11 @@ [ftp://ftp.astron.com/pub/file/file-4.20.tar.gz] md5=402bdb26356791bd5d277099adacc006 sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7 + +[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.tar.gz] +md5=28d0e78d736748e67f25ad99456f10c3 +sha256=9bccf1240ce9317510eb860e7fcd387be2ddc73adc14451d679a6a7358383772 + +[http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz] +md5=85b6a42a9e17a23c01b2f2ed0ece0563 +sha256=6154872089834b0ffd34e92612d07e2d1ccec572698bd861da752eeeaab7ca78 -- cgit v1.2.3 From 843415ddd33228b986bea759c09c89d3782e2f47 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 2 Apr 2007 21:19:59 +0000 Subject: bitbake.conf: "wifi" was treated as COMBINED_FEATURE for some time now, but wasn't actually computed as such. --- conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 12f663ae4b..e3608c3ddc 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -472,5 +472,6 @@ COMBINED_FEATURES = "\ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \ ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \ - ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)}" + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \ + ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}" -- cgit v1.2.3 From e1952029899a1212b48eb42080808acff8869a0a Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 3 Apr 2007 08:04:22 +0000 Subject: smdk2443.conf : machine conf for smdk2443 --- conf/machine/smdk2443.conf | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 conf/machine/smdk2443.conf (limited to 'conf') diff --git a/conf/machine/smdk2443.conf b/conf/machine/smdk2443.conf new file mode 100644 index 0000000000..535846c731 --- /dev/null +++ b/conf/machine/smdk2443.conf @@ -0,0 +1,19 @@ +#@TYPE: Machine +#@Name: Samsung SMDK2440 Dev BOard +#@DESCRIPTION: Machine configuration for Samsung SMDK2440 Dev Board + + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t" + +PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2443" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttySAC0" + +IMAGE_FSTYPES = "tar.gz" + +MACHINE_TASK_PROVIDER = "task-base" +MACHINE_FEATURES = "kernel26 apm screen" + +require conf/machine/include/tune-arm920t.conf -- cgit v1.2.3 From ec9aedf2932d5208e3a00fd3ec40942ffa32f797 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Tue, 3 Apr 2007 08:05:45 +0000 Subject: slugos.inc: Update ipkg to 0.99.163 --- conf/distro/include/slugos.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index df16ad557f..bc1a6fbfdd 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -133,8 +133,8 @@ INHERIT += "nslu2-mirrors" PREFERRED_VERSION_nslu2-linksys-firmware ?= "2.3r63" -PREFERRED_VERSION_ipkg ?= "0.99.154" -PREFERRED_VERSION_ipkg-native ?= "0.99.154" +PREFERRED_VERSION_ipkg ?= "0.99.163" +PREFERRED_VERSION_ipkg-native ?= "0.99.163" #FIXME: HACK: REMOVE THIS IGNORE_STRIP_ERRORS = "" -- cgit v1.2.3 From 268088f56c7e1be1918e34301e8fe0b920f45de6 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Tue, 3 Apr 2007 15:54:25 +0000 Subject: netvista.conf: Update to more modern standards and kernel 2.6 --- conf/machine/netvista.conf | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'conf') diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index f5787e6448..b19558bd97 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -1,23 +1,22 @@ #@TYPE: Machine -#@NAME: IBM Netvista -#@DESCRIPTION: Machine configuration for the IBM Netvista thin client +#@NAME: X86 +#@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines -TARGET_ARCH = "i386" -PREFERRED_PROVIDER_xserver = "xserver-xorg" -PREFERRED_PROVIDER_virtual/kernel = "linux-netvista" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils" -#BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules" -#IMAGE_FSTYPES = "cramfs" -EXTRA_IMAGEDEPENDS = "" -SERIAL_CONSOLE = "ttyS0 115200 vt100" +# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html +TARGET_ARCH = "i486" +# TARGET_VENDOR = "-oe" +PACKAGE_EXTRA_ARCHS = "netvista" +PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +# todo: convert to task-base +# BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -TARGET_VENDOR = "-oe" -PREFERRED_PROVIDERS_append = " virtual/kernel:linux-netvista" -IMAGE_FSTYPES = "ext2" -GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword" - -#BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace -#udevdir = "/dev" +MACHINE_TASK_PROVIDER = "task-base" +MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa" +ROOT_FLASH_SIZE = "32" +udevdir = "/dev" +OLDEST_KERNEL = "2.6.17" +GLIBC_ADDONS = "nptl" +GLIBC_EXTRA_OECONF = "--with-tls" -- cgit v1.2.3 From 205c9d448868dcb43296f71b938d3a16ea04f12c Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Tue, 3 Apr 2007 21:39:10 +0000 Subject: compulab-pxa270: create jffs2 images w/ summary information --- conf/machine/compulab-pxa270.conf | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'conf') diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index d8d9264699..4febd8939e 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -19,6 +19,13 @@ ROOT_FLASH_SIZE ?= "32" EXTRA_IMAGECMD_jffs2 = "--pad=0x1000000 --eraseblock=0x40000" +# for NAND flash. +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad=0x20000;\ + sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ + -e 0x20000 -p\ + " + MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen alsa" MACHINE_TASK_PROVIDER = "task-base" -- cgit v1.2.3 From 9912c1fa44adca3374d17b2e432c3eeab8ea6eec Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 4 Apr 2007 10:15:32 +0000 Subject: netvista.conf: We have a big screen. --- conf/machine/netvista.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index b19558bd97..25bf6649bd 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -15,6 +15,7 @@ MACHINE_TASK_PROVIDER = "task-base" MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa" ROOT_FLASH_SIZE = "32" +GUI_MACHINE_CLASS = "bigscreen" udevdir = "/dev" OLDEST_KERNEL = "2.6.17" -- cgit v1.2.3 From e27a4881f76b0725e4afb60932615625f58f51f6 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Apr 2007 17:17:09 +0000 Subject: angstrom-2007.1.conf: Bump h3900, h4000, hx4700, magician kernel version to 2.6.20-hh6. * Fixes "TS driver spams syslog" issue. * Approved by Koen Kooi. --- conf/distro/angstrom-2007.1.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index ab5f3b8f72..3344b71726 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -86,10 +86,11 @@ FEED_URIS += " \ #SRCDATE = "20070303" #PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" -PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13" +PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.20-hh6" +PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13" -PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh5" -PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh5" +PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6" +PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh6" PREFERRED_VERSION_file = "4.18" PREFERRED_VERSION_file_native = "4.18" -- cgit v1.2.3 From ef843251012fd69cd8d0059e6826ccde8601fcff Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Apr 2007 17:20:10 +0000 Subject: angstrom-2007.1.conf: Put back default linux-handhelds-2.6 kernel version to use. * It's a question if it should be still 2.6.16-hh9, but there should be default version for sure. --- 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 3344b71726..1eb11afa7f 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -85,7 +85,7 @@ FEED_URIS += " \ # We will lock down a SRCDATE when we go into release mode #SRCDATE = "20070303" -#PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" +PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13" -- cgit v1.2.3 From 2572cbe44f1f681f13d981c8cff159f6b732efa4 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Apr 2007 18:08:52 +0000 Subject: angstrom-2007.1.conf: Bump h5000 kernel version to 2.6.20-hh6. * Approved by Koen Kooi --- conf/distro/angstrom-2007.1.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 1eb11afa7f..e7f4fdc654 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -88,6 +88,7 @@ FEED_URIS += " \ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9" PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_h4000 ?= "2.6.20-hh6" +PREFERRED_VERSION_linux-handhelds-2.6_h5000 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13" PREFERRED_VERSION_linux-handhelds-2.6_hx4700 ?= "2.6.20-hh6" PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh6" -- cgit v1.2.3 From 140eb23c9ed3ffe7951f02da05f58eae8ce4ad62 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 4 Apr 2007 21:33:22 +0000 Subject: h4000.conf: Install BT and WiFi firmware. --- conf/machine/h4000.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 9428b9ce11..61d473929a 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -22,6 +22,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +MACHINE_EXTRA_RDEPENDS = "tiinit acx-firmware" MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-h4000-audio \ kernel-module-i2c-pxa" -- cgit v1.2.3 From 9019e731b2a9c7120b9c6f604b4e390e9569dd4a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 5 Apr 2007 08:58:35 +0000 Subject: htcuniversal: add phone feature --- conf/machine/htcuniversal.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 485d90df7f..dbe3a5a010 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -15,7 +15,8 @@ require conf/machine/include/tune-xscale.conf #require conf/machine/include/tune-iwmmxt.conf GUI_MACHINE_CLASS = "bigscreen" -MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth" +MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone" +MACHINE_TASK_PROVIDER = "task-base" # # Software/packages selection -- cgit v1.2.3 From 6f3c79ab520a30cbfda05b40f868fcbb35afc67e Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Thu, 5 Apr 2007 19:58:34 +0000 Subject: slugos: Pin linux-libc-headers to 2.6.18, due to annoying 2.6.20 breakage. --- conf/distro/include/slugos.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index d64cb2c917..df16ad557f 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -143,3 +143,5 @@ IGNORE_STRIP_ERRORS = "" # needs, nail down a specific, known-working version of madwifi-ng. # Remove this once the madwifi-ng stuff seems to stabilize once again. PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" + +PREFERRED_VERSION_linux-libc-headers = "2.6.18" \ No newline at end of file -- cgit v1.2.3 From 05409756970385c276789b3d0d32882f6631ac61 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 22:54:37 +0000 Subject: generic.conf: Allow overriding the image types to be generated, ext2 can be critical. --- conf/distro/generic.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/generic.conf b/conf/distro/generic.conf index 17d7d657b1..a9d667372f 100644 --- a/conf/distro/generic.conf +++ b/conf/distro/generic.conf @@ -25,7 +25,7 @@ INHERIT += "debian multimachine" # Packaging and output format # INHERIT += "package_ipk" -IMAGE_FSTYPES = "tar.gz ext2.gz jffs2" +IMAGE_FSTYPES ?= "tar.gz ext2.gz jffs2" # # Kernel -- cgit v1.2.3 From bde12db3a8e623eee6c5ababb33e4c18d7d95d5f Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 22:55:15 +0000 Subject: netvista.conf: Use faster VESA Kdrive --- conf/machine/netvista.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 25bf6649bd..65a797c680 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -7,6 +7,8 @@ TARGET_ARCH = "i486" # TARGET_VENDOR = "-oe" PACKAGE_EXTRA_ARCHS = "netvista" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +XSERVER = "xserver-kdrive-vesa" + # todo: convert to task-base # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" @@ -14,7 +16,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa" -ROOT_FLASH_SIZE = "32" +ROOT_FLASH_SIZE = "64" GUI_MACHINE_CLASS = "bigscreen" udevdir = "/dev" -- cgit v1.2.3 From dec62593524659ca6e8f632830e9aa8b0b50ac72 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 08:26:01 +0000 Subject: angstrom: prefer gcc 4.1.2 for the sdk --- conf/distro/angstrom-2007.1.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index e7f4fdc654..ce8d446388 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.4" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "39" +DISTRO_REVISION = "40" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -199,7 +199,7 @@ PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uc #use EABI toolchain PREFERRED_VERSION_gcc ?= "4.1.2" PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1" +PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" PREFERRED_VERSION_binutils ?= "2.17.50.0.5" -- cgit v1.2.3 From 19d52cb16ab1f04c935bff833be7991af02af980 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 13:16:04 +0000 Subject: angstrom: move gcc-cross to 4.1.2 as well --- conf/distro/angstrom-2007.1.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index ce8d446388..ef4953056d 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -8,7 +8,7 @@ #DISTRO_VERSION = "2007.4" DISTRO_VERSION = "test-${DATE}" -DISTRO_REVISION = "40" +DISTRO_REVISION = "41" require conf/distro/include/angstrom.inc require conf/distro/include/sane-srcdates.inc @@ -198,7 +198,7 @@ PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uc #use EABI toolchain PREFERRED_VERSION_gcc ?= "4.1.2" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" +PREFERRED_VERSION_gcc-cross ?= "4.1.2" PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2" PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -- cgit v1.2.3 From 51f71651252dec9b6eb3304562898aa996af35c7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 6 Apr 2007 14:15:00 +0000 Subject: angstrom: prefer glib-2.0 2.12.11 --- 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 ef4953056d..86e87f31d6 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -133,7 +133,7 @@ PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_freetype = "2.3.1" PREFERRED_VERSION_freetype-native = "2.2.1" PREFERRED_VERSION_cairo = "1.4.2" -PREFERRED_VERSION_glib-2.0 = "2.12.10" +PREFERRED_VERSION_glib-2.0 = "2.12.11" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -- cgit v1.2.3 From 41b13b4beba086ce1eb00bc15a6c27b83f6b3fc5 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 7 Apr 2007 12:30:48 +0000 Subject: packages/libmrss: Move to 0.17.1 and drop all patches The patches were applied upstream, move to the new version and update the checksums. --- conf/checksums.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/checksums.ini b/conf/checksums.ini index f73fc47571..b11c0f9825 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -2,9 +2,9 @@ md5=402bdb26356791bd5d277099adacc006 sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7 -[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.tar.gz] -md5=28d0e78d736748e67f25ad99456f10c3 -sha256=9bccf1240ce9317510eb860e7fcd387be2ddc73adc14451d679a6a7358383772 +[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.1.tar.gz] +md5=bc6f32759db02cf32a83640d74fb9993 +sha256=cfa9b2d0f9b87a7a524abe149e7207adf86c077749c907342df63126a7ec292d [http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz] md5=85b6a42a9e17a23c01b2f2ed0ece0563 -- cgit v1.2.3 From f23ae58138fa2b5ba4308de977428d81513fba2e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 7 Apr 2007 17:33:44 +0000 Subject: xorg 7.2: prefer 1.1.1 for libx11 native --- conf/distro/include/preferred-xorg-versions-X11R7.2.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'conf') diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc index be6813369e..59a481a104 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.2.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.2.inc @@ -219,6 +219,7 @@ PREFERRED_VERSION_libice ?= "X11R7.1-1.0.1" PREFERRED_VERSION_liblbxutil ?= "X11R7.1-1.0.1" PREFERRED_VERSION_libsm ?= "1.0.2" PREFERRED_VERSION_libx11 ?= "1.1.1" +PREFERRED_VERSION_libx11-native ?= "1.1.1" PREFERRED_VERSION_libxau ?= "1.0.3" PREFERRED_VERSION_libxaw ?= "X11R7.1-1.0.2" PREFERRED_VERSION_libxcomposite ?= "0.3.1" -- cgit v1.2.3 From 14d985a574cd3a11d25305a79c39614e262771e8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 7 Apr 2007 19:11:14 +0000 Subject: tinder.conf: update TINDER_URL --- conf/tinder.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/tinder.conf b/conf/tinder.conf index 99e263c96c..614ed89400 100644 --- a/conf/tinder.conf +++ b/conf/tinder.conf @@ -12,7 +12,7 @@ INHERIT += "tinderclient" # HTTP posting #TINDER_HOST = "ewi546.ewi.utwente.nl" -#TINDER_URL = "/OE_qa/cgi-bin/process_builds.cgi" +#TINDER_URL = "/tinderbox" # Which branch do we build #TINDER_BRANCH = "org.openembedded.dev" -- cgit v1.2.3