* [Buildroot] [PATCH 1/2] distcc: remove deprecated package
@ 2015-01-15 13:40 Gustavo Zacarias
2015-01-15 13:40 ` [Buildroot] [PATCH 2/2] haserl: remove deprecated 0.8.x version Gustavo Zacarias
2015-01-18 16:17 ` [Buildroot] [PATCH 1/2] distcc: remove deprecated package Yann E. MORIN
0 siblings, 2 replies; 4+ messages in thread
From: Gustavo Zacarias @ 2015-01-15 13:40 UTC (permalink / raw)
To: buildroot
It's been deprecated since feb 2014 and it'll be a year for the 2015.02
release so remove it.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/Config.in | 3 ---
package/distcc/Config.in | 11 -----------
package/distcc/distcc.mk | 19 -------------------
3 files changed, 33 deletions(-)
delete mode 100644 package/distcc/Config.in
delete mode 100644 package/distcc/distcc.mk
diff --git a/package/Config.in b/package/Config.in
index b1375ae..eeb363a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -108,9 +108,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"
diff --git a/package/distcc/Config.in b/package/distcc/Config.in
deleted file mode 100644
index 08e1ab3..0000000
--- a/package/distcc/Config.in
+++ /dev/null
@@ -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/
diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk
deleted file mode 100644
index eae5fb8..0000000
--- a/package/distcc/distcc.mk
+++ /dev/null
@@ -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))
--
2.0.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] haserl: remove deprecated 0.8.x version
2015-01-15 13:40 [Buildroot] [PATCH 1/2] distcc: remove deprecated package Gustavo Zacarias
@ 2015-01-15 13:40 ` Gustavo Zacarias
2015-01-18 16:24 ` Yann E. MORIN
2015-01-18 16:17 ` [Buildroot] [PATCH 1/2] distcc: remove deprecated package Yann E. MORIN
1 sibling, 1 reply; 4+ messages in thread
From: Gustavo Zacarias @ 2015-01-15 13:40 UTC (permalink / raw)
To: buildroot
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.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
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 +----
5 files changed, 5 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%)
diff --git a/package/haserl/0.8.0/haserl-0.8.0-legacy.patch b/package/haserl/0.8.0/haserl-0.8.0-legacy.patch
deleted file mode 100644
index bb6f3b0..0000000
--- a/package/haserl/0.8.0/haserl-0.8.0-legacy.patch
+++ /dev/null
@@ -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);
diff --git a/package/haserl/0.9.33/haserl-001-add-haserl_lualib.inc.patch b/package/haserl/0001-add-haserl_lualib.inc.patch
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
diff --git a/package/haserl/Config.in b/package/haserl/Config.in
index 680e280..1620d72 100644
--- a/package/haserl/Config.in
+++ b/package/haserl/Config.in
@@ -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
diff --git a/package/haserl/haserl.hash b/package/haserl/haserl.hash
index 3573fa9..7b1bfa2 100644
--- a/package/haserl/haserl.hash
+++ b/package/haserl/haserl.hash
@@ -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
diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index f0de790..4985c09 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -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
--
2.0.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Buildroot] [PATCH 2/2] haserl: remove deprecated 0.8.x version
2015-01-15 13:40 ` [Buildroot] [PATCH 2/2] haserl: remove deprecated 0.8.x version Gustavo Zacarias
@ 2015-01-18 16:24 ` Yann E. MORIN
0 siblings, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2015-01-18 16:24 UTC (permalink / raw)
To: buildroot
Gustavo, All,
On 2015-01-15 10:40 -0300, Gustavo Zacarias spake thusly:
> 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.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> diff --git a/package/haserl/0.9.33/haserl-001-add-haserl_lualib.inc.patch b/package/haserl/0001-add-haserl_lualib.inc.patch
> 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
> diff --git a/package/haserl/Config.in b/package/haserl/Config.in
> index 680e280..1620d72 100644
> --- a/package/haserl/Config.in
> +++ b/package/haserl/Config.in
> @@ -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.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] distcc: remove deprecated package
2015-01-15 13:40 [Buildroot] [PATCH 1/2] distcc: remove deprecated package Gustavo Zacarias
2015-01-15 13:40 ` [Buildroot] [PATCH 2/2] haserl: remove deprecated 0.8.x version Gustavo Zacarias
@ 2015-01-18 16:17 ` Yann E. MORIN
1 sibling, 0 replies; 4+ messages in thread
From: Yann E. MORIN @ 2015-01-18 16:17 UTC (permalink / raw)
To: buildroot
gustavo, All,
On 2015-01-15 10:40 -0300, Gustavo Zacarias spake thusly:
> It's been deprecated since feb 2014 and it'll be a year for the 2015.02
> release so remove it.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/Config.in | 3 ---
> package/distcc/Config.in | 11 -----------
> package/distcc/distcc.mk | 19 -------------------
> 3 files changed, 33 deletions(-)
> delete mode 100644 package/distcc/Config.in
> delete mode 100644 package/distcc/distcc.mk
>
> diff --git a/package/Config.in b/package/Config.in
> index b1375ae..eeb363a 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -108,9 +108,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"
> diff --git a/package/distcc/Config.in b/package/distcc/Config.in
> deleted file mode 100644
> index 08e1ab3..0000000
> --- a/package/distcc/Config.in
> +++ /dev/null
> @@ -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/
> diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk
> deleted file mode 100644
> index eae5fb8..0000000
> --- a/package/distcc/distcc.mk
> +++ /dev/null
> @@ -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))
> --
> 2.0.5
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-18 16:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-15 13:40 [Buildroot] [PATCH 1/2] distcc: remove deprecated package Gustavo Zacarias
2015-01-15 13:40 ` [Buildroot] [PATCH 2/2] haserl: remove deprecated 0.8.x version Gustavo Zacarias
2015-01-18 16:24 ` Yann E. MORIN
2015-01-18 16:17 ` [Buildroot] [PATCH 1/2] distcc: remove deprecated package Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox