* [Buildroot] [pull request] Pull request for branch misc-fixes
@ 2010-04-28 21:40 Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 01/19] autotools: fix autoreconf check Thomas Petazzoni
` (19 more replies)
0 siblings, 20 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Hello,
Here is a set of patches, some of them are important fixes that should
really be merged before 2010.05, some other are improvements and
cleanups that can be postponed if needed.
The important ones are :
libxslt: fix host compilation
uClibc: add UCLIBC_HAS_NFTW to default configuration
uclibc: make sure the default configuration doesn't ask questions
Fix autotools configuration cache handling
Best regards,
Thomas
The following changes since commit 671ec3917b7b8d9e6a22c1f881ff46808e3d8806:
Peter Korsgaard (1):
alsa-utils: alsamixer needs WCHAR
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot misc-fixes
Thomas Petazzoni (19):
autotools: fix autoreconf check
libxslt: fix host compilation
openssl: convert to the generic infrastructure
autotools: inherit LIBTOOL_PATCH for host packages
packages: remove useless HOST_*_LIBTOOL_PATCH
autotools: fix referencing to LIBTOOL_PATCH variable
freetype: disable autoreconf
packages: handle interrupted downloads
uClibc: add UCLIBC_HAS_NFTW to default configuration
uclibc: make sure the default configuration doesn't ask questions
Commonalize the definition of TOOLCHAIN_DIR
Get rid of KERNEL_CROSS
Remove latest users of the ROOTFS_SUFFIX thing
Get rid of the code computing ROOTFS_SUFFIX
Update defconfigs after BR2_ROOTFS_SUFFIX removal
Remove BR2_GNU_TARGET_SUFFIX and compute GNU_TARGET_NAME
Update defconfigs after BR2_GNU_TARGET_SUFFIX removal
Unverbosify autoreconf output
Fix autotools configuration cache handling
Config.in | 18 -----
Makefile | 2 +
configs/arm_toolchain_defconfig | 2 -
configs/at91rm9200df_defconfig | 2 -
configs/at91rm9200df_ext_bare_defconfig | 2 -
configs/at91rm9200df_ext_defconfig | 2 -
configs/at91sam9260dfc_defconfig | 2 -
configs/at91sam9260dfc_ext_bare_defconfig | 2 -
configs/at91sam9260dfc_ext_defconfig | 2 -
configs/at91sam9260pf_defconfig | 1 -
configs/at91sam9261ek_defconfig | 2 -
configs/at91sam9261ek_ext_bare_defconfig | 2 -
configs/at91sam9261ek_ext_defconfig | 2 -
configs/at91sam9263ek_defconfig | 2 -
configs/at91sam9263ek_ext_bare_defconfig | 2 -
configs/at91sam9263ek_ext_defconfig | 2 -
configs/at91sam9g20dfc_defconfig | 2 -
configs/at91sam9g20dfc_ext_bare_defconfig | 2 -
configs/at91sam9g20dfc_ext_defconfig | 2 -
configs/atngw100-base_defconfig | 2 -
configs/atngw100_defconfig | 2 -
configs/atstk1005_defconfig | 2 -
configs/atstk100x_defconfig | 2 -
configs/i386_defconfig | 2 -
configs/i686_defconfig | 2 -
configs/integrator926_defconfig | 2 -
configs/integrator926_huge_defconfig | 2 -
configs/kb9202_defconfig | 2 -
configs/v100sc2_defconfig | 2 -
package/Makefile.autotools.in | 15 +++-
package/Makefile.in | 29 ++++----
package/Makefile.package.in | 8 ++-
package/autoconf/autoconf.mk | 2 +-
package/dbus/dbus.mk | 1 -
package/directfb/directfb.mk | 1 -
package/expat/expat.mk | 1 -
package/fakeroot/fakeroot.mk | 1 -
package/freetype/freetype.mk | 2 +-
package/libglib2/libglib2.mk | 1 -
package/libpng/libpng.mk | 1 -
package/libxml2/libxml2.mk | 2 -
package/libxslt/libxslt.mk | 3 +-
package/openssl/openssl.mk | 85 +++++++++++++---------
package/pcmcia/pcmcia.mk | 2 +-
package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 1 -
target/linux/Makefile.in | 5 +-
target/linux/Makefile.in.advanced | 5 +-
toolchain/uClibc/uClibc-0.9.31.config | 2 +-
toolchain/uClibc/uclibc.mk | 4 +-
49 files changed, 98 insertions(+), 146 deletions(-)
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 01/19] autotools: fix autoreconf check
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 02/19] libxslt: fix host compilation Thomas Petazzoni
` (18 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
The autoreconf check was incorrect, missing a $ sign to properly
reference a package-specific variable. There was no visible effect
until now since :
* The existing syntax allowed to access the value defined in the
package specific .mk file, so when AUTORECONF was set to YES by a
package, it was working.
* The default value in Makefile.autotools.in was NO. In fact, when a
package .mkf file wasn't defining the AUTORECONF variable, the
Makefile.autotools.in test was testing the empty string against
'YES', which was false, leading to the AUTORECONF not being done,
which was the desired effect.
However, in a later patch, we intend to change this default value.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.autotools.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index a4be8c8..d624881 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -161,7 +161,7 @@ define AUTORECONF_HOOK
fi
endef
-ifeq ($($(2)_AUTORECONF),YES)
+ifeq ($$($(2)_AUTORECONF),YES)
$(2)_POST_PATCH_HOOKS += AUTORECONF_HOOK
$(2)_DEPENDENCIES += host-automake host-autoconf host-libtool
endif
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 02/19] libxslt: fix host compilation
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 01/19] autotools: fix autoreconf check Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 03/19] openssl: convert to the generic infrastructure Thomas Petazzoni
` (17 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Do not build against libgcrypt on the host, since we don't build
libgcrypt ourself, and it might fail even when libgcrypt is installed
on the host:
...configure...
checking for libgcrypt-config... /usr/bin/libgcrypt-config
Crypto extensions will be available.
...build...
gcc: /usr/lib/libgcrypt.so: No such file or directory
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/libxslt/libxslt.mk | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk
index 407924d..e77663d 100644
--- a/package/libxslt/libxslt.mk
+++ b/package/libxslt/libxslt.mk
@@ -27,7 +27,8 @@ LIBXSLT_DEPENDENCIES = libxml2 $(LIBXSLT_DEPENDENCIES_EXTRA)
HOST_LIBXSLT_CONF_OPT = --enable-shared \
--without-debugging \
--without-python \
- --without-threads
+ --without-threads \
+ --without-crypto
HOST_LIBXSLT_DEPENDENCIES = host-libxml2
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 03/19] openssl: convert to the generic infrastructure
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 01/19] autotools: fix autoreconf check Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 02/19] libxslt: fix host compilation Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 04/19] autotools: inherit LIBTOOL_PATCH for host packages Thomas Petazzoni
` (16 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
OpenSSL is not using the autotools as its build system. Therefore, we
must use the generic infrastructure instead of the autotools one.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/openssl/openssl.mk | 85 ++++++++++++++++++++++++++-----------------
1 files changed, 51 insertions(+), 34 deletions(-)
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 0f8c83c..f1b8b9f 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -5,6 +5,8 @@
#############################################################
OPENSSL_VERSION:=0.9.8n
OPENSSL_SITE:=http://www.openssl.org/source
+OPENSSL_INSTALL_STAGING = YES
+OPENSSL_DEPENDENCIES = zlib
OPENSSL_TARGET_ARCH=generic32
@@ -19,17 +21,8 @@ ifeq ($(ARCH),x86_64)
OPENSSL_TARGET_ARCH=x86_64
endif
-OPENSSL_INSTALL_STAGING = YES
-OPENSSL_INSTALL_STAGING_OPT = INSTALL_PREFIX=$(STAGING_DIR) install
-
-OPENSSL_INSTALL_TARGET_OPT = INSTALL_PREFIX=$(TARGET_DIR) install
-
-OPENSSL_DEPENDENCIES = zlib
-
-$(eval $(call AUTOTARGETS,package,openssl))
-
-$(OPENSSL_TARGET_CONFIGURE):
- (cd $(OPENSSL_DIR); \
+define OPENSSL_CONFIGURE_CMDS
+ (cd $(@D); \
$(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \
./Configure \
@@ -43,38 +36,62 @@ $(OPENSSL_TARGET_CONFIGURE):
no-rc5 \
zlib-dynamic \
)
- $(SED) "s:-march=[-a-z0-9] ::" -e "s:-mcpu=[-a-z0-9] ::g" $(OPENSSL_DIR)/Makefile
- $(SED) "s:-O[0-9]:$(TARGET_CFLAGS):" $(OPENSSL_DIR)/Makefile
- touch $@
-
-$(OPENSSL_TARGET_BUILD):
- $(MAKE1) CC=$(TARGET_CC) -C $(OPENSSL_DIR) all build-shared
- $(MAKE1) CC=$(TARGET_CC) -C $(OPENSSL_DIR) do_linux-shared
- touch $@
-
-$(OPENSSL_HOOK_POST_INSTALL):
- $(if $(BR2_HAVE_DEVFILES),,rm -rf $(TARGET_DIR)/usr/lib/ssl)
-ifeq ($(BR2_PACKAGE_OPENSSL_BIN),y)
- $(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/bin/openssl
-else
+ $(SED) "s:-march=[-a-z0-9] ::" -e "s:-mcpu=[-a-z0-9] ::g" $(@D)/Makefile
+ $(SED) "s:-O[0-9]:$(TARGET_CFLAGS):" $(@D)/Makefile
+endef
+
+define OPENSSL_BUILD_CMDS
+ $(MAKE1) CC=$(TARGET_CC) -C $(@D) all build-shared
+ $(MAKE1) CC=$(TARGET_CC) -C $(@D) do_linux-shared
+endef
+
+define OPENSSL_INSTALL_STAGING_CMDS
+ $(MAKE1) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install
+endef
+
+define OPENSSL_INSTALL_TARGET_CMDS
+ $(MAKE1) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install
+endef
+
+define OPENSSL_REMOVE_DEV_FILES
+ rm -rf $(TARGET_DIR)/usr/lib/ssl
+endef
+
+ifneq ($(BR2_HAVE_DEVFILES),y)
+OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_DEV_FILES
+endif
+
+define OPENSSL_REMOVE_OPENSSL_BIN
rm -f $(TARGET_DIR)/usr/bin/openssl
+endef
+
+ifneq ($(BR2_PACKAGE_OPENSSL_BIN),y)
+OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_OPENSSL_BIN
endif
+
+define OPENSSL_INSTALL_FIXUPS
rm -f $(TARGET_DIR)/usr/bin/c_rehash
# libraries gets installed read only, so strip fails
+ chmod +w $(TARGET_DIR)/usr/lib/engines/lib*.so
for i in $(addprefix $(TARGET_DIR)/usr/lib/,libcrypto.so.* libssl.so.*); \
- do chmod +w $$i; $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $$i; done
-ifneq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
+ do chmod +w $$i; done
+endef
+
+OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_INSTALL_FIXUPS
+
+define OPENSSL_REMOVE_OPENSSL_ENGINES
rm -rf $(TARGET_DIR)/usr/lib/engines
-else
- chmod +w $(TARGET_DIR)/usr/lib/engines/lib*.so
- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/engines/lib*.so
+endef
+
+ifneq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
+OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_OPENSSL_ENGINES
endif
- touch $@
-$(OPENSSL_TARGET_UNINSTALL):
- $(call MESSAGE,"Uninstalling")
+define OPENSSL_UNINSTALL_CMDS
rm -rf $(addprefix $(TARGET_DIR)/,etc/ssl usr/bin/openssl usr/include/openssl)
rm -rf $(addprefix $(TARGET_DIR)/usr/lib/,ssl engines libcrypto* libssl* pkgconfig/libcrypto.pc)
rm -rf $(addprefix $(STAGING_DIR)/,etc/ssl usr/bin/openssl usr/include/openssl)
rm -rf $(addprefix $(STAGING_DIR)/usr/lib/,ssl engines libcrypto* libssl* pkgconfig/libcrypto.pc)
- rm -f $(OPENSSL_TARGET_INSTALL_TARGET) $(OPENSSL_HOOK_POST_INSTALL)
+endef
+
+$(eval $(call GENTARGETS,package,openssl))
\ No newline at end of file
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 04/19] autotools: inherit LIBTOOL_PATCH for host packages
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (2 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 03/19] openssl: convert to the generic infrastructure Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 05/19] packages: remove useless HOST_*_LIBTOOL_PATCH Thomas Petazzoni
` (15 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
When FOO_LIBTOOL_PATCH is defined, assume that the same value should
be used for HOST_FOO_LIBTOOL_PATCH.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.autotools.in | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index d624881..d8404d9 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -49,6 +49,14 @@ ifndef $(2)_SUBDIR
endif
endif
+ifndef $(2)_LIBTOOL_PATCH
+ ifdef $(3)_LIBTOOL_PATCH
+ $(2)_LIBTOOL_PATCH = $($(3)_LIBTOOL_PATCH)
+ else
+ $(2)_LIBTOOL_PATCH ?= YES
+ endif
+endif
+
$(2)_CONF_ENV ?=
$(2)_CONF_OPT ?=
$(2)_MAKE ?= $(MAKE)
@@ -56,7 +64,6 @@ $(2)_MAKE_ENV ?=
$(2)_MAKE_OPT ?=
$(2)_AUTORECONF ?= NO
$(2)_AUTORECONF_OPT ?=
-$(2)_LIBTOOL_PATCH ?= YES
$(2)_USE_CONFIG_CACHE ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
$(2)_INSTALL_STAGING_OPT ?= DESTDIR=$$(STAGING_DIR) install
ifeq ($(BR2_ENABLE_DEBUG),y)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 05/19] packages: remove useless HOST_*_LIBTOOL_PATCH
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (3 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 04/19] autotools: inherit LIBTOOL_PATCH for host packages Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 06/19] autotools: fix referencing to LIBTOOL_PATCH variable Thomas Petazzoni
` (14 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/dbus/dbus.mk | 1 -
package/directfb/directfb.mk | 1 -
package/expat/expat.mk | 1 -
package/fakeroot/fakeroot.mk | 1 -
package/freetype/freetype.mk | 1 -
package/libglib2/libglib2.mk | 1 -
package/libpng/libpng.mk | 1 -
package/libxml2/libxml2.mk | 2 --
package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 1 -
9 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index a97fc02..e93738e 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -7,7 +7,6 @@ DBUS_VERSION = 1.2.16
DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz
DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
DBUS_LIBTOOL_PATCH = NO
-HOST_DBUS_LIBTOOL_PATCH = NO
DBUS_INSTALL_STAGING = YES
DBUS_INSTALL_TARGET = YES
ifeq ($(BR2_ENABLE_DEBUG),y)
diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk
index a4ee3bc..57b2e17 100644
--- a/package/directfb/directfb.mk
+++ b/package/directfb/directfb.mk
@@ -9,7 +9,6 @@ DIRECTFB_SITE:=http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSIO
DIRECTFB_SOURCE:=DirectFB-$(DIRECTFB_VERSION).tar.gz
DIRECTFB_AUTORECONF = NO
DIRECTFB_LIBTOOL_PATCH = NO
-HOST_DIRECTFB_LIBTOOL_PATCH = NO
DIRECTFB_INSTALL_STAGING = YES
DIRECTFB_INSTALL_TARGET = YES
diff --git a/package/expat/expat.mk b/package/expat/expat.mk
index 368a297..5b4eb97 100644
--- a/package/expat/expat.mk
+++ b/package/expat/expat.mk
@@ -8,7 +8,6 @@ EXPAT_VERSION = 2.0.1
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.gz
EXPAT_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/expat
EXPAT_LIBTOOL_PATCH = NO
-HOST_EXPAT_LIBTOOL_PATCH = NO
EXPAT_INSTALL_STAGING = YES
EXPAT_INSTALL_TARGET = YES
# no install-strip / install-exec
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index a8eff52..fd60dbe 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -7,7 +7,6 @@ FAKEROOT_VERSION:=1.9.5
FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
FAKEROOT_SITE:=http://snapshot.debian.net/archive/2008/04/27/debian/pool/main/f/fakeroot/
FAKEROOT_LIBTOOL_PATCH=NO
-HOST_FAKEROOT_LIBTOOL_PATCH=NO
define FAKEROOT_PATCH_FAKEROOT_IN
# If using busybox getopt, make it be quiet.
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index cffe811..f19b854 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -7,7 +7,6 @@ FREETYPE_VERSION = 2.3.12
FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
FREETYPE_LIBTOOL_PATCH = NO
-HOST_FREETYPE_LIBTOOL_PATCH = NO
FREETYPE_INSTALL_STAGING = YES
FREETYPE_INSTALL_TARGET = YES
FREETYPE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index f122491..72a1396 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -11,7 +11,6 @@ LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_M
LIBGLIB2_AUTORECONF = NO
LIBGLIB2_LIBTOOL_PATCH = NO
-HOST_LIBGLIB2_LIBTOOL_PATCH = NO
LIBGLIB2_INSTALL_STAGING = YES
LIBGLIB2_INSTALL_TARGET = YES
LIBGLIB2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk
index 7547884..f458871 100644
--- a/package/libpng/libpng.mk
+++ b/package/libpng/libpng.mk
@@ -11,7 +11,6 @@ LIBPNG_INSTALL_STAGING = YES
LIBPNG_CONF_OPT = --without-libpng-compat
LIBPNG_DEPENDENCIES = host-pkg-config zlib
-HOST_LIBPNG_LIBTOOL_PATCH = NO
HOST_LIBPNG_CONF_OPT = --without-libpng-compat
HOST_LIBPNG_DEPENDENCIES = host-pkg-config host-zlib
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index 0cffa06..7680aa6 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -28,8 +28,6 @@ HOST_LIBXML2_CONF_OPT = \
--enable-shared --without-debugging --without-python \
--without-threads
-HOST_LIBXML2_LIBTOOL_PATCH = NO
-
$(eval $(call AUTOTARGETS,package,libxml2))
$(eval $(call AUTOTARGETS,package,libxml2,host))
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index 6bda081..cc5cdf4 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -13,7 +13,6 @@ XLIB_LIBFONTENC_INSTALL_STAGING = YES
XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
XLIB_LIBFONTENC_CONF_OPT = --enable-shared --disable-static
-HOST_XLIB_LIBFONTENC_LIBTOOL_PATCH = NO
HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto
$(eval $(call AUTOTARGETS,package/x11r7,xlib_libfontenc))
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 06/19] autotools: fix referencing to LIBTOOL_PATCH variable
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (4 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 05/19] packages: remove useless HOST_*_LIBTOOL_PATCH Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 07/19] freetype: disable autoreconf Thomas Petazzoni
` (13 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.autotools.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index d8404d9..96ff91f 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -151,7 +151,7 @@ define LIBTOOL_PATCH_HOOK
endef
# default values are not evaluated yet, so don't rely on this defaulting to YES
-ifneq ($($(2)_LIBTOOL_PATCH),NO)
+ifneq ($$($(2)_LIBTOOL_PATCH),NO)
$(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK
endif
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 07/19] freetype: disable autoreconf
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (5 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 06/19] autotools: fix referencing to LIBTOOL_PATCH variable Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-29 20:20 ` Paulius Zaleckas
2010-04-28 21:40 ` [Buildroot] [PATCH 08/19] packages: handle interrupted downloads Thomas Petazzoni
` (12 subsequent siblings)
19 siblings, 1 reply; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Freetype is unfortunately not a normal autotools-based package. Its
real configure script is in builds/unix/, but the build cannot be
started from here. And it doesn't rely on automake.
For absolute perfection, the package should probably be converted to
the GENTARGETS infrastructure, but it will generate a much, much
longer .mk file that the one we have today.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/freetype/freetype.mk | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index f19b854..e9a270f 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -7,6 +7,7 @@ FREETYPE_VERSION = 2.3.12
FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
FREETYPE_LIBTOOL_PATCH = NO
+FREETYPE_AUTORECONF = NO
FREETYPE_INSTALL_STAGING = YES
FREETYPE_INSTALL_TARGET = YES
FREETYPE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 08/19] packages: handle interrupted downloads
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (6 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 07/19] freetype: disable autoreconf Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 23:26 ` Paul Jones
2010-05-02 20:48 ` Peter Korsgaard
2010-04-28 21:40 ` [Buildroot] [PATCH 09/19] uClibc: add UCLIBC_HAS_NFTW to default configuration Thomas Petazzoni
` (11 subsequent siblings)
19 siblings, 2 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Currently, when package downloads are interrupted, next time you run
Buildroot, it thinks that the download is complete (the file is
present in $(DL_DIR), isn't it ?), which leads Buildroot to extract an
invalid tarball.
Therefore, the DOWNLOAD macro is enhanced to download the file under a
temporary name, and to rename it to the correct name one the download
has completed.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.package.in | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index e98fda8..8fa82a0 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -51,14 +51,18 @@ TERM_RESET := $(shell tput rmso)
# $(call DOWNLOAD,$(FOO_SITE),$(FOO_SOURCE))
################################################################################
-# support make source-check/external-deps
+# In order to avoid interrupted downloaded being considered as
+# complete, we download under a temporary name and rename once the
+# download is completed. The SPIDER thing is here to support make
+# source-check/external-deps
ifneq ($(SPIDER),)
DOWNLOAD=$(WGET) -P $(DL_DIR) $(1)/$(2)
else
define DOWNLOAD
$(Q)test -e $(DL_DIR)/$(2) || \
+ (rm -f $(DL_DIR)/$(2).tmp && \
for site in $(call qstrip,$(BR2_PRIMARY_SITE)) $(1) $(call qstrip,$(BR2_BACKUP_SITE)); \
- do $(WGET) -P $(DL_DIR) $$site/$(2) && exit; done
+ do $(WGET) -O $(DL_DIR)/$(2).tmp $$site/$(2) && mv $(DL_DIR)/$(2).tmp $(DL_DIR)/$(2) && exit; done)
endef
endif
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 09/19] uClibc: add UCLIBC_HAS_NFTW to default configuration
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (7 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 08/19] packages: handle interrupted downloads Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-29 6:52 ` Paulius Zaleckas
2010-04-28 21:40 ` [Buildroot] [PATCH 10/19] uclibc: make sure the default configuration doesn't ask questions Thomas Petazzoni
` (10 subsequent siblings)
19 siblings, 1 reply; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
UCLIBC_HAS_NFTW is a new knob in 0.9.31, which allows the obsolete and
deprecated ftw() to be compiled-out separatly from nftw(), which is
part of POSIX. nftw() should probably be enabled by default in uClibc,
and a bug has been opened about this on uClibc bug tracker
(https://bugs.busybox.net/show_bug.cgi?id=1597).
nftw() is, for example, used in Gtk+.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/uClibc/uClibc-0.9.31.config | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/toolchain/uClibc/uClibc-0.9.31.config b/toolchain/uClibc/uClibc-0.9.31.config
index 091f179..d2e54ad 100644
--- a/toolchain/uClibc/uClibc-0.9.31.config
+++ b/toolchain/uClibc/uClibc-0.9.31.config
@@ -191,7 +191,7 @@ UCLIBC_HAS_REGEX=y
UCLIBC_HAS_FNMATCH=y
# UCLIBC_HAS_FNMATCH_OLD is not set
# UCLIBC_HAS_WORDEXP is not set
-# UCLIBC_HAS_NFTW is not set
+UCLIBC_HAS_NFTW=y
UCLIBC_HAS_FTW=y
UCLIBC_HAS_GLOB=y
UCLIBC_HAS_GNU_GLOB=y
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 10/19] uclibc: make sure the default configuration doesn't ask questions
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (8 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 09/19] uClibc: add UCLIBC_HAS_NFTW to default configuration Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-05-02 22:02 ` Peter Korsgaard
2010-04-28 21:40 ` [Buildroot] [PATCH 11/19] Commonalize the definition of TOOLCHAIN_DIR Thomas Petazzoni
` (9 subsequent siblings)
19 siblings, 1 reply; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Since new configuration options have been added in 0.9.31, the value
of these configuration options should be determined, either by the
default configuration file we provide, or by uclibc.mk process.
The locale generation process should probably be improved in order to
allow building other locales than just en_US.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/uClibc/uclibc.mk | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index a9ee609..e8556d0 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -314,7 +314,7 @@ else
echo "# PTHREADS_DEBUG_SUPPORT is not set" >> $(UCLIBC_DIR)/.oldconfig
endif
ifeq ($(BR2_ENABLE_LOCALE),y)
- $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\nUCLIBC_PREGENERATED_LOCALE_DATA=n\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
+ $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\nUCLIBC_BUILD_MINIMAL_LOCALE=y\nUCLIBC_BUILD_MINIMAL_LOCALES="en_US"\nUCLIBC_PREGENERATED_LOCALE_DATA=n\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
else
$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=n,g' $(UCLIBC_DIR)/.oldconfig
endif
@@ -325,8 +325,10 @@ else
endif
ifeq ($(BR2_PROGRAM_INVOCATION),y)
$(SED) 's,^.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*,UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y,g' $(UCLIBC_DIR)/.oldconfig
+ $(SED) 's,^.*UCLIBC_HAS___PROGNAME.*,UCLIBC_HAS___PROGNAME=y,g' $(UCLIBC_DIR)/.oldconfig
else
$(SED) 's,^.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*,UCLIBC_HAS_PROGRAM_INVOCATION_NAME=n,g' $(UCLIBC_DIR)/.oldconfig
+ $(SED) 's,^.*UCLIBC_HAS___PROGNAME.*,UCLIBC_HAS___PROGNAME=n,g' $(UCLIBC_DIR)/.oldconfig
endif
ifeq ("$(KERNEL_ARCH)","i386")
/bin/echo "# CONFIG_GENERIC_386 is not set" >> $(UCLIBC_DIR)/.oldconfig
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 11/19] Commonalize the definition of TOOLCHAIN_DIR
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (9 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 10/19] uclibc: make sure the default configuration doesn't ask questions Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 12/19] Get rid of KERNEL_CROSS Thomas Petazzoni
` (8 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
The definition of TOOLCHAIN_DIR is the same regardless of whether
external or internal toolchains are used. Moreover, move its
definition together with all the other *_DIR definitions.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Makefile | 1 +
package/Makefile.in | 2 --
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 54dd4f1..271db9c 100644
--- a/Makefile
+++ b/Makefile
@@ -267,6 +267,7 @@ STAMP_DIR:=$(BASE_DIR)/stamps
BINARIES_DIR:=$(BASE_DIR)/images
TARGET_DIR:=$(BASE_DIR)/target
+TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config
diff --git a/package/Makefile.in b/package/Makefile.in
index 3dfc712..396187d 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -105,7 +105,6 @@ ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
endif
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
# Quotes are needed for spaces et al in path components.
TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
@@ -116,7 +115,6 @@ KERNEL_CROSS=$(TARGET_CROSS)
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
-TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 12/19] Get rid of KERNEL_CROSS
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (10 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 11/19] Commonalize the definition of TOOLCHAIN_DIR Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 13/19] Remove latest users of the ROOTFS_SUFFIX thing Thomas Petazzoni
` (7 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
In both internal and external toolchain cases, KERNEL_CROSS was
defined to *exactly* the same value as TARGET_CROSS. It isn't modified
anywhere, and is just used by kernel compilation and pcmcia
compilation.
Therefore, get rid of KERNEL_CROSS and use TARGET_CROSS instead.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.in | 2 --
package/pcmcia/pcmcia.mk | 2 +-
target/linux/Makefile.in | 2 +-
target/linux/Makefile.in.advanced | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index 396187d..adc645e 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -111,14 +111,12 @@ TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR
GNU_TARGET_NAME=$(ARCH)-linux
REAL_GNU_TARGET_NAME=$(ARCH)$(GNU_TARGET_SUFFIX)
TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
-KERNEL_CROSS=$(TARGET_CROSS)
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
-KERNEL_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
endif
TARGET_AR=$(TARGET_CROSS)ar
diff --git a/package/pcmcia/pcmcia.mk b/package/pcmcia/pcmcia.mk
index 7cea886..00ee358 100644
--- a/package/pcmcia/pcmcia.mk
+++ b/package/pcmcia/pcmcia.mk
@@ -42,7 +42,7 @@ $(PCMCIA_DIR)/.patched: $(PCMCIA_DIR)/.unpacked
$(PCMCIA_DIR)/.configured: $(PCMCIA_DIR)/.patched
( cd $(PCMCIA_DIR); ./Configure --kernel=$(LINUX26_DIR) --noprompt \
--rcdir=/etc --arch=$(ARCH) --trust --srctree --nocardbus \
- --sysv --kcc=$(KERNEL_CROSS)gcc --ucc=$(TARGET_CC) --ld=$(TARGET_CROSS)ld \
+ --sysv --kcc=$(TARGET_CROSS)gcc --ucc=$(TARGET_CC) --ld=$(TARGET_CROSS)ld \
--target=$(TARGET_DIR))
$(SED) "s/pump/udhcpc/" $(PCMCIA_DIR)/etc/network
$(SED) "s/ide_cs/ide-cs/" $(PCMCIA_DIR)/etc/config
diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index 41e4821..ea74409 100644
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -85,7 +85,7 @@ endif
LINUX26_MAKE_FLAGS = HOSTCC="$(HOSTCC)" HOSTCFLAGS="$(HOSTCFLAGS)" \
ARCH=$(KERNEL_ARCH) \
INSTALL_MOD_PATH=$(TARGET_DIR) \
- CROSS_COMPILE=$(KERNEL_CROSS) \
+ CROSS_COMPILE=$(TARGET_CROSS) \
LDFLAGS="$(TARGET_LDFLAGS)" \
LZMA="$(LZMA)"
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 745224d..a95852d 100644
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -179,7 +179,7 @@ LINUX26_BZCAT:=$(BZCAT)
LINUX26_MAKE_FLAGS = HOSTCC="$(HOSTCC)" HOSTCFLAGS="$(HOSTCFLAGS)" \
ARCH=$(KERNEL_ARCH) \
INSTALL_MOD_PATH=$(TARGET_DIR) \
- CROSS_COMPILE=$(KERNEL_CROSS) \
+ CROSS_COMPILE=$(TARGET_CROSS) \
LDFLAGS="$(TARGET_LDFLAGS)" \
LZMA="$(LZMA)" \
PATH=$(LINUX26_MKIMAGE_DIR):$(PATH)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 13/19] Remove latest users of the ROOTFS_SUFFIX thing
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (11 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 12/19] Get rid of KERNEL_CROSS Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 14/19] Get rid of the code computing ROOTFS_SUFFIX Thomas Petazzoni
` (6 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
The ROOTFS_SUFFIX thing has been removed in
325bfd1cbae03fe286796d3fa7de7c0a3227f7a5, so get rid of the latest
users.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
target/linux/Makefile.in | 3 +--
target/linux/Makefile.in.advanced | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index ea74409..6983d25 100644
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -62,10 +62,9 @@ endif
endif
endif
-ROOTFS_STRIPPED_SUFFIX=$(call qstrip,$(ROOTFS_SUFFIX))
# File name for the Linux kernel binary
ifndef LINUX26_KERNEL
-LINUX26_KERNEL_NAME=$(BINARIES_DIR)/$(LINUX26_FORMAT)$(ROOTFS_STRIPPED_SUFFIX)
+LINUX26_KERNEL_NAME=$(BINARIES_DIR)/$(LINUX26_FORMAT)
endif
# Version of Linux AFTER patches
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index a95852d..9e495f3 100644
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -155,10 +155,9 @@ LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/bzImage
endif
endif
-ROOTFS_STRIPPED_SUFFIX=$(call qstrip,$(ROOTFS_SUFFIX))
# -----------------------------------------------------------------------------
# File name for the Linux kernel binary
-LINUX26_KERNEL_NAME:=$(LINUX26_FORMAT)$(ROOTFS_STRIPPED_SUFFIX)
+LINUX26_KERNEL_NAME:=$(LINUX26_FORMAT)
ifeq ($(BOARD_NAME),)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 14/19] Get rid of the code computing ROOTFS_SUFFIX
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (12 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 13/19] Remove latest users of the ROOTFS_SUFFIX thing Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 15/19] Update defconfigs after BR2_ROOTFS_SUFFIX removal Thomas Petazzoni
` (5 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.in | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index adc645e..5f7af99 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -95,14 +95,6 @@ TARGET_CXXFLAGS=$(TARGET_CFLAGS)
TARGET_LDFLAGS=--sysroot $(STAGING_DIR)/
endif
#########################################################################
-#ifeq ($(BR2_ROOTFS_SUFFIX),)
-ROOTFS_SUFFIX:=$(call qstrip,$(BR2_ROOTFS_SUFFIX))
-ifeq ($(ROOTFS_SUFFIX),)
-ROOTFS_SUFFIX:=
-else
-XXXX=xxxx
-ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
-endif
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 15/19] Update defconfigs after BR2_ROOTFS_SUFFIX removal
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (13 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 14/19] Get rid of the code computing ROOTFS_SUFFIX Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 16/19] Remove BR2_GNU_TARGET_SUFFIX and compute GNU_TARGET_NAME Thomas Petazzoni
` (4 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configs/arm_toolchain_defconfig | 1 -
configs/at91rm9200df_defconfig | 1 -
configs/at91rm9200df_ext_bare_defconfig | 1 -
configs/at91rm9200df_ext_defconfig | 1 -
configs/at91sam9260dfc_defconfig | 1 -
configs/at91sam9260dfc_ext_bare_defconfig | 1 -
configs/at91sam9260dfc_ext_defconfig | 1 -
configs/at91sam9261ek_defconfig | 1 -
configs/at91sam9261ek_ext_bare_defconfig | 1 -
configs/at91sam9261ek_ext_defconfig | 1 -
configs/at91sam9263ek_defconfig | 1 -
configs/at91sam9263ek_ext_bare_defconfig | 1 -
configs/at91sam9263ek_ext_defconfig | 1 -
configs/at91sam9g20dfc_defconfig | 1 -
configs/at91sam9g20dfc_ext_bare_defconfig | 1 -
configs/at91sam9g20dfc_ext_defconfig | 1 -
configs/atngw100-base_defconfig | 1 -
configs/atngw100_defconfig | 1 -
configs/atstk1005_defconfig | 1 -
configs/atstk100x_defconfig | 1 -
configs/i386_defconfig | 1 -
configs/i686_defconfig | 1 -
configs/integrator926_defconfig | 1 -
configs/integrator926_huge_defconfig | 1 -
configs/kb9202_defconfig | 1 -
configs/v100sc2_defconfig | 1 -
26 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 8e89107..2ad9e63 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -161,7 +161,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index e004b21..e07ef84 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -166,7 +166,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig
index 032064a..2198cb2 100644
--- a/configs/at91rm9200df_ext_bare_defconfig
+++ b/configs/at91rm9200df_ext_bare_defconfig
@@ -161,7 +161,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91rm9200df-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig
index 35251a3..5957a68 100644
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -172,7 +172,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91rm9200df-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index b571c80..daa1c82 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -179,7 +179,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig
index e1ace69..d53b294 100644
--- a/configs/at91sam9260dfc_ext_bare_defconfig
+++ b/configs/at91sam9260dfc_ext_bare_defconfig
@@ -161,7 +161,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig
index c430d3d..cab9a4c 100644
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -180,7 +180,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index 1cfc2e7..7d79611 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -182,7 +182,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9261ek-NAND"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig
index 5e5e22d..346b9b6 100644
--- a/configs/at91sam9261ek_ext_bare_defconfig
+++ b/configs/at91sam9261ek_ext_bare_defconfig
@@ -164,7 +164,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9261ek-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig
index 362680b..1819442 100644
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -183,7 +183,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9261ek-NAND"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index a670b41..87db7a0 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -180,7 +180,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9263ek-NAND"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig
index bc6f626..58ce35d 100644
--- a/configs/at91sam9263ek_ext_bare_defconfig
+++ b/configs/at91sam9263ek_ext_bare_defconfig
@@ -163,7 +163,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9263ek-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig
index 4a59ea6..49466fc 100644
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -182,7 +182,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9263ek-NAND"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index a57dcff..7eac58c 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -180,7 +180,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam92g20ek-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig
index 3977dc9..0feba79 100644
--- a/configs/at91sam9g20dfc_ext_bare_defconfig
+++ b/configs/at91sam9g20dfc_ext_bare_defconfig
@@ -161,7 +161,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9g20dfc-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig
index 632f2d1..a9fa530 100644
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -180,7 +180,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9g20dfc-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index 15d779a..cc6ccf9 100644
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -693,7 +693,6 @@ BR2_PACKAGE_ZLIB=y
# Target filesystem options
#
BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
#
# filesystem for target device
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index ecaf774..7c5be16 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -683,7 +683,6 @@ BR2_PACKAGE_ZLIB=y
# Target filesystem options
#
BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
#
# filesystem for target device
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index 6b7a7b6..0a7a7d8 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -112,7 +112,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 1a27f1a..8be238e 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -829,7 +829,6 @@ BR2_PACKAGE_ZLIB=y
# Target filesystem options
#
BR2_ROOTFS_PREFIX="atstk1002-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
#
# filesystem for target device
diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index 284afc6..09a960e 100644
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -671,7 +671,6 @@ BR2_PACKAGE_ZLIB=y
# Target filesystem options
#
BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX=""
#
# filesystem for target device
diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index 87c3512..eb7b180 100644
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -671,7 +671,6 @@ BR2_PACKAGE_ZLIB=y
# Target filesystem options
#
BR2_ROOTFS_PREFIX="i686-rootfs"
-BR2_ROOTFS_SUFFIX=""
#
# filesystem for target device
diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index 4e2de89..7270bcb 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -110,7 +110,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX=""
BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index 06814c1..77f9548 100644
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -110,7 +110,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="$(BOARD_NAME)-rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index e66348b..3c865ea 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -118,7 +118,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX=""
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index b139c27..c47e0e1 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -89,7 +89,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 16/19] Remove BR2_GNU_TARGET_SUFFIX and compute GNU_TARGET_NAME
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (14 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 15/19] Update defconfigs after BR2_ROOTFS_SUFFIX removal Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 17/19] Update defconfigs after BR2_GNU_TARGET_SUFFIX removal Thomas Petazzoni
` (3 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Instead of asking the user about the GNU target suffix, just compute
it automatically from the other configuration options.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in | 18 ------------------
Makefile | 1 +
package/Makefile.in | 21 +++++++++++++++++----
3 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/Config.in b/Config.in
index bc4fec2..b051a37 100644
--- a/Config.in
+++ b/Config.in
@@ -103,24 +103,6 @@ config BR2_STAGING_DIR
source "target/device/Config.in.mirrors"
-config BR2_GNU_TARGET_SUFFIX
- string "GNU target suffix"
- default "linux-uclibcgnueabi" if BR2_ARM_EABI
- default "linux-uclibc"
- help
- The string used to pass to configure scripts via the
- --target= option. Just specify the suffix here, the leading
- arch will be filled in automatically.
-
- Most users will want to stick with the default setting, though
- other users (most notably ARM EABI) like to add on to this in
- order to stay in line with gcc conventions.
-
- Default options are:
- linux-uclibcgnueabi for ARM EABI
- linux-uclibc for the rest
- gnuhurd-uclibc for the hurd
-
config BR2_JLEVEL
int "Number of jobs to run simultaneously"
default "2"
diff --git a/Makefile b/Makefile
index 271db9c..607ec6d 100644
--- a/Makefile
+++ b/Makefile
@@ -214,6 +214,7 @@ ARCH:=$(call qstrip,$(BR2_ARCH))
ifeq ($(ARCH),xtensa)
ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name))
endif
+
WGET:=$(call qstrip,$(BR2_WGET)) $(SPIDER) $(QUIET)
SVN_CO:=$(call qstrip,$(BR2_SVN_CO)) $(QUIET)
SVN_UP:=$(call qstrip,$(BR2_SVN_UP)) $(QUIET)
diff --git a/package/Makefile.in b/package/Makefile.in
index 5f7af99..acba382 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -96,19 +96,32 @@ TARGET_LDFLAGS=--sysroot $(STAGING_DIR)/
endif
#########################################################################
+# Compute GNU_TARGET_NAME and REAL_GNU_TARGET_NAME
+GNU_TARGET_NAME=$(ARCH)-linux
+
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
+LIBC=uclibc
+else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
+LIBC=uclibc
+else
+LIBC=glibc
+endif
+
+ifeq ($(BR2_ARM_EABI),y)
+ABI=gnueabi
+endif
+
+REAL_GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI)
+
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
# Quotes are needed for spaces et al in path components.
TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
-GNU_TARGET_NAME=$(ARCH)-linux
-REAL_GNU_TARGET_NAME=$(ARCH)$(GNU_TARGET_SUFFIX)
TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
-REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
-GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
endif
TARGET_AR=$(TARGET_CROSS)ar
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 17/19] Update defconfigs after BR2_GNU_TARGET_SUFFIX removal
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (15 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 16/19] Remove BR2_GNU_TARGET_SUFFIX and compute GNU_TARGET_NAME Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 18/19] Unverbosify autoreconf output Thomas Petazzoni
` (2 subsequent siblings)
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configs/arm_toolchain_defconfig | 1 -
configs/at91rm9200df_defconfig | 1 -
configs/at91rm9200df_ext_bare_defconfig | 1 -
configs/at91rm9200df_ext_defconfig | 1 -
configs/at91sam9260dfc_defconfig | 1 -
configs/at91sam9260dfc_ext_bare_defconfig | 1 -
configs/at91sam9260dfc_ext_defconfig | 1 -
configs/at91sam9260pf_defconfig | 1 -
configs/at91sam9261ek_defconfig | 1 -
configs/at91sam9261ek_ext_bare_defconfig | 1 -
configs/at91sam9261ek_ext_defconfig | 1 -
configs/at91sam9263ek_defconfig | 1 -
configs/at91sam9263ek_ext_bare_defconfig | 1 -
configs/at91sam9263ek_ext_defconfig | 1 -
configs/at91sam9g20dfc_defconfig | 1 -
configs/at91sam9g20dfc_ext_bare_defconfig | 1 -
configs/at91sam9g20dfc_ext_defconfig | 1 -
configs/atngw100-base_defconfig | 1 -
configs/atngw100_defconfig | 1 -
configs/atstk1005_defconfig | 1 -
configs/atstk100x_defconfig | 1 -
configs/i386_defconfig | 1 -
configs/i686_defconfig | 1 -
configs/integrator926_defconfig | 1 -
configs/integrator926_huge_defconfig | 1 -
configs/kb9202_defconfig | 1 -
configs/v100sc2_defconfig | 1 -
27 files changed, 0 insertions(+), 27 deletions(-)
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 2ad9e63..460fe95 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -161,7 +161,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
BR2_CONFIG_CACHE=y
diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index e07ef84..7d2bcfd 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -166,7 +166,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig
index 2198cb2..436c8ff 100644
--- a/configs/at91rm9200df_ext_bare_defconfig
+++ b/configs/at91rm9200df_ext_bare_defconfig
@@ -161,7 +161,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91rm9200df-rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig
index 5957a68..79e55fc 100644
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -172,7 +172,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91rm9200df-rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index daa1c82..087067f 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -179,7 +179,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig
index d53b294..92704d9 100644
--- a/configs/at91sam9260dfc_ext_bare_defconfig
+++ b/configs/at91sam9260dfc_ext_bare_defconfig
@@ -161,7 +161,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig
index cab9a4c..e52cd2d 100644
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -180,7 +180,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig
index a2b8695..b45271c 100644
--- a/configs/at91sam9260pf_defconfig
+++ b/configs/at91sam9260pf_defconfig
@@ -72,7 +72,6 @@ BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX="wchar"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index 7d79611..cd7483b 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -182,7 +182,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9261ek-NAND"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
BR2_CONFIG_CACHE=y
diff --git a/configs/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig
index 346b9b6..b687190 100644
--- a/configs/at91sam9261ek_ext_bare_defconfig
+++ b/configs/at91sam9261ek_ext_bare_defconfig
@@ -164,7 +164,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9261ek-rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig
index 1819442..5ab47ad 100644
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -183,7 +183,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9261ek-NAND"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
BR2_CONFIG_CACHE=y
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index 87db7a0..bc95b6b 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -180,7 +180,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9263ek-NAND"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
BR2_CONFIG_CACHE=y
diff --git a/configs/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig
index 58ce35d..4ec46b3 100644
--- a/configs/at91sam9263ek_ext_bare_defconfig
+++ b/configs/at91sam9263ek_ext_bare_defconfig
@@ -163,7 +163,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9263ek-rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig
index 49466fc..9771c83 100644
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -182,7 +182,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9263ek-NAND"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
BR2_CONFIG_CACHE=y
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 7eac58c..30cc4e1 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -180,7 +180,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam92g20ek-rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig
index 0feba79..75f65ea 100644
--- a/configs/at91sam9g20dfc_ext_bare_defconfig
+++ b/configs/at91sam9g20dfc_ext_bare_defconfig
@@ -161,7 +161,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9g20dfc-rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig
index a9fa530..e18754e 100644
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -180,7 +180,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9g20dfc-rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index cc6ccf9..d3092df 100644
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -113,7 +113,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
# BR2_FPU_SUFFIX is not set
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 7c5be16..995aee1 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -113,7 +113,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
# BR2_FPU_SUFFIX is not set
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=3
# BR2_DEPRECATED is not set
BR2_CONFIG_CACHE=y
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index 0a7a7d8..a1fe0b7 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -112,7 +112,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 8be238e..0fbbf14 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -112,7 +112,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
# BR2_FPU_SUFFIX is not set
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index 09a960e..2481412 100644
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -113,7 +113,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
# BR2_FPU_SUFFIX is not set
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index eb7b180..066842f 100644
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -113,7 +113,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
# BR2_FPU_SUFFIX is not set
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index 7270bcb..3879272 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -110,7 +110,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index 77f9548..86443db 100644
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -110,7 +110,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="$(BOARD_NAME)-rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
# BR2_CONFIG_CACHE is not set
diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 3c865ea..4c84b9e 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -118,7 +118,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
# BR2_ENABLE_DEBUG is not set
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index c47e0e1..0ad7ab0 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -89,7 +89,6 @@ BR2_STAGING_DIR="$(BASE_DIR)/staging"
BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
-BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
# BR2_ENABLE_DEBUG is not set
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 18/19] Unverbosify autoreconf output
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (16 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 17/19] Update defconfigs after BR2_GNU_TARGET_SUFFIX removal Thomas Petazzoni
@ 2010-04-28 21:40 ` Thomas Petazzoni
2010-04-28 21:41 ` [Buildroot] [PATCH 19/19] Fix autotools configuration cache handling Thomas Petazzoni
2010-05-02 22:03 ` [Buildroot] [pull request] Pull request for branch misc-fixes Peter Korsgaard
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:40 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/autoconf/autoconf.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index d82c2c5..e74efdc 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -26,4 +26,4 @@ $(eval $(call AUTOTARGETS,package,autoconf,host))
# variables used by other packages
AUTOCONF:=$(HOST_DIR)/usr/bin/autoconf
-AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -v -f -i -I "$(ACLOCAL_DIR)"
+AUTORECONF=$(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 19/19] Fix autotools configuration cache handling
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (17 preceding siblings ...)
2010-04-28 21:40 ` [Buildroot] [PATCH 18/19] Unverbosify autoreconf output Thomas Petazzoni
@ 2010-04-28 21:41 ` Thomas Petazzoni
2010-05-02 22:03 ` [Buildroot] [pull request] Pull request for branch misc-fixes Peter Korsgaard
19 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-28 21:41 UTC (permalink / raw)
To: buildroot
It got broken by the introduction of the new autotools infrastructure
based on the generic infrastructure.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.autotools.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index 96ff91f..67ca5d0 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -93,7 +93,7 @@ define $(2)_CONFIGURE_CMDS
$$(TARGET_CONFIGURE_ENV) \
$$($$(PKG)_CONF_ENV) \
./configure \
- $(if $(filter YES,$$($$(PKG)_USE_CONFIG_CACHE)),--cache-file="$(BUILD_DIR)/tgt-config.cache",) \
+ $$(if $$(filter YES,$$($$(PKG)_USE_CONFIG_CACHE)),--cache-file="$(BUILD_DIR)/tgt-config.cache",) \
--target=$$(GNU_TARGET_NAME) \
--host=$$(GNU_TARGET_NAME) \
--build=$$(GNU_HOST_NAME) \
--
1.6.3.3
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 08/19] packages: handle interrupted downloads
2010-04-28 21:40 ` [Buildroot] [PATCH 08/19] packages: handle interrupted downloads Thomas Petazzoni
@ 2010-04-28 23:26 ` Paul Jones
2010-05-02 20:48 ` Peter Korsgaard
1 sibling, 0 replies; 27+ messages in thread
From: Paul Jones @ 2010-04-28 23:26 UTC (permalink / raw)
To: buildroot
> -----Original Message-----
> From: buildroot-bounces at busybox.net [mailto:buildroot-
> bounces at busybox.net] On Behalf Of Thomas Petazzoni
> Sent: Thursday, 29 April 2010 7:41 AM
> To: buildroot at uclibc.org
> Cc: Thomas Petazzoni
> Subject: [Buildroot] [PATCH 08/19] packages: handle interrupted downloads
>
> Currently, when package downloads are interrupted, next time you run
> Buildroot, it thinks that the download is complete (the file is present in
> $(DL_DIR), isn't it ?), which leads Buildroot to extract an invalid
tarball.
>
> Therefore, the DOWNLOAD macro is enhanced to download the file under a
> temporary name, and to rename it to the correct name one the download
> has completed.
Would it be possible to add automatic download resume support while you are
at it?
Paul.
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 09/19] uClibc: add UCLIBC_HAS_NFTW to default configuration
2010-04-28 21:40 ` [Buildroot] [PATCH 09/19] uClibc: add UCLIBC_HAS_NFTW to default configuration Thomas Petazzoni
@ 2010-04-29 6:52 ` Paulius Zaleckas
0 siblings, 0 replies; 27+ messages in thread
From: Paulius Zaleckas @ 2010-04-29 6:52 UTC (permalink / raw)
To: buildroot
On Thu, Apr 29, 2010 at 12:40 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> UCLIBC_HAS_NFTW is a new knob in 0.9.31, which allows the obsolete and
> deprecated ftw() to be compiled-out separatly from nftw(), which is
> part of POSIX. nftw() should probably be enabled by default in uClibc,
> and a bug has been opened about this on uClibc bug tracker
> (https://bugs.busybox.net/show_bug.cgi?id=1597).
>
> nftw() is, for example, used in Gtk+.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
> ---
> ?toolchain/uClibc/uClibc-0.9.31.config | ? ?2 +-
> ?1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/toolchain/uClibc/uClibc-0.9.31.config b/toolchain/uClibc/uClibc-0.9.31.config
> index 091f179..d2e54ad 100644
> --- a/toolchain/uClibc/uClibc-0.9.31.config
> +++ b/toolchain/uClibc/uClibc-0.9.31.config
> @@ -191,7 +191,7 @@ UCLIBC_HAS_REGEX=y
> ?UCLIBC_HAS_FNMATCH=y
> ?# UCLIBC_HAS_FNMATCH_OLD is not set
> ?# UCLIBC_HAS_WORDEXP is not set
> -# UCLIBC_HAS_NFTW is not set
> +UCLIBC_HAS_NFTW=y
> ?UCLIBC_HAS_FTW=y
> ?UCLIBC_HAS_GLOB=y
> ?UCLIBC_HAS_GNU_GLOB=y
> --
> 1.6.3.3
>
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 07/19] freetype: disable autoreconf
2010-04-28 21:40 ` [Buildroot] [PATCH 07/19] freetype: disable autoreconf Thomas Petazzoni
@ 2010-04-29 20:20 ` Paulius Zaleckas
2010-04-30 7:14 ` Thomas Petazzoni
0 siblings, 1 reply; 27+ messages in thread
From: Paulius Zaleckas @ 2010-04-29 20:20 UTC (permalink / raw)
To: buildroot
On 04/29/2010 12:40 AM, Thomas Petazzoni wrote:
> Freetype is unfortunately not a normal autotools-based package. Its
> real configure script is in builds/unix/, but the build cannot be
> started from here. And it doesn't rely on automake.
>
> For absolute perfection, the package should probably be converted to
> the GENTARGETS infrastructure, but it will generate a much, much
> longer .mk file that the one we have today.
>
> Signed-off-by: Thomas Petazzoni<thomas.petazzoni@free-electrons.com>
> ---
> package/freetype/freetype.mk | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
> index f19b854..e9a270f 100644
> --- a/package/freetype/freetype.mk
> +++ b/package/freetype/freetype.mk
> @@ -7,6 +7,7 @@ FREETYPE_VERSION = 2.3.12
> FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
> FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
> FREETYPE_LIBTOOL_PATCH = NO
> +FREETYPE_AUTORECONF = NO
It is disabled by default... Do we need to explicitly specify it?
> FREETYPE_INSTALL_STAGING = YES
> FREETYPE_INSTALL_TARGET = YES
> FREETYPE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 07/19] freetype: disable autoreconf
2010-04-29 20:20 ` Paulius Zaleckas
@ 2010-04-30 7:14 ` Thomas Petazzoni
0 siblings, 0 replies; 27+ messages in thread
From: Thomas Petazzoni @ 2010-04-30 7:14 UTC (permalink / raw)
To: buildroot
On Thu, 29 Apr 2010 23:20:36 +0300
Paulius Zaleckas <paulius.zaleckas@gmail.com> wrote:
> > FREETYPE_LIBTOOL_PATCH = NO +FREETYPE_AUTORECONF = NO
>
> It is disabled by default... Do we need to explicitly specify it?
In fact, in this patch set, I had a patch that made autoreconf enabled
by default. This is necessary for external toolchains to work properly
(otherwise libtool does stupid things and links against host
libraries). But I finally decided not to send such a change now, as I
wanted to do some more testing around it.
So, you're right, this patch is not strictly needed today.
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 08/19] packages: handle interrupted downloads
2010-04-28 21:40 ` [Buildroot] [PATCH 08/19] packages: handle interrupted downloads Thomas Petazzoni
2010-04-28 23:26 ` Paul Jones
@ 2010-05-02 20:48 ` Peter Korsgaard
1 sibling, 0 replies; 27+ messages in thread
From: Peter Korsgaard @ 2010-05-02 20:48 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Currently, when package downloads are interrupted, next time you run
Thomas> Buildroot, it thinks that the download is complete (the file is
Thomas> present in $(DL_DIR), isn't it ?), which leads Buildroot to extract an
Thomas> invalid tarball.
Thomas> Therefore, the DOWNLOAD macro is enhanced to download the file under a
Thomas> temporary name, and to rename it to the correct name one the download
Thomas> has completed.
Wouldn't it be simpler / nicer to just add -c (continue) to WGET?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] [PATCH 10/19] uclibc: make sure the default configuration doesn't ask questions
2010-04-28 21:40 ` [Buildroot] [PATCH 10/19] uclibc: make sure the default configuration doesn't ask questions Thomas Petazzoni
@ 2010-05-02 22:02 ` Peter Korsgaard
0 siblings, 0 replies; 27+ messages in thread
From: Peter Korsgaard @ 2010-05-02 22:02 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Since new configuration options have been added in 0.9.31, the value
Thomas> of these configuration options should be determined, either by the
Thomas> default configuration file we provide, or by uclibc.mk process.
Thomas> The locale generation process should probably be improved in order to
Thomas> allow building other locales than just en_US.
Thomas> ifeq ($(BR2_ENABLE_LOCALE),y)
Thomas> - $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\nUCLIBC_PREGENERATED_LOCALE_DATA=n\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
Thomas> + $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\nUCLIBC_BUILD_MINIMAL_LOCALE=y\nUCLIBC_BUILD_MINIMAL_LOCALES="en_US"\nUCLIBC_PREGENERATED_LOCALE_DATA=n\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
It still asks unless we add a # UCLIBC_BUILD_ALL_LOCALE is not set line
in the sed statement.
Thomas> else
Thomas> $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=n,g' $(UCLIBC_DIR)/.oldconfig
Thomas> endif
Thomas> @@ -325,8 +325,10 @@ else
Thomas> endif
Thomas> ifeq ($(BR2_PROGRAM_INVOCATION),y)
Thomas> $(SED) 's,^.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*,UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y,g' $(UCLIBC_DIR)/.oldconfig
Thomas> + $(SED) 's,^.*UCLIBC_HAS___PROGNAME.*,UCLIBC_HAS___PROGNAME=y,g' $(UCLIBC_DIR)/.oldconfig
Thomas> else
Thomas> $(SED) 's,^.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*,UCLIBC_HAS_PROGRAM_INVOCATION_NAME=n,g' $(UCLIBC_DIR)/.oldconfig
Thomas> + $(SED) 's,^.*UCLIBC_HAS___PROGNAME.*,UCLIBC_HAS___PROGNAME=n,g' $(UCLIBC_DIR)/.oldconfig
This only works if we add a UCLIBC_HAS___PROGNAME line to the defconfig.
I've fixed those two issues and committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 27+ messages in thread
* [Buildroot] [pull request] Pull request for branch misc-fixes
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
` (18 preceding siblings ...)
2010-04-28 21:41 ` [Buildroot] [PATCH 19/19] Fix autotools configuration cache handling Thomas Petazzoni
@ 2010-05-02 22:03 ` Peter Korsgaard
19 siblings, 0 replies; 27+ messages in thread
From: Peter Korsgaard @ 2010-05-02 22:03 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Hello,
Thomas> Here is a set of patches, some of them are important fixes that should
Thomas> really be merged before 2010.05, some other are improvements and
Thomas> cleanups that can be postponed if needed.
Thomas> The important ones are :
Thomas> libxslt: fix host compilation
Thomas> uClibc: add UCLIBC_HAS_NFTW to default configuration
Thomas> uclibc: make sure the default configuration doesn't ask questions
Thomas> Fix autotools configuration cache handling
Thanks, I've committed everything except for 7 and 8 (freetype +
interrupted downloads).
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2010-05-02 22:03 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-28 21:40 [Buildroot] [pull request] Pull request for branch misc-fixes Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 01/19] autotools: fix autoreconf check Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 02/19] libxslt: fix host compilation Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 03/19] openssl: convert to the generic infrastructure Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 04/19] autotools: inherit LIBTOOL_PATCH for host packages Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 05/19] packages: remove useless HOST_*_LIBTOOL_PATCH Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 06/19] autotools: fix referencing to LIBTOOL_PATCH variable Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 07/19] freetype: disable autoreconf Thomas Petazzoni
2010-04-29 20:20 ` Paulius Zaleckas
2010-04-30 7:14 ` Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 08/19] packages: handle interrupted downloads Thomas Petazzoni
2010-04-28 23:26 ` Paul Jones
2010-05-02 20:48 ` Peter Korsgaard
2010-04-28 21:40 ` [Buildroot] [PATCH 09/19] uClibc: add UCLIBC_HAS_NFTW to default configuration Thomas Petazzoni
2010-04-29 6:52 ` Paulius Zaleckas
2010-04-28 21:40 ` [Buildroot] [PATCH 10/19] uclibc: make sure the default configuration doesn't ask questions Thomas Petazzoni
2010-05-02 22:02 ` Peter Korsgaard
2010-04-28 21:40 ` [Buildroot] [PATCH 11/19] Commonalize the definition of TOOLCHAIN_DIR Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 12/19] Get rid of KERNEL_CROSS Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 13/19] Remove latest users of the ROOTFS_SUFFIX thing Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 14/19] Get rid of the code computing ROOTFS_SUFFIX Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 15/19] Update defconfigs after BR2_ROOTFS_SUFFIX removal Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 16/19] Remove BR2_GNU_TARGET_SUFFIX and compute GNU_TARGET_NAME Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 17/19] Update defconfigs after BR2_GNU_TARGET_SUFFIX removal Thomas Petazzoni
2010-04-28 21:40 ` [Buildroot] [PATCH 18/19] Unverbosify autoreconf output Thomas Petazzoni
2010-04-28 21:41 ` [Buildroot] [PATCH 19/19] Fix autotools configuration cache handling Thomas Petazzoni
2010-05-02 22:03 ` [Buildroot] [pull request] Pull request for branch misc-fixes Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox