diff options
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | TODO | 9 | ||||
| -rw-r--r-- | package/busybox/Makefile | 20 | ||||
| -rw-r--r-- | package/parted/Makefile | 2 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 9 | ||||
| -rw-r--r-- | target/Config.in | 36 | ||||
| -rw-r--r-- | target/toolchain-arm/target.mk | 2 | ||||
| -rw-r--r-- | target/toolchain-armel/target.mk | 2 | ||||
| -rw-r--r-- | toolchain/eglibc/Makefile | 4 | ||||
| -rw-r--r-- | toolchain/eglibc/patches/eglibc-cross.patch | 92 |
10 files changed, 142 insertions, 35 deletions
@@ -9,6 +9,7 @@ Before you can start you need to install some tools: - gcc - binutils - GNU make +- GNU m4 - GNU tar - GNU awk - GNU sed @@ -1,9 +1,12 @@ +- check ncurses headers in latest cygwin +- macos x build +- test on OpenSuSE +- test on CentOS +- test on Fedora Core +- help text for config/ needs adoption - fix glibc build for MIPS targets - implement update for MTD devices (ag241) - fix watchdog for alix1c (mfgpt timers problem) -- macos x build - package drbd -- new packages for openais and pacemaker -- continuos build via hudson or sth. like that - implement rpm package backend - implement dpkg package backend diff --git a/package/busybox/Makefile b/package/busybox/Makefile index ab50a5aec..400be01e6 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.15.2 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 495e320537f0772125f2db3c098e437c PKG_DESCR:= Core utilities for embedded Linux systems PKG_SECTION:= base @@ -16,9 +16,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual ${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \ @@ -32,31 +32,31 @@ do-configure: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config ifeq ($(ADK_NATIVE),y) yes '' | \ $(MAKE) V=1 \ - IPKG_ARCH="$(ARCH)" \ + IPKG_ARCH="$(CPU_ARCH)" \ ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE) else yes '' | \ $(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(ARCH)" \ + EXTRA_CFLAGS="$(TARGET_CFLAGS)" IPKG_ARCH="$(CPU_ARCH)" \ ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) oldconfig $(MAKE_TRACE) endif do-build: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ - IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox + IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox else $(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ - IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox + IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) busybox endif do-install: $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config ifeq ($(ADK_NATIVE),y) $(MAKE) V=1 \ - IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) + IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) else $(MAKE) V=1 CROSS_COMPILE="$(TARGET_CROSS)" \ - IPKG_ARCH="$(ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) + IPKG_ARCH="$(CPU_ARCH)" ARCH="$(ARCH)" HOSTCC="$(HOSTCC)" -C $(WRKBUILD) install $(MAKE_TRACE) endif $(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/ ifeq ($(ADK_DEBUG),y) diff --git a/package/parted/Makefile b/package/parted/Makefile index 03df2e270..b54746dda 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 055305bc7bcf472ce38f9abf69a9d94d PKG_DESCR:= GNU parted PKG_SECTION:= admin -PKG_DEPENDS:= libuuid libreadline device-mapper libpthread +PKG_DEPENDS:= libuuid libreadline libdevmapper libpthread PKG_BUILDDEP+= e2fsprogs lvm readline PKG_URL:= http://www.gnu.org/software/parted/index.shtml PKG_SITES:= ${MASTER_SITE_GNU:=parted/} diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index bcd1e186a..89e368d8b 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -45,7 +45,8 @@ MirBSD) CYG*) echo "Building OpenADK on $os needs a small registry change." echo 'http://cygwin.com/cygwin-ug-net/using-specialnames.html' - sleep 5 + echo "You can ignore this message, when you already done the change" + sleep 3 ;; NetBSD) # supported with no extra quirks at the moment @@ -227,6 +228,12 @@ if ! which perl >/dev/null 2>&1; then out=1 fi +if ! which m4 >/dev/null 2>&1; then + echo "You must install m4 (macro processor) to continue." + echo + out=1 +fi + cd $topdir rm -rf tmp diff --git a/target/Config.in b/target/Config.in index f8e483311..1aa5826c2 100644 --- a/target/Config.in +++ b/target/Config.in @@ -478,24 +478,24 @@ config ADK_LINUX_X86_64_TOOLCHAIN endchoice -choice -prompt "Target Optimization" -depends on ADK_LINUX_ARMEL_TOOLCHAIN || ADK_LINUX_ARM_TOOLCHAIN - -config ADK_LINUX_ARM_V5TE - bool "armv5te" - help - -config ADK_LINUX_ARM_V4T - bool "armv4t" - help - -endchoice +#choice +#prompt "Target Optimization" +#depends on ADK_LINUX_ARMEL_TOOLCHAIN || ADK_LINUX_ARM_TOOLCHAIN +# +#config ADK_LINUX_ARM_V5TE +# bool "armv5te" +# help +# +#config ADK_LINUX_ARM_V4T +# bool "armv4t" +# help +# +#endchoice -config ADK_TARGET_ARCH_OPTIMIZATION - string - default "armv5te" if ADK_LINUX_ARM_V5TE - default "armv4t" if ADK_LINUX_ARM_V4T +#config ADK_TARGET_ARCH_OPTIMIZATION +# string +# default "armv5te" if ADK_LINUX_ARM_V5TE +# default "armv4t" if ADK_LINUX_ARM_V4T choice prompt "Architecture" @@ -975,7 +975,7 @@ endchoice choice prompt "Compression method for Kernel" - depends on !(ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK) + depends on !(ADK_TARGET_ROOTFS_INITRAMFS || ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK || ADK_TOOLCHAIN_ONLY) config ADK_TARGET_KERNEL_COMPRESSION_GZIP boolean diff --git a/target/toolchain-arm/target.mk b/target/toolchain-arm/target.mk index 9037d7ac4..64327fb30 100644 --- a/target/toolchain-arm/target.mk +++ b/target/toolchain-arm/target.mk @@ -1,5 +1,5 @@ ARCH:= arm -CPU_ARCH:= armeb +CPU_ARCH:= arm KERNEL_VERSION:= 2.6.33 KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= c3883760b18d50e8d78819c54d579b00 diff --git a/target/toolchain-armel/target.mk b/target/toolchain-armel/target.mk index 64327fb30..c1d2d8136 100644 --- a/target/toolchain-armel/target.mk +++ b/target/toolchain-armel/target.mk @@ -1,5 +1,5 @@ ARCH:= arm -CPU_ARCH:= arm +CPU_ARCH:= armel KERNEL_VERSION:= 2.6.33 KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= c3883760b18d50e8d78819c54d579b00 diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index f52cf0717..863cd88ba 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -7,6 +7,10 @@ include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk +ifneq ($(ADK_DEBUG),) +TARGET_CFLAGS+= -O2 +endif + EGLIBC_CONFOPTS:= \ --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ diff --git a/toolchain/eglibc/patches/eglibc-cross.patch b/toolchain/eglibc/patches/eglibc-cross.patch new file mode 100644 index 000000000..e2cc86c2e --- /dev/null +++ b/toolchain/eglibc/patches/eglibc-cross.patch @@ -0,0 +1,92 @@ +diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc/types.h eglibc-2.11.1/libc/sunrpc/rpc/types.h +--- eglibc-2.11.1.orig/libc/sunrpc/rpc/types.h 2010-02-24 08:09:59.000000000 +0100 ++++ eglibc-2.11.1/libc/sunrpc/rpc/types.h 2010-03-22 18:30:14.944408497 +0100 +@@ -68,6 +68,7 @@ + #include <sys/types.h> + #endif + ++#if !defined(_CROSS_RPCGEN_) + #ifndef __u_char_defined + typedef __u_char u_char; + typedef __u_short u_short; +@@ -83,6 +84,7 @@ + typedef __caddr_t caddr_t; + # define __daddr_t_defined + #endif ++#endif + + #include <sys/time.h> + #include <sys/param.h> +diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_clntout.c eglibc-2.11.1/libc/sunrpc/rpc_clntout.c +--- eglibc-2.11.1.orig/libc/sunrpc/rpc_clntout.c 2010-02-24 08:10:01.000000000 +0100 ++++ eglibc-2.11.1/libc/sunrpc/rpc_clntout.c 2010-03-22 18:30:38.973160151 +0100 +@@ -31,7 +31,7 @@ + */ + #include <stdio.h> + #include <string.h> +-#include <rpc/types.h> ++#include "rpc/types.h" + #include "rpc_parse.h" + #include "rpc_util.h" + #include "proto.h" +diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c eglibc-2.11.1/libc/sunrpc/rpc_main.c +--- eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c 2010-02-24 08:10:00.000000000 +0100 ++++ eglibc-2.11.1/libc/sunrpc/rpc_main.c 2010-03-22 18:31:31.245661003 +0100 +@@ -37,7 +37,11 @@ + #include <stdio.h> + #include <string.h> + #include <unistd.h> ++#ifdef _CROSS_RPCGEN_ ++#define gettext(X) (X) ++#else + #include <libintl.h> ++#endif + #include <ctype.h> + #include <sys/types.h> + #include <sys/param.h> +diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_scan.c eglibc-2.11.1/libc/sunrpc/rpc_scan.c +--- eglibc-2.11.1.orig/libc/sunrpc/rpc_scan.c 2010-02-24 08:10:00.000000000 +0100 ++++ eglibc-2.11.1/libc/sunrpc/rpc_scan.c 2010-03-22 18:31:16.146907097 +0100 +@@ -36,7 +36,11 @@ + #include <stdio.h> + #include <ctype.h> + #include <string.h> ++#ifdef _CROSS_RPCGEN_ ++#define gettext(X) (X) ++#else + #include <libintl.h> ++#endif + #include "rpc_scan.h" + #include "rpc_parse.h" + #include "rpc_util.h" +diff -Nur eglibc-2.11.1.orig/libc/timezone/Makefile eglibc-2.11.1/libc/timezone/Makefile +--- eglibc-2.11.1.orig/libc/timezone/Makefile 2010-02-24 08:09:02.000000000 +0100 ++++ eglibc-2.11.1/libc/timezone/Makefile 2010-03-22 18:50:04.134408513 +0100 +@@ -69,10 +69,11 @@ + $(addprefix $(inst_zonedir)/, \ + $(posixrules-file))) + +-install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \ +- $(zonenames:%=posix/%) \ +- $(zonenames:%=right/%)) \ +- $(installed-localtime-file) $(installed-posixrules-file) ++install-others = ++#install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \ ++# $(zonenames:%=posix/%) \ ++# $(zonenames:%=right/%)) \ ++# $(installed-localtime-file) $(installed-posixrules-file) + + ifeq ($(have-ksh),yes) + install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab +@@ -181,8 +182,9 @@ + $(objpfx)zic: $(addprefix $(objpfx), $(zic-objs)) + + $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c +- gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \ +- -DCROSS_ZIC $(compile-mkdep-flags) ++ gcc $< -c $(OUTPUT_OPTION) \ ++ $(filter-out -DHAVE_GETTEXT,$(CFLAGS-$*.c)) \ ++ $(CPPFLAGS-$*) -DCROSS_ZIC $(compile-mkdep-flags) + + $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs)) + gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@ |