From fe63fdaa70f4054c4d0b2de4d45c5f5bf0fa0bc8 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 9 Jan 2010 19:03:34 +0100 Subject: linux: gta03 won't ever see the light of day. remove references to it from three OM kernel recipes. --- recipes/linux/linux-openmoko-2.6.28_git.bb | 1 - recipes/linux/linux-openmoko-shr-devel_git.bb | 1 - recipes/linux/linux-openmoko-shr-drm-devel_git.bb | 1 - 3 files changed, 3 deletions(-) diff --git a/recipes/linux/linux-openmoko-2.6.28_git.bb b/recipes/linux/linux-openmoko-2.6.28_git.bb index 0b779384d9..2e1d133546 100644 --- a/recipes/linux/linux-openmoko-2.6.28_git.bb +++ b/recipes/linux/linux-openmoko-2.6.28_git.bb @@ -18,7 +18,6 @@ S = "${WORKDIR}/git" CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig" CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig" -CONFIG_NAME_om-gta03 = "gta03_defconfig" do_configure_prepend() { install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe diff --git a/recipes/linux/linux-openmoko-shr-devel_git.bb b/recipes/linux/linux-openmoko-shr-devel_git.bb index 480dd4b652..f94bdafd7d 100644 --- a/recipes/linux/linux-openmoko-shr-devel_git.bb +++ b/recipes/linux/linux-openmoko-shr-devel_git.bb @@ -19,7 +19,6 @@ S = "${WORKDIR}/git" CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig" CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig" -CONFIG_NAME_om-gta03 = "gta03_defconfig" do_configure_prepend() { install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb index 11838c6a1b..494e4cebd7 100644 --- a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb +++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb @@ -27,7 +27,6 @@ S = "${WORKDIR}/git" CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig" CONFIG_NAME_om-gta02 = "gta02_drm_defconfig" -CONFIG_NAME_om-gta03 = "gta03_defconfig" do_configure_prepend() { install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe -- cgit v1.2.3 From 9c5e5bbc025641ef0555f0b0576addec1e47b799 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 9 Jan 2010 19:11:48 +0100 Subject: vala: bump to 0.7.9.7, libfsoframework compiles again (really), fsomusicd: updated revision for new vala compatibility Signed-off-by: Martin Jansa --- conf/checksums.ini | 4 ++++ conf/distro/include/sane-srcrevs-fso.inc | 2 +- recipes/vala/vala-native_0.7.9.6.bb | 3 --- recipes/vala/vala-native_0.7.9.7.bb | 3 +++ recipes/vala/vala_0.7.9.6.bb | 2 -- recipes/vala/vala_0.7.9.7.bb | 2 ++ 6 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 recipes/vala/vala-native_0.7.9.6.bb create mode 100644 recipes/vala/vala-native_0.7.9.7.bb delete mode 100644 recipes/vala/vala_0.7.9.6.bb create mode 100644 recipes/vala/vala_0.7.9.7.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 1cc08703e6..1f4fdc1b9a 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -27410,6 +27410,10 @@ sha256=e1d6e89eb8689fb3422502a9020a39fff0a5e6ddb3eb47eed9ac9a00636e06b0 md5=d13ead3d2926b9e7abd7fe61c3a48181 sha256=48332dd1a31ac8cf29536111730d6710f79c5e825ca3acd8927e662fb0f25f48 +[http://www.freesmartphone.org/sources/vala-0.7.9.7.tar.bz2] +md5=b05fd8f4420152ca0080a99750863f3f +sha256=46805e1c19707de043820a1474a8b3775ea3b698a0b539eabd7b86f0f3ad888a + [http://www.freesmartphone.org/sources/vala-0.7.9.tar.bz2] md5=f2f8b2914361db599fd6392ec27f7042 sha256=a71d59cfed750ff402fece5e7d4b656caf3377d5a6bfe5339894f1b13769d58d diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc index 6b4c494684..d1573cfd90 100644 --- a/conf/distro/include/sane-srcrevs-fso.inc +++ b/conf/distro/include/sane-srcrevs-fso.inc @@ -7,7 +7,7 @@ SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d" SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}" -SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}" +SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9" SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}" SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}" diff --git a/recipes/vala/vala-native_0.7.9.6.bb b/recipes/vala/vala-native_0.7.9.6.bb deleted file mode 100644 index d6c239f7bf..0000000000 --- a/recipes/vala/vala-native_0.7.9.6.bb +++ /dev/null @@ -1,3 +0,0 @@ -require vala_${PV}.bb -inherit native -DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala-native_0.7.9.7.bb b/recipes/vala/vala-native_0.7.9.7.bb new file mode 100644 index 0000000000..d6c239f7bf --- /dev/null +++ b/recipes/vala/vala-native_0.7.9.7.bb @@ -0,0 +1,3 @@ +require vala_${PV}.bb +inherit native +DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala_0.7.9.6.bb b/recipes/vala/vala_0.7.9.6.bb deleted file mode 100644 index a5b1958f2c..0000000000 --- a/recipes/vala/vala_0.7.9.6.bb +++ /dev/null @@ -1,2 +0,0 @@ -require vala.inc -PR = "${INC_PR}.0" diff --git a/recipes/vala/vala_0.7.9.7.bb b/recipes/vala/vala_0.7.9.7.bb new file mode 100644 index 0000000000..a5b1958f2c --- /dev/null +++ b/recipes/vala/vala_0.7.9.7.bb @@ -0,0 +1,2 @@ +require vala.inc +PR = "${INC_PR}.0" -- cgit v1.2.3 From dbcb75bd0190f8732b30318b9579929dec8452fa Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Sat, 9 Jan 2010 21:53:57 +0100 Subject: fsodatad: add a config file Signed-off-by: Klaus Kurzmann --- recipes/freesmartphone/fsodatad/fsodatad.conf | 19 +++++++++++++++++++ recipes/freesmartphone/fsodatad_git.bb | 11 ++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 recipes/freesmartphone/fsodatad/fsodatad.conf diff --git a/recipes/freesmartphone/fsodatad/fsodatad.conf b/recipes/freesmartphone/fsodatad/fsodatad.conf new file mode 100644 index 0000000000..85919cf6aa --- /dev/null +++ b/recipes/freesmartphone/fsodatad/fsodatad.conf @@ -0,0 +1,19 @@ +####################################################################################### +# FSO Data Daemon Configuration File -- for SYSTEM INTEGRATORS only +######################################################################################## +[logging] +# Log level: DEBUG, INFO (default), WARNING, ERROR +# Override via environment as FSO_LOG_LEVEL +log_level = INFO +# Where to log to: none (default), stderr, stderr:colors, file, syslog +# Override via environment as FSO_LOG_TO +log_to = file +# Log Destination (valid only for log_to = file) +# Override via environment as FSO_LOG_DESTINATION +log_destination = /var/log/fsodatad.log + +[fsodata] +# No settings yet + +[fsodata.world] +# No settings yet diff --git a/recipes/freesmartphone/fsodatad_git.bb b/recipes/freesmartphone/fsodatad_git.bb index de13bedc0a..c2933ed4da 100644 --- a/recipes/freesmartphone/fsodatad_git.bb +++ b/recipes/freesmartphone/fsodatad_git.bb @@ -1,6 +1,15 @@ require cornucopia.inc inherit fso-plugin -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" PV = "0.0.0+gitr${SRCREV}" DEPENDS += "libxml2 mobile-broadband-provider-info" + +SRC_URI += "file://fsodatad.conf" + +do_install_append() { + install -d ${D}${sysconfdir}/freesmartphone/ + install -m 0644 ${WORKDIR}/fsodatad.conf ${D}${sysconfdir}/freesmartphone/ +} + +FILES_${PN} += "${sysconfdir}/freesmartphone/fsodatad.conf" -- cgit v1.2.3 From 150e8d822c777b4d5c260a978e36ba98996707f0 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Sat, 9 Jan 2010 21:54:36 +0100 Subject: fsotdld: add a config file Signed-off-by: Klaus Kurzmann --- recipes/freesmartphone/fsotdld/fsotdld.conf | 43 +++++++++++++++++++++++++++++ recipes/freesmartphone/fsotdld_git.bb | 11 +++++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 recipes/freesmartphone/fsotdld/fsotdld.conf diff --git a/recipes/freesmartphone/fsotdld/fsotdld.conf b/recipes/freesmartphone/fsotdld/fsotdld.conf new file mode 100644 index 0000000000..07e91b0ff8 --- /dev/null +++ b/recipes/freesmartphone/fsotdld/fsotdld.conf @@ -0,0 +1,43 @@ +####################################################################################### +# FSO Time Date Location Daemon Configuration File -- for SYSTEM INTEGRATORS only +######################################################################################## +[logging] +# Log level: DEBUG, INFO (default), WARNING, ERROR +# Override via environment as FSO_LOG_LEVEL +log_level = INFO +# Where to log to: none (default), stderr, stderr:colors, file, syslog +# Override via environment as FSO_LOG_TO +log_to = file +# Log Destination (valid only for log_to = file) +# Override via environment as FSO_LOG_DESTINATION +log_destination = /var/log/fsotdld.log + +[fsotdl] +gps_receiver_transport = serial +gps_receiver_port = /dev/rfcomm0 +gps_receiver_speed = 9600 + +[fsotdl.alarm] +# No settings yet + +[fsotdl.source_ntp] +# Which server to use; default is 'pool.ntp.org' +server = time.windows.com + +[fsotdl.source_gsm] +# No settings yet + +[fsotdl.provider_gps_nmea] +# No settings yet + +[fsotdl.provider_gps] +provider_type = nmea + +[fsotdl.sync_time] +# Which sources to use; what is available depends on the loaded modules +sources = ntp;gsm +# Which current timezone file to use; default is /etc/timezone +timezone_file = /etc/timezone +# Path to zoneinfo files, default is /usr/share/zoneinfo +zoneinfo_dir = /usr/share/zoneinfo + diff --git a/recipes/freesmartphone/fsotdld_git.bb b/recipes/freesmartphone/fsotdld_git.bb index a70bf596f5..14659bdeff 100644 --- a/recipes/freesmartphone/fsotdld_git.bb +++ b/recipes/freesmartphone/fsotdld_git.bb @@ -1,6 +1,15 @@ require cornucopia.inc inherit fso-plugin -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" PV = "0.0.0+gitr${SRCREV}" DEPENDS += "libfsotransport libfsoresource" + +SRC_URI += "file://fsotdld.conf" + +do_install_append() { + install -d ${D}${sysconfdir}/freesmartphone/ + install -m 0644 ${WORKDIR}/fsotdld.conf ${D}${sysconfdir}/freesmartphone/ +} + +FILES_${PN} += "${sysconfdir}/freesmartphone/fsotdld.conf" -- cgit v1.2.3 From 2a616172157dcd78ebb783bbaa41d49a6cbbcb36 Mon Sep 17 00:00:00 2001 From: Klaus Kurzmann Date: Sat, 9 Jan 2010 21:54:59 +0100 Subject: fsogsmd: add a config file Signed-off-by: Klaus Kurzmann --- recipes/freesmartphone/fsogsmd/fsogsmd.conf | 57 +++++++++++++++++++++++++++++ recipes/freesmartphone/fsogsmd_git.bb | 11 +++++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 recipes/freesmartphone/fsogsmd/fsogsmd.conf diff --git a/recipes/freesmartphone/fsogsmd/fsogsmd.conf b/recipes/freesmartphone/fsogsmd/fsogsmd.conf new file mode 100644 index 0000000000..0da34cff4d --- /dev/null +++ b/recipes/freesmartphone/fsogsmd/fsogsmd.conf @@ -0,0 +1,57 @@ +####################################################################################### +# FSO GSM Daemon Configuration File -- for SYSTEM INTEGRATORS only +######################################################################################## +[logging] +# Log level: DEBUG, INFO (default), WARNING, ERROR +# Override via environment as FSO_LOG_LEVEL +log_level = INFO +# Where to log to: none (default), stderr, stderr:colors, file, syslog +# Override via environment as FSO_LOG_TO +log_to = file +# Log Destination (valid only for log_to = file) +# Override via environment as FSO_LOG_DESTINATION +log_destination = /var/log/fsogsmd.log + +[fsogsm] +# Combined modem access string, prefered over individual configs below +modem_access = serial:/dev/ttyUSB0:115200 + +# Which modem to use: singleline, ti_calypso, freescale_neptune, cinterion_mc75, qualcomm_msm +modem_type = singleline +# Which transport channel: serial, pty +modem_transport = serial +# Which port to communicate with: or +modem_port = /dev/ttyUSB0 +# Which speed to use for the transport/port +modem_speed = 115200 + +# Global modem init sequence; this is the first sequence that gets sent to the modem after power cycling +modem_init = E0V1;+CMEE=1;+CRC=1;+CSCS="UCS2" + +# Following configuration options are in the form channel__, with state being one of +# "init", "unlocked", "registered", "suspend", "resume", and name being the channel name (modem specific) +# Whether these strings override, append, or are honored at all depends on the actual modem plugin +# Example usage for one channel named 'main': +channel_init_main = +CSNS=0;+CMGF=0;+CLIP=1 +channel_unlocked_main = +SIM_NOW_UNLOCKED;+CSDH=1;+COLP=1;+CCWA=1;+CNMI=2,1,2,2,1 +channel_registered_main = +NET_NOW_REGISTERED +channel_suspend_main = +PREPARE_FOR_SUSPEND +channel_resume_main = +RECOVER_AFTER_RESUME + +# Where to store SMS: (default=/tmp/fsogsmd/sms/) +sms_storage_dir = /tmp/fsogsmd/sms/ + +[fsogsm.modem_singleline] +# No settings yet + +[fsogsm.modem_cinterion_mc75] +# No settings yet + +[fsogsm.modem_ti_calypso] +# No settings yet + +[fsogsm.modem_qualcomm_msm] +# No settings yet + +[fsogsm.dbus_service] +# No settings yet diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb index 9186ab990b..ec46d62ff3 100644 --- a/recipes/freesmartphone/fsogsmd_git.bb +++ b/recipes/freesmartphone/fsogsmd_git.bb @@ -1,6 +1,15 @@ require cornucopia.inc inherit fso-plugin -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" PV = "0.2.0+gitr${SRCREV}" DEPENDS += "libfsoresource libgsm0710mux" + +SRC_URI += "file://fsogsmd.conf" + +do_install_append() { + install -d ${D}${sysconfdir}/freesmartphone/ + install -m 0644 ${WORKDIR}/fsogsmd.conf ${D}${sysconfdir}/freesmartphone/ +} + +FILES_${PN} += "${sysconfdir}/freesmartphone/fsogsmd.conf" -- cgit v1.2.3 From 182b7546b2fd5fa27ecb8c606fe5ad8c95f76ee2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 10 Jan 2010 00:11:58 +0100 Subject: navit: bump svnrev, all unset LC_ALL to Exec in .desktop files (gps coords are wrong with LC_ALL set) Signed-off-by: Martin Jansa --- conf/distro/include/sane-srcrevs.inc | 2 +- recipes/navit/files/navit.desktop | 2 +- recipes/navit/files/shr/navit.desktop | 2 +- recipes/navit/files/shr/navitD.desktop | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 9bcb10b4c1..7f1f7742ce 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -181,7 +181,7 @@ SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b" -SRCREV_pn-navit ?= "2890" +SRCREV_pn-navit ?= "2902" SRCREV_pn-navit-icons ?= "2871" SRCREV_pn-neod ?= "4617" SRCREV_pn-neomis ?= "6" diff --git a/recipes/navit/files/navit.desktop b/recipes/navit/files/navit.desktop index 05ecc1d4ee..df16d492bb 100644 --- a/recipes/navit/files/navit.desktop +++ b/recipes/navit/files/navit.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Navit Comment=GPS Navigation -Exec=navit +Exec=unset LC_ALL && navit Icon=navit Terminal=false Type=Application diff --git a/recipes/navit/files/shr/navit.desktop b/recipes/navit/files/shr/navit.desktop index d313d6a63e..b1c0d1321d 100644 --- a/recipes/navit/files/shr/navit.desktop +++ b/recipes/navit/files/shr/navit.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Navit Comment=GPS Navigation -Exec=fsoraw -r CPU,GPS -- navit +Exec=unset LC_ALL && fsoraw -r CPU,GPS -- navit Icon=navit Terminal=false Type=Application diff --git a/recipes/navit/files/shr/navitD.desktop b/recipes/navit/files/shr/navitD.desktop index 9a2378a3ea..fc77efcda2 100644 --- a/recipes/navit/files/shr/navitD.desktop +++ b/recipes/navit/files/shr/navitD.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=NavitD Comment=GPS Navigation Display blanking disabled -Exec=fsoraw -r CPU,GPS,Display -- navit +Exec=unset LC_ALL && fsoraw -r CPU,GPS,Display -- navit Icon=navitD Terminal=false Type=Application -- cgit v1.2.3 From 7baeaabe52552c1705ebafd72a390cee078ad8aa Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 10 Jan 2010 01:33:39 +0100 Subject: zaurus: first reorganization of XSERVER preferences. * Put all in the common zaurus-2.6.inc. --- conf/machine/akita.conf | 4 ---- conf/machine/c7x0.conf | 2 -- conf/machine/collie.conf | 2 -- conf/machine/include/zaurus-2.6.inc | 19 +++++++++++++++++++ conf/machine/spitz.conf | 4 ---- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 6f71787fa1..9930c89c6a 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -21,7 +21,3 @@ MACHINE_DISPLAY_PPI = "216" UBOOT_MACHINE = "akita_config" UBOOT_ENTRYPOINT = "0xA1000000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" - -# xserver-kdrive 1.3.0.0 is still the only working version: -XSERVER = "xserver-kdrive-1300-fbdev" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 16073fee82..4daedde482 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -15,8 +15,6 @@ require conf/machine/include/zaurus-clamshell.inc # please set the right value in your local.conf ROOT_FLASH_SIZE = "25" -XSERVER = "xserver-kdrive-imageon" - MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "640" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index 47f6e30dfd..66995e9b09 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -9,8 +9,6 @@ ROOT_FLASH_SIZE = "14" # actually 14680064 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" -XSERVER = "xserver-kdrive-fbdev" - MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index cd83a7b5a6..02a48629c8 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -17,9 +17,28 @@ EXTRA_IMAGEDEPENDS += "zaurus-installer" SERIAL_CONSOLE = "115200 ttyS0" SERIAL_CONSOLE_collie = "115200 ttySA0" +# FIXME: xserver-xorg is in testing + +# deprecated defaults PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +# c7x0 uses kdrive-imageon (W100) PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" +XSERVER_c7x0 = "xserver-kdrive-imageon" + +# collie uses kdrive-fbdev PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev" +XSERVER_collie = "xserver-kdrive-fbdev" + +# FIXME xserver-kdrive 1.3.0.0 is still the only working version ? +PREFERRED_PROVIDER_virtual/xserver_akita = "xserver-kdrive-1300" +XSERVER_akita = "xserver-kdrive-1300-fbdev" + +# spitz uses xserver-xorg +PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg" +XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev" +PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri" PCMCIA_MANAGER ?= "pcmciautils" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 0d79977180..4fe62b5f43 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -27,7 +27,3 @@ MACHINE_DISPLAY_PPI = "216" UBOOT_MACHINE = "akita_config" UBOOT_ENTRYPOINT = "0xA1000000" UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" - -XSERVER = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev" -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" -- cgit v1.2.3 From 657fea552c0145701838ae96422741fe5b097fdf Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Wed, 6 Jan 2010 00:42:47 +0100 Subject: linux-on-qualcomm-s-msm: htcraphael: first step sanitizing defconfig for GNU/Linux disable virtual keyboard, enable sysv ipc, enable nfs, enable cifs, enable rtc --- .../linux-on-qualcomm-s-msm/htcraphael/defconfig | 71 ++++++++++++++-------- 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/recipes/linux/linux-on-qualcomm-s-msm/htcraphael/defconfig b/recipes/linux/linux-on-qualcomm-s-msm/htcraphael/defconfig index 97e043e72e..d4f6a118a0 100644 --- a/recipes/linux/linux-on-qualcomm-s-msm/htcraphael/defconfig +++ b/recipes/linux/linux-on-qualcomm-s-msm/htcraphael/defconfig @@ -1,12 +1,12 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.27 -# Sun Sep 6 20:35:49 2009 +# Wed Jan 6 00:18:25 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_GENERIC_GPIO=y -CONFIG_GENERIC_TIME=y +# CONFIG_GENERIC_TIME is not set CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_MMU=y # CONFIG_NO_IOPORT is not set @@ -36,10 +36,11 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y -# CONFIG_SYSVIPC is not set -# CONFIG_POSIX_MQUEUE is not set +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_TASKSTATS is not set # CONFIG_AUDIT is not set @@ -52,15 +53,14 @@ CONFIG_GROUP_SCHED=y # CONFIG_RT_GROUP_SCHED is not set CONFIG_USER_SCHED=y # CONFIG_CGROUP_SCHED is not set -CONFIG_SYSFS_DEPRECATED=y -CONFIG_SYSFS_DEPRECATED_V2=y +# CONFIG_SYSFS_DEPRECATED_V2 is not set # CONFIG_RELAY is not set CONFIG_NAMESPACES=y # CONFIG_UTS_NS is not set +# CONFIG_IPC_NS is not set # CONFIG_USER_NS is not set # CONFIG_PID_NS is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" +# CONFIG_BLK_DEV_INITRD is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_PANIC_TIMEOUT=3 @@ -185,6 +185,8 @@ CONFIG_ARCH_MSM=y CONFIG_MSM_AMSS_VERSION=5200 CONFIG_MSM_AMSS_VERSION_WINCE=y CONFIG_MSM_AMSS_VERSION_5200=y +# CONFIG_MSM_AMSS_VERSION_6120 is not set +# CONFIG_MSM_AMSS_VERSION_6125 is not set # CONFIG_MSM_AMSS_VERSION_6150 is not set # CONFIG_MSM_AMSS_VERSION_6210 is not set # CONFIG_MSM_AMSS_VERSION_6220 is not set @@ -206,6 +208,8 @@ CONFIG_MACH_HTCDIAMOND=y CONFIG_MACH_HTCDIAMOND_CDMA=y # CONFIG_MACH_HTCBLACKSTONE is not set # CONFIG_MACH_HTCKOVSKY is not set +# CONFIG_MACH_HTCTOPAZ is not set +# CONFIG_MACH_HTCRHODIUM is not set # CONFIG_HTC_HEADSET is not set CONFIG_MSM_BATTCHG=y # CONFIG_TROUT_BATTCHG is not set @@ -281,9 +285,7 @@ CONFIG_ARM_THUMB=y # # Kernel Features # -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y +# CONFIG_TICK_ONESHOT is not set CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_PREEMPT=y CONFIG_HZ=100 @@ -313,7 +315,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="mem=76M console=ttyMSM2,115200n8" +CONFIG_CMDLINE=" debug " # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set @@ -688,7 +690,7 @@ CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI=y # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set CONFIG_TOUCHSCREEN_MSM=y -CONFIG_MSM_VIRTUAL_KEYBOARD=y +# CONFIG_MSM_VIRTUAL_KEYBOARD is not set # CONFIG_MSM_BLACKSTONE_PAD is not set CONFIG_INPUT_MISC=y # CONFIG_INPUT_ATI_REMOTE is not set @@ -890,11 +892,7 @@ CONFIG_FONT_8x8=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -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_DIAMRAPH_CLUT224=y +# CONFIG_LOGO is not set # CONFIG_SOUND is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y @@ -928,6 +926,11 @@ CONFIG_USB_FUNCTION_ADB=y CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USB_FUNCTION_DIAG=y CONFIG_USB_FUNCTION_ETHER=y +CONFIG_USB_FUNCTION_RNDIS=y +# CONFIG_USB_FUNCTION_FSYNC is not set +# CONFIG_USB_FUNCTION_SERIAL is not set +# CONFIG_USB_FUNCTION_PROJECTOR is not set +# CONFIG_USB_FUNCTION_MTP_TUNNEL is not set # # OTG and related infrastructure @@ -982,9 +985,10 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # # RTC interfaces # -# CONFIG_RTC_INTF_SYSFS is not set +CONFIG_RTC_INTF_SYSFS=y # CONFIG_RTC_INTF_PROC is not set -# CONFIG_RTC_INTF_DEV is not set +CONFIG_RTC_INTF_DEV=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y CONFIG_RTC_INTF_ALARM=y # CONFIG_RTC_DRV_TEST is not set @@ -1103,6 +1107,7 @@ CONFIG_TMPFS=y # CONFIG_YAFFS_FS is not set # CONFIG_JFFS2_FS is not set CONFIG_CRAMFS=y +# CONFIG_SQUASHFS is not set # CONFIG_VXFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_OMFS_FS is not set @@ -1112,10 +1117,26 @@ CONFIG_CRAMFS=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -# CONFIG_NFS_FS is not set +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set # CONFIG_NFSD is not set +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set +CONFIG_CIFS=y +CONFIG_CIFS_STATS=y +# CONFIG_CIFS_STATS2 is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +CONFIG_CIFS_XATTR=y +# CONFIG_CIFS_POSIX is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -1164,7 +1185,7 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_15 is not set # CONFIG_NLS_KOI8_R is not set # CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_UTF8 is not set +CONFIG_NLS_UTF8=y # CONFIG_DLM is not set # @@ -1216,8 +1237,6 @@ CONFIG_FRAME_POINTER=y CONFIG_HAVE_FTRACE=y CONFIG_HAVE_DYNAMIC_FTRACE=y # CONFIG_FTRACE is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set # CONFIG_SCHED_TRACER is not set # CONFIG_CONTEXT_SWITCH_TRACER is not set # CONFIG_SAMPLES is not set -- cgit v1.2.3 From 2610f65bd7d2902302be6650b9536aa43cc58656 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Sun, 10 Jan 2010 12:12:19 +0100 Subject: sysstat: refactor into .inc file, add 9.0.6 --- conf/checksums.ini | 4 ++++ recipes/sysstat/sysstat.inc | 22 ++++++++++++++++++++++ recipes/sysstat/sysstat_8.1.5.bb | 16 ++-------------- recipes/sysstat/sysstat_8.1.6.bb | 24 ++---------------------- recipes/sysstat/sysstat_9.0.6.bb | 2 ++ 5 files changed, 32 insertions(+), 36 deletions(-) create mode 100644 recipes/sysstat/sysstat.inc create mode 100644 recipes/sysstat/sysstat_9.0.6.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 1f4fdc1b9a..90f402c387 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -25838,6 +25838,10 @@ sha256=26c05ef7666881eb1d60291a4293e67d75dbf048ca8a30f6b9eb3dc86ad1b6b0 md5=d7b8f27b83ff080ff824177d65a7dae0 sha256=0a63da1c99b6a9b6a93b6fd0a9391c7d8216f658d2bea0ba81999e261c6b6649 +[http://pagesperso-orange.fr/sebastien.godard/sysstat-9.0.6.tar.gz] +md5=c05ca01878a4069199d9af93cbe39c8e +sha256=464a4e23ab3b7d6886a5b8aa108e05b1a7f42654e1c398a040c88c81f30168c9 + [http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-1.1.7.tar.bz2] md5=a77bde5adc5ee8822b0764ff786ccc09 sha256=fdd50cb114151c66b8180c0ce90ba0e99f77a69770ac21598a87be935eec2224 diff --git a/recipes/sysstat/sysstat.inc b/recipes/sysstat/sysstat.inc new file mode 100644 index 0000000000..dcc6c85456 --- /dev/null +++ b/recipes/sysstat/sysstat.inc @@ -0,0 +1,22 @@ +DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." +HOMEPAGE = "http://pagesperso-orange.fr/sebastien.godard/" +LICENSE = "GPL" +SECTION = "console/utils" +INC_PR = "r2" + +DEPENDS = "virtual/libintl" + +SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz" + +inherit autotools + +do_configure_prepend() { + sed -i s,'-g $(MAN_GROUP)','', Makefile.in +} + +FILES_${PN} += "${libdir}/sa" + +TARGET_CC_ARCH += "${LDFLAGS}" +LDFLAGS_append_linux-uclibc = " -lintl" +LDFLAGS_append_linux-uclibceabi = " -lintl" +LDFLAGS_append_linux-uclibcspe = " -lintl" diff --git a/recipes/sysstat/sysstat_8.1.5.bb b/recipes/sysstat/sysstat_8.1.5.bb index 0f394ed259..1aed038a54 100644 --- a/recipes/sysstat/sysstat_8.1.5.bb +++ b/recipes/sysstat/sysstat_8.1.5.bb @@ -1,15 +1,3 @@ -DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." -HOMEPAGE = "http://pagesperso-orange.fr/sebastien.godard/" -LICENSE = "GPL" -SECTION = "console/utils" - -SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz" - -inherit autotools - -do_configure_prepend() { - sed -i s,'-g $(MAN_GROUP)','', Makefile.in -} - -FILES_${PN} += "${libdir}/sa" +require sysstat.inc +PR = "${INC_PR}.0" diff --git a/recipes/sysstat/sysstat_8.1.6.bb b/recipes/sysstat/sysstat_8.1.6.bb index 42dd5e2d75..8dce9efedd 100644 --- a/recipes/sysstat/sysstat_8.1.6.bb +++ b/recipes/sysstat/sysstat_8.1.6.bb @@ -1,22 +1,2 @@ -DESCRIPTION = "The sysstat utilities are a collection of performance monitoring tools for Linux." -HOMEPAGE = "http://pagesperso-orange.fr/sebastien.godard/" -LICENSE = "GPL" -SECTION = "console/utils" -PR = "r1" - -DEPENDS = "virtual/libintl" - -SRC_URI = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${PV}.tar.gz" - -inherit autotools - -do_configure_prepend() { - sed -i s,'-g $(MAN_GROUP)','', Makefile.in -} - -FILES_${PN} += "${libdir}/sa" - -TARGET_CC_ARCH += "${LDFLAGS}" -LDFLAGS_append_linux-uclibc = " -lintl" -LDFLAGS_append_linux-uclibceabi = " -lintl" -LDFLAGS_append_linux-uclibcspe = " -lintl" +require sysstat.inc +PR = "${INC_PR}.0" diff --git a/recipes/sysstat/sysstat_9.0.6.bb b/recipes/sysstat/sysstat_9.0.6.bb new file mode 100644 index 0000000000..8dce9efedd --- /dev/null +++ b/recipes/sysstat/sysstat_9.0.6.bb @@ -0,0 +1,2 @@ +require sysstat.inc +PR = "${INC_PR}.0" -- cgit v1.2.3 From b086d737776d214699843bd6bf4ed6612bd8ecca Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 9 Jan 2010 10:46:50 +0100 Subject: ffmpeg: bump SRCREV --- recipes/ffmpeg/ffmpeg_svn.bb | 2 +- recipes/gstreamer/gst-ffmpeg_0.10.8.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index 5cb365678b..2fc16e37d6 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -2,7 +2,7 @@ require ffmpeg.inc DEPENDS += "schroedinger libgsm" -SRCREV = "20701" +SRCREV = "21107" PE = "1" PV = "0.5.0+${PR}+svnr${SRCPV}" diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.8.bb b/recipes/gstreamer/gst-ffmpeg_0.10.8.bb index e05d0b0461..f08b60b197 100644 --- a/recipes/gstreamer/gst-ffmpeg_0.10.8.bb +++ b/recipes/gstreamer/gst-ffmpeg_0.10.8.bb @@ -11,7 +11,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \ file://lower-rank.diff;patch=1 \ " -PR = "r1" +PR = "r2" FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" -- cgit v1.2.3 From 8274bc3cdd5c071057d36f85980174215e127d2e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 9 Jan 2010 10:46:56 +0100 Subject: mplayer: bump SRCREV --- recipes/mplayer/mplayer_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index 2d5adc1792..6d6f78fc94 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -13,7 +13,7 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \ file://mplayer-lavc-arm.patch;patch=1 \ " -SRCREV = "30165" +SRCREV = "30247" SRC_URI_append_armv7a = " \ file://omapfb.patch;patch=1 \ file://vo_omapfb.c \ -- cgit v1.2.3 From 31113502d63b822a853eef33e2629c78fba76cb2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 10 Jan 2010 12:21:33 +0100 Subject: navit: fix build with qt4 in staging, only enable floats when you have an fpu --- recipes/navit/navit-fpu.inc | 6 ++++++ recipes/navit/navit.inc | 15 +++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 recipes/navit/navit-fpu.inc diff --git a/recipes/navit/navit-fpu.inc b/recipes/navit/navit-fpu.inc new file mode 100644 index 0000000000..d333b92001 --- /dev/null +++ b/recipes/navit/navit-fpu.inc @@ -0,0 +1,6 @@ + +def get_navit_fpu_setting(bb, d): + if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: + return "--enable-avoid-float" + return "" + diff --git a/recipes/navit/navit.inc b/recipes/navit/navit.inc index 0b0c36470d..ad29f347ed 100644 --- a/recipes/navit/navit.inc +++ b/recipes/navit/navit.inc @@ -5,11 +5,22 @@ DEPENDS = "glib-2.0 gtk+" RRECOMMENDS = "gpsd speechd flite" PE = "1" -INC_PR = "r4" +INC_PR = "r5" inherit autotools -EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned" +EXTRA_OECONF = " \ + --disable-binding-python \ + --disable-gui-sdl \ + --disable-samplemap \ + --enable-avoid-unaligned \ + --disable-graphics-qt-qpainter \ +" + +# --enable-avoid-float \ +#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points +require navit-fpu.inc +EXTRA_OECONF += "${@get_navit_fpu_setting(bb, d)}" PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" -- cgit v1.2.3 From 371ee0f79ef1ee4d5ba01035ff1e99c0ba59ae7f Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 12:58:29 +0000 Subject: alsa-lib: Bump PR, r1.5 appeared somehow in angstrom unstable feed and moves current r0.5 to morgue. --- recipes/alsa/alsa-lib_1.0.20.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/alsa/alsa-lib_1.0.20.bb b/recipes/alsa/alsa-lib_1.0.20.bb index eff114de4b..b21a890fd9 100644 --- a/recipes/alsa/alsa-lib_1.0.20.bb +++ b/recipes/alsa/alsa-lib_1.0.20.bb @@ -2,6 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "LGPL" +PR = "r2" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, -- cgit v1.2.3 From f3aefd497f216d9fe0240625305f7a9a28da16c7 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 13:00:18 +0000 Subject: xextproto-70-includes: New old package, that provides headers required to compile ancient X servers (e. g. kdrive). --- recipes/xorg-proto/xextproto-70-includes_7.0.5.bb | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 recipes/xorg-proto/xextproto-70-includes_7.0.5.bb diff --git a/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb b/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb new file mode 100644 index 0000000000..db9cec6c09 --- /dev/null +++ b/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb @@ -0,0 +1,26 @@ +# Build of xserver-kdrive is not possible with xextproto >= 7.1. +# This package allows to install old 7.0 includes in parallel. +# akita and spitz needs them: +FILESPATH = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xextproto-7.0:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xextproto:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files" +PR_append = ".0" + +require xextproto_7.0.5.bb + +XORG_PN = "xextproto" +EXTRA_OECONF += "--includedir=${includedir}/xextproto-70" + +#export INHIBIT_AUTO_STAGE = "1" +#SYSROOT_PREPROCESS_FUNCS = "${@bb.data.getVar('SYSROOT_PREPROCESS_FUNCS',d,1).replace('pkgconfig_sysroot_preprocess', '')}" + +do_install_append() { + rm -r ${D}${libdir} +} +## xorg-proto-common.inc would stage all. We need to overwrite it. +do_stage() { +# export INHIBIT_AUTO_STAGE=1 + autotools_stage_includes +# rm -r ${STAGE_TEMP_PREFIX}${libdir} +} +# No, we really do not want to install .pc file and overwrite newer one: +pkgconfig_sysroot_preprocess() { +} -- cgit v1.2.3 From faf1793d478bc800a5ef994e98962c4dd8717d40 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 13:02:36 +0000 Subject: xserver-kdrive: Build against xextproto-70-includes: * Ancient xservers are incompatible with xextproto >= 7.1. * Nobody would want to port working ancient code. * For more see http://lists.linuxtogo.org/pipermail/angstrom-distro-users/2010-January/003011.html * Introduced INC_PR. --- recipes/xorg-xserver/xserver-kdrive-common.inc | 5 ++++- recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_1.4.2.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_1.4.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_1.5.3.bb | 2 +- recipes/xorg-xserver/xserver-kdrive_git.bb | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/recipes/xorg-xserver/xserver-kdrive-common.inc b/recipes/xorg-xserver/xserver-kdrive-common.inc index b00893da6d..fd4b2f6045 100644 --- a/recipes/xorg-xserver/xserver-kdrive-common.inc +++ b/recipes/xorg-xserver/xserver-kdrive-common.inc @@ -1,6 +1,7 @@ LICENSE = "MIT" DEPENDS = "compositeproto damageproto fixesproto recordproto resourceproto scrnsaverproto xineramaproto videoproto xextproto xproto \ - libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans" + libxau libxext libxdmcp libxfont libxrandr tslib virtual/libx11 xtrans xextproto-70-includes" +INC_PR = "r28" PKGN ?= "xserver-kdrive" @@ -94,6 +95,8 @@ inherit autotools pkgconfig ARM_INSTRUCTION_SET = "arm" +CFLAGS_prepend = "-I${STAGING_INCDIR}/xextproto-70 " + EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-dga --disable-dri --disable-xinerama \ --disable-xf86misc --disable-xf86vidmode \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 1b052e7926..34b5c0d05e 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r27" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb index b6322769ab..25715a82a8 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS += "hal" PE = "1" -PR = "r8" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb index e6e791ad4f..d0b7ac17e0 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS += "hal" PE = "1" -PR = "r3" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb index 161390179d..187de43996 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.99.901.bb @@ -6,7 +6,7 @@ RDEPENDS += "hal" DEFAULT_PREFERENCE = "-99" PE = "1" -PR = "r4" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.bb index e792c84ce0..43a07f9a3f 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS += "hal" PE = "1" -PR = "r6" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb index 686826eca3..ab7c594c87 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.5.3.bb @@ -6,7 +6,7 @@ RDEPENDS += "hal" DEFAULT_PREFERENCE = "-99" PE = "1" -PR = "r1" +PR = "${INC_PR}.0" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/recipes/xorg-xserver/xserver-kdrive_git.bb b/recipes/xorg-xserver/xserver-kdrive_git.bb index 2e1da5c977..4de73e8fc1 100644 --- a/recipes/xorg-xserver/xserver-kdrive_git.bb +++ b/recipes/xorg-xserver/xserver-kdrive_git.bb @@ -6,7 +6,7 @@ PV = "1.4+git${SRCDATE}" DEPENDS += "libxkbfile libxcalibrate pixman" PE = "1" -PR = "r1" +PR = "${INC_PR}.0" FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-git:${FILE_DIRNAME}/xserver-kdrive" SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ -- cgit v1.2.3 From 85908133b0e18f0a0f9bad762590fbe8407149e6 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 14:15:37 +0000 Subject: xextproto-70-includes: Fixed comments. --- recipes/xorg-proto/xextproto-70-includes_7.0.5.bb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb b/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb index db9cec6c09..0a0f9808ef 100644 --- a/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb +++ b/recipes/xorg-proto/xextproto-70-includes_7.0.5.bb @@ -1,6 +1,5 @@ # Build of xserver-kdrive is not possible with xextproto >= 7.1. # This package allows to install old 7.0 includes in parallel. -# akita and spitz needs them: FILESPATH = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xextproto-7.0:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xextproto:${@os.path.dirname(bb.data.getVar('FILE',d,1))}/files" PR_append = ".0" @@ -9,17 +8,12 @@ require xextproto_7.0.5.bb XORG_PN = "xextproto" EXTRA_OECONF += "--includedir=${includedir}/xextproto-70" -#export INHIBIT_AUTO_STAGE = "1" -#SYSROOT_PREPROCESS_FUNCS = "${@bb.data.getVar('SYSROOT_PREPROCESS_FUNCS',d,1).replace('pkgconfig_sysroot_preprocess', '')}" - do_install_append() { rm -r ${D}${libdir} } -## xorg-proto-common.inc would stage all. We need to overwrite it. +# xorg-proto-common.inc would stage all. We need to overwrite it. do_stage() { -# export INHIBIT_AUTO_STAGE=1 autotools_stage_includes -# rm -r ${STAGE_TEMP_PREFIX}${libdir} } # No, we really do not want to install .pc file and overwrite newer one: pkgconfig_sysroot_preprocess() { -- cgit v1.2.3 From 474c06d9c5462de3329e63fd98f37fc14e8439d2 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 10 Jan 2010 14:16:39 +0000 Subject: balsa: Update to version 2.4.2. --- recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch | 27 ------- recipes/balsa/balsa_2.4.1.bb | 86 ---------------------- recipes/balsa/balsa_2.4.2.bb | 92 ++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 113 deletions(-) delete mode 100644 recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch delete mode 100644 recipes/balsa/balsa_2.4.1.bb create mode 100644 recipes/balsa/balsa_2.4.2.bb diff --git a/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch b/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch deleted file mode 100644 index 7e16171ecc..0000000000 --- a/recipes/balsa/balsa-2.4.1/gnome-icon-theme.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=596309 -Index: balsa-2.4.1/src/balsa-app.c -=================================================================== ---- balsa-2.4.1.orig/src/balsa-app.c -+++ balsa-2.4.1/src/balsa-app.c -@@ -436,6 +436,9 @@ balsa_app_init(void) - /* Message filing */ - balsa_app.folder_mru=NULL; - balsa_app.fcc_mru=NULL; -+ -+ g_object_set (gtk_settings_get_default (), -+ "gtk-fallback-icon-theme", "gnome", NULL); - } - - void -Index: balsa-2.4.1/configure.in -=================================================================== ---- balsa-2.4.1.orig/configure.in -+++ balsa-2.4.1/configure.in -@@ -329,6 +329,7 @@ glib-2.0 >= 2.16.0 - gtk+-2.0 >= 2.14.0 - gmime-2.4 - gio-2.0 -+gnome-icon-theme - $gnome_extras - ]) - diff --git a/recipes/balsa/balsa_2.4.1.bb b/recipes/balsa/balsa_2.4.1.bb deleted file mode 100644 index 59b0b10ac0..0000000000 --- a/recipes/balsa/balsa_2.4.1.bb +++ /dev/null @@ -1,86 +0,0 @@ -DESCRIPTION = "Robust and configurable e-mail client for GNOME" -HOMEPAGE = "http://pawsa.fedorapeople.org/balsa/" -SECTION = "x11/network" -LICENSE = "GPL" -SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2 \ - file://gnome-icon-theme.patch;patch=1" -PR = "r1" - -DEPENDS = "glib-2.0 libgmime-2.4 gnome-icon-theme gtk+ intltool-native libesmtp libxml-parser-perl-native" -RDEPENDS_${PN} = "gnome-icon-theme" -# FIXME: It is possible to build several variants of balsa: lite (SSL, gqlite/GPE, maybe HTML), -# standard (GNOME, spell checking, HTML), full (Kerberos, LDAP, PGP, Rubrica, X-Face) - -# Options for regular expressions are: NONE (POSIX) glib-2.0 (GRegex) libpcre (PCRE) -DEPENDS += "" - -# Options for remote activation are: libbonobo libunique -DEPENDS += "libunique" - -# Options for HTML view are: gtkhtml-2.0 gtkhtml-3.0 webkit-gtk NONE -DEPENDS += "webkit-gtk" - -# Optional dependencies (missing in OE): Spell checking -#DEPENDS += "gtkspell" - -# Optional dependencies: SSL support: -DEPENDS += "openssl" - -# Optional dependencies: GPE addressbook: -DEPENDS += "sqlite" - -# Optional dependencies: GNOME: -DEPENDS += "gconf libgnome libgnomeui" -#DEPENDS += "gnome-keyring" - -# Optional dependencies: PGP support: -#DEPENDS += "gpgme" - -# Optional dependencies: view source: -#DEPENDS += "gtksourceview2" - -# Optional dependencies: LDAP: -#DEPENDS += "openldap" - -# Options for optional Kerberos 5: heimdal (not in OE) krb5 -#DEPENDS += "krb5" - -# Optional dependencies: Rubrica addressbook: -#DEPENDS += "libxml2" - -# Optional dependencies (not yet in OE): X-Face support: -#DEPENDS += "compface" - -# Optional dependencies: sound support: -#DEPENDS += "libcanberra" - -# FIXME: doc build requires docbook4 and gnome-doc-utils - -inherit autotools - -EXTRA_OECONF="--with-ssl \ - --without-gnome \ - --disable-scrollkeeper \ - --enable-smime \ - --with-sqlite \ - --with-ssl \ - --with-webkit \ - --with-unique \ - --without-gtkspell \ -" -# Broken (does not compile, crashes after symbol fix): -# --enable-touch-ui \ -# Not enabled: -# --with-gtkspell \ -# --with-gpgme \ -# --with-gtksourceview \ -# --with-rubrica \ -# --with-gss \ -# --with-ldap \ -# --with-compface \ -# --with-canberra \ - -do_configure_prepend() { - # aclocal seems to insist on looking in here. Make sure it exists. - mkdir -p ${S}/m4 -} diff --git a/recipes/balsa/balsa_2.4.2.bb b/recipes/balsa/balsa_2.4.2.bb new file mode 100644 index 0000000000..e0675c82ba --- /dev/null +++ b/recipes/balsa/balsa_2.4.2.bb @@ -0,0 +1,92 @@ +DESCRIPTION = "Robust and configurable e-mail client for GNOME" +HOMEPAGE = "http://pawsa.fedorapeople.org/balsa/" +SECTION = "x11/network" +LICENSE = "GPL" +SRC_URI = "http://pawsa.fedorapeople.org/balsa/${P}.tar.bz2" +PR = "r0" + +DEPENDS = "glib-2.0 gmime gnome-icon-theme gtk+ intltool-native libesmtp libxml-parser-perl-native" +RDEPENDS_${PN} = "gnome-icon-theme" +# FIXME: It is possible to build several variants of balsa: lite (SSL, gqlite/GPE, maybe HTML), +# standard (GNOME, spell checking, HTML), full (Kerberos, LDAP, PGP, Rubrica, X-Face) + +# Options for regular expressions are: NONE (POSIX) glib-2.0 (GRegex) libpcre (PCRE) +DEPENDS += "" + +# Options for remote activation are: libbonobo libunique +DEPENDS += "libunique" + +# Options for HTML view are: gtkhtml-2.0 gtkhtml-3.0 webkit-gtk NONE +DEPENDS += "webkit-gtk" + +# Optional dependencies (missing in OE): Spell checking +#DEPENDS += "gtkspell" + +# Optional dependencies: desktop notification: +DEPENDS += "libnotify" + +# Optional dependencies: SSL support: +DEPENDS += "openssl" + +# Optional dependencies: GPE addressbook: +DEPENDS += "sqlite" + +# Optional dependencies: GNOME: +DEPENDS += "gconf libgnome libgnomeui" +#DEPENDS += "gnome-keyring" + +# Optional dependencies: PGP support: +#DEPENDS += "gpgme" + +# Optional dependencies: view source: +#DEPENDS += "gtksourceview2" + +# Optional dependencies: LDAP: +#DEPENDS += "openldap" + +# Options for optional Kerberos 5: heimdal (not in OE) krb5 +#DEPENDS += "krb5" + +# Optional dependencies: automatic online/offline with NetworkManager: +#DEPENDS += "networkmanager" + +# Optional dependencies: Rubrica addressbook: +#DEPENDS += "libxml2" + +# Optional dependencies (not yet in OE): X-Face support: +#DEPENDS += "compface" + +# Optional dependencies: sound support: +#DEPENDS += "libcanberra" + +# FIXME: doc build requires docbook4 and gnome-doc-utils + +inherit autotools + +EXTRA_OECONF="--with-ssl \ + --without-gnome \ + --disable-scrollkeeper \ + --enable-smime \ + --with-sqlite \ + --with-ssl \ + --with-webkit \ + --with-unique \ + --without-gtkspell \ + --without-nm \ +" +# Broken (does not compile, crashes after symbol fix): +# --enable-touch-ui \ +# Not enabled: +# --with-gtkspell \ +# --with-gpgme \ +# --with-gtksourceview \ +# --with-rubrica \ +# --with-gss \ +# --with-ldap \ +# --with-compface \ +# --with-canberra \ + +do_configure_prepend() { + # aclocal seems to insist on looking in here. Make sure it exists. + mkdir -p ${S}/m4 +} -- cgit v1.2.3 From c9157c4a6a756c3550dcd2a544155640dc4e4b85 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 10 Jan 2010 15:26:58 +0100 Subject: linux-kexecboot_2.6.32+2.6.33-rc3: update defconfigs for akita/spitz --- .../akita/defconfig | 1307 ++++++++++++++++++++ .../spitz/defconfig | 76 +- 2 files changed, 1344 insertions(+), 39 deletions(-) create mode 100644 recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/akita/defconfig diff --git a/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/akita/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/akita/defconfig new file mode 100644 index 0000000000..35b2e2723c --- /dev/null +++ b/recipes/kexecboot/linux-kexecboot-2.6.32+2.6.33-rc3/akita/defconfig @@ -0,0 +1,1307 @@ +# +# Automatically generated make config: don't edit +# Linux kernel version: 2.6.33-rc3 +# Sun Jan 10 14:55:55 2010 +# +CONFIG_ARM=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_GENERIC_GPIO=y +CONFIG_GENERIC_TIME=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y +CONFIG_ARCH_HAS_CPUFREQ=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MTD_XIP=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_CONSTRUCTORS=y + +# +# General setup +# +CONFIG_EXPERIMENTAL=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_LOCALVERSION="" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_TINY_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_IKCONFIG is not set +CONFIG_LOG_BUF_SHIFT=14 +# CONFIG_GROUP_SCHED is not set +# CONFIG_CGROUPS is not set +# CONFIG_SYSFS_DEPRECATED_V2 is not set +# CONFIG_RELAY is not set +# CONFIG_NAMESPACES is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma" +CONFIG_INITRAMFS_ROOT_UID=0 +CONFIG_INITRAMFS_ROOT_GID=0 +CONFIG_RD_GZIP=y +# CONFIG_RD_BZIP2 is not set +CONFIG_RD_LZMA=y +# CONFIG_INITRAMFS_COMPRESSION_NONE is not set +# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set +# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set +CONFIG_INITRAMFS_COMPRESSION_LZMA=y +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +CONFIG_SYSCTL=y +CONFIG_ANON_INODES=y +CONFIG_EMBEDDED=y +# CONFIG_UID16 is not set +# CONFIG_SYSCTL_SYSCALL is not set +# CONFIG_KALLSYMS is not set +CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y +# CONFIG_ELF_CORE is not set +# CONFIG_BASE_FULL is not set +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y + +# +# Kernel Performance Events And Counters +# +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_COMPAT_BRK is not set +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLOB is not set +# CONFIG_PROFILING is not set +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_HAVE_CLK=y + +# +# GCOV-based kernel profiling +# +# CONFIG_SLOW_WORK is not set +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=1 +# CONFIG_MODULES is not set +CONFIG_BLOCK=y +# CONFIG_LBDAF is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_BLK_DEV_INTEGRITY is not set + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_CFQ is not set +CONFIG_DEFAULT_DEADLINE=y +# CONFIG_DEFAULT_CFQ is not set +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="deadline" +# CONFIG_INLINE_SPIN_TRYLOCK is not set +# CONFIG_INLINE_SPIN_TRYLOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK is not set +# CONFIG_INLINE_SPIN_LOCK_BH is not set +# CONFIG_INLINE_SPIN_LOCK_IRQ is not set +# CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set +CONFIG_INLINE_SPIN_UNLOCK=y +# CONFIG_INLINE_SPIN_UNLOCK_BH is not set +CONFIG_INLINE_SPIN_UNLOCK_IRQ=y +# CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_READ_TRYLOCK is not set +# CONFIG_INLINE_READ_LOCK is not set +# CONFIG_INLINE_READ_LOCK_BH is not set +# CONFIG_INLINE_READ_LOCK_IRQ is not set +# CONFIG_INLINE_READ_LOCK_IRQSAVE is not set +CONFIG_INLINE_READ_UNLOCK=y +# CONFIG_INLINE_READ_UNLOCK_BH is not set +CONFIG_INLINE_READ_UNLOCK_IRQ=y +# CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set +# CONFIG_INLINE_WRITE_TRYLOCK is not set +# CONFIG_INLINE_WRITE_LOCK is not set +# CONFIG_INLINE_WRITE_LOCK_BH is not set +# CONFIG_INLINE_WRITE_LOCK_IRQ is not set +# CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set +CONFIG_INLINE_WRITE_UNLOCK=y +# CONFIG_INLINE_WRITE_UNLOCK_BH is not set +CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set +# CONFIG_MUTEX_SPIN_ON_OWNER is not set +CONFIG_FREEZER=y + +# +# System Type +# +CONFIG_MMU=y +# 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_CLPS711X is not set +# CONFIG_ARCH_GEMINI is not set +# CONFIG_ARCH_EBSA110 is not set +# CONFIG_ARCH_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_MXC is not set +# CONFIG_ARCH_STMP3XXX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_NOMADIK is not set +# CONFIG_ARCH_IOP13XX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IXP23XX is not set +# CONFIG_ARCH_IXP2000 is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_DOVE is not set +# CONFIG_ARCH_KIRKWOOD is not set +# CONFIG_ARCH_LOKI is not set +# CONFIG_ARCH_MV78XX0 is not set +# CONFIG_ARCH_ORION5X is not set +# CONFIG_ARCH_MMP is not set +# CONFIG_ARCH_KS8695 is not set +# CONFIG_ARCH_NS9XXX is not set +# CONFIG_ARCH_W90X900 is not set +# CONFIG_ARCH_PNX4008 is not set +CONFIG_ARCH_PXA=y +# CONFIG_ARCH_MSM is not set +# CONFIG_ARCH_RPC is not set +# CONFIG_ARCH_SA1100 is not set +# CONFIG_ARCH_S3C2410 is not set +# CONFIG_ARCH_S3C64XX is not set +# CONFIG_ARCH_S5PC1XX is not set +# CONFIG_ARCH_SHARK is not set +# CONFIG_ARCH_LH7A40X is not set +# CONFIG_ARCH_U300 is not set +# CONFIG_ARCH_DAVINCI is not set +# CONFIG_ARCH_OMAP is not set +# CONFIG_ARCH_BCMRING is not set +# CONFIG_ARCH_U8500 is not set + +# +# Intel PXA2xx/PXA3xx Implementations +# + +# +# Intel/Marvell Dev Platforms (sorted by hardware release time) +# +# CONFIG_ARCH_LUBBOCK is not set +# CONFIG_MACH_MAINSTONE is not set +# CONFIG_MACH_ZYLONITE300 is not set +# CONFIG_MACH_ZYLONITE320 is not set +# CONFIG_MACH_LITTLETON is not set +# CONFIG_MACH_TAVOREVB is not set +# CONFIG_MACH_SAAR is not set + +# +# Third Party Dev Platforms (sorted by vendor name) +# +# CONFIG_ARCH_PXA_IDP is not set +# CONFIG_ARCH_VIPER is not set +# CONFIG_MACH_ARCOM_ZEUS is not set +# CONFIG_MACH_BALLOON3 is not set +# CONFIG_MACH_CSB726 is not set +# CONFIG_MACH_ARMCORE is not set +# CONFIG_MACH_EM_X270 is not set +# CONFIG_MACH_EXEDA is not set +# CONFIG_MACH_CM_X300 is not set +# CONFIG_ARCH_GUMSTIX is not set +# CONFIG_MACH_INTELMOTE2 is not set +# CONFIG_MACH_STARGATE2 is not set +# CONFIG_MACH_XCEP is not set +# CONFIG_TRIZEPS_PXA is not set +# CONFIG_MACH_LOGICPD_PXA270 is not set +# CONFIG_MACH_PCM027 is not set +# CONFIG_MACH_COLIBRI is not set +# CONFIG_MACH_COLIBRI300 is not set +# CONFIG_MACH_COLIBRI320 is not set + +# +# End-user Products (sorted by vendor name) +# +# CONFIG_MACH_H4700 is not set +# CONFIG_MACH_H5000 is not set +# CONFIG_MACH_HIMALAYA is not set +# CONFIG_MACH_MAGICIAN is not set +# CONFIG_MACH_MIOA701 is not set +# CONFIG_PXA_EZX is not set +# CONFIG_MACH_MP900C is not set +# CONFIG_ARCH_PXA_PALM is not set +CONFIG_PXA_SHARPSL=y +CONFIG_SHARPSL_PM=y +# CONFIG_MACH_POODLE is not set +# CONFIG_MACH_CORGI is not set +# CONFIG_MACH_SHEPHERD is not set +# CONFIG_MACH_HUSKY is not set +CONFIG_MACH_AKITA=y +CONFIG_MACH_SPITZ=y +CONFIG_MACH_BORZOI=y +# CONFIG_MACH_TOSA is not set +# CONFIG_ARCH_PXA_ESERIES is not set +CONFIG_PXA27x=y +CONFIG_PXA_SHARP_Cxx00=y +CONFIG_PXA_SSP=y +CONFIG_PLAT_PXA=y + +# +# Processor Type +# +CONFIG_CPU_XSCALE=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV5T=y +CONFIG_CPU_PABRT_LEGACY=y +CONFIG_CPU_CACHE_VIVT=y +CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y + +# +# Processor Features +# +CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_ARM_L1_CACHE_SHIFT=5 +# CONFIG_IWMMXT is not set +CONFIG_XSCALE_PMU=y +CONFIG_SHARP_PARAM=y +CONFIG_SHARP_SCOOP=y +CONFIG_COMMON_CLKDEV=y + +# +# Bus support +# +# CONFIG_PCI_SYSCALL is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set +CONFIG_PCCARD=y +CONFIG_PCMCIA=y +# CONFIG_PCMCIA_LOAD_CIS is not set +# CONFIG_PCMCIA_IOCTL is not set + +# +# PC-card bridges +# +CONFIG_PCMCIA_SOC_COMMON=y +CONFIG_PCMCIA_PXA2XX=y +# CONFIG_PCMCIA_DEBUG is not set + +# +# Kernel Features +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +# CONFIG_HIGH_RES_TIMERS is not set +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_2G is not set +# CONFIG_VMSPLIT_1G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_HZ=100 +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set +# CONFIG_HIGHMEM is not set +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=999999 +# CONFIG_PHYS_ADDR_T_64BIT is not set +CONFIG_ZONE_DMA_FLAG=0 +CONFIG_VIRT_TO_BUS=y +# CONFIG_KSM is not set +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ALIGNMENT_TRAP=y +# CONFIG_UACCESS_WITH_MEMCPY is not set + +# +# Boot options +# +CONFIG_ZBOOT_ROM_TEXT=0 +CONFIG_ZBOOT_ROM_BSS=0 +CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 loglevel=3 " +# CONFIG_XIP_KERNEL is not set +CONFIG_KEXEC=y +CONFIG_ATAGS_PROC=y + +# +# CPU Power Management +# +# CONFIG_CPU_FREQ is not set +# CONFIG_CPU_IDLE is not set + +# +# Floating point emulation +# + +# +# At least one emulation must be selected +# + +# +# Userspace binary formats +# +CONFIG_BINFMT_ELF=y +CONFIG_HAVE_AOUT=y +# CONFIG_BINFMT_AOUT is not set +# CONFIG_BINFMT_MISC is not set + +# +# Power management options +# +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_SLEEP=y +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_APM_EMULATION=y +# CONFIG_PM_RUNTIME is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_NET is not set + +# +# Device Drivers +# + +# +# Generic Driver Options +# +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y +CONFIG_FW_LOADER=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_SYS_HYPERVISOR is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_AR7_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +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 +# CONFIG_MTD_OOPS is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +CONFIG_MTD_ROM=y +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +# CONFIG_MTD_GPIO_ADDR is not set +# 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_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_ECC_SMC is not set +# CONFIG_MTD_NAND_MUSEUM_IDS is not set +# CONFIG_MTD_NAND_H1900 is not set +# CONFIG_MTD_NAND_GPIO is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_NAND_SHARPSL=y +# CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_NAND_PLATFORM is not set +# CONFIG_MTD_ONENAND is not set + +# +# LPDDR flash memory drivers +# +# CONFIG_MTD_LPDDR is not set + +# +# UBI - Unsorted block images +# +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MTD_UBI_BEB_RESERVE=1 +# CONFIG_MTD_UBI_GLUEBI is not set + +# +# UBI debugging options +# +# CONFIG_MTD_UBI_DEBUG is not set +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set + +# +# DRBD disabled because PROC_FS, INET or CONNECTOR not selected +# +# CONFIG_BLK_DEV_RAM is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_MG_DISK is not set +CONFIG_MISC_DEVICES=y +# CONFIG_AD525X_DPOT is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_ISL29003 is not set +# CONFIG_DS1682 is not set +# CONFIG_TI_DAC7512 is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +# CONFIG_EEPROM_AT24 is not set +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_IWMC3200TOP is not set +CONFIG_HAVE_IDE=y +CONFIG_IDE=y + +# +# Please see Documentation/ide/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_IDE_GD=y +CONFIG_IDE_GD_ATA=y +# CONFIG_IDE_GD_ATAPI is not set +CONFIG_BLK_DEV_IDECS=y +# CONFIG_BLK_DEV_IDECD is not set +# CONFIG_BLK_DEV_IDETAPE is not set +# CONFIG_IDE_TASK_IOCTL is not set