diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | package/Makefile.in | 5 | ||||
| -rw-r--r-- | package/bison/bison.mk | 2 | ||||
| -rwxr-xr-x | package/bison/yacc (renamed from sources/yacc) | 0 | ||||
| -rw-r--r-- | package/boa/boa-config.site-i386 (renamed from sources/boa-config.site-i386) | 0 | ||||
| -rw-r--r-- | package/boa/boa.conf (renamed from sources/boa.conf) | 2 | ||||
| -rw-r--r-- | package/boa/boa.mk | 8 | ||||
| -rw-r--r-- | package/boa/mime.types (renamed from sources/mime.types) | 0 | ||||
| -rw-r--r-- | package/bridge/bridge.mk | 4 | ||||
| -rw-r--r-- | package/bridge/bridge.patch (renamed from sources/bridge.patch) | 0 | ||||
| -rw-r--r-- | package/busybox/busybox.mk | 2 | ||||
| -rw-r--r-- | package/customize/customize.mk | 5 | ||||
| -rw-r--r-- | package/dnsmasq/dnsmasq.mk | 2 | ||||
| -rw-r--r-- | package/dnsmasq/dnsmasq1-100-bugfix.patch (renamed from sources/dnsmasq1-100-bugfix.patch) | 0 | ||||
| -rw-r--r-- | package/dnsmasq/dnsmasq2-100-config.patch (renamed from sources/dnsmasq2-100-config.patch) | 0 | ||||
| -rw-r--r-- | package/dropbear_sshd/dropbear-init.patch (renamed from sources/dropbear-init.patch) | 0 | ||||
| -rw-r--r-- | package/dropbear_sshd/dropbear_sshd.mk | 2 | ||||
| -rw-r--r-- | package/ed/ed.mk | 2 | ||||
| -rw-r--r-- | package/file/file.mk | 2 | ||||
| -rw-r--r-- | package/file/file.patch (renamed from sources/file.patch) | 0 | ||||
| -rw-r--r-- | package/flex/flex.mk | 2 | ||||
| -rw-r--r-- | package/hotplug/hotplug.mk | 5 | ||||
| -rw-r--r-- | package/hotplug/hotplug.patch | 33 | ||||
| -rw-r--r-- | package/iptables/iptables.mk | 2 | ||||
| -rw-r--r-- | package/libfloat/libfloat.mk | 4 | ||||
| -rw-r--r-- | package/libfloat/libfloat.patch (renamed from sources/libfloat.patch) | 0 | ||||
| -rw-r--r-- | package/libglib12/libglib12.mk | 4 | ||||
| -rw-r--r-- | package/libglib12/libglib_configure_1.2.10.bz2 (renamed from sources/libglib_configure_1.2.10.bz2) | bin | 8884 -> 8884 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/006-ieee1394-hotplug.bz2 (renamed from sources/kernel-patches/006-ieee1394-hotplug.bz2) | bin | 339 -> 339 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/007-scsi_add_remove_single.bz2 (renamed from sources/kernel-patches/007-scsi_add_remove_single.bz2) | bin | 2990 -> 2990 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/008-ieee1394-fix.bz2 (renamed from sources/kernel-patches/008-ieee1394-fix.bz2) | bin | 390 -> 390 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/009-always-inline.bz2 (renamed from sources/kernel-patches/009-always-inline.bz2) | bin | 468 -> 468 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/010-optimize-for-size.bz2 (renamed from sources/kernel-patches/010-optimize-for-size.bz2) | bin | 1186 -> 1186 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/012-x86-check_gcc.bz2 (renamed from sources/kernel-patches/012-x86-check_gcc.bz2) | bin | 329 -> 329 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/017-printk.bz2 (renamed from sources/kernel-patches/017-printk.bz2) | bin | 336 -> 336 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/018-slab-loop-init.bz2 (renamed from sources/kernel-patches/018-slab-loop-init.bz2) | bin | 268 -> 268 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/041-changeloop.patch.bz2 (renamed from sources/kernel-patches/041-changeloop.patch.bz2) | bin | 2783 -> 2783 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/042-loopfixes.patch.bz2 (renamed from sources/kernel-patches/042-loopfixes.patch.bz2) | bin | 640 -> 640 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/044-streaming_io.bz2 (renamed from sources/kernel-patches/044-streaming_io.bz2) | bin | 1743 -> 1743 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/062-silence-blk-queue.bz2 (renamed from sources/kernel-patches/062-silence-blk-queue.bz2) | bin | 382 -> 382 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/063-silence.kbd.patch.bz2 (renamed from sources/kernel-patches/063-silence.kbd.patch.bz2) | bin | 506 -> 506 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/064-shutup-md.bz2 (renamed from sources/kernel-patches/064-shutup-md.bz2) | bin | 501 -> 501 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/077-orinoco-0.13e.bz2 (renamed from sources/kernel-patches/077-orinoco-0.13e.bz2) | bin | 7472 -> 7472 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/078-hostap.bz2 (renamed from sources/kernel-patches/078-hostap.bz2) | bin | 90852 -> 90852 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/079-jiffies64.bz2 (renamed from sources/kernel-patches/079-jiffies64.bz2) | bin | 5066 -> 5066 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/089-no-touch-makedep.bz2 (renamed from sources/kernel-patches/089-no-touch-makedep.bz2) | bin | 858 -> 858 bytes | |||
| -rw-r--r-- | package/linux/kernel-patches/100_VERSION.bz2 (renamed from sources/kernel-patches/100_VERSION.bz2) | bin | 227 -> 227 bytes | |||
| -rw-r--r-- | package/linux/linux.config (renamed from sources/linux.config) | 0 | ||||
| -rw-r--r-- | package/linux/linux.mk | 6 | ||||
| -rw-r--r-- | package/ltp-testsuite/ltp-testsuite.mk | 3 | ||||
| -rw-r--r-- | package/ltp-testsuite/ltp-testsuite.patch (renamed from sources/ltp-testsuite.patch) | 0 | ||||
| -rw-r--r-- | package/lzo/lzo-cross-compile.patch (renamed from sources/lzo-cross-compile.patch) | 0 | ||||
| -rw-r--r-- | package/lzo/lzo.mk | 3 | ||||
| -rw-r--r-- | package/mrouted/mrouted-sys_errlist.patch (renamed from sources/mrouted-sys_errlist.patch) | 0 | ||||
| -rw-r--r-- | package/mrouted/mrouted.mk | 3 | ||||
| -rw-r--r-- | package/ncurses/ncurses-100-hostccflags.patch (renamed from sources/ncurses-100-hostccflags.patch) | 0 | ||||
| -rw-r--r-- | package/ncurses/ncurses.mk | 4 | ||||
| -rw-r--r-- | package/netkittelnet/netkittelnet.mk | 3 | ||||
| -rw-r--r-- | package/netkittelnet/netkittelnet.patch (renamed from sources/netkittelnet.patch) | 0 | ||||
| -rw-r--r-- | package/netsnmp/netsnmp.mk | 3 | ||||
| -rw-r--r-- | package/netsnmp/netsnmp.patch (renamed from sources/netsnmp.patch) | 0 | ||||
| -rw-r--r-- | package/openssh/openssh.mk | 5 | ||||
| -rw-r--r-- | package/openssh/openssh.patch (renamed from sources/openssh.patch) | 0 | ||||
| -rw-r--r-- | package/openssl/openssl.mk | 5 | ||||
| -rw-r--r-- | package/openssl/openssl.patch (renamed from sources/openssl.patch) | 0 | ||||
| -rwxr-xr-x | package/openvpn/openvpn.init (renamed from sources/openvpn) | 0 | ||||
| -rw-r--r-- | package/openvpn/openvpn.mk | 4 | ||||
| -rw-r--r-- | package/pciutils/pciutils.mk | 2 | ||||
| -rw-r--r-- | package/pciutils/pciutils.patch (renamed from sources/pciutils.patch) | 0 | ||||
| -rw-r--r-- | package/pcmcia/pcmcia.mk | 3 | ||||
| -rw-r--r-- | package/pcmcia/pcmcia.patch (renamed from sources/pcmcia.patch) | 0 | ||||
| -rw-r--r-- | package/python/python-cross-compile.patch (renamed from sources/python-cross-compile.patch) | 0 | ||||
| -rw-r--r-- | package/python/python.mk | 2 | ||||
| -rw-r--r-- | package/rxvt/rxvt.mk | 3 | ||||
| -rw-r--r-- | package/sed/sed.mk | 87 | ||||
| -rwxr-xr-x | package/sed/sedcheck.sh (renamed from sources/sedcheck.sh) | 0 | ||||
| -rw-r--r-- | package/tinyx/tinyx-011010.patch (renamed from sources/tinyx-011010.patch) | 0 | ||||
| -rw-r--r-- | package/tinyx/tinyx.mk | 3 | ||||
| -rw-r--r-- | package/util-linux/util-linux.mk | 2 | ||||
| -rw-r--r-- | package/util-linux/util-linux.patch (renamed from sources/util-linux.patch) | 0 | ||||
| -rw-r--r-- | package/valgrind/valgrind.mk | 3 | ||||
| -rw-r--r-- | package/valgrind/valgrind.patch (renamed from sources/valgrind.patch) | 0 | ||||
| -rw-r--r-- | package/vtun/vtun.mk | 3 | ||||
| -rw-r--r-- | package/vtun/vtun.patch (renamed from sources/vtun.patch) | 0 | ||||
| -rw-r--r-- | sources/perl-cross-0.1.tar.gz | bin | 11872 -> 0 bytes | |||
| -rw-r--r-- | sources/perl.patch | 996 | ||||
| -rw-r--r-- | target/Config.in | 8 | ||||
| -rw-r--r-- | target/Makefile.in | 1 | ||||
| -rw-r--r-- | target/cramfs/Config.in | 6 | ||||
| -rw-r--r-- | target/cramfs/Makefile.in | 3 | ||||
| -rw-r--r-- | target/cramfs/cramfs.mk (renamed from package/cramfsroot/cramfsroot.mk) | 0 | ||||
| -rw-r--r-- | target/cramfs/cramfs.patch (renamed from sources/cramfs.patch) | 0 | ||||
| -rw-r--r-- | target/default/device_table.txt (renamed from sources/device_table.txt) | 0 | ||||
| -rw-r--r-- | target/default/skel.tar.gz (renamed from sources/skel.tar.gz) | bin | 4846 -> 4846 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/etc/TZ (renamed from sources/target_skeleton/etc/TZ) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/fstab (renamed from sources/target_skeleton/etc/fstab) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/group (renamed from sources/target_skeleton/etc/group) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/hostname (renamed from sources/target_skeleton/etc/hostname) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/hosts (renamed from sources/target_skeleton/etc/hosts) | 0 | ||||
| -rwxr-xr-x | target/default/target_skeleton/etc/init.d/S20urandom (renamed from sources/target_skeleton/etc/init.d/S20urandom) | 0 | ||||
| -rwxr-xr-x | target/default/target_skeleton/etc/init.d/S40network (renamed from sources/target_skeleton/etc/init.d/S40network) | 0 | ||||
| -rwxr-xr-x | target/default/target_skeleton/etc/init.d/rcS (renamed from sources/target_skeleton/etc/init.d/rcS) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/inittab (renamed from sources/target_skeleton/etc/inittab) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/inputrc (renamed from sources/target_skeleton/etc/inputrc) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/issue (renamed from sources/target_skeleton/etc/issue) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/network/interfaces (renamed from sources/target_skeleton/etc/network/interfaces) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/passwd (renamed from sources/target_skeleton/etc/passwd) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/profile (renamed from sources/target_skeleton/etc/profile) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/protocols (renamed from sources/target_skeleton/etc/protocols) | 2 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/random-seed (renamed from sources/target_skeleton/etc/random-seed) | bin | 512 -> 512 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/etc/resolv.conf (renamed from sources/target_skeleton/etc/resolv.conf) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/securetty (renamed from sources/target_skeleton/etc/securetty) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/services (renamed from sources/target_skeleton/etc/services) | 2 | ||||
| -rw-r--r-- | target/default/target_skeleton/etc/shadow (renamed from sources/target_skeleton/etc/shadow) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/root/.bash_history (renamed from sources/target_skeleton/root/.bash_history) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/root/.bash_logout (renamed from sources/target_skeleton/root/.bash_logout) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/root/.bash_profile (renamed from sources/target_skeleton/root/.bash_profile) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/root/.bashrc (renamed from sources/target_skeleton/root/.bashrc) | 0 | ||||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/a/ansi (renamed from sources/target_skeleton/usr/share/terminfo/a/ansi) | bin | 1450 -> 1450 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/d/dumb (renamed from sources/target_skeleton/usr/share/terminfo/d/dumb) | bin | 308 -> 308 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/l/linux (renamed from sources/target_skeleton/usr/share/terminfo/l/linux) | bin | 1552 -> 1552 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/r/rxvt (renamed from sources/target_skeleton/usr/share/terminfo/r/rxvt) | bin | 1627 -> 1627 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/s/screen (renamed from sources/target_skeleton/usr/share/terminfo/s/screen) | bin | 1318 -> 1318 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/s/screen-w (renamed from sources/target_skeleton/usr/share/terminfo/s/screen-w) | bin | 1334 -> 1334 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/s/sun (renamed from sources/target_skeleton/usr/share/terminfo/s/sun) | bin | 1019 -> 1019 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/v/vt100 (renamed from sources/target_skeleton/usr/share/terminfo/v/vt100) | bin | 1143 -> 1143 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/v/vt220 (renamed from sources/target_skeleton/usr/share/terminfo/v/vt220) | bin | 975 -> 975 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/v/vt52 (renamed from sources/target_skeleton/usr/share/terminfo/v/vt52) | bin | 462 -> 462 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/x/xterm (renamed from sources/target_skeleton/usr/share/terminfo/x/xterm) | bin | 1366 -> 1366 bytes | |||
| -rw-r--r-- | target/default/target_skeleton/usr/share/terminfo/x/xterm-xfree86 (renamed from sources/target_skeleton/usr/share/terminfo/x/xterm-xfree86) | bin | 1840 -> 1840 bytes | |||
| -rwxr-xr-x | target/default/target_skeleton/usr/share/udhcpc/default.script (renamed from sources/target_skeleton/usr/share/udhcpc/default.script) | 0 | ||||
| -rw-r--r-- | target/ext2/ext2root.mk (renamed from package/ext2root/ext2root.mk) | 0 | ||||
| -rw-r--r-- | target/ext2/genext2fs.patch (renamed from sources/genext2fs.patch) | 0 | ||||
| -rw-r--r-- | target/jffs2/jffs2root.mk (renamed from package/jffs2root/jffs2root.mk) | 0 | ||||
| -rw-r--r-- | target/squashfs/squashfs.patch (renamed from sources/squashfs.patch) | 0 | ||||
| -rw-r--r-- | target/squashfs/squashfsroot.mk (renamed from package/squashfsroot/squashfsroot.mk) | 0 | ||||
| -rw-r--r-- | toolchain/binutils/binutils.mk | 2 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-2.95.mk | 2 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-3.x.mk | 8 | ||||
| -rw-r--r-- | toolchain/gdb/gdb.mk | 2 | ||||
| -rw-r--r-- | toolchain/kernel-headers/kernel-headers.mk | 2 | ||||
| -rw-r--r-- | toolchain/kernel-headers/linux-libc-headers-2.6.8-cleanup.patch (renamed from sources/linux-libc-headers-2.6.8-cleanup.patch) | 0 | ||||
| -rwxr-xr-x | toolchain/patch-kernel.sh (renamed from sources/patch-kernel.sh) | 0 |
144 files changed, 182 insertions, 1089 deletions
diff --git a/.cvsignore b/.cvsignore index 08611a0d4d..e834fd6c36 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -UMlinux +.config* root_fs* build_* toolchain_build_* @@ -48,6 +48,8 @@ include toolchain/Makefile.in include toolchain/*/Makefile.in include package/Makefile.in include package/*/Makefile.in +include target/Makefile.in +include target/*/Makefile.in ############################################################# # diff --git a/package/Makefile.in b/package/Makefile.in index fa320393dd..ddb3d82a98 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -11,9 +11,8 @@ TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) HOSTCC:=gcc BASE_DIR:=${shell pwd} -SOURCE_DIR:=$(BASE_DIR)/sources -DL_DIR:=$(SOURCE_DIR)/dl -PATCH_DIR=$(SOURCE_DIR)/patches +DL_DIR:=$(BASE_DIR)/sources/dl +PATCH_DIR=$(BASE_DIR)/sources/patches BUILD_DIR:=$(BASE_DIR)/build_$(ARCH)$(ARCH_FPU_SUFFIX) TARGET_DIR:=$(BUILD_DIR)/root STAGING_DIR=$(BUILD_DIR)/staging_dir diff --git a/package/bison/bison.mk b/package/bison/bison.mk index 89c9b916cc..7481b76884 100644 --- a/package/bison/bison.mk +++ b/package/bison/bison.mk @@ -49,7 +49,7 @@ $(TARGET_DIR)/$(BISON_TARGET_BINARY): $(BISON_DIR)/$(BISON_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) install rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc - cp -a $(SOURCE_DIR)/yacc $(TARGET_DIR)/usr/bin/yacc + cp -a package/bison/yacc $(TARGET_DIR)/usr/bin/yacc bison: uclibc $(TARGET_DIR)/$(BISON_TARGET_BINARY) diff --git a/sources/yacc b/package/bison/yacc index aed120e88a..aed120e88a 100755 --- a/sources/yacc +++ b/package/bison/yacc diff --git a/sources/boa-config.site-i386 b/package/boa/boa-config.site-i386 index 425d948c41..425d948c41 100644 --- a/sources/boa-config.site-i386 +++ b/package/boa/boa-config.site-i386 diff --git a/sources/boa.conf b/package/boa/boa.conf index ccb9563318..f51c237316 100644 --- a/sources/boa.conf +++ b/package/boa/boa.conf @@ -10,7 +10,7 @@ # these directives mimic those of NCSA httpd 1.3; I saw no reason to # introduce gratuitous differences. -# $Id: boa.conf,v 1.1 2001/12/22 00:56:12 andersen Exp $ +# $Id: boa.conf,v 1.1 2004/10/09 02:48:37 andersen Exp $ # The "ServerRoot" is not in this configuration file. It can be compiled # into the server (see defines.h) or specified on the command line with diff --git a/package/boa/boa.mk b/package/boa/boa.mk index 1eb233fbc6..07f29f441b 100644 --- a/package/boa/boa.mk +++ b/package/boa/boa.mk @@ -24,10 +24,10 @@ $(BOA_DIR)/.unpacked: $(DL_DIR)/$(BOA_SOURCE) $(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked rm -f $(BOA_WORKDIR)/Makefile mkdir -p $(BOA_WORKDIR) - (cd $(BOA_WORKDIR) && CONFIG_SITE=$(SOURCE_DIR)/boa-config.site-$(ARCH) \ + (cd $(BOA_WORKDIR) && CONFIG_SITE=package/boa/boa-config.site-$(ARCH) \ CC=$(TARGET_CC) $(BOA_DIR)/configure) touch $(BOA_WORKDIR)/.depend - + $(BOA_WORKDIR)/boa $(BOA_WORKDIR)/boa_indexer: $(BOA_WORKDIR)/Makefile rm -f $@ $(MAKE) VPATH=$(BOA_DIR)/src/ -C $(BOA_WORKDIR) @@ -38,8 +38,8 @@ $(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/boa $(BOA_WORKDIR)/boa_indexer mkdir -p $(TARGET_DIR)/usr/lib/boa cp -f $(BOA_WORKDIR)/src/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer mkdir -p $(TARGET_DIR)/etc/boa - cp -f $(SOURCE_DIR)/boa.conf $(TARGET_DIR)/etc/boa - cp -f $(SOURCE_DIR)/mime.types $(TARGET_DIR)/etc/mime.types + cp -f package/boa/boa.conf $(TARGET_DIR)/etc/boa + cp -f package/boa/mime.types $(TARGET_DIR)/etc/mime.types strip --strip-all $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer touch $(BOA_WORKDIR)/.installed diff --git a/sources/mime.types b/package/boa/mime.types index 53f6ea1011..53f6ea1011 100644 --- a/sources/mime.types +++ b/package/boa/mime.types diff --git a/package/bridge/bridge.mk b/package/bridge/bridge.mk index 46b78b0e87..64703fa3a7 100644 --- a/package/bridge/bridge.mk +++ b/package/bridge/bridge.mk @@ -10,11 +10,11 @@ BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-1.0.4 BRIDGE_TARGET_BINARY:=usr/sbin/brctl $(DL_DIR)/$(BRIDGE_SOURCE): - $(WGET) -P $(DL_DIR) $(BRIDGE_SOURCE_URL)/$(BRIDGE_SOURCE) + $(WGET) -P $(DL_DIR) $(BRIDGE_SOURCE_URL)/$(BRIDGE_SOURCE) $(BRIDGE_BUILD_DIR)/.unpacked: $(DL_DIR)/$(BRIDGE_SOURCE) zcat $(DL_DIR)/$(BRIDGE_SOURCE) | tar -C $(BUILD_DIR) -xvf - - patch -p1 -d $(BRIDGE_BUILD_DIR) < $(SOURCE_DIR)/bridge.patch + patch -p1 -d $(BRIDGE_BUILD_DIR) < package/bridge/bridge.patch touch $(BRIDGE_BUILD_DIR)/.unpacked $(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.unpacked diff --git a/sources/bridge.patch b/package/bridge/bridge.patch index f44737750b..f44737750b 100644 --- a/sources/bridge.patch +++ b/package/bridge/bridge.patch diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index c6b3b0ad14..571a17f10b 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -25,7 +25,7 @@ busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.configured: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG) $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) -xvf - # Allow busybox patches. - $(SOURCE_DIR)/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-\*.patch + toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox busybox-\*.patch cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.config $(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\ PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak diff --git a/package/customize/customize.mk b/package/customize/customize.mk index 2cfed18345..d6c99407ba 100644 --- a/package/customize/customize.mk +++ b/package/customize/customize.mk @@ -3,8 +3,7 @@ # Any custom stuff you feel like doing.... # ############################################################# -CUST_DIR:=$(SOURCE_DIR)/customize -ROOT_DIR:=$(BUILD_DIR)/root +CUST_DIR:=package/customize/source customize: - cp -af $(CUST_DIR)/* $(ROOT_DIR)/ + -cp -af $(CUST_DIR)/* $(TARGET_DIR)/ diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 0c9b204b88..22ef4310de 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -22,7 +22,7 @@ $(DL_DIR)/$(DNSMASQ_SOURCE): $(DNSMASQ_DIR)/.source: $(DL_DIR)/$(DNSMASQ_SOURCE) zcat $(DL_DIR)/$(DNSMASQ_SOURCE) | tar -C $(BUILD_DIR) -xvf - - $(SOURCE_DIR)/patch-kernel.sh $(DNSMASQ_DIR) $(SOURCE_DIR) \ + toolchain/patch-kernel.sh $(DNSMASQ_DIR) package/dnsmasq/ \ $(DNSMASQ_VER)-\*.patch touch $(DNSMASQ_DIR)/.source diff --git a/sources/dnsmasq1-100-bugfix.patch b/package/dnsmasq/dnsmasq1-100-bugfix.patch index c676a1a398..c676a1a398 100644 --- a/sources/dnsmasq1-100-bugfix.patch +++ b/package/dnsmasq/dnsmasq1-100-bugfix.patch diff --git a/sources/dnsmasq2-100-config.patch b/package/dnsmasq/dnsmasq2-100-config.patch index 270c22740e..270c22740e 100644 --- a/sources/dnsmasq2-100-config.patch +++ b/package/dnsmasq/dnsmasq2-100-config.patch diff --git a/sources/dropbear-init.patch b/package/dropbear_sshd/dropbear-init.patch index d6bf1740a0..d6bf1740a0 100644 --- a/sources/dropbear-init.patch +++ b/package/dropbear_sshd/dropbear-init.patch diff --git a/package/dropbear_sshd/dropbear_sshd.mk b/package/dropbear_sshd/dropbear_sshd.mk index 407fb57794..ac0307c722 100644 --- a/package/dropbear_sshd/dropbear_sshd.mk +++ b/package/dropbear_sshd/dropbear_sshd.mk @@ -18,7 +18,7 @@ dropbear_sshd-source: $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE) $(DROPBEAR_SSHD_DIR)/.unpacked: $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE) $(DROPBEAR_SSHD_CAT) $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE) | tar -C $(BUILD_DIR) -xvf - - $(SOURCE_DIR)/patch-kernel.sh $(DROPBEAR_SSHD_DIR) $(SOURCE_DIR) dropbear-\*.patch + toolchain/patch-kernel.sh $(DROPBEAR_SSHD_DIR) package/dropbear_sshd/ dropbear-\*.patch $(SED) 's,^/\* #define DROPBEAR_MULTI.*,#define DROPBEAR_MULTI,g' $(DROPBEAR_SSHD_DIR)/options.h touch $(DROPBEAR_SSHD_DIR)/.unpacked diff --git a/package/ed/ed.mk b/package/ed/ed.mk index de6c3cb251..361918404d 100644 --- a/package/ed/ed.mk +++ b/package/ed/ed.mk @@ -21,7 +21,7 @@ ed-source: $(DL_DIR)/$(ED_SOURCE) $(DL_DIR)/$(ED_PATCH) $(ED_DIR)/.unpacked: $(DL_DIR)/$(ED_SOURCE) $(DL_DIR)/$(ED_PATCH) $(ED_CAT) $(DL_DIR)/$(ED_SOURCE) | tar -C $(BUILD_DIR) -xvf - - $(SOURCE_DIR)/patch-kernel.sh $(ED_DIR) $(DL_DIR) $(ED_PATCH) + toolchain/patch-kernel.sh $(ED_DIR) $(DL_DIR) $(ED_PATCH) touch $(ED_DIR)/.unpacked $(ED_DIR)/.configured: $(ED_DIR)/.unpacked diff --git a/package/file/file.mk b/package/file/file.mk index ad21956c72..1bdaf788e2 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -18,7 +18,7 @@ file-source: $(DL_DIR)/$(FILE_SOURCE) $(FILE_DIR)/.unpacked: $(DL_DIR)/$(FILE_SOURCE) $(FILE_CAT) $(DL_DIR)/$(FILE_SOURCE) | tar -C $(BUILD_DIR) -xvf - - cat $(SOURCE_DIR)/file.patch | patch -p1 -d $(FILE_DIR) + toolchain/patch-kernel.sh $(FILE_DIR) package/file/ file\*.patch touch $(FILE_DIR)/.unpacked $(FILE_DIR)/.configured: $(FILE_DIR)/.unpacked diff --git a/sources/file.patch b/package/file/file.patch index b2b7d3c807..b2b7d3c807 100644 --- a/sources/file.patch +++ b/package/file/file.patch diff --git a/package/flex/flex.mk b/package/flex/flex.mk index a29fa5875e..488bf60ae7 100644 --- a/package/flex/flex.mk +++ b/package/flex/flex.mk @@ -21,7 +21,7 @@ flex-source: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH) $(FLEX_DIR)/.unpacked: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH) $(FLEX_CAT) $(DL_DIR)/$(FLEX_SOURCE) | tar -C $(BUILD_DIR) -xvf - - #$(SOURCE_DIR)/patch-kernel.sh $(FLEX_DIR) $(DL_DIR) $(FLEX_PATCH) + #toolchain/patch-kernel.sh $(FLEX_DIR) $(DL_DIR) $(FLEX_PATCH) touch $(FLEX_DIR)/.unpacked $(FLEX_DIR)/.configured: $(FLEX_DIR)/.unpacked diff --git a/package/hotplug/hotplug.mk b/package/hotplug/hotplug.mk index e13a6025dd..ef38deec3b 100644 --- a/package/hotplug/hotplug.mk +++ b/package/hotplug/hotplug.mk @@ -6,14 +6,13 @@ HOTPLUG_SOURCE=diethotplug-0.4.tar.gz HOTPLUG_SITE=http://aleron.dl.sourceforge.net/sourceforge/linux-hotplug HOTPLUG_DIR=$(BUILD_DIR)/diethotplug-0.4 -HOTPLUG_PATCH=$(SOURCE_DIR)/hotplug.patch $(DL_DIR)/$(HOTPLUG_SOURCE): $(WGET) -P $(DL_DIR) $(HOTPLUG_SITE)/$(HOTPLUG_SOURCE) -$(HOTPLUG_DIR): $(DL_DIR)/$(HOTPLUG_SOURCE) $(HOTPLUG_PATCH) +$(HOTPLUG_DIR): $(DL_DIR)/$(HOTPLUG_SOURCE) zcat $(DL_DIR)/$(HOTPLUG_SOURCE) | tar -C $(BUILD_DIR) -xvf - - cat $(HOTPLUG_PATCH) | patch -p1 -d $(HOTPLUG_DIR) + toolchain/patch-kernel.sh $(HOTPLUG_DIR) package/hotplug/ hotplug\*.patch $(HOTPLUG_DIR)/hotplug: $(HOTPLUG_DIR) $(MAKE) CROSS=$(TARGET_CROSS) DEBUG=false KLIBC=false \ diff --git a/package/hotplug/hotplug.patch b/package/hotplug/hotplug.patch new file mode 100644 index 0000000000..22c356b227 --- /dev/null +++ b/package/hotplug/hotplug.patch @@ -0,0 +1,33 @@ +diff -urN diethotplug-0.4.orig/pci.c diethotplug-0.4/pci.c +--- diethotplug-0.4.orig/pci.c Wed Jan 9 13:57:29 2002 ++++ diethotplug-0.4/pci.c Wed Jan 30 22:35:24 2002 +@@ -68,8 +68,8 @@ + } + + /* check that the class matches */ +- class_temp = pci_module_map[i].class_mask & pci_class; +- if (pci_module_map[i].class != class_temp) { ++ class_temp = (pci_module_map[i].class ^ pci_class) & pci_module_map[i].class_mask; ++ if (class_temp != 0) { + dbg ("class mask check failed %x != %x", + pci_module_map[i].class, class_temp); + continue; +--- diethotplug-0.4/Makefile.orig Wed Jan 9 14:28:05 2002 ++++ diethotplug-0.4/Makefile Mon Jul 8 07:29:00 2002 +@@ -135,13 +135,13 @@ + + # Rules on how to create the generated header files + usb_modules.h: +- perl convert_usb.pl < /lib/modules/$(KERNEL_VERSION)/modules.usbmap > $@ ++ perl convert_usb.pl < $(TARGET_DIR)/lib/modules/$(KERNEL_VERSION)/modules.usbmap > $@ + + pci_modules.h: +- perl convert_pci.pl < /lib/modules/$(KERNEL_VERSION)/modules.pcimap > $@ ++ perl convert_pci.pl < $(TARGET_DIR)/lib/modules/$(KERNEL_VERSION)/modules.pcimap > $@ + + ieee1394_modules.h: +- perl convert_ieee1394.pl < /lib/modules/$(KERNEL_VERSION)/modules.ieee1394map > $@ ++ perl convert_ieee1394.pl < $(TARGET_DIR)/lib/modules/$(KERNEL_VERSION)/modules.ieee1394map > $@ + + hotplug_version.h: + @echo \#define HOTPLUG_VERSION \"$(VERSION)\" > $@ diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 2d4ef43b50..dac8c0170b 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -16,7 +16,7 @@ $(IPTABLES_BUILD_DIR)/.unpacked: $(DL_DIR)/$(IPTABLES_SOURCE) $(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked # Allow patches. Needed for openwrt for instance. - $(SOURCE_DIR)/patch-kernel.sh $(IPTABLES_BUILD_DIR) $(SOURCE_DIR) iptables-\*.patch + toolchain/patch-kernel.sh $(IPTABLES_BUILD_DIR) package/iptables/ iptables-\*.patch # $(SED) "s;\[ -f /usr/include/netinet/ip6.h \];grep -q '__UCLIBC_HAS_IPV6__ 1' \ $(BUILD_DIR)/uClibc/include/bits/uClibc_config.h;" $(IPTABLES_BUILD_DIR)/Makefile diff --git a/package/libfloat/libfloat.mk b/package/libfloat/libfloat.mk index a7404fcdc6..8e8fb85224 100644 --- a/package/libfloat/libfloat.mk +++ b/package/libfloat/libfloat.mk @@ -30,8 +30,8 @@ $(LIBFLOAT_DIR)/.unpacked: $(DL_DIR)/$(LIBFLOAT_SOURCE) $(DL_DIR)/$(LIBFLOAT_PAT $(LIBFLOAT_CAT) $(DL_DIR)/$(LIBFLOAT_SOURCE) | tar -C $(BUILD_DIR) -xvf - # Remove the binary files distributed with the the package. make -C $(LIBFLOAT_DIR) clean - $(SOURCE_DIR)/patch-kernel.sh $(LIBFLOAT_DIR) $(DL_DIR) $(LIBFLOAT_PATCH) - $(SOURCE_DIR)/patch-kernel.sh $(LIBFLOAT_DIR) $(SOURCE_DIR) libfloat.patch + toolchain/patch-kernel.sh $(LIBFLOAT_DIR) $(DL_DIR) $(LIBFLOAT_PATCH) + toolchain/patch-kernel.sh $(LIBFLOAT_DIR) package/libfloat/ libfloat\*.patch touch $(LIBFLOAT_DIR)/.unpacked $(LIBFLOAT_DIR)/libfloat.so.1: $(LIBFLOAT_DIR)/.unpacked $(TARGET_CC) diff --git a/sources/libfloat.patch b/package/libfloat/libfloat.patch index 90459a89e6..90459a89e6 100644 --- a/sources/libfloat.patch +++ b/package/libfloat/libfloat.patch diff --git a/package/libglib12/libglib12.mk b/package/libglib12/libglib12.mk index f6211ee107..26c2bce4ec 100644 --- a/package/libglib12/libglib12.mk +++ b/package/libglib12/libglib12.mk @@ -8,7 +8,7 @@ LIBGLIB12_SITE:=ftp://ftp.gtk.org/pub/gtk/v1.2 LIBGLIB12_CAT:=zcat LIBGLIB12_DIR:=$(BUILD_DIR)/glib-1.2.10 LIBGLIB12_BINARY:=libglib.a -LIBGLIB12_PATCH:=$(SOURCE_DIR)/libglib_configure_1.2.10.bz2 +LIBGLIB12_PATCH:=libglib_configure_1.2.10.bz2 $(DL_DIR)/$(LIBGLIB12_SOURCE): @@ -18,7 +18,7 @@ libglib12-source: $(DL_DIR)/$(LIBGLIB12_SOURCE) $(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE) $(LIBGLIB12_CAT) $(DL_DIR)/$(LIBGLIB12_SOURCE) | tar -C $(BUILD_DIR) -xvf - - bzcat $(LIBGLIB12_PATCH) | patch -p1 -d $(LIBGLIB12_DIR) + toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib/ $(LIBGLIB12_PATCH) touch $(LIBGLIB12_DIR)/.unpacked $(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked diff --git a/sources/libglib_configure_1.2.10.bz2 b/package/libglib12/libglib_configure_1.2.10.bz2 Binary files differindex 883a8009d4..883a8009d4 100644 --- a/sources/libglib_configure_1.2.10.bz2 +++ b/package/libglib12/libglib_configure_1.2.10.bz2 diff --git a/sources/kernel-patches/006-ieee1394-hotplug.bz2 b/package/linux/kernel-patches/006-ieee1394-hotplug.bz2 Binary files differindex b8361ba35b..b8361ba35b 100644 --- a/sources/kernel-patches/006-ieee1394-hotplug.bz2 +++ b/package/linux/kernel-patches/006-ieee1394-hotplug.bz2 diff --git a/sources/kernel-patches/007-scsi_add_remove_single.bz2 b/package/linux/kernel-patches/007-scsi_add_remove_single.bz2 Binary files differindex 0d2ee20a93..0d2ee20a93 100644 --- a/sources/kernel-patches/007-scsi_add_remove_single.bz2 +++ b/package/linux/kernel-patches/007-scsi_add_remove_single.bz2 diff --git a/sources/kernel-patches/008-ieee1394-fix.bz2 b/package/linux/kernel-patches/008-ieee1394-fix.bz2 Binary files differindex d88f251349..d88f251349 100644 --- a/sources/kernel-patches/008-ieee1394-fix.bz2 +++ b/package/linux/kernel-patches/008-ieee1394-fix.bz2 diff --git a/sources/kernel-patches/009-always-inline.bz2 b/package/linux/kernel-patches/009-always-inline.bz2 Binary files differindex 0838fedd6d..0838fedd6d 100644 --- a/sources/kernel-patches/009-always-inline.bz2 +++ b/package/linux/kernel-patches/009-always-inline.bz2 diff --git a/sources/kernel-patches/010-optimize-for-size.bz2 b/package/linux/kernel-patches/010-optimize-for-size.bz2 Binary files differindex 68c19d4bbb..68c19d4bbb 100644 --- a/sources/kernel-patches/010-optimize-for-size.bz2 +++ b/package/linux/kernel-patches/010-optimize-for-size.bz2 diff --git a/sources/kernel-patches/012-x86-check_gcc.bz2 b/package/linux/kernel-patches/012-x86-check_gcc.bz2 Binary files differindex f645dc1aa9..f645dc1aa9 100644 --- a/sources/kernel-patches/012-x86-check_gcc.bz2 +++ b/package/linux/kernel-patches/012-x86-check_gcc.bz2 diff --git a/sources/kernel-patches/017-printk.bz2 b/package/linux/kernel-patches/017-printk.bz2 Binary files differindex da99976164..da99976164 100644 --- a/sources/kernel-patches/017-printk.bz2 +++ b/package/linux/kernel-patches/017-printk.bz2 diff --git a/sources/kernel-patches/018-slab-loop-init.bz2 b/package/linux/kernel-patches/018-slab-loop-init.bz2 Binary files differindex dfba2bae58..dfba2bae58 100644 --- a/sources/kernel-patches/018-slab-loop-init.bz2 +++ b/package/linux/kernel-patches/018-slab-loop-init.bz2 diff --git a/sources/kernel-patches/041-changeloop.patch.bz2 b/package/linux/kernel-patches/041-changeloop.patch.bz2 Binary files differindex 9e64eca6b5..9e64eca6b5 100644 --- a/sources/kernel-patches/041-changeloop.patch.bz2 +++ b/package/linux/kernel-patches/041-changeloop.patch.bz2 diff --git a/sources/kernel-patches/042-loopfixes.patch.bz2 b/package/linux/kernel-patches/042-loopfixes.patch.bz2 Binary files differindex 456ee6145a..456ee6145a 100644 --- a/sources/kernel-patches/042-loopfixes.patch.bz2 +++ b/package/linux/kernel-patches/042-loopfixes.patch.bz2 diff --git a/sources/kernel-patches/044-streaming_io.bz2 b/package/linux/kernel-patches/044-streaming_io.bz2 Binary files differindex 4f453e1820..4f453e1820 100644 --- a/sources/kernel-patches/044-streaming_io.bz2 +++ b/package/linux/kernel-patches/044-streaming_io.bz2 diff --git a/sources/kernel-patches/062-silence-blk-queue.bz2 b/package/linux/kernel-patches/062-silence-blk-queue.bz2 Binary files differindex 84a9a05c79..84a9a05c79 100644 --- a/sources/kernel-patches/062-silence-blk-queue.bz2 +++ b/package/linux/kernel-patches/062-silence-blk-queue.bz2 diff --git a/sources/kernel-patches/063-silence.kbd.patch.bz2 b/package/linux/kernel-patches/063-silence.kbd.patch.bz2 Binary files differindex 04c56d62bc..04c56d62bc 100644 --- a/sources/kernel-patches/063-silence.kbd.patch.bz2 +++ b/package/linux/kernel-patches/063-silence.kbd.patch.bz2 diff --git a/sources/kernel-patches/064-shutup-md.bz2 b/package/linux/kernel-patches/064-shutup-md.bz2 Binary files differindex 944b12acef..944b12acef 100644 --- a/sources/kernel-patches/064-shutup-md.bz2 +++ b/package/linux/kernel-patches/064-shutup-md.bz2 diff --git a/sources/kernel-patches/077-orinoco-0.13e.bz2 b/package/linux/kernel-patches/077-orinoco-0.13e.bz2 Binary files differindex b181185281..b181185281 100644 --- a/sources/kernel-patches/077-orinoco-0.13e.bz2 +++ b/package/linux/kernel-patches/077-orinoco-0.13e.bz2 diff --git a/sources/kernel-patches/078-hostap.bz2 b/package/linux/kernel-patches/078-hostap.bz2 Binary files differindex f9ce7aaade..f9ce7aaade 100644 --- a/sources/kernel-patches/078-hostap.bz2 +++ b/package/linux/kernel-patches/078-hostap.bz2 diff --git a/sources/kernel-patches/079-jiffies64.bz2 b/package/linux/kernel-patches/079-jiffies64.bz2 Binary files differindex 1b6873d3ec..1b6873d3ec 100644 --- a/sources/kernel-patches/079-jiffies64.bz2 +++ b/package/linux/kernel-patches/079-jiffies64.bz2 diff --git a/sources/kernel-patches/089-no-touch-makedep.bz2 b/package/linux/kernel-patches/089-no-touch-makedep.bz2 Binary files differindex 2e413ccafc..2e413ccafc 100644 --- a/sources/kernel-patches/089-no-touch-makedep.bz2 +++ b/package/linux/kernel-patches/089-no-touch-makedep.bz2 diff --git a/sources/kernel-patches/100_VERSION.bz2 b/package/linux/kernel-patches/100_VERSION.bz2 Binary files differindex 9bfe01ce28..9bfe01ce28 100644 --- a/sources/kernel-patches/100_VERSION.bz2 +++ b/package/linux/kernel-patches/100_VERSION.bz2 diff --git a/sources/linux.config b/package/linux/linux.config index d268d77842..d268d77842 100644 --- a/sources/linux.config +++ b/package/linux/linux.config diff --git a/package/linux/linux.mk b/package/linux/linux.mk index 0d3f8f0f71..78280b96ef 100644 --- a/package/linux/linux.mk +++ b/package/linux/linux.mk @@ -38,7 +38,7 @@ LINUX_BINLOC=arch/$(LINUX_KARCH)/boot/$(LINUX_FORMAT) LINUX_DIR=$(BUILD_DIR)/linux-$(LINUX_VERSION) LINUX_SOURCE=linux-$(DOWNLOAD_LINUX_VERSION).tar.bz2 LINUX_SITE=http://www.kernel.org/pub/linux/kernel/v2.4 -LINUX_KCONFIG=$(SOURCE_DIR)/linux.config +LINUX_KCONFIG=package/linux/linux.config LINUX_KERNEL=$(BUILD_DIR)/buildroot-kernel # Used by pcmcia-cs and others LINUX_SOURCE_DIR=$(LINUX_DIR) @@ -57,8 +57,8 @@ ifneq ($(DOWNLOAD_LINUX_VERSION),$(LINUX_VERSION)) # Rename the dir from the downloaded version to the AFTER patch version mv -f $(BUILD_DIR)/linux-$(DOWNLOAD_LINUX_VERSION) $(BUILD_DIR)/linux-$(LINUX_VERSION) endif - mkdir -p $(SOURCE_DIR)/kernel-patches - $(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR) $(SOURCE_DIR)/kernel-patches + mkdir -p package/linux/kernel-patches + toolchain/patch-kernel.sh $(LINUX_DIR) package/linux/kernel-patches -(cd $(TOOL_BUILD_DIR); ln -sf $(LINUX_DIR) linux) touch $(LINUX_DIR)/.unpacked diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index 43c897c8a8..30629619c8 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -7,7 +7,6 @@ LTP_TESTSUITE_SOURCE:=ltp-full-20040506.tgz LTP_TESTSUITE_SITE:=http://aleron.dl.sourceforge.net/sourceforge/ltp LTP_TESTSUITE_CAT:=zcat LTP_TESTSUITE_DIR:=$(BUILD_DIR)/ltp-full-20040506 -LTP_TESTSUITE_PATCH:=$(SOURCE_DIR)/ltp-testsuite.patch $(DL_DIR)/$(LTP_TESTSUITE_SOURCE): @@ -17,7 +16,7 @@ ltp-testsuite-source: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) $(LTP_TESTSUITE_DIR)/.unpacked: $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) $(LTP_TESTSUITE_CAT) $(DL_DIR)/$(LTP_TESTSUITE_SOURCE) | tar -C $(BUILD_DIR) -xvf - - cat $(LTP_TESTSUITE_PATCH) | patch -p1 -d $(LTP_TESTSUITE_DIR) + toolchain/patch-kernel.sh $(LTP_TESTSUITE_DIR) package/ltp-testsuite/ ltp-testsuite-\*.patch touch $(LTP_TESTSUITE_DIR)/.unpacked $(LTP_TESTSUITE_DIR)/ltp-testsuite: $(LTP_TESTSUITE_DIR)/.unpacked diff --git a/sources/ltp-testsuite.patch b/package/ltp-testsuite/ltp-testsuite.patch index baad6d6f56..baad6d6f56 100644 --- a/sources/ltp-testsuite.patch +++ b/package/ltp-testsuite/ltp-testsuite.patch diff --git a/sources/lzo-cross-compile.patch b/package/lzo/lzo-cross-compile.patch index 68a3d0449e..68a3d0449e 100644 --- a/sources/lzo-cross-compile.patch +++ b/package/lzo/lzo-cross-compile.patch diff --git a/package/lzo/lzo.mk b/package/lzo/lzo.mk index 48e9d7b5db..1e603635e3 100644 --- a/package/lzo/lzo.mk +++ b/package/lzo/lzo.mk @@ -12,7 +12,6 @@ LZO_SITE:=http://ftp.debian.org/debian/pool/main/l/lzo #LZO_SITE:=http://www.oberhumer.com/opensource/lzo/download LZO_DIR:=$(BUILD_DIR)/lzo-1.08 LZO_CAT:=zcat -LZO_PATCH:=$(SOURCE_DIR)/lzo-cross-compile.patch $(DL_DIR)/$(LZO_SOURCE): $(WGET) -P $(DL_DIR) $(LZO_SITE)/$(LZO_SOURCE) @@ -21,7 +20,7 @@ lzo-source: $(DL_DIR)/$(LZO_SOURCE) $(LZO_DIR)/.unpacked: $(DL_DIR)/$(LZO_SOURCE) $(LZO_CAT) $(DL_DIR)/$(LZO_SOURCE) | tar -C $(BUILD_DIR) -xvf - - cat $(LZO_PATCH) | patch -p1 -d $(LZO_DIR) + toolchain/patch-kernel.sh $(LZO_DIR) package/lzo/ lzo-\*.patch touch $(LZO_DIR)/.unpacked LZO_CONFIG_SHARED:=--disable-shared diff --git a/sources/mrouted-sys_errlist.patch b/package/mrouted/mrouted-sys_errlist.patch index 8498dc743f..8498dc743f 100644 --- a/sources/mrouted-sys_errlist.patch +++ b/package/mrouted/mrouted-sys_errlist.patch diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index c017d910b5..e307672ac4 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -8,7 +8,6 @@ MROUTED_SOURCE:=mrouted_3.9-beta3.orig.tar.gz MROUTED_SITE:=http://ftp.debian.org/debian/pool/non-free/m/mrouted MROUTED_DIR:=$(BUILD_DIR)/mrouted-3.9-beta3.orig MROUTED_CAT:=zcat -#MROUTED_PATCH:=$(SOURCE_DIR)/mrouted_3.9-beta3-1.1.diff MROUTED_PATCH:=mrouted_3.9-beta3-1.1.diff.gz MROUTED_BINARY:=mrouted MROUTED_TARGET_BINARY:=usr/sbin/mrouted @@ -24,7 +23,7 @@ mrouted-source: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH) $(MROUTED_DIR)/.unpacked: mrouted-source $(MROUTED_CAT) $(DL_DIR)/$(MROUTED_SOURCE) | tar -C $(BUILD_DIR) -xvf - $(MROUTED_CAT) $(DL_DIR)/$(MROUTED_PATCH) | patch -p1 -d $(MROUTED_DIR) - $(SOURCE_DIR)/patch-kernel.sh $(MROUTED_DIR) $(SOURCE_DIR) mrouted-\*.patch + toolchain/patch-kernel.sh $(MROUTED_DIR) package/mrouted/ mrouted-\*.patch touch $(MROUTED_DIR)/.unpacked $(MROUTED_DIR)/$(MROUTED_BINARY): $(MROUTED_DIR)/.unpacked diff --git a/sources/ncurses-100-hostccflags.patch b/package/ncurses/ncurses-100-hostccflags.patch index a3743d8a26..a3743d8a26 100644 --- a/sources/ncurses-100-hostccflags.patch +++ b/package/ncurses/ncurses-100-hostccflags.patch diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index e2b464ae2a..442542ccde 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -5,7 +5,7 @@ # ############################################################# # Copyright (C) 2002 by Ken Restivo <ken@246gt.com> -# $Id: ncurses.mk,v 1.1 2004/10/09 01:24:04 andersen Exp $ +# $Id: ncurses.mk,v 1.2 2004/10/09 02:48:53 andersen Exp $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Library General Public License as @@ -35,7 +35,7 @@ $(NCURSES_DIR)/.dist: $(DL_DIR)/$(NCURSES_SOURCE) #use the local tic and not whatever the build system was going to find. $(SED) 's~\$$srcdir/shlib tic\$$suffix~/usr/bin/tic~' \ $(NCURSES_DIR)/misc/run_tic.in - $(SOURCE_DIR)/patch-kernel.sh $(NCURSES_DIR) $(SOURCE_DIR) ncurses-\*.patch + toolchain/patch-kernel.sh $(NCURSES_DIR) package/ncurses/ ncurses-\*.patch touch $(NCURSES_DIR)/.dist $(NCURSES_DIR)/.configured: $(NCURSES_DIR)/.dist diff --git a/package/netkittelnet/netkittelnet.mk b/package/netkittelnet/netkittelnet.mk index 401b885cab..9243b4c6ff 100644 --- a/package/netkittelnet/netkittelnet.mk +++ b/package/netkittelnet/netkittelnet.mk @@ -9,7 +9,6 @@ NETKITTELNET_DIR:=$(BUILD_DIR)/netkit-telnet-0.17 NETKITTELNET_CAT:=zcat NETKITTELNET_BINARY:=telnetd/telnetd NETKITTELNET_TARGET_BINARY:=usr/sbin/telnetd -NETKITTELNET_PATCH:=$(SOURCE_DIR)/netkittelnet.patch $(DL_DIR)/$(NETKITTELNET_SOURCE): $(WGET) -P $(DL_DIR) $(NETKITTELNET_SITE)/$(NETKITTELNET_SOURCE) @@ -23,7 +22,7 @@ $(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE) # Disable termcap support $(SED) "s~\(.*termcap\.h.*\)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c # don't try to run cross compiled binaries while configuring things - cat $(NETKITTELNET_PATCH) | patch -p1 -d $(NETKITTELNET_DIR) + toolchain/patch-kernel.sh $(NETKITTELNET_DIR) package/netkittelnet/ netkittelnet\*.patch touch $(NETKITTELNET_DIR)/.unpacked $(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked diff --git a/sources/netkittelnet.patch b/package/netkittelnet/netkittelnet.patch index c894c2abd8..c894c2abd8 100644 --- a/sources/netkittelnet.patch +++ b/package/netkittelnet/netkittelnet.patch diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk index eeb2449676..04f0749e01 100644 --- a/package/netsnmp/netsnmp.mk +++ b/package/netsnmp/netsnmp.mk @@ -9,7 +9,6 @@ NETSNMP_DIR:=$(BUILD_DIR)/net-snmp-5.1 NETSNMP_SOURCE:=net-snmp-5.1.tar.gz NETSNMP_PATCH1:=net-snmp_5.1-5.diff.gz NETSNMP_PATCH1_URL:=http://ftp.debian.org/debian/pool/main/n/net-snmp/ -NETSNMP_PATCH2:=$(SOURCE_DIR)/netsnmp.patch $(DL_DIR)/$(NETSNMP_SOURCE): $(WGET) -P $(DL_DIR) $(NETSNMP_URL)/$(NETSNMP_SOURCE) @@ -20,7 +19,7 @@ $(DL_DIR)/$(NETSNMP_PATCH1): $(NETSNMP_DIR)/.unpacked: $(DL_DIR)/$(NETSNMP_SOURCE) $(DL_DIR)/$(NETSNMP_PATCH1) zcat $(DL_DIR)/$(NETSNMP_SOURCE) | tar -C $(BUILD_DIR) -xvf - zcat $(DL_DIR)/$(NETSNMP_PATCH1) | patch -p1 -d $(NETSNMP_DIR) - cat $(NETSNMP_PATCH2) | patch -p1 -d $(NETSNMP_DIR) + toolchain/patch-kernel.sh $(NETSNMP_DIR) package/netsnmp/ netsnmp\*.patch touch $(NETSNMP_DIR)/.unpacked # We set CAN_USE_SYSCTL to no and use /proc since the diff --git a/sources/netsnmp.patch b/package/netsnmp/netsnmp.patch index 076592bd8e..076592bd8e 100644 --- a/sources/netsnmp.patch +++ b/package/netsnmp/netsnmp.patch diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index c7feba20c6..7d7fe31927 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -7,14 +7,13 @@ OPENSSH_SITE:=ftp://ftp.tux.org/bsd/openbsd/OpenSSH/portable/ OPENSSH_DIR:=$(BUILD_DIR)/openssh-3.8p1 OPENSSH_SOURCE:=openssh-3.8p1.tar.gz -OPENSSH_PATCH:=$(SOURCE_DIR)/openssh.patch $(DL_DIR)/$(OPENSSH_SOURCE): $(WGET) -P $(DL_DIR) $(OPENSSH_SITE)/$(OPENSSH_SOURCE) -$(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE) $(OPENSSH_PATCH) +$(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE) zcat $(DL_DIR)/$(OPENSSH_SOURCE) | tar -C $(BUILD_DIR) -xvf - - cat $(OPENSSH_PATCH) | patch -p1 -d $(OPENSSH_DIR) + toolchain/patch-kernel.sh $(OPENSSH_DIR) package/openssh/ openssh\*.patch touch $(OPENSSH_DIR)/.unpacked $(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.unpacked diff --git a/sources/openssh.patch b/package/openssh/openssh.patch index 7d85a0400e..7d85a0400e 100644 --- a/sources/openssh.patch +++ b/package/openssh/openssh.patch diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index a4003553b1..64d77940a5 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -8,14 +8,13 @@ OPENSSL_SITE:=http://www.openssl.org/source OPENSSL_SOURCE:=openssl-0.9.7d.tar.gz OPENSSL_DIR:=$(BUILD_DIR)/openssl-0.9.7d -OPENSSL_PATCH=$(SOURCE_DIR)/openssl.patch $(DL_DIR)/$(OPENSSL_SOURCE): $(WGET) -P $(DL_DIR) $(OPENSSL_SITE)/$(OPENSSL_SOURCE) -$(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE) $(OPENSSL_PATCH) +$(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE) gunzip -c $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) -xvf - - cat $(OPENSSL_PATCH) | patch -p1 -d $(OPENSSL_DIR) + toolchain/patch-kernel.sh $(OPENSSL_DIR) package/openssl/ openssl\*.patch # sigh... we have to resort to this just to set a gcc flag. $(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' \ $(OPENSSL_DIR)/Configure diff --git a/sources/openssl.patch b/package/openssl/openssl.patch index 1ed23263d0..1ed23263d0 100644 --- a/sources/openssl.patch +++ b/package/openssl/openssl.patch diff --git a/sources/openvpn b/package/openvpn/openvpn.init index 94bdc600e0..94bdc600e0 100755 --- a/sources/openvpn +++ b/package/openvpn/openvpn.init diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 0ac6279328..b0a60c8038 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -12,7 +12,6 @@ OPENVPN_DIR:=$(BUILD_DIR)/openvpn-1.5.0 OPENVPN_CAT:=zcat OPENVPN_BINARY:=openvpn OPENVPN_TARGET_BINARY:=usr/sbin/openvpn -#OPENVPN_PATCH:=$(SOURCE_DIR)/openvpn.patch $(DL_DIR)/$(OPENVPN_SOURCE): $(WGET) -P $(DL_DIR) $(OPENVPN_SITE)/$(OPENVPN_SOURCE) @@ -21,7 +20,6 @@ openvpn-source: $(DL_DIR)/$(OPENVPN_SOURCE) $(OPENVPN_DIR)/.unpacked: $(DL_DIR)/$(OPENVPN_SOURCE) $(OPENVPN_CAT) $(DL_DIR)/$(OPENVPN_SOURCE) | tar -C $(BUILD_DIR) -xvf - - #cat $(OPENVPN_PATCH) | patch -p1 -d $(OPENVPN_DIR) touch $(OPENVPN_DIR)/.unpacked $(OPENVPN_DIR)/.configured: $(OPENVPN_DIR)/.unpacked @@ -53,7 +51,7 @@ $(OPENVPN_DIR)/$(OPENVPN_BINARY): $(OPENVPN_DIR)/.configured $(TARGET_DIR)/$(OPENVPN_TARGET_BINARY): $(OPENVPN_DIR)/$(OPENVPN_BINARY) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(OPENVPN_DIR) install mkdir -p $(TARGET_DIR)/etc/openvpn - cp $(SOURCE_DIR)/openvpn $(TARGET_DIR)/etc/init.d/openvpn + cp package/openvpn/openvpn.init $(TARGET_DIR)/etc/init.d/openvpn rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 219864f747..296e96822f 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -25,7 +25,7 @@ pciutils-source: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE) $(PCIUTILS_DIR)/.unpacked: $(DL_DIR)/$(PCIUTILS_SOURCE) $(DL_DIR)/$(PCIIDS_SOURCE) $(PCIUTILS_CAT) $(DL_DIR)/$(PCIUTILS_SOURCE) | tar -C $(BUILD_DIR) -xvf - $(PCIIDS_CAT) $(DL_DIR)/$(PCIIDS_SOURCE) > $(PCIUTILS_DIR)/pci.id - $(SOURCE_DIR)/patch-kernel.sh $(PCIUTILS_DIR) $(SOURCE_DIR) pciutils*.patch + toolchain/patch-kernel.sh $(PCIUTILS_DIR) package/pciutils pciutils*.patch touch $(PCIUTILS_DIR)/.unpacked $(PCIUTILS_DIR)/.compiled: $(PCIUTILS_DIR)/.unpacked diff --git a/sources/pciutils.patch b/package/pciutils/pciutils.patch index 7718b253a8..7718b253a8 100644 --- a/sources/pciutils.patch +++ b/package/pciutils/pciutils.patch diff --git a/package/pcmcia/pcmcia.mk b/package/pcmcia/pcmcia.mk index eded294b89..efd646dd21 100644 --- a/package/pcmcia/pcmcia.mk +++ b/package/pcmcia/pcmcia.mk @@ -24,7 +24,6 @@ PCMCIA_SOURCE:=pcmcia-cs-3.2.7.tar.gz PCMCIA_SITE:=http://aleron.dl.sourceforge.net/sourceforge/pcmcia-cs PCMCIA_DIR:=$(BUILD_DIR)/pcmcia-cs-3.2.7 -PCMCIA_PATCH:=$(SOURCE_DIR)/pcmcia.patch PCMCIA_CAT:=zcat $(DL_DIR)/$(PCMCIA_SOURCE): @@ -37,7 +36,7 @@ $(PCMCIA_DIR)/.unpacked: $(DL_DIR)/$(PCMCIA_SOURCE) touch $(PCMCIA_DIR)/.unpacked $(PCMCIA_DIR)/.patched: $(PCMCIA_DIR)/.unpacked - cat $(PCMCIA_PATCH) | patch -d $(PCMCIA_DIR) -p1 + toolchain/patch-kernel.sh $(PCMCIA_DIR) package/pcmcia/ pcmcia\*.patch touch $(PCMCIA_DIR)/.patched $(PCMCIA_DIR)/.configured: $(PCMCIA_DIR)/.patched diff --git a/sources/pcmcia.patch b/package/pcmcia/pcmcia.patch index 121435fc1b..121435fc1b 100644 --- a/sources/pcmcia.patch +++ b/package/pcmcia/pcmcia.patch diff --git a/sources/python-cross-compile.patch b/package/python/python-cross-compile.patch index f7465cc3c7..f7465cc3c7 100644 --- a/sources/python-cross-compile.patch +++ b/package/python/python-cross-compile.patch diff --git a/package/python/python.mk b/package/python/python.mk index e49cc12aa6..f12e1f1551 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -21,7 +21,7 @@ $(PYTHON_DIR)/.unpacked: $(DL_DIR)/$(PYTHON_SOURCE) touch $(PYTHON_DIR)/.unpacked $(PYTHON_DIR)/.patched: $(PYTHON_DIR)/.unpacked - $(SOURCE_DIR)/patch-kernel.sh $(PYTHON_DIR) $(SOURCE_DIR) python*.patch + toolchain/patch-kernel.sh $(PYTHON_DIR) package/python/ python*.patch touch $(PYTHON_DIR)/.patched $(PYTHON_DIR)/.hostpython: $(PYTHON_DIR)/.patched diff --git a/package/rxvt/rxvt.mk b/package/rxvt/rxvt.mk index a633547038..e43b272028 100644 --- a/package/rxvt/rxvt.mk +++ b/package/rxvt/rxvt.mk @@ -21,7 +21,6 @@ # USA RXVT_SOURCE:=rxvt-2.6.4.tar.bz2 -RXVT_PATCH:=$(SOURCE_DIR)/rxvt-2.6.4.patch RXVT_SITE:=ftp://ftp.rxvt.org/pub/rxvt/ RXVT_CAT:=bzcat RXVT_DIR:=$(BUILD_DIR)/rxvt-2.6.4 @@ -49,7 +48,7 @@ $(RXVT_DIR)/.configured: $(RXVT_DIR)/.unpacked --x-includes=$(TINYX_DIR)/exports/include \ --x-libraries=$(TINYX_DIR)/exports/lib \ ); - cat $(RXVT_PATCH) | patch -d $(RXVT_DIR) -p1 + toolchain/patch-kernel.sh $(RXVT_DIR) package/rxvt/ rxvt*.patch touch $(RXVT_DIR)/.configured $(RXVT_BINARY): $(RXVT_DIR)/.configured diff --git a/package/sed/sed.mk b/package/sed/sed.mk index e197bca3ec..108d4fe3a9 100644 --- a/package/sed/sed.mk +++ b/package/sed/sed.mk @@ -7,14 +7,15 @@ SED_VER:=4.1.2 SED_SOURCE:=sed-$(SED_VER).tar.gz SED_SITE:=ftp://ftp.gnu.org/gnu/sed SED_CAT:=zcat -SED_DIR:=$(BUILD_DIR)/sed-$(SED_VER) +SED_DIR1:=$(TOOL_BUILD_DIR)/sed-$(SED_VER) +SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VER) SED_BINARY:=sed/sed SED_TARGET_BINARY:=bin/sed -ifeq ($(BR2_LARGEFILE),y) +ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true) SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64 endif SED:=$(STAGING_DIR)/bin/sed -i -e - +HOST_SED_TARGET=$(shell package/sed/sedcheck.sh) $(DL_DIR)/$(SED_SOURCE): mkdir -p $(DL_DIR) @@ -25,15 +26,67 @@ sed-source: $(DL_DIR)/$(SED_SOURCE) ############################################################# # +# build sed for use on the host system +# +############################################################# +$(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE) + mkdir -p $(TOOL_BUILD_DIR) + mkdir -p $(STAGING_DIR)/bin; + $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf - + touch $(SED_DIR1)/.unpacked + +$(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked + (cd $(SED_DIR1); rm -rf config.cache; \ + ./configure \ + --prefix=$(STAGING_DIR) \ + --prefix=/usr \ + ); + touch $(SED_DIR1)/.configured + +$(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured + $(MAKE) -C $(SED_DIR1) + +# This stuff is needed to work around GNU make deficiencies +build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY) + @if [ -L $(STAGING_DIR)/$(SED_TARGET_BINARY) ] ; then \ + rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); fi; + @if [ ! -f $(STAGING_DIR)/$(SED_TARGET_BINARY) -o $(STAGING_DIR)/$(SED_TARGET_BINARY) \ + -ot $(SED_DIR1)/$(SED_BINARY) ] ; then \ + set -x; \ + mkdir -p $(STAGING_DIR)/bin; \ + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SED_DIR1) install; \ + mv $(STAGING_DIR)/usr/bin/sed $(STAGING_DIR)/bin/; \ + rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \ + $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi + +use-sed-host-binary: + @if [ -x /usr/bin/sed ]; then SED="/usr/bin/sed"; else \ + if [ -x /bin/sed ]; then SED="/bin/sed"; fi; fi; \ + mkdir -p $(STAGING_DIR)/bin; \ + rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); \ + ln -s $$SED $(STAGING_DIR)/$(SED_TARGET_BINARY) + +host-sed: $(HOST_SED_TARGET) + +host-sed-clean: + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SED_DIR1) uninstall + -$(MAKE) -C $(SED_DIR1) clean + +host-sed-dirclean: + rm -rf $(SED_DIR1) + + +############################################################# +# # build sed for use on the target system # ############################################################# -$(SED_DIR)/.unpacked: $(DL_DIR)/$(SED_SOURCE) +$(SED_DIR2)/.unpacked: $(DL_DIR)/$(SED_SOURCE) $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(BUILD_DIR) -xvf - - touch $(SED_DIR)/.unpacked + touch $(SED_DIR2)/.unpacked -$(SED_DIR)/.configured: $(SED_DIR)/.unpacked - (cd $(SED_DIR); rm -rf config.cache; \ +$(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked + (cd $(SED_DIR2); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="$(SED_CFLAGS)" \ @@ -53,20 +106,20 @@ $(SED_DIR)/.configured: $(SED_DIR)/.unpacked --infodir=/usr/info \ $(DISABLE_NLS) \ ); - touch $(SED_DIR)/.configured + touch $(SED_DIR2)/.configured -$(SED_DIR)/$(SED_BINARY): $(SED_DIR)/.configured - $(MAKE) CC=$(TARGET_CC) -C $(SED_DIR) +$(SED_DIR2)/$(SED_BINARY): $(SED_DIR2)/.configured + $(MAKE) CC=$(TARGET_CC) -C $(SED_DIR2) # This stuff is needed to work around GNU make deficiencies -sed-target_binary: $(SED_DIR)/$(SED_BINARY) +sed-target_binary: $(SED_DIR2)/$(SED_BINARY) @if [ -L $(TARGET_DIR)/$(SED_TARGET_BINARY) ] ; then \ rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); fi; - @if [ ! -f $(SED_DIR)/$(SED_BINARY) -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \ - -ot $(SED_DIR)/$(SED_BINARY) ] ; then \ + @if [ ! -f $(SED_DIR2)/$(SED_BINARY) -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \ + -ot $(SED_DIR2)/$(SED_BINARY) ] ; then \ set -x; \ - $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR) install; \ + $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) install; \ mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \ rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; fi @@ -74,10 +127,10 @@ sed-target_binary: $(SED_DIR)/$(SED_BINARY) sed: uclibc sed-target_binary sed-clean: - $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR) uninstall - -$(MAKE) -C $(SED_DIR) clean + $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) uninstall + -$(MAKE) -C $(SED_DIR2) clean sed-dirclean: - rm -rf $(SED_DIR) + rm -rf $(SED_DIR2) diff --git a/sources/sedcheck.sh b/package/sed/sedcheck.sh index 4d645b6ab0..4d645b6ab0 100755 --- a/sources/sedcheck.sh +++ b/package/sed/sedcheck.sh diff --git a/sources/tinyx-011010.patch b/package/tinyx/tinyx-011010.patch index 3040b3dd40..3040b3dd40 100644 --- a/sources/tinyx-011010.patch +++ b/package/tinyx/tinyx-011010.patch diff --git a/package/tinyx/tinyx.mk b/package/tinyx/tinyx.mk index 1455ae6d8b..a891b8a411 100644 --- a/package/tinyx/tinyx.mk +++ b/package/tinyx/tinyx.mk @@ -43,7 +43,6 @@ TINYX_LIBS:=ICE X11 Xext Xpm TINYX_DIR:=$(BUILD_DIR)/xc-011010 TINYX_LDIR:=$(TINYX_DIR)/lib TINYX_PROGS:=$(TINYX_DIR)/programs -TINYX_PATCH:=$(SOURCE_DIR)/tinyx-011010.patch TINYX_SOURCE:=xc-011010.tar.bz2 TINYX_SITE:= http://intimate.handhelds.org/jacques/ TINYX_CF:=$(TINYX_DIR)/config/cf @@ -72,7 +71,7 @@ $(DL_DIR)/host.def: # $(TINYX_DIR)/.configure: $(DL_DIR)/$(TINYX_SOURCE) $(DL_DIR)/cross.def $(DL_DIR)/host.def $(TINYX_CAT) $(DL_DIR)/$(TINYX_SOURCE) | tar -C $(BUILD_DIR) -xvf - - cat $(TINYX_PATCH) | patch -d $(TINYX_DIR) -p1 + toolchain/patch-kernel.sh $(TINYX_DIR) package/tinyx/ tinyx*.patch cp $(DL_DIR)/host.def $(TINYX_CF)/host.def cp $(DL_DIR)/cross.def $(TINYX_CF)/cross.def $(SED) 's,arm-uclibc-,$(ARCH)-linux-uclibc-,g' $(TINYX_CF)/cross.def diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 1cc828bcdc..82c0309d5c 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -20,7 +20,7 @@ $(DL_DIR)/$(UTIL-LINUX_PATCH): $(UTIL-LINUX_DIR)/.unpacked: $(DL_DIR)/$(UTIL-LINUX_SOURCE) $(DL_DIR)/$(UTIL-LINUX_PATCH) $(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_SOURCE) | tar -C $(BUILD_DIR) -xvf - $(UTIL-LINUX_CAT) $(DL_DIR)/$(UTIL-LINUX_PATCH) | patch -p1 -d $(UTIL-LINUX_DIR) - cat $(SOURCE_DIR)/util-linux.patch | patch -p1 -d $(UTIL-LINUX_DIR) + toolchain/patch-kernel.sh $(UTIL-LINUX_DIR) package/util-linux/ util-linux*.patch touch $(UTIL-LINUX_DIR)/.unpacked $(UTIL-LINUX_DIR)/.configured: $(UTIL-LINUX_DIR)/.unpacked diff --git a/sources/util-linux.patch b/package/util-linux/util-linux.patch index 601e7dc11d..601e7dc11d 100644 --- a/sources/util-linux.patch +++ b/package/util-linux/util-linux.patch diff --git a/package/valgrind/valgrind.mk b/package/valgrind/valgrind.mk index ed295a3cfb..698c03437b 100644 --- a/package/valgrind/valgrind.mk +++ b/package/valgrind/valgrind.mk @@ -7,7 +7,6 @@ VALGRIND_SITE:=http://developer.kde.org/~sewardj/ VALGRIND_DIR:=$(BUILD_DIR)/valgrind-2.1.1 VALGRIND_SOURCE:=valgrind-2.1.1.tar.bz2 -VALGRIND_PATCH:=$(SOURCE_DIR)/valgrind.patch $(DL_DIR)/$(VALGRIND_SOURCE): $(WGET) -P $(DL_DIR) $(VALGRIND_SITE)/$(VALGRIND_SOURCE) @@ -17,7 +16,7 @@ $(VALGRIND_DIR)/.unpacked: $(DL_DIR)/$(VALGRIND_SOURCE) touch $(VALGRIND_DIR)/.unpacked $(VALGRIND_DIR)/.patched: $(VALGRIND_DIR)/.unpacked - cat $(VALGRIND_PATCH) | patch -d $(VALGRIND_DIR) -p1 + toolchain/patch-kernel.sh $(VALGRIND_DIR) package/valgrind/ valgrind*.patch touch $(VALGRIND_DIR)/.patched $(VALGRIND_DIR)/.configured: $(VALGRIND_DIR)/.patched diff --git a/sources/valgrind.patch b/package/valgrind/valgrind.patch index d0946bd9c6..d0946bd9c6 100644 --- a/sources/valgrind.patch +++ b/package/valgrind/valgrind.patch diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk index 595a6f82b2..864214783c 100644 --- a/package/vtun/vtun.mk +++ b/package/vtun/vtun.mk @@ -12,7 +12,6 @@ VTUN_DIR:=$(BUILD_DIR)/vtun-2.6 VTUN_CAT:=zcat VTUN_BINARY:=vtund VTUN_TARGET_BINARY:=usr/sbin/vtund -VTUN_PATCH:=$(SOURCE_DIR)/vtun.patch $(DL_DIR)/$(VTUN_SOURCE): $(WGET) -P $(DL_DIR) $(VTUN_SITE)/$(VTUN_SOURCE) @@ -22,7 +21,7 @@ vtun-source: $(DL_DIR)/$(VTUN_SOURCE) $(VTUN_DIR)/.unpacked: $(DL_DIR)/$(VTUN_SOURCE) $(VTUN_CAT) $(DL_DIR)/$(VTUN_SOURCE) | tar -C $(BUILD_DIR) -xvf - mv $(BUILD_DIR)/vtun $(VTUN_DIR) - cat $(VTUN_PATCH) | patch -p1 -d $(VTUN_DIR) + toolchain/patch-kernel.sh $(VTUN_DIR) package/vtun/ vtun*.patch touch $(VTUN_DIR)/.unpacked $(VTUN_DIR)/.configured: $(VTUN_DIR)/.unpacked zlib lzo openssl diff --git a/sources/vtun.patch b/package/vtun/vtun.patch index 00a12454ee..00a12454ee 100644 --- a/sources/vtun.patch +++ b/package/vtun/vtun.patch diff --git a/sources/perl-cross-0.1.tar.gz b/sources/perl-cross-0.1.tar.gz Binary files differdeleted file mode 100644 index d0c553dc8a..0000000000 --- a/sources/perl-cross-0.1.tar.gz +++ /dev/null diff --git a/sources/perl.patch b/sources/perl.patch deleted file mode 100644 index 0e9ab19d4f..0000000000 --- a/sources/perl.patch +++ /dev/null @@ -1,996 +0,0 @@ -diff -urN cross.o/Makefile cross.x/Makefile ---- Makefile 2003-04-15 14:35:51.000000000 -0600 -+++ perl-5.8.0.uclibc/cross/Makefile 2003-06-27 16:38:23.000000000 -0600 -@@ -49,8 +49,8 @@ - @echo toolchain: $(CC), $(CXX), $(LD), $(STRIP), $(AR), $(RANLIB) - @echo Optimizations: $(FULL_OPTIMIZATION) - -- $(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh -- $(TOPDIR)/generate_config_sh config.sh-$(SYS) > $(TOPDIR)/../config.sh-arse -+ $(TOPDIR)/generate_config_sh config.sh.uclibc > $(TOPDIR)/../config.sh -+ $(TOPDIR)/generate_config_sh config.sh.uclibc > $(TOPDIR)/../config.sh-arse - cd $(TOPDIR)/.. ; ./Configure -S ; make depend ; make ; make more - cd $(TOPDIR)/.. ; mkdir -p fake_config_library ; cp lib/Config.pm fake_config_library - cd $(TOPDIR)/.. ; $(MAKE) more2 "PERLRUN=/usr/bin/perl -I$(TOPDIR)/../fake_config_library -MConfig" -diff -urN cross.o/config.sh.uclibc cross.x/config.sh.uclibc ---- /dev/null -+++ perl-5.8.0.uclibc/cross/config.sh.uclibc 2003-06-27 16:53:28.000000000 -0600 -@@ -0,0 +1,978 @@ -+#!/bin/sh -+# -+# This file was produced by running the Configure script. It holds all the -+# definitions figured out by Configure. Should you modify one of these values, -+# do not forget to propagate your changes by running "Configure -der". You may -+# instead choose to run each of the .SH files by yourself, or "Configure -S". -+# -+ -+# Package name : perl5 -+# Source directory : . -+# Configuration time: Fri Jun 27 16:41:22 MDT 2003 -+# Configured by : root -+# Target system : <whatever> -+ -+Author='' -+Date='$Date' -+Header='' -+Id='$Id' -+Locker='' -+Log='$Log' -+Mcc='Mcc' -+RCSfile='$RCSfile' -+Revision='$Revision' -+Source='' -+State='' -+_a='.a' -+_exe='' -+_o='.o' -+afs='false' -+afsroot='/afs' -+alignbytes='4' -+ansi2knr='' -+aphostname='/bin/hostname' -+api_revision='5' -+api_subversion='0' -+api_version='8' -+api_versionstring='5.8.0' -+ar='TARGET_CROSSar' -+archlib='/usr/lib/perl/5.8.0/TARGET_ARCH-linux' -+archlibexp='/usr/lib/perl/5.8.0/TARGET_ARCH-linux' -+archname64='' -+archname='TARGET_ARCH-linux' -+archobjs='' -+asctime_r_proto='0' -+awk='awk' -+baserev='5.0' -+bash='' -+bin='/usr/bin' -+binexp='/usr/bin' -+bison='bison' -+byacc='byacc' -+byteorder='1234' -+c='' -+castflags='0' -+cat='cat' -+cc='TARGET_CROSScc' -+cccdlflags='-fpic' -+ccdlflags='-rdynamic' -+ccflags='-fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' -+ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' -+ccname='gcc' -+ccsymbols='__ARM_ARCH_4T__=1 __GNUC_MINOR__=3 __GNUC_PATCHLEVEL__=0' -+ccversion='' -+cf_by='root' -+charsize='1' -+chgrp='' -+chmod='chmod' -+chown='' -+clocktype='clock_t' -+comm='comm' -+compress='' -+contains='grep' -+cp='cp' -+cpio='' -+cpp='cpp' -+cpp_stuff='42' -+cppccsymbols='__GNUC__=3' -+cppflags='-fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' -+cpplast='-' -+cppminus='-' -+cpprun='TARGET_CROSScc -E' -+cppstdin='TARGET_CROSScc -E' -+cppsymbols='BIG_ENDIAN=4321 __BIG_ENDIAN=4321 __ELF__=1 _FILE_OFFSET_BITS=64 __GLIBC__=2 __GLIBC_MINOR__=2 __GNUC_MINOR__=3 __GNU_LIBRARY__=6 _LARGEFILE_SOURCE=1 LITTLE_ENDIAN=1234 __LITTLE_ENDIAN=1234 _POSIX_C_SOURCE=199506 _POSIX_SOURCE=1 __STDC__=1 __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_SVID=1 linux=1 __linux=1 __linux__=1 unix=1 __unix=1 __unix__=1' -+crypt_r_proto='0' -+cryptlib='' -+csh='csh' -+ctermid_r_proto='0' -+ctime_r_proto='0' -+d_Gconvert='gcvt((x),(n),(b))' -+d_PRIEUldbl='define' -+d_PRIFUldbl='define' -+d_PRIGUldbl='define' -+d_PRIXU64='define' -+d_PRId64='define' -+d_PRIeldbl='define' -+d_PRIfldbl='define' -+d_PRIgldbl='define' -+d_PRIi64='define' -+d_PRIo64='define' -+d_PRIu64='define' -+d_PRIx64='define' -+d_SCNfldbl='define' -+d__fwalk='undef' -+d_access='define' -+d_accessx='undef' -+d_alarm='define' -+d_archlib='define' -+d_asctime_r='undef' -+d_atolf='undef' -+d_atoll='define' -+d_attribut='define' -+d_bcmp='define' -+d_bcopy='define' -+d_bsd='undef' -+d_bsdgetpgrp='undef' -+d_bsdsetpgrp='undef' -+d_bzero='define' -+d_casti32='define' -+d_castneg='define' -+d_charvspr='define' -+d_chown='define' -+d_chroot='define' -+d_chsize='undef' -+d_class='undef' -+d_closedir='define' -+d_cmsghdr_s='define' -+d_const='define' -+d_crypt='define' -+d_crypt_r='undef' -+d_csh='undef' -+d_ctermid_r='undef' -+d_ctime_r='undef' -+d_cuserid='undef' -+d_dbl_dig='define' -+d_dbminitproto='undef' -+d_difftime='define' -+d_dirfd='define' -+d_dirnamlen='undef' -+d_dlerror='define' -+d_dlopen='define' -+d_dlsymun='undef' -+d_dosuid='undef' -+d_drand48_r='undef' -+d_drand48proto='define' -+d_dup2='define' -+d_eaccess='undef' -+d_endgrent='define' -+d_endgrent_r='undef' -+d_endhent='define' -+d_endhostent_r='undef' -+d_endnent='define' -+d_endnetent_r='undef' -+d_endpent='define' -+d_endprotoent_r='undef' -+d_endpwent='define' -+d_endpwent_r='undef' -+d_endsent='define' -+d_endservent_r='undef' -+d_eofnblk='define' -+d_eunice='undef' -+d_fchdir='define' -+d_fchmod='define' -+d_fchown='define' -+d_fcntl='define' -+d_fcntl_can_lock='define' -+d_fd_macros='define' -+d_fd_set='define' -+d_fds_bits='undef' -+d_fgetpos='define' -+d_finite='define' -+d_finitel='undef' -+d_flexfnam='define' -+d_flock='define' -+d_flockproto='define' -+d_fork='define' -+d_fp_class='undef' -+d_fpathconf='define' -+d_fpclass='undef' -+d_fpclassify='define' -+d_fpclassl='undef' -+d_fpos64_t='undef' -+d_frexpl='undef' -+d_fs_data_s='undef' -+d_fseeko='define' -+d_fsetpos='define' -+d_fstatfs='define' -+d_fstatvfs='define' -+d_fsync='define' -+d_ftello='define' -+d_ftime='undef' -+d_getcwd='define' -+d_getespwnam='undef' -+d_getfsstat='undef' -+d_getgrent='define' -+d_getgrent_r='undef' -+d_getgrgid_r='undef' -+d_getgrnam_r='undef' -+d_getgrps='define' -+d_gethbyaddr='define' -+d_gethbyname='define' -+d_gethent='define' -+d_gethname='define' -+d_gethostbyaddr_r='undef' -+d_gethostbyname_r='undef' -+d_gethostent_r='undef' -+d_gethostprotos='define' -+d_getitimer='define' -+d_getlogin='define' -+d_getlogin_r='undef' -+d_getmnt='undef' -+d_getmntent='define' -+d_getnbyaddr='define' -+d_getnbyname='define' -+d_getnent='define' -+d_getnetbyaddr_r='undef' -+d_getnetbyname_r='undef' -+d_getnetent_r='undef' -+d_getnetprotos='define' -+d_getpagsz='define' -+d_getpbyname='define' -+d_getpbynumber='define' -+d_getpent='define' -+d_getpgid='define' -+d_getpgrp2='undef' -+d_getpgrp='define' -+d_getppid='define' -+d_getprior='define' -+d_getprotobyname_r='undef' -+d_getprotobynumber_r='undef' -+d_getprotoent_r='undef' -+d_getprotoprotos='define' -+d_getprpwnam='undef' -+d_getpwent='define' -+d_getpwent_r='undef' -+d_getpwnam_r='undef' -+d_getpwuid_r='undef' -+d_getsbyname='define' -+d_getsbyport='define' -+d_getsent='define' -+d_getservbyname_r='undef' -+d_getservbyport_r='undef' -+d_getservent_r='undef' -+d_getservprotos='define' -+d_getspnam='define' -+d_getspnam_r='undef' -+d_gettimeod='define' -+d_gmtime_r='undef' -+d_gnulibc='undef' -+d_grpasswd='define' -+d_hasmntopt='define' -+d_htonl='define' -+d_index='undef' -+d_inetaton='define' -+d_int64_t='define' -+d_isascii='define' -+d_isfinite='undef' -+d_isinf='define' -+d_isnan='define' -+d_isnanl='define' -+d_killpg='define' -+d_lchown='define' -+d_ldbl_dig='define' -+d_link='define' -+d_localtime_r='undef' -+d_locconv='define' -+d_lockf='define' -+d_longdbl='define' -+d_longlong='define' -+d_lseekproto='define' -+d_lstat='define' -+d_madvise='define' -+d_mblen='define' -+d_mbstowcs='define' -+d_mbtowc='define' -+d_memchr='define' -+d_memcmp='define' -+d_memcpy='define' -+d_memmove='define' -+d_memset='define' -+d_mkdir='define' -+d_mkdtemp='define' -+d_mkfifo='define' -+d_mkstemp='define' -+d_mkstemps='undef' -+d_mktime='define' -+d_mmap='define' -+d_modfl='undef' -+d_modfl_pow32_bug='undef' -+d_mprotect='define' -+d_msg='define' -+d_msg_ctrunc='define' -+d_msg_dontroute='define' -+d_msg_oob='define' -+d_msg_peek='define' -+d_msg_proxy='define' -+d_msgctl='define' -+d_msgget='define' -+d_msghdr_s='define' -+d_msgrcv='define' -+d_msgsnd='define' -+d_msync='define' -+d_munmap='define' -+d_mymalloc='undef' -+d_nice='define' -+d_nl_langinfo='define' -+d_nv_preserves_uv='define' -+d_off64_t='undef' -+d_old_pthread_create_joinable='undef' -+d_oldpthreads='undef' -+d_oldsock='undef' -+d_open3='define' -+d_pathconf='define' -+d_pause='define' -+d_perl_otherlibdirs='undef' -+d_phostname='undef' -+d_pipe='define' -+d_poll='define' -+d_portable='define' -+d_procselfexe='define' -+d_pthread_atfork='undef' -+d_pthread_yield='undef' -+d_pwage='undef' -+d_pwchange='undef' -+d_pwclass='undef' -+d_pwcomment='undef' -+d_pwexpire='undef' -+d_pwgecos='define' -+d_pwpasswd='define' -+d_pwquota='undef' -+d_qgcvt='undef' -+d_quad='define' -+d_random_r='undef' -+d_readdir64_r='undef' -+d_readdir='define' -+d_readdir_r='undef' -+d_readlink='define' -+d_readv='define' -+d_recvmsg='define' -+d_rename='define' -+d_rewinddir='define' -+d_rmdir='define' -+d_safebcpy='undef' -+d_safemcpy='undef' -+d_sanemcmp='define' -+d_sbrkproto='define' -+d_sched_yield='define' -+d_scm_rights='define' -+d_seekdir='define' -+d_select='define' -+d_sem='define' -+d_semctl='define' -+d_semctl_semid_ds='define' -+d_semctl_semun='define' -+d_semget='define' -+d_semop='define' -+d_sendmsg='define' -+d_setegid='define' -+d_seteuid='define' -+d_setgrent='define' -+d_setgrent_r='undef' -+d_setgrps='define' -+d_sethent='define' -+d_sethostent_r='undef' -+d_setitimer='define' -+d_setlinebuf='define' -+d_setlocale='define' -+d_setlocale_r='undef' -+d_setnent='define' -+d_setnetent_r='undef' -+d_setpent='define' -+d_setpgid='define' -+d_setpgrp2='undef' -+d_setpgrp='define' -+d_setprior='define' -+d_setproctitle='undef' -+d_setprotoent_r='undef' -+d_setpwent='define' -+d_setpwent_r='undef' -+d_setregid='define' -+d_setresgid='define' -+d_setresuid='define' -+d_setreuid='define' -+d_setrgid='undef' -+d_setruid='undef' -+d_setsent='define' -+d_setservent_r='undef' -+d_setsid='define' -+d_setvbuf='define' -+d_sfio='undef' -+d_shm='define' -+d_shmat='define' -+d_shmatprototype='define' -+d_shmctl='define' -+d_shmdt='define' -+d_shmget='define' -+d_sigaction='define' -+d_sigprocmask='define' -+d_sigsetjmp='define' -+d_sockatmark='undef' -+d_sockatmarkproto='undef' -+d_socket='define' -+d_socklen_t='define' -+d_sockpair='define' -+d_socks5_init='undef' -+d_sqrtl='undef' -+d_srand48_r='undef' -+d_srandom_r='undef' -+d_sresgproto='undef' -+d_sresuproto='undef' -+d_statblks='define' -+d_statfs_f_flags='undef' -+d_statfs_s='define' -+d_statvfs='define' -+d_stdio_cnt_lval='undef' -+d_stdio_ptr_lval='undef' -+d_stdio_ptr_lval_nochange_cnt='undef' -+d_stdio_ptr_lval_sets_cnt='undef' -+d_stdio_stream_array='undef' -+d_stdiobase='undef' -+d_stdstdio='undef' -+d_strchr='define' -+d_strcoll='define' -+d_strctcpy='define' -+d_strerrm='strerror(e)' -+d_strerror='define' -+d_strerror_r='undef' -+d_strftime='define' -+d_strtod='define' -+d_strtol='define' -+d_strtold='define' -+d_strtoll='define' -+d_strtoq='define' -+d_strtoul='define' -+d_strtoull='define' -+d_strtouq='define' -+d_strxfrm='define' -+d_suidsafe='undef' -+d_symlink='define' -+d_syscall='define' -+d_syscallproto='define' -+d_sysconf='define' -+d_sysernlst='' -+d_syserrlst='define' -+d_system='define' -+d_tcgetpgrp='define' -+d_tcsetpgrp='define' -+d_telldir='define' -+d_telldirproto='define' -+d_time='define' -+d_times='define' -+d_tm_tm_gmtoff='define' -+d_tm_tm_zone='define' -+d_tmpnam_r='undef' -+d_truncate='define' -+d_ttyname_r='undef' -+d_tzname='define' -+d_u32align='undef' -+d_ualarm='undef' -+d_umask='define' -+d_uname='define' -+d_union_semun='undef' -+d_unordered='undef' -+d_usleep='define' -+d_usleepproto='define' -+d_ustat='undef' -+d_vendorarch='undef' -+d_vendorbin='undef' -+d_vendorlib='undef' -+d_vfork='undef' -+d_void_closedir='undef' -+d_voidsig='define' -+d_voidtty='' -+d_volatile='define' -+d_vprintf='define' -+d_wait4='define' -+d_waitpid='define' -+d_wcstombs='define' -+d_wctomb='define' -+d_writev='define' -+d_xenix='undef' -+date='date' -+db_hashtype='u_int32_t' -+db_prefixtype='size_t' -+db_version_major='' -+db_version_minor='' -+db_version_patch='' -+defvoidused='15' -+direntrytype='struct dirent' -+dlext='so' -+dlsrc='dl_dlopen.xs' -+doublesize='8' -+drand01='drand48()' -+drand48_r_proto='0' -+dynamic_ext='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared' -+eagain='EAGAIN' -+ebcdic='undef' -+echo='echo' -+egrep='egrep' -+emacs='' -+endgrent_r_proto='0' -+endhostent_r_proto='0' -+endnetent_r_proto='0' -+endprotoent_r_proto='0' -+endpwent_r_proto='0' -+endservent_r_proto='0' -+eunicefix=':' -+exe_ext='' -+expr='expr' -+extensions='B ByteLoader Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Errno' -+extras='' -+fflushNULL='define' -+fflushall='undef' -+find='' -+firstmakefile='makefile' -+flex='' -+fpossize='16' -+fpostype='fpos_t' -+freetype='void' -+from=':' -+full_ar='/usr/bin/ar' -+full_csh='csh' -+full_sed='/bin/sed' -+gccosandvers='' -+gccversion='3.3' -+getgrent_r_proto='0' -+getgrgid_r_proto='0' -+getgrnam_r_proto='0' -+gethostbyaddr_r_proto='0' -+gethostbyname_r_proto='0' -+gethostent_r_proto='0' -+getlogin_r_proto='0' -+getnetbyaddr_r_proto='0' -+getnetbyname_r_proto='0' -+getnetent_r_proto='0' -+getprotobyname_r_proto='0' -+getprotobynumber_r_proto='0' -+getprotoent_r_proto='0' -+getpwent_r_proto='0' -+getpwnam_r_proto='0' -+getpwuid_r_proto='0' -+getservbyname_r_proto='0' -+getservbyport_r_proto='0' -+getservent_r_proto='0' -+getspnam_r_proto='0' -+gidformat='"lu"' -+gidsign='1' -+gidsize='4' -+gidtype='gid_t' -+glibpth='/usr/shlib /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib ' -+gmake='gmake' -+gmtime_r_proto='0' -+gnulibc_version='' -+grep='grep' -+groupcat='cat /etc/group' -+groupstype='gid_t' -+gzip='gzip' -+h_fcntl='false' -+h_sysfile='true' -+hint='previous' -+hostcat='cat /etc/hosts' -+i16size='2' -+i16type='short' -+i32size='4' -+i32type='long' -+i64size='8' -+i64type='long long' -+i8size='1' -+i8type='char' -+i_arpainet='define' -+i_bsdioctl='' -+i_crypt='define' -+i_db='undef' -+i_dbm='undef' -+i_dirent='define' -+i_dld='undef' -+i_dlfcn='define' -+i_fcntl='undef' -+i_float='define' -+i_fp='undef' -+i_fp_class='undef' -+i_gdbm='undef' -+i_grp='define' -+i_ieeefp='undef' -+i_inttypes='define' -+i_langinfo='define' -+i_libutil='undef' -+i_limits='define' -+i_locale='define' -+i_machcthr='undef' -+i_malloc='define' -+i_math='define' -+i_memory='undef' -+i_mntent='define' -+i_ndbm='undef' -+i_netdb='define' -+i_neterrno='undef' -+i_netinettcp='define' -+i_niin='define' -+i_poll='define' -+i_prot='undef' -+i_pthread='define' -+i_pwd='define' -+i_rpcsvcdbm='undef' -+i_sfio='undef' -+i_sgtty='undef' -+i_shadow='define' -+i_socks='undef' -+i_stdarg='define' -+i_stddef='define' -+i_stdlib='define' -+i_string='define' -+i_sunmath='undef' -+i_sysaccess='undef' -+i_sysdir='define' -+i_sysfile='define' -+i_sysfilio='undef' -+i_sysin='undef' -+i_sysioctl='define' -+i_syslog='define' -+i_sysmman='define' -+i_sysmode='undef' -+i_sysmount='define' -+i_sysndir='undef' -+i_sysparam='define' -+i_sysresrc='define' -+i_syssecrt='undef' -+i_sysselct='define' -+i_syssockio='undef' -+i_sysstat='define' -+i_sysstatfs='define' -+i_sysstatvfs='define' -+i_systime='define' -+i_systimek='undef' -+i_systimes='define' -+i_systypes='define' -+i_sysuio='define' -+i_sysun='define' -+i_sysutsname='define' -+i_sysvfs='define' -+i_syswait='define' -+i_termio='undef' -+i_termios='define' -+i_time='define' -+i_unistd='define' -+i_ustat='undef' -+i_utime='define' -+i_values='define' -+i_varargs='undef' -+i_varhdr='stdarg.h' -+i_vfork='undef' -+ignore_versioned_solibs='y' -+inc_version_list=' ' -+inc_version_list_init='0' -+incpath='' -+inews='' -+installarchlib='./install_me_here/usr/lib/perl/5.8.0/TARGET_ARCH-linux' -+installbin='./install_me_here/usr/bin' -+installman1dir='' -+installman3dir='' -+installprefix='./install_me_here/usr/lib/perl/5.8.0' -+installprefixexp='./install_me_here/usr/lib/perl/5.8.0' -+installprivlib='./install_me_here/usr/lib/perl/5.8.0' -+installscript='./install_me_here/usr/bin' -+installsitearch='./install_me_here/usr/lib/perl/5.8.0/TARGET_ARCH-linux' -+installsitebin='./install_me_here/usr/bin' -+installsitelib='./install_me_here/usr/lib/perl/5.8.0' -+installstyle='lib' -+installusrbinperl='undef' -+installvendorarch='' -+installvendorbin='' -+installvendorlib='' -+intsize='4' -+issymlink='/usr/bin/test -h' -+ivdformat='"ld"' -+ivsize='4' -+ivtype='long' -+known_extensions='B ByteLoader Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Encode Fcntl File/Glob Filter/Util/Call GDBM_File I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Thread Time/HiRes Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared' -+ksh='' -+ld='TARGET_CROSScc' -+lddlflags='-shared' -+ldflags='' -+ldflags_uselargefiles='' -+ldlibpthname='LD_LIBRARY_PATH' -+less='less' -+lib_ext='.a' -+libc='/lib/libc.so.0' -+libperl='libperl.a' -+libpth='/lib /usr/lib' -+libs='-ldl -lm -lpthread -lc -lcrypt' -+libsdirs='' -+libsfiles='' -+libsfound='' -+libspath=' /lib /usr/lib' -+libswanted='sfio socket bind inet nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt sec ucb BSD PW x util' -+libswanted_uselargefiles='' -+line='' -+lint='' -+lkflags='' -+ln='ln' -+lns='/bin/ln -s' -+localtime_r_proto='0' -+locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include' -+loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib' -+longdblsize='8' -+longlongsize='8' -+longsize='4' -+lp='' -+lpr='' -+ls='ls' -+lseeksize='8' -+lseektype='off_t' -+mail='' -+mailx='' -+make='make' -+make_set_make='#' -+mallocobj='' -+mallocsrc='' -+malloctype='void *' -+man1dir=' ' -+man1direxp='' -+man1ext='0' -+man3dir=' ' -+man3direxp='' -+man3ext='0' -+mips_type='' -+mkdir='mkdir' -+mmaptype='void *' -+modetype='mode_t' -+more='more' -+multiarch='undef' -+mv='' -+myarchname='TARGET_ARCH-linux' -+n='-n' -+need_va_copy='undef' -+netdb_hlen_type='size_t' -+netdb_host_type='const void *' -+netdb_name_type='const char *' -+netdb_net_type='in_addr_t' -+nm='TARGET_CROSSnm' -+nm_opt='' -+nm_so_opt='--dynamic' -+nonxs_ext='Errno' -+nroff='nroff' -+nvEUformat='"E"' -+nvFUformat='"F"' -+nvGUformat='"G"' -+nv_preserves_uv_bits='32' -+nveformat='"e"' -+nvfformat='"f"' -+nvgformat='"g"' -+nvsize='8' -+nvtype='double' -+o_nonblock='O_NONBLOCK' -+obj_ext='.o' -+old_pthread_create_joinable='' -+optimize='-O2' -+orderlib='false' -+osname='linux' -+otherlibdirs=' ' -+package='perl5' -+pager='/bin/more' -+passcat='cat /etc/passwd' -+patchlevel='8' -+path_sep=':' -+perl5='' -+perl='' -+perl_patchlevel='' -+perllibs='-ldl -lm -lpthread -lc -lcrypt' -+perlpath='/usr/bin/perl' -+pg='pg' -+phostname='hostname' -+pidtype='pid_t' -+plibpth='' -+pm_apiversion='5.005' -+pmake='' -+pr='' -+prefix='/usr/lib/perl/5.8.0' -+prefixexp='/usr/lib/perl/5.8.0' -+privlib='/usr/lib/perl/5.8.0' -+privlibexp='/usr/lib/perl/5.8.0' -+procselfexe='"/proc/self/exe"' -+prototype='define' -+ptrsize='4' -+quadkind='3' -+quadtype='long long' -+randbits='48' -+randfunc='drand48' -+random_r_proto='0' -+randseedtype='long' -+ranlib='TARGET_CROSSranlib' -+rd_nodata='-1' -+readdir64_r_proto='0' -+readdir_r_proto='0' -+revision='5' -+rm='rm' -+rmail='' -+run='' -+runnm='true' -+sPRIEUldbl='"E"' -+sPRIFUldbl='"F"' -+sPRIGUldbl='"G"' -+sPRIXU64='"LX"' -+sPRId64='"Ld"' -+sPRIeldbl='"e"' -+sPRIfldbl='"f"' -+sPRIgldbl='"g"' -+sPRIi64='"Li"' -+sPRIo64='"Lo"' -+sPRIu64='"Lu"' -+sPRIx64='"Lx"' -+sSCNfldbl='"f"' -+sched_yield='sched_yield()' -+scriptdir='/usr/bin' -+scriptdirexp='/usr/bin' -+sed='sed' -+seedfunc='srand48' -+selectminbits='32' -+selecttype='fd_set *' -+sendmail='' -+setgrent_r_proto='0' -+sethostent_r_proto='0' -+setlocale_r_proto='0' -+setnetent_r_proto='0' -+setprotoent_r_proto='0' -+setpwent_r_proto='0' -+setservent_r_proto='0' -+sh='/bin/sh' -+shar='' -+sharpbang='#!' -+shmattype='void *' -+shortsize='2' -+shrpenv='' -+shsharp='true' -+sig_count='64' -+sig_name='ZERO HUP INT QUIT ILL TRAP ABRT BUS FPE KILL USR1 SEGV USR2 PIPE ALRM TERM STKFLT CHLD CONT STOP TSTP TTIN TTOU URG XCPU XFSZ VTALRM PROF WINCH IO PWR SYS RTMIN NUM33 NUM34 NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 RTMAX IOT CLD POLL UNUSED ' -+sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "BUS", "FPE", "KILL", "USR1", "SEGV", "USR2", "PIPE", "ALRM", "TERM", "STKFLT", "CHLD", "CONT", "STOP", "TSTP", "TTIN", "TTOU", "URG", "XCPU", "XFSZ", "VTALRM", "PROF", "WINCH", "IO", "PWR", "SYS", "RTMIN", "NUM33", "NUM34", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "RTMAX", "IOT", "CLD", "POLL", "UNUSED", 0' -+sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 6 17 29 31 ' -+sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0' -+sig_size='68' -+signal_t='void' -+sitearch='/usr/lib/perl/5.8.0/TARGET_ARCH-linux' -+sitearchexp='/usr/lib/perl/5.8.0/TARGET_ARCH-linux' -+sitebin='/usr/bin' -+sitebinexp='/usr/bin' -+sitelib='/usr/lib/perl/5.8.0' -+sitelib_stem='/usr/lib/perl/5.8.0/lib/site_perl' -+sitelibexp='/usr/lib/perl/5.8.0' -+siteprefix='/usr/lib/perl/5.8.0' -+siteprefixexp='/usr/lib/perl/5.8.0' -+sizesize='4' -+sizetype='size_t' -+sleep='' -+smail='' -+so='so' -+sockethdr='' -+socketlib='' -+socksizetype='socklen_t' -+sort='sort' -+spackage='Perl5' -+spitshell='cat' -+srand48_r_proto='0' -+srandom_r_proto='0' -+src='.' -+ssizetype='ssize_t' -+startperl='#!/usr/bin/perl' -+startsh='#!/bin/sh' -+static_ext=' ' -+stdchar='char' -+stdio_base='((fp)->_base)' -+stdio_bufsiz='((fp)->_cnt + (fp)->_ptr - (fp)->_base)' -+stdio_cnt='((fp)->_cnt)' -+stdio_filbuf='' -+stdio_ptr='((fp)->_ptr)' -+stdio_stream_array='' -+strerror_r_proto='0' -+strings='/usr/include/string.h' -+submit='' -+subversion='0' -+sysman='/usr/man/man1' -+tail='' -+tar='' -+targetarch='' -+tbl='' -+tee='' -+test='test' -+timeincl='/usr/include/sys/time.h /usr/include/time.h ' -+timetype='time_t' -+tmpnam_r_proto='0' -+to=':' -+touch='touch' -+tr='tr' -+trnl='\n' -+troff='' -+ttyname_r_proto='0' -+u16size='2' -+u16type='unsigned short' -+u32size='4' -+u32type='unsigned long' -+u64size='8' -+u64type='unsigned long long' -+u8size='1' -+u8type='unsigned char' -+uidformat='"lu"' -+uidsign='1' -+uidsize='4' -+uidtype='uid_t' -+uname='uname' -+uniq='uniq' -+uquadtype='unsigned long long' -+use5005threads='undef' -+use64bitall='undef' -+use64bitint='undef' -+usecrosscompile='undef' -+usedl='define' -+useithreads='undef' -+uselargefiles='define' -+uselongdouble='undef' -+usemorebits='undef' -+usemultiplicity='undef' -+usemymalloc='n' -+usenm='true' -+useopcode='true' -+useperlio='define' -+useposix='true' -+usereentrant='undef' -+usesfio='false' -+useshrplib='false' -+usesocks='undef' -+usethreads='undef' -+usevendorprefix='undef' -+usevfork='false' -+usrinc='/usr/include' -+uuname='' -+uvXUformat='"lX"' -+uvoformat='"lo"' -+uvsize='4' -+uvtype='unsigned long' -+uvuformat='"lu"' -+uvxformat='"lx"' -+vendorarch='' -+vendorarchexp='' -+vendorbin='' -+vendorbinexp='' -+vendorlib='' -+vendorlib_stem='' -+vendorlibexp='' -+vendorprefix='' -+vendorprefixexp='' -+version='5.8.0' -+version_patchlevel_string='version 8 subversion 0' -+versiononly='undef' -+vi='' -+voidflags='15' -+xlibpth='/usr/lib/386 /lib/386' -+xs_apiversion='5.8.0' -+yacc='yacc' -+yaccflags='' -+zcat='' -+zip='zip' -+# Configure command line arguments. -+config_arg0='./Configure' -+config_args='-Dprefix=/usr/lib/perl/5.8.0 -Uinstallusrbinperl -des' -+config_argc=3 -+config_arg1='-Dprefix=/usr/lib/perl/5.8.0' -+config_arg2='-Uinstallusrbinperl' -+config_arg3='-des' -+PERL_REVISION=5 -+PERL_VERSION=8 -+PERL_SUBVERSION=0 -+PERL_API_REVISION=5 -+PERL_API_VERSION=8 -+PERL_API_SUBVERSION=0 -+PERL_PATCHLEVEL= -+PERL_CONFIG_SH=true -+# Variables propagated from previous config.sh file. -+siteman1='' -+siteman3='' -+sitescript='' diff --git a/target/Config.in b/target/Config.in new file mode 100644 index 0000000000..dbc631725a --- /dev/null +++ b/target/Config.in @@ -0,0 +1,8 @@ +# + +menu "Target Options" + +source "target/cramfs/Config.in" + +endmenu + diff --git a/target/Makefile.in b/target/Makefile.in new file mode 100644 index 0000000000..c01ade299a --- /dev/null +++ b/target/Makefile.in @@ -0,0 +1 @@ +# Nothing diff --git a/target/cramfs/Config.in b/target/cramfs/Config.in new file mode 100644 index 0000000000..2ba1cdece8 --- /dev/null +++ b/target/cramfs/Config.in @@ -0,0 +1,6 @@ +config BR2_TARGET_ROOTFS_CRAMFS + bool "Build a cramfs root filesystem for the target device" + default n + help + Build a cramfs root filesystem + diff --git a/target/cramfs/Makefile.in b/target/cramfs/Makefile.in new file mode 100644 index 0000000000..45d9b67ce6 --- /dev/null +++ b/target/cramfs/Makefile.in @@ -0,0 +1,3 @@ +ifeq ($(strip $(BR2_TARGET_ROOTFS_CRAMFS)),y) +TARGETS+=cramfsroot +endif diff --git a/package/cramfsroot/cramfsroot.mk b/target/cramfs/cramfs.mk index 0f1204a258..0f1204a258 100644 --- a/package/cramfsroot/cramfsroot.mk +++ b/target/cramfs/cramfs.mk diff --git a/sources/cramfs.patch b/target/cramfs/cramfs.patch index 884eb8cb83..884eb8cb83 100644 --- a/sources/cramfs.patch +++ b/target/cramfs/cramfs.patch diff --git a/sources/device_table.txt b/target/default/device_table.txt index 8b46ca0323..8b46ca0323 100644 --- a/sources/device_table.txt +++ b/target/default/device_table.txt diff --git a/sources/skel.tar.gz b/target/default/skel.tar.gz Binary files differindex 301c5cfa28..301c5cfa28 100644 --- a/sources/skel.tar.gz +++ b/target/default/skel.tar.gz diff --git a/sources/target_skeleton/etc/TZ b/target/default/target_skeleton/etc/TZ index 9fcb2a3c56..9fcb2a3c56 100644 --- a/sources/target_skeleton/etc/TZ +++ b/target/default/target_skeleton/etc/TZ diff --git a/sources/target_skeleton/etc/fstab b/target/default/target_skeleton/etc/fstab index 6d33629a7b..6d33629a7b 100644 --- a/sources/target_skeleton/etc/fstab +++ b/target/default/target_skeleton/etc/fstab diff --git a/sources/target_skeleton/etc/group b/target/default/target_skeleton/etc/group index a21ef0f769..a21ef0f769 100644 --- a/sources/target_skeleton/etc/group +++ b/target/default/target_skeleton/etc/group diff --git a/sources/target_skeleton/etc/hostname b/target/default/target_skeleton/etc/hostname index 52e67d68aa..52e67d68aa 100644 --- a/sources/target_skeleton/etc/hostname +++ b/target/default/target_skeleton/etc/hostname diff --git a/sources/target_skeleton/etc/hosts b/target/default/target_skeleton/etc/hosts index ba712fe033..ba712fe033 100644 --- a/sources/target_skeleton/etc/hosts +++ b/target/default/target_skeleton/etc/hosts diff --git a/sources/target_skeleton/etc/init.d/S20urandom b/target/default/target_skeleton/etc/init.d/S20urandom index 433fafee4e..433fafee4e 100755 --- a/sources/target_skeleton/etc/init.d/S20urandom +++ b/target/default/target_skeleton/etc/init.d/S20urandom diff --git a/sources/target_skeleton/etc/init.d/S40network b/target/default/target_skeleton/etc/init.d/S40network index d835d9c72a..d835d9c72a 100755 --- a/sources/target_skeleton/etc/init.d/S40network +++ b/target/default/target_skeleton/etc/init.d/S40network diff --git a/sources/target_skeleton/etc/init.d/rcS b/target/default/target_skeleton/etc/init.d/rcS index de411534da..de411534da 100755 --- a/sources/target_skeleton/etc/init.d/rcS +++ b/target/default/target_skeleton/etc/init.d/rcS diff --git a/sources/target_skeleton/etc/inittab b/target/default/target_skeleton/etc/inittab index a6c014e751..a6c014e751 100644 --- a/sources/target_skeleton/etc/inittab +++ b/target/default/target_skeleton/etc/inittab diff --git a/sources/target_skeleton/etc/inputrc b/target/default/target_skeleton/etc/inputrc index 2f1cb601a5..2f1cb601a5 100644 --- a/sources/target_skeleton/etc/inputrc +++ b/target/default/target_skeleton/etc/inputrc diff --git a/sources/target_skeleton/etc/issue b/target/default/target_skeleton/etc/issue index f24b862c97..f24b862c97 100644 --- a/sources/target_skeleton/etc/issue +++ b/target/default/target_skeleton/etc/issue diff --git a/sources/target_skeleton/etc/network/interfaces b/target/default/target_skeleton/etc/network/interfaces index 218b82cde5..218b82cde5 100644 --- a/sources/target_skeleton/etc/network/interfaces +++ b/target/default/target_skeleton/etc/network/interfaces diff --git a/sources/target_skeleton/etc/passwd b/target/default/target_skeleton/etc/passwd index e0f473fc7b..e0f473fc7b 100644 --- a/sources/target_skeleton/etc/passwd +++ b/target/default/target_skeleton/etc/passwd diff --git a/sources/target_skeleton/etc/profile b/target/default/target_skeleton/etc/profile index cc2e0beb87..cc2e0beb87 100644 --- a/sources/target_skeleton/etc/profile +++ b/target/default/target_skeleton/etc/profile diff --git a/sources/target_skeleton/etc/protocols b/target/default/target_skeleton/etc/protocols index e717657c59..1ac8a40967 100644 --- a/sources/target_skeleton/etc/protocols +++ b/target/default/target_skeleton/etc/protocols @@ -1,5 +1,5 @@ # /etc/protocols: -# $Id: protocols,v 1.3 2002/04/26 22:01:41 andersen Exp $ +# $Id: protocols,v 1.1 2004/10/09 02:49:18 andersen Exp $ # # Internet (IP) protocols # diff --git a/sources/target_skeleton/etc/random-seed b/target/default/target_skeleton/etc/random-seed Binary files differindex f26038adc5..f26038adc5 100644 --- a/sources/target_skeleton/etc/random-seed +++ b/target/default/target_skeleton/etc/random-seed diff --git a/sources/target_skeleton/etc/resolv.conf b/target/default/target_skeleton/etc/resolv.conf index 71a86dd76c..71a86dd76c 100644 --- a/sources/target_skeleton/etc/resolv.conf +++ b/target/default/target_skeleton/etc/resolv.conf diff --git a/sources/target_skeleton/etc/securetty b/target/default/target_skeleton/etc/securetty index 81616f38ea..81616f38ea 100644 --- a/sources/target_skeleton/etc/securetty +++ b/target/default/target_skeleton/etc/securetty diff --git a/sources/target_skeleton/etc/services b/target/default/target_skeleton/etc/services index ebe7ab2bd2..b287b63ea0 100644 --- a/sources/target_skeleton/etc/services +++ b/target/default/target_skeleton/etc/services @@ -1,5 +1,5 @@ # /etc/services: -# $Id: services,v 1.4 2003/06/14 00:47:20 andersen Exp $ +# $Id: services,v 1.1 2004/10/09 02:49:18 andersen Exp $ # # Network services, Internet style # diff --git a/sources/target_skeleton/etc/shadow b/target/default/target_skeleton/etc/shadow index 4941a1ac53..4941a1ac53 100644 --- a/sources/target_skeleton/etc/shadow +++ b/target/default/target_skeleton/etc/shadow diff --git a/sources/target_skeleton/root/.bash_history b/target/default/target_skeleton/root/.bash_history index e69de29bb2..e69de29bb2 100644 --- a/sources/target_skeleton/root/.bash_history +++ b/target/default/target_skeleton/root/.bash_history diff --git a/sources/target_skeleton/root/.bash_logout b/target/default/target_skeleton/root/.bash_logout index 77ef1f9508..77ef1f9508 100644 --- a/sources/target_skeleton/root/.bash_logout +++ b/target/default/target_skeleton/root/.bash_logout diff --git a/sources/target_skeleton/root/.bash_profile b/target/default/target_skeleton/root/.bash_profile index 27bf14953d..27bf14953d 100644 --- a/sources/target_skeleton/root/.bash_profile +++ b/target/default/target_skeleton/root/.bash_profile diff --git a/sources/target_skeleton/root/.bashrc b/target/default/target_skeleton/root/.bashrc index d13c8f9026..d13c8f9026 100644 --- a/sources/target_skeleton/root/.bashrc +++ b/target/default/target_skeleton/root/.bashrc diff --git a/sources/target_skeleton/usr/share/terminfo/a/ansi b/target/default/target_skeleton/usr/share/terminfo/a/ansi Binary files differindex 3884faec40..3884faec40 100644 --- a/sources/target_skeleton/usr/share/terminfo/a/ansi +++ b/target/default/target_skeleton/usr/share/terminfo/a/ansi diff --git a/sources/target_skeleton/usr/share/terminfo/d/dumb b/target/default/target_skeleton/usr/share/terminfo/d/dumb Binary files differindex fd4091a994..fd4091a994 100644 --- a/sources/target_skeleton/usr/share/terminfo/d/dumb +++ b/target/default/target_skeleton/usr/share/terminfo/d/dumb diff --git a/sources/target_skeleton/usr/share/terminfo/l/linux b/target/default/target_skeleton/usr/share/terminfo/l/linux Binary files differindex 7f5844cef5..7f5844cef5 100644 --- a/sources/target_skeleton/usr/share/terminfo/l/linux +++ b/target/default/target_skeleton/usr/share/terminfo/l/linux diff --git a/sources/target_skeleton/usr/share/terminfo/r/rxvt b/target/default/target_skeleton/usr/share/terminfo/r/rxvt Binary files differindex 359465fea8..359465fea8 100644 --- a/sources/target_skeleton/usr/share/terminfo/r/rxvt +++ b/target/default/target_skeleton/usr/share/terminfo/r/rxvt diff --git a/sources/target_skeleton/usr/share/terminfo/s/screen b/target/default/target_skeleton/usr/share/terminfo/s/screen Binary files differindex b8377500ad..b8377500ad 100644 --- a/sources/target_skeleton/usr/share/terminfo/s/screen +++ b/target/default/target_skeleton/usr/share/terminfo/s/screen diff --git a/sources/target_skeleton/usr/share/terminfo/s/screen-w b/target/default/target_skeleton/usr/share/terminfo/s/screen-w Binary files differindex 8533897b95..8533897b95 100644 --- a/sources/target_skeleton/usr/share/terminfo/s/screen-w +++ b/target/default/target_skeleton/usr/share/terminfo/s/screen-w diff --git a/sources/target_skeleton/usr/share/terminfo/s/sun b/target/default/target_skeleton/usr/share/terminfo/s/sun Binary files differindex 77aaa3a958..77aaa3a958 100644 --- a/sources/target_skeleton/usr/share/terminfo/s/sun +++ b/target/default/target_skeleton/usr/share/terminfo/s/sun diff --git a/sources/target_skeleton/usr/share/terminfo/v/vt100 b/target/default/target_skeleton/usr/share/terminfo/v/vt100 Binary files differindex 647ca5c133..647ca5c133 100644 --- a/sources/target_skeleton/usr/share/terminfo/v/vt100 +++ b/target/default/target_skeleton/usr/share/terminfo/v/vt100 diff --git a/sources/target_skeleton/usr/share/terminfo/v/vt220 b/target/default/target_skeleton/usr/share/terminfo/v/vt220 Binary files differindex f10553acd6..f10553acd6 100644 --- a/sources/target_skeleton/usr/share/terminfo/v/vt220 +++ b/target/default/target_skeleton/usr/share/terminfo/v/vt220 diff --git a/sources/target_skeleton/usr/share/terminfo/v/vt52 b/target/default/target_skeleton/usr/share/terminfo/v/vt52 Binary files differindex 61a8ad04d3..61a8ad04d3 100644 --- a/sources/target_skeleton/usr/share/terminfo/v/vt52 +++ b/target/default/target_skeleton/usr/share/terminfo/v/vt52 diff --git a/sources/target_skeleton/usr/share/terminfo/x/xterm b/target/default/target_skeleton/usr/share/terminfo/x/xterm Binary files differindex 310a7fb62a..310a7fb62a 100644 --- a/sources/target_skeleton/usr/share/terminfo/x/xterm +++ b/target/default/target_skeleton/usr/share/terminfo/x/xterm diff --git a/sources/target_skeleton/usr/share/terminfo/x/xterm-xfree86 b/target/default/target_skeleton/usr/share/terminfo/x/xterm-xfree86 Binary files differindex e4d9966c72..e4d9966c72 100644 --- a/sources/target_skeleton/usr/share/terminfo/x/xterm-xfree86 +++ b/target/default/target_skeleton/usr/share/terminfo/x/xterm-xfree86 diff --git a/sources/target_skeleton/usr/share/udhcpc/default.script b/target/default/target_skeleton/usr/share/udhcpc/default.script index a52a7f8122..a52a7f8122 100755 --- a/sources/target_skeleton/usr/share/udhcpc/default.script +++ b/target/default/target_skeleton/usr/share/udhcpc/default.script diff --git a/package/ext2root/ext2root.mk b/target/ext2/ext2root.mk index ff2877145f..ff2877145f 100644 --- a/package/ext2root/ext2root.mk +++ b/target/ext2/ext2root.mk diff --git a/sources/genext2fs.patch b/target/ext2/genext2fs.patch index 73e5ce0aaa..73e5ce0aaa 100644 --- a/sources/genext2fs.patch +++ b/target/ext2/genext2fs.patch diff --git a/package/jffs2root/jffs2root.mk b/target/jffs2/jffs2root.mk index a8c6de68ce..a8c6de68ce 100644 --- a/package/jffs2root/jffs2root.mk +++ b/target/jffs2/jffs2root.mk diff --git a/sources/squashfs.patch b/target/squashfs/squashfs.patch index ea75a7f18a..ea75a7f18a 100644 --- a/sources/squashfs.patch +++ b/target/squashfs/squashfs.patch diff --git a/package/squashfsroot/squashfsroot.mk b/target/squashfs/squashfsroot.mk index 523d5e2a9d..523d5e2a9d 100644 --- a/package/squashfsroot/squashfsroot.mk +++ b/target/squashfs/squashfsroot.mk diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index fbd0196994..6e06f97248 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -33,7 +33,7 @@ $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE) $(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked # Apply appropriate binutils patches. - $(SOURCE_DIR)/patch-kernel.sh $(BINUTILS_DIR) toolchain/binutils/$(BINUTILS_VERSION) \*.patch + toolchain/patch-kernel.sh $(BINUTILS_DIR) toolchain/binutils/$(BINUTILS_VERSION) \*.patch touch $(BINUTILS_DIR)/.patched $(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched diff --git a/toolchain/gcc/gcc-uclibc-2.95.mk b/toolchain/gcc/gcc-uclibc-2.95.mk index cedbfd92ce..e75fb6bf8f 100644 --- a/toolchain/gcc/gcc-uclibc-2.95.mk +++ b/toolchain/gcc/gcc-uclibc-2.95.mk @@ -62,7 +62,7 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked # Apply any files named gcc-*.patch from the source directory to gcc - $(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) \*.patch + toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) \*.patch # # We do not wish to build the libstdc++ library provided with gcc, # since it doesn't seem to work at all with uClibc plus gcc 2.95... diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index cc32d29529..2d15b6f3c8 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -67,7 +67,7 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked # Apply any files named gcc-*.patch from the source directory to gcc - $(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) \*.patch + toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) \*.patch # Note: The soft float situation has improved considerably with gcc 3.4.x. # We can dispense with the custom spec files, as well as libfloat for the arm case. # However, we still need a patch for arm. There's a similar patch for gcc 3.3.x @@ -75,14 +75,14 @@ $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked # anyone (?) who might still be using gcc 2.95. mjn3 ifeq ($(SOFT_FLOAT),true) ifeq ("$(strip $(ARCH))","arm") - $(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional + toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional endif ifeq ("$(strip $(ARCH))","armeb") - $(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional + toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) arm-softfloat.patch.conditional endif # Not yet updated to 3.4.1. #ifeq ("$(strip $(ARCH))","i386") - #$(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) toolchain/gcc i386-gcc-soft-float.patch + #toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc i386-gcc-soft-float.patch #endif endif touch $(GCC_DIR)/.patched diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index 5340ab10e8..057ccad27f 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -22,7 +22,7 @@ $(DL_DIR)/$(GDB_SOURCE): $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE) $(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(TOOL_BUILD_DIR) -xvf - - $(SOURCE_DIR)/patch-kernel.sh $(GDB_DIR) $(SOURCE_DIR)/gdb/$(GDB_VERSION) \*.patch + toolchain/patch-kernel.sh $(GDB_DIR) $(SOURCE_DIR)/gdb/$(GDB_VERSION) \*.patch # Copy a config.sub from gcc. This is only necessary until # gdb's config.sub supports <arch>-linux-uclibc tuples. # Should probably integrate this into the patch. diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 39d14e6dcb..4c3b9a2536 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -65,7 +65,7 @@ endif touch $(LINUX_HEADERS_DIR)/.unpacked $(LINUX_HEADERS_DIR)/.patched: $(LINUX_HEADERS_DIR)/.unpacked - $(SOURCE_DIR)/patch-kernel.sh $(LINUX_HEADERS_DIR) toolchain/kernel-headers linux-libc-headers-$(LINUX_VERSION)-\*.patch + toolchain/patch-kernel.sh $(LINUX_HEADERS_DIR) toolchain/kernel-headers linux-libc-headers-$(LINUX_VERSION)-\*.patch touch $(LINUX_HEADERS_DIR)/.patched $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.patched diff --git a/sources/linux-libc-headers-2.6.8-cleanup.patch b/toolchain/kernel-headers/linux-libc-headers-2.6.8-cleanup.patch index 44461d1abf..44461d1abf 100644 --- a/sources/linux-libc-headers-2.6.8-cleanup.patch +++ b/toolchain/kernel-headers/linux-libc-headers-2.6.8-cleanup.patch diff --git a/sources/patch-kernel.sh b/toolchain/patch-kernel.sh index 79401c2a74..79401c2a74 100755 --- a/sources/patch-kernel.sh +++ b/toolchain/patch-kernel.sh |
