summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES10
-rw-r--r--Makefile2
-rw-r--r--package/Makefile.in2
-rw-r--r--package/Makefile.package.in16
-rw-r--r--package/boa/boa.mk2
-rw-r--r--package/busybox/busybox-1.16.x.config8
-rw-r--r--package/customize/customize.mk2
-rw-r--r--package/hostapd/hostapd.mk1
-rw-r--r--package/pciutils/Config.in3
-rw-r--r--package/pciutils/pciutils.mk4
-rw-r--r--package/sed/sed.mk2
-rw-r--r--package/usbutils/Config.in1
-rw-r--r--package/usbutils/usbutils.mk7
-rw-r--r--package/wpa_supplicant/wpa_supplicant.mk1
-rw-r--r--package/x11r7/libxcb/libxcb.mk3
-rw-r--r--package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch35
-rwxr-xr-xtoolchain/dependencies/check-host-sed.sh2
-rwxr-xr-xtoolchain/dependencies/dependencies.sh2
18 files changed, 87 insertions, 16 deletions
diff --git a/CHANGES b/CHANGES
index 19cb48676..63295a242 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,13 +2,19 @@
Fixes all over the tree.
- Updated/fixed packages: hal, mplayer,
- xdriver_xf86-video-openchrome, usb_modeswitch
+ Updated/fixed packages: busybox, customize, hal, hostapd, libxcb,
+ mplayer, pciutils, xdriver_xf86-video-openchrome,
+ usb_modeswitch, usbutils, wpa_supplicant, xlib_libX11
Issues resolved (http://bugs.uclibc.org):
+ #849: "customize" package copies files to wrong place in target tree
#985: Bump usb_modeswitch package to 1.1.0
+ #1135: Package customize. Wrong copying
#1525: Package hal deletes a whole <target>/etc/rc.d directory
+ #1699: Fix usbutils dependencies and bump
+ #1705: Fix pciutils broken cross compiling
+ #1717: External toolchain fixes for hostapd & wpa_supplicant
2010.05-rc1, Released May 3rd, 2010:
diff --git a/Makefile b/Makefile
index 5da21d888..a4bf4b570 100644
--- a/Makefile
+++ b/Makefile
@@ -153,7 +153,7 @@ cc-option=$(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /dev
unexport CROSS_COMPILE
unexport ARCH
-GNU_HOST_NAME=$(shell package/gnuconfig/config.guess)
+GNU_HOST_NAME:=$(shell package/gnuconfig/config.guess)
#############################################################
#
diff --git a/package/Makefile.in b/package/Makefile.in
index 2ed7f423c..7ac429c81 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -110,7 +110,7 @@ LIBC=uclibc
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
LIBC=uclibc
else
-LIBC=glibc
+LIBC=
endif
ifeq ($(BR2_ARM_EABI),y)
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index e98fda85d..c2f86c7be 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -24,7 +24,21 @@
# UPPERCASE Macro -- transform its argument to uppercase and replace dots and
# hyphens to underscores
-UPPERCASE = $(shell echo $(1) | tr "a-z.-" "A-Z__")
+
+# Heavily inspired by the up macro from gmsl (http://gmsl.sf.net)
+# This is approx 5 times faster than forking a shell and tr, and
+# as this macro is used a lot it matters
+# This works by creating translation character pairs (E.G. a:A b:B)
+# and then looping though all of them running $(subst from,to,text)
+[FROM] := a b c d e f g h i j k l m n o p q r s t u v w x y z . -
+[TO] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z _ _
+
+UPPERCASE = $(strip $(eval __tmp := $1) \
+ $(foreach c, $(join $(addsuffix :,$([FROM])),$([TO])), \
+ $(eval __tmp := \
+ $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)),\
+ $(__tmp)))) \
+ $(__tmp))
# Define extrators for different archive suffixes
INFLATE.bz2 = $(BZCAT)
diff --git a/package/boa/boa.mk b/package/boa/boa.mk
index 9356d52be..a51de96fe 100644
--- a/package/boa/boa.mk
+++ b/package/boa/boa.mk
@@ -12,7 +12,7 @@ BOA_VERSION=0.94.14rc21
BOA_SOURCE=boa-$(BOA_VERSION).tar.gz
BOA_CAT:=$(ZCAT)
BOA_SITE=http://www.boa.org/
-BOA_DIR=$(BUILD_DIR)/${shell basename $(BOA_SOURCE) .tar.gz}
+BOA_DIR=$(BUILD_DIR)/boa-$(BOA_VERSION)
BOA_WORKDIR=$(BUILD_DIR)/boa_workdir
$(DL_DIR)/$(BOA_SOURCE):
diff --git a/package/busybox/busybox-1.16.x.config b/package/busybox/busybox-1.16.x.config
index 0b3dcc568..e5f51023a 100644
--- a/package/busybox/busybox-1.16.x.config
+++ b/package/busybox/busybox-1.16.x.config
@@ -604,10 +604,10 @@ CONFIG_DEVMEM=y
CONFIG_EJECT=y
# CONFIG_FEATURE_EJECT_SCSI is not set
# CONFIG_FBSPLASH is not set
-CONFIG_FLASHCP=y
-CONFIG_FLASH_LOCK=y
-CONFIG_FLASH_UNLOCK=y
-CONFIG_FLASH_ERASEALL=y
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
# CONFIG_IONICE is not set
# CONFIG_INOTIFYD is not set
CONFIG_LAST=y
diff --git a/package/customize/customize.mk b/package/customize/customize.mk
index 780e42b00..d2b851872 100644
--- a/package/customize/customize.mk
+++ b/package/customize/customize.mk
@@ -11,7 +11,7 @@ $(BUILD_DIR)/.customize:
/bin/ls -d * > $(BUILD_DIR)/series || \
touch $(BUILD_DIR)/series )
for f in `cat $(BUILD_DIR)/series`; do \
- cp -af $(CUST_DIR)/$$f $(TARGET_DIR)/$$f; \
+ cp -af $(CUST_DIR)/$$f $(TARGET_DIR); \
done
rm -f $(BUILD_DIR)/series
touch $@
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 5c5c1e300..2359fd348 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -20,6 +20,7 @@ $(HOSTAPD_TARGET_CONFIGURE):
cp $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/defconfig $(HOSTAPD_CONFIG)
$(SED) "s/\/local//" $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/Makefile
echo "CFLAGS += $(TARGET_CFLAGS)" >>$(HOSTAPD_CONFIG)
+ echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(HOSTAPD_CONFIG)
echo "CC = $(TARGET_CC)" >>$(HOSTAPD_CONFIG)
# IPv6
ifneq ($(BR2_INET_IPV6),y)
diff --git a/package/pciutils/Config.in b/package/pciutils/Config.in
index bc026602f..07fc49b82 100644
--- a/package/pciutils/Config.in
+++ b/package/pciutils/Config.in
@@ -7,4 +7,7 @@ config BR2_PACKAGE_PCIUTILS
Various utilities dealing with the PCI bus.
Provides things like setpci and lspci.
+ You'll need a copy of pci.ids or pci.ids.gz in your
+ target skeleton to enjoy verbose output.
+
http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html
diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk
index 393162f62..2b999dfb5 100644
--- a/package/pciutils/pciutils.mk
+++ b/package/pciutils/pciutils.mk
@@ -18,10 +18,12 @@ define PCIUTILS_CONFIGURE_CMDS
$(SED) 's/uname -s/echo Linux/' \
-e 's/uname -r/echo $(LINUX_HEADERS_VERSION)/' \
$(PCIUTILS_DIR)/lib/configure
+ $(SED) 's/^STRIP/#STRIP/' $(PCIUTILS_DIR)/Makefile
endef
define PCIUTILS_BUILD_CMDS
$(MAKE) CC="$(TARGET_CC)" \
+ HOST="$(KERNEL_ARCH)-linux" \
OPT="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
RANLIB=$(TARGET_RANLIB) \
@@ -33,8 +35,10 @@ define PCIUTILS_BUILD_CMDS
SHAREDIR=/usr/share/misc
endef
+# Ditch install-lib if SHARED is an option in the future
define PCIUTILS_INSTALL_TARGET_CMDS
$(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(TARGET_DIR)/usr install
+ $(MAKE) BUILDDIR=$(@D) -C $(@D) PREFIX=$(TARGET_DIR)/usr install-lib
endef
$(eval $(call GENTARGETS,package,pciutils))
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index 650872569..35cedce5b 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -17,7 +17,7 @@ endif
#HOST_SED_DIR:=$(STAGING_DIR)
HOST_SED_DIR:=$(TOOLCHAIN_DIR)
SED:=$(HOST_SED_DIR)/bin/sed -i -e
-HOST_SED_BINARY=$(shell package/sed/sedcheck.sh)
+HOST_SED_BINARY:=$(shell package/sed/sedcheck.sh)
HOST_SED_IF_ANY=$(shell toolchain/dependencies/check-host-sed.sh)
$(DL_DIR)/$(SED_SOURCE):
diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in
index 6e5435277..427325231 100644
--- a/package/usbutils/Config.in
+++ b/package/usbutils/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_USBUTILS
bool "usbutils"
+ select BR2_PACKAGE_LIBUSB
select BR2_PACKAGE_LIBUSB_COMPAT
help
USB enumeration utilities
diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk
index 880a2c843..f0952976e 100644
--- a/package/usbutils/usbutils.mk
+++ b/package/usbutils/usbutils.mk
@@ -4,8 +4,8 @@
#
#############################################################
-USBUTILS_VERSION = 0.86
-USBUTILS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/linux-usb/
+USBUTILS_VERSION = 0.87
+USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
USBUTILS_DEPENDENCIES = host-pkg-config libusb-compat
ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y)
@@ -25,4 +25,7 @@ ifeq ($(BR2_PACKAGE_USBUTILS_ZLIB),y)
else
rm -f $(TARGET_DIR)/usr/share/usb.ids.gz
endif
+ifneq ($(BR2_HAVE_DEVFILES),y)
+ rm -f $(TARGET_DIR)/usr/bin/libusb-config
+endif
touch $@
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index 01436b189..c6bb0585b 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -33,6 +33,7 @@ $(eval $(call AUTOTARGETS,package,wpa_supplicant))
$(WPA_SUPPLICANT_TARGET_CONFIGURE):
cp $(WPA_SUPPLICANT_DIR)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG)
echo "CFLAGS += $(TARGET_CFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
+ echo "LDFLAGS += $(TARGET_LDFLAGS)" >>$(WPA_SUPPLICANT_CONFIG)
echo "CC = $(TARGET_CC)" >>$(WPA_SUPPLICANT_CONFIG)
$(SED) "s/\/local//" $(WPA_SUPPLICANT_DIR)/wpa_supplicant/Makefile
ifneq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y)
diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk
index ec9843e1b..c8b70ea18 100644
--- a/package/x11r7/libxcb/libxcb.mk
+++ b/package/x11r7/libxcb/libxcb.mk
@@ -13,7 +13,8 @@ LIBXCB_AUTORECONF = NO
LIBXCB_LIBTOOL_PATCH = NO
LIBXCB_DEPENDENCIES = host-libxslt pthread-stubs xcb-proto xlib_libXdmcp xlib_libXau
LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)"
-LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb XCBPROTO_XCBPYTHONDIR=$(STAGING_DIR)/usr/lib/python2.6/site-packages
+HOST_PYTHON_VERSION=$(shell python --version 2>&1 | sed 's/Python \(2\.[0-9]\)\..*/\1/')
+LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb XCBPROTO_XCBPYTHONDIR=$(STAGING_DIR)/usr/lib/python$(HOST_PYTHON_VERSION)/site-packages
$(eval $(call AUTOTARGETS,package/x11r7,libxcb))
diff --git a/package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch b/package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch
new file mode 100644
index 000000000..9c4eae2b3
--- /dev/null
+++ b/package/x11r7/xlib_libX11/xlib_libX11-1.3.2-keysymdef.patch
@@ -0,0 +1,35 @@
+[patch]: configure: add --with-keysymdef argument for cross compilation
+
+Based on a similar patch from Openembedded.
+
+The libX11 configure script hardcodes the location to keysymdef.h as
+<prefix>/include/X11/keysymdef.h, which is fine for native compilation,
+but breaks with cross compilation as that directory is a location on
+the target, not the build host.
+
+Fix it by providing an explicit --with-keysymdef=<full-path-to-file>.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>Index: libX11-1.1.5/configure.ac
+===================================================================
+Index: xlib_libX11-1.3.2/configure.ac
+===================================================================
+--- xlib_libX11-1.3.2.orig/configure.ac 2009-10-23 22:55:03.000000000 +0200
++++ xlib_libX11-1.3.2/configure.ac 2010-05-04 16:26:39.000000000 +0200
+@@ -280,8 +280,15 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysymdef.h])
+-dir=`pkg-config --variable=includedir xproto`
+-KEYSYMDEF="$dir/X11/keysymdef.h"
++AC_ARG_WITH(keysymdef,
++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]),
++ KEYSYMDEF=$withval, KEYSYMDEF="")
++
++if test x$KEYSYMDEF = x; then
++ dir=`pkg-config --variable=includedir xproto`
++ KEYSYMDEF="$dir/X11/keysymdef.h"
++fi
++
+ if test -f "$KEYSYMDEF"; then
+ AC_MSG_RESULT([$KEYSYMDEF])
+ else
diff --git a/toolchain/dependencies/check-host-sed.sh b/toolchain/dependencies/check-host-sed.sh
index 71f0eb9e8..188b7210b 100755
--- a/toolchain/dependencies/check-host-sed.sh
+++ b/toolchain/dependencies/check-host-sed.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
SEDLIST="/usr/bin/sed /bin/sed sed gnused gsed"
for SED in $SEDLIST
diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index 013c1d57d..923c76bcd 100755
--- a/toolchain/dependencies/dependencies.sh
+++ b/toolchain/dependencies/dependencies.sh
@@ -122,7 +122,7 @@ if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then
fi;
# Check that a few mandatory programs are installed
-for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio ; do
+for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio python ; do
if ! which $prog > /dev/null ; then
/bin/echo -e "\nYou must install '$prog' on your build machine";
if test $prog = "makeinfo" ; then
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 06:53:05 +0000