Revert "update: Add support for upcoming Buildroot 2016-11"

brianredbeard · brianredbeard · commit 419e97b84cdf · 2016-11-21T20:30:30.000-08:00
This reverts commit 7773dd2. Buildroot 2016-11 has not be released yet. Fixing this up.
diff --git a/Config.in b/Config.in
@@ -1 +1 @@
-source "$BR2_EXTERNAL_COREOS_BUILDROOT/package/Config.in"
+source "$BR2_EXTERNAL/package/Config.in"
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ Step 3 - Reference the `coreos_buildroot` directory from `buildroot`:
 
 ```
 $ cd buildroot
-$ make BR2_EXTERNAL_COREOS_BUILDROOT=../coreos_buildroot menuconfig
+$ make BR2_EXTERNAL=../coreos_buildroot menuconfig
 ```
 This connects the two repos together and exposes all of the coreos_buildroot
 options through the menu option `"User-provided options  --->"`
diff --git a/external.desc b/external.desc
diff --git a/external.mk b/external.mk
@@ -1 +1 @@
-include $(sort $(wildcard $(BR2_EXTERNAL_COREOS_BUILDROOT)/package/*/*.mk))
+include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))
diff --git a/package/Config.in b/package/Config.in
@@ -1,7 +1,3 @@
 menu "Networking applications"  
-	source "$BR2_EXTERNAL_COREOS_BUILDROOT/package/openresty/Config.in"
-endmenu
-
-menu "Other"
-	source "$BR2_EXTERNAL_COREOS_BUILDROOT/package/python-pip/Config.in"
+	source "$BR2_EXTERNAL/package/openresty/Config.in"
 endmenu

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-source "$BR2_EXTERNAL_COREOS_BUILDROOT/package/Config.in"`
	`1`	`+source "$BR2_EXTERNAL/package/Config.in"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include $(sort $(wildcard $(BR2_EXTERNAL_COREOS_BUILDROOT)/package//.mk))`
	`1`	`+include $(sort $(wildcard $(BR2_EXTERNAL)/package//.mk))`