* [Buildroot] [PATCH 2/7] iproute2: bump to version 2.6.38
2011-04-20 17:41 [Buildroot] [PATCH 1/7] alsa-utils: make /var/lib/alsa directory in target Gustavo Zacarias
@ 2011-04-20 17:41 ` Gustavo Zacarias
2011-04-21 5:41 ` Peter Korsgaard
2011-04-20 17:41 ` [Buildroot] [PATCH 3/7] haserl: bump dev version to 0.9.28 Gustavo Zacarias
` (5 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Gustavo Zacarias @ 2011-04-20 17:41 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
.../iproute2/iproute2-2.6.37-optional-ipv6.patch | 94 --------------------
package/iproute2/iproute2-optional-ipv6.patch | 94 ++++++++++++++++++++
package/iproute2/iproute2.mk | 2 +-
3 files changed, 95 insertions(+), 95 deletions(-)
delete mode 100644 package/iproute2/iproute2-2.6.37-optional-ipv6.patch
create mode 100644 package/iproute2/iproute2-optional-ipv6.patch
diff --git a/package/iproute2/iproute2-2.6.37-optional-ipv6.patch b/package/iproute2/iproute2-2.6.37-optional-ipv6.patch
deleted file mode 100644
index ef22c22..0000000
--- a/package/iproute2/iproute2-2.6.37-optional-ipv6.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-[PATCH] fix build on uClibc without IPv6 support
-
-Disable IPv6 support code when building with uClibc configured without IPv6
-support.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- ip/ip6tunnel.c | 6 ++++++
- ip/ipprefix.c | 8 ++++++++
- ip/iptunnel.c | 6 ++++++
- 3 files changed, 20 insertions(+)
-
-Index: iproute2-2.6.37-orig/ip/ip6tunnel.c
-===================================================================
---- iproute2-2.6.37-orig.orig/ip/ip6tunnel.c
-+++ iproute2-2.6.37-orig/ip/ip6tunnel.c
-@@ -20,6 +20,10 @@
- * Masahide NAKAMURA @USAGI
- */
-
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#else
-+
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -410,3 +414,5 @@ int do_ip6tunnel(int argc, char **argv)
- fprintf(stderr, "Command \"%s\" is unknown, try \"ip -f inet6 tunnel help\".\n", *argv);
- exit(-1);
- }
-+
-+#endif /* no ipv6 */
-Index: iproute2-2.6.37-orig/ip/ipprefix.c
-===================================================================
---- iproute2-2.6.37-orig.orig/ip/ipprefix.c
-+++ iproute2-2.6.37-orig/ip/ipprefix.c
-@@ -22,11 +22,17 @@
- * Authors:
- * Masahide NAKAMURA @USAGI
- */
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#define NO_IPV6
-+#endif
-
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef NO_IPV6
- #include <netinet/icmp6.h>
-+#endif
- #include "utils.h"
-
- /* prefix flags; see kernel's net/ipv6/addrconf.c and include/net/if_inet6.h */
-@@ -62,10 +68,12 @@ int print_prefix(const struct sockaddr_n
- fprintf(stderr, "wrong family %d\n", prefix->prefix_family);
- return 0;
- }
-+#ifdef ND_OPT_PREFIX_INFORMATION
- if (prefix->prefix_type != ND_OPT_PREFIX_INFORMATION) {
- fprintf(stderr, "wrong ND type %d\n", prefix->prefix_type);
- return 0;
- }
-+#endif
-
- parse_rtattr(tb, RTA_MAX, RTM_RTA(prefix), len);
-
-Index: iproute2-2.6.37-orig/ip/iptunnel.c
-===================================================================
---- iproute2-2.6.37-orig.orig/ip/iptunnel.c
-+++ iproute2-2.6.37-orig/ip/iptunnel.c
-@@ -9,6 +9,10 @@
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
- */
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#define NO_IPV6
-+#endif
-
- #include <stdio.h>
- #include <stdlib.h>
-@@ -601,8 +605,10 @@ int do_iptunnel(int argc, char **argv)
- * protocol-independent because of unarranged structure between
- * IPv4 and IPv6.
- */
-+#ifndef NO_IPV6
- case AF_INET6:
- return do_ip6tunnel(argc, argv);
-+#endif
- default:
- fprintf(stderr, "Unsupported family:%d\n", preferred_family);
- exit(-1);
diff --git a/package/iproute2/iproute2-optional-ipv6.patch b/package/iproute2/iproute2-optional-ipv6.patch
new file mode 100644
index 0000000..ef22c22
--- /dev/null
+++ b/package/iproute2/iproute2-optional-ipv6.patch
@@ -0,0 +1,94 @@
+[PATCH] fix build on uClibc without IPv6 support
+
+Disable IPv6 support code when building with uClibc configured without IPv6
+support.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ ip/ip6tunnel.c | 6 ++++++
+ ip/ipprefix.c | 8 ++++++++
+ ip/iptunnel.c | 6 ++++++
+ 3 files changed, 20 insertions(+)
+
+Index: iproute2-2.6.37-orig/ip/ip6tunnel.c
+===================================================================
+--- iproute2-2.6.37-orig.orig/ip/ip6tunnel.c
++++ iproute2-2.6.37-orig/ip/ip6tunnel.c
+@@ -20,6 +20,10 @@
+ * Masahide NAKAMURA @USAGI
+ */
+
++#include <features.h>
++#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
++#else
++
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -410,3 +414,5 @@ int do_ip6tunnel(int argc, char **argv)
+ fprintf(stderr, "Command \"%s\" is unknown, try \"ip -f inet6 tunnel help\".\n", *argv);
+ exit(-1);
+ }
++
++#endif /* no ipv6 */
+Index: iproute2-2.6.37-orig/ip/ipprefix.c
+===================================================================
+--- iproute2-2.6.37-orig.orig/ip/ipprefix.c
++++ iproute2-2.6.37-orig/ip/ipprefix.c
+@@ -22,11 +22,17 @@
+ * Authors:
+ * Masahide NAKAMURA @USAGI
+ */
++#include <features.h>
++#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
++#define NO_IPV6
++#endif
+
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifndef NO_IPV6
+ #include <netinet/icmp6.h>
++#endif
+ #include "utils.h"
+
+ /* prefix flags; see kernel's net/ipv6/addrconf.c and include/net/if_inet6.h */
+@@ -62,10 +68,12 @@ int print_prefix(const struct sockaddr_n
+ fprintf(stderr, "wrong family %d\n", prefix->prefix_family);
+ return 0;
+ }
++#ifdef ND_OPT_PREFIX_INFORMATION
+ if (prefix->prefix_type != ND_OPT_PREFIX_INFORMATION) {
+ fprintf(stderr, "wrong ND type %d\n", prefix->prefix_type);
+ return 0;
+ }
++#endif
+
+ parse_rtattr(tb, RTA_MAX, RTM_RTA(prefix), len);
+
+Index: iproute2-2.6.37-orig/ip/iptunnel.c
+===================================================================
+--- iproute2-2.6.37-orig.orig/ip/iptunnel.c
++++ iproute2-2.6.37-orig/ip/iptunnel.c
+@@ -9,6 +9,10 @@
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ *
+ */
++#include <features.h>
++#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
++#define NO_IPV6
++#endif
+
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -601,8 +605,10 @@ int do_iptunnel(int argc, char **argv)
+ * protocol-independent because of unarranged structure between
+ * IPv4 and IPv6.
+ */
++#ifndef NO_IPV6
+ case AF_INET6:
+ return do_ip6tunnel(argc, argv);
++#endif
+ default:
+ fprintf(stderr, "Unsupported family:%d\n", preferred_family);
+ exit(-1);
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index dfb8410..630fab4 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -4,7 +4,7 @@
#
#############################################################
-IPROUTE2_VERSION = 2.6.37
+IPROUTE2_VERSION = 2.6.38
IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.bz2
IPROUTE2_SITE = http://devresources.linuxfoundation.org/dev/iproute2/download
IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
--
1.7.3.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 2/7] iproute2: bump to version 2.6.38
2011-04-20 17:41 ` [Buildroot] [PATCH 2/7] iproute2: bump to version 2.6.38 Gustavo Zacarias
@ 2011-04-21 5:41 ` Peter Korsgaard
0 siblings, 0 replies; 14+ messages in thread
From: Peter Korsgaard @ 2011-04-21 5:41 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> .../iproute2/iproute2-2.6.37-optional-ipv6.patch | 94 --------------------
Gustavo> package/iproute2/iproute2-optional-ipv6.patch | 94 ++++++++++++++++++++
Gustavo> package/iproute2/iproute2.mk | 2 +-
Gustavo> 3 files changed, 95 insertions(+), 95 deletions(-)
Gustavo> delete mode 100644 package/iproute2/iproute2-2.6.37-optional-ipv6.patch
Gustavo> create mode 100644 package/iproute2/iproute2-optional-ipv6.patch
Committed, thanks. It would be good if you configure git to detet
renames, so I right away can see that the patch didn't change.
E.G. add:
[diff]
renames = "copy"
to your ~/.gitconfig
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 3/7] haserl: bump dev version to 0.9.28
2011-04-20 17:41 [Buildroot] [PATCH 1/7] alsa-utils: make /var/lib/alsa directory in target Gustavo Zacarias
2011-04-20 17:41 ` [Buildroot] [PATCH 2/7] iproute2: bump to version 2.6.38 Gustavo Zacarias
@ 2011-04-20 17:41 ` Gustavo Zacarias
2011-04-24 20:59 ` Peter Korsgaard
2011-04-20 17:41 ` [Buildroot] [PATCH 4/7] libcap: bump to version 2.20 Gustavo Zacarias
` (4 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Gustavo Zacarias @ 2011-04-20 17:41 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/haserl/Config.in | 2 +-
package/haserl/haserl.mk | 15 +++++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/package/haserl/Config.in b/package/haserl/Config.in
index 23101c4..ad9a8e9 100644
--- a/package/haserl/Config.in
+++ b/package/haserl/Config.in
@@ -38,4 +38,4 @@ endchoice
config BR2_PACKAGE_HASERL_VERSION
string
default "0.8.0" if BR2_PACKAGE_HASERL_VERSION_0_8_X
- default "0.9.27" if BR2_PACKAGE_HASERL_VERSION_0_9_X
+ default "0.9.28" if BR2_PACKAGE_HASERL_VERSION_0_9_X
diff --git a/package/haserl/haserl.mk b/package/haserl/haserl.mk
index a8585e8..c62b344 100644
--- a/package/haserl/haserl.mk
+++ b/package/haserl/haserl.mk
@@ -4,13 +4,20 @@
#
#############################################################
-HASERL_VERSION:=$(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
-HASERL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
-HASERL_AUTORECONF:=NO
-HASERL_INSTALL_TARGET:=YES
+HASERL_VERSION = $(call qstrip,$(BR2_PACKAGE_HASERL_VERSION))
+HASERL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/haserl/
# force haserl 0.8.0 to use install-sh so stripping works
HASERL_CONF_ENV = ac_cv_path_install=./install-sh
+
+# lua2c is only needed when haserl_lualib.inc is older than haserl_lualib.lua
+# So avoid having a host-lua just for this
+define HASERL_NO_LUA2C
+ $(SED) 's/haserl_lualib.lua lua2c/haserl_lualib.lua/' \
+ $(@D)/src/Makefile.in
+endef
+HASERL_POST_EXTRACT_HOOKS += HASERL_NO_LUA2C
+
ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y)
HASERL_CONF_OPT += --with-lua=$(STAGING_DIR) \
--with-lua-headers=$(STAGING_DIR)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 4/7] libcap: bump to version 2.20
2011-04-20 17:41 [Buildroot] [PATCH 1/7] alsa-utils: make /var/lib/alsa directory in target Gustavo Zacarias
2011-04-20 17:41 ` [Buildroot] [PATCH 2/7] iproute2: bump to version 2.6.38 Gustavo Zacarias
2011-04-20 17:41 ` [Buildroot] [PATCH 3/7] haserl: bump dev version to 0.9.28 Gustavo Zacarias
@ 2011-04-20 17:41 ` Gustavo Zacarias
2011-04-21 21:19 ` Peter Korsgaard
2011-04-20 17:41 ` [Buildroot] [PATCH 5/7] readline: bump to version 6.2pl1 Gustavo Zacarias
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Gustavo Zacarias @ 2011-04-20 17:41 UTC (permalink / raw)
To: buildroot
Bump libcap to version 2.20 and adjust style to match buildroot's
defacto standard.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/libcap/libcap-2.19-build-system.patch | 59 -------------------------
package/libcap/libcap-2.20-build-system.patch | 54 ++++++++++++++++++++++
package/libcap/libcap.mk | 29 ++++++++----
3 files changed, 73 insertions(+), 69 deletions(-)
delete mode 100644 package/libcap/libcap-2.19-build-system.patch
create mode 100644 package/libcap/libcap-2.20-build-system.patch
diff --git a/package/libcap/libcap-2.19-build-system.patch b/package/libcap/libcap-2.19-build-system.patch
deleted file mode 100644
index f548726..0000000
--- a/package/libcap/libcap-2.19-build-system.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Nura libcap-2.19.orig/Make.Rules libcap-2.19/Make.Rules
---- libcap-2.19.orig/Make.Rules 2010-01-13 23:04:58.000000000 -0300
-+++ libcap-2.19/Make.Rules 2010-12-28 16:44:18.164052748 -0300
-@@ -45,25 +45,26 @@
- KERNEL_HEADERS := $(topdir)/libcap/include
- IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
-
--CC := gcc
--CFLAGS := -O2
--BUILD_CC := $(CC)
--BUILD_CFLAGS := $(CFLAGS) $(IPATH)
--AR := ar
--RANLIB := ranlib
-+CC ?= gcc
-+CFLAGS ?= -O2
-+CC_FOR_BUILD ?= $(CC)
-+CFLAGS_FOR_BUILD ?= $(CFLAGS)
-+AR ?= ar
-+RANLIB ?= ranlib
- DEBUG = -g #-DDEBUG
- WARNINGS=-fPIC -Wall -Wwrite-strings \
- -Wpointer-arith -Wcast-qual -Wcast-align \
- -Wstrict-prototypes -Wmissing-prototypes \
- -Wnested-externs -Winline -Wshadow
- LD=$(CC) -Wl,-x -shared
--LDFLAGS := #-g
-+LDFLAGS ?= #-g
-
- SYSTEM_HEADERS = /usr/include
- INCS=$(topdir)/libcap/include/sys/capability.h
- LDFLAGS += -L$(topdir)/libcap
- CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH)
--PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
-+CFLAGS_FOR_BUILD += $(IPATH)
-+PAM_CAP := no
- INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
- DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
- LIBATTR := yes
-diff -Nura libcap-2.19.orig/libcap/Makefile libcap-2.19/libcap/Makefile
---- libcap-2.19.orig/libcap/Makefile 2008-12-04 05:03:12.000000000 -0200
-+++ libcap-2.19/libcap/Makefile 2010-12-28 16:44:33.457052750 -0300
-@@ -33,7 +33,7 @@
- endif
-
- _makenames: _makenames.c cap_names.list.h
-- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
-+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
-
- cap_names.h: _makenames
- ./_makenames > cap_names.h
-@@ -65,7 +65,7 @@
- install -m 0644 include/sys/capability.h $(INCDIR)/sys
- mkdir -p -m 0755 $(LIBDIR)
- install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
-- install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
-+ install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
- ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
- ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
- ifeq ($(FAKEROOT),)
diff --git a/package/libcap/libcap-2.20-build-system.patch b/package/libcap/libcap-2.20-build-system.patch
new file mode 100644
index 0000000..397aff2
--- /dev/null
+++ b/package/libcap/libcap-2.20-build-system.patch
@@ -0,0 +1,54 @@
+Avoid the libcap buildsys forcing CC/CFLAGS/LDFLAGS/AR/RANLIB
+Also install the shared lib +x
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura libcap-2.20/Make.Rules libcap-2.20-build/Make.Rules
+--- libcap-2.20/Make.Rules 2011-01-19 02:06:44.000000000 -0300
++++ libcap-2.20-build/Make.Rules 2011-04-19 14:07:53.544903094 -0300
+@@ -47,25 +47,25 @@
+ KERNEL_HEADERS := $(topdir)/libcap/include
+ IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+
+-CC := gcc
+-CFLAGS := -O2
+-BUILD_CC := $(CC)
+-BUILD_CFLAGS := $(CFLAGS) $(IPATH)
+-AR := ar
+-RANLIB := ranlib
++CC ?= gcc
++CFLAGS ?= -O2
++BUILD_CC ?= $(CC)
++BUILD_CFLAGS ?= $(CFLAGS) $(IPATH)
++AR ?= ar
++RANLIB ?= ranlib
+ DEBUG = -g #-DDEBUG
+ WARNINGS=-Wall -Wwrite-strings \
+ -Wpointer-arith -Wcast-qual -Wcast-align \
+ -Wstrict-prototypes -Wmissing-prototypes \
+ -Wnested-externs -Winline -Wshadow
+ LD=$(CC) -Wl,-x -shared
+-LDFLAGS := #-g
++LDFLAGS ?= #-g
+
+ SYSTEM_HEADERS = /usr/include
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LDFLAGS += -L$(topdir)/libcap
+ CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
+-PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
++PAM_CAP = no
+ INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
+ LIBATTR := yes
+diff -Nura libcap-2.20/libcap/Makefile libcap-2.20-build/libcap/Makefile
+--- libcap-2.20/libcap/Makefile 2010-08-08 19:26:04.000000000 -0300
++++ libcap-2.20-build/libcap/Makefile 2011-04-19 14:08:29.377146094 -0300
+@@ -65,7 +65,7 @@
+ install -m 0644 include/sys/capability.h $(INCDIR)/sys
+ mkdir -p -m 0755 $(LIBDIR)
+ install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
+- install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
++ install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
+ ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
+ ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
+ ifeq ($(FAKEROOT),)
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index d4f8f17..9357df1 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -1,27 +1,36 @@
-LIBCAP_VERSION=2.19
-LIBCAP_SOURCE=libcap-$(LIBCAP_VERSION).tar.bz2
-LIBCAP_SITE=http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/
-LIBCAP_INSTALL_STAGING=YES
+#############################################################
+#
+# libcap
+#
+#############################################################
+
+LIBCAP_VERSION = 2.20
+LIBCAP_SITE = http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
+LIBCAP_INSTALL_STAGING = YES
define LIBCAP_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+ LIBATTR=no BUILD_CC="$(HOSTCC)" BUILD_CFLAGS="$(HOST_CFLAGS)"
endef
define LIBCAP_INSTALL_STAGING_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib install
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(STAGING_DIR) \
+ prefix=/usr lib=lib install
endef
define LIBCAP_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib install
- rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,capsh getpcaps)
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(TARGET_DIR) \
+ prefix=/usr lib=lib install
+ rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,capsh getpcaps)
endef
define HOST_LIBCAP_BUILD_CMDS
- $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
+ $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
endef
define HOST_LIBCAP_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(HOST_DIR) prefix=/usr lib=lib install
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(HOST_DIR) \
+ prefix=/usr lib=lib install
endef
$(eval $(call GENTARGETS,package,libcap))
--
1.7.3.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 4/7] libcap: bump to version 2.20
2011-04-20 17:41 ` [Buildroot] [PATCH 4/7] libcap: bump to version 2.20 Gustavo Zacarias
@ 2011-04-21 21:19 ` Peter Korsgaard
0 siblings, 0 replies; 14+ messages in thread
From: Peter Korsgaard @ 2011-04-21 21:19 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Bump libcap to version 2.20 and adjust style to match buildroot's
Gustavo> defacto standard.
Breaks here (I don't have libcap development headers on my build host):
/usr/bin/make -C libcap all
make[2]: Entering directory `/home/peko/source/buildroot/output/build/libcap-2.20/libcap'
/usr/bin/gcc -O2 -I/home/peko/source/buildroot/output/host/include -I/home/peko/source/buildroot/output/host/usr/include _makenames.c -o _makenames
_makenames.c:10:28: error: sys/capability.h: No such file or directory
_makenames.c:25: error: invalid application of ?sizeof? to incomplete type ?struct __user_cap_data_struct?
make[2]: *** [_makenames] Error 1
make[2]: Leaving directory `/home/peko/source/buildroot/output/build/libcap-2.20/libcap'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/peko/source/buildroot/output/build/libcap-2.20'
make: *** [/home/peko/source/buildroot/output/build/libcap-2.20/.stamp_built] Error 2
It seems like we'll need to first build libcap for the host.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 5/7] readline: bump to version 6.2pl1
2011-04-20 17:41 [Buildroot] [PATCH 1/7] alsa-utils: make /var/lib/alsa directory in target Gustavo Zacarias
` (2 preceding siblings ...)
2011-04-20 17:41 ` [Buildroot] [PATCH 4/7] libcap: bump to version 2.20 Gustavo Zacarias
@ 2011-04-20 17:41 ` Gustavo Zacarias
2011-04-21 21:21 ` Peter Korsgaard
2011-04-20 17:41 ` [Buildroot] [PATCH 6/7] ncurses: roll back to version 5.7 Gustavo Zacarias
` (2 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Gustavo Zacarias @ 2011-04-20 17:41 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/readline/readline-6.1-curses-link.patch | 16 ------------
package/readline/readline-6.2-pl1.patch | 29 +++++++++++++++++++++++
package/readline/readline-curses-link.patch | 16 ++++++++++++
package/readline/readline.mk | 3 +-
4 files changed, 47 insertions(+), 17 deletions(-)
delete mode 100644 package/readline/readline-6.1-curses-link.patch
create mode 100644 package/readline/readline-6.2-pl1.patch
create mode 100644 package/readline/readline-curses-link.patch
diff --git a/package/readline/readline-6.1-curses-link.patch b/package/readline/readline-6.1-curses-link.patch
deleted file mode 100644
index 56b4770..0000000
--- a/package/readline/readline-6.1-curses-link.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-link readline directly to ncurses since it needs symbols from it
-
-upstream readline does this on purpose (no direct linking), but
-it doesn't make much sense in a Linux world
-
---- a/support/shobj-conf
-+++ b/support/shobj-conf
-@@ -42,7 +42,7 @@
- SHOBJ_LIBS=
-
- SHLIB_XLDFLAGS=
--SHLIB_LIBS=
-+SHLIB_LIBS=-lncurses
-
- SHLIB_DOT='.'
- SHLIB_LIBPREF='lib'
diff --git a/package/readline/readline-6.2-pl1.patch b/package/readline/readline-6.2-pl1.patch
new file mode 100644
index 0000000..9ef0e48
--- /dev/null
+++ b/package/readline/readline-6.2-pl1.patch
@@ -0,0 +1,29 @@
+Bug-Reported-by: Clark J. Wang <dearvoid@gmail.com>
+Bug-Reference-ID: <AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD@mail.gmail.com>
+Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
+
+diff -Nura readline-6.2/callback.c readline-6.2-pl1/callback.c
+--- readline-6.2/callback.c 2010-06-06 13:18:58.000000000 -0300
++++ readline-6.2-pl1/callback.c 2011-04-19 14:20:00.269829168 -0300
+@@ -148,6 +148,9 @@
+ eof = _rl_vi_domove_callback (_rl_vimvcxt);
+ /* Should handle everything, including cleanup, numeric arguments,
+ and turning off RL_STATE_VIMOTION */
++ if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
++ _rl_internal_char_cleanup ();
++
+ return;
+ }
+ #endif
+diff -Nura readline-6.2/vi_mode.c readline-6.2-pl1/vi_mode.c
+--- readline-6.2/vi_mode.c 2010-11-20 21:51:39.000000000 -0300
++++ readline-6.2-pl1/vi_mode.c 2011-04-19 14:19:24.510586785 -0300
+@@ -1114,7 +1114,7 @@
+ rl_beg_of_line (1, c);
+ _rl_vi_last_motion = c;
+ RL_UNSETSTATE (RL_STATE_VIMOTION);
+- return (0);
++ return (vidomove_dispatch (m));
+ }
+ #if defined (READLINE_CALLBACKS)
+ /* XXX - these need to handle rl_universal_argument bindings */
diff --git a/package/readline/readline-curses-link.patch b/package/readline/readline-curses-link.patch
new file mode 100644
index 0000000..56b4770
--- /dev/null
+++ b/package/readline/readline-curses-link.patch
@@ -0,0 +1,16 @@
+link readline directly to ncurses since it needs symbols from it
+
+upstream readline does this on purpose (no direct linking), but
+it doesn't make much sense in a Linux world
+
+--- a/support/shobj-conf
++++ b/support/shobj-conf
+@@ -42,7 +42,7 @@
+ SHOBJ_LIBS=
+
+ SHLIB_XLDFLAGS=
+-SHLIB_LIBS=
++SHLIB_LIBS=-lncurses
+
+ SHLIB_DOT='.'
+ SHLIB_LIBPREF='lib'
diff --git a/package/readline/readline.mk b/package/readline/readline.mk
index 9e25e04..e34c650 100644
--- a/package/readline/readline.mk
+++ b/package/readline/readline.mk
@@ -3,7 +3,8 @@
# build GNU readline
#
#############################################################
-READLINE_VERSION = 6.1
+
+READLINE_VERSION = 6.2
READLINE_SOURCE = readline-$(READLINE_VERSION).tar.gz
READLINE_SITE = $(BR2_GNU_MIRROR)/readline
READLINE_INSTALL_STAGING = YES
--
1.7.3.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 6/7] ncurses: roll back to version 5.7
2011-04-20 17:41 [Buildroot] [PATCH 1/7] alsa-utils: make /var/lib/alsa directory in target Gustavo Zacarias
` (3 preceding siblings ...)
2011-04-20 17:41 ` [Buildroot] [PATCH 5/7] readline: bump to version 6.2pl1 Gustavo Zacarias
@ 2011-04-20 17:41 ` Gustavo Zacarias
2011-04-24 20:54 ` Peter Korsgaard
2011-04-20 17:41 ` [Buildroot] [PATCH 7/7] toolchain: bump 2.6.35 kernel headers to 2.6.35.12 Gustavo Zacarias
2011-05-03 19:49 ` [Buildroot] [PATCH 1/7] alsa-utils: make /var/lib/alsa directory in target Peter Korsgaard
6 siblings, 1 reply; 14+ messages in thread
From: Gustavo Zacarias @ 2011-04-20 17:41 UTC (permalink / raw)
To: buildroot
ncurses 5.8 and 5.9 segfault with some applications so roll back to
version 5.7
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/ncurses/ncurses.mk | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 91ab97a..ae3f3fb 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -23,9 +23,8 @@
# USA
# TARGETS
-NCURSES_VERSION = 5.8
+NCURSES_VERSION = 5.7
NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
-NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
NCURSES_INSTALL_STAGING = YES
NCURSES_CONF_OPT = \
--
1.7.3.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 7/7] toolchain: bump 2.6.35 kernel headers to 2.6.35.12
2011-04-20 17:41 [Buildroot] [PATCH 1/7] alsa-utils: make /var/lib/alsa directory in target Gustavo Zacarias
` (4 preceding siblings ...)
2011-04-20 17:41 ` [Buildroot] [PATCH 6/7] ncurses: roll back to version 5.7 Gustavo Zacarias
@ 2011-04-20 17:41 ` Gustavo Zacarias
2011-04-21 9:56 ` Peter Korsgaard
2011-05-03 19:49 ` [Buildroot] [PATCH 1/7] alsa-utils: make /var/lib/alsa directory in target Peter Korsgaard
6 siblings, 1 reply; 14+ messages in thread
From: Gustavo Zacarias @ 2011-04-20 17:41 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
| 2 +-
| 59 --------------------
| 59 ++++++++++++++++++++
3 files changed, 60 insertions(+), 60 deletions(-)
delete mode 100644 toolchain/kernel-headers/linux-2.6.35.11-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
create mode 100644 toolchain/kernel-headers/linux-2.6.35.12-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
--git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in
index 92798d8..68151d0 100644
--- a/toolchain/kernel-headers/Config.in
+++ b/toolchain/kernel-headers/Config.in
@@ -43,7 +43,7 @@ config BR2_DEFAULT_KERNEL_VERSION
config BR2_DEFAULT_KERNEL_HEADERS
string
- default "2.6.35.11" if BR2_KERNEL_HEADERS_2_6_35
+ default "2.6.35.12" if BR2_KERNEL_HEADERS_2_6_35
default "2.6.36.4" if BR2_KERNEL_HEADERS_2_6_36
default "2.6.37.6" if BR2_KERNEL_HEADERS_2_6_37
default "2.6.38.3" if BR2_KERNEL_HEADERS_2_6_38
diff --git a/toolchain/kernel-headers/linux-2.6.35.11-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.35.11-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
deleted file mode 100644
index 1089c71..0000000
--- a/toolchain/kernel-headers/linux-2.6.35.11-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 877aa0313e7d22b88d04ebef76392e1688fffff9 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Fri, 27 Nov 2009 11:20:54 +0100
-Subject: [PATCH] scsi: use __uX types for headers exported to user space
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 9e4f5e29 (FC Pass Thru support) exported a number of header files
-in include/scsi to user space, but didn't change the uX types to the
-userspace-compatible __uX types. Without that you'll get compile errors
-when including them - E.G.:
-
-/tmp/include/scsi/scsi.h:145: error: expected specifier-qualifier-list
-before ?u8?
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- include/scsi/scsi.h | 8 ++++----
- include/scsi/scsi_netlink.h | 4 ++--
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
-index 8b4deca..ec3053e 100644
---- a/include/scsi/scsi.h
-+++ b/include/scsi/scsi.h
-@@ -149,10 +149,10 @@ struct scsi_cmnd;
-
- /* defined in T10 SCSI Primary Commands-2 (SPC2) */
- struct scsi_varlen_cdb_hdr {
-- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
-- u8 control;
-- u8 misc[5];
-- u8 additional_cdb_length; /* total cdb length - 8 */
-+ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
-+ __u8 control;
-+ __u8 misc[5];
-+ __u8 additional_cdb_length; /* total cdb length - 8 */
- __be16 service_action;
- /* service specific data follows */
- };
-diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
-index 536752c..58ce8fe 100644
---- a/include/scsi/scsi_netlink.h
-+++ b/include/scsi/scsi_netlink.h
-@@ -105,8 +105,8 @@ struct scsi_nl_host_vendor_msg {
- * PCI : ID data is the 16 bit PCI Registered Vendor ID
- */
- #define SCSI_NL_VID_TYPE_SHIFT 56
--#define SCSI_NL_VID_TYPE_MASK ((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
--#define SCSI_NL_VID_TYPE_PCI ((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
-+#define SCSI_NL_VID_TYPE_MASK ((__u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
-+#define SCSI_NL_VID_TYPE_PCI ((__u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
- #define SCSI_NL_VID_ID_MASK (~ SCSI_NL_VID_TYPE_MASK)
-
-
---
-1.7.0
-
--git a/toolchain/kernel-headers/linux-2.6.35.12-scsi-use-__uX-types-for-headers-exported-to-user-space.patch b/toolchain/kernel-headers/linux-2.6.35.12-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
new file mode 100644
index 0000000..1089c71
--- /dev/null
+++ b/toolchain/kernel-headers/linux-2.6.35.12-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
@@ -0,0 +1,59 @@
+From 877aa0313e7d22b88d04ebef76392e1688fffff9 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Fri, 27 Nov 2009 11:20:54 +0100
+Subject: [PATCH] scsi: use __uX types for headers exported to user space
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 9e4f5e29 (FC Pass Thru support) exported a number of header files
+in include/scsi to user space, but didn't change the uX types to the
+userspace-compatible __uX types. Without that you'll get compile errors
+when including them - E.G.:
+
+/tmp/include/scsi/scsi.h:145: error: expected specifier-qualifier-list
+before ?u8?
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ include/scsi/scsi.h | 8 ++++----
+ include/scsi/scsi_netlink.h | 4 ++--
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
+index 8b4deca..ec3053e 100644
+--- a/include/scsi/scsi.h
++++ b/include/scsi/scsi.h
+@@ -149,10 +149,10 @@ struct scsi_cmnd;
+
+ /* defined in T10 SCSI Primary Commands-2 (SPC2) */
+ struct scsi_varlen_cdb_hdr {
+- u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
+- u8 control;
+- u8 misc[5];
+- u8 additional_cdb_length; /* total cdb length - 8 */
++ __u8 opcode; /* opcode always == VARIABLE_LENGTH_CMD */
++ __u8 control;
++ __u8 misc[5];
++ __u8 additional_cdb_length; /* total cdb length - 8 */
+ __be16 service_action;
+ /* service specific data follows */
+ };
+diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
+index 536752c..58ce8fe 100644
+--- a/include/scsi/scsi_netlink.h
++++ b/include/scsi/scsi_netlink.h
+@@ -105,8 +105,8 @@ struct scsi_nl_host_vendor_msg {
+ * PCI : ID data is the 16 bit PCI Registered Vendor ID
+ */
+ #define SCSI_NL_VID_TYPE_SHIFT 56
+-#define SCSI_NL_VID_TYPE_MASK ((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
+-#define SCSI_NL_VID_TYPE_PCI ((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
++#define SCSI_NL_VID_TYPE_MASK ((__u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
++#define SCSI_NL_VID_TYPE_PCI ((__u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
+ #define SCSI_NL_VID_ID_MASK (~ SCSI_NL_VID_TYPE_MASK)
+
+
+--
+1.7.0
+
--
1.7.3.4
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH 7/7] toolchain: bump 2.6.35 kernel headers to 2.6.35.12
2011-04-20 17:41 ` [Buildroot] [PATCH 7/7] toolchain: bump 2.6.35 kernel headers to 2.6.35.12 Gustavo Zacarias
@ 2011-04-21 9:56 ` Peter Korsgaard
0 siblings, 0 replies; 14+ messages in thread
From: Peter Korsgaard @ 2011-04-21 9:56 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> toolchain/kernel-headers/Config.in | 2 +-
Gustavo> ...-types-for-headers-exported-to-user-space.patch | 59 --------------------
Gustavo> ...-types-for-headers-exported-to-user-space.patch | 59 ++++++++++++++++++++
Gustavo> 3 files changed, 60 insertions(+), 60 deletions(-)
Gustavo> delete mode 100644 toolchain/kernel-headers/linux-2.6.35.11-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
Gustavo> create mode 100644 toolchain/kernel-headers/linux-2.6.35.12-scsi-use-__uX-types-for-headers-exported-to-user-space.patch
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH 1/7] alsa-utils: make /var/lib/alsa directory in target
2011-04-20 17:41 [Buildroot] [PATCH 1/7] alsa-utils: make /var/lib/alsa directory in target Gustavo Zacarias
` (5 preceding siblings ...)
2011-04-20 17:41 ` [Buildroot] [PATCH 7/7] toolchain: bump 2.6.35 kernel headers to 2.6.35.12 Gustavo Zacarias
@ 2011-05-03 19:49 ` Peter Korsgaard
6 siblings, 0 replies; 14+ messages in thread
From: Peter Korsgaard @ 2011-05-03 19:49 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> alsactl needs /var/lib/alsa to store asound.state when saving mixer
Gustavo> settings so make it in the target.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 14+ messages in thread