[Buildroot] Buildroot 2010.02 "echo foo"

[Buildroot] Buildroot 2010.02 "echo foo"

[Darcy Watkins]

I see "echo foo" in output of make just before it breaks because it
wants to copy mkdosfs from dosfstools before having built the package.

I see the "echo foo" and make dependency commented out in recent patch
and commit wrt dosfstools package (in dosfstools.mk).

 

Was this debug intended to be removed before the release?

 

Regards

 

Darcy

 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100226/4df876b4/attachment-0001.htm>

[Buildroot] Buildroot 2010.02 "echo foo"

[Darcy L. Watkins]

I think this should fix it ....


--- buildroot-2010.02_arm/package/dosfstools/dosfstools.mk.theorig	2010-02-26 06:52:48.000000000 -0800
+++ buildroot-2010.02_arm/package/dosfstools/dosfstools.mk	2010-02-26 11:12:54.000000000 -0800
@@ -32,8 +32,7 @@ $(DOSFSTOOLS_DIR)/.built : $(DOSFSTOOLS_
 	$(STRIPCMD) $(DOSFSTOOLS_DIR)/$(DOSFSLABEL_BINARY)
 	touch $@
 
-$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): # $(DOSFSTOOLS_DIR)/.built
-	echo foo
+$(TARGET_DIR)/$(MKDOSFS_TARGET_BINARY): $(DOSFSTOOLS_DIR)/.built
 	cp -a $(DOSFSTOOLS_DIR)/$(MKDOSFS_BINARY) $@
 	touch -c $@
 

... and don't revert any of the other changes.


On Fri, 2010-02-26 at 11:11 -0800, Darcy Watkins wrote:
> I see ?echo foo? in output of make just before it breaks because it
> wants to copy mkdosfs from dosfstools before having built the package.
> 
> I see the ?echo foo? and make dependency commented out in recent patch
> and commit wrt dosfstools package (in dosfstools.mk).
> 
>  
> 
> Was this debug intended to be removed before the release?

[Buildroot] Buildroot 2010.02 "echo foo"

[Thomas Petazzoni]

On Fri, 26 Feb 2010 11:11:36 -0800
"Darcy Watkins" <DWatkins@tranzeo.com> wrote:

> Was this debug intended to be removed before the release?

This was supposed to be removed even before I submitted the patch.
Considering the number of mistakes I made on patches lately, it looks
like I tried to fix too many problems too quickly before the release.

2010.02 has already been released by Peter. For the moment, we don't do
bug-fix releases (such as 2010.02.1, 2010.02.2, etc.), so the fix is
likely to be integrated only for 2010.05.

Regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] Patch to allow iproute2 without IPv6 requirement

[Darcy L. Watkins]

Hello,

I noticed that when I upgraded from 2009.02 to 2010.02 I lost iproute2
in my config that doesn't use IPv6.  The patch below applies to 2010.02
and should allow the iproute2 to build without IPv6.  It builds OK (and
doesn't appear to misbehave) on my powerpc 405 platform and I am also
building it to try out later today on an ARM11 platform.

Anyone else who wants to test drive it is welcome to do so.

------------

Signed-off-by: Darcy L. Watkins <dwatkins@tranzeo.com>


--- buildroot-2010.02_powerpc/package/iproute2/Config.in.theorig	2010-02-26 06:52:48.000000000 -0800
+++ buildroot-2010.02_powerpc/package/iproute2/Config.in	2010-03-01 11:01:09.000000000 -0800
@@ -1,11 +1,8 @@
 config BR2_PACKAGE_IPROUTE2
 	bool "iproute2"
-	depends on BR2_INET_IPV6
 	help
 	  Kernel routing and traffic control utilities.  Provides things
 	  like ip and tc.
 
 	  http://developer.osdl.org/dev/iproute2/
 
-comment "iproute2 requires a toolchain with IPv6 support"
-	depends on !BR2_INET_IPV6
--- buildroot-2010.02_powerpc/package/iproute2/iproute2.mk.theorig	2010-02-26 06:52:48.000000000 -0800
+++ buildroot-2010.02_powerpc/package/iproute2/iproute2.mk	2010-03-01 10:59:05.000000000 -0800
@@ -11,6 +11,10 @@ IPROUTE2_CAT:=$(BZCAT)
 IPROUTE2_BINARY:=tc/tc
 IPROUTE2_TARGET_BINARY:=sbin/tc
 
+ifeq ($(BR2_INET_IPV6),)
+IPV6_OPT= SUPPRESS_IPV6_SUPPORT=y
+endif
+
 $(DL_DIR)/$(IPROUTE2_SOURCE):
 	$(call DOWNLOAD,$(IPROUTE2_SITE),$(IPROUTE2_SOURCE))
 
@@ -18,6 +22,7 @@ iproute2-source: $(DL_DIR)/$(IPROUTE2_SO
 
 $(IPROUTE2_DIR)/.unpacked: $(DL_DIR)/$(IPROUTE2_SOURCE)
 	$(IPROUTE2_CAT) $(DL_DIR)/$(IPROUTE2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(IPROUTE2_DIR) package/iproute2 iproute2-$(IPROUTE2_VERSION)\*.patch
 	touch $@
 
 $(IPROUTE2_DIR)/.configured: $(IPROUTE2_DIR)/.unpacked
@@ -31,6 +36,7 @@ $(IPROUTE2_DIR)/$(IPROUTE2_BINARY): $(IP
 	$(MAKE) \
 		-C $(IPROUTE2_DIR) \
 		KERNEL_INCLUDE=$(LINUX_SOURCE_DIR)/include \
+		$(IPV6_OPT) \
 		CC=$(TARGET_CC) \
 		AR=$(TARGET_CROSS)ar \
 		NETEM_DIST="" \
--- buildroot-2010.02_powerpc/package/iproute2/iproute2-2.6.28-no-ipv6-option.patch.theorig	1969-12-31 16:00:00.000000000 -0800
+++ buildroot-2010.02_powerpc/package/iproute2/iproute2-2.6.28-no-ipv6-option.patch	2010-03-01 11:02:44.000000000 -0800
@@ -0,0 +1,97 @@
+--- iproute2-2.6.28/ip/Makefile.theorig	2009-01-15 12:25:04.000000000 -0800
++++ iproute2-2.6.28/ip/Makefile	2010-03-01 10:43:53.000000000 -0800
+@@ -1,9 +1,15 @@
+ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o \
+-    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
++    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
+     ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o \
+     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
+     iplink_vlan.o link_veth.o link_gre.o
+ 
++ifneq ($(SUPPRESS_IPV6_SUPPORT),)
++CFLAGS += -DSUPPRESS_IPV6_SUPPORT=1
++else
++IPOBJ += ip6tunnel.o 
++endif
++
+ RTMONOBJ=rtmon.o
+ 
+ ALLOBJ=$(IPOBJ) $(RTMONOBJ)
+--- iproute2-2.6.28/ip/iptunnel.c.theorig	2009-01-15 12:25:04.000000000 -0800
++++ iproute2-2.6.28/ip/iptunnel.c	2010-03-01 10:40:35.000000000 -0800
+@@ -84,6 +84,7 @@ static int parse_args(int argc, char **a
+ 					exit(-1);
+ 				}
+ 				p->iph.protocol = IPPROTO_GRE;
++#ifndef SUPPRESS_IPV6_SUPPORT
+ 			} else if (strcmp(*argv, "sit") == 0 ||
+ 				   strcmp(*argv, "ipv6/ip") == 0) {
+ 				if (p->iph.protocol && p->iph.protocol != IPPROTO_IPV6) {
+@@ -98,6 +99,7 @@ static int parse_args(int argc, char **a
+ 				}
+ 				p->iph.protocol = IPPROTO_IPV6;
+ 				isatap++;
++#endif
+ 			} else {
+ 				fprintf(stderr,"Cannot guess tunnel mode.\n");
+ 				exit(-1);
+@@ -219,12 +221,14 @@ static int parse_args(int argc, char **a
+ 			p->iph.protocol = IPPROTO_GRE;
+ 		else if (memcmp(p->name, "ipip", 4) == 0)
+ 			p->iph.protocol = IPPROTO_IPIP;
++#ifndef SUPPRESS_IPV6_SUPPORT
+ 		else if (memcmp(p->name, "sit", 3) == 0)
+ 			p->iph.protocol = IPPROTO_IPV6;
+ 		else if (memcmp(p->name, "isatap", 6) == 0) {
+ 			p->iph.protocol = IPPROTO_IPV6;
+ 			isatap++;
+ 		}
++#endif
+ 	}
+ 
+ 	if (p->iph.protocol == IPPROTO_IPIP || p->iph.protocol == IPPROTO_IPV6) {
+@@ -281,8 +285,10 @@ static int do_add(int cmd, int argc, cha
+ 		return tnl_add_ioctl(cmd, "tunl0", p.name, &p);
+ 	case IPPROTO_GRE:
+ 		return tnl_add_ioctl(cmd, "gre0", p.name, &p);
++#ifndef SUPPRESS_IPV6_SUPPORT
+ 	case IPPROTO_IPV6:
+ 		return tnl_add_ioctl(cmd, "sit0", p.name, &p);
++#endif
+ 	default:
+ 		fprintf(stderr, "cannot determine tunnel mode (ipip, gre or sit)\n");
+ 		return -1;
+@@ -302,8 +308,10 @@ static int do_del(int argc, char **argv)
+ 		return tnl_del_ioctl("tunl0", p.name, &p);
+ 	case IPPROTO_GRE:
+ 		return tnl_del_ioctl("gre0", p.name, &p);
++#ifndef SUPPRESS_IPV6_SUPPORT
+ 	case IPPROTO_IPV6:
+ 		return tnl_del_ioctl("sit0", p.name, &p);
++#endif
+ 	default:
+ 		return tnl_del_ioctl(p.name, p.name, &p);
+ 	}
+@@ -454,9 +462,11 @@ static int do_show(int argc, char **argv
+ 	case IPPROTO_GRE:
+ 		err = tnl_get_ioctl(p.name[0] ? p.name : "gre0", &p);
+ 		break;
++#ifndef SUPPRESS_IPV6_SUPPORT
+ 	case IPPROTO_IPV6:
+ 		err = tnl_get_ioctl(p.name[0] ? p.name : "sit0", &p);
+ 		break;
++#endif
+ 	default:
+ 		do_tunnels_list(&p);
+ 		return 0;
+@@ -482,8 +492,10 @@ int do_iptunnel(int argc, char **argv)
+ 	 * protocol-independent because of unarranged structure between
+ 	 * IPv4 and IPv6.
+ 	 */
++#ifndef SUPPRESS_IPV6_SUPPORT
+ 	case AF_INET6:
+ 		return do_ip6tunnel(argc, argv);
++#endif
+ 	default:
+ 		fprintf(stderr, "Unsupported family:%d\n", preferred_family);
+ 		exit(-1);


------------




Regards,

Darcy

[Buildroot] Patch to allow iproute2 without IPv6 requirement

[Peter Korsgaard]

>>>>> "Darcy" == Darcy L Watkins <dwatkins@tranzeo.com> writes:

 Darcy> Hello,
 Darcy> I noticed that when I upgraded from 2009.02 to 2010.02 I lost iproute2
 Darcy> in my config that doesn't use IPv6.  The patch below applies to 2010.02
 Darcy> and should allow the iproute2 to build without IPv6.  It builds OK (and
 Darcy> doesn't appear to misbehave) on my powerpc 405 platform and I am also
 Darcy> building it to try out later today on an ARM11 platform.

 Darcy> Anyone else who wants to test drive it is welcome to do so.

Thanks, looks sane. Please submit it to iproute upstream so we don't
need to maintain this in the future.

-- 
Bye, Peter Korsgaard

[Buildroot] Buildroot 2010.02 "echo foo"

[Peter Korsgaard]

>>>>> "Darcy" == Darcy L Watkins <dwatkins@tranzeo.com> writes:

 Darcy> I think this should fix it ....

Thanks, committed.

-- 
Bye, Peter Korsgaard

[Buildroot] Patch to allow iproute2 without IPv6 requirement

[Darcy Watkins]

Hi Peter,

After some second thought, the "IPV6_OPT" variable I used in the patch
part to iproute2.mk should probably have an appropriate prefix prepended
to it to avoid potential for future namespace conflicts in case
something similar happens for another package.

For example use "IPROUTE2_IPV6_OPT" or something similar instead of
"IPV6_OPT".

I've also just submitted the patch to iproute2 code itself upstream.

Regards,

Darcy


-----Original Message-----
From: Peter Korsgaard [mailto:jacmet at gmail.com] On Behalf Of Peter
Korsgaard
Sent: Saturday, March 06, 2010 1:52 PM
To: Darcy Watkins
Cc: buildroot at busybox.net
Subject: Re: Patch to allow iproute2 without IPv6 requirement

>>>>> "Darcy" == Darcy L Watkins <dwatkins@tranzeo.com> writes:

 Darcy> Hello,
 Darcy> I noticed that when I upgraded from 2009.02 to 2010.02 I lost
iproute2
 Darcy> in my config that doesn't use IPv6.  The patch below applies to
2010.02
 Darcy> and should allow the iproute2 to build without IPv6.  It builds
OK (and
 Darcy> doesn't appear to misbehave) on my powerpc 405 platform and I am
also
 Darcy> building it to try out later today on an ARM11 platform.

 Darcy> Anyone else who wants to test drive it is welcome to do so.

Thanks, looks sane. Please submit it to iproute upstream so we don't
need to maintain this in the future.

-- 
Bye, Peter Korsgaard

[Buildroot] Patch to allow iproute2 without IPv6 requirement

[Peter Korsgaard]

>>>>> "Darcy" == Darcy Watkins <DWatkins@tranzeo.com> writes:

 Darcy> Hi Peter,
 Darcy> After some second thought, the "IPV6_OPT" variable I used in the patch
 Darcy> part to iproute2.mk should probably have an appropriate prefix prepended
 Darcy> to it to avoid potential for future namespace conflicts in case
 Darcy> something similar happens for another package.

Yes, I was thinking the same thig.

 Darcy> For example use "IPROUTE2_IPV6_OPT" or something similar instead of
 Darcy> "IPV6_OPT".

 Darcy> I've also just submitted the patch to iproute2 code itself upstream.

Great. Do you have a URL to the mailing list archive and/or bug tracker,
then I'll add that to the patch header.

-- 
Bye, Peter Korsgaard