[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-278-g7e7bd07
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-278-g7e7bd07
|
From: Julien B a. A. <ar...@us...> - 2011-07-01 20:34:15
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 7e7bd077d994b5d685ef94ac9916f56ee8e427b0 (commit)
via 79bb1d48e40c49d132d0c2fddab75e412e0743f9 (commit)
via 69ee98133e5efe920e83eb489c537a14e2288cc1 (commit)
via a3aa365d7341e838c0ecdec92172accde3047f31 (commit)
via 01c031152cc9254d4650c7965732f1125316eb31 (commit)
from 723889b80c0bdff0af5b097070c9fa2bd20e4277 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7e7bd077d994b5d685ef94ac9916f56ee8e427b0
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 1 22:33:25 2011 +0200
[BUILDROOT] Add missing packages to new apf27test config
commit 79bb1d48e40c49d132d0c2fddab75e412e0743f9
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 1 22:30:17 2011 +0200
[LINUX] 2.6.29: adds CAN support for apf27test default config
commit 69ee98133e5efe920e83eb489c537a14e2288cc1
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 1 22:29:17 2011 +0200
[BUILDROOT] Converts slideshow package makefile to GENTARGET. Makes it work again while we are at it ;-)
commit a3aa365d7341e838c0ecdec92172accde3047f31
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 1 15:02:45 2011 +0200
Moves to 4.0-beta stage
commit 01c031152cc9254d4650c7965732f1125316eb31
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jul 1 15:01:41 2011 +0200
[BUILDROOT] Disable NLS by default in lbreakout2 (otherwise network support doesn't compile)
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27test_defconfig | 327 +++++++++++++++++---
.../armadeus/apf27/apf27test-linux-2.6.29.config | 13 +-
.../rootfs/target_skeleton/etc/armadeus-version | 2 +-
patches/buildroot/2010.11/034-slideshow.patch | 98 ++++---
.../2010.11/130-lbreakout-add_package.patch | 11 +-
5 files changed, 352 insertions(+), 99 deletions(-)
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index e76fa5f..79e9b2c 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Buildroot version: 2010.11
-# Sun Jun 26 20:04:04 2011
+# Fri Jul 1 15:50:55 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_arm=y
@@ -220,33 +220,63 @@ BR2_BUSYBOX_VERSION_1_16_X=y
BR2_BUSYBOX_VERSION="1.16.2"
BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
BR2_PACKAGE_BUSYBOX_CONFIG="target/device/armadeus/busybox-$(BR2_BUSYBOX_VERSION).config"
-# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
# BR2_PACKAGE_CUSTOMIZE is not set
#
# Armadeus specific tools/utilities
#
-BR2_PACKAGE_AD9889CTRL=y
-# BR2_PACKAGE_ANYBUSD is not set
-# BR2_PACKAGE_AS_DEVICES is not set
-# BR2_PACKAGE_CH7024CTRL is not set
-# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+BR2_PACKAGE_ANYBUSD=y
+BR2_PACKAGE_AS_DEVICES=y
+BR2_PACKAGE_AS_DEVICES_TESTS=y
+BR2_PACKAGE_AS_DEVICES_CPP=y
+BR2_PACKAGE_AS_DEVICES_TESTS_CPP=y
+# BR2_PACKAGE_AS_DEVICES_PYTHON is not set
+BR2_PACKAGE_ARMADEUS_DEMOS=y
+
+#
+# Choose the demos to install
+#
+BR2_PACKAGE_ARMADEUS_DEMOS_ARMANOID=y
+BR2_PACKAGE_ARMADEUS_DEMOS_BACKLIGHT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPIO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_GPS=y
+BR2_PACKAGE_ARMADEUS_DEMOS_INPUT=y
+BR2_PACKAGE_ARMADEUS_DEMOS_MUSIC_PLAYER=y
+BR2_PACKAGE_ARMADEUS_DEMOS_CAPTURE=y
+BR2_PACKAGE_ARMADEUS_DEMOS_OSCILLO=y
+BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
+BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
+BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020=y
BR2_PACKAGE_FPGAREGS=y
+# BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE is not set
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
+# BR2_PACKAGE_STRATON is not set
+BR2_PACKAGE_ARMADEUS_TESTSUITE=y
+
+#
+# APF27 specific:
+#
+BR2_PACKAGE_AD9889CTRL=y
# BR2_PACKAGE_ARMADEUS_PPS_UTILITIES is not set
#
-# Select as_devices package to use straton
+# APF51 specific:
#
-# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
# BR2_PACKAGE_TFP410CTRL is not set
#
+# APF9328 specific:
+#
+# BR2_PACKAGE_CH7024CTRL is not set
+
+#
# Audio and video libraries and applications
#
BR2_PACKAGE_ALSA_LIB=y
+# BR2_PACKAGE_ALSA_LIB_PYTHON is not set
#
# ALSA lib selection
@@ -289,8 +319,8 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
# BR2_PACKAGE_LIBCDAUDIO is not set
# BR2_PACKAGE_LIBDVDREAD is not set
# BR2_PACKAGE_LIBDVDNAV is not set
-# BR2_PACKAGE_LIBID3TAG is not set
-# BR2_PACKAGE_LIBMAD is not set
+BR2_PACKAGE_LIBID3TAG=y
+BR2_PACKAGE_LIBMAD=y
# BR2_PACKAGE_LIBMMS is not set
# BR2_PACKAGE_LIBMPD is not set
# BR2_PACKAGE_LIBMPEG2 is not set
@@ -298,9 +328,10 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
# BR2_PACKAGE_LIBSNDFILE is not set
# BR2_PACKAGE_LIBTHEORA is not set
# BR2_PACKAGE_LIBVORBIS is not set
-# BR2_PACKAGE_MADPLAY is not set
+BR2_PACKAGE_MADPLAY=y
+BR2_PACKAGE_MADPLAY_ALSA=y
# BR2_PACKAGE_MPG123 is not set
-# BR2_PACKAGE_MPLAYER is not set
+BR2_PACKAGE_MPLAYER=y
# BR2_PACKAGE_PYWEBRADIO is not set
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_SWFDEC is not set
@@ -311,6 +342,8 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
#
# Compressors and decompressors
#
+# BR2_PACKAGE_BZIP2 is not set
+# BR2_PACKAGE_GZIP is not set
# BR2_PACKAGE_LZOP is not set
# BR2_PACKAGE_XZ is not set
@@ -319,9 +352,9 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
#
# BR2_PACKAGE_DMALLOC is not set
# BR2_PACKAGE_KEXEC is not set
-# BR2_PACKAGE_LMBENCH is not set
+BR2_PACKAGE_LMBENCH=y
# BR2_PACKAGE_LSOF is not set
-# BR2_PACKAGE_LTRACE is not set
+BR2_PACKAGE_LTRACE=y
# BR2_PACKAGE_MEMSTAT is not set
# BR2_PACKAGE_NETPERF is not set
# BR2_PACKAGE_OPROFILE is not set
@@ -334,34 +367,45 @@ BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_AUTOMAKE is not set
# BR2_PACKAGE_BISON is not set
# BR2_PACKAGE_BSDIFF is not set
+# BR2_PACKAGE_COREUTILS is not set
# BR2_PACKAGE_CVS is not set
+# BR2_PACKAGE_DIFFUTILS is not set
# BR2_PACKAGE_DISTCC is not set
# BR2_PACKAGE_FAKEROOT is not set
+# BR2_PACKAGE_FINDUTILS is not set
# BR2_PACKAGE_FLEX is not set
+# BR2_PACKAGE_GAWK is not set
#
# native toolchain needs development files in target filesystem
#
# BR2_PACKAGE_GETTEXT is not set
-# BR2_PACKAGE_LIBINTL is not set
+BR2_PACKAGE_LIBINTL=y
# BR2_PACKAGE_LIBGMP is not set
# BR2_PACKAGE_GPERF is not set
+# BR2_PACKAGE_GREP is not set
# BR2_PACKAGE_MAKE is not set
# BR2_PACKAGE_LIBMPC is not set
# BR2_PACKAGE_LIBMPFR is not set
# BR2_PACKAGE_LIBTOOL is not set
# BR2_PACKAGE_M4 is not set
+# BR2_PACKAGE_PATCH is not set
# BR2_PACKAGE_PKG_CONFIG is not set
+# BR2_PACKAGE_SED is not set
+# BR2_PACKAGE_TAR is not set
#
# Games
#
# BR2_PACKAGE_E_UAE is not set
# BR2_PACKAGE_GNUCHESS is not set
-# BR2_PACKAGE_LBREAKOUT2 is not set
+BR2_PACKAGE_LBREAKOUT2=y
+BR2_PACKAGE_LBREAKOUT2_AUDIO=y
+BR2_PACKAGE_LBREAKOUT2_NET=y
# BR2_PACKAGE_LTRIS is not set
-# BR2_PACKAGE_OPENTYRIAN is not set
-# BR2_PACKAGE_PRBOOM is not set
+BR2_PACKAGE_OPENTYRIAN=y
+BR2_PACKAGE_PRBOOM=y
+BR2_PACKAGE_DOOM_WAD=y
# BR2_PACKAGE_SDLQUAKE is not set
# BR2_PACKAGE_SNES9X is not set
# BR2_PACKAGE_WOLF4SDL is not set
@@ -380,18 +424,45 @@ BR2_PACKAGE_STRACE=y
#
# BR2_PACKAGE_ALLEGRO is not set
# BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_FBDUMP is not set
-# BR2_PACKAGE_FBGRAB is not set
-# BR2_PACKAGE_FBTEST is not set
-# BR2_PACKAGE_FBV is not set
+BR2_PACKAGE_FBDUMP=y
+BR2_PACKAGE_FBGRAB=y
+# BR2_PACKAGE_FBSET is not set
+BR2_PACKAGE_FBTEST=y
+BR2_PACKAGE_FBV=y
# BR2_PACKAGE_IMAGEMAGICK is not set
# BR2_PACKAGE_LINUX_FUSION is not set
-# BR2_PACKAGE_SDL is not set
+# BR2_PACKAGE_PYGAME is not set
+BR2_PACKAGE_SDL=y
+BR2_PACKAGE_SDL_FBCON=y
+BR2_PACKAGE_SDL_IMAGE=y
+
+#
+# SDL_image file format support
+#
+BR2_PACKAGE_SDL_IMAGE_BMP=y
+BR2_PACKAGE_SDL_IMAGE_GIF=y
+BR2_PACKAGE_SDL_IMAGE_JPEG=y
+# BR2_PACKAGE_SDL_IMAGE_LBM is not set
+# BR2_PACKAGE_SDL_IMAGE_PCX is not set
+BR2_PACKAGE_SDL_IMAGE_PNG=y
+# BR2_PACKAGE_SDL_IMAGE_PNM is not set
+# BR2_PACKAGE_SDL_IMAGE_TARGA is not set
+# BR2_PACKAGE_SDL_IMAGE_TIFF is not set
+# BR2_PACKAGE_SDL_IMAGE_XCF is not set
+# BR2_PACKAGE_SDL_IMAGE_XPM is not set
+# BR2_PACKAGE_SDL_IMAGE_XV is not set
+BR2_PACKAGE_SDL_MIXER=y
+BR2_PACKAGE_SDL_SOUND=y
+BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
+BR2_PACKAGE_SDL_NET=y
+BR2_PACKAGE_SDL_TTF=y
+BR2_PACKAGE_SDL_GFX=y
+BR2_PACKAGE_SLIDESHOW=y
#
# Demos
#
-# BR2_PACKAGE_SDL_WATER is not set
+BR2_PACKAGE_SDL_WATER=y
#
# other GUIs
@@ -431,23 +502,118 @@ BR2_PACKAGE_STRACE=y
#
# dbus not available (need expat or libxml2)
#
+# BR2_PACKAGE_DEVMEM2 is not set
# BR2_PACKAGE_DMRAID is not set
# BR2_PACKAGE_DOSFSTOOLS is not set
-# BR2_PACKAGE_E2FSPROGS is not set
+BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_E2FSPROGS_UTILS=y
+BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
+BR2_PACKAGE_E2FSPROGS_BLKID=y
+BR2_PACKAGE_E2FSPROGS_CHATTR=y
+BR2_PACKAGE_E2FSPROGS_DUMPE2FS=y
+BR2_PACKAGE_E2FSPROGS_E2FREEFRAG=y
+BR2_PACKAGE_E2FSPROGS_E2FSCK=y
+BR2_PACKAGE_E2FSPROGS_E2LABEL=y
+BR2_PACKAGE_E2FSPROGS_E2UNDO=y
+BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
+BR2_PACKAGE_E2FSPROGS_FINDFS=y
+BR2_PACKAGE_E2FSPROGS_FSCK=y
+BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
+BR2_PACKAGE_E2FSPROGS_LSATTR=y
+BR2_PACKAGE_E2FSPROGS_MKE2FS=y
+BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND=y
+BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
+BR2_PACKAGE_E2FSPROGS_UUIDGEN=y
+BR2_PACKAGE_E2FSPROGS_UUIDD=y
+
+#
+# e2fsprogs libraries
+#
+BR2_PACKAGE_E2FSPROGS_LIBUUID=y
+BR2_PACKAGE_E2FSPROGS_LIBBLKID=y
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
-# BR2_PACKAGE_FIRMWARE is not set
+BR2_PACKAGE_FIRMWARE=y
+
+#
+# Video
+#
+
+#
+# WiFi chipsets
+#
+BR2_PACKAGE_FIRMWARE_88W8686=y
+BR2_PACKAGE_FIRMWARE_88W8686_SDIO=y
+# BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8 is not set
+BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9=y
+# BR2_PACKAGE_FIRMWARE_88W8686_GSPI is not set
+
+#
+# Others
+#
# BR2_PACKAGE_FIS is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GENEXT2FS is not set
# BR2_PACKAGE_GENROMFS is not set
# BR2_PACKAGE_GPM is not set
-# BR2_PACKAGE_GPSD is not set
+BR2_PACKAGE_GPSD=y
+BR2_PACKAGE_GPSD_DEVICES="/dev/ttyS1"
+
+#
+# Features
+#
+# BR2_PACKAGE_GPSD_TIMING is not set
+# BR2_PACKAGE_GPSD_CLIENT_DEBUG is not set
+# BR2_PACKAGE_GPSD_OLDSTYLE is not set
+# BR2_PACKAGE_GPSD_PROFILING is not set
+# BR2_PACKAGE_GPSD_NTP_SHM is not set
+# BR2_PACKAGE_GPSD_PPS is not set
+# BR2_PACKAGE_GPSD_USER is not set
+# BR2_PACKAGE_GPSD_GROUP is not set
+# BR2_PACKAGE_GPSD_FIXED_PORT_SPEED is not set
+# BR2_PACKAGE_GPSD_MAX_CLIENT is not set
+# BR2_PACKAGE_GPSD_MAX_DEV is not set
+BR2_PACKAGE_GPSD_RECONFIGURE=y
+BR2_PACKAGE_GPSD_CONTROLSEND=y
+# BR2_PACKAGE_GPSD_RAW is not set
+# BR2_PACKAGE_GPSD_SQUELCH is not set
+
+#
+# Protocols
+#
+# BR2_PACKAGE_GPSD_ASHTECH is not set
+# BR2_PACKAGE_GPSD_AIVDM is not set
+# BR2_PACKAGE_GPSD_EARTHMATE is not set
+# BR2_PACKAGE_GPSD_EVERMORE is not set
+# BR2_PACKAGE_GPSD_FV18 is not set
+# BR2_PACKAGE_GPSD_GARMIN is not set
+# BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT is not set
+# BR2_PACKAGE_GPSD_GPSCLOCK is not set
+# BR2_PACKAGE_GPSD_ITRAX is not set
+# BR2_PACKAGE_GPSD_MTK3301 is not set
+BR2_PACKAGE_GPSD_NMEA=y
+# BR2_PACKAGE_GPSD_NTRIP is not set
+# BR2_PACKAGE_GPSD_NAVCOM is not set
+# BR2_PACKAGE_GPSD_OCEANSERVER is not set
+# BR2_PACKAGE_GPSD_ONCORE is not set
+# BR2_PACKAGE_GPSD_RTCM104V2 is not set
+# BR2_PACKAGE_GPSD_RTCM104V3 is not set
+# BR2_PACKAGE_GPSD_SIRF is not set
+# BR2_PACKAGE_GPSD_SUPERSTAR2 is not set
+# BR2_PACKAGE_GPSD_TRIMBLE_TSIP is not set
+# BR2_PACKAGE_GPSD_TRIPMATE is not set
+# BR2_PACKAGE_GPSD_TRUE_NORTH is not set
+# BR2_PACKAGE_GPSD_UBX is not set
# BR2_PACKAGE_GVFS is not set
# BR2_PACKAGE_HAL is not set
+# BR2_PACKAGE_HDPARM is not set
# BR2_PACKAGE_HWDATA is not set
BR2_PACKAGE_I2C_TOOLS=y
-# BR2_PACKAGE_INPUT_TOOLS is not set
+BR2_PACKAGE_INPUT_TOOLS=y
+BR2_PACKAGE_INPUT_TOOLS_EVTEST=y
+BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH=y
+BR2_PACKAGE_INPUT_TOOLS_JSCAL=y
+BR2_PACKAGE_INPUT_TOOLS_JSTEST=y
# BR2_PACKAGE_IOSTAT is not set
# BR2_PACKAGE_KBD is not set
# BR2_PACKAGE_LCD4LINUX is not set
@@ -519,10 +685,44 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# Interpreter languages and scripting
#
# BR2_PACKAGE_HASERL is not set
-# BR2_PACKAGE_LUA is not set
+BR2_PACKAGE_LUA=y
+# BR2_PACKAGE_LUA_COMPILER is not set
+BR2_PACKAGE_LUA_INTERPRETER=y
+BR2_PACKAGE_LUA_INTERPRETER_READLINE=y
+BR2_PACKAGE_LUA_SHARED_LIBRARY=y
+
+#
+# LUA libraries/modules
+#
+# BR2_PACKAGE_CGILUA is not set
+# BR2_PACKAGE_COPAS is not set
+# BR2_PACKAGE_COXPCALL is not set
+# BR2_PACKAGE_LUAFILESYSTEM is not set
+# BR2_PACKAGE_LUASOCKET is not set
+# BR2_PACKAGE_RINGS is not set
+# BR2_PACKAGE_WSAPI is not set
+# BR2_PACKAGE_XAVANTE is not set
# BR2_PACKAGE_MICROPERL is not set
# BR2_PACKAGE_PHP is not set
-# BR2_PACKAGE_PYTHON is not set
+BR2_PACKAGE_PYTHON=y
+# BR2_PACKAGE_PYTHON_DEV is not set
+BR2_PACKAGE_PYTHON_PY_ONLY=y
+# BR2_PACKAGE_PYTHON_PYC_ONLY is not set
+# BR2_PACKAGE_PYTHON_PY_PYC is not set
+
+#
+# The following modules are unusual or require extra libraries
+#
+# BR2_PACKAGE_PYTHON_BSDDB is not set
+BR2_PACKAGE_PYTHON_CODECSCJK=y
+# BR2_PACKAGE_PYTHON_CURSES is not set
+# BR2_PACKAGE_PYTHON_PYEXPAT is not set
+# BR2_PACKAGE_PYTHON_READLINE is not set
+# BR2_PACKAGE_PYTHON_SSL is not set
+# BR2_PACKAGE_PYTHON_TKINTER is not set
+BR2_PACKAGE_PYTHON_UNICODEDATA=y
+BR2_PACKAGE_PYSERIAL=y
+# BR2_PACKAGE_PYMYSQL is not set
# BR2_PACKAGE_RUBY is not set
# BR2_PACKAGE_TCL is not set
@@ -568,13 +768,13 @@ BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_ATK is not set
# BR2_PACKAGE_CAIRO is not set
# BR2_PACKAGE_FONTCONFIG is not set
-# BR2_PACKAGE_FREETYPE is not set
-# BR2_PACKAGE_JPEG is not set
+BR2_PACKAGE_FREETYPE=y
+BR2_PACKAGE_JPEG=y
# BR2_PACKAGE_LIBART is not set
# BR2_PACKAGE_GDK_PIXBUF is not set
-# BR2_PACKAGE_LIBPNG is not set
+BR2_PACKAGE_LIBPNG=y
# BR2_PACKAGE_LIBSVGTINY is not set
-# BR2_PACKAGE_LIBUNGIF is not set
+BR2_PACKAGE_LIBUNGIF=y
# BR2_PACKAGE_MESALIB is not set
# BR2_PACKAGE_PANGO is not set
# BR2_PACKAGE_PIXMAN is not set
@@ -590,7 +790,8 @@ BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_LIBAIO is not set
# BR2_PACKAGE_LIBRAW1394 is not set
BR2_PACKAGE_TSLIB=y
-# BR2_PACKAGE_LIBUSB is not set
+BR2_PACKAGE_LIBUSB=y
+# BR2_PACKAGE_LIBUSB_COMPAT is not set
#
# Java
@@ -609,7 +810,7 @@ BR2_PACKAGE_TSLIB=y
# BR2_PACKAGE_LIBMICROHTTPD is not set
# BR2_PACKAGE_NEON is not set
# BR2_PACKAGE_LIBNL is not set
-# BR2_PACKAGE_LIBPCAP is not set
+BR2_PACKAGE_LIBPCAP=y
# BR2_PACKAGE_LIBOSIP2 is not set
# BR2_PACKAGE_LIBRSYNC is not set
# BR2_PACKAGE_LIBSOUP is not set
@@ -622,7 +823,7 @@ BR2_PACKAGE_TSLIB=y
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
# BR2_PACKAGE_LIBDAEMON is not set
-# BR2_PACKAGE_LIBELF is not set
+BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBGLIB2 is not set
# BR2_PACKAGE_LIBOIL is not set
@@ -639,7 +840,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_NEWT is not set
# BR2_PACKAGE_PCRE is not set
# BR2_PACKAGE_POPT is not set
-# BR2_PACKAGE_READLINE is not set
+BR2_PACKAGE_READLINE=y
# BR2_PACKAGE_SLANG is not set
#
@@ -662,8 +863,9 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+BR2_PACKAGE_BOA=y
# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ3_LIBS is not set
+BR2_PACKAGE_BLUEZ3_LIBS=y
#
# bluez-utils not available (need dbus)
@@ -673,25 +875,31 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
BR2_PACKAGE_CAN_UTILS=y
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
+# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DNSMASQ is not set
-# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_ETHTOOL is not set
+BR2_PACKAGE_DROPBEAR=y
+# BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS is not set
+BR2_PACKAGE_ETHTOOL=y
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
-# BR2_PACKAGE_IPERF is not set
+BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPROUTE2=y
# BR2_PACKAGE_IPSEC_TOOLS is not set
# BR2_PACKAGE_IPTABLES is not set
# BR2_PACKAGE_IW is not set
# BR2_PACKAGE_KISMET is not set
# BR2_PACKAGE_L2TP is not set
-# BR2_PACKAGE_LINKS is not set
+# BR2_PACKAGE_LIGHTTPD is not set
+BR2_PACKAGE_LINKS=y
# BR2_PACKAGE_LRZSZ is not set
# BR2_PACKAGE_MIIDIAG is not set
# BR2_PACKAGE_MROUTED is not set
# BR2_PACKAGE_MUTT is not set
# BR2_PACKAGE_NBD is not set
# BR2_PACKAGE_NCFTP is not set
+# BR2_PACKAGE_NETCAT is not set
+# BR2_PACKAGE_NETKITBASE is not set
+# BR2_PACKAGE_NETKITTELNET is not set
# BR2_PACKAGE_NETPLUG is not set
# BR2_PACKAGE_NETSNMP is not set
# BR2_PACKAGE_NETSTAT_NAT is not set
@@ -701,7 +909,7 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_SNTP is not set
# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
# BR2_PACKAGE_NTP_NTPD is not set
-# BR2_PACKAGE_NTP_NTPDATE is not set
+BR2_PACKAGE_NTP_NTPDATE=y
# BR2_PACKAGE_NTP_NTPDC is not set
# BR2_PACKAGE_NTP_NTPQ is not set
# BR2_PACKAGE_NTP_TICKADJ is not set
@@ -723,9 +931,13 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
-# BR2_PACKAGE_TCPDUMP is not set
+BR2_PACKAGE_TCPDUMP=y
+# BR2_PACKAGE_TCPDUMP_SMB is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_TCPREPLAY is not set
+# BR2_PACKAGE_TFTPD is not set
+# BR2_PACKAGE_THTTPD is not set
+# BR2_PACKAGE_TINYHTTPD is not set
# BR2_PACKAGE_TN5250 is not set
# BR2_PACKAGE_TTCP is not set
# BR2_PACKAGE_UDPCAST is not set
@@ -735,9 +947,13 @@ BR2_PACKAGE_UUCP=y
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
# BR2_PACKAGE_WEBIF is not set
+# BR2_PACKAGE_WGET is not set
BR2_PACKAGE_WIRELESS_TOOLS=y
# BR2_PACKAGE_WIRELESS_TOOLS_LIB is not set
-# BR2_PACKAGE_WPA_SUPPLICANT is not set
+BR2_PACKAGE_WPA_SUPPLICANT=y
+# BR2_PACKAGE_WPA_SUPPLICANT_EAP is not set
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+# BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE is not set
#
# Package managers
@@ -745,9 +961,15 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
# BR2_PACKAGE_IPKG is not set
#
+# rpm requires libneon with SSL, XML and ZLIB support
+#
+
+#
# Shell and utilities
#
# BR2_PACKAGE_AT is not set
+# BR2_PACKAGE_BASH is not set
+# BR2_PACKAGE_DASH is not set
# BR2_PACKAGE_DIALOG is not set
# BR2_PACKAGE_FILE is not set
# BR2_PACKAGE_LOCKFILE_PROGS is not set
@@ -759,13 +981,22 @@ BR2_PACKAGE_WIRELESS_TOOLS=y
#
# System tools
#
+# BR2_PACKAGE_BOOTUTILS is not set
+# BR2_PACKAGE_MODULE_INIT_TOOLS is not set
+# BR2_PACKAGE_PROCPS is not set
+# BR2_PACKAGE_PSMISC is not set
+# BR2_PACKAGE_SYSKLOGD is not set
+# BR2_PACKAGE_SYSVINIT is not set
+# BR2_PACKAGE_UTIL-LINUX is not set
#
# Text editors and viewers
#
# BR2_PACKAGE_ED is not set
+# BR2_PACKAGE_LESS is not set
BR2_PACKAGE_NANO=y
# BR2_PACKAGE_UEMACS is not set
+# BR2_PACKAGE_VIM is not set
#
# Target filesystem options
@@ -856,6 +1087,6 @@ BR2_LINUX_KERNEL_VERSION="2.6.29.6"
BR2_LINUX_KERNEL_PATCH="$(LINUX26_PATCH_DIR)"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX_KERNEL_VERSION).config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)test-linux-$(BR2_LINUX_KERNEL_VERSION).config"
BR2_LINUX_KERNEL_UIMAGE=y
# BR2_LINUX_KERNEL_ZIMAGE is not set
diff --git a/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config b/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config
index 1e4280f..ecb06b0 100644
--- a/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/apf27/apf27test-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Tue Jun 21 18:13:55 2011
+# Fri Jul 1 15:19:18 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -407,7 +407,16 @@ CONFIG_IPV6_NDISC_NODETYPE=y
#
# CONFIG_NET_PKTGEN is not set
# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+# CONFIG_CAN_DEBUG_DEVICES is not set
+CONFIG_CAN_MCP251X=m
# CONFIG_IRDA is not set
CONFIG_BT=m
CONFIG_BT_L2CAP=m
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
index cb3b57c..dec737b 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/armadeus-version
@@ -1 +1 @@
-4.0-alpha-git
+4.0-beta-git
diff --git a/patches/buildroot/2010.11/034-slideshow.patch b/patches/buildroot/2010.11/034-slideshow.patch
index 30bddb0..1cc3d52 100644
--- a/patches/buildroot/2010.11/034-slideshow.patch
+++ b/patches/buildroot/2010.11/034-slideshow.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-27 15:23:50.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-27 15:23:54.000000000 +0100
+--- buildroot.orig/package/Config.in 2011-07-01 17:40:50.000000000 +0200
++++ buildroot/package/Config.in 2011-07-01 21:32:32.000000000 +0200
@@ -113,6 +113,7 @@
source "package/sdl_net/Config.in"
source "package/sdl_ttf/Config.in"
@@ -17,13 +17,12 @@ Index: buildroot/package/Config.in
Index: buildroot/package/slideshow/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/Config.in 2011-01-27 15:23:54.000000000 +0100
-@@ -0,0 +1,9 @@
++++ buildroot/package/slideshow/Config.in 2011-07-01 21:35:15.000000000 +0200
+@@ -0,0 +1,8 @@
+config BR2_PACKAGE_SLIDESHOW
+ bool "Slideshow"
+ depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
+ help
-+
+ Perigee Slideshow is a command line program that searches a directory
+ for supported graphic files and displays them in a slideshow.
+
@@ -31,63 +30,47 @@ Index: buildroot/package/slideshow/Config.in
Index: buildroot/package/slideshow/slideshow.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow.mk 2011-01-27 15:23:54.000000000 +0100
-@@ -0,0 +1,51 @@
++++ buildroot/package/slideshow/slideshow.mk 2011-07-01 21:32:17.000000000 +0200
+@@ -0,0 +1,35 @@
+#############################################################
+#
+# slideshow
+#
+#############################################################
++
+SLIDESHOW_VERSION:=1.1
+SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
+SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
-+SLIDESHOW_CAT:=zcat
-+SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow
-+
-+$(DL_DIR)/$(SLIDESHOW_SOURCE):
-+ $(WGET) -P $(DL_DIR) $(SLIDESHOW_SITE)/$(SLIDESHOW_SOURCE)
+
-+slideshow-source: $(DL_DIR)/$(SLIDESHOW_SOURCE)
-+
-+$(SLIDESHOW_DIR)/.unpacked: $(DL_DIR)/$(SLIDESHOW_SOURCE)
-+ unzip $(DL_DIR)/$(SLIDESHOW_SOURCE) -d $(BUILD_DIR)
-+ touch $@
++SLIDESHOW_DEPENDENCIES += sdl sdl_image
+
-+$(SLIDESHOW_DIR)/.configured: $(SLIDESHOW_DIR)/.unpacked
-+ @echo "Patching slideshow..."
-+ toolchain/patch-kernel.sh $(SLIDESHOW_DIR) package/slideshow/ slideshow-\*.patch
-+ touch $@
-+
-+$(SLIDESHOW_DIR)/slideshow: $(SLIDESHOW_DIR)/.configured
-+ $(MAKE) CC=$(TARGET_CXX) CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
++define SLIDESHOW_BUILD_CMDS
++ $(MAKE) CC="$(TARGET_CXX)" CFLAGS="$(TARGET_CFLAGS) `sh $(STAGING_DIR)/usr/bin/sdl-config --cflags`" \
+ LFLAGS="`sh $(STAGING_DIR)/usr/bin/sdl-config --libs` -lSDL_image" \
+ -C $(SLIDESHOW_DIR)
++endef
+
-+$(TARGET_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/slideshow
-+ cp -dpf $< $(TARGET_DIR)/usr/bin
-+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $@
++define SLIDESHOW_INSTALL_TARGET_CMDS
++ cp -dpf $(SLIDESHOW_DIR)/slideshow $(TARGET_DIR)/usr/bin
++endef
+
-+SLIDESHOW slideshow: sdl sdl_image $(TARGET_DIR)/usr/bin/slideshow
-+
-+slideshow-clean:
++define SLIDESHOW_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/slideshow
-+ -$(MAKE) -C $(SLIDESHOW_DIR) clean
++endef
+
-+slideshow-dirclean:
-+ rm -rf $(SLIDESHOW_DIR)
++$(eval $(call GENTARGETS,package,slideshow))
+
-+#############################################################
-+#
-+# Toplevel Makefile options
-+#
-+#############################################################
-+ifeq ($(strip $(BR2_PACKAGE_SLIDESHOW)),y)
-+TARGETS+=slideshow
-+endif
++# BR currently doesn't support .zip archive, so do extraction manually:
++$(SLIDESHOW_TARGET_EXTRACT): $(SLIDESHOW_TARGET_SOURCE)
++ $(call MESSAGE,"Extracting")
++ unzip $(DL_DIR)/$($(PKG)_SOURCE) -d $(BUILD_DIR)
++ mv $(BUILD_DIR)/slideshow/* $(BUILD_DIR)/slideshow-$(SLIDESHOW_VERSION)/
++ rm -rf $(BUILD_DIR)/slideshow
++ touch $@
Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2011-01-27 15:23:54.000000000 +0100
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2011-07-01 17:40:50.000000000 +0200
@@ -0,0 +1,73 @@
+--- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
++++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
@@ -165,7 +148,7 @@ Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2011-01-27 15:23:54.000000000 +0100
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2011-07-01 17:40:50.000000000 +0200
@@ -0,0 +1,13 @@
+--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
@@ -180,3 +163,32 @@ Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
+
+ for(const char *p = text; *p != '\0'; p++)
+ {
+Index: buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/slideshow/slideshow-03-fix_compilation_errors_with_recent_gcc.patch 2011-07-01 19:02:28.000000000 +0200
+@@ -0,0 +1,24 @@
++Index: slideshow-1.1/file_list.cpp
++===================================================================
++--- slideshow-1.1.orig/file_list.cpp 2011-07-01 18:58:49.000000000 +0200
+++++ slideshow-1.1/file_list.cpp 2011-07-01 18:59:10.000000000 +0200
++@@ -8,6 +8,7 @@
++ #include <fstream>
++ #include <stdlib.h>
++ #include <ctype.h>
+++#include <string.h>
++
++ #ifdef WIN32
++ #include <io.h>
++Index: slideshow-1.1/slideshow.h
++===================================================================
++--- slideshow-1.1.orig/slideshow.h 2011-07-01 18:59:56.000000000 +0200
+++++ slideshow-1.1/slideshow.h 2011-07-01 19:00:02.000000000 +0200
++@@ -9,6 +9,7 @@
++ #pragma once
++ #endif // _MSC_VER > 1000
++
+++#include <iostream>
++ #include "SDL.h"
++ #include "cache.h"
++
diff --git a/patches/buildroot/2010.11/130-lbreakout-add_package.patch b/patches/buildroot/2010.11/130-lbreakout-add_package.patch
index 72cb9c5..fed303b 100644
--- a/patches/buildroot/2010.11/130-lbreakout-add_package.patch
+++ b/patches/buildroot/2010.11/130-lbreakout-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-27 15:25:13.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-27 15:25:16.000000000 +0100
+--- buildroot.orig/package/Config.in 2011-07-01 10:37:54.000000000 +0200
++++ buildroot/package/Config.in 2011-07-01 10:38:58.000000000 +0200
@@ -82,6 +82,7 @@
source "package/games/ace_of_penguins/Config.in"
source "package/e-uae/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/lbreakout2/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lbreakout2/Config.in 2011-01-27 15:25:16.000000000 +0100
++++ buildroot/package/lbreakout2/Config.in 2011-07-01 10:37:54.000000000 +0200
@@ -0,0 +1,26 @@
+config BR2_PACKAGE_LBREAKOUT2
+ bool "LBreakout2"
@@ -48,8 +48,8 @@ Index: buildroot/package/lbreakout2/Config.in
Index: buildroot/package/lbreakout2/lbreakout2.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lbreakout2/lbreakout2.mk 2011-01-27 15:25:16.000000000 +0100
-@@ -0,0 +1,29 @@
++++ buildroot/package/lbreakout2/lbreakout2.mk 2011-07-01 10:40:55.000000000 +0200
+@@ -0,0 +1,30 @@
+#############################################################
+#
+# LBreakout2
@@ -62,6 +62,7 @@ Index: buildroot/package/lbreakout2/lbreakout2.mk
+LBREAKOUT2_CAT=$(ZCAT)
+
+LBREAKOUT2_DEPENDENCIES = sdl
++LBREAKOUT2_CONF_OPT += --disable-nls
+
+ifeq ($(BR2_PACKAGE_LBREAKOUT2_AUDIO),y)
+LBREAKOUT2_DEPENDENCIES += sdl_mixer
hooks/post-receive
--
armadeus
|
