* [Buildroot] [PATCH 01/25] Remove BR2_PREFER_IMA
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
@ 2010-04-11 4:04 ` Thomas Petazzoni
2010-04-11 4:04 ` [Buildroot] [PATCH 02/25] Update defconfig after BR2_PREFER_IMA removal Thomas Petazzoni
` (24 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:04 UTC (permalink / raw)
To: buildroot
This option is barely used, no-one is maintaining it or extending
it. So let's remove it.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in | 11 -----------
package/busybox/busybox.mk | 8 --------
package/busybox/initramfs.mk | 8 --------
package/microcom/microcom.mk | 7 -------
package/setserial/setserial.mk | 4 ----
toolchain/gcc/Makefile.in | 4 ----
6 files changed, 0 insertions(+), 42 deletions(-)
diff --git a/Config.in b/Config.in
index 224a44a..b82a11b 100644
--- a/Config.in
+++ b/Config.in
@@ -136,17 +136,6 @@ config BR2_JLEVEL
help
Number of jobs to run simultaneously
-config BR2_PREFER_IMA
- bool "prefer IMA compiles"
- help
- Where possible, compile package with Inter Module Analysis.
- This potentially uses alot of system resources on your compile
- host with the benefit of creating smaller binaries for the target.
-
- If unsure, say No.
-
- WARNING: This is highly experimental at the moment.
-
config BR2_DEPRECATED
bool "Show packages that are deprecated or obsolete"
help
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index cc2097e..c93f33a 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -107,14 +107,6 @@ $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config
CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
ARCH=$(KERNEL_ARCH) \
EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR)
-ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
- rm -f $@
- $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
- CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
- ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \
- EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR) \
- -f scripts/Makefile.IMA
-endif
$(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
ifeq ($(BR2_PACKAGE_BUSYBOX_FULLINSTALL),y)
diff --git a/package/busybox/initramfs.mk b/package/busybox/initramfs.mk
index 394f483..2f1e34c 100644
--- a/package/busybox/initramfs.mk
+++ b/package/busybox/initramfs.mk
@@ -86,14 +86,6 @@ $(BUSYBOX_INITRAMFS_DIR)/busybox: $(BUSYBOX_INITRAMFS_DIR)/.configured
ARCH=$(KERNEL_ARCH) \
EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
busybox.links busybox
-ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
- rm -f $@
- $(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
- CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
- ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_INITRAMFS_DIR) \
- -f scripts/Makefile.IMA
-endif
$(BR2_INITRAMFS_DIR)/bin/busybox: $(BUSYBOX_INITRAMFS_DIR)/busybox
$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
diff --git a/package/microcom/microcom.mk b/package/microcom/microcom.mk
index d171be9..f691723 100644
--- a/package/microcom/microcom.mk
+++ b/package/microcom/microcom.mk
@@ -46,14 +46,7 @@ $(MICROCOM_DIR)/.configured: $(MICROCOM_DIR)/.unpacked
touch $@
$(MICROCOM_DIR)/microcom: $(MICROCOM_DIR)/.configured
-ifeq ($(BR2_PREFER_IMA),y)
- (cd $(MICROCOM_DIR); \
- $(TARGET_CC) $(TARGET_CFLAGS) $(CFLAGS_COMBINE) \
- $(CFLAGS_WHOLE_PROGRAM) -o $@ $(wildcard $(MICROCOM_DIR)/*.c); \
- )
-else
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(MICROCOM_DIR)
-endif
$(STRIPCMD) $(STRIP_STRIP_ALL) $@
$(TARGET_DIR)/usr/bin/microcom: $(MICROCOM_DIR)/microcom
diff --git a/package/setserial/setserial.mk b/package/setserial/setserial.mk
index a1d5ab7..9667637 100644
--- a/package/setserial/setserial.mk
+++ b/package/setserial/setserial.mk
@@ -36,10 +36,6 @@ endif
touch $(SETSERIAL_DIR)/gorhack.h
touch $@
-ifeq ($(BR2_PREFER_IMA),y)
-SETSERIAL_CFLAGS=$(CFLAGS_COMBINE) $(CFLAGS_WHOLE_PROGRAM)
-endif
-
$(SETSERIAL_DIR)/.configured: $(SETSERIAL_DIR)/.unpacked
(cd $(SETSERIAL_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index c3e21cf..23b5c73 100644
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -74,9 +74,5 @@ endif
# and finally pull in config opts from the user
EXTRA_TARGET_GCC_CONFIG_OPTIONS+=$(call qstrip,$(BR2_EXTRA_TARGET_GCC_CONFIG_OPTIONS))
-ifeq ($(BR2_PREFER_IMA),y)
-EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--enable-intermodule
-endif # BR2_PREFER_IMA=y
-
TARGETS+=gcc_target
endif
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 02/25] Update defconfig after BR2_PREFER_IMA removal
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
2010-04-11 4:04 ` [Buildroot] [PATCH 01/25] Remove BR2_PREFER_IMA Thomas Petazzoni
@ 2010-04-11 4:04 ` Thomas Petazzoni
2010-04-11 4:04 ` [Buildroot] [PATCH 03/25] Update config.{guess, sub} unconditionally Thomas Petazzoni
` (23 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:04 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 f044e51..d827dda 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -165,7 +165,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
BR2_CONFIG_CACHE=y
diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index 1fe6e3f..b231dbe 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -170,7 +170,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig
index 84f6b7e..b5dd71e 100644
--- a/configs/at91rm9200df_ext_bare_defconfig
+++ b/configs/at91rm9200df_ext_bare_defconfig
@@ -165,7 +165,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig
index 32843ba..8817ae0 100644
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -176,7 +176,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 46166e0..052b78e 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -183,7 +183,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig
index d99cfa2..90f6f60 100644
--- a/configs/at91sam9260dfc_ext_bare_defconfig
+++ b/configs/at91sam9260dfc_ext_bare_defconfig
@@ -165,7 +165,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig
index 7f12884..b01b457 100644
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -184,7 +184,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig
index b9e8a28..9e463c5 100644
--- a/configs/at91sam9260pf_defconfig
+++ b/configs/at91sam9260pf_defconfig
@@ -76,7 +76,6 @@ BR2_TOPDIR_SUFFIX="wchar"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_STRIP_strip=y
# BR2_STRIP_sstrip is not set
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index 1073e78..4b9cac0 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -186,7 +186,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
BR2_CONFIG_CACHE=y
diff --git a/configs/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig
index 4c534a7..19661eb 100644
--- a/configs/at91sam9261ek_ext_bare_defconfig
+++ b/configs/at91sam9261ek_ext_bare_defconfig
@@ -168,7 +168,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig
index d7f9f4a..1bf11ad 100644
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -187,7 +187,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
BR2_CONFIG_CACHE=y
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index 74dbfcd..dac5ec5 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -184,7 +184,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
BR2_CONFIG_CACHE=y
diff --git a/configs/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig
index 185372c..2ede9a8 100644
--- a/configs/at91sam9263ek_ext_bare_defconfig
+++ b/configs/at91sam9263ek_ext_bare_defconfig
@@ -167,7 +167,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig
index 44c30e2..b6b7f53 100644
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -186,7 +186,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
BR2_CONFIG_CACHE=y
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 9b3af76..c02efe8 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -184,7 +184,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig
index 3feef30..1401133 100644
--- a/configs/at91sam9g20dfc_ext_bare_defconfig
+++ b/configs/at91sam9g20dfc_ext_bare_defconfig
@@ -165,7 +165,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig
index 5bf6ea7..aab8f43 100644
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -184,7 +184,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index fe34989..13457d8 100644
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -116,7 +116,6 @@ BR2_TOPDIR_SUFFIX=""
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 4a702a5..3a32f8d 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -116,7 +116,6 @@ BR2_TOPDIR_SUFFIX=""
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=3
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
BR2_CONFIG_CACHE=y
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index c829495..4b894d7 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -116,7 +116,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index c1398d4..86a351b 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -115,7 +115,6 @@ BR2_TOPDIR_SUFFIX=""
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index 4c2d092..82b09e4 100644
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -116,7 +116,6 @@ BR2_TOPDIR_SUFFIX=""
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index dcf35d7..85ddffe 100644
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -116,7 +116,6 @@ BR2_TOPDIR_SUFFIX=""
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index e537b40..f907053 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -114,7 +114,6 @@ BR2_ROOTFS_SUFFIX=""
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index 276d69a..fa4e55f 100644
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -114,7 +114,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 67e6d68..9b313a8 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -122,7 +122,6 @@ BR2_ROOTFS_SUFFIX=""
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_ENABLE_DEBUG is not set
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index 836321a..672c5e0 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -93,7 +93,6 @@ BR2_ROOTFS_SUFFIX="$(DATE)"
BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
-# BR2_PREFER_IMA is not set
# BR2_DEPRECATED is not set
BR2_RECENT=y
# BR2_ENABLE_DEBUG is not set
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 03/25] Update config.{guess, sub} unconditionally
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
2010-04-11 4:04 ` [Buildroot] [PATCH 01/25] Remove BR2_PREFER_IMA Thomas Petazzoni
2010-04-11 4:04 ` [Buildroot] [PATCH 02/25] Update defconfig after BR2_PREFER_IMA removal Thomas Petazzoni
@ 2010-04-11 4:04 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 04/25] Update defconfigs after BR2_UPDATE_CONFIG removal Thomas Petazzoni
` (22 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:04 UTC (permalink / raw)
To: buildroot
Remove the BR2_UPDATE_CONFIG option which allowed to globally
enable/disable the replacement of config.{guess,sub} for
autotools-based packages. Doing it unconditionnally just works.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in | 2 --
package/Makefile.autotools.in | 2 --
package/gnuconfig/Config.in | 8 --------
3 files changed, 0 insertions(+), 12 deletions(-)
delete mode 100644 package/gnuconfig/Config.in
diff --git a/Config.in b/Config.in
index b82a11b..f2d4a50 100644
--- a/Config.in
+++ b/Config.in
@@ -327,8 +327,6 @@ config BR2_HAVE_DEVFILES
Install headers and static libraries in the
target filesystem
-source package/gnuconfig/Config.in
-
endmenu
source "toolchain/Config.in"
diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in
index a8dd051..a4be8c8 100644
--- a/package/Makefile.autotools.in
+++ b/package/Makefile.autotools.in
@@ -128,9 +128,7 @@ define UPDATE_CONFIG_HOOK
done
endef
-ifeq ($(BR2_UPDATE_CONFIG),y)
$(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
-endif
#
# Hook to patch libtool to make it work properly for cross-compilation
diff --git a/package/gnuconfig/Config.in b/package/gnuconfig/Config.in
deleted file mode 100644
index 5ac0bb3..0000000
--- a/package/gnuconfig/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_UPDATE_CONFIG
- bool "update config.sub and config.guess"
- default y
- help
- This just exists to easily update the config.sub / config.guess
- files in packages to the latest version (since many bundled ones
- don't support the latest possible targets)
-
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 04/25] Update defconfigs after BR2_UPDATE_CONFIG removal
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (2 preceding siblings ...)
2010-04-11 4:04 ` [Buildroot] [PATCH 03/25] Update config.{guess, sub} unconditionally Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 05/25] Do not let packages remove man pages, info pages and documentation Thomas Petazzoni
` (21 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 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 -
target/xtensa/defconfig | 1 -
28 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index d827dda..76ba81e 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -182,7 +182,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index b231dbe..a1946b7 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -187,7 +187,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig
index b5dd71e..e874ffa 100644
--- a/configs/at91rm9200df_ext_bare_defconfig
+++ b/configs/at91rm9200df_ext_bare_defconfig
@@ -182,7 +182,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig
index 8817ae0..e94a730 100644
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -193,7 +193,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 052b78e..ae67079 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -200,7 +200,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig
index 90f6f60..a5aa0b3 100644
--- a/configs/at91sam9260dfc_ext_bare_defconfig
+++ b/configs/at91sam9260dfc_ext_bare_defconfig
@@ -182,7 +182,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig
index b01b457..1a8aba4 100644
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -201,7 +201,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig
index 9e463c5..d8e1edf 100644
--- a/configs/at91sam9260pf_defconfig
+++ b/configs/at91sam9260pf_defconfig
@@ -52,7 +52,6 @@ BR2_ENDIAN="LITTLE"
#
# Build options
#
-# BR2_UPDATE_CONFIG is not set
BR2_WGET="wget --passive-ftp"
BR2_SVN="svn co"
BR2_ZCAT="gzip -d -c"
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index 4b9cac0..b07117e 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -203,7 +203,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig
index 19661eb..68c67ae 100644
--- a/configs/at91sam9261ek_ext_bare_defconfig
+++ b/configs/at91sam9261ek_ext_bare_defconfig
@@ -185,7 +185,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig
index 1bf11ad..e777292 100644
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -204,7 +204,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index dac5ec5..4c9cce3 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -201,7 +201,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig
index 2ede9a8..7d01b98 100644
--- a/configs/at91sam9263ek_ext_bare_defconfig
+++ b/configs/at91sam9263ek_ext_bare_defconfig
@@ -184,7 +184,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig
index b6b7f53..f2d432c 100644
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -203,7 +203,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index c02efe8..0eb0026 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -201,7 +201,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig
index 1401133..ca7f4fd 100644
--- a/configs/at91sam9g20dfc_ext_bare_defconfig
+++ b/configs/at91sam9g20dfc_ext_bare_defconfig
@@ -182,7 +182,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig
index aab8f43..9626136 100644
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -201,7 +201,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index 13457d8..012d78e 100644
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -133,7 +133,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 3a32f8d..e66365f 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -133,7 +133,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index 4b894d7..3a8d71c 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -133,7 +133,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 86a351b..b2c5850 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -132,7 +132,6 @@ BR2_OPTIMIZE_2=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index 82b09e4..783ddcc 100644
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -133,7 +133,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index 85ddffe..436a7f8 100644
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -133,7 +133,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index f907053..cd3cf74 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -131,7 +131,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index fa4e55f..dc261ec 100644
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -131,7 +131,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 9b313a8..ae7c702 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -137,7 +137,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_MANPAGES is not set
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index 672c5e0..f90d8a7 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -109,7 +109,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
-BR2_UPDATE_CONFIG=y
#
# Toolchain
diff --git a/target/xtensa/defconfig b/target/xtensa/defconfig
index f9b53a3..f03f7a6 100644
--- a/target/xtensa/defconfig
+++ b/target/xtensa/defconfig
@@ -19,7 +19,6 @@ BR2_WGET="wget --passive-ftp"
# BR2_STRIP_none=y
## Added by Maxim
-BR2_UPDATE_CONFIG=y
#
# Kernel Header Options
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 05/25] Do not let packages remove man pages, info pages and documentation
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (3 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 04/25] Update defconfigs after BR2_UPDATE_CONFIG removal Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 06/25] Remove all documentation when BR2_HAVE_DOCUMENTATION is not set Thomas Petazzoni
` (20 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
The cleanup of $(TARGET_DIR)/usr/share/man, $(TARGET_DIR)/usr/man,
$(TARGET_DIR)/usr/share/info, $(TARGET_DIR)/usr/info,
$(TARGET_DIR)/usr/share/doc and $(TARGET_DIR)/usr/doc is already done
globally in the main Makefile. Therefore, there's no need to handle
that on a per-package basis.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/bash/bash.mk | 7 -------
package/berkeleydb/berkeleydb.mk | 7 -------
package/bison/bison.mk | 7 -------
package/coreutils/coreutils.mk | 7 -------
package/dhcp/dhcp.mk | 25 -------------------------
package/dialog/dialog.mk | 3 ---
package/diffutils/diffutils.mk | 6 ------
package/file/file.mk | 7 -------
package/findutils/findutils.mk | 7 -------
package/gawk/gawk.mk | 7 -------
package/gettext/gettext.mk | 9 +--------
package/gzip/gzip.mk | 6 ------
package/ipsec-tools/ipsec-tools.mk | 7 -------
package/liblockfile/liblockfile.mk | 3 ---
package/netsnmp/netsnmp.mk | 7 -------
package/quagga/quagga.mk | 6 ------
package/sed/sed.mk | 12 ------------
package/udpcast/udpcast.mk | 4 ----
toolchain/binutils/binutils.mk | 8 +-------
19 files changed, 2 insertions(+), 143 deletions(-)
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index b7fc716..5abae55 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -81,14 +81,7 @@ $(TARGET_DIR)/$(BASH_TARGET_BINARY): $(BASH_DIR)/$(BASH_BINARY)
rm -f $(TARGET_DIR)/bin/bash*
mv $(TARGET_DIR)/usr/bin/bash* $(TARGET_DIR)/bin/
(cd $(TARGET_DIR)/bin; /bin/ln -fs bash sh)
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
rm -rf $(TARGET_DIR)/share/locale
- rm -rf $(TARGET_DIR)/usr/share/doc
# If both bash and busybox are selected, make certain bash wins
# the fight over who gets to own the /bin/sh symlink.
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 716d645..f15df6a 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -60,14 +60,7 @@ $(STAGING_DIR)/lib/$(DB_SHARLIB): $(DB_DIR)/build_unix/.libs/$(DB_SHARLIB)
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(DB_DIR)/build_unix install
chmod a-x $(STAGING_DIR)/lib/libdb*so*
rm -f $(STAGING_DIR)/bin/db_*
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(STAGING_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(STAGING_DIR)/usr/share/man
-endif
rm -rf $(STAGING_DIR)/share/locale
- rm -rf $(STAGING_DIR)/usr/share/doc
$(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB)
rm -rf $(TARGET_DIR)/lib/libdb*
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index 32ed7c7..f29259f 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -52,14 +52,7 @@ $(BISON_DIR)/$(BISON_BINARY): $(BISON_DIR)/.configured
$(TARGET_DIR)/$(BISON_TARGET_BINARY): $(BISON_DIR)/$(BISON_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) install
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
rm -rf $(TARGET_DIR)/share/locale
- rm -rf $(TARGET_DIR)/usr/share/doc
cp -a package/bison/yacc $(TARGET_DIR)/usr/bin/yacc
bison: $(TARGET_DIR)/$(BISON_TARGET_BINARY)
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 85a5491..2081994 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -118,14 +118,7 @@ $(TARGET_DIR)/$(COREUTILS_TARGET_BINARY): $(COREUTILS_DIR)/$(COREUTILS_BINARY)
# gnu thinks chroot is in bin, debian thinks it's in sbin
mv $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin/chroot
$(STRIPCMD) $(TARGET_DIR)/usr/sbin/chroot > /dev/null 2>&1
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
rm -rf $(TARGET_DIR)/share/locale
- rm -rf $(TARGET_DIR)/usr/share/doc
# If both coreutils and busybox are selected, make certain coreutils
# wins the fight over who gets to have their utils actually installed.
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 4ae5bc7..57e0a5d 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -57,14 +57,7 @@ $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
mkdir -p $(TARGET_DIR)/etc/dhcp
$(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf \
$(TARGET_DIR)/etc/dhcp/dhcpd.conf
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/man
-endif
rm -rf $(TARGET_DIR)/share/locale
- rm -rf $(TARGET_DIR)/usr/share/doc
$(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
mkdir -p $(TARGET_DIR)/var/lib
@@ -74,15 +67,6 @@ $(TARGET_DIR)/$(DHCP_RELAY_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
mkdir -p $(TARGET_DIR)/etc/init.d
$(INSTALL) -m 0755 -D package/dhcp/S80dhcp-relay \
$(TARGET_DIR)/etc/init.d
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/man
-endif
- # Why on earth do we wipe out whole directories here?
- #rm -rf $(TARGET_DIR)/usr/share/locale
- #rm -rf $(TARGET_DIR)/usr/share/doc
$(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
mkdir -p $(TARGET_DIR)/var/lib
@@ -94,15 +78,6 @@ $(TARGET_DIR)/$(DHCP_CLIENT_TARGET_BINARY): $(DHCP_DIR)/$(DHCP_RELAY_BINARY)
$(TARGET_DIR)/etc/dhcp/dhclient.conf
$(INSTALL) -m 0755 -D package/dhcp/dhclient-script \
$(TARGET_DIR)/sbin/dhclient-script
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/man
-endif
- # Why on earth do we wipe out whole directories here?
- #rm -rf $(TARGET_DIR)/usr/share/locale
- #rm -rf $(TARGET_DIR)/usr/share/doc
dhcp_server: $(TARGET_DIR)/$(DHCP_SERVER_TARGET_BINARY)
diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index 1f56660..9c6f2a9 100644
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -39,9 +39,6 @@ $(TARGET_DIR)/$(DIALOG_TARGET_BINARY): $(DIALOG_DIR)/$(DIALOG_BINARY)
$(MAKE) prefix=$(TARGET_DIR)/usr \
mandir=$(TARGET_DIR)/usr/share/man \
-C $(DIALOG_DIR) install
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -Rf $(TARGET_DIR)/usr/share/man
-endif
dialog: ncurses $(TARGET_DIR)/$(DIALOG_TARGET_BINARY)
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index fe1bab8..fd5e5a3 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -90,12 +90,6 @@ $(DIFFUTILS_DIR)/$(DIFFUTILS_BINARY): $(DIFFUTILS_DIR)/.configured
$(TARGET_DIR)/$(DIFFUTILS_TARGET_BINARY): $(DIFFUTILS_DIR)/$(DIFFUTILS_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(DIFFUTILS_DIR) \
$(if $(BR2_STRIP_none),install,install-strip)
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
ifneq ($(BR2_ENABLE_LOCALE),y)
rm -rf $(TARGET_DIR)/usr/share/locale
endif
diff --git a/package/file/file.mk b/package/file/file.mk
index 579b943..6a76117 100644
--- a/package/file/file.mk
+++ b/package/file/file.mk
@@ -91,14 +91,7 @@ $(FILE_DIR2)/$(FILE_BINARY): $(FILE_DIR2)/.configured $(TOOLCHAIN_DIR)/bin/file
$(TARGET_DIR)/$(FILE_TARGET_BINARY): $(FILE_DIR2)/$(FILE_BINARY)
$(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(FILE_DIR2) install
-($(STRIPCMD) $(TARGET_DIR)/usr/lib/libmagic.so.*.* > /dev/null 2>&1)
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
rm -rf $(TARGET_DIR)/share/locale
- rm -rf $(TARGET_DIR)/usr/share/doc
mv $(TARGET_DIR)/lib/libmagic.a $(STAGING_DIR)/lib
rm -f $(TARGET_DIR)/lib/libmagic.la
mv $(TARGET_DIR)/usr/include/magic.h $(STAGING_DIR)/usr/include
diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk
index ee30425..96e2682 100644
--- a/package/findutils/findutils.mk
+++ b/package/findutils/findutils.mk
@@ -62,14 +62,7 @@ findutils-target_binary: $(FINDUTILS_DIR)/$(FINDUTILS_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(FINDUTILS_DIR) install-strip; \
$(STRIPCMD) $(TARGET_DIR)/usr/lib/locate/* > /dev/null 2>&1; \
fi
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
rm -rf $(TARGET_DIR)/share/locale
- rm -rf $(TARGET_DIR)/usr/share/doc
findutils: findutils-target_binary
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 71e943c..8886e6b 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -56,14 +56,7 @@ $(TARGET_DIR)/$(GAWK_TARGET_BINARY): $(GAWK_DIR)/$(GAWK_BINARY)
rm -f $(TARGET_DIR)/usr/bin/gawk-*
(cd $(TARGET_DIR)/usr/bin; ln -snf gawk awk)
$(STRIPCMD) $(TARGET_DIR)/usr/lib/awk/* > /dev/null 2>&1
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
rm -rf $(TARGET_DIR)/share/locale
- rm -rf $(TARGET_DIR)/usr/share/doc
gawk: $(TARGET_DIR)/$(GAWK_TARGET_BINARY)
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 81ab9de..5b04560 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -135,14 +135,7 @@ gettext-dirclean:
gettext-target: $(GETTEXT_DIR)/$(GETTEXT_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(GETTEXT_DIR) install
chmod +x $(TARGET_DIR)/usr/lib/libintl.so* # identify as needing to be stripped
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/man
-endif
- rm -rf $(addprefix $(TARGET_DIR),/usr/share/doc \
- /usr/doc /usr/share/aclocal /usr/include/libintl.h)
+ rm -rf $(addprefix $(TARGET_DIR),/usr/share/aclocal /usr/include/libintl.h)
rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/include
$(TARGET_DIR)/usr/lib/libintl.so: $(STAGING_DIR)/$(GETTEXT_TARGET_BINARY)
diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index fc3c840..3feb49a 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -41,12 +41,6 @@ $(GZIP_BINARY): $(GZIP_DIR)/.configured
$(GZIP_TARGET_BINARY): $(GZIP_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(GZIP_DIR) install-strip
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
gzip: $(GZIP_TARGET_BINARY)
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index 38cd57b..911da7c 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -121,13 +121,6 @@ $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL): \
$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \
$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -f $(addprefix $(TARGET_DIR)/usr/man/, \
- man3/ipsec_strerror.3 man3/ipsec_set_policy.3 \
- man5/racoon.conf.5 \
- man8/racoonctl.8 man8/racoon.8 \
- man8/plainrsa-gen.8 man8/setkey.8)
-endif
ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_LIBS), y)
install -D $(addprefix $(IPSEC_TOOLS_DIR)/src/, \
libipsec/.libs/libipsec.a libipsec/.libs/libipsec.la \
diff --git a/package/liblockfile/liblockfile.mk b/package/liblockfile/liblockfile.mk
index 6840b99..b30d356 100644
--- a/package/liblockfile/liblockfile.mk
+++ b/package/liblockfile/liblockfile.mk
@@ -56,9 +56,6 @@ liblockfile-clean:
rm -f $(TARGET_DIR)/usr/lib/liblockfile.so*
rm -f $(STAGING_DIR)/usr/lib/liblockfile*
rm -f $(addprefix $(STAGING_DIR)/usr/include/,lockfile.h mailfile.h)
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(STAGING_DIR)/usr/share/man
-endif
-$(MAKE) -C $(LIBLOCKFILE_DIR) clean
liblockfile-dirclean:
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index c589e25..fb0151c 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -111,13 +111,6 @@ $(TARGET_DIR)/usr/sbin/snmpd: $(NETSNMP_DIR)/agent/snmpd
includedir=$(STAGING_DIR)/usr/include/net-snmp \
ucdincludedir=$(STAGING_DIR)/usr/include/ucd-snmp \
-C $(NETSNMP_DIR) install
- rm -rf $(TARGET_DIR)/usr/share/doc
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/info
-endif
# Copy the .conf files.
$(INSTALL) -D -m 0644 $(NETSNMP_DIR)/EXAMPLE.conf $(TARGET_DIR)/etc/snmp/snmpd.conf
-mv $(TARGET_DIR)/usr/share/snmp/mib2c*.conf $(TARGET_DIR)/etc/snmp
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index d2f0616..30ebd35 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -159,12 +159,6 @@ $(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY): $(QUAGGA_BINARY)
ifneq ($(BR2_PACKAGE_QUAGGA_HEADERS),y)
rm -rf $(TARGET_DIR)/usr/include/quagga
endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/man
-endif
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/info
-endif
quagga: $(QUAGGA_DEPENDENCIES) $(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY)
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index 3445deb..6508725 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -65,12 +65,6 @@ build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY)
rm -rf $(HOST_SED_DIR)/share/locale; \
rm -rf $(HOST_SED_DIR)/usr/share/doc; \
fi
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(HOST_SED_DIR)/usr/man/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(HOST_SED_DIR)/usr/share/man
-endif
$(HOST_SED_DIR)/$(SED_TARGET_BINARY):
if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ]; then \
@@ -152,12 +146,6 @@ sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
rm -rf $(TARGET_DIR)/share/locale; \
rm -rf $(TARGET_DIR)/usr/share/doc; \
fi
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/share/man
-endif
sed: sed-target_binary
diff --git a/package/udpcast/udpcast.mk b/package/udpcast/udpcast.mk
index ba22ba4..3e0823a 100644
--- a/package/udpcast/udpcast.mk
+++ b/package/udpcast/udpcast.mk
@@ -73,10 +73,6 @@ ifneq ($(BR2_PACKAGE_UDPCAST_RECEIVER),y)
rm -f $(TARGET_DIR)/usr/sbin/udp-receiver
rm -f $(TARGET_DIR)/usr/sbin/udp-receiver.1
endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -f $(addprefix $(TARGET_DIR)/usr/man/, \
- $(addsuffix .1,$(UDPCAST_BINARIES)))
-endif
udpcast: $(UDPCAST_PROGS)
diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk
index 3f48c18..c24acc4 100644
--- a/toolchain/binutils/binutils.mk
+++ b/toolchain/binutils/binutils.mk
@@ -151,13 +151,7 @@ $(TARGET_DIR)/usr/bin/ld: $(BINUTILS_DIR2)/binutils/objdump
$(MAKE) DESTDIR=$(TARGET_DIR) \
tooldir=/usr build_tooldir=/usr \
-C $(BINUTILS_DIR2) install
-ifneq ($(BR2_HAVE_MANPAGES),y)
- rm -rf $(TARGET_DIR)/usr/man
-endif
-ifneq ($(BR2_HAVE_INFOPAGES),y)
- rm -rf $(TARGET_DIR)/usr/info
-endif
- rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/share/doc
+ rm -rf $(TARGET_DIR)/share/locale
-$(STRIPCMD) $(TARGET_DIR)/usr/$(REAL_GNU_TARGET_NAME)/bin/* > /dev/null 2>&1
-$(STRIPCMD) $(TARGET_DIR)/usr/bin/* > /dev/null 2>&1
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 06/25] Remove all documentation when BR2_HAVE_DOCUMENTATION is not set
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (4 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 05/25] Do not let packages remove man pages, info pages and documentation Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 07/25] Do not remove documentation on a per-package basis Thomas Petazzoni
` (19 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Until now, we had BR2_HAVE_MANPAGES, BR2_HAVE_INFOPAGES and
BR2_HAVE_DOCUMENTATION, but there's no need to have such a
fine-grained control over what documentation gets kept or not.
Therefore, just remove all the documentation (man pages, info pages
and documentation in $(TARGET_DIR)/usr/doc and
$(TARGET_DIR)/usr/share/doc) when BR2_HAVE_DOCUMENTATION is not set.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Makefile | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index ce6bf3d..03ed4c5 100644
--- a/Makefile
+++ b/Makefile
@@ -409,11 +409,10 @@ else
find $(TARGET_DIR)/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
find $(TARGET_DIR)/usr/lib \( -name '*.a' -o -name '*.la' \) -print0 | xargs -0 rm -f
endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
rm -rf $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/man
-endif
-ifneq ($(BR2_HAVE_INFOPAGES),y)
rm -rf $(TARGET_DIR)/usr/info $(TARGET_DIR)/usr/share/info
+ rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc
endif
find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 07/25] Do not remove documentation on a per-package basis
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (5 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 06/25] Remove all documentation when BR2_HAVE_DOCUMENTATION is not set Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 08/25] Use BR2_HAVE_DOCUMENTATION instead of BR2_HAVE_{MANPAGES, INFOPAGES} Thomas Petazzoni
` (18 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Since the documentation cleanup is done by the main Makefile in a
global way, there's no need to do that on a per-package basis in the
generic package infrastructure.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.package.in | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index fbd7f69..e98fda8 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -171,15 +171,6 @@ $(BUILD_DIR)/%/.stamp_target_installed:
@$(call MESSAGE,"Installing to target")
$($(PKG)_INSTALL_TARGET_CMDS)
$(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep))
- $(if $(BR2_HAVE_MANPAGES),,for d in man share/man; do \
- rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
- done)
- $(if $(BR2_HAVE_INFOPAGES),,for d in info share/info; do \
- rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
- done)
- $(if $(BR2_HAVE_DOCUMENTATION),,for d in doc share/doc; do \
- rm -rf $(TARGET_DIR)/$$d $(TARGET_DIR)/usr/$$d; \
- done)
$(Q)touch $@
# Clean package
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 08/25] Use BR2_HAVE_DOCUMENTATION instead of BR2_HAVE_{MANPAGES, INFOPAGES}
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (6 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 07/25] Do not remove documentation on a per-package basis Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 09/25] Get rid of BR2_HAVE_{MANPAGES, INFOPAGES} config options Thomas Petazzoni
` (17 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/avahi/avahi.mk | 2 +-
package/axel/axel.mk | 2 +-
package/hdparm/hdparm.mk | 2 +-
package/ltrace/ltrace.mk | 2 +-
package/netsnmp/netsnmp.mk | 2 +-
package/pppd/pppd.mk | 2 +-
package/pptp-linux/pptp-linux.mk | 2 +-
package/rp-pppoe/rp-pppoe.mk | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk
index b3e1d9b..9940d28 100644
--- a/package/avahi/avahi.mk
+++ b/package/avahi/avahi.mk
@@ -75,7 +75,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \
--disable-monodoc \
--disable-stack-protector \
--with-distro=none \
- $(if $(BR2_HAVE_MANPAGES),--enable,--disable)-manpages \
+ $(if $(BR2_HAVE_DOCUMENTATION),--enable,--disable)-manpages \
$(if $(BR2_PACKAGE_AVAHI_AUTOIPD),--enable,--disable)-autoipd \
--with-avahi-user=default \
--with-avahi-group=default \
diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index 2e42a18..8891795 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -32,7 +32,7 @@ $(AXEL_DIR)/$(AXEL_BINARY): $(AXEL_DIR)/Makefile.settings
$(TARGET_DIR)/$(AXEL_TARGET_BINARY): $(AXEL_DIR)/$(AXEL_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-bin
-ifeq ($(BR2_HAVE_MANPAGES),y)
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-man
endif
diff --git a/package/hdparm/hdparm.mk b/package/hdparm/hdparm.mk
index c1b83c0..cc747eb 100644
--- a/package/hdparm/hdparm.mk
+++ b/package/hdparm/hdparm.mk
@@ -29,7 +29,7 @@ $(HDPARM_DIR)/$(HDPARM_BINARY): $(HDPARM_DIR)/.unpacked
$(TARGET_DIR)/$(HDPARM_TARGET_BINARY): $(HDPARM_DIR)/$(HDPARM_BINARY)
rm -f $(TARGET_DIR)/$(HDPARM_TARGET_BINARY)
$(INSTALL) -D -m 0755 $(HDPARM_DIR)/$(HDPARM_BINARY) $(TARGET_DIR)/$(HDPARM_TARGET_BINARY)
-ifeq ($(BR2_HAVE_MANPAGES),y)
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
$(INSTALL) -D $(HDPARM_DIR)/hdparm.8 $(TARGET_DIR)/usr/share/man/man8/hdparm.8
endif
$(STRIPCMD) $(STRIP_STRIP_ALL) $@
diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk
index 424c39d..c99f223 100644
--- a/package/ltrace/ltrace.mk
+++ b/package/ltrace/ltrace.mk
@@ -60,7 +60,7 @@ $(LTRACE_DIR)/$(LTRACE_BINARY): $(LTRACE_DIR)/.configured
$(TARGET_DIR)/$(LTRACE_TARGET_BINARY): $(LTRACE_DIR)/$(LTRACE_BINARY)
#$(MAKE) DESTDIR=$(TARGET_DIR) ARCH=$(LTRACE_ARCH) -C $(LTRACE_DIR) install
$(INSTALL) -D $(LTRACE_DIR)/$(LTRACE_BINARY) $@
-ifeq ($(BR2_HAVE_MANPAGES),y)
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
$(INSTALL) -D $(LTRACE_DIR)/ltrace.1 \
$(TARGET_DIR)/usr/share/man/man1/ltrace.1
endif
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index fb0151c..86f7a94 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -52,7 +52,7 @@ else
NETSNMP_CONFIGURE_OPENSSL:=--without-openssl
endif
-ifneq ($(findstring y,$(BR2_HAVE_MANPAGES)$(BR2_HAVE_INFOPAGES)),y)
+ifneq ($(BR2_HAVE_DOCUMENTATION),y)
NETSNMP_DOCS:=--disable-manuals
endif
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index 32be428..31ddbb6 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -8,7 +8,7 @@ PPPD_VERSION = 2.4.5
PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz
PPPD_SITE = ftp://ftp.samba.org/pub/ppp
PPPD_TARGET_BINS = chat pppd pppdump pppstats
-PPPD_MANPAGES = $(if $(BR2_HAVE_MANPAGES),chat pppd pppdump pppstats)
+PPPD_MANPAGES = $(if $(BR2_HAVE_DOCUMENTATION),chat pppd pppdump pppstats)
PPPD_MAKE = $(MAKE) CC=$(TARGET_CC) COPTS="$(TARGET_CFLAGS)" -C $(PPPD_DIR) $(PPPD_MAKE_OPT)
ifeq ($(BR2_PACKAGE_PPPD_FILTER),y)
diff --git a/package/pptp-linux/pptp-linux.mk b/package/pptp-linux/pptp-linux.mk
index db187d9..8de0832 100644
--- a/package/pptp-linux/pptp-linux.mk
+++ b/package/pptp-linux/pptp-linux.mk
@@ -51,7 +51,7 @@ $(PPTP_LINUX_DIR)/$(PPTP_LINUX_BINARY): $(PPTP_LINUX_DIR)/.unpacked
$(TARGET_DIR)/$(PPTP_LINUX_TARGET_BINARY): $(PPTP_LINUX_DIR)/$(PPTP_LINUX_BINARY)
cp -dpf $(PPTP_LINUX_DIR)/$(PPTP_LINUX_BINARY) $@
-ifeq ($(BR2_HAVE_MANPAGES),y)
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
mkdir -p $(TARGET_DIR)/usr/share/man/man8
$(INSTALL) -m 644 $(PPTP_LINUX_DIR)/pptp.8 $(TARGET_DIR)/usr/share/man/man8/pptp.8
endif
diff --git a/package/rp-pppoe/rp-pppoe.mk b/package/rp-pppoe/rp-pppoe.mk
index 1aa5467..bb17750 100644
--- a/package/rp-pppoe/rp-pppoe.mk
+++ b/package/rp-pppoe/rp-pppoe.mk
@@ -53,7 +53,7 @@ $(RP_PPPOE_DIR)/$(RP_PPPOE_BINARY): $(RP_PPPOE_TOPDIR)/.configured
$(TARGET_DIR)/$(RP_PPPOE_TARGET_BINARY): $(RP_PPPOE_DIR)/$(RP_PPPOE_BINARY)
cp -dpf $(RP_PPPOE_DIR)/$(RP_PPPOE_BINARY) $@
-ifeq ($(BR2_HAVE_MANPAGES),y)
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
mkdir -p $(TARGET_DIR)/usr/share/man/man8
$(INSTALL) -m 644 $(RP_PPPOE_TOPDIR)/man/pppoe.8 $(TARGET_DIR)/usr/share/man/man8/pppoe.8
endif
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 09/25] Get rid of BR2_HAVE_{MANPAGES, INFOPAGES} config options
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (7 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 08/25] Use BR2_HAVE_DOCUMENTATION instead of BR2_HAVE_{MANPAGES, INFOPAGES} Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 10/25] Update defconfigs after BR2_HAVE_{INFOPAGES, MANPAGES} removal Thomas Petazzoni
` (16 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/Config.in b/Config.in
index f2d4a50..7e51c84 100644
--- a/Config.in
+++ b/Config.in
@@ -300,24 +300,11 @@ config BR2_PREFER_STATIC_LIB
WARNING: This is highly experimental at the moment.
-config BR2_HAVE_MANPAGES
- bool "manpages on the target"
- help
- Leave the manpages on the target.
- If you say n here, your target will not contain any
- manpage.
-
-config BR2_HAVE_INFOPAGES
- bool "infopages on the target"
- help
- Leave the infopages on the target.
- If you say n here, your target will not contain any
- infopage.
-
config BR2_HAVE_DOCUMENTATION
bool "documentation on the target"
help
- Leave the documentation on the target.
+ Install the documentation, including manual pages and info
+ pages, on the target.
If you say n here, your target will not contain any
documentation.
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 10/25] Update defconfigs after BR2_HAVE_{INFOPAGES, MANPAGES} removal
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (8 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 09/25] Get rid of BR2_HAVE_{MANPAGES, INFOPAGES} config options Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 11/25] Get rid of all usages of BR2_RECENT Thomas Petazzoni
` (15 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
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/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 --
26 files changed, 0 insertions(+), 52 deletions(-)
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 76ba81e..325c3f7 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -178,8 +178,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index a1946b7..b592e7b 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -183,8 +183,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig
index e874ffa..2ec58fa 100644
--- a/configs/at91rm9200df_ext_bare_defconfig
+++ b/configs/at91rm9200df_ext_bare_defconfig
@@ -178,8 +178,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig
index e94a730..d9ef5e4 100644
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -189,8 +189,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index ae67079..22c61da 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -196,8 +196,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig
index a5aa0b3..e5584f6 100644
--- a/configs/at91sam9260dfc_ext_bare_defconfig
+++ b/configs/at91sam9260dfc_ext_bare_defconfig
@@ -178,8 +178,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig
index 1a8aba4..e1cba70 100644
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -197,8 +197,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index b07117e..43711f5 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -199,8 +199,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig
index 68c67ae..265f2a2 100644
--- a/configs/at91sam9261ek_ext_bare_defconfig
+++ b/configs/at91sam9261ek_ext_bare_defconfig
@@ -181,8 +181,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig
index e777292..da2e8b1 100644
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -200,8 +200,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index 4c9cce3..f9979a0 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -197,8 +197,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig
index 7d01b98..8c15e3c 100644
--- a/configs/at91sam9263ek_ext_bare_defconfig
+++ b/configs/at91sam9263ek_ext_bare_defconfig
@@ -180,8 +180,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig
index f2d432c..e6e12bb 100644
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -199,8 +199,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 0eb0026..376f1da 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -197,8 +197,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig
index ca7f4fd..6adcded 100644
--- a/configs/at91sam9g20dfc_ext_bare_defconfig
+++ b/configs/at91sam9g20dfc_ext_bare_defconfig
@@ -178,8 +178,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig
index 9626136..588aa4a 100644
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -197,8 +197,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index 012d78e..24606ed 100644
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -129,8 +129,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index e66365f..d8f03f9 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -129,8 +129,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index 3a8d71c..f7de236 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -129,8 +129,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index b2c5850..7f0ef5a 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -128,8 +128,6 @@ BR2_OPTIMIZE_2=y
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_S is not set
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index 783ddcc..b4c0312 100644
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -129,8 +129,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index 436a7f8..85e2a47 100644
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -129,8 +129,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index cd3cf74..a9d4629 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -127,8 +127,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index dc261ec..65b1c42 100644
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -127,8 +127,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index ae7c702..70aa1f9 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -134,8 +134,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DEVFILES is not set
#
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index f90d8a7..28b9da1 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -105,8 +105,6 @@ BR2_STRIP_strip=y
# BR2_OPTIMIZE_3 is not set
BR2_OPTIMIZE_S=y
# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_MANPAGES is not set
-# BR2_HAVE_INFOPAGES is not set
# BR2_HAVE_DOCUMENTATION is not set
# BR2_HAVE_DEVFILES is not set
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 11/25] Get rid of all usages of BR2_RECENT
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (9 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 10/25] Update defconfigs after BR2_HAVE_{INFOPAGES, MANPAGES} removal Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 18:27 ` Peter Korsgaard
2010-04-11 4:05 ` [Buildroot] [PATCH 12/25] Remove the BR2_RECENT option Thomas Petazzoni
` (14 subsequent siblings)
25 siblings, 1 reply; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/busybox/Config.in | 4 ++--
target/u-boot/Config.in | 4 ++--
toolchain/binutils/Config.in | 2 +-
toolchain/gcc/Config.in | 4 ++--
| 2 +-
toolchain/uClibc/Config.in | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 7110f0f..491319a 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -23,7 +23,7 @@ choice
config BR2_BUSYBOX_VERSION_1_13_X
bool "BusyBox 1.13.x"
- depends on BR2_RECENT
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_14_X
bool "BusyBox 1.14.x"
@@ -31,7 +31,7 @@ choice
config BR2_BUSYBOX_VERSION_1_15_X
bool "BusyBox 1.15.x"
- depends on BR2_DEPRECATED || BR2_RECENT
+ depends on BR2_DEPRECATED
config BR2_BUSYBOX_VERSION_1_16_X
bool "BusyBox 1.16.x"
diff --git a/target/u-boot/Config.in b/target/u-boot/Config.in
index f84d181..2c3271d 100644
--- a/target/u-boot/Config.in
+++ b/target/u-boot/Config.in
@@ -22,11 +22,11 @@ config BR2_TARGET_UBOOT_2010_03
config BR2_TARGET_UBOOT_2009_11
bool "u-boot-2009.11"
- depends on BR2_DEPRECATED || BR2_RECENT
+ depends on BR2_DEPRECATED
config BR2_TARGET_UBOOT_2009_08
bool "u-boot-2009.08"
- depends on BR2_DEPRECATED || BR2_RECENT
+ depends on BR2_DEPRECATED
config BR2_TARGET_UBOOT_2009_06
bool "u-boot-2009.06"
diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 003d0ee..125c447 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -34,7 +34,7 @@ choice
config BR2_BINUTILS_VERSION_2_20
depends on !BR2_avr32
- depends on BR2_DEPRECATED || BR2_RECENT
+ depends on BR2_DEPRECATED
bool "binutils 2.20"
config BR2_BINUTILS_VERSION_2_20_1
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 97d5eb7..b837348 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -35,7 +35,7 @@ choice
config BR2_GCC_VERSION_4_2_4
depends on !BR2_avr32
- depends on BR2_RECENT || BR2_DEPRECATED
+ depends on BR2_DEPRECATED
bool "gcc 4.2.4"
config BR2_GCC_VERSION_4_3_2
@@ -45,7 +45,7 @@ choice
config BR2_GCC_VERSION_4_3_3
depends on !BR2_avr32
- depends on BR2_RECENT || BR2_DEPRECATED
+ depends on BR2_DEPRECATED
bool "gcc 4.3.3"
config BR2_GCC_VERSION_4_3_4
--git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 8f7f720..4097409 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -38,7 +38,7 @@ choice
config BR2_KERNEL_HEADERS_2_6_32
bool "Linux 2.6.32.x kernel headers"
- depends on BR2_DEPRECATED || BR2_RECENT
+ depends on BR2_DEPRECATED
config BR2_KERNEL_HEADERS_2_6_33
bool "Linux 2.6.33.x kernel headers"
diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index e254f28..45b5eb1 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -20,7 +20,7 @@ choice
bool "uClibc 0.9.29"
config BR2_UCLIBC_VERSION_0_9_30
- depends on BR2_DEPRECATED || BR2_RECENT
+ depends on BR2_DEPRECATED
bool "uClibc 0.9.30.x"
config BR2_UCLIBC_VERSION_0_9_31
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 12/25] Remove the BR2_RECENT option
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (10 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 11/25] Get rid of all usages of BR2_RECENT Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 13/25] Update defconfigs after BR2_RECENT removal Thomas Petazzoni
` (13 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/Config.in b/Config.in
index 7e51c84..430cb4f 100644
--- a/Config.in
+++ b/Config.in
@@ -141,12 +141,6 @@ config BR2_DEPRECATED
help
This option hides outdated/obsolete versions of packages.
-config BR2_RECENT
- bool "Show packages that are of the latest major version"
- default y
- help
- This option show recent versions of packages.
-
config BR2_CONFIG_CACHE
bool "Use a central configure cache file"
default y
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 13/25] Update defconfigs after BR2_RECENT removal
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (11 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 12/25] Remove the BR2_RECENT option Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 14/25] Move the command-related options to a submenu Thomas Petazzoni
` (12 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 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 325c3f7..79193e1 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -166,7 +166,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
BR2_CONFIG_CACHE=y
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index b592e7b..308aec0 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -171,7 +171,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig
index 2ec58fa..53ebc37 100644
--- a/configs/at91rm9200df_ext_bare_defconfig
+++ b/configs/at91rm9200df_ext_bare_defconfig
@@ -166,7 +166,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig
index d9ef5e4..4beb1e4 100644
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -177,7 +177,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 22c61da..c9777e2 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -184,7 +184,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig
index e5584f6..e36a905 100644
--- a/configs/at91sam9260dfc_ext_bare_defconfig
+++ b/configs/at91sam9260dfc_ext_bare_defconfig
@@ -166,7 +166,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig
index e1cba70..b927dc4 100644
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -185,7 +185,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index 43711f5..324b7bc 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -187,7 +187,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
BR2_CONFIG_CACHE=y
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig
index 265f2a2..56a2912 100644
--- a/configs/at91sam9261ek_ext_bare_defconfig
+++ b/configs/at91sam9261ek_ext_bare_defconfig
@@ -169,7 +169,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig
index da2e8b1..365b36f 100644
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -188,7 +188,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
BR2_CONFIG_CACHE=y
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index f9979a0..90090e9 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -185,7 +185,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
BR2_CONFIG_CACHE=y
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig
index 8c15e3c..53e8b0b 100644
--- a/configs/at91sam9263ek_ext_bare_defconfig
+++ b/configs/at91sam9263ek_ext_bare_defconfig
@@ -168,7 +168,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig
index e6e12bb..265e2ed 100644
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -187,7 +187,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
BR2_CONFIG_CACHE=y
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 376f1da..5709cbb 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -185,7 +185,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig
index 6adcded..43905f9 100644
--- a/configs/at91sam9g20dfc_ext_bare_defconfig
+++ b/configs/at91sam9g20dfc_ext_bare_defconfig
@@ -166,7 +166,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig
index 588aa4a..1d76e30 100644
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -185,7 +185,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index 24606ed..ae3a735 100644
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -117,7 +117,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index d8f03f9..c701bab 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -117,7 +117,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=3
# BR2_DEPRECATED is not set
-BR2_RECENT=y
BR2_CONFIG_CACHE=y
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index f7de236..8d8ec6a 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -117,7 +117,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 7f0ef5a..fa4caa1 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -116,7 +116,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index b4c0312..a225b29 100644
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -117,7 +117,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index 85e2a47..c653cc4 100644
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -117,7 +117,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index a9d4629..767e370 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -115,7 +115,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index 65b1c42..9f18d8c 100644
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -115,7 +115,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibcgnueabi"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_CONFIG_CACHE is not set
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index 70aa1f9..a7e2cc3 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -123,7 +123,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
# BR2_STRIP_sstrip is not set
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index 28b9da1..51017ca 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -94,7 +94,6 @@ BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
-BR2_RECENT=y
# BR2_ENABLE_DEBUG is not set
BR2_STRIP_strip=y
# BR2_STRIP_sstrip is not set
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 14/25] Move the command-related options to a submenu
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (12 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 13/25] Update defconfigs after BR2_RECENT removal Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 15/25] Bring the three path-related options together Thomas Petazzoni
` (11 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/Config.in b/Config.in
index 430cb4f..1b717b3 100644
--- a/Config.in
+++ b/Config.in
@@ -15,6 +15,8 @@ source "target/device/Config.in"
menu "Build options"
+menu "Commands"
+
config BR2_WGET
string "Wget command"
default "wget --passive-ftp -nd"
@@ -67,6 +69,8 @@ config BR2_TAR_OPTIONS
E.g. " -v --exclude='*.svn*'" to exclude all .svn internal files
and to be verbose.
+endmenu
+
config BR2_DL_DIR
string "Download dir"
default "$(TOPDIR)/dl"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 15/25] Bring the three path-related options together
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (13 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 14/25] Move the command-related options to a submenu Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 16/25] Move the global config cache option to an Advanced submenu Thomas Petazzoni
` (10 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Config.in b/Config.in
index 1b717b3..de0c3b2 100644
--- a/Config.in
+++ b/Config.in
@@ -88,8 +88,6 @@ config BR2_COPYTO
Setting this variable will (eventually) override
any other copyto configurations in buildroot.
-source "target/device/Config.in.mirrors"
-
config BR2_STAGING_DIR
string "Toolchain and header file location?"
default "$(BASE_DIR)/staging"
@@ -103,6 +101,8 @@ config BR2_STAGING_DIR
Most people will leave this set to the default value of
"$(BASE_DIR)/staging".
+source "target/device/Config.in.mirrors"
+
config BR2_GNU_BUILD_SUFFIX
string "GNU build hostname suffix"
default "pc-linux-gnu"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 16/25] Move the global config cache option to an Advanced submenu
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (14 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 15/25] Bring the three path-related options together Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 17/25] Guess build system and remove BR2_GNU_BUILD_SUFFIX Thomas Petazzoni
` (9 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Config.in b/Config.in
index de0c3b2..7ad84e7 100644
--- a/Config.in
+++ b/Config.in
@@ -145,14 +145,6 @@ config BR2_DEPRECATED
help
This option hides outdated/obsolete versions of packages.
-config BR2_CONFIG_CACHE
- bool "Use a central configure cache file"
- default y
- help
- This determines if a central config cache is used by
- packages, reducing the configure time for packages as each
- one caches its findings.
-
config BR2_ENABLE_DEBUG
bool "build packages with debugging symbols"
select BR2_PACKAGE_GDB_SERVER
@@ -312,6 +304,18 @@ config BR2_HAVE_DEVFILES
Install headers and static libraries in the
target filesystem
+menu "Advanced"
+
+config BR2_CONFIG_CACHE
+ bool "Use a central configure cache file"
+ default y
+ help
+ This determines if a central config cache is used by
+ packages, reducing the configure time for packages as each
+ one caches its findings.
+
+endmenu
+
endmenu
source "toolchain/Config.in"
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 17/25] Guess build system and remove BR2_GNU_BUILD_SUFFIX
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (15 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 16/25] Move the global config cache option to an Advanced submenu Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 18/25] Update defconfigs after BR2_GNU_BUILD_SUFFIX removal Thomas Petazzoni
` (8 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Instead of having a configuration option BR2_GNU_BUILD_SUFFIX, let's
use config.guess to guess the build system type.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Config.in | 13 -------------
Makefile | 10 ++++++----
package/Makefile.in | 1 -
package/qt/qt.mk | 2 +-
4 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/Config.in b/Config.in
index 7ad84e7..bc4fec2 100644
--- a/Config.in
+++ b/Config.in
@@ -103,19 +103,6 @@ config BR2_STAGING_DIR
source "target/device/Config.in.mirrors"
-config BR2_GNU_BUILD_SUFFIX
- string "GNU build hostname suffix"
- default "pc-linux-gnu"
- help
- The string used to pass to configure scripts via the
- --build= option. Just specify the suffix here, the leading
- arch will be filled in automatically.
-
- Here's some copy and paste build host options for you:
- linux: pc-linux-gnu
- cygwin: pc-cygwin
- os x: apple-darwin7 / apple-darwin8
-
config BR2_GNU_TARGET_SUFFIX
string "GNU target suffix"
default "linux-uclibcgnueabi" if BR2_ARM_EABI
diff --git a/Makefile b/Makefile
index 03ed4c5..7fdf697 100644
--- a/Makefile
+++ b/Makefile
@@ -153,29 +153,31 @@ 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)
+
#############################################################
#
# Setup the proper filename extensions for the host
#
##############################################################
-ifneq ($(findstring linux,$(BR2_GNU_BUILD_SUFFIX)),)
+ifneq ($(findstring linux,$(GNU_HOST_NAME)),)
HOST_EXEEXT:=
HOST_LIBEXT:=.a
HOST_SHREXT:=.so
endif
-ifneq ($(findstring apple,$(BR2_GNU_BUILD_SUFFIX)),)
+ifneq ($(findstring apple,$(GNU_HOST_NAME)),)
HOST_EXEEXT:=
HOST_LIBEXT:=.a
HOST_SHREXT:=.dylib
endif
-ifneq ($(findstring cygwin,$(BR2_GNU_BUILD_SUFFIX)),)
+ifneq ($(findstring cygwin,$(GNU_HOST_NAME)),)
HOST_EXEEXT:=.exe
HOST_LIBEXT:=.lib
HOST_SHREXT:=.dll
HOST_LOADLIBES="-lcurses -lintl"
export HOST_LOADLIBES
endif
-ifneq ($(findstring mingw,$(BR2_GNU_BUILD_SUFFIX)),)
+ifneq ($(findstring mingw,$(GNU_HOST_NAME)),)
HOST_EXEEXT:=.exe
HOST_LIBEXT:=.lib
HOST_SHREXT:=.dll
diff --git a/package/Makefile.in b/package/Makefile.in
index efb4dec..8f1a29d 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -187,7 +187,6 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
-e 's/i[3-9]86/i386/' \
-e 's/xtensa.*/xtensa/' \
)
-GNU_HOST_NAME:=$(HOST_ARCH)-$(call qstrip,$(BR2_GNU_BUILD_SUFFIX))
TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
AR="$(TARGET_AR)" \
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 9167349..4f42e59 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -372,7 +372,7 @@ BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
# x86x86fix
# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
# host. It's unclear if this would happen on other hosts.
-ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),)
+ifneq ($(findstring unknown-linux,$(GNU_HOST_NAME)),)
ifneq ($(findstring x86,$(BR2_PACKAGE_QT_EMB_PLATFORM)),)
QT_CONFIGURE+= -platform linux-g++
endif
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 18/25] Update defconfigs after BR2_GNU_BUILD_SUFFIX removal
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (16 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 17/25] Guess build system and remove BR2_GNU_BUILD_SUFFIX Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 19/25] Get rid of now unused HOST_ARCH computation code Thomas Petazzoni
` (7 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 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 79193e1..b13bccd 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -162,7 +162,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 308aec0..8a643c2 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -167,7 +167,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 53ebc37..65a640b 100644
--- a/configs/at91rm9200df_ext_bare_defconfig
+++ b/configs/at91rm9200df_ext_bare_defconfig
@@ -162,7 +162,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91rm9200df-rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 4beb1e4..6a39002 100644
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -173,7 +173,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91rm9200df-rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 c9777e2..776fcac 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -180,7 +180,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 e36a905..6e4d478 100644
--- a/configs/at91sam9260dfc_ext_bare_defconfig
+++ b/configs/at91sam9260dfc_ext_bare_defconfig
@@ -162,7 +162,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 b927dc4..22287ba 100644
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -181,7 +181,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9260dfc-rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig
index d8e1edf..396adee 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_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index 324b7bc..a6b38f8 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -183,7 +183,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9261ek-NAND"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 56a2912..316c15e 100644
--- a/configs/at91sam9261ek_ext_bare_defconfig
+++ b/configs/at91sam9261ek_ext_bare_defconfig
@@ -165,7 +165,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9261ek-rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 365b36f..4bb96f1 100644
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -184,7 +184,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9261ek-NAND"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 90090e9..cd6bcd2 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -181,7 +181,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9263ek-NAND"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 53e8b0b..3e57789 100644
--- a/configs/at91sam9263ek_ext_bare_defconfig
+++ b/configs/at91sam9263ek_ext_bare_defconfig
@@ -164,7 +164,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9263ek-rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 265e2ed..944811f 100644
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -183,7 +183,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9263ek-NAND"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 5709cbb..0b7da36 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -181,7 +181,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam92g20ek-rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 43905f9..4db69f3 100644
--- a/configs/at91sam9g20dfc_ext_bare_defconfig
+++ b/configs/at91sam9g20dfc_ext_bare_defconfig
@@ -162,7 +162,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9g20dfc-rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 1d76e30..a2f34a2 100644
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -181,7 +181,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="at91sam9g20dfc-rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 ae3a735..cd5a676 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_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index c701bab..36c6745 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_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=3
# BR2_DEPRECATED is not set
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index 8d8ec6a..ee147a4 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -113,7 +113,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 fa4caa1..36fcc75 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_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=2
# BR2_DEPRECATED is not set
diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index a225b29..38cfb17 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_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index c653cc4..361b181 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_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index 767e370..4e2de89 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -111,7 +111,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
BR2_ROOTFS_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 9f18d8c..06814c1 100644
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -111,7 +111,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="$(BOARD_NAME)-rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 a7e2cc3..b1ec323 100644
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -119,7 +119,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
BR2_ROOTFS_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
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 51017ca..309b80e 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -90,7 +90,6 @@ BR2_TOPDIR_PREFIX=""
BR2_TOPDIR_SUFFIX=""
BR2_ROOTFS_PREFIX="rootfs"
BR2_ROOTFS_SUFFIX="$(DATE)"
-BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
BR2_GNU_TARGET_SUFFIX="linux-uclibc"
BR2_JLEVEL=1
# BR2_DEPRECATED is not set
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 19/25] Get rid of now unused HOST_ARCH computation code
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (17 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 18/25] Update defconfigs after BR2_GNU_BUILD_SUFFIX removal Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 20/25] Remove BR2_ENABLE_LOCALE_PREGENERATED Thomas Petazzoni
` (6 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.in | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index 8f1a29d..43ff2dd 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -174,20 +174,6 @@ HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH)
HOSTCC_VERSION:=$(shell $(HOSTCC) --version | \
sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p')
-HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
- -e 's/sparc.*/sparc/' \
- -e 's/arm.*/arm/g' \
- -e 's/m68k.*/m68k/' \
- -e 's/ppc/powerpc/g' \
- -e 's/v850.*/v850/g' \
- -e 's/sh[234]/sh/' \
- -e 's/mips-.*/mips/' \
- -e 's/mipsel-.*/mipsel/' \
- -e 's/cris.*/cris/' \
- -e 's/i[3-9]86/i386/' \
- -e 's/xtensa.*/xtensa/' \
- )
-
TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
AR="$(TARGET_AR)" \
AS="$(TARGET_AS)" \
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 20/25] Remove BR2_ENABLE_LOCALE_PREGENERATED
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (18 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 19/25] Get rid of now unused HOST_ARCH computation code Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 21/25] Update defconfigs after BR2_ENABLE_LOCALE_PREGENERATED removal Thomas Petazzoni
` (5 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
The option is marked broken since october 2009, and even the uClibc
configuration help text says that using pregenerated locales is highly
discouraged.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/Config.in.2 | 10 ----------
toolchain/uClibc/uclibc.mk | 21 +--------------------
2 files changed, 1 insertions(+), 30 deletions(-)
diff --git a/toolchain/Config.in.2 b/toolchain/Config.in.2
index 17830c0..f04f18a 100644
--- a/toolchain/Config.in.2
+++ b/toolchain/Config.in.2
@@ -35,16 +35,6 @@ config BR2_ENABLE_LOCALE
If you have an external binary toolchain that has been
built with locale/i18n support then enable this option.
-config BR2_ENABLE_LOCALE_PREGENERATED
- bool "Use pregenerated locale data?"
- depends on BR2_ENABLE_LOCALE && BR2_TOOLCHAIN_BUILDROOT && BROKEN # tarball missing
- help
- Instead of generating the locale data locally you can optionally
- download a pregenerated set of locales.
-
- Say N here unless your buildhost lacks locale support and you
- desparately want to use internationalization on your target.
-
config BR2_ENABLE_LOCALE_PURGE
bool "Purge unwanted locales"
help
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index ddeb395..a9ee609 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -68,20 +68,8 @@ UCLIBC_SPARC_TYPE:=CONFIG_SPARC_$(call qstrip,$(BR2_SPARC_TYPE))
$(DL_DIR)/$(UCLIBC_SOURCE):
$(call DOWNLOAD,$(UCLIBC_SITE),$(UCLIBC_SOURCE))
-ifneq ($(BR2_ENABLE_LOCALE_PREGENERATED),)
-UCLIBC_SITE_LOCALE:=http://www.uclibc.org/downloads
-UCLIBC_SOURCE_LOCALE:=uClibc-locale-030818.tgz
-
-$(DL_DIR)/$(UCLIBC_SOURCE_LOCALE):
- $(call DOWNLOAD,$(UCLIBC_SITE_LOCALE),$(UCLIBC_SOURCE_LOCALE))
-
-UCLIBC_LOCALE_DATA:=$(DL_DIR)/$(UCLIBC_SOURCE_LOCALE)
-else
-UCLIBC_LOCALE_DATA=
-endif
-
uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
-$(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
+$(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
mkdir -p $(TOOLCHAIN_DIR)
rm -rf $(UCLIBC_DIR)
$(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
@@ -97,9 +85,6 @@ else
toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
uClibc.\*.patch uClibc.\*.patch.$(ARCH)
endif
-ifneq ($(BR2_ENABLE_LOCALE_PREGENERATED),)
- cp -dpf $(DL_DIR)/$(UCLIBC_SOURCE_LOCALE) $(UCLIBC_DIR)/extra/locale/
-endif
touch $@
@@ -329,11 +314,7 @@ else
echo "# PTHREADS_DEBUG_SUPPORT is not set" >> $(UCLIBC_DIR)/.oldconfig
endif
ifeq ($(BR2_ENABLE_LOCALE),y)
-ifeq ($(BR2_ENABLE_LOCALE_PREGENERATED),y)
- $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\nUCLIBC_PREGENERATED_LOCALE_DATA=y\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
-else
$(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
-endif
else
$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=n,g' $(UCLIBC_DIR)/.oldconfig
endif
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 21/25] Update defconfigs after BR2_ENABLE_LOCALE_PREGENERATED removal
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (19 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 20/25] Remove BR2_ENABLE_LOCALE_PREGENERATED Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 22/25] Get rid of unused variables Thomas Petazzoni
` (4 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 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/at91sam9260dfc_defconfig | 1 -
configs/at91sam9261ek_defconfig | 1 -
configs/at91sam9263ek_defconfig | 1 -
configs/at91sam9g20dfc_defconfig | 1 -
configs/atngw100_defconfig | 1 -
configs/atstk1005_defconfig | 1 -
configs/atstk100x_defconfig | 1 -
configs/i386_defconfig | 1 -
configs/i686_defconfig | 1 -
11 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index b13bccd..529a363 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -276,7 +276,6 @@ BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
BR2_USE_WCHAR=y
# BR2_SOFT_FLOAT is not set
# BR2_PTHREADS_NONE is not set
diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index 8a643c2..e4c0b0e 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -291,7 +291,6 @@ BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
BR2_USE_WCHAR=y
# BR2_SOFT_FLOAT is not set
# BR2_PTHREADS_NONE is not set
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 776fcac..8fb7f0e 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -232,7 +232,6 @@ BR2_UCLIBC_VERSION_0_9_30=y
# BR2_UCLIBC_VERSION_SNAPSHOT is not set
BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
# BR2_PTHREADS_NONE is not set
# BR2_PTHREADS is not set
BR2_PTHREADS_OLD=y
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index a6b38f8..73fc09c 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -235,7 +235,6 @@ BR2_UCLIBC_VERSION_0_9_30=y
# BR2_UCLIBC_VERSION_SNAPSHOT is not set
BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
# BR2_PTHREADS_NONE is not set
# BR2_PTHREADS is not set
BR2_PTHREADS_OLD=y
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index cd6bcd2..cdbeaa3 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -296,7 +296,6 @@ BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
BR2_USE_WCHAR=y
# BR2_SOFT_FLOAT is not set
# BR2_PTHREADS_NONE is not set
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 0b7da36..710639b 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -296,7 +296,6 @@ BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
BR2_USE_WCHAR=y
# BR2_SOFT_FLOAT is not set
# BR2_PTHREADS_NONE is not set
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index 36c6745..367bcdc 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -230,7 +230,6 @@ BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
# BR2_ENABLE_LOCALE_PURGE is not set
BR2_USE_WCHAR=y
BR2_SOFT_FLOAT=y
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index ee147a4..50e013e 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -237,7 +237,6 @@ BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
BR2_USE_WCHAR=y
BR2_SOFT_FLOAT=y
# BR2_PTHREADS_NONE is not set
diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 36fcc75..df30b05 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -231,7 +231,6 @@ BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
# BR2_ENABLE_LOCALE_PURGE is not set
BR2_USE_WCHAR=y
BR2_SOFT_FLOAT=y
diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index 38cfb17..284afc6 100644
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -230,7 +230,6 @@ BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
# BR2_ENABLE_LOCALE_PURGE is not set
BR2_USE_WCHAR=y
# BR2_USE_SSP is not set
diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index 361b181..87c3512 100644
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -230,7 +230,6 @@ BR2_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
# BR2_ENABLE_LOCALE_PURGE is not set
BR2_USE_WCHAR=y
# BR2_USE_SSP is not set
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 22/25] Get rid of unused variables
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (20 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 21/25] Update defconfigs after BR2_ENABLE_LOCALE_PREGENERATED removal Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 23/25] Remove variables useless after BR2_PREFER_IMA removal Thomas Petazzoni
` (3 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Makefile | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 7fdf697..54dd4f1 100644
--- a/Makefile
+++ b/Makefile
@@ -268,13 +268,6 @@ STAMP_DIR:=$(BASE_DIR)/stamps
BINARIES_DIR:=$(BASE_DIR)/images
TARGET_DIR:=$(BASE_DIR)/target
-# define values for prepatched source trees for toolchains
-VENDOR_SITE:=$(call qstrip,$(BR2_VENDOR_SITE))
-VENDOR_BINUTILS_RELEASE:=$(call qstrip,$(BR2_VENDOR_BINUTILS_RELEASE))
-VENDOR_GCC_RELEASE:=$(call qstrip,$(BR2_VENDOR_GCC_RELEASE))
-VENDOR_UCLIBC_RELEASE:=$(call qstrip,$(BR2_VENDOR_UCLIBC_RELEASE))
-VENDOR_PATCH_DIR:=$(call qstrip,$(BR2_VENDOR_PATCH_DIR))
-
BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config
include toolchain/Makefile.in
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 23/25] Remove variables useless after BR2_PREFER_IMA removal
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (21 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 22/25] Get rid of unused variables Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 24/25] Get rid of useless OpenMP related code Thomas Petazzoni
` (2 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
toolchain/Makefile.in | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in
index db1a87a..16451ee 100644
--- a/toolchain/Makefile.in
+++ b/toolchain/Makefile.in
@@ -40,9 +40,5 @@ endif
# FIXME -- this is temporary
OPTIMIZE_FOR_CPU=$(ARCH)
-# late binding check to see if the target cc supports -fwhole-program
-CFLAGS_WHOLE_PROGRAM = $(call cc-option,-fwhole-program,)
-CFLAGS_COMBINE = $(call cc-option,-combine,)
-
# gcc has a bunch of needed stuff....
include toolchain/gcc/Makefile.in
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 24/25] Get rid of useless OpenMP related code
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (22 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 23/25] Remove variables useless after BR2_PREFER_IMA removal Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 4:05 ` [Buildroot] [PATCH 25/25] Get rid of the OPTIMIZE_FOR_CPU variable Thomas Petazzoni
2010-04-11 19:51 ` [Buildroot] [pull request] Pull request for branch various-fixes Peter Korsgaard
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
It seems that there was an intention to add BR2_ENABLE_OPENMP someday,
but it was in June 2007 (commit
c81807a9d71fba9f35eeb7e3f3b56bda4b2e0edd) and since then, nothing
occured. Therefore, get rid of this code, and just pass
--disable-openmp to gettext to keep the current behaviour.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/gettext/gettext.mk | 2 +-
toolchain/Makefile.in | 7 -------
2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 5b04560..8ec8bdf 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -93,7 +93,7 @@ $(GETTEXT_DIR)/.configured: $(GETTEXT_DIR)/.unpacked
--disable-libasprintf \
--enable-shared \
$(IGNORE_EXTERNAL_GETTEXT) \
- $(OPENMP) \
+ --disable-openmp \
)
touch $@
diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in
index 16451ee..91aa17a 100644
--- a/toolchain/Makefile.in
+++ b/toolchain/Makefile.in
@@ -10,13 +10,6 @@ else
MULTILIB:=--disable-multilib
endif
-ifeq ($(BR2_ENABLE_OPENMP),y)
-OPENMP:=--enable-openmp
-else
-OPENMP:=--disable-openmp
-endif
-
-
ifeq ($(BR2_TOOLCHAIN_SYSROOT),y)
BR2_SYSROOT_PREFIX=# nothing, straight into /usr
BR2_SYSROOT_STAGING_DESTDIR=DESTDIR=$(STAGING_DIR)/
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [PATCH 25/25] Get rid of the OPTIMIZE_FOR_CPU variable
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (23 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 24/25] Get rid of useless OpenMP related code Thomas Petazzoni
@ 2010-04-11 4:05 ` Thomas Petazzoni
2010-04-11 19:51 ` [Buildroot] [pull request] Pull request for branch various-fixes Peter Korsgaard
25 siblings, 0 replies; 28+ messages in thread
From: Thomas Petazzoni @ 2010-04-11 4:05 UTC (permalink / raw)
To: buildroot
This variable, together with the FIXME comment, has been added has
part of Eric Andersen's ? Major buildroot facelift, step one ? commit
that occured in October 2004.
Since then, no real usage has been made of OPTIMIZE_FOR_CPU, and the
initial intention has probably been lost in the memories of the
implementors.
Therefore, get rid of the variable, and just use $(ARCH) at the two
locations the variable was used.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/Makefile.in | 4 ++--
toolchain/Makefile.in | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/package/Makefile.in b/package/Makefile.in
index 43ff2dd..983caf3 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -109,8 +109,8 @@ 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)"
-GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
-REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
+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)
diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in
index 91aa17a..57d84a3 100644
--- a/toolchain/Makefile.in
+++ b/toolchain/Makefile.in
@@ -30,8 +30,5 @@ BR2_SYSROOT=# nothing
BR2_ISYSROOT=#nothing
endif
-# FIXME -- this is temporary
-OPTIMIZE_FOR_CPU=$(ARCH)
-
# gcc has a bunch of needed stuff....
include toolchain/gcc/Makefile.in
--
1.6.3.3
^ permalink raw reply related [flat|nested] 28+ messages in thread* [Buildroot] [pull request] Pull request for branch various-fixes
2010-04-11 4:04 [Buildroot] [pull request] Pull request for branch various-fixes Thomas Petazzoni
` (24 preceding siblings ...)
2010-04-11 4:05 ` [Buildroot] [PATCH 25/25] Get rid of the OPTIMIZE_FOR_CPU variable Thomas Petazzoni
@ 2010-04-11 19:51 ` Peter Korsgaard
25 siblings, 0 replies; 28+ messages in thread
From: Peter Korsgaard @ 2010-04-11 19:51 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Thomas> Hello,
Thomas> During the flight to San Francisco today (to go to the Embedded Linux
Thomas> Conference), I had the time to work on a few Buildroot cleanups. Most
Thomas> of them have been discussed during the Buildroot Working Day that took
Thomas> place in February 2010, right after FOSDEM, in Brussels.
Thomas> Enjoy :-)
Thomas> git://git.busybox.net/~tpetazzoni/git/buildroot various-fixes
Thanks, pulled and pushed everything except for the BR2_RECENT stuff
(patch 11-13), that I'm not quite sure about yet.
Enjoy ELC - I think we need to send you on transatlantic flights more
often ;)
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 28+ messages in thread