Skip to content

Commit

Permalink
Merge branch 'Issue-22_Buildroot_ver._2012.02' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Max Galemin committed Mar 4, 2012
2 parents 0d17a0c + 23c3b5f commit 7e18b75
Show file tree
Hide file tree
Showing 613 changed files with 14,683 additions and 6,497 deletions.
115 changes: 115 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,118 @@
2012.02, Released February 29th, 2012:

Updated/fixed packages: libecore

2012.02-rc3, Released February 27th, 2012:

Fixes all over the tree.

Automatic host dependencies handling for cmake packages
fixed. Customize package deprecated as using a post-build
script is nowadays the preferred way of adding extra stuff to
the rootfs.

Linux-headers 3.0.x / 3.2.x stable version bumped.

QEMU defconfigs updated to 3.2.x kernels and readme fixed.

Updated/fixed packages: dropbear, ffmpeg, libpng

2012.02-rc2, Released February 19th, 2012:

Fixes all over the tree.

Toolchain: uClibc: Added upstream post-0.9.33 fixes, Bump
linux-headers 3.0.x / 3.2.x stable versions.

Documentation: Added makedev / <pkg>_DEVICES /
<pkg>_PERMISSIONS documentation.

Updated/fixed packages: busybox, ffmpeg, gst-dsp, libecore,
libvncserver, mxml, python.

2012.02-rc1, Released February 12th, 2012:

Fixes all over the tree and new features.

Toolchain: Default to GCC 4.5.x, add binutils 2.22. Java
support removed, Powerpc SPE ABI support. GDB ELF support fix,
GDB 7.4, crosstool-NG 1.13.4.

Gentargets: scp and mercurial support.
Autotools: derive host dependencies from target by default.
Packages can now declare device table snippets.

Host utilities menu with commonly used host tools.

defconfigs: qemu configs for x86-64, mips and sparc, at91
defconfigs now use modern U-Boot / mainline Linux, added
lpc3250 defconfigs.

uClibc: remove 0.9.30, backport unshare() support, add
0.9.32.1 / 0.9.33, use same config for ctng.

Bootloaders: U-Boot: add 2011.12, remove 2010.xx versions,
Barebox: add 2012.01/02, remove 2011.10/11, LPC32xx
bootloaders added.

Various manual updates. Release tarballs now contain generated
manual in text/html/pdf formats.

Buildroot now calls the stop function of scripts in
/etc/init.d at shutdown.

Updated/fixed packages: atk, avahi, barebox, bash, beecrypt,
bind, binutils, bison, bluez_utils, bzip2, busybox, cairo,
ccache, cdrkit, coreutils, cramfs, dbus, dbus-glib, dialog,
diffutils, dmalloc, dropbear, e2fsprogs, ebtables, ed,
ethtool, expat, ffmpeg, file, fis, flex, fluxbox, fontconfig,
freetype, gawk, grep, gst-dsp, gst-ffmpeg, gst-plugins-base,
hdparm, hostapd, htop, i2c-tools, icu, iproute2, ipsec-tools,
ipset, iptables, iw, jpeg, kismet, lame, libcap, libcgi,
libev, libeXosip2, libffi, libftdi, libgpg-error, libgtk2,
libidn, libmms, libmnl, libmodbus, libnl, libogg, libosip,
libpcap, libpng, libraw1394, libroxml, libusb, libusb-compat,
libv4l, libvorbis, libxcb, libxml-parser-perl, libxslt,
lighttpd, links, lm-sensors, lua, m4, module-init-tools, mpc,
mesa3d, mpd, mpfr, mplayer, mtd-utils, nano, nbd, ncurses,
netperf, netsnmp, ntp, opencv, openocd, openssl, openvpn, orc,
pciutils, pcre, pixman, pkg-config, poco, popt, proftpd,
python, python-serial, qt, ruby, samba, sdl, sdparm,
squashfs3, sshfs, sqlite, squid, sudo, syslinux, tcl, tcpdump,
ti-utils, tiff, tremor, uboot, uboot-tools, udev, usbmount,
util-linux, vala, valgrind, vsftpd, wpa_supplicant,
xapp_{bdftopcf,mkfontdir,mkfontscale,xkbcomp,xcursorgen,xinit},
xapp_xinput, xapp_xman, xcb-util, xdm, xenomai,
xf86-video-sis, xfont_{encodings,font-util},
xlib_lib{fontenc,X11,Xau,Xcursor,Xdmcp,Xfixes,Xfont,Xrender},
xlib_libxkbfile, xterm, xutil_makedepend, yajl

New packages: boost, connman, dstat, expedite, explorercanvas,
feh, flot, giblib, igh-ethercat, imlib2, jquery,
jquery-sparklines, jquery-validation, jsmin, kmod, libecore,
libedbus, libedje, libeet, libeina, libelementary, libesmtp,
libethumb, libevas, libical, libmbus, liboauth, liburcu,
libvncserver, linux-firmware,
lttng-{babeltrace,libust,modules,tools}, NetworkManager,
open2300, python-distutilscross, python-dpkt,
python-netifaces, python-pygame, python-setuptools, rt-tests,
sam-ba, sane-backends, sqlcipher, transmission, unionfs,
xf86-input-tslib, xinput-calibrator

Issues resolved (http://bugs.uclibc.org):

#743: Add Transmission bit torrent option to buildroot
#755: Add Boost libraries as a package
#2299: Add crypto support to libsoup
#2617: Pixman 0.19.2 & Cairo 1.10.0
#3403: libgpg-error: bump to version 1.10
#3409: libgpg-error: download from gnupg.org
#3421: nano: make tiny flag optional
#3691: New EFL packages
#4664: Cannot patch AT91Bootstrap
#4700: setlocalversion not working for combination svn/ubuntu 11.10...
#4760: Qt: add host-pkg-config to dependency-list

2011.11, Released November 30th, 2011:

Fixes all over the tree.
Expand Down
19 changes: 18 additions & 1 deletion Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ config BR2_LOCALFILES
string "Local files retrieval command"
default "cp"

config BR2_SCP
string "Secure copy (scp) command"
default "scp"

config BR2_SSH
string "Secure shell (ssh) command"
default "ssh"

config BR2_HG
string "Mercurial (hg) command"
default "hg"

config BR2_ZCAT
string "zcat command"
default "gzip -d -c"
Expand Down Expand Up @@ -102,7 +114,10 @@ config BR2_PRIMARY_SITE
Primary site to download from. If this option is set then buildroot
will try to download package source first from this site and try the
default if the file is not found.
NOTE: This only works for packages using the Makefile.autotools.in
Valid URIs are URIs recognized by $(WGET) and scp URIs of the form
scp://[user@]host:path.
NOTE: This works for all packages using the central package
infrastructure (generic, autotools, cmake, ...)

config BR2_BACKUP_SITE
string "Backup download site"
Expand Down Expand Up @@ -356,6 +371,8 @@ source "target/generic/Config.in"

source "package/Config.in"

source "package/Config.in.host"

source "fs/Config.in"

source "boot/Config.in"
Expand Down
30 changes: 22 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,13 @@
#--------------------------------------------------------------

# Set and export the version string
export BR2_VERSION:=2011.11
export BR2_VERSION:=2012.02-mg01.1

# Check for minimal make version (note: this check will break at make 10.x)
MIN_MAKE_VERSION=3.81
ifneq ($(firstword $(sort $(MAKE_VERSION) $(MIN_MAKE_VERSION))),$(MIN_MAKE_VERSION))
$(error You have make '$(MAKE_VERSION)' installed. GNU make >= $(MIN_MAKE_VERSION) is required)
endif

# This top-level Makefile can *not* be executed in parallel
.NOTPARALLEL:
Expand Down Expand Up @@ -192,6 +198,7 @@ unexport CPP
unexport CFLAGS
unexport CXXFLAGS
unexport GREP_OPTIONS
unexport CONFIG_SITE

GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess)

Expand Down Expand Up @@ -277,8 +284,6 @@ TARGET_DIR:=$(BASE_DIR)/target
TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
TARGET_SKELETON=$(TOPDIR)/fs/skeleton

BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config

ifeq ($(BR2_CCACHE),y)
CCACHE:=$(HOST_DIR)/usr/bin/ccache
CCACHE_CACHE_DIR=$(HOME)/.buildroot-ccache
Expand All @@ -298,6 +303,8 @@ include package/Makefile.in

all: world

include support/dependencies/dependencies.mk

# We also need the various per-package makefiles, which also add
# each selected package to TARGETS if that package was selected
# in the .config file.
Expand Down Expand Up @@ -359,7 +366,7 @@ HOST_SOURCE += $(addsuffix -source,$(sort $(TARGETS_HOST_DEPS) $(HOST_DEPS)))
$(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) %

dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)

$(BASE_TARGETS): dirs $(O)/toolchainfile.cmake

Expand All @@ -368,7 +375,7 @@ $(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config

prepare: $(BUILD_DIR)/buildroot-config/auto.conf

world: prepare dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL)
world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)

$(O)/toolchainfile.cmake:
@echo -en "\
Expand All @@ -390,7 +397,7 @@ $(O)/toolchainfile.cmake:
$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)

#############################################################
#
Expand Down Expand Up @@ -696,8 +703,15 @@ endif

release: OUT=buildroot-$(BR2_VERSION)

# Create release tarballs. We need to fiddle a bit to add the generated
# documentation to the git output
release:
git archive --format=tar --prefix=$(OUT)/ master|gzip -9 >$(OUT).tar.gz
git archive --format=tar --prefix=$(OUT)/ master > $(OUT).tar
$(MAKE) O=$(OUT) manual-html manual-txt manual-pdf
tar rf $(OUT).tar $(OUT)
gzip -9 -c < $(OUT).tar > $(OUT).tar.gz
bzip2 -9 -c < $(OUT).tar > $(OUT).tar.bz2
rm -rf $(OUT) $(OUT).tar

################################################################################
# GENDOC -- generates the make targets needed to build a specific type of
Expand All @@ -720,7 +734,7 @@ $(1)-$(3): $$(O)/docs/$(1)/$(1).$(4)

$$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES)
@echo "Generating $(5) $(1)..."
$(Q)mkdir -p $$(O)/docs/$(1)/$(2)
$(Q)mkdir -p $$(@D)
$(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \
-D $$(@D) $$<
endef
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 053ba505eb0d40287ac5750daf454af0aed2ce75 Mon Sep 17 00:00:00 2001
From: Gwenhael Goavec-Merou <[email protected]>
Date: Tue, 4 Oct 2011 14:19:58 +0200
Subject: [PATCH 1/2] [ARM] mach-types: Re-add apf9328


Signed-off-by: Gwenhael Goavec-Merou <[email protected]>
---
arch/arm/tools/mach-types | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index fff68d0..07811a7 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -188,6 +188,7 @@ omap_2430sdp MACH_OMAP_2430SDP OMAP_2430SDP 900
davinci_evm MACH_DAVINCI_EVM DAVINCI_EVM 901
palmz72 MACH_PALMZ72 PALMZ72 904
nxdb500 MACH_NXDB500 NXDB500 905
+apf9328 MACH_APF9328 APF9328 906
palmt5 MACH_PALMT5 PALMT5 917
palmtc MACH_PALMTC PALMTC 918
omap_apollon MACH_OMAP_APOLLON OMAP_APOLLON 919
--
1.7.3.4

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
APF9328 needs CONFIG_MTD_CFI_INTELEXT to boot on its NOR FLASH.

Signed-off-by: Julien Boibessot <[email protected]>

Index: linux-3.1.1/arch/arm/mach-imx/Kconfig
===================================================================
--- linux-3.1.1.orig/arch/arm/mach-imx/Kconfig 2011-11-16 14:45:55.000000000 +0100
+++ linux-3.1.1/arch/arm/mach-imx/Kconfig 2011-11-16 14:47:20.000000000 +0100
@@ -84,6 +84,7 @@
bool "APF9328"
select SOC_IMX1
select IMX_HAVE_PLATFORM_IMX_UART
+ select MTD_CFI_INTELEXT
help
Say Yes here if you are using the Armadeus APF9328 development board

2 changes: 1 addition & 1 deletion board/beagleboard/xm/linux-3.2.8.config
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ CONFIG_IRQ_WORK=y
CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE="arm-none-linux-gnueabi-"
CONFIG_LOCALVERSION="-mg01.0"
CONFIG_LOCALVERSION="-mg01.1"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_LZMA=y
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion board/qemu/arm-versatile/readme.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Run the emulation with:

qemu-system-arm -M versatilepb -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=scsi -append "root=/dev/sda console=ttyAMA0,115200" -serial stdio
qemu-system-arm -M versatilepb -kernel output/images/zImage -drive file=output/images/rootfs.ext2,if=scsi -append "root=/dev/sda console=ttyAMA0,115200" -serial stdio -net nic,model=smc91c111 -net user

The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer.
76 changes: 76 additions & 0 deletions board/qemu/mips-malta/linux-3.2.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
CONFIG_MIPS_MALTA=y
CONFIG_CPU_MIPS32_R2=y
CONFIG_MIPS_MT_SMP=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_HZ_100=y
CONFIG_EXPERIMENTAL=y
CONFIG_SYSVIPC=y
CONFIG_LOG_BUF_SHIFT=15
CONFIG_SYSFS_DEPRECATED_V2=y
CONFIG_RELAY=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
CONFIG_PID_NS=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_EMBEDDED=y
# CONFIG_SYSCTL_SYSCALL is not set
# CONFIG_COMPAT_BRK is not set
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
# CONFIG_BLK_DEV_BSG is not set
CONFIG_PCI=y
CONFIG_PM=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
CONFIG_INET=y
CONFIG_IP_PNP=y
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
# CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_INET_LRO is not set
# CONFIG_INET_DIAG is not set
# CONFIG_IPV6 is not set
# CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
# CONFIG_MISC_DEVICES is not set
CONFIG_IDE=y
CONFIG_BLK_DEV_IDECD=y
CONFIG_IDE_GENERIC=y
CONFIG_BLK_DEV_GENERIC=y
CONFIG_BLK_DEV_PIIX=y
CONFIG_NETDEVICES=y
CONFIG_NET_ETHERNET=y
CONFIG_NET_PCI=y
CONFIG_PCNET32=y
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
# CONFIG_WLAN is not set
# CONFIG_INPUT_KEYBOARD is not set
# CONFIG_INPUT_MOUSE is not set
# CONFIG_SERIO_I8042 is not set
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
# CONFIG_HW_RANDOM is not set
# CONFIG_HWMON is not set
# CONFIG_MFD_SUPPORT is not set
CONFIG_FB=y
CONFIG_FB_CIRRUS=y
# CONFIG_VGA_CONSOLE is not set
# CONFIG_HID_SUPPORT is not set
# CONFIG_USB_SUPPORT is not set
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_QUOTA=y
CONFIG_PROC_KCORE=y
CONFIG_TMPFS=y
CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
CONFIG_ROOT_NFS=y
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
7 changes: 7 additions & 0 deletions board/qemu/mips-malta/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Run the emulation with:

qemu-system-mips -M malta -kernel output/images/vmlinux -serial stdio -hda output/images/rootfs.ext2 -append "root=/dev/hda"

The login prompt will appear in the terminal that started Qemu. The
graphical window is the framebuffer. No keyboard support has been
enabled.
File renamed without changes.
Loading

0 comments on commit 7e18b75

Please sign in to comment.