From 2893993b5767a8d3980f16b7e4b5bf596eb977a8 Mon Sep 17 00:00:00 2001 From: Rodrigo Vivi Date: Thu, 12 Apr 2007 14:10:48 +0000 Subject: package_deb.bbclass: add shebang, closes #2086 --- classes/package_deb.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 388f9819bd..0c83e58a37 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -209,6 +209,7 @@ python do_package_deb () { scriptfile = file(os.path.join(controldir, script), 'w') except OSError: raise bb.build.FuncFailed("unable to open %s script file for writing." % script) + scriptfile.write("#!/bin/sh\n") scriptfile.write(scriptvar) scriptfile.close() os.chmod(os.path.join(controldir, script), 0755) -- cgit v1.2.3 From 8e896b6f463e51a5ac6a14b4ccf6e8a56c3749b6 Mon Sep 17 00:00:00 2001 From: Rodrigo Vivi Date: Thu, 12 Apr 2007 14:58:55 +0000 Subject: mamona: add distro config for mamona (http://www.vivi.eng.br/index.php?title=Main_Page), closes #2103 --- conf/distro/mamona.conf | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 conf/distro/mamona.conf diff --git a/conf/distro/mamona.conf b/conf/distro/mamona.conf new file mode 100644 index 0000000000..26bf8b94f1 --- /dev/null +++ b/conf/distro/mamona.conf @@ -0,0 +1,60 @@ +#@-------------------------------------------------------------------- +#@TYPE: Distribution +#@NAME: Mamona +#@-------------------------------------------------------------------- + +DISTRO = "mamona" +DISTRO_NAME = Mamona"" +DISTRO_VERSION = "test-${DATE}" +DISTRO_TYPE = "debug" +#DISTRO_TYPE = "release" + +TARGET_VENDOR = "-mamona" + +require conf/distro/include/angstrom-glibc.inc + +INHERIT += " package_deb debian" +TARGET_OS = "linux-gnueabi" + +TARGET_FPU_nokia770 = "soft" +TARGET_FPU_n800 = "hard" + +FEED_ARCH_nokia770 = "armv5te" + +# Actually n800 is armv6 but we are using armv5te because qemu does not emulate +# armv6 yet. +FEED_ARCH_n800 = "armv5te" +#FEED_ARCH_n800 = "armv6" + +#Make sure we use 2.6 on machines with a 2.4/2.6 selector +KERNEL = "kernel26" +MACHINE_KERNEL_VERSION = "2.6" + +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" + +#NPTL stuff +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-mamona-linux-gnueabi-libc-for-gcc = "glibc-intermediate" +PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" + +PREFERRED_VERSION_binutils = "2.17.50.0.5" +PREFERRED_VERSION_binutils-cross = "2.17.50.0.5" + +PREFERRED_VERSION_gcc = "4.1.1" +PREFERRED_VERSION_gcc-cross = "4.1.1" +PREFERRED_VERSION_gcc-initial-cross = "4.1.1" + +PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" + +PREFERRED_VERSION_glibc ?= "2.5" + +PREFERRED_VERSION_glibc-intermediate ?= "2.5" + +PREFERRED_VERSION_glibc-initial ?= "2.5" + +require conf/distro/include/sane-srcdates.inc + + -- cgit v1.2.3 From d77127ab253ab95a2b57f37eb28df438ccb0ee4e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 12 Apr 2007 16:05:24 +0000 Subject: python-2.4.4-manifest.inc: fix python-misc * FILES_foo is useless is foo isn't in PACKAGES.... --- packages/python/python-2.4.4-manifest.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/python/python-2.4.4-manifest.inc b/packages/python/python-2.4.4-manifest.inc index 7a1035ac50..33f5bac2f2 100644 --- a/packages/python/python-2.4.4-manifest.inc +++ b/packages/python/python-2.4.4-manifest.inc @@ -10,13 +10,14 @@ PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc" -PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc" +PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio python-misc-dbg python-misc" DESCRIPTION_python-misc-dbg="Misc Python debug files" FILES_python-misc-dbg="${libdir}/python2.4/lib-dynload/.debug" RDEPENDS_python-misc-dbg="python-core" DESCRIPTION_python-misc="Misc Python files" +PR_python-misc="ml1" FILES_python-misc="${libdir}/python2.4/" RDEPENDS_python-misc="python-core" -- cgit v1.2.3 From 67435ac524d77b9f164cc9e3a419c3e0144201d6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 12 Apr 2007 16:08:13 +0000 Subject: angstrom: add omap5192 support --- conf/distro/angstrom-2007.1.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 5ad67f328f..4c0fa9ff84 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -53,6 +53,7 @@ FEED_ARCH_ixp4xx = "armv5te" FEED_ARCH_magician = "armv5te" FEED_ARCH_netbook-pro = "armv5te" FEED_ARCH_nokia770 = "armv5te" +FEED_ARCH_omap5912osk = "armv5te" FEED_ARCH_poodle = "armv5te" FEED_ARCH_spitz = "armv5te" FEED_ARCH_tosa = "armv5te" -- cgit v1.2.3 From cfce83cf61593878a185957fa2824da4bf01e8af Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 12 Apr 2007 18:43:25 +0000 Subject: dates: update to 0.4.1 (from Poky) --- packages/pimlico/dates.inc | 1 + packages/pimlico/dates_0.3.1.bb | 5 ----- packages/pimlico/dates_0.4.1.bb | 3 +++ packages/pimlico/dates_svn.bb | 4 +--- 4 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 packages/pimlico/dates_0.3.1.bb create mode 100644 packages/pimlico/dates_0.4.1.bb diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc index 4f92b2c767..d4debfd28d 100644 --- a/packages/pimlico/dates.inc +++ b/packages/pimlico/dates.inc @@ -8,6 +8,7 @@ RCONFLICTS_${PN} = "openmoko-dates" inherit autotools pkgconfig gtk-icon-cache # EXTRA_OECONF = "--disable-debug" +EXTRA_OECONF = "--enable-owl=true" FILES_${PN} += "${datadir}/pixmaps/dates.png" diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb deleted file mode 100644 index 176d2b9077..0000000000 --- a/packages/pimlico/dates_0.3.1.bb +++ /dev/null @@ -1,5 +0,0 @@ -require dates.inc - -PR = "r3" - -SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/dates_0.4.1.bb b/packages/pimlico/dates_0.4.1.bb new file mode 100644 index 0000000000..d7f0185b86 --- /dev/null +++ b/packages/pimlico/dates_0.4.1.bb @@ -0,0 +1,3 @@ +require dates.inc + +SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb index cac0eb4fae..cfac6630b4 100644 --- a/packages/pimlico/dates_svn.bb +++ b/packages/pimlico/dates_svn.bb @@ -1,10 +1,8 @@ require dates.inc -PR = "r2" - DEFAULT_PREFERENCE = "-1" -PV = "0.3.1+svn${SRCDATE}" +PV = "0.4.1+svn${SRCDATE}" S = "${WORKDIR}/trunk" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http" -- cgit v1.2.3 From 43232a233516b72942e47ee650221c64c331f13e Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 12 Apr 2007 18:44:48 +0000 Subject: tasks: Patch tasks to make it single instance (from Poky) --- packages/pimlico/files/tasks-single.diff | 9 +++++++++ packages/pimlico/tasks_0.4.bb | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 packages/pimlico/files/tasks-single.diff diff --git a/packages/pimlico/files/tasks-single.diff b/packages/pimlico/files/tasks-single.diff new file mode 100644 index 0000000000..dd807ea256 --- /dev/null +++ b/packages/pimlico/files/tasks-single.diff @@ -0,0 +1,9 @@ +Index: tasks/data/tasks.desktop.in +=================================================================== +--- tasks/data/tasks.desktop.in (revision 115) ++++ tasks/data/tasks.desktop.in (working copy) +@@ -9,3 +9,4 @@ + Categories=GTK;Application;Office;ProjectManagement; + Terminal=false + StartupNotify=true ++SingleInstance=true diff --git a/packages/pimlico/tasks_0.4.bb b/packages/pimlico/tasks_0.4.bb index 679dedf9da..068579ef9c 100644 --- a/packages/pimlico/tasks_0.4.bb +++ b/packages/pimlico/tasks_0.4.bb @@ -1,3 +1,6 @@ require tasks.inc -SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz" +PR = "r1" + +SRC_URI = "http://projects.o-hand.com/sources/tasks/${P}.tar.gz \ + file://tasks-single.diff;patch=1" -- cgit v1.2.3 From 5db9837e1292b6f24bc240189c5dd038c7533a95 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 12 Apr 2007 22:15:06 +0000 Subject: gnome-doc-utils/gnome-desktop: Running scrollkeeper is pointless, disable. --- packages/gnome/gnome-desktop/.mtn2git_empty | 0 packages/gnome/gnome-desktop/scrollkeeper.patch | 17 +++++++++++++++++ packages/gnome/gnome-desktop_2.16.1.bb | 3 +++ packages/gnome/gnome-doc-utils_0.7.1.bb | 2 ++ 4 files changed, 22 insertions(+) create mode 100644 packages/gnome/gnome-desktop/.mtn2git_empty create mode 100644 packages/gnome/gnome-desktop/scrollkeeper.patch diff --git a/packages/gnome/gnome-desktop/.mtn2git_empty b/packages/gnome/gnome-desktop/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnome/gnome-desktop/scrollkeeper.patch b/packages/gnome/gnome-desktop/scrollkeeper.patch new file mode 100644 index 0000000000..c1b7f3b44a --- /dev/null +++ b/packages/gnome/gnome-desktop/scrollkeeper.patch @@ -0,0 +1,17 @@ +Index: gnome-desktop-2.16.1/configure.in +=================================================================== +--- gnome-desktop-2.16.1.orig/configure.in 2006-10-02 19:00:52.000000000 +0000 ++++ gnome-desktop-2.16.1/configure.in 2007-04-12 21:12:36.000000000 +0000 +@@ -113,9 +113,9 @@ + dnl scrollkeeper checks + + AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) +-if test x$SCROLLKEEPER_CONFIG = xno; then +- AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package) +-fi ++dnl if test x$SCROLLKEEPER_CONFIG = xno; then ++dnl AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package) ++dnl fi + + dnl Language Support + diff --git a/packages/gnome/gnome-desktop_2.16.1.bb b/packages/gnome/gnome-desktop_2.16.1.bb index 647e751c57..1e3e814d17 100644 --- a/packages/gnome/gnome-desktop_2.16.1.bb +++ b/packages/gnome/gnome-desktop_2.16.1.bb @@ -6,6 +6,9 @@ inherit gnome pkgconfig DEPENDS = "gnome-common gnome-doc-utils libgnomeui" +SRC_URI += "file://scrollkeeper.patch;patch=1" + +EXTRA_OECONF = "--disable-scrollkeeper" EXTRA_AUTORECONF = "-I ${STAGING_DIR}/${HOST_SYS}/share/aclocal/gnome2-macros" do_configure_prepend () { diff --git a/packages/gnome/gnome-doc-utils_0.7.1.bb b/packages/gnome/gnome-doc-utils_0.7.1.bb index 18d6d3012a..f190a5ae13 100644 --- a/packages/gnome/gnome-doc-utils_0.7.1.bb +++ b/packages/gnome/gnome-doc-utils_0.7.1.bb @@ -5,6 +5,8 @@ PR = "r1" inherit gnome +EXTRA_OECONF = "--disable-scrollkeeper" + FILES_${PN} += "${datadir}/xml*" do_stage() { -- cgit v1.2.3 From 4db3cf0ae1688007779db00019287084f6b063b6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 12 Apr 2007 22:28:51 +0000 Subject: tasks: Remove strange (uneeded) syntax before it spreads any further --- packages/tasks/task-gpe.bb | 22 +++++++++++----------- packages/tasks/task-gpephone.bb | 14 +++++++------- packages/tasks/task-sdk-base.bb | 2 +- packages/tasks/task-sdk-extra.bb | 6 +++--- packages/tasks/task-sdk-gpephone.bb | 2 +- packages/tasks/task-sdk-opie.bb | 2 +- packages/tasks/task-sdk-sbox-gpe.bb | 2 +- packages/tasks/task-sdk-sbox.bb | 2 +- packages/tasks/task-sdk.bb | 2 +- packages/tasks/task-xfce-base.bb | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb index b59b3ceea3..ed9460ef13 100644 --- a/packages/tasks/task-gpe.bb +++ b/packages/tasks/task-gpe.bb @@ -16,11 +16,11 @@ PACKAGES = "\ gpe-task-desktopapps \ gpe-task-sectest" -RDEPENDS_gpe-base-depends := "\ +RDEPENDS_gpe-base-depends = "\ diet-x11 \ virtual/xserver" -RDEPENDS_gpe-task-base := "\ +RDEPENDS_gpe-task-base = "\ gpe-bootsplash \ bluez-utils-dbus \ matchbox \ @@ -49,7 +49,7 @@ RDEPENDS_gpe-task-base := "\ pango-module-basic-x \ pango-module-basic-fc" -RDEPENDS_gpe-task-pim := "\ +RDEPENDS_gpe-task-pim = "\ gpe-timesheet \ gpe-todo \ gpe-calendar \ @@ -58,7 +58,7 @@ RDEPENDS_gpe-task-pim := "\ gpe-today \ gpesyncd" -RDEPENDS_gpe-task-settings := "\ +RDEPENDS_gpe-task-settings = "\ matchbox-panel-manager \ gpe-bluetooth \ gpe-beam \ @@ -75,7 +75,7 @@ RDEPENDS_gpe-task-settings := "\ minimix \ xmonobut" -RDEPENDS_gpe-task-apps := "\ +RDEPENDS_gpe-task-apps = "\ gpe-edit \ gpe-gallery \ gpe-calculator \ @@ -91,7 +91,7 @@ RDEPENDS_gpe-task-apps := "\ gpe-scap \ gpe-windowlist" -RDEPENDS_gpe-task-games := "\ +RDEPENDS_gpe-task-games = "\ gpe-go \ gpe-lights \ gpe-othello \ @@ -99,22 +99,22 @@ RDEPENDS_gpe-task-games := "\ gsoko \ xdemineur" -RDEPENDS_gpe-task-connectivity := "\ +RDEPENDS_gpe-task-connectivity = "\ gpe-mini-browser" # gaim # linphone-hh -RDEPENDS_gpe-task-apps-extra := "\ +RDEPENDS_gpe-task-apps-extra = "\ gpe-filemanager \ gpe-soundbite \ mbmerlin" -RDEPENDS_gpe-task-web := "\ +RDEPENDS_gpe-task-web = "\ gpe-irc \ minimo \ gaim" -RDEPENDS_gpe-task-desktopapps := "\ +RDEPENDS_gpe-task-desktopapps = "\ firefox \ thunderbird \ galculator \ @@ -122,7 +122,7 @@ RDEPENDS_gpe-task-desktopapps := "\ gpdf \ totem" -RDEPENDS_gpe-task-sectest := "\ +RDEPENDS_gpe-task-sectest = "\ mbmerlin \ nmap \ ettercap \ diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb index a480a03b86..96a27e6ed2 100644 --- a/packages/tasks/task-gpephone.bb +++ b/packages/tasks/task-gpephone.bb @@ -12,11 +12,11 @@ PACKAGES = "\ gpephone-task-apps \ gpephone-task-development" -RDEPENDS_gpephone-base-depends := "\ +RDEPENDS_gpephone-base-depends = "\ diet-x11 \ virtual/xserver" -RDEPENDS_gpephone-task-development := "\ +RDEPENDS_gpephone-task-development = "\ rxvt-unicode \ xmonobut \ gpe-terminal \ @@ -25,7 +25,7 @@ RDEPENDS_gpephone-task-development := "\ strace \ e2fsprogs" -RDEPENDS_gpephone-task-base := "\ +RDEPENDS_gpephone-task-base = "\ cms92init \ gsmmux \ connect \ @@ -73,10 +73,10 @@ RDEPENDS_gpephone-task-base := "\ ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus xtscal", "",d)} \ " -RDEPENDS_gpephone-task-pim := "\ +RDEPENDS_gpephone-task-pim = "\ gpesyncd" -RDEPENDS_gpephone-task-settings := "\ +RDEPENDS_gpephone-task-settings = "\ gpe-su \ gpe-conf \ gpe-clock \ @@ -85,12 +85,12 @@ RDEPENDS_gpephone-task-settings := "\ keylaunch \ minilite" -RDEPENDS_gpephone-task-apps := "\ +RDEPENDS_gpephone-task-apps = "\ gpe-watch \ gpe-what \ matchbox-panel-hacks \ gpe-scap \ gpe-windowlist" -RDEPENDS_gpephone-task-connectivity := "\ +RDEPENDS_gpephone-task-connectivity = "\ " diff --git a/packages/tasks/task-sdk-base.bb b/packages/tasks/task-sdk-base.bb index 3bf708902f..52956239eb 100644 --- a/packages/tasks/task-sdk-base.bb +++ b/packages/tasks/task-sdk-base.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" DEPENDS = "task-sdk" -RDEPENDS := "\ +RDEPENDS = "\ task-sdk-bare \ glibc \ glibc-dev \ diff --git a/packages/tasks/task-sdk-extra.bb b/packages/tasks/task-sdk-extra.bb index 805974c9b5..33f8e3a5e8 100644 --- a/packages/tasks/task-sdk-extra.bb +++ b/packages/tasks/task-sdk-extra.bb @@ -8,7 +8,7 @@ PACKAGES = "\ task-sdk-x11-ext \ task-sdk-gpe" -RDEPENDS_task-sdk-x11 := "\ +RDEPENDS_task-sdk-x11 = "\ atk-dev \ cairo-dev \ gconf-dbus-dev \ @@ -20,7 +20,7 @@ RDEPENDS_task-sdk-x11 := "\ pango-dev \ startup-notification-dev" -RDEPENDS_task-sdk-x11-ext := "\ +RDEPENDS_task-sdk-x11-ext = "\ libxcursor-dev \ libxdmcp-dev \ libxft-dev \ @@ -45,7 +45,7 @@ RDEPENDS_task-sdk-x11-ext := "\ libxtst-dev" -RDEPENDS_task-sdk-gpe := "\ +RDEPENDS_task-sdk-gpe = "\ libcontactsdb-dev \ esound-dev \ libeventdb-dev \ diff --git a/packages/tasks/task-sdk-gpephone.bb b/packages/tasks/task-sdk-gpephone.bb index 10afccf477..56b398b04e 100644 --- a/packages/tasks/task-sdk-gpephone.bb +++ b/packages/tasks/task-sdk-gpephone.bb @@ -3,7 +3,7 @@ PR = "r0" LICENSE = "MIT" ALLOW_EMPTY = "1" -RDEPENDS := "\ +RDEPENDS = "\ libidn-dev \ libim-dev \ gloox-dev \ diff --git a/packages/tasks/task-sdk-opie.bb b/packages/tasks/task-sdk-opie.bb index 34fca7bcc6..0c4c1f6558 100644 --- a/packages/tasks/task-sdk-opie.bb +++ b/packages/tasks/task-sdk-opie.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" PACKAGES = "task-sdk-opie" -RDEPENDS_task-sdk-opie := "\ +RDEPENDS_task-sdk-opie = "\ libopiebluez2 \ libopiedb2 \ libopiecore2 \ diff --git a/packages/tasks/task-sdk-sbox-gpe.bb b/packages/tasks/task-sdk-sbox-gpe.bb index 77950dfb01..930de7cd2e 100644 --- a/packages/tasks/task-sdk-sbox-gpe.bb +++ b/packages/tasks/task-sdk-sbox-gpe.bb @@ -3,7 +3,7 @@ PR = "r0" LICENSE = "MIT" ALLOW_EMPTY = "1" -RDEPENDS := "\ +RDEPENDS = "\ glib-2.0-utils \ gdk-pixbuf-loader-png \ gdk-pixbuf-loader-jpeg \ diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb index aa8dddfbd8..2d73fe2716 100644 --- a/packages/tasks/task-sdk-sbox.bb +++ b/packages/tasks/task-sdk-sbox.bb @@ -3,7 +3,7 @@ PR = "r6" LICENSE = "MIT" ALLOW_EMPTY = "1" -RDEPENDS := "\ +RDEPENDS = "\ strace \ gdb \ sbrsh \ diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index 6e6770c913..fee2be51b8 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -7,7 +7,7 @@ PACKAGES = "\ task-sdk-bare \ " -RDEPENDS_task-sdk-bare := "\ +RDEPENDS_task-sdk-bare = "\ glibc \ glibc-dev \ libgcc1 \ diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb index bd6841f025..3a4081199b 100644 --- a/packages/tasks/task-xfce-base.bb +++ b/packages/tasks/task-xfce-base.bb @@ -8,7 +8,7 @@ ALLOW_EMPTY = "1" PACKAGES = "${PN}" PR = "r2" -RDEPENDS= "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \ +RDEPENDS = "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \ xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \ xfce4-panel-mcs-plugins \ xfdesktop-mcs-plugins" -- cgit v1.2.3 From accb1927c162f0a4f98ad77894af23439e4d4364 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 13 Apr 2007 08:44:03 +0000 Subject: task-base: major restructure - task-base-FEATURENAME are built nevermind does MACHINE supports them - task-base depends on task-* packages only - MACHINE/DISTRO features only - task-boot contain stuff needed to get minimal bootable image - task-distro-base contain distro addons - task-machine-base contain machine specific addons - ability to choose SSH daemon (dropbear, openssh, none) by distro - ability to choose /dev/ manager (udev, devfsd, mdev) by distro - ability to choose getty provider (tinylogin by default) by distro With this version it is easier to create smaller rootfs - for example image with ONLY bluetooth support is "task-boot + task-base-bluetooth". --- packages/tasks/task-base.bb | 403 +++++++++++++++++++++++++------------------- 1 file changed, 225 insertions(+), 178 deletions(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index e2bc56762b..bd38da5359 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,207 +1,229 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r23" - -PACKAGES = "task-base \ - task-base-oh-minimal \ - task-base-core-default" +PR = "r26" + +PACKAGES = 'task-boot \ + task-base \ + task-distro-base \ + task-machine-base \ + \ + task-base-acpi \ + task-base-alsa \ + task-base-apm \ + task-base-bluetooth \ + task-base-ext2 \ + task-base-irda \ + task-base-keyboard \ + task-base-pci \ + task-base-pcmcia \ + task-base-phone \ + task-base-screen \ + task-base-serial \ + task-base-touchscreen \ + task-base-usbgadget \ + task-base-usbhost \ + task-base-wifi \ + \ + task-base-cramfs \ + task-base-ipsec \ + task-base-ipv6 \ + task-base-nfs \ + task-base-ppp \ + task-base-smbfs \ + \ + ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \ + ' ALLOW_EMPTY = "1" -PACKAGE_ARCH = "${MACHINE_ARCH}" +PACKAGE_ARCH = "all" -# Valid only in MACHINE_FEATURES: # -# kernel24 -# kernel26 -# apm -# keyboard -# touchscreen -# screen -# pci -# acpi -# phone +# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH +# +PACKAGE_ARCH_task-base = "${MACHINE_ARCH}" +PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}" +PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}" +PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}" -# Valid only in DISTRO_FEATURES: # -# nfs -# smbfs -# ipsec -# wifi -# ppp +# udev, devfsd, mdev (from busybox) or none +# +DISTRO_DEV_MANAGER ?= "${@base_contains("MACHINE_FEATURES", "kernel26", "udev","",d)} " -# Valid COMBINED_FEATURES: -# (These features need to be supported by both the machine and the distro) # -# alsa -# bluetooth -# ext2 -# irda -# pci -# pcmcia -# redboot -# uboot -# usbgadget -# usbhost +# sysvinit, upstart +# +DISTRO_INIT_MANAGER ?= "sysvinit" +# +# tinylogin, getty +# +DISTRO_LOGIN_MANAGER ?= "tinylogin" -DISTRO_CORE_PACKAGE ?= "task-base-core-default" +# +# linux-hotplug or none +# +HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} " # -# task-base +# dropbear, openssh or none # -RDEPENDS_task-base = "\ - ${DISTRO_CORE_PACKAGE} \ - kernel \ - ${@base_contains("MACHINE_FEATURES", "kernel24", "${task-base-kernel24-rdepends}", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "acpi", "${task-base-acpi-rdepends}", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "keyboard", "${task-base-keyboard-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pci", "${task-base-pci-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "uboot", "${task-base-uboot-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "redboot", "${task-base-redboot-rdepends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "raid", "${task-distro-raid-rdepends}", "",d)} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ - ${MACHINE_EXTRA_RDEPENDS} \ - ${DISTRO_EXTRA_RDEPENDS}" - -RRECOMMENDS_task-base = "\ - ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "usbgadget", "${task-base-usbgadget-rrecommends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rrecommends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rrecommends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rrecommends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rrecommends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rrecommends}", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "cramfs", "${task-distro-cramfs-rrecommends}", "",d)} \ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ - ${MACHINE_EXTRA_RRECOMMENDS} \ - ${DISTRO_EXTRA_RRECOMMENDS}" - - -# -# task-base-oh-minimal -# An example of a small cut down machine configuration -# -RDEPENDS_task-base-oh-minimal = "\ - kernel \ - ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" +DISTRO_SSH_DAEMON ?= "dropbear" -RRECOMMENDS_task-base-oh-minimal = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" +# +# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others +# +PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " +# +# those ones can be set in machine config to supply packages needed to get machine booting +# +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" + +# +# task-base contain stuff needed for base system (machine related) +# +RDEPENDS_task-base = "\ + task-boot \ + task-distro-base \ + task-machine-base \ + ${DISTRO_SSH_DAEMON} \ + ${HOTPLUG} \ + \ + ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \ + ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \ + ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \ + ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \ + \ + ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \ + \ + ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \ + " -HOTPLUG ?= "linux-hotplug" +# +# packages added by distribution +# +RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}" +RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" -RDEPENDS_task-base-core-default = '\ +# +# packages added by machine config +# +RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}" +RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" + +# +# minimal set of packages - needed to boot +# +RDEPENDS_task-boot = "\ + kernel \ base-files \ base-passwd \ busybox \ initscripts \ - netbase \ - sysvinit \ - sysvinit-pidof \ - tinylogin \ modutils-initscripts \ - fuser \ - setserial' -# Lets see if we can kill off hotplug... -# ${HOTPLUG} -# ${@bootstrap_modutils_rdepends(d)} - + netbase \ + ${DISTRO_DEV_MANAGER} \ + ${DISTRO_INIT_MANAGER} \ + ${DISTRO_LOGIN_MANAGER} \ + ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_task-base-core-default = '\ - dropbear ' +RRECOMMENDS_task-boot = "\ + ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" -task-base-kernel24-rdepends = "\ - modutils-depmod \ - linux-hotplug " +RDEPENDS_task-base-kernel24 = "\ + modutils-depmod" -task-base-kernel26-rdepends = "\ - udev \ +RDEPENDS_task-base-kernel26 = "\ sysfsutils \ module-init-tools" -task-base-keyboard-rdepends = "\ - keymaps" - -task-base-pci-rdepends = "\ - pciutils" +RRECOMMENDS_task-base-kernel24 = "\ + kernel-module-input \ + kernel-module-uinput" -task-base-kernel26-extras-rrecommends = "\ +RRECOMMENDS_task-base-kernel26 = "\ kernel-module-input \ kernel-module-uinput" -task-base-acpi-rdepends = "\ +RDEPENDS_task-base-keyboard = "\ + keymaps" + +RDEPENDS_task-base-pci = "\ + pciutils" + +RDEPENDS_task-base-acpi = "\ acpid" -task-base-apm-rdepends = "\ +RDEPENDS_task-base-apm = "\ apm \ apmd \ - ${@base_contains("MACHINE_FEATURES", "kernel24", "network-suspend-scripts", "",d)}" + ${@base_contains('MACHINE_FEATURES', 'kernel24', 'network-suspend-scripts', '',d)}" -task-base-ext2-rdepends = "\ +RDEPENDS_task-base-ext2 = "\ hdparm \ e2fsprogs \ e2fsprogs-e2fsck \ e2fsprogs-mke2fs" -task-base-alsa-rdepends = "\ +RDEPENDS_task-base-alsa = "\ alsa-utils-alsactl \ alsa-utils-alsamixer" -task-base-alsa-rrecommends = "\ +# +# alsa-state is machine related so can be missing in feed, OSS support is optional +# +RRECOMMENDS_task-base-alsa = "\ + alsa-state \ kernel-module-snd-mixer-oss \ kernel-module-snd-pcm-oss" -task-base-pcmcia-rdepends = "\ +RDEPENDS_task-base-pcmcia = "\ ${PCMCIA_MANAGER} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-firmware", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-support", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "spectrum-fw", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-conf", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-conf", "",d)}" - -task-base-pcmcia-rrecommends = "\ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-firmware', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-support', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-conf', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-conf', '',d)}" + +RRECOMMENDS_task-base-pcmcia = "\ + ${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \ kernel-module-pcmcia \ kernel-module-airo-cs \ kernel-module-pcnet-cs \ kernel-module-serial-cs \ kernel-module-ide-cs \ kernel-module-ide-disk \ - ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} " + " -task-base-pcmcia24-rrecommends = "\ - ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-modules-cs", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-modules-cs", "",d)}" +task-base-pcmcia24 = "\ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)}" -task-base-pcmcia26-rrecommends = "\ - ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-hostap-cs", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-orinoco-cs", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "kernel-module-spectrum-cs", "",d)}" +task-base-pcmcia26 = "\ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" -task-base-bluetooth-rdepends = "\ - blueprobe \ - bluez-utils" +RDEPENDS_task-base-bluetooth = "\ + blueprobe \ + bluez-utils" -task-base-bluetooth-rrecommends = "\ +RRECOMMENDS_task-base-bluetooth = "\ kernel-module-bluetooth \ kernel-module-l2cap \ kernel-module-rfcomm \ @@ -210,39 +232,39 @@ task-base-bluetooth-rrecommends = "\ kernel-module-hidp \ kernel-module-hci-uart \ kernel-module-sco \ - ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-hci-usb", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetooth3c-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluecard-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-bluetoothuart-cs", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "kernel-module-dtl1-cs", "",d)}" + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)}" -task-base-irda-rdepends = "\ +RDEPENDS_task-base-irda = "\ irda-utils" -task-base-irda-rrecommends = "\ +RRECOMMENDS_task-base-irda = "\ kernel-module-pxaficp-ir \ kernel-module-irda \ kernel-module-ircomm \ kernel-module-ircomm-tty \ kernel-module-irlan \ - ${@base_contains("DISTRO_FEATURES", "ppp", "kernel-module-irnet", "",d)} \ + ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \ kernel-module-irport \ kernel-module-irtty \ kernel-module-irtty-sir \ kernel-module-sir-dev \ - ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-ir-usb", "",d)} " + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} " -task-base-usbgadget-rrecommends = "\ +RRECOMMENDS_task-base-usbgadget = "\ kernel-module-pxa27x_udc \ kernel-module-gadgetfs \ kernel-module-g-file-storage \ kernel-module-g-serial \ kernel-module-g-ether" -task-base-usbhost-rdepends = "\ +RDEPENDS_task-base-usbhost = "\ usbutils " -task-base-usbhost-rrecommends = "\ +RRECOMMENDS_task-base-usbhost = "\ kernel-module-uhci-hcd \ kernel-module-ohci-hcd \ kernel-module-ehci-hcd \ @@ -256,34 +278,41 @@ task-base-usbhost-rrecommends = "\ kernel-module-usbserial \ kernel-module-usb-storage " -task-base-uboot-rdepends = "\ - uboot-utils" +RDEPENDS_task-base-uboot = "\ + uboot-utils" -task-base-redboot-rdepends = "\ - fis" +RDEPENDS_task-base-redboot = "\ + fis" -task-distro-ppp-rdepends = "\ +RDEPENDS_task-base-ppp = "\ ppp \ ppp-dialin" -task-distro-ppp-rrecommends = "\ +RRECOMMENDS_task-base-ppp = "\ kernel-module-ppp-async \ kernel-module-ppp-deflate \ kernel-module-ppp-mppe" -task-distro-ipsec-rdepends = "\ +RDEPENDS_task-base-ipsec = "\ openswan" -task-distro-ipsec-rrecommends = "\ +RRECOMMENDS_task-base-ipsec = "\ kernel-module-ipsec" -task-distro-wifi-rdepends = "\ +# +# task-base-wifi contain everything needed to get WiFi working +# WEP/WPA connection needs to be supported out-of-box +# +RDEPENDS_task-base-wifi = "\ wireless-tools \ - ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \ - ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-tools', '',d)} \ wpa-supplicant" -task-distro-wifi-rrecommends = "\ +RRECOMMENDS_task-base-wifi = "\ + ${@base_contains('COMBINED_FEATURES', 'pci', 'madwifi-ng-modules', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ kernel-module-ieee80211-crypt \ kernel-module-ieee80211-crypt-ccmp \ kernel-module-ieee80211-crypt-tkip \ @@ -293,30 +322,49 @@ task-distro-wifi-rrecommends = "\ kernel-module-michael-mic \ kernel-module-aes" -task-distro-smbfs-rrecommends = "\ +RRECOMMENDS_task-base-smbfs = "\ kernel-module-cifs \ kernel-module-smbfs" -task-distro-cramfs-rrecommends = "\ +RRECOMMENDS_task-base-cramfs = "\ kernel-module-cramfs" -task-distro-nfs-rdepends = "\ +# +# task-base-nfs provides ONLY client support - server is in nfs-utils package +# +RDEPENDS_task-base-nfs = "\ portmap" -task-distro-nfs-rrecommends = "\ - kernel-module-nfs \ - kernel-module-lockd \ - kernel-module-sunrpc" +RRECOMMENDS_task-base-nfs = "\ + kernel-module-nfs " + +RDEPENDS_task-base-raid = "\ + " -task-distro-raid-rdepends = "\ +RDEPENDS_task-base-screen = "\ " +# +# GPE/OPIE/OpenMoko provide own touchscreen calibration utils +# +RDEPENDS_task-base-touchscreen = "\ + tslib-tests \ + tslib-calibrate " + +RDEPENDS_task-base-ipv6 = "\ + " + +RRECOMMENDS_task-base-ipv6 = "\ + kernel-module-ipv6 " + +RDEPENDS_task-base-serial = "\ + setserial \ + lrzsz " + # Tosort -# kernel-module-ipv6 # kernel-module-nvrd # kernel-module-mip6-mn # kernel-module-tun -# kernel-module-ide-disk # kernel-module-ide-probe-mo # kernel-module-loop # kernel-module-vfat @@ -330,4 +378,3 @@ task-distro-raid-rdepends = "\ # kernel-module-md5 # kernel-module-8250 # Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz - -- cgit v1.2.3 From 97c38e71591a9ce274b884e0d1ab4babac22f589 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 13 Apr 2007 11:03:15 +0000 Subject: angstrom: add versions for gtk-webcore --- conf/distro/angstrom-2007.1.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 4c0fa9ff84..877627332c 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -133,6 +133,13 @@ PREFERRED_VERSION_freetype-native = "2.2.1" PREFERRED_VERSION_cairo = "1.4.2" PREFERRED_VERSION_glib-2.0 = "2.12.11" +# older gtk-webcore releases don't work on ARM/EABI +# We need to switch to a fixed SRCDATE or release as soon as possible +PREFERRED_VERSION_osb-browser = "0.5.0+svn${SRCDATE}" +PREFERRED_VERSION_osb-jscore = "0.5.2+svn${SRCDATE}" +PREFERRED_VERSION_osb-nrcit = "0.5.2+svn${SRCDATE}" +PREFERRED_VERSION_osb-nrcore = "0.5.2+svn${SRCDATE}" + #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" -- cgit v1.2.3 From 46c29d3ae15aa5b0ee3541e60f4dfd7093a93830 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 13 Apr 2007 11:33:52 +0000 Subject: angstrom: remove references to task-base-core-default --- packages/angstrom/angstrom-console-image.bb | 3 +-- packages/angstrom/angstrom-e-image.bb | 3 +-- packages/angstrom/angstrom-mokogateway-image.bb | 4 ++-- packages/angstrom/angstrom-x11-image.bb | 3 +-- packages/angstrom/task-angstrom-e.bb | 2 +- packages/angstrom/task-angstrom-x11.bb | 5 +++-- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb index 8bd0fe07e7..e5a6dcc2a3 100644 --- a/packages/angstrom/angstrom-console-image.bb +++ b/packages/angstrom/angstrom-console-image.bb @@ -5,8 +5,7 @@ PR = "r4" ANGSTROM_EXTRA_INSTALL ?= "" DEPENDS = "task-base" -RDEPENDS = "task-base-core-default \ - task-base \ +RDEPENDS = "task-base \ ${ANGSTROM_EXTRA_INSTALL} \ " diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb index da40f7e00c..4c9bb83507 100644 --- a/packages/angstrom/angstrom-e-image.bb +++ b/packages/angstrom/angstrom-e-image.bb @@ -1,6 +1,6 @@ #Angstrom e image LICENSE = "MIT" -PR = "r0" +PR = "r1" PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" @@ -21,7 +21,6 @@ export IMAGE_BASENAME = "e-image" DEPENDS = "task-base" RDEPENDS = "\ ${XSERVER} \ - task-base-core-default \ task-base \ angstrom-e-base-depends \ angstrom-e-depends \ diff --git a/packages/angstrom/angstrom-mokogateway-image.bb b/packages/angstrom/angstrom-mokogateway-image.bb index 80673f61ec..6cf96ba8cf 100644 --- a/packages/angstrom/angstrom-mokogateway-image.bb +++ b/packages/angstrom/angstrom-mokogateway-image.bb @@ -1,12 +1,12 @@ #Angstrom moko gateway image # tries to be a companion for openmoko based phones LICENSE = "MIT" -PR = "r0" +PR = "r1" ANGSTROM_EXTRA_INSTALL ?= "" DEPENDS = "task-base" -RDEPENDS = "task-base-core-default \ +RDEPENDS = " \ task-base \ bluez-utils \ blue-probe \ diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb index dbb986ae65..c5d2675b60 100644 --- a/packages/angstrom/angstrom-x11-image.bb +++ b/packages/angstrom/angstrom-x11-image.bb @@ -1,6 +1,6 @@ #Angstrom X11 image LICENSE = "MIT" -PR = "r5" +PR = "r6" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +16,6 @@ export IMAGE_BASENAME = "x11-image" DEPENDS = "task-base" RDEPENDS = "\ ${XSERVER} \ - task-base-core-default \ task-base \ angstrom-x11-base-depends \ angstrom-gpe-task-base \ diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb index 228c637158..eb9f025743 100644 --- a/packages/angstrom/task-angstrom-e.bb +++ b/packages/angstrom/task-angstrom-e.bb @@ -24,4 +24,4 @@ RDEPENDS_angstrom-e-depends := "\ gdk-pixbuf-loader-png \ gdk-pixbuf-loader-pnm \ gdk-pixbuf-loader-xbm \ - gdk-pixbuf-loader-xpm" \ No newline at end of file + gdk-pixbuf-loader-xpm" diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb index f427f15ab8..a5f9be1938 100644 --- a/packages/angstrom/task-angstrom-x11.bb +++ b/packages/angstrom/task-angstrom-x11.bb @@ -109,12 +109,13 @@ RDEPENDS_angstrom-task-office := "\ gnumeric \ abiword \ imposter \ -# evince \ + evince \ gqview" RDEPENDS_angstrom-task-printing := "\ cups \ - gnome-cups-manager" +# gnome-cups-manager \ + " RDEPENDS_angstrom-task-sectest := "\ nmap \ -- cgit v1.2.3 From 25478ca2ba3aade0ab77fe3a045fb86c69584cef Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 13 Apr 2007 12:25:22 +0000 Subject: linux-rp: added SD/MMC driver for collie - written by Thomas Kunze --- packages/linux/linux-rp-2.6.20/defconfig-collie | 296 ++++++++++++++++-------- packages/linux/linux-rp.inc | 3 + packages/linux/linux-rp_2.6.20.bb | 20 +- 3 files changed, 211 insertions(+), 108 deletions(-) diff --git a/packages/linux/linux-rp-2.6.20/defconfig-collie b/packages/linux/linux-rp-2.6.20/defconfig-collie index 55336bae96..b0603a8408 100644 --- a/packages/linux/linux-rp-2.6.20/defconfig-collie +++ b/packages/linux/linux-rp-2.6.20/defconfig-collie @@ -1,15 +1,23 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17 -# Tue Jul 4 16:35:35 2006 +# Linux kernel version: 2.6.20.4 +# Fri Apr 6 23:20:59 2007 # CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # # Code maturity level options @@ -26,29 +34,36 @@ CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y +# CONFIG_IPC_NS is not set # CONFIG_POSIX_MQUEUE is not set CONFIG_BSD_PROCESS_ACCT=y # CONFIG_BSD_PROCESS_ACCT_V3 is not set -CONFIG_SYSCTL=y +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set +# CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set CONFIG_INITRAMFS_SOURCE="" -CONFIG_UID16=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -CONFIG_ELF_CORE=y +# CONFIG_ELF_CORE is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set @@ -66,7 +81,10 @@ CONFIG_KMOD=y # # Block layer # +CONFIG_BLOCK=y +# CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers @@ -84,18 +102,28 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # # System Type # +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set # CONFIG_ARCH_PXA is not set # CONFIG_ARCH_RPC is not set CONFIG_ARCH_SA1100=y @@ -103,12 +131,6 @@ CONFIG_ARCH_SA1100=y # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_AT91RM9200 is not set # # SA11x0 Implementations @@ -138,11 +160,14 @@ CONFIG_CPU_ABRT_EV4=y CONFIG_CPU_CACHE_V4WB=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WB=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features # -CONFIG_KEXEC=y +# CONFIG_CPU_ICACHE_DISABLE is not set +# CONFIG_CPU_DCACHE_DISABLE is not set CONFIG_SHARP_LOCOMO=y CONFIG_SHARP_PARAM=y CONFIG_SHARP_SCOOP=y @@ -186,6 +211,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_NEED_MULTIPLE_NODES=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set # CONFIG_LEDS is not set CONFIG_ALIGNMENT_TRAP=y @@ -194,8 +220,8 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 mem=32M fbcon=rotate:1 dyntick=enable quiet" # CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y # # CPU Frequency scaling @@ -227,7 +253,8 @@ CONFIG_BINFMT_MISC=m CONFIG_PM=y # CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set -CONFIG_APM=y +# CONFIG_PM_SYSFS_DEPRECATED is not set +CONFIG_APM=m # # Networking @@ -238,11 +265,12 @@ CONFIG_NET=y # Networking options # # CONFIG_NETDEBUG is not set -CONFIG_PACKET=y +CONFIG_PACKET=m CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y CONFIG_XFRM_USER=m +# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set @@ -258,10 +286,15 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # # IP: Virtual Server Configuration @@ -273,9 +306,17 @@ CONFIG_IPV6=m CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m +# CONFIG_IPV6_MIP6 is not set CONFIG_INET6_XFRM_TUNNEL=m CONFIG_INET6_TUNNEL=m +CONFIG_INET6_XFRM_MODE_TRANSPORT=m +CONFIG_INET6_XFRM_MODE_TUNNEL=m +CONFIG_INET6_XFRM_MODE_BEET=m +# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set +CONFIG_IPV6_SIT=m CONFIG_IPV6_TUNNEL=m +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_NETWORK_SECMARK is not set CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set @@ -283,23 +324,12 @@ CONFIG_NETFILTER=y # Core Netfilter Configuration # # CONFIG_NETFILTER_NETLINK is not set +# CONFIG_NF_CONNTRACK_ENABLED is not set # CONFIG_NETFILTER_XTABLES is not set # # IP: Netfilter Configuration # -CONFIG_IP_NF_CONNTRACK=m -# CONFIG_IP_NF_CT_ACCT is not set -# CONFIG_IP_NF_CONNTRACK_MARK is not set -# CONFIG_IP_NF_CONNTRACK_EVENTS is not set -CONFIG_IP_NF_CT_PROTO_SCTP=m -CONFIG_IP_NF_FTP=m -CONFIG_IP_NF_IRC=m -# CONFIG_IP_NF_NETBIOS_NS is not set -CONFIG_IP_NF_TFTP=m -CONFIG_IP_NF_AMANDA=m -# CONFIG_IP_NF_PPTP is not set -# CONFIG_IP_NF_H323 is not set CONFIG_IP_NF_QUEUE=m # @@ -330,7 +360,6 @@ CONFIG_IP_NF_QUEUE=m # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -390,6 +419,7 @@ CONFIG_IRTTY_SIR=m CONFIG_USB_IRDA=m # CONFIG_SIGMATEL_FIR is not set CONFIG_SA1100_FIR=m +# CONFIG_MCS_FIR is not set CONFIG_BT=m CONFIG_BT_L2CAP=m CONFIG_BT_SCO=m @@ -434,6 +464,7 @@ CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_DEBUG_DRIVER is not set +# CONFIG_SYS_HYPERVISOR is not set # # Connector - unified userspace <-> kernelspace linker @@ -454,12 +485,14 @@ CONFIG_MTD_PARTITIONS=y # # User Modules And Translation Layers # -CONFIG_MTD_CHAR=y +CONFIG_MTD_CHAR=m +CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set # CONFIG_NFTL is not set # CONFIG_INFTL is not set # CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set # # RAM/ROM/Flash chip drivers @@ -486,12 +519,15 @@ CONFIG_MTD_SHARP=y # Mapping drivers for chip access # # CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PHYSMAP is not set CONFIG_MTD_SA1100=y # CONFIG_MTD_PLATRAM is not set # # Self-contained MTD device drivers # +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_M25P80 is not set # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_PHRAM is not set # CONFIG_MTD_MTDRAM is not set @@ -540,7 +576,8 @@ CONFIG_BLK_DEV_LOOP=m # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=y +CONFIG_IDE=m +CONFIG_IDE_MAX_HWIFS=4 CONFIG_BLK_DEV_IDE=m # @@ -571,6 +608,8 @@ CONFIG_BLK_DEV_IDECS=m # # CONFIG_RAID_ATTRS is not set CONFIG_SCSI=m +# CONFIG_SCSI_TGT is not set +# CONFIG_SCSI_NETLINK is not set CONFIG_SCSI_PROC_FS=y # @@ -590,14 +629,16 @@ CONFIG_CHR_DEV_SG=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set # -# SCSI Transport Attributes +# SCSI Transports # # CONFIG_SCSI_SPI_ATTRS is not set # CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set # CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set # # SCSI low-level drivers @@ -606,7 +647,6 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_AHA152X is not set # CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_IN2000 is not set -# CONFIG_SCSI_SATA is not set # CONFIG_SCSI_DTC3280 is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_GENERIC_NCR5380 is not set @@ -628,11 +668,18 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_PCMCIA_QLOGIC is not set # CONFIG_PCMCIA_SYM53C500 is not set +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set + # # Multi-device support (RAID and LVM) # CONFIG_MD=y +# CONFIG_BLK_DEV_MD is not set CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set CONFIG_DM_CRYPT=m CONFIG_DM_SNAPSHOT=m CONFIG_DM_MIRROR=m @@ -734,6 +781,7 @@ CONFIG_PCMCIA_HERMES=m CONFIG_PCMCIA_SPECTRUM=m # CONFIG_AIRO_CS is not set # CONFIG_PCMCIA_WL3501 is not set +# CONFIG_USB_ZD1201 is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set @@ -767,6 +815,7 @@ CONFIG_PPP_BSDCOMP=m # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set +CONFIG_SLHC=m # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -781,11 +830,12 @@ CONFIG_PPP_BSDCOMP=m # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=m +CONFIG_INPUT_MOUSEDEV=y # CONFIG_INPUT_MOUSEDEV_PSAUX is not set CONFIG_INPUT_MOUSEDEV_SCREEN_X=480 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640 @@ -805,6 +855,7 @@ CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_LOCOMO=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -822,6 +873,7 @@ CONFIG_KEYBOARD_LOCOMO=y CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -852,14 +904,11 @@ CONFIG_UNIX98_PTYS=y # Watchdog Cards # # CONFIG_WATCHDOG is not set +CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set # CONFIG_DTLK is not set # CONFIG_R3964 is not set -# -# Ftape, the floppy tape device driver -# - # # PCMCIA character devices # @@ -872,7 +921,6 @@ CONFIG_UNIX98_PTYS=y # TPM devices # # CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set # # I2C support @@ -891,6 +939,7 @@ CONFIG_I2C=m # I2C Hardware Bus support # # CONFIG_I2C_ELEKTOR is not set +# CONFIG_I2C_OCORES is not set # CONFIG_I2C_PARPORT_LIGHT is not set # CONFIG_I2C_STUB is not set # CONFIG_I2C_PCA_ISA is not set @@ -913,8 +962,19 @@ CONFIG_I2C=m # # SPI support # -# CONFIG_SPI is not set -# CONFIG_SPI_MASTER is not set +CONFIG_SPI=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_BITBANG is not set +CONFIG_SPI_LOCOMO=m + +# +# SPI Protocol Masters +# # # Dallas's 1-wire bus @@ -930,6 +990,7 @@ CONFIG_I2C=m # # Misc devices # +# CONFIG_TIFM_CORE is not set # # Multimedia Capabilities Port drivers @@ -937,7 +998,6 @@ CONFIG_I2C=m CONFIG_MCP=y CONFIG_MCP_SA11X0=y CONFIG_MCP_UCB1200=y -# CONFIG_MCP_UCB1200_AUDIO is not set CONFIG_MCP_UCB1200_TS=m # @@ -948,12 +1008,12 @@ CONFIG_MCP_UCB1200_TS=m # LED devices # CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y +CONFIG_LEDS_CLASS=m # # LED drivers # -# CONFIG_LEDS_LOCOMO is not set +CONFIG_LEDS_LOCOMO=m # # LED Triggers @@ -961,6 +1021,7 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=m # CONFIG_LEDS_TRIGGER_IDE_DISK is not set +CONFIG_LEDS_TRIGGER_HEARTBEAT=m # # Multimedia devices @@ -978,6 +1039,7 @@ CONFIG_VIDEO_V4L2=y # Video Capture Adapters # # CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # CONFIG_VIDEO_VIVI is not set # CONFIG_VIDEO_PMS is not set # CONFIG_VIDEO_CPIA is not set @@ -985,35 +1047,24 @@ CONFIG_VIDEO_V4L2=y # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set # CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_OVCAMCHIP is not set - -# -# Encoders and Decoders -# -# CONFIG_VIDEO_MSP3400 is not set -# CONFIG_VIDEO_CS53L32A is not set -# CONFIG_VIDEO_WM8775 is not set -# CONFIG_VIDEO_WM8739 is not set -# CONFIG_VIDEO_CX25840 is not set -# CONFIG_VIDEO_SAA711X is not set -# CONFIG_VIDEO_SAA7127 is not set -# CONFIG_VIDEO_UPD64031A is not set -# CONFIG_VIDEO_UPD64083 is not set # # V4L USB devices # +# CONFIG_VIDEO_PVRUSB2 is not set # CONFIG_VIDEO_EM28XX is not set -# CONFIG_USB_DSBR is not set +# CONFIG_VIDEO_USBVISION is not set # CONFIG_USB_VICAM is not set # CONFIG_USB_IBMCAM is not set # CONFIG_USB_KONICAWC is not set +# CONFIG_USB_QUICKCAM_MESSENGER is not set # CONFIG_USB_ET61X251 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set +# CONFIG_USB_W9968CF is not set # CONFIG_USB_OV511 is not set # CONFIG_USB_SE401 is not set # CONFIG_USB_SN9C102 is not set # CONFIG_USB_STV680 is not set -# CONFIG_USB_W9968CF is not set # CONFIG_USB_ZC0301 is not set # CONFIG_USB_PWC is not set @@ -1025,13 +1076,13 @@ CONFIG_VIDEO_V4L2=y # CONFIG_RADIO_RTRACK2 is not set # CONFIG_RADIO_AZTECH is not set # CONFIG_RADIO_GEMTEK is not set -# CONFIG_RADIO_MAESTRO is not set # CONFIG_RADIO_SF16FMI is not set # CONFIG_RADIO_SF16FMR2 is not set # CONFIG_RADIO_TERRATEC is not set # CONFIG_RADIO_TRUST is not set # CONFIG_RADIO_TYPHOON is not set # CONFIG_RADIO_ZOLTRIX is not set +# CONFIG_USB_DSBR is not set # # Digital Video Broadcasting Devices @@ -1042,12 +1093,13 @@ CONFIG_VIDEO_V4L2=y # # Graphics support # +CONFIG_FIRMWARE_EDID=y CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set -# CONFIG_FB_FIRMWARE_EDID is not set +# CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set CONFIG_FB_SA1100=y @@ -1077,18 +1129,12 @@ CONFIG_FONT_8x8=y # # Logo configuration # -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -# CONFIG_LOGO_OHAND_CLUT224 is not set -CONFIG_LOGO_OZ240_CLUT224=y -# CONFIG_LOGO_OZ480_CLUT224 is not set -# CONFIG_LOGO_OZ640_CLUT224 is not set +# CONFIG_LOGO is not set CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y -# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_DEVICE=y CONFIG_BACKLIGHT_LOCOMO=y # @@ -1146,6 +1192,11 @@ CONFIG_SND_DUMMY=m # # CONFIG_SOUND_PRIME is not set +# +# HID Devices +# +CONFIG_HID=m + # # USB support # @@ -1195,13 +1246,13 @@ CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_SDDR55 is not set # CONFIG_USB_STORAGE_JUMPSHOT is not set # CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_KARMA is not set # CONFIG_USB_LIBUSUAL is not set # # USB Input Devices # CONFIG_USB_HID=m -CONFIG_USB_HIDINPUT=y # CONFIG_USB_HIDINPUT_POWERBOOK is not set # CONFIG_HID_FF is not set # CONFIG_USB_HIDDEV is not set @@ -1237,12 +1288,14 @@ CONFIG_USB_HIDINPUT=y # CONFIG_USB_KAWETH is not set # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set +CONFIG_USB_USBNET_MII=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m # CONFIG_USB_NET_GL620A is not set CONFIG_USB_NET_NET1080=m # CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set # CONFIG_USB_NET_RNDIS_HOST is not set CONFIG_USB_NET_CDC_SUBSET=m # CONFIG_USB_ALI_M5632 is not set @@ -1251,7 +1304,6 @@ CONFIG_USB_BELKIN=y CONFIG_USB_ARMLINUX=y # CONFIG_USB_EPSON2888 is not set CONFIG_USB_NET_ZAURUS=m -# CONFIG_USB_ZD1201 is not set CONFIG_USB_MON=y # @@ -1263,8 +1315,8 @@ CONFIG_USB_MON=y # CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRCABLE is not set CONFIG_USB_SERIAL_AIRPRIME=m -CONFIG_USB_SERIAL_ANYDATA=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_WHITEHEAT=m @@ -1298,15 +1350,20 @@ CONFIG_USB_SERIAL_KEYSPAN=m CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m +# CONFIG_USB_SERIAL_MOS7720 is not set +# CONFIG_USB_SERIAL_MOS7840 is not set # CONFIG_USB_SERIAL_NAVMAN is not set CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set +# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set CONFIG_USB_SERIAL_TI=m CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m +# CONFIG_USB_SERIAL_OPTION is not set # CONFIG_USB_SERIAL_OMNINET is not set +# CONFIG_USB_SERIAL_DEBUG is not set CONFIG_USB_EZUSB=y # @@ -1314,16 +1371,20 @@ CONFIG_USB_EZUSB=y # # CONFIG_USB_EMI62 is not set # CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set # CONFIG_USB_AUERSWALD is not set # CONFIG_USB_RIO500 is not set # CONFIG_USB_LEGOTOWER is not set # CONFIG_USB_LCD is not set # CONFIG_USB_LED is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set # CONFIG_USB_CYTHERM is not set -# CONFIG_USB_PHIDGETKIT is not set -# CONFIG_USB_PHIDGETSERVO is not set +# CONFIG_USB_PHIDGET is not set # CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_FTDI_ELAN is not set +# CONFIG_USB_APPLEDISPLAY is not set # CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_TEST is not set # @@ -1335,7 +1396,6 @@ CONFIG_USB_EZUSB=y # CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set -CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set # CONFIG_USB_GADGET_PXA27X is not set @@ -1343,24 +1403,17 @@ CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_LH7A40X is not set # CONFIG_USB_GADGET_OMAP is not set # CONF