[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-140-gf3addf0
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-140-gf3addf0
|
From: Julien B a. A. <ar...@us...> - 2010-01-25 13:27:18
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f3addf0634096076dc613602bb0baff83a2fab79 (commit)
via cc625a5e6016b003041ecaa4cbb650723b8e28d6 (commit)
via 23b60820f494cb35f139c123f35124b12088cc9e (commit)
via ecf4bec4855b046bdd27b6b28c3d0df449a84198 (commit)
via 9cc014877a22f65317c985e8ed9375071cec2899 (commit)
from b3eb290689befdb90a9af36e1ce74af307d1b400 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f3addf0634096076dc613602bb0baff83a2fab79
Merge: cc625a5e6016b003041ecaa4cbb650723b8e28d6 b3eb290689befdb90a9af36e1ce74af307d1b400
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 14:20:47 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit cc625a5e6016b003041ecaa4cbb650723b8e28d6
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 13:47:42 2010 +0100
[BUILDROOT] Removes unused/unapplied sdl_ttf patch
commit 23b60820f494cb35f139c123f35124b12088cc9e
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 12:25:18 2010 +0100
Updates buildroot/package/.gitignore
commit ecf4bec4855b046bdd27b6b28c3d0df449a84198
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 12:22:38 2010 +0100
[BUILDROOT] Merge curl -> libcurl transition in one single patch
commit 9cc014877a22f65317c985e8ed9375071cec2899
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 25 11:08:01 2010 +0100
[BUILDROOT] Comments some uClibc patches
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 11 --
buildroot/package/libcurl/Config.in | 13 --
.../libcurl-7.19.2-fix-ssl-no-verbose.patch | 25 ----
buildroot/package/libcurl/libcurl.mk | 29 ----
.../sdl/sdl_ttf-2.0.8-freetype-includes.patch | 29 ----
...-0.9.29-fix-max_baud_rate_setting_for_arm.patch | 5 +
.../uClibc/uClibc-0.9.29-fix-spin_locks.patch | 10 +-
patches/buildroot/068-upgrade_to_libcurl.patch | 144 ++++++++++++++++----
patches/buildroot/cleanup_buildroot.sh | 2 +
9 files changed, 134 insertions(+), 134 deletions(-)
delete mode 100644 buildroot/package/libcurl/Config.in
delete mode 100644 buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
delete mode 100644 buildroot/package/libcurl/libcurl.mk
delete mode 100644 buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index aedc788..29bfb0f 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -8,25 +8,14 @@
/buildroot-libtool.patch
# except:
-!/ad9889ctrl/
!/allegro/
!/armadeus/
-!/armadeus-drivers-helpers/
-!/armadeus-testsuite/
-!/as_devices/
!/audio/
!/bluez/
-!/ch7024ctrl/
!/fbgrab/
!/fbtest/
-!/fpgaregs/
-!/freescale-tools/
-!/imxregs/
-!/imxssi/
!/lcd4linux/
-!/libcurl/
!/lmbench/
-!/max5821ctrl/
!/mesa/
!/mplayer/
!/mtd/
diff --git a/buildroot/package/libcurl/Config.in b/buildroot/package/libcurl/Config.in
deleted file mode 100644
index 1d6d08e..0000000
--- a/buildroot/package/libcurl/Config.in
+++ /dev/null
@@ -1,13 +0,0 @@
-config BR2_PACKAGE_LIBCURL
- bool "libcurl"
- help
- cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
- and Dict servers, using any of the supported protocols.
-
- http://curl.haxx.nu/
-
-config BR2_PACKAGE_CURL
- bool "curl binary"
- depends on BR2_PACKAGE_LIBCURL
- help
- Install curl binary as well
diff --git a/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch b/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
deleted file mode 100644
index b15ed96..0000000
--- a/buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-ssluse.c: fix build breakage with --with-ssl --disable-verbose
-
-Revision 1.206 of ssluse.c removed the prefix argument to asn1_output,
-but it is still referenced in the CURL_DISABLE_VERBOSE_STRINGS case.
-
-Signed-off-by: Peter Korsgaard <ja...@su...>
----
- lib/ssluse.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-Index: curl-7.19.2/lib/ssluse.c
-===================================================================
---- curl-7.19.2.orig/lib/ssluse.c
-+++ curl-7.19.2/lib/ssluse.c
-@@ -923,10 +923,6 @@
- int i;
- int year=0,month=0,day=0,hour=0,minute=0,second=0;
-
--#ifdef CURL_DISABLE_VERBOSE_STRINGS
-- (void)prefix;
--#endif
--
- i=tm->length;
- asn1_string=(const char *)tm->data;
-
diff --git a/buildroot/package/libcurl/libcurl.mk b/buildroot/package/libcurl/libcurl.mk
deleted file mode 100644
index d62a0e9..0000000
--- a/buildroot/package/libcurl/libcurl.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#############################################################
-#
-# libcurl
-#
-#############################################################
-LIBCURL_VERSION = 7.19.2
-LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
-LIBCURL_SITE = http://curl.haxx.se/download/
-LIBCURL_INSTALL_STAGING = YES
-LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
- $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6)
-
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBCURL_DEPENDENCIES += openssl
-LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
-LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
-endif
-
-$(eval $(call AUTOTARGETS,package,libcurl))
-
-$(LIBCURL_HOOK_POST_INSTALL):
- rm -rf $(TARGET_DIR)/usr/bin/curl-config \
- $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)
- touch $@
-
-curl: libcurl
-curl-clean: libcurl-clean
-curl-dirclean: libcurl-dirclean
-curl-source: libcurl-source
diff --git a/buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch b/buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch
deleted file mode 100644
index 1e16bc7..0000000
--- a/buildroot/package/sdl/sdl_ttf-2.0.8-freetype-includes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urN -X dontdiff SDL_ttf-2.0.8/SDL_ttf.c SDL_ttf-2.0.8.mod/SDL_ttf.c
---- SDL_ttf-2.0.8/SDL_ttf.c 2006-05-01 11:26:17.000000000 +0200
-+++ SDL_ttf-2.0.8.mod/SDL_ttf.c 2008-07-12 19:56:49.000000000 +0200
-@@ -43,16 +43,6 @@
- #include FT_FREETYPE_H
- #include FT_OUTLINE_H
- #include FT_TRUETYPE_IDS_H
--/*
--#include <freetype/freetype.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
--*/
--#include <freetype/internal/ftobjs.h>
--
--#ifndef FT_OPEN_STREAM
--#define FT_OPEN_STREAM ft_open_stream
--#endif
-
- #include "SDL.h"
- #include "SDL_endian.h"
-@@ -278,7 +268,7 @@
- }
- memset(stream, 0, sizeof(*stream));
-
-- stream->memory = library->memory;
-+ stream->memory = NULL; /* set by FT_Open_Face */
- stream->read = RWread;
- stream->descriptor.pointer = src;
- stream->pos = (unsigned long)position;
diff --git a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch
index 9f5681e..db84e14 100644
--- a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch
+++ b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-max_baud_rate_setting_for_arm.patch
@@ -1,3 +1,8 @@
+uClibc 0.9.29 limits terminal baud rate to 115200 by default. Removes this
+limitation.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h
===================================================================
--- uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h 2009-12-10 15:05:16.000000000 +0100
diff --git a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
index 5addc5c..92b5f87 100644
--- a/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
+++ b/buildroot/toolchain/uClibc/uClibc-0.9.29-fix-spin_locks.patch
@@ -1,3 +1,7 @@
+Spinlocks are still not yet implemented in uClibc for ARM targets.
+However, Xenomai-2.4.3 use this flags to enable or not spinlocking.
+If _POSIX_SPIN_LOCKS is set, Xenomai will fail to compile. So comment it.
+
diff -purN uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h
--- uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:25:03.000000000 +0200
+++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/posix_opt.h 2008-04-26 15:39:38.000000000 +0200
@@ -5,9 +9,9 @@ diff -purN uClibc-0.9.29.ori/libc/sysdeps/linux/common/bits/posix_opt.h uClibc-0
/* We support the Timeouts option. */
#define _POSIX_TIMEOUTS 200112L
-+/* Armadeus Patch: Spinlock is still not yet implemented in UcLibc for Arm */
-+/* targets. However, Xenomai-2.4.3 use this flags to enable or not */
-+/* spinlocking. If this define is set, Xenomai will fail to compile */
++/* Armadeus patch for Xenomai-2.4.3: Spinlocks are still not yet implemented
++ * in uClibc for ARM targets.
++ */
/* We support spinlocks. */
-#define _POSIX_SPIN_LOCKS 200112L
+/* #define _POSIX_SPIN_LOCKS 200112L */
diff --git a/patches/buildroot/068-upgrade_to_libcurl.patch b/patches/buildroot/068-upgrade_to_libcurl.patch
index 6461e81..af05137 100644
--- a/patches/buildroot/068-upgrade_to_libcurl.patch
+++ b/patches/buildroot/068-upgrade_to_libcurl.patch
@@ -1,5 +1,13 @@
---- buildroot/package/Config.in.ref 2009-01-05 22:57:30.000000000 +0100
-+++ buildroot/package/Config.in 2009-01-06 00:11:31.000000000 +0100
+Upgrades from package/curl/ @ 7.17.1 to package/libcurl/ @ 7.19.2
+
+Will be removed when updating to latest Builroot.
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-01-25 11:36:59.000000000 +0100
++++ buildroot/package/Config.in 2010-01-25 11:47:38.000000000 +0100
@@ -145,7 +145,6 @@
source "package/boa/Config.in"
source "package/bind/Config.in"
@@ -16,9 +24,10 @@
source "package/libeXosip2/Config.in"
source "package/libosip2/Config.in"
source "package/libpcap/Config.in"
-diff -urN buildroot/package/curl.ori/Config.in buildroot/package/curl/Config.in
---- buildroot/package/curl.ori/Config.in 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/Config.in 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/Config.in
+===================================================================
+--- buildroot.orig/package/curl/Config.in 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-config BR2_PACKAGE_CURL
- bool "curl"
@@ -35,9 +44,10 @@ diff -urN buildroot/package/curl.ori/Config.in buildroot/package/curl/Config.in
- and Dict servers, using any of the supported protocols.
-
- http://curl.haxx.nu/
-diff -urN buildroot/package/curl.ori/curl-7.10.4-path.patch buildroot/package/curl/curl-7.10.4-path.patch
---- buildroot/package/curl.ori/curl-7.10.4-path.patch 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl-7.10.4-path.patch 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl-7.10.4-path.patch
+===================================================================
+--- buildroot.orig/package/curl/curl-7.10.4-path.patch 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
---- curl-7.10.4/lib/Makefile.am
-+++ curl-7.10.4/lib/Makefile.am
@@ -52,9 +62,10 @@ diff -urN buildroot/package/curl.ori/curl-7.10.4-path.patch buildroot/package/cu
- fi
-
- # this hook is mainly for non-unix systems to build even if configure
-diff -urN buildroot/package/curl.ori/curl-7.12.0-nousr.patch buildroot/package/curl/curl-7.12.0-nousr.patch
---- buildroot/package/curl.ori/curl-7.12.0-nousr.patch 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl-7.12.0-nousr.patch 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl-7.12.0-nousr.patch
+===================================================================
+--- buildroot.orig/package/curl/curl-7.12.0-nousr.patch 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
---- curl-7.12.0/configure.ac.orig 2004-05-25 23:43:39.000000000 +0200
-+++ curl-7.12.0/configure.ac 2004-07-26 15:12:03.029071072 +0200
@@ -72,9 +83,10 @@ diff -urN buildroot/package/curl.ori/curl-7.12.0-nousr.patch buildroot/package/c
-+ LDFLAGS="$CLEANLDFLAGS"
- CPPFLAGS="$CLEANCPPFLAGS -I$EXTRA_SSL/include/openssl -I$EXTRA_SSL/include"
- AC_CHECK_LIB(crypto, CRYPTO_add_lock,[
-diff -urN buildroot/package/curl.ori/curl-7.13.1-2005-3185.patch buildroot/package/curl/curl-7.13.1-2005-3185.patch
---- buildroot/package/curl.ori/curl-7.13.1-2005-3185.patch 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl-7.13.1-2005-3185.patch 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl-7.13.1-2005-3185.patch
+===================================================================
+--- buildroot.orig/package/curl/curl-7.13.1-2005-3185.patch 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
---- curl-7.13.1/lib/http_ntlm.c.2005-3185 2005-02-22 13:10:30.000000000 +0100
-+++ curl-7.13.1/lib/http_ntlm.c 2005-10-19 15:18:42.165859528 +0200
@@ -92,9 +104,10 @@ diff -urN buildroot/package/curl.ori/curl-7.13.1-2005-3185.patch buildroot/packa
- memcpy(&ntlmbuf[size], domain, domlen);
- size += domlen;
-
-diff -urN buildroot/package/curl.ori/curl-7.13.1-auth.patch buildroot/package/curl/curl-7.13.1-auth.patch
---- buildroot/package/curl.ori/curl-7.13.1-auth.patch 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl-7.13.1-auth.patch 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl-7.13.1-auth.patch
+===================================================================
+--- buildroot.orig/package/curl/curl-7.13.1-auth.patch 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
---- curl-7.13.1/lib/http.c.pom 2005-02-19 00:53:07.000000000 +0100
-+++ curl-7.13.1/lib/http.c 2005-04-27 11:48:40.000000000 +0200
@@ -144,9 +157,10 @@ diff -urN buildroot/package/curl.ori/curl-7.13.1-auth.patch buildroot/package/cu
- };
-
- struct hostname {
-diff -urN buildroot/package/curl.ori/curl-7.13.1-cve-2005-4077.patch buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch
---- buildroot/package/curl.ori/curl-7.13.1-cve-2005-4077.patch 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl-7.13.1-cve-2005-4077.patch
+===================================================================
+--- buildroot.orig/package/curl/curl-7.13.1-cve-2005-4077.patch 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
---- curl-7.13.1/lib/url.c.cve-2005-4077 2005-12-08 13:08:03.000000000 +0100
-+++ curl-7.13.1/lib/url.c 2005-12-08 13:15:56.565790336 +0100
@@ -171,9 +185,10 @@ diff -urN buildroot/package/curl.ori/curl-7.13.1-cve-2005-4077.patch buildroot/p
- if(NULL == conn->host.rawalloc)
- return CURLE_OUT_OF_MEMORY;
- conn->host.name = conn->host.rawalloc;
-diff -urN buildroot/package/curl.ori/curl.mk buildroot/package/curl/curl.mk
---- buildroot/package/curl.ori/curl.mk 2008-11-03 09:15:13.000000000 +0100
-+++ buildroot/package/curl/curl.mk 1970-01-01 01:00:00.000000000 +0100
+Index: buildroot/package/curl/curl.mk
+===================================================================
+--- buildroot.orig/package/curl/curl.mk 2008-11-03 09:15:13.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,97 +0,0 @@
-#############################################################
-#
@@ -272,4 +287,85 @@ diff -urN buildroot/package/curl.ori/curl.mk buildroot/package/curl/curl.mk
-ifeq ($(strip $(BR2_PACKAGE_LIBCURL)),y)
-TARGETS+=libcurl
-endif
-
+Index: buildroot/package/libcurl/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/libcurl/Config.in 2010-01-25 11:48:40.000000000 +0100
+@@ -0,0 +1,13 @@
++config BR2_PACKAGE_LIBCURL
++ bool "libcurl"
++ help
++ cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
++ and Dict servers, using any of the supported protocols.
++
++ http://curl.haxx.nu/
++
++config BR2_PACKAGE_CURL
++ bool "curl binary"
++ depends on BR2_PACKAGE_LIBCURL
++ help
++ Install curl binary as well
+Index: buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/libcurl/libcurl-7.19.2-fix-ssl-no-verbose.patch 2010-01-25 11:48:40.000000000 +0100
+@@ -0,0 +1,25 @@
++ssluse.c: fix build breakage with --with-ssl --disable-verbose
++
++Revision 1.206 of ssluse.c removed the prefix argument to asn1_output,
++but it is still referenced in the CURL_DISABLE_VERBOSE_STRINGS case.
++
++Signed-off-by: Peter Korsgaard <ja...@su...>
++---
++ lib/ssluse.c | 4 ----
++ 1 file changed, 4 deletions(-)
++
++Index: curl-7.19.2/lib/ssluse.c
++===================================================================
++--- curl-7.19.2.orig/lib/ssluse.c
+++++ curl-7.19.2/lib/ssluse.c
++@@ -923,10 +923,6 @@
++ int i;
++ int year=0,month=0,day=0,hour=0,minute=0,second=0;
++
++-#ifdef CURL_DISABLE_VERBOSE_STRINGS
++- (void)prefix;
++-#endif
++-
++ i=tm->length;
++ asn1_string=(const char *)tm->data;
++
+Index: buildroot/package/libcurl/libcurl.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/libcurl/libcurl.mk 2010-01-25 11:48:40.000000000 +0100
+@@ -0,0 +1,29 @@
++#############################################################
++#
++# libcurl
++#
++#############################################################
++LIBCURL_VERSION = 7.19.2
++LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
++LIBCURL_SITE = http://curl.haxx.se/download/
++LIBCURL_INSTALL_STAGING = YES
++LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
++ $(DISABLE_NLS) $(DISABLE_LARGEFILE) $(DISABLE_IPV6)
++
++ifeq ($(BR2_PACKAGE_OPENSSL),y)
++LIBCURL_DEPENDENCIES += openssl
++LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
++LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
++endif
++
++$(eval $(call AUTOTARGETS,package,libcurl))
++
++$(LIBCURL_HOOK_POST_INSTALL):
++ rm -rf $(TARGET_DIR)/usr/bin/curl-config \
++ $(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)
++ touch $@
++
++curl: libcurl
++curl-clean: libcurl-clean
++curl-dirclean: libcurl-dirclean
++curl-source: libcurl-source
diff --git a/patches/buildroot/cleanup_buildroot.sh b/patches/buildroot/cleanup_buildroot.sh
index 42898d2..fa42d5b 100755
--- a/patches/buildroot/cleanup_buildroot.sh
+++ b/patches/buildroot/cleanup_buildroot.sh
@@ -12,3 +12,5 @@ rm -f buildroot/package/proftpd/proftpd-1.3.2-fix-kernel-header-capability-vers
rm -rf buildroot/package/uucp/
rm -f buildroot/package/audio/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/audio/flite/
+rm -rf buildroot/package/libcurl/
+
hooks/post-receive
--
armadeus
|
