update for 2010.05

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
xserver_xorg-server: Use $(MAKE1) for make install
2010-05-30 22:24:10 +02:00 · 2010-05-30 20:13:45 +02:00 · 2010-05-30 20:12:52 +02:00 · 2010-05-30 10:42:17 +02:00 · 2010-05-30 09:32:15 +02:00 · 2010-05-29 20:09:25 +02:00
15 changed files with 75 additions and 45 deletions
--- a/13
+++ b/13
@@ -1,3 +1,16 @@
+2010.05, Released May 30th, 2010:
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: coreutils, hal, libcap,
+	lockfile-progs, ncftp, xserver_xorg-server
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#1789: binutils fails to build for i386
+	#1843: Fix libcap build failure
+	#1855: XORG Keyboard driver fails to compile
+
 2010.05-rc3, Released May 27th, 2010:

 	Fixes all over the tree.
--- a/Config.in
+++ b/Config.in
@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG

 config BR2_VERSION
 	string
-	default "2010.05-rc3"
+	default "2010.05"

 source "target/Config.in.arch"
 source "target/device/Config.in"
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,14 +6,14 @@

 <p>

-The latest stable release is <b>2010.02</b>, which can be downloaded
+The latest stable release is <b>2010.05</b>, which can be downloaded
 here:<p>

-<a href="/downloads/buildroot-2010.02.tar.gz">buildroot-2010.02.tar.gz</a>
+<a href="/downloads/buildroot-2010.05.tar.gz">buildroot-2010.05.tar.gz</a>
 or
-<a href="/downloads/buildroot-2010.02.tar.bz2">buildroot-2010.02.tar.bz2</a>.
+<a href="/downloads/buildroot-2010.05.tar.bz2">buildroot-2010.05.tar.bz2</a>.
 <p>
-
+<!--
 The latest release candidate is <b>2010.05-rc3</b>, which can be
 downloaded here:<p>

@@ -21,7 +21,7 @@ downloaded here:<p>
 or
 <a href="/downloads/buildroot-2010.05-rc3.tar.bz2">buildroot-2010.05-rc3.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.

--- a/docs/news.html
+++ b/docs/news.html
@@ -6,6 +6,15 @@

 <ul>

+  <li><b>30 May 2010 -- 2010.05 released</b>
+
+    <p>The stable 2010.05 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2010.05">CHANGES</a>
+    file for more details, and go to the <a href="/downloads/">downloads page</a>
+    to pick up the <a href="/downloads/buildroot-2010.05.tar.bz2">2010.05
+    release</a>.</p>
+
  <li><b>27 May 2010 -- 2010.05-rc3 released</b>

    <p>RC3 is out with more cleanups and bugfixes, see the <a
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -77,11 +77,6 @@ ifeq ($(BR2_LARGEFILE),y)
 TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif

-# Host packages are sometimes linked against host libraries installed
-# in $(HOST_DIR)/usr/lib. As we cannot add $(HOST_DIR)/usr/lib to
-# LD_LIBRARY_PATH when building target packages because it causes
-# libtool breakage, we force a rpath to be added to host binaries.
-HOST_CFLAGS+=-Wl,-rpath -Wl,$(HOST_DIR)/usr/lib

 #########################################################################
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -12,7 +12,8 @@ COREUTILS_DIR:=$(BUILD_DIR)/coreutils-$(COREUTILS_VERSION)
 COREUTILS_BINARY:=src/vdir
 COREUTILS_TARGET_BINARY:=bin/vdir
 BIN_PROGS:=cat chgrp chmod chown cp date dd df dir echo false hostname \
-	ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true uname
+	ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \
+	uname join

 $(DL_DIR)/$(COREUTILS_SOURCE):
 	 $(call DOWNLOAD,$(COREUTILS_SITE),$(COREUTILS_SOURCE))
--- a/package/hal/Config.in
+++ b/package/hal/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_HAL
 	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_DBUS
-	select BR2_PACKAGE_DBUS_EXPAT
+	select BR2_DBUS_EXPAT
 	select BR2_PACKAGE_DBUS_GLIB
 	select BR2_PACKAGE_HWDATA
 	select BR2_PACKAGE_UDEV
--- a/package/libcap/libcap-2.19-build-system.patch
+++ b/package/libcap/libcap-2.19-build-system.patch
@@ -1,13 +1,19 @@
---
- Make.Rules      |   15 ++++++++-------
- libcap/Makefile |    2 +-
- 2 files changed, 9 insertions(+), 8 deletions(-)
-
-Index: libcap-2.19/Make.Rules
-===================================================================
--- libcap-2.19.orig/Make.Rules
-+++ libcap-2.19/Make.Rules
-@@ -45,24 +45,25 @@
+diff -Nura libcap-2.19.orig/libcap/Makefile libcap-2.19/libcap/Makefile
+--- libcap-2.19.orig/libcap/Makefile	2008-12-04 05:03:12.000000000 -0200
+++ libcap-2.19/libcap/Makefile	2010-05-28 14:32:06.290297694 -0300
+@@ -33,7 +33,7 @@
+ endif
+ 
+ _makenames: _makenames.c cap_names.list.h
+-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
+ 
+ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
+diff -Nura libcap-2.19.orig/Make.Rules libcap-2.19/Make.Rules
+--- libcap-2.19.orig/Make.Rules	2010-01-13 23:04:58.000000000 -0300
+++ libcap-2.19/Make.Rules	2010-05-28 14:32:31.802296186 -0300
+@@ -45,25 +45,26 @@
 KERNEL_HEADERS := $(topdir)/libcap/include
 IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
 
@@ -36,20 +42,9 @@ Index: libcap-2.19/Make.Rules
 INCS=$(topdir)/libcap/include/sys/capability.h
 LDFLAGS += -L$(topdir)/libcap
 CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH)
+-PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
 +CFLAGS_FOR_BUILD += $(IPATH)
- PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
+PAM_CAP := no
 INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
 DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
-Index: libcap-2.19/libcap/Makefile
-===================================================================
--- libcap-2.19.orig/libcap/Makefile
-+++ libcap-2.19/libcap/Makefile
-@@ -33,7 +33,7 @@
- endif
- 
- _makenames: _makenames.c cap_names.list.h
-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
- 
- cap_names.h: _makenames
- 	./_makenames > cap_names.h
+ LIBATTR := yes
--- a/package/lockfile-progs/lockfile-progs.mk
+++ b/package/lockfile-progs/lockfile-progs.mk
@@ -21,7 +21,7 @@ $(LOCKFILE_PROGS_DIR)/.unpacked: $(DL_DIR)/$(LOCKFILE_PROGS_SOURCE)
 	touch $(LOCKFILE_PROGS_DIR)/.unpacked

 $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY): $(LOCKFILE_PROGS_DIR)/.unpacked
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(TARGET_LDFLAGS)" \
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(TARGET_CONFIGURE_ENV) \
 		-C $(LOCKFILE_PROGS_DIR)
 	cp -a $(LOCKFILE_PROGS_DIR)/bin/lockfile* $(TARGET_DIR)/usr/bin
 	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LOCKFILE_PROGS_BINARY)
--- a/package/ncftp/ncftp.mk
+++ b/package/ncftp/ncftp.mk
@@ -3,7 +3,7 @@
 # ncftp client
 #
 #############################################################
-NCFTP_VERSION:=3.2.2
+NCFTP_VERSION:=3.2.4
 NCFTP_SOURCE:=ncftp-$(NCFTP_VERSION)-src.tar.bz2
 NCFTP_SITE:=ftp://ftp.ncftp.com/ncftp

--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -19,11 +19,10 @@ choice

 config BR2_PACKAGE_XSERVER_xorg
 	bool "Modular X.org"
-	# depending on BR2_ENABLE_LOCALE gives a recursion error with dbus
-	depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP # && BR2_ENABLE_LOCALE
+	depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP

-comment 'X.org requires largefile, locale and C++ support'
-	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE)
+comment 'X.org requires largefile and C++ support'
+	depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP)

 config BR2_PACKAGE_XSERVER_tinyx
 	bool "TinyX"
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -7,6 +7,7 @@
 XSERVER_XORG_SERVER_VERSION = 1.7.5
 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
 XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
+XSERVER_XORG_XSERVER_MAKE = $(MAKE1) # make install fails with parallel make
 XSERVER_XORG_SERVER_AUTORECONF = NO
 XSERVER_XORG_SERVER_LIBTOOL_PATCH = NO
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -10,7 +10,7 @@ ifeq ($(DOWNLOAD_LINUX26_VERSION),)
 # User did not define linux version, try using headers
 ifeq ($(LINUX_HEADERS_VERSION),)
 # We did not have headers (this is for real???)
-# Version of linuc before patches
+# Version of linux before patches
 DOWNLOAD_LINUX26_VERSION=2.6.22.1
 # Version of Linux after applying any patches
 LINUX26_VERSION=2.6.22.1
@@ -44,9 +44,14 @@ ifndef LINUX26_FORMAT
 ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)),)
 LINUX26_FORMAT=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT))
 else
+ifneq ($(filter i386 x86-64,$(KERNEL_ARCH)),)
+# zImage target no longer available on x86 since 2.6.30
+LINUX26_FORMAT=bzImage
+else
 LINUX26_FORMAT=zImage
 endif
 endif
+endif

 # Has to be set by the target/device
 ifndef LINUX26_BINLOC
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -111,9 +111,14 @@ ifndef LINUX26_FORMAT
 ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)),)
 LINUX26_FORMAT:=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT))
 else
+ifneq ($(filter i386 x86-64,$(KERNEL_ARCH)),)
+# zImage target no longer available on x86 since 2.6.30
+LINUX26_FORMAT=bzImage
+else
 LINUX26_FORMAT:=zImage
 endif
 endif
+endif

 # -----------------------------------------------------------------------------
 # Has to be set by the target/device
--- a/toolchain/external-toolchain/ext-tool.mk
+++ b/toolchain/external-toolchain/ext-tool.mk
@@ -251,7 +251,7 @@ check_cross_compiler_exists = \

 uclibc: dependencies $(STAMP_DIR)/ext-toolchain-installed

-EXTERNAL_LIBS=libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libpthread.so libresolv.so librt.so libutil.so
+EXTERNAL_LIBS=libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
 EXTERNAL_LIBS+=ld-uClibc.so
 else
@@ -262,6 +262,13 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 EXTERNAL_LIBS+=libstdc++.so
 endif

+ifneq ($(BR2_PTHREADS_NONE),y)
+EXTERNAL_LIBS+=libpthread.so
+ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
+EXTERNAL_LIBS+=libthread_db.so
+endif # gdbserver
+endif # ! no threads
+
 # SYSROOT_DIR selection. We first try the -print-sysroot option,
 # available in gcc 4.4.x and in some Codesourcery toolchains. If this
 # option is not available, we fallback to the value of --with-sysroot
Author	SHA1	Message	Date
Peter Korsgaard	07da619d75	update for 2010.05 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-30 22:24:10 +02:00
Peter Korsgaard	41c49b3c9f	xserver_xorg-server: Use $(MAKE1) for make install Xserver installation fails with parallel make jobs. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-30 20:13:45 +02:00
Peter Korsgaard	7f1bca8479	Revert "xserver_xorg-server: Use $(MAKE1) for make install" This reverts commit `b7acacaf6e`. Closes #1855 We DO need to install into staging for all the xdriver-* packages, so revert this commit. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-30 20:12:52 +02:00
Peter Korsgaard	e1a7d916e9	Revert "Add -rpath option for host package compilation" Closes #1789 This reverts commit `6b939d40f6`. The problem this commit tries to fix is valid, but the fix unfortunately seems to cause worse problems on certain distributions/setups, so revert for now. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-30 10:42:17 +02:00
Peter Korsgaard	a4bba08343	lockfile-progs: use correct CFLAGS Use the correct CFLAGS from BR and not just the LDFLAGS. This is especially important for external toolchain setups, but the lockfile-progs buildsystem also hardcodes -Werror, which breaks the build in certain setups. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-30 09:32:15 +02:00
Julien Boibessot	bc065596b4	ncftp: bump version Due to recent 3.2.4 release, 3.2.2 download address has changed, so I prefered bump version to 3.2.4 rather than changing NCFTP_SITE. Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-29 20:09:25 +02:00
Yann E. MORIN	1f39e6e206	external toolchain: also copy the libthread_db.so for gdbserver gdbserver dlopen(3)s libthread_db.so at runtime, so there is no dependency on it (does not appear as being (NEEDED)). Copy libthread_db.so from external toolchain when gdbserver is enbled. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-28 23:31:39 +02:00
Yann E. MORIN	b6e67cc363	toolchain/external: only copy the pthread lib if needed If threads are disabled, do not try to copy the libpthread.so from the external library. It is still expected that the BR configuration matches the external toolchain setup, and no check is done to enforce that. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-28 23:31:15 +02:00
Peter Korsgaard	1041c8383b	CHANGES: xserver-xorg has been changed Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-28 23:17:37 +02:00
Paulius Zaleckas	b7acacaf6e	xserver_xorg-server: Use $(MAKE1) for make install Xserver installation fails with parallel make jobs. Installation to staging is not needed. So just remove it instead of converting to $(MAKE1). Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-28 22:47:52 +02:00
Paulius Zaleckas	b578f670d1	Remove locale dependency from xserver XServer compiles just fine without locale support Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-28 22:00:42 +02:00
Gustavo Zacarias	2816c33c3d	libcap: fix build issue when host pam is around Closes #1843 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-28 21:47:46 +02:00
Bjørn Forsman	c0b3dc2005	coreutils: add 'join' coreutils: add 'join' to the list of files that are copied to target rootfs. Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-28 12:06:47 +02:00
Peter Korsgaard	98de259aee	linux: zImage target no longer available on x86 The legacy zImage target for x86 was removed from the kernel in 2.6.30, and we state in Config.in that we'll use bzImage if BR2_PACKAGE_LINUX_FORMAT isn't set, so ensure we do so for x86. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-28 12:03:56 +02:00
Peter Korsgaard	170b3d3d05	hal: dbus expat option is BR2_DBUS_EXPAT Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>	2010-05-27 14:48:47 +02:00