From: Peter Korsgaard Date: Wed, 16 Dec 2009 19:02:19 +0000 (+0100) Subject: defconfigs: use new default location for STAGING_DIR X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=13975944738104ce7394f9f2bf22fca19887285f;p=buildroot.git defconfigs: use new default location for STAGING_DIR Reported by Grant Edwards Use the new default STAGING_DIR location (output/staging) in all the defconfigs for clarity. Signed-off-by: Peter Korsgaard --- diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig index e7f9358b1f..f044e51e95 100644 --- a/configs/arm_toolchain_defconfig +++ b/configs/arm_toolchain_defconfig @@ -156,7 +156,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="/usr/local/$(ARCH)/gcc-$(BR2_GCC_VERSION)-uclibc" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig index 76408c0036..3d98b0f6b9 100644 --- a/configs/at91rm9200df_defconfig +++ b/configs/at91rm9200df_defconfig @@ -161,7 +161,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91rm9200df_ext_bare_defconfig b/configs/at91rm9200df_ext_bare_defconfig index 80257828c0..84f6b7ec72 100644 --- a/configs/at91rm9200df_ext_bare_defconfig +++ b/configs/at91rm9200df_ext_bare_defconfig @@ -156,7 +156,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig index 2965ffee67..1dea062c9c 100644 --- a/configs/at91rm9200df_ext_defconfig +++ b/configs/at91rm9200df_ext_defconfig @@ -167,7 +167,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig index 4e50465a7a..1b4094e42d 100644 --- a/configs/at91sam9260dfc_defconfig +++ b/configs/at91sam9260dfc_defconfig @@ -174,7 +174,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9260dfc_ext_bare_defconfig b/configs/at91sam9260dfc_ext_bare_defconfig index b4d349acdb..d99cfa28c9 100644 --- a/configs/at91sam9260dfc_ext_bare_defconfig +++ b/configs/at91sam9260dfc_ext_bare_defconfig @@ -156,7 +156,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig index 70a00dc1ce..14bdc7aeca 100644 --- a/configs/at91sam9260dfc_ext_defconfig +++ b/configs/at91sam9260dfc_ext_defconfig @@ -175,7 +175,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig index 2cdabd08ac..c668e03353 100644 --- a/configs/at91sam9260pf_defconfig +++ b/configs/at91sam9260pf_defconfig @@ -70,7 +70,7 @@ BR2_SOURCEFORGE_MIRROR="easynews" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="wchar" BR2_GNU_BUILD_SUFFIX="pc-linux-gnu" diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig index 69b19e46e6..9598085b99 100644 --- a/configs/at91sam9261ek_defconfig +++ b/configs/at91sam9261ek_defconfig @@ -177,7 +177,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9261ek_ext_bare_defconfig b/configs/at91sam9261ek_ext_bare_defconfig index 662667b261..4c534a7f48 100644 --- a/configs/at91sam9261ek_ext_bare_defconfig +++ b/configs/at91sam9261ek_ext_bare_defconfig @@ -159,7 +159,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig index 06cb986eeb..e7da95ad81 100644 --- a/configs/at91sam9261ek_ext_defconfig +++ b/configs/at91sam9261ek_ext_defconfig @@ -178,7 +178,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig index e8f84f8a6e..145700da69 100644 --- a/configs/at91sam9263ek_defconfig +++ b/configs/at91sam9263ek_defconfig @@ -175,7 +175,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9263ek_ext_bare_defconfig b/configs/at91sam9263ek_ext_bare_defconfig index 60ebfebb5f..185372c58f 100644 --- a/configs/at91sam9263ek_ext_bare_defconfig +++ b/configs/at91sam9263ek_ext_bare_defconfig @@ -158,7 +158,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig index 1668d23915..15b4d3b172 100644 --- a/configs/at91sam9263ek_ext_defconfig +++ b/configs/at91sam9263ek_ext_defconfig @@ -177,7 +177,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig index 451b29a9de..a6ef10c959 100644 --- a/configs/at91sam9g20dfc_defconfig +++ b/configs/at91sam9g20dfc_defconfig @@ -175,7 +175,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9g20dfc_ext_bare_defconfig b/configs/at91sam9g20dfc_ext_bare_defconfig index c503a296ee..3feef30319 100644 --- a/configs/at91sam9g20dfc_ext_bare_defconfig +++ b/configs/at91sam9g20dfc_ext_bare_defconfig @@ -156,7 +156,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig index f8dbe9ddfe..96d9793481 100644 --- a/configs/at91sam9g20dfc_ext_defconfig +++ b/configs/at91sam9g20dfc_ext_defconfig @@ -175,7 +175,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig index d89daa15f4..6fbc0deb9f 100644 --- a/configs/atngw100-base_defconfig +++ b/configs/atngw100-base_defconfig @@ -109,7 +109,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig index 6e244eb198..7a6cba41b4 100644 --- a/configs/atngw100_defconfig +++ b/configs/atngw100_defconfig @@ -109,7 +109,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig index ffca23552c..309ac08288 100644 --- a/configs/atstk1005_defconfig +++ b/configs/atstk1005_defconfig @@ -107,7 +107,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig index 0b75e47eda..b4abff9fe2 100644 --- a/configs/atstk100x_defconfig +++ b/configs/atstk100x_defconfig @@ -108,7 +108,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/i386_defconfig b/configs/i386_defconfig index b94f4f3e7d..97067c486d 100644 --- a/configs/i386_defconfig +++ b/configs/i386_defconfig @@ -109,7 +109,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/i686_defconfig b/configs/i686_defconfig index 51720b14de..a3a26839ab 100644 --- a/configs/i686_defconfig +++ b/configs/i686_defconfig @@ -109,7 +109,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig index a59562186d..2d2579b964 100644 --- a/configs/integrator926_defconfig +++ b/configs/integrator926_defconfig @@ -105,7 +105,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig index d4cf501610..380e2e10d8 100644 --- a/configs/integrator926_huge_defconfig +++ b/configs/integrator926_huge_defconfig @@ -105,7 +105,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig index 3b6b615555..608eb86959 100644 --- a/configs/kb9202_defconfig +++ b/configs/kb9202_defconfig @@ -113,7 +113,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX="" diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig index 6b56972ec1..336953ebf1 100644 --- a/configs/v100sc2_defconfig +++ b/configs/v100sc2_defconfig @@ -84,7 +84,7 @@ BR2_DEBIAN_MIRROR="http://ftp.debian.org" # BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # BR2_FPU_SUFFIX is not set BR2_TOPDIR_PREFIX="" BR2_TOPDIR_SUFFIX=""