Skip to contentSkip to conversation

haserl: remove deprecated 0.8.x version

PATCH New Gustavo Zacarias 3 participants 21 messages Jan 15, 2015 – Jan 25, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/7 haserl: remove deprecated 0.8.x version

It'll be a year for the 2015.02 release so remove the old/deprecated 0.8.x version for the release.

Also update hash to match sourceforge (original) one.

And rename patch to new naming convention.

---
 Config.in.legacy                                   |  8 ++++++
 package/haserl/0.8.0/haserl-0.8.0-legacy.patch     | 12 ---------
 ....inc.patch => 0001-add-haserl_lualib.inc.patch} |  0
 package/haserl/Config.in                           | 30 +---------------------
 package/haserl/haserl.hash                         |  6 ++---
 package/haserl/haserl.mk                           |  6 +----
 6 files changed, 13 insertions(+), 49 deletions(-)
 delete mode 100644 package/haserl/0.8.0/haserl-0.8.0-legacy.patch
 rename package/haserl/{0.9.33/haserl-001-add-haserl_lualib.inc.patch => 0001-add-haserl_lualib.inc.patch} (100%)
Config.in.legacy +8 -0
index 69608c7..db8c3b1 100644
@@ -102,6 +102,14 @@ endif
 
 comment "Legacy options removed in 2015.02"
 
+config BR2_PACKAGE_HASERL_VERSION_0_8_X
+	bool "haserl 0.8.x version removed"
+	select BR2_LEGACY
+	help
+	  The 0.8.x version option for haserl has been removed since it
+	  has been deprecated for some time now.
+	  You should be able to use the 0.9.x version without issues.
+
 config BR2_PACKAGE_STRONGSWAN_TOOLS
 	bool "strongswan option has been removed"
 	select BR2_LEGACY
package/haserl/0.8.0/haserl-0.8.0-legacy.patch deleted +0 -12
deleted file mode 100644
index bb6f3b0..0000000
@@ -1,12 +0,0 @@
-diff -urN haserl-0.8.0-0rig/src/haserl.c haserl-0.8.0/src/haserl.c
---- haserl-0.8.0-0rig/src/haserl.c	2004-11-10 18:59:35.000000000 +0100
-+++ haserl-0.8.0/src/haserl.c	2007-10-12 14:36:28.000000000 +0200
-@@ -131,7 +131,7 @@
- 	if (strlen(prefix)) { memcpy (entry, prefix, strlen(prefix)); }
- 	memcpy ((char *) (entry + strlen(prefix)), newbuf, strlen(newbuf));
- 
--	keylen = (size_t) (index (entry, '=') - entry);
-+	keylen = (size_t) (strchr (entry, '=') - entry);
- 	
- 	if ( keylen <= 0 ) {
- 			free (entry);
package/haserl/0001-add-haserl_lualib.inc.patch renamed from package/haserl/0.9.33/haserl-001-add-haserl_lualib.inc.patch +0 -0
similarity index 100%
rename from package/haserl/0.9.33/haserl-001-add-haserl_lualib.inc.patch
rename to package/haserl/0001-add-haserl_lualib.inc.patch
package/haserl/Config.in +1 -29
index 680e280..1620d72 100644
@@ -8,37 +8,9 @@ config BR2_PACKAGE_HASERL
 
 	  http://haserl.sourceforge.net/
 
-if BR2_PACKAGE_HASERL
-
 config BR2_PACKAGE_HASERL_WITH_LUA
 	bool "Lua support"
-	depends on BR2_PACKAGE_HASERL_VERSION_0_9_X
+	depends on BR2_PACKAGE_HASERL
 	select BR2_PACKAGE_LUA
 	help
 	  Enable Lua support for haserl
-
-choice
-	prompt "Haserl version"
-	default BR2_PACKAGE_HASERL_VERSION_0_9_X
-	help
-	  Select the older stable version, or the newer developer version
-
-config BR2_PACKAGE_HASERL_VERSION_0_8_X
-	bool	"v 0.8.x"
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	help
-	  stable version
-
-config BR2_PACKAGE_HASERL_VERSION_0_9_X
-	bool	"v 0.9.x"
-	help
-	  developer version - seems OK though
-
-endchoice
-
-endif
-
-config BR2_PACKAGE_HASERL_VERSION
-	string
-	default "0.8.0"		if BR2_PACKAGE_HASERL_VERSION_0_8_X
-	default "0.9.33"	if BR2_PACKAGE_HASERL_VERSION_0_9_X
package/haserl/haserl.hash +3 -3
index 3573fa9..7b1bfa2 100644
@@ -1,3 +1,3 @@
-# Locally computed:
-sha256  ba261a21539e1f204ba74590d313c501007e546b54aa9ae7210a99eaf3c097be  haserl-0.8.0.tar.gz
-sha256  9a65b14dc721643fc5b85c79117cb6d824bd3683b246744137bb5d978df7621b  haserl-0.9.33.tar.gz
+# From http://sourceforge.net/projects/haserl/files/haserl-devel/
+md5	a9decddb508944d56f71dd2f821e2ec5	haserl-0.9.33.tar.gz
+sha1	bbb5d55db911fdb854828794181e57a1a275e65d	haserl-0.9.33.tar.gz
package/haserl/haserl.mk +1 -5
index f0de790..4985c09 100644
@@ -4,12 +4,8 @@
 #
 ################################################################################
 
-HASERL_VERSION = $(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
-ifeq ($(BR2_PACKAGE_HASERL_VERSION_0_8_X),y)
-HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl/$(HASERL_VERSION)
-else
+HASERL_VERSION = 0.9.33
 HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel
-endif
 HASERL_LICENSE = GPLv2
 HASERL_LICENSE_FILES = COPYING
 HASERL_DEPENDENCIES = host-pkgconf
Signature · 1 line
2.0.5
#1 lore raw

PATCH 2/7 distcc: remove deprecated package

It's been deprecated since feb 2014 and it'll be a year for the 2015.02 release so remove it.
And it's basically useless without a target toolchain.

---
 Config.in.legacy         |  8 ++++++++
 package/Config.in        |  3 ---
 package/distcc/Config.in | 11 -----------
 package/distcc/distcc.mk | 19 -------------------
 4 files changed, 8 insertions(+), 33 deletions(-)
 delete mode 100644 package/distcc/Config.in
 delete mode 100644 package/distcc/distcc.mk
Config.in.legacy +8 -0
index db8c3b1..9bd2fde 100644
@@ -102,6 +102,14 @@ endif
 
 comment "Legacy options removed in 2015.02"
 
+config BR2_PACKAGE_DISTCC
+	bool "distcc target package removed"
+	select BR2_LEGACY
+	help
+	  The distcc target package has been removed, it's been
+	  deprecated for some time now and was essentially useless
+	  without a target toolchain.
+
 config BR2_PACKAGE_HASERL_VERSION_0_8_X
 	bool "haserl 0.8.x version removed"
 	select BR2_LEGACY
package/Config.in +0 -3
index 319ffd6..a8e09f3 100644
@@ -109,9 +109,6 @@ menu "Development tools"
 	source "package/cvs/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/diffutils/Config.in"
-endif
-	source "package/distcc/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/findutils/Config.in"
 endif
 	source "package/flex/Config.in"
package/distcc/Config.in deleted +0 -11
deleted file mode 100644
index 08e1ab3..0000000
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_DISTCC
-	bool "distcc"
-	# needs fork()
-	depends on BR2_USE_MMU
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	help
-	  Distributed compiler client and server.  Allows you to
-	  distribute compilation of C code across several machines
-	  on a network.
-
-	  http://distcc.samba.org/
package/distcc/distcc.mk deleted +0 -19
deleted file mode 100644
index eae5fb8..0000000
@@ -1,19 +0,0 @@
-################################################################################
-#
-# distcc
-#
-################################################################################
-
-DISTCC_VERSION = 2.18.3
-DISTCC_SOURCE = distcc-$(DISTCC_VERSION).tar.bz2
-DISTCC_SITE = http://distcc.googlecode.com/files
-DISTCC_CONF_OPTS = --with-included-popt --without-gtk --without-gnome
-DISTCC_LICENSE = GPLv2+
-DISTCC_LICENSE_FILES = COPYING
-
-define DISTCC_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/distccd $(TARGET_DIR)/usr/bin/distccd
-	$(INSTALL) -D $(@D)/distcc $(TARGET_DIR)/usr/bin/distcc
-endef
-
-$(eval $(autotools-package))
Signature · 1 line
2.0.5
#2 lore raw

PATCH 2/7 distcc: remove deprecated package

Gustavo, All,

Damn, I also replied to the previous submission of this one...

On 2015-01-15 11:30 -0300, Gustavo Zacarias spake thusly:

Quoted 5 lines

It's been deprecated since feb 2014 and it'll be a year for the 2015.02 release so remove it.
And it's basically useless without a target toolchain.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 2/7 distcc: remove deprecated package

In reply to Gustavo Zacarias
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

It's been deprecated since feb 2014 and it'll be a year for the 2015.02 release so remove it.
And it's basically useless without a target toolchain.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 3/7 gob2: remove deprecated target package

In reply to Gustavo Zacarias

It's been deprecated for a year now so remove the target variant.

Also rename patch to new naming convention.

---
 Config.in.legacy                                     |  8 ++++++++
 package/Config.in                                    |  1 -
 ...fix.patch => 0001-dont-include-from-prefix.patch} |  0
 package/gob2/Config.in                               | 20 --------------------
 package/gob2/gob2.mk                                 |  2 --
 5 files changed, 8 insertions(+), 23 deletions(-)
 rename package/gob2/{gob2-01-dont-include-from-prefix.patch => 0001-dont-include-from-prefix.patch} (100%)
 delete mode 100644 package/gob2/Config.in
Config.in.legacy +8 -0
index 9bd2fde..50591af 100644
@@ -102,6 +102,14 @@ endif
 
 comment "Legacy options removed in 2015.02"
 
+config BR2_PACKAGE_GOB2
+	bool "gob2 target package removed"
+	select BR2_LEGACY
+	help
+	  The gob2 target package has been removed, it's been
+	  deprecated for some time now and was essentially useless
+	  without a target toolchain.
+
 config BR2_PACKAGE_DISTCC
 	bool "distcc target package removed"
 	select BR2_LEGACY
package/Config.in +0 -1
index a8e09f3..d5e675c 100644
@@ -246,7 +246,6 @@ comment "X applications"
 	source "package/feh/Config.in"
 	source "package/freerdp/Config.in"
 	source "package/gmpc/Config.in"
-	source "package/gob2/Config.in"
 	source "package/gqview/Config.in"
 	source "package/gtkperf/Config.in"
 	source "package/leafpad/Config.in"
package/gob2/0001-dont-include-from-prefix.patch renamed from package/gob2/gob2-01-dont-include-from-prefix.patch +0 -0
similarity index 100%
rename from package/gob2/gob2-01-dont-include-from-prefix.patch
rename to package/gob2/0001-dont-include-from-prefix.patch
package/gob2/Config.in deleted +0 -20
deleted file mode 100644
index bd9ba1f..0000000
@@ -1,20 +0,0 @@
-config BR2_PACKAGE_GOB2
-	bool "gob2"
-	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
-	depends on BR2_USE_MMU # bison, glib2
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_FLEX
-	select BR2_PACKAGE_BISON
-	# development tool, useless on the target
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	help
-	  GOB (GTK+ Object Builder) is a preprocessor which simplifies
-	  the writing of GObjects in C.
-
-	  http://www.jirka.org/gob.html
-
-comment "gob2 needs a toolchain w/ wchar"
-	depends on BR2_USE_MMU
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
package/gob2/gob2.mk +0 -2
index e4f1396..04d02e1 100644
@@ -7,10 +7,8 @@
 GOB2_VERSION = 2.0.20
 GOB2_SOURCE = gob2-$(GOB2_VERSION).tar.xz
 GOB2_SITE = http://ftp.5z.com/pub/gob
-GOB2_DEPENDENCIES = libglib2 flex bison host-pkgconf host-flex
 HOST_GOB2_DEPENDENCIES = host-bison host-flex host-libglib2
 
-$(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # gob2 for the host
Signature · 1 line
2.0.5
#5 lore raw

PATCH 3/7 gob2: remove deprecated target package

Gustavo, All,

On 2015-01-15 11:30 -0300, Gustavo Zacarias spake thusly:

Quoted 5 lines

It's been deprecated for a year now so remove the target variant.

Also rename patch to new naming convention.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#7 lore raw

PATCH 4/7 bison: remove deprecated target package

In reply to Gustavo Zacarias

It's been deprecated for a year now so remove the target variant.

---
 Config.in.legacy        |  8 ++++++++
 package/Config.in       |  1 -
 package/bison/Config.in | 19 -------------------
 package/bison/bison.mk  |  9 ---------
 4 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 package/bison/Config.in
Config.in.legacy +8 -0
index 50591af..243416e 100644
@@ -102,6 +102,14 @@ endif
 
 comment "Legacy options removed in 2015.02"
 
+config BR2_PACKAGE_BISON
+	bool "bison target package removed"
+	select BR2_LEGACY
+	help
+	  The bison target package has been removed, it's been
+	  deprecated for some time now and is essentially a development
+	  tool which isn't very useful in the target.
+
 config BR2_PACKAGE_GOB2
 	bool "gob2 target package removed"
 	select BR2_LEGACY
package/Config.in +0 -1
index d5e675c..9ab6a99 100644
@@ -102,7 +102,6 @@ endmenu
 
 menu "Development tools"
 	source "package/binutils/Config.in"
-	source "package/bison/Config.in"
 	source "package/bsdiff/Config.in"
 	source "package/bustle/Config.in"
 	source "package/cppunit/Config.in"
package/bison/Config.in deleted +0 -19
deleted file mode 100644
index 8d88430..0000000
@@ -1,19 +0,0 @@
-config BR2_PACKAGE_BISON
-	bool "bison"
-	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_M4
-	# m4 uses fork()
-	depends on BR2_USE_MMU
-	# development tool, useless on the target
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	help
-	  General-purpose parser generator that converts a
-	  grammar description for an LALR context-free grammar into a C
-	  program to parse that grammar.
-
-	  http://www.gnu.org/software/bison/
-
-comment "bison needs a toolchain w/ wchar"
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR
package/bison/bison.mk +0 -9
index fdf87f6..c092b78 100644
@@ -9,15 +9,6 @@ BISON_SOURCE = bison-$(BISON_VERSION).tar.xz
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
 BISON_LICENSE = GPLv3+
 BISON_LICENSE_FILES = COPYING
-BISON_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
-BISON_DEPENDENCIES = m4
 BISON_AUTORECONF = YES
 
-define BISON_DISABLE_EXAMPLES
-	echo 'all install:' > $(@D)/examples/Makefile
-endef
-
-BISON_POST_CONFIGURE_HOOKS += BISON_DISABLE_EXAMPLES
-
-$(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
2.0.5
#8 lore raw

PATCH 4/7 bison: remove deprecated target package

Gustavo, All,

On 2015-01-15 11:30 -0300, Gustavo Zacarias spake thusly:

Quoted 3 lines

It's been deprecated for a year now so remove the target variant.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#10 lore raw

PATCH 5/7 bison: bump to version 3.0.3

In reply to Gustavo Zacarias

Also add hash file and remove patch since it's no longer necessary.

---
 package/bison/bison-01-no-docs-regen.patch | 53 ------------------------------
 package/bison/bison.hash                   |  2 ++
 package/bison/bison.mk                     |  3 +-
 3 files changed, 3 insertions(+), 55 deletions(-)
 delete mode 100644 package/bison/bison-01-no-docs-regen.patch
 create mode 100644 package/bison/bison.hash
package/bison/bison-01-no-docs-regen.patch deleted +0 -53
deleted file mode 100644
index 7c375d6..0000000
@@ -1,53 +0,0 @@
-bison regenerates the docs to see if they changed which requires running
-the recently built bison. This obviously doesn't work for cross compiles
-hence breaks for many target bison builds.
-Just disable it.
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura bison-3.0.orig/doc/local.mk bison-3.0/doc/local.mk
---- bison-3.0.orig/doc/local.mk	2013-10-02 16:52:48.711890121 -0300
-+++ bison-3.0/doc/local.mk	2013-10-02 17:14:59.329341143 -0300
-@@ -37,15 +37,6 @@
- CROSS_OPTIONS_PL = $(top_srcdir)/build-aux/cross-options.pl
- CROSS_OPTIONS_TEXI = $(top_srcdir)/doc/cross-options.texi
- $(CROSS_OPTIONS_TEXI): doc/bison.help $(CROSS_OPTIONS_PL)
--# Create $@~ which is the previous contents.  Don't use 'mv' here so
--# that even if we are interrupted, the file is still available for
--# diff in the next run.  Note that $@ might not exist yet.
--	$(AM_V_GEN){ test ! -f $@ || cat $@; } >$@~
--	$(AM_V_at)test ! -f [email protected] || rm -f [email protected]
--	$(AM_V_at)src/bison$(EXEEXT) --help |				 \
--	  $(PERL) $(CROSS_OPTIONS_PL) $(top_srcdir)/src/scan-gram.l >[email protected]
--	$(AM_V_at)diff -u $@~ [email protected] || true
--	$(AM_V_at)mv [email protected] $@
- MAINTAINERCLEANFILES = $(CROSS_OPTIONS_TEXI)
- 
- ## ---------- ##
-@@ -86,9 +77,6 @@
- EXTRA_DIST += $(top_srcdir)/doc/bison.help
- MAINTAINERCLEANFILES += $(top_srcdir)/doc/bison.help
- $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
--	$(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
--	$(AM_V_at) src/bison$(EXEEXT) --help   >>doc/bison.help.tmp
--	$(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
- 
- 
- ## ----------- ##
-@@ -106,16 +94,6 @@
- 
- # Depend on configure to get version number changes.
- $(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure
--	$(AM_V_GEN)$(HELP2MAN)			\
--	    --include=$(top_srcdir)/doc/bison.x	\
--	    [email protected] src/bison$(EXEEXT)
--	$(AM_V_at)if $(remove_time_stamp) $@ >[email protected] 2>/dev/null &&	 \
--	   $(remove_time_stamp) [email protected] | cmp [email protected] - >/dev/null 2>&1; then \
--	  touch $@;							 \
--	else								 \
--	  mv [email protected] $@;							 \
--	fi
--	$(AM_V_at)rm -f $@*.t
- 
- nodist_man_MANS = doc/yacc.1
- 
package/bison/bison.hash new file +2 -0
new file mode 100644
index 0000000..dd10086
@@ -0,0 +1,2 @@
+# Locally calculated after checking pgp signature
+sha256	5940efbdd6b5d80e55ec16a01d2322e2892da21863391049b9b692570649177c	bison-3.0.3.tar.xz
package/bison/bison.mk +1 -2
index c092b78..45f785e 100644
@@ -4,11 +4,10 @@
 #
 ################################################################################
 
-BISON_VERSION = 3.0.2
+BISON_VERSION = 3.0.3
 BISON_SOURCE = bison-$(BISON_VERSION).tar.xz
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
 BISON_LICENSE = GPLv3+
 BISON_LICENSE_FILES = COPYING
-BISON_AUTORECONF = YES
 
 $(eval $(host-autotools-package))
Signature · 1 line
2.0.5
#11 lore raw

PATCH 5/7 bison: bump to version 3.0.3

gustavo, All,

On 2015-01-15 11:30 -0300, Gustavo Zacarias spake thusly:

Quoted 3 lines

Also add hash file and remove patch since it's no longer necessary.

Manually downloaded, and hash manualy checked to be OK.

package/bison/bison.hash line 2

Quoted 8 lines
package/bison/bison.hash new file +2 -0
new file mode 100644
index 0000000..dd10086
@@ -0,0 +1,2 @@
+# Locally calculated after checking pgp signature
+sha256	5940efbdd6b5d80e55ec16a01d2322e2892da21863391049b9b692570649177c	bison-3.0.3.tar.xz

Regards,
Yann E. MORIN.

Signature · 13 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20150118/68fe6116/attachment.asc>
#13 lore raw

PATCH 6/7 flex: remove deprecated binary in target

In reply to Gustavo Zacarias

It's been deprecated for a year now so remove the option.

Also rename patch to new naming convention.

---
 Config.in.legacy                                    |  8 ++++++++
 .../flex/{flex-prog-ar.patch => 0001-prog-ar.patch} |  0
 package/flex/Config.in                              | 21 ---------------------
 package/flex/flex.mk                                | 11 -----------
 4 files changed, 8 insertions(+), 32 deletions(-)
 rename package/flex/{flex-prog-ar.patch => 0001-prog-ar.patch} (100%)
Config.in.legacy +8 -0
index 243416e..d6f32a0 100644
@@ -102,6 +102,14 @@ endif
 
 comment "Legacy options removed in 2015.02"
 
+config BR2_PACKAGE_FLEX_BINARY
+	bool "flex binary in target option removed"
+	select BR2_LEGACY
+	help
+	  The flex binary in the target option has been removed.
+	  It's been deprecated for some time now and is essentially a
+	  development tool which isn't very useful in the target.
+
 config BR2_PACKAGE_BISON
 	bool "bison target package removed"
 	select BR2_LEGACY
package/flex/0001-prog-ar.patch renamed from package/flex/flex-prog-ar.patch +0 -0
similarity index 100%
rename from package/flex/flex-prog-ar.patch
rename to package/flex/0001-prog-ar.patch
package/flex/Config.in +0 -21
index 9ac600d..7199c6a 100644
@@ -6,24 +6,3 @@ config BR2_PACKAGE_FLEX
 	  programs that perform pattern-matching on text.
 
 	  http://flex.sourceforge.net/
-
-if BR2_PACKAGE_FLEX
-
-config BR2_PACKAGE_FLEX_BINARY
-	bool "Install flex binary on target"
-	# needs fork()
-	depends on BR2_USE_MMU
-	# runtime dependency
-	select BR2_PACKAGE_M4
-	# development tool, useless on the target
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	depends on BR2_USE_WCHAR # m4
-	help
-	  Install the flex binary tool in the target filesystem.
-
-comment "flex binary needs a toolchain w/ wchar"
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR
-
-endif
package/flex/flex.mk +0 -11
index cd92dd7..9a3f840 100644
@@ -15,15 +15,6 @@ FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
 # we don't have a host-gettext/libintl
 HOST_FLEX_DEPENDENCIES = host-m4
 
-ifeq ($(BR2_PACKAGE_FLEX_BINARY),y)
-# lex -> flex
-define FLEX_INSTALL_LEX
-	cd $(TARGET_DIR)/usr/bin && ln -snf flex lex
-endef
-FLEX_POST_INSTALL_HOOKS += FLEX_INSTALL_LEX
-
-else
-
 define FLEX_DISABLE_PROGRAM
 	$(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
 endef
@@ -35,7 +26,5 @@ define FLEX_REMOVE_BROKEN_SYMLINK
 endef
 FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK
 
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
2.0.5
#14 lore raw

PATCH 6/7 flex: remove deprecated binary in target

Gustavo, All,

On 2015-01-15 11:30 -0300, Gustavo Zacarias spake thusly:

Quoted 5 lines

It's been deprecated for a year now so remove the option.

Also rename patch to new naming convention.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#16 lore raw

PATCH 7/7 m4: remove deprecated target package

In reply to Gustavo Zacarias

It's been deprecated for a year now so remove the target variant.

---
 Config.in.legacy     |  7 +++++++
 package/Config.in    |  1 -
 package/m4/Config.in | 16 ----------------
 package/m4/m4.mk     |  7 -------
 4 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 package/m4/Config.in
Config.in.legacy +7 -0
index d6f32a0..a8c5dab 100644
@@ -102,6 +102,13 @@ endif
 
 comment "Legacy options removed in 2015.02"
 
+config BR2_PACKAGE_M4
+	bool "m4 target package removed"
+	select BR2_LEGACY
+	help
+	  The m4 target package has been removed, it's been
+	  deprecated for some time now.
+
 config BR2_PACKAGE_FLEX_BINARY
 	bool "flex binary in target option removed"
 	select BR2_LEGACY
package/Config.in +0 -1
index 9ab6a99..eeb363a 100644
@@ -123,7 +123,6 @@ endif
 	source "package/intltool/Config.in"
 	source "package/jq/Config.in"
 	source "package/libtool/Config.in"
-	source "package/m4/Config.in"
 	source "package/make/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/patch/Config.in"
package/m4/Config.in deleted +0 -16
deleted file mode 100644
index e2ce5b3..0000000
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_M4
-	bool "m4"
-	depends on BR2_USE_WCHAR
-	# uses fork()
-	depends on BR2_USE_MMU
-	# development tool, useless on the target
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	help
-	  An implementation of the traditional Unix macro processor.
-
-	  http://www.gnu.org/software/m4/m4.html
-
-comment "m4 needs a toolchain w/ wchar"
-	depends on BR2_DEPRECATED_SINCE_2014_02
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR
package/m4/m4.mk +0 -7
index 32dfef4..9b5d2d1 100644
@@ -9,13 +9,6 @@ M4_SOURCE = m4-$(M4_VERSION).tar.xz
 M4_SITE = $(BR2_GNU_MIRROR)/m4
 M4_LICENSE = GPLv3+
 M4_LICENSE_FILES = COPYING
-M4_CONF_ENV = gl_cv_func_gettimeofday_clobber=no
-
-ifneq ($(BR2_USE_WCHAR),y)
-M4_CONF_ENV += gt_cv_c_wchar_t=no gl_cv_absolute_wchar_h=__fpending.h
-endif
-
 HOST_M4_CONF_OPTS = --disable-static
 
-$(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
2.0.5
#17 lore raw

PATCH 7/7 m4: remove deprecated target package

Gustavo, All,

On 2015-01-15 11:30 -0300, Gustavo Zacarias spake thusly:

Quoted 3 lines

It's been deprecated for a year now so remove the target variant.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#19 lore raw

PATCH 1/7 haserl: remove deprecated 0.8.x version

In reply to Gustavo Zacarias

Gustavo, All,

Damn, I replied to the previous submission... :-/
Here it is again so the ack does not get lost...

On 2015-01-15 11:30 -0300, Gustavo Zacarias spake thusly:

Quoted 8 lines

It'll be a year for the 2015.02 release so remove the old/deprecated 0.8.x version for the release.

Also update hash to match sourceforge (original) one.

And rename patch to new naming convention.

Quoted 5 lines
package/haserl/Config.in +0 -0
index 680e280..1620d72 100644

package/haserl/Config.in config BR2_PACKAGE_HASERL · line 14

Quoted 10 lines
package/haserl/Config.in +1 -3
@@ -8,37 +8,9 @@ config BR2_PACKAGE_HASERL
 
 	  http://haserl.sourceforge.net/
 
-if BR2_PACKAGE_HASERL
-
 config BR2_PACKAGE_HASERL_WITH_LUA
 	bool "Lua support"
-	depends on BR2_PACKAGE_HASERL_VERSION_0_9_X
+	depends on BR2_PACKAGE_HASERL
 	select BR2_PACKAGE_LUA

The Lua package is a provider for the virtual package LUAINTERPRETER. We must not select a provider, we can only depend on it.

Care to fix that while you're at it, please?

Thanks! :-)

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#20 lore raw

PATCH 1/7 haserl: remove deprecated 0.8.x version

In reply to Gustavo Zacarias
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

It'll be a year for the 2015.02 release so remove the old/deprecated 0.8.x version for the release.

Also update hash to match sourceforge (original) one.

And rename patch to new naming convention.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard