Skip to contentSkip to conversation

Pull request for branch arnout-legacy

GIT PULL New Arnout Vandecappelle (Essensium/Mind) 2 participants 4 messages Feb 5, 2013

lore
Share & tools
lore
#0 lore raw

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

Hello,

Two patches to clean up the legacy config menu, as discussed in the BR developer day.

The following changes since commit ddd69b5609cc9bd954afcfc2f91831d64b9cfff7:

libffi: switch to using a Git version, brings Microblaze and Xtensa support (2013-02-05 15:57:02 +0100)

are available in the git repository at:

https://git.gitorious.org/buildroot/buildroot.git arnout-legacy

for you to fetch changes up to a5670953b17e7bbae7daf2ae2a98fdc43d53d8ad:

Legacy: order the options reverse-chronologically. (2013-02-05 16:03:35 +0100)

----------------------------------------------------------------
Arnout Vandecappelle (Essensium/Mind) (2):
Legacy: make the menu a normal menu.
Legacy: order the options reverse-chronologically.

 Config.in.legacy |   78 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 40 insertions(+), 38 deletions(-)
--
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#1 lore raw

PATCH 1/2 Legacy: make the menu a normal menu.

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

The help text is moved to comments.

---
 Config.in.legacy |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)
Config.in.legacy +11 -14
index 906c038..70958c3 100644
@@ -29,20 +29,17 @@ config BR2_LEGACY
 comment "Legacy detected: check the content of the menu below"
 	depends on BR2_LEGACY
 
-# This option should get a new name with every buildroot release, so it defaults
-# to y again for people who upgrade.
-menuconfig BR2_LEGACY_CHECK_2012_11
-	bool "Check for legacy config options"
-	default y
-	help
-	  Select this option to see the config options that are present in your
-	  current .config but are no longer supported by buildroot. If any of
-	  the options in this menu is selected, they should be replaced with
-	  something else. As long as they stay selected, the build will fail.
-	  Just de-select this option to automatically remove all the legacy
-	  configuration.
+menu "Legacy config options"
+
+if BR2_LEGACY
+comment "Your old configuration uses legacy options that no  "
+comment "longer exist in buildroot.                          "
+comment "Please look at the options which have been selected "
+comment "and read their help text.                           "
+comment "As long as these options stay selected, the build   "
+comment "will fail.                                          "
+endif
 
-if BR2_LEGACY_CHECK_2012_11
 
 #
 # Legacy options from 2012.08
@@ -94,4 +91,4 @@ config BR2_PACKAGE_XSERVER_tinyx
 	  The option has been renamed
 	  BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE.
 
-endif
+endmenu
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/2 Legacy: order the options reverse-chronologically.

In reply to Arnout Vandecappelle (Essensium/Mind)

From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]>

This makes sure that the most interesting ones are at the top.

---
 Config.in.legacy |   55 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 25 deletions(-)
Config.in.legacy +30 -25
index 70958c3..90a7b67 100644
@@ -42,7 +42,36 @@ endif
 
 
 #
-# Legacy options from 2012.08
+# Legacy options since 2012.11
+#
+
+config BR2_PACKAGE_XSERVER_xorg
+	bool "X.org modular server"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR.
+
+config BR2_PACKAGE_XSERVER_tinyx
+	bool "KDrive / TinyX server"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
+	help
+	  The option has been renamed
+	  BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE.
+
+config BR2_PACKAGE_PTHREAD_STUBS
+	bool "pthread-stubs option has been renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
+	help
+	  For consistency reason, the pthread-stubs package has been
+	  renamed to xlib_libpthread-stubs.
+
+
+#
+# Legacy options since 2012.08
 #
 
 config BR2_PACKAGE_GETTEXT_STATIC
@@ -67,28 +96,4 @@ config BR2_PACKAGE_INPUT_TOOLS_EVTEST
 	help
 	  The evtest program from input-tools is now a separate package.
 
-config BR2_PACKAGE_PTHREAD_STUBS
-	bool "pthread-stubs option has been renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XLIB_LIBPTHREAD_STUBS
-	help
-	  For consistency reason, the pthread-stubs package has been
-	  renamed to xlib_libpthread-stubs.
-
-config BR2_PACKAGE_XSERVER_xorg
-	bool "X.org modular server"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
-	help
-	  The option has been renamed
-	  BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR.
-
-config BR2_PACKAGE_XSERVER_tinyx
-	bool "KDrive / TinyX server"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
-	help
-	  The option has been renamed
-	  BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE.
-
 endmenu
Signature · 1 line
1.7.10.4
#3 lore raw
In reply to Arnout Vandecappelle (Essensium/Mind)
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle (Essensium/Mind) <[email protected]> writes:

Arnout> From: "Arnout Vandecappelle (Essensium/Mind)" <[email protected]> Arnout> Hello,

Arnout> Two patches to clean up the legacy config menu, as discussed in Arnout> the BR developer day.

Arnout> The following changes since commit Arnout> ddd69b5609cc9bd954afcfc2f91831d64b9cfff7:

Arnout> libffi: switch to using a Git version, brings Microblaze and
Arnout> Xtensa support (2013-02-05 15:57:02 +0100)

Arnout> are available in the git repository at:

Arnout> https://git.gitorious.org/buildroot/buildroot.git arnout-legacy

Arnout> for you to fetch changes up to Arnout> a5670953b17e7bbae7daf2ae2a98fdc43d53d8ad:

Arnout> Legacy: order the options reverse-chronologically. (2013-02-05 16:03:35 +0100)

Arnout> ---------------------------------------------------------------- Arnout> Arnout Vandecappelle (Essensium/Mind) (2):
Arnout> Legacy: make the menu a normal menu.
Arnout> Legacy: order the options reverse-chronologically.

Committed both, thanks.

Signature · 1 line
Bye, Peter Korsgaard