changeset 603:524215827ef8

Fix toybox to build on a non-x86_64 host (the packaging script was leaving a prebuilt kconfig/conf binary in the tarball) and update to the latest busybox dot release while we're at it.
author Rob Landley <rob@landley.net>
date Thu, 29 Jan 2009 15:55:25 -0600
parents 8de4598dfe46
children 7fc1f4695c29
files download.sh sources/patches/busybox-1.13.1-2.6.28.patch
diffstat 2 files changed, 4 insertions(+), 81 deletions(-) [+]
line wrap: on
line diff
--- a/download.sh	Thu Jan 29 15:13:47 2009 -0600
+++ b/download.sh	Thu Jan 29 15:55:25 2009 -0600
@@ -47,14 +47,14 @@
 SHA1=e29c6e151050f8b5ac5d680b99483df522606143 \
 download || dienow
 
-URL=http://impactlinux.com/code/toybox/downloads/toybox-0.0.8.tar.bz2 \
-SHA1=f2797805c42d70b6e1184ab679bfdee49e26ad2b \
+URL=http://impactlinux.com/code/toybox/downloads/toybox-0.0.9.tar.bz2 \
+SHA1=a3aed07694149c6582a78cf6de4dfcff0383c9d5 \
 download || dienow
 
 # Required for native build environment
 
-URL=http://www.busybox.net/downloads/busybox-1.13.1.tar.bz2 \
-SHA1=9380c7ab81013b7b242daf02696c0aa1fec74b28 \
+URL=http://www.busybox.net/downloads/busybox-1.13.2.tar.bz2 \
+SHA1=6659d92b0056971e0faab254fdcbc7fcce872e9e \
 UNSTABLE=http://busybox.net/downloads/busybox-snapshot.tar.bz2 \
 download || dienow
 
--- a/sources/patches/busybox-1.13.1-2.6.28.patch	Thu Jan 29 15:13:47 2009 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
- ------------------------------------------------------------------------
-r24253 | vda | 2008-12-03 14:16:11 -0600 (Wed, 03 Dec 2008) | 4 lines
-Changed paths:
-   M /trunk/busybox/networking/libiproute/iptunnel.c
-
-iptunnel: fix problems with including linux/ip_tunnel.h
- on some systems
-
-
- ------------------------------------------------------------------------
-Index: networking/libiproute/iptunnel.c
-===================================================================
---- a/networking/libiproute/iptunnel.c	(revision 24252)
-+++ b/networking/libiproute/iptunnel.c	(revision 24253)
-@@ -6,7 +6,6 @@
-  *
-  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-  *
-- *
-  * Changes:
-  *
-  * Rani Assaf <rani@magic.metawire.com> 980929:	resolve addresses
-@@ -18,11 +17,53 @@
- #include <net/if.h>
- #include <net/if_arp.h>
- #include <asm/types.h>
-+
- #ifndef __constant_htons
- #define __constant_htons htons
- #endif
--#include <linux/if_tunnel.h>
- 
-+// FYI: #define SIOCDEVPRIVATE 0x89F0
-+
-+/* From linux/if_tunnel.h. #including it proved troublesome
-+ * (redefiniton errors due to name collisions in linux/ and net[inet]/) */
-+#define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
-+#define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
-+#define SIOCDELTUNNEL   (SIOCDEVPRIVATE + 2)
-+#define SIOCCHGTUNNEL   (SIOCDEVPRIVATE + 3)
-+//#define SIOCGETPRL      (SIOCDEVPRIVATE + 4)
-+//#define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
-+//#define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
-+//#define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
-+#define GRE_CSUM        __constant_htons(0x8000)
-+//#define GRE_ROUTING     __constant_htons(0x4000)
-+#define GRE_KEY         __constant_htons(0x2000)
-+#define GRE_SEQ         __constant_htons(0x1000)
-+//#define GRE_STRICT      __constant_htons(0x0800)
-+//#define GRE_REC         __constant_htons(0x0700)
-+//#define GRE_FLAGS       __constant_htons(0x00F8)
-+//#define GRE_VERSION     __constant_htons(0x0007)
-+struct ip_tunnel_parm {
-+	char            name[IFNAMSIZ];
-+	int             link;
-+	uint16_t        i_flags;
-+	uint16_t        o_flags;
-+	uint32_t        i_key;
-+	uint32_t        o_key;
-+	struct iphdr    iph;
-+};
-+/* SIT-mode i_flags */
-+//#define SIT_ISATAP 0x0001
-+//struct ip_tunnel_prl {
-+//	uint32_t          addr;
-+//	uint16_t          flags;
-+//	uint16_t          __reserved;
-+//	uint32_t          datalen;
-+//	uint32_t          __reserved2;
-+//	/* data follows */
-+//};
-+///* PRL flags */
-+//#define PRL_DEFAULT 0x0001
-+
- #include "ip_common.h"  /* #include "libbb.h" is inside */
- #include "rt_names.h"
- #include "utils.h"