summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Documentation/NEWPACKETHOWTO90
-rw-r--r--Documentation/README9
-rw-r--r--Makefile85
-rw-r--r--TODO219
-rw-r--r--config/Config.in327
-rw-r--r--config/ptxconfig-i386-generic-glibc-20031018-1831
-rw-r--r--config/ptxconfig-i386-generic-uclibc-20031001-1883
-rwxr-xr-xrules/NEWPACKET-XCHAIN36
-rwxr-xr-xrules/NEWPATCH35
-rw-r--r--rules/Rules.make65
-rw-r--r--rules/Version.make59
-rw-r--r--rules/Virtual.make32
-rw-r--r--rules/addons.make18
-rw-r--r--rules/atk124.make34
-rw-r--r--rules/autoconf-2.13.make20
-rw-r--r--rules/autoconf-2.57.make20
-rw-r--r--rules/automake-1.5.make20
-rw-r--r--rules/automake-1.7.6.make20
-rw-r--r--rules/bash.make20
-rw-r--r--rules/binutils.make143
-rw-r--r--rules/bootdisk.make24
-rw-r--r--rules/busybox.make24
-rw-r--r--rules/clementine.make22
-rw-r--r--rules/coreutils.make52
-rw-r--r--rules/db41.in12
-rw-r--r--rules/db41.make141
-rw-r--r--rules/distcc.make103
-rw-r--r--rules/dropbear.in1
-rw-r--r--rules/dropbear.make24
-rw-r--r--rules/e2fsprogs.make88
-rw-r--r--rules/expat.make24
-rw-r--r--rules/flash.make24
-rw-r--r--rules/fltk.in7
-rw-r--r--rules/fltk.make145
-rw-r--r--rules/fontconfig22.make34
-rw-r--r--rules/freetype214.make20
-rw-r--r--rules/gdb.in32
-rw-r--r--rules/gdb.make123
-rw-r--r--rules/gdbserver.make114
-rw-r--r--rules/genext2fs.make117
-rw-r--r--rules/gettext.make24
-rw-r--r--rules/glib1210.make30
-rw-r--r--rules/glib22.make26
-rw-r--r--rules/glibc.in13
-rw-r--r--rules/glibc.make310
-rw-r--r--rules/gmp.make20
-rw-r--r--rules/gmp3.make20
-rw-r--r--rules/grub.make20
-rw-r--r--rules/gtk1210.make28
-rw-r--r--rules/gtk22.make24
-rw-r--r--rules/hosttool-genext2fs.make122
-rw-r--r--rules/inetutils.make27
-rw-r--r--rules/kaffe.make35
-rw-r--r--rules/kernel-ben.make63
-rw-r--r--rules/kernel-ds.make64
-rw-r--r--rules/kernel-ltt.make64
-rw-r--r--rules/kernel-mtd.make64
-rw-r--r--rules/kernel-ptx.make64
-rw-r--r--rules/kernel-pxa.make64
-rw-r--r--rules/kernel-rmk.make65
-rw-r--r--rules/kernel-rtai.make67
-rw-r--r--rules/kernel-uc.make64
-rw-r--r--rules/kernel.in863
-rw-r--r--rules/kernel.make453
-rw-r--r--rules/konq-e.make22
-rw-r--r--rules/libIDL068.make28
-rw-r--r--rules/libc.in7
-rw-r--r--rules/libgd.make22
-rw-r--r--rules/libnet.make21
-rw-r--r--rules/liboop.make21
-rw-r--r--rules/libpcap.make20
-rw-r--r--rules/libpng125.make24
-rw-r--r--rules/lilo.make20
-rw-r--r--rules/lrzsz.make24
-rw-r--r--rules/lsh.make6
-rw-r--r--rules/ltt.make75
-rw-r--r--rules/mfirebird.make25
-rw-r--r--rules/mtd.make71
-rw-r--r--rules/nasm.make135
-rw-r--r--rules/native-binutils.make126
-rw-r--r--rules/native-gcc.make148
-rw-r--r--rules/ncurses.in37
-rw-r--r--rules/ncurses.make135
-rw-r--r--rules/netcat.make116
-rw-r--r--rules/nettle.make6
-rw-r--r--rules/nfs-utils.make57
-rw-r--r--rules/nmap.make143
-rw-r--r--rules/openssh.make6
-rw-r--r--rules/openssl.make45
-rw-r--r--rules/oprofile.make40
-rw-r--r--rules/pango12.make38
-rw-r--r--rules/pcmcia-cs.make8
-rw-r--r--rules/pdksh.make24
-rw-r--r--rules/penguzilla.make28
-rw-r--r--rules/popt.make28
-rw-r--r--rules/portmap.make22
-rw-r--r--rules/pppd.make32
-rw-r--r--rules/procps.in21
-rw-r--r--rules/procps.make167
-rw-r--r--rules/proftpd.make6
-rw-r--r--rules/python.make22
-rw-r--r--rules/qt.make22
-rw-r--r--rules/rootfs.make20
-rw-r--r--rules/rsync.in7
-rw-r--r--rules/rsync.make139
-rw-r--r--rules/rtai.make134
-rw-r--r--rules/shorewall.make7
-rw-r--r--rules/strace.make26
-rw-r--r--rules/tcpwrapper.make26
-rw-r--r--rules/template14
-rw-r--r--rules/template-patch64
-rw-r--r--rules/tinylogin.make20
-rw-r--r--rules/u-boot-mkimage.make104
-rw-r--r--rules/uclibc.make27
-rw-r--r--rules/utelnetd.make22
-rw-r--r--rules/util-linux.make81
-rw-r--r--rules/vendor-tweaks/innokom.make27
-rw-r--r--rules/vhll.in4
-rw-r--r--rules/wireless.make23
-rw-r--r--rules/wxWindows.in19
-rw-r--r--rules/wxWindows.make149
-rw-r--r--rules/xalf.make22
-rw-r--r--rules/xchain-binutils.make131
-rw-r--r--rules/xchain-gccstage1.make149
-rw-r--r--rules/xchain-gccstage2.make118
-rw-r--r--rules/xchain-gdb.make65
-rw-r--r--rules/xchain-glibc.make118
-rw-r--r--rules/xchain-kaffe.make23
-rw-r--r--rules/xchain-kernel-ben.make43
-rw-r--r--rules/xchain-kernel-ds.make43
-rw-r--r--rules/xchain-kernel-mtd.make43
-rw-r--r--rules/xchain-kernel-ptx.make43
-rw-r--r--rules/xchain-kernel-pxa.make43
-rw-r--r--rules/xchain-kernel-rmk.make43
-rw-r--r--rules/xchain-kernel-uc.make43
-rw-r--r--rules/xchain-kernel.make141
-rw-r--r--rules/xchain-ksymoops.make (renamed from rules/ksymoops.make)46
-rw-r--r--rules/xchain-ltt.make127
-rw-r--r--rules/xchain-nasm.make138
-rw-r--r--rules/xchain-python.make18
-rw-r--r--rules/xchain-uclibc.make29
-rw-r--r--rules/xchain-umkimage.make123
-rw-r--r--rules/xchain-zlib.make16
-rw-r--r--rules/xfree430.make30
-rw-r--r--rules/xvkbd.make22
-rw-r--r--rules/zebra.make61
-rw-r--r--rules/zlib.make18
148 files changed, 8130 insertions, 2973 deletions
diff --git a/ChangeLog b/ChangeLog
index eb49abef0..1cac803b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,11 @@
* cramfs tools: added
* innokom: configuration update
+2003-10-xx Robert Schwebel <r.schwebel@pengutronix.de>
+
+ * nmap: Fix nmap to care for the PTXCONF_OPENSSL
+ switch. (Milan Bobde, Ixia)
+
2003-09-25 Robert Schwebel <r.schwebel@pengutronix.de>
* Documentation: added attempt of a documentation dir
diff --git a/Documentation/NEWPACKETHOWTO b/Documentation/NEWPACKETHOWTO
new file mode 100644
index 000000000..4c1c33cb0
--- /dev/null
+++ b/Documentation/NEWPACKETHOWTO
@@ -0,0 +1,90 @@
+PTXdist
+How to add a new packet to the building tree
+============================================
+
+General notes
+-------------
+
+The script rules/NEWPACKET; it asks you some basic questions and
+spits out a makefile for your packet which has the major stuff in place
+and can easily be adapted to your needs afterwards.
+
+The basic idea is that Makefile, rules/Rules.make and rules/*.make are
+all one big makefile (included by Makefile). So you can make some target
+being dependend on every other target of the system. Just find out what
+you need in order to build something and add it to the list of
+dependencies.
+
+Then you have the configuration system: it all starts with
+config/Config.in, which will be split up in the future. For some packets
+it follows the "new" scheme to include rules/foobar.in files for the
+packets.
+
+NEWPACKET just takes rules/template.make and fills in the stuff you
+enter. You have to add config options for your packets, either in
+config/Config.in or - better - just add a source entry there and add
+your options in rules/foobar.in.
+
+
+Steps
+-----
+
+A. use script rules/NEWPACKET to add a new packet (example NewToolName)
+B. rules/NewToolName.in
+C. config/Config.in
+
+
+
+Example
+-------
+
+In this example we are going to add a new packet into the
+menu "Graphics Libraries "
+
+1.---------
+Edit rules/NewToolName.in and modify the entries you want to see
+when configuring
+
+menu "NewToolName-2.1.0 "
+config NEWTOOLNAME
+ bool
+ prompt "Compile NewToolName"
+endmenu
+
+2.---------
+Edit config/Config.in
+
+menu "Graphics Libraries "
+
+source rules/xfree430.in
+source rules/clementine.in
+source rules/NewToolName.in
+
+endmenu
+
+
+Caution
+-------
+If you perform a manual compilation (like me)
+
+$ make xconfig
+$ make extract
+$ make prepare
+$ make compile
+$ make install
+
+bear in mind that each make step is conditioned by the existence of the
+correspondent touched file in the directory state.
+So you get these three files after these steps
+state/NewToolName.extract
+state/NewToolName.prepare
+state/NewToolName.compile
+
+If you need a modulr rebuild you need simply to delete the file corresponding
+to the desired step.
+
+
+
+03-10-2003
+Marco Cavallini <m.cavallini@koansoftware.com>
+
diff --git a/Documentation/README b/Documentation/README
index 154f2fcc7..8f8ea03de 100644
--- a/Documentation/README
+++ b/Documentation/README
@@ -20,4 +20,13 @@ the kernel is started. PTXdist takes care of changes in the kernels
.config files, it is copied from and to the specified config file.
+Developement - new Packets
+--------------------------
+When adding a new packet to ptxdist which requires a patch, you'd like
+to use $(call get_patches) and $(call patchin), but you can't, because
+the patch isn't in the public repository yet.
+
+So, here's a patch against 'ptxdist-testing-20031001-1.tar.bz2' that
+adds a local repository called patches-local; patches in there are
+applied after those from the public repository.
diff --git a/Makefile b/Makefile
index 550f0a1a9..318588891 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,20 @@
-# $Id: Makefile,v 1.42 2003/10/23 10:19:03 robert Exp $
+# $Id: Makefile,v 1.43 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Robert Schwebel <r.schwebel@pengutronix.de>
-# (c) 2002 by Jochen Striepe <ptxdist@tolot.escape.de>
+# Copyright (C) 2002 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2002 by Jochen Striepe <ptxdist@tolot.escape.de>
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
#
-# For further information about the PTXDIST project see the README file.
+# For further information about the PTXdist project see the README file.
PROJECT = PTXdist
VERSION = 0
PATCHLEVEL = 4
SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = -cvs
FULLVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
-export PROJECT VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION
+export PROJECT VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION FULLVERSION
MAKE=make
TAR=tar
@@ -22,6 +23,8 @@ TOPDIR=$(shell /bin/pwd)
BASENAME=$(shell /usr/bin/basename $(TOPDIR))
BUILDDIR=$(TOPDIR)/build
XCHAIN_BUILDDIR=$(BUILDDIR)/xchain
+NATIVE_BUILDDIR=$(BUILDDIR)/native
+PATCHES_BUILDDIR=$(BUILDDIR)/patches
SRCDIR=$(TOPDIR)/src
PTXSRCDIR=$(TOPDIR)/src_ptx
PATCHDIR=$(TOPDIR)/patches
@@ -35,6 +38,7 @@ INSTALL_LOG=$(TOPDIR)/tools/install-log-1.9/install-log
PACKAGES=
XCHAIN=
+NATIVE=
export TAR TOPDIR BUILDDIR ROOTDIR SRCDIR PTXSRCDIR STATEDIR PACKAGES
@@ -42,10 +46,7 @@ all: help
-include .config
-# remove quotes
-PTXCONF_VENDORTWEAKS:=$(subst ",,$(PTXCONF_VENDORTWEAKS))
-
-ROOTDIR=$(shell echo $(PTXCONF_ROOT) | sed -e s/\"//g)
+ROOTDIR=$(subst ",,$(PTXCONF_ROOT))
ifeq ("", $(PTXCONF_ROOT))
ROOTDIR=$(TOPDIR)/root
endif
@@ -53,19 +54,25 @@ ifndef PTXCONF_ROOT
ROOTDIR=$(TOPDIR)/root
endif
-include $(wildcard rules/*.make)
+include rules/Rules.make
+include rules/Version.make
+include $(filter-out rules/Virtual.make,$(wildcard rules/*.make))
+include rules/Virtual.make
+
+PTXCONF_TARGET_CONFIG_FILE ?= none
+ifeq ("", $(PTXCONF_TARGET_CONFIG_FILE))
+PTXCONF_TARGET_CONFIG_FILE = none
+endif
+-include config/arch/$(subst ",,$(PTXCONF_TARGET_CONFIG_FILE))
# if specified, include vendor tweak makefile (run at the end of build)
# rewrite variable to make the magic in 'world' target work
-ifeq (exists, $(shell test -f rules/vendor-tweaks/$(PTXCONF_VENDORTWEAKS) && echo exists))
-include rules/vendor-tweaks/$(PTXCONF_VENDORTWEAKS)
-PTXCONF_VENDORTWEAKS=vendor-tweaks_targetinstall
-else
-PTXCONF_VENDORTWEAKS=skip_vendortweaks
-endif
-PTXCONF_TARGET_CONFIG_FILE?="arm"
--include config/arch/$(subst ",,$(PTXCONF_TARGET_CONFIG_FILE))
+PTXCONF_VENDORTWEAKS ?= none
+ifeq ("", $(PTXCONF_VENDORTWEAKS))
+PTXCONF_VENDORTWEAKS = none
+endif
+-include rules/vendor-tweaks/$(subst ",,$(PTXCONF_VENDORTWEAKS))
# install targets
PACKAGES_TARGETINSTALL = $(addsuffix _targetinstall,$(PACKAGES))
@@ -74,15 +81,17 @@ PACKAGES_EXTRACT = $(addsuffix _extract,$(PACKAGES))
PACKAGES_PREPARE = $(addsuffix _prepare,$(PACKAGES))
PACKAGES_COMPILE = $(addsuffix _compile,$(PACKAGES))
+VENDORTWEAKS_TARGETINSTALL = $(addsuffix _targetinstall,$(VENDORTWEAKS))
+
help:
# help message {{{
- @echo
- @echo "PTXDIST - Pengutronix Distribution Build System"
+ @echo
+ @echo "PTXdist - Pengutronix Distribution Build System"
@echo
@echo "Syntax:"
- @echo
+ @echo
@echo " make menuconfig Configure the whole system"
- @echo
+ @echo
@echo " make extract Extract all needed archives"
@echo " make prepare Prepare the configured system for compilation"
@echo " make compile Compile the packages"
@@ -90,18 +99,24 @@ help:
@echo " make clean Remove everything but local/"
@echo " make rootclean Remove root directory contents"
@echo " make distclean Clean everything"
- @echo
+ @echo
@echo " make world Make-everything-and-be-happy"
@echo
@echo "Calling these targets affects the whole system. If you want to"
@echo "do something for a packet do 'make packet_<action>'."
@echo
@echo "Available packages and versions:"
- @echo "$(PACKAGES)"
+ @echo " $(PACKAGES)"
@echo
@echo "Available cross-chain packages:"
- @echo "$(XCHAIN)"
- @echo
+ @echo " $(XCHAIN)"
+ @echo
+ @echo "Eventually needed native packes:"
+ @echo " $(NATIVE)"
+ @echo
+ @echo "Available vendortweaks:"
+ @echo " $(VENDORTWEAKS)"
+ @echo
# }}}
get: getclean $(PACKAGES_GET)
@@ -122,12 +137,12 @@ dep_tree:
fi
skip_vendortweaks:
- @echo "Vendor-Tweaks file (PTXCONF_VENDORTWEAKS) does not exist, skipping."
+ @echo "Vendor-Tweaks file $(PTXCONF_VENDORTWEAKS) does not exist, skipping."
-dep_world: $(PACKAGES_TARGETINSTALL)
+dep_world: $(PACKAGES_TARGETINSTALL) $(VENDORTWEAKS_TARGETINSTALL)
@echo $@ : $^ | sed -e "s/_/./g" >> $(DEP_OUTPUT)
-world: dep_output_clean dep_world $(PTXCONF_VENDORTWEAKS) dep_tree
+world: dep_output_clean dep_world dep_tree
# Configuration system -------------------------------------------------------
@@ -167,6 +182,10 @@ i386-generic-glibc_config:
@echo "copying i386-generic-glibc config" $(call latestconfig, ptxconfig-i386-generic-glibc)
@cp $(call latestconfig, ptxconfig-i386-generic-glibc) .config
+i386-generic-uclibc_config:
+ @echo "copying i386-generic-uclibc config" $(call latestconfig, ptxconfig-i386-generic-uclibc)
+ @cp $(call latestconfig, ptxconfig-i386-generic-uclibc) .config
+
innokom_config:
@echo "copying innokom configuration"
@cp config/innokom.ptxconfig .config
@@ -195,6 +214,9 @@ distclean: clean
@echo -n "cleaning .config, .kernelconfig.. "
@rm -f .config* .kernelconfig .tmp* .rtaiconfig
@echo "done."
+ @echo -n "cleaning patches dir............. "
+ @rm -rf $(TOPDIR)/patches
+ @echo "done."
@echo
clean: rootclean
@@ -209,9 +231,6 @@ clean: rootclean
@make -s -f $(TOPDIR)/scripts/ptx-modifications/Makefile.kconfig.ptx -C scripts/kconfig clean
@make -s -f $(TOPDIR)/scripts/ptx-modifications/Makefile.lxdialog.ptx -C scripts/lxdialog clean
@echo "done."
- @echo -n "cleaning patches dir............. "
- @rm -rf $(TOPDIR)/patches
- @echo "done."
@echo -n "cleaning bootdisk image.......... "
@rm -f $(TOPDIR)/boot.image
@echo "done."
diff --git a/TODO b/TODO
index 8e8606183..7910ff236 100644
--- a/TODO
+++ b/TODO
@@ -20,6 +20,8 @@ High Priority
used, which breaks gcc-stage2. At least sometimes :-( This
effect is observed only on certain systems (all Debian unstable,
but downgrading does not help). Has to be evaluated!!!
+ - MKL: this _may_ be fixed by the new xchain building process in
+ the feature-patch branch
- RSC: add #ifdef __cplusplus ... #else ... #endif to bits/in.h
- RSC: add .in file for xvkbd; integrate fixes for Makefile...
- RSC: busybox 1.00-pre2 has lots of problems (broken job control/
@@ -30,14 +32,18 @@ High Priority
to do this yet.
- RSC: For the patches I would like to have a selection mechanism
in kconfig.
+ - MKL: are you happy with _this_? :)
- RSC: Before release test: innokom, cameron and i386-generic-glibc
- RSC: - patches/
- src/*.diff, *.patch
- etc/solidcard-bmwm-20030821-1/xmodmap
+- MKL: someone with real life(TM) experiece should look at the kernel
+ patches for arm (rmkX) and delete all old stuff
Low Priority
------------
+- MKL: tweak wireless to xcompile
- RSC: finish integration of zebra
- RSC: you currently need gdk-pixbuf-csource on the host
- RSC: pango has a patch which has to be verified (GLIB_CFLAGS)
@@ -66,7 +72,7 @@ Low Priority
let ptxflash not copy it to the target flash disk
- RSC: check if Dan Kegel's scripts can be integrated:
- regression tests
- - separate per-cpu features into one file
+ MKL: /me is working on this
- RSC: check for uImage targets: have to depend on vmlinux, not on
zImage.
- LGR: concept for debug levels: strip, -g, -S
@@ -84,214 +90,3 @@ Nice-to-Have Packets
"User Interfaces" flash, Shell Menues (Robin), JVisu
"Init" lmainit
"Languages" perl, miniperl
-
-8<----------
-Hello,
-
-You'll find below the build procedure we have used to make a gcc big endian
-cross toolchain for Intel IXP2400 which contains an ARM XScale core. I think
-this procedure is valid for any ARM target.
-
-We hope it will help others.
-
-Best regards,
-david
-
---begin--
-Howto make the GCC big endian toolchain for IXP2400/Linux (ARM XScale
-core)
-=====================================================================
-
-Version 1.3 / 2003-05-07
- David MENTRE <mentre@tcl.ite.mee.com>
- Mathieu BERTRAND <bertrand@tcl.ite.mee.com>
-
--1. Last update
-
- With below procedure, the gcc is usable in -static but cannot produce
- dynamic linked programs. More exactly, the glibc-2.2.3 used in the
- ixp_ramdisk.gz should be replaced by glibc-2.2.5. 2.2.5 version has
- been patched to work with gcc3.
-
-0. Used software
-
- - binutils-2.12.1.tar.gz
- - gcc-3.2.2.tar.gz
- - glibc-2.2.5.tar.gz
- - glibc-linuxthreads-2.2.5.tar.gz
- - gdb-5.3.tar.gz
-(Those packages can be found on ftp.gnu.org mirrors.)
-
- - sources of patched linux kernel for IXP2400. linux-2.4.19-rmk7-ds1
- is working for us (YMMV)
-
-(Linux sources can be found at:
- http://www.kernel.org/pub/linux/kernel/v2.4/
- Russel King patches can be found at:
- http://www.arm.linux.org.uk/developer/v2.4/
- Deepak Saxena patches can be found at:
- ftp://source.mvista.com/pub/ds-patches/2.4
-)
-
-
-1. Compilation overview
-
- One will need to do the following steps :
-
- - setup destination directory and apply needed patches to sources
-
- - compile the binutils
-
- - compile a bare-bone gcc (for big endian)
-
- - compile the glibc
-
- - re-compile a complete gcc (for big endian)
-
- - compile gdb
-
-2. packages installation
-
-* In /usr/local/src (or whatever directory you choose):
-
- - mkdir build-binutils
- - mkdir build-gcc
- - mkdir build-glibc
- - mkdir build-gcc2
- - mkdir build-gdb
-
- - tar xvf binutils-2.13.tar.gz
- - tar xvf gcc-3.2.1.tar.gz
- - tar xvf glibc-2.2.3.tar.gz
- - cd glibc-2.3.3; tar xvf glibc-linuxthreads-2.2.3.tar.gz; cd ..
- - tar xvf gdb-5.3.tar.gz
-
-* Patch glibc:
-
- - cd glibc-2.2.5
- - perl -pi -e 's/weak_alias \(__old_sys_nerr/\/\/ $&/'
-sysdeps/unix/sysv/linux/arm/errlist.c
- - cd ..
-
-* Patch gcc:
-
- - cd gcc-3.2.2
- - perl -pi -e 's/^(TARGET_LIBGCC2_CFLAGS.*)/$1 -Dinhibit_libc
--D__gthr_posix_h/' gcc/config/arm/t-linux
- - echo 'T_CFLAGS = -Dinhibit_libc -D__gthr_posix_h' >>
-gcc/config/arm/t-linux
-
- edit Makefile.in and rewrite xgcc in xgcc -mbig-endian on definition
- GCC_FOR_TARGET:
-GCC_FOR_TARGET = $$r/gcc/xgcc -mbig-endian -B$$r/gcc/ $(FLAGS_FOR_TARGET)
-
- edit gcc/Makefile.in and rewrite xgcc in xgcc -mbig-endian on
- definition:
-GCC_FOR_TARGET = ./xgcc -mbig-endian -B./ -B$(build_tooldir)/bin/ -isystem
-$(build_tooldir)/include -isystem $(build_tooldir)/sys-include
-
-
-
- apply following patch to gcc/reload1.c with
- - cd gcc; patch -l < the-patch.patch; cd ..
-
-=== start of patch ===
---- reload1.c.orig Thu Oct 10 16:40:20 2002
-+++ reload1.c Thu Dec 12 14:43:56 2002
-@@ -8674,7 +8674,9 @@
- ... (MEM (PLUS (REGZ) (REGY)))... .
-
- First, check that we have (set (REGX) (PLUS (REGX) (REGY)))
-- and that we know all uses of REGX before it dies. */
-+ and that we know all uses of REGX before it dies.
-+ Also, explicitly check that REGX != REGY; our life information
-+ does not yet show whether REGY changes in this insn. */
- set = single_set (insn);
- if (set != NULL_RTX
- && GET_CODE (SET_DEST (set)) == REG
-@@ -8684,6 +8686,7 @@
- && GET_CODE (SET_SRC (set)) == PLUS
- && GET_CODE (XEXP (SET_SRC (set), 1)) == REG
- && rtx_equal_p (XEXP (SET_SRC (set), 0), SET_DEST (set))
-+ && !rtx_equal_p (XEXP (SET_SRC (set), 1), SET_DEST (set))
- && last_label_ruid < reg_state[REGNO (SET_DEST (set))].use_ruid)
- {
- rtx reg = SET_DEST (set);
-=== end of patch ===
-
-This patch comes from following gcc gnats entry:
- http://gcc.gnu.org/cgi-bin/gnatsweb.pl?cmd=view&pr=8896
-
-
-3. Setup of installation directory
-
- - target=arm-linux
- - prefix=/opt/tc-arm-linux-bu2.12.1-gcc3.2.2p-glibc2.2.5p # or whatever you
-want
-
- - mkdir -p $prefix/$target/include
- - cp -r (path to linux sources)/linux/include/linux $prefix/$target/include
- - cp -r (path to linux sources)/linux/include/asm-arm
-$prefix/$target/include/asm
-
-
-4. add $prefix/bin directory into your $PATH
-
- - PATH=$prefix/bin:$PATH
-
-
-5. Compilation of binutils
-
- - cd build-binutils
- - ../binutils-2.12.1/configure --prefix=$prefix --target=$target
- - make all install
- - cd ..
-
-6. Compilation of the bare-bone gcc
-
- - cd build-gcc
- - ../gcc-3.2.2/configure --target=$target --prefix=$prefix
---enable-languages=c --with-sysroot=$prefix/$target --without-headers
---disable-shared --disable-threads
- - make all-gcc install-gcc
- - cd ..
-
-7. Compilation of glibc
-
- - cd build-glibc
- - CC="$target-gcc -mbig-endian" AR=$target-ar RANLIB=$target-ranlib
-../glibc-2.2.5/configure --host=$target --prefix=$prefix/$target
---enable-add-ons=linuxthreads --with-headers=$prefix/$target/include
- - make all install
- - cd ..
-
-8. Compilation of complete gcc
-
- - cd build-gcc2
- - ../gcc-3.2.2/configure --prefix=$prefix --target=$target
---enable-languages=c --with-sysroot=$prefix/$target
- - make all install
- - cd ..
-
-Note: At the above step, we haven't been able to active other
- languages like c++. We would accept any idea to fix that.
-
-9. Compilation of gdb
-
- - cd build-gdb
- - ../gdb-5.3/configure --prefix=$prefix --target=$target
- - make all install
- - cd ..
---end--
-
---
-David Mentré <mentre@tcl.ite.mee.com> - Research engineer
-Mitsubishi Electric ITE-TCL / European Telecommunication Research Laboratory
-
-Phone: +33 2 23 45 58 29 / Fax: +33 2 23 45 58 59
-http://www.mitsubishi-electric-itce.fr
-
--------------------------------------------------------------------
-Subscription options: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm
-FAQ/Etiquette: http://www.arm.linux.org.uk/armlinux/mailinglists.php
-8<----------
diff --git a/config/Config.in b/config/Config.in
index 0e67bce97..a5b236fc6 100644
--- a/config/Config.in
+++ b/config/Config.in
@@ -1,6 +1,6 @@
#
# config/Config.in: Main menu structure definition
-# (c) Robert Schwebel <r.schwebel@pengutronix.de> 2002
+# Copyright (C) Robert Schwebel <r.schwebel@pengutronix.de> 2002, 2003
#
mainmenu "Configuration"
@@ -9,18 +9,27 @@ config PTXCONF
bool
default y
help
- This is the Pengutronix Distribution Build System. A better name
- for the Projest still has to be found.
+ This is the Pengutronix Distribution Build System. A better name
+ for the Projest still has to be found.
+
+menu "Code maturity "
+
+ config EXP
+ bool "Support experimental Stuff"
+
+ config EXP_M
+ bool "Support even more experimental Suff"
+ depends on EXP
+endmenu
##############################################################################
-comment "General Options "
+comment "General Options --- "
##############################################################################
-menu "Target Options "
+menu "Target Options "
choice
prompt "CPU Architecture "
- default ARCH_ARM
config ARCH_ARM
bool "ARM"
@@ -29,6 +38,7 @@ choice
config ARCH_ARM_NOMMU
bool "ARM-nommu"
+ depends on EXP_M
help
This is support for the ARM processor architecture w/o MMU.
@@ -42,28 +52,44 @@ choice
config ARCH_SPARC
bool "SPARC"
+ depends on EXP
config ARCH_MIPS
bool "MIPS"
+ depends on EXP
config ARCH_CRIS
+ depends on EXP_M
bool "CRIS"
config ARCH_PARISC
+ depends on EXP_M
bool "PARISC"
+
+ config ARCH_SH
+ depends on EXP_M
+ bool "SuperH"
endchoice
-choice
+choice
prompt "ARM architecture"
- depends on ARCH_ARM || ARCH_ARM_NOMMU
+ depends on ARCH_ARM || ARCH_ARM_NOMMU
config ARM_ARCH_PXA
bool "pxa (little endian)"
depends on ARCH_ARM
+ config ARM_ARCH_EPXA
+ bool "Excalibur (little endian)"
+ depends on ARCH_ARM
+
+ config ARM_ARCH_SA1100
+ bool "sa1100 (little endian)"
+ depends on ARCH_ARM
+
config ARM_ARCH_IXP2000
bool "ixp2000 (big endian)"
- depends on ARCH_ARM
+ depends on ARCH_ARM && EXP_M
config ARM_ARCH_NETARM
bool "net+arm (little endian)"
@@ -72,13 +98,26 @@ choice
config ARM_ARCH_ATMEL
bool "atmel (little endian)"
depends on ARCH_ARM_NOMMU
-
- config ARM_ARCH_EPXA
- bool "Excalibur (little endian)"
- depends on ARCH_ARM
endchoice
+config ARM_ARCH
+ string
+ default "pxa" if ARM_ARCH_PXA
+ default "sa1100" if ARM_ARCH_SA1100
+ default "netarm" if ARM_ARCH_NETARM
+ default "atmel" if ARM_ARCH_ATMEL
+ default "ixp2000" if ARM_ARCH_IXP2000
+ default "epxa" if ARM_ARCH_EPXA
+
+config ARM_ARCH_BE
+ bool
+ default y if ARM_ARCH_IXP2000
+
+config ARM_ARCH_LE
+ bool
+ default y if ARM_ARCH_PXA || ARM_ARCH_SA1100 || ARM_ARCH_NETARM || ARM_ARCH_ATMEL
+
choice
prompt "MIPS architecture"
depends on ARCH_MIPS
@@ -91,6 +130,17 @@ choice
endchoice
choice
+ prompt "SuperH architecture"
+ depends on ARCH_SH
+
+ config SH_ARCH_SH3
+ bool "SH3"
+
+ config SH_ARCH_SH4
+ bool "SH4"
+endchoice
+
+choice
prompt "Code Optimization"
config OPT_ARM
@@ -144,6 +194,14 @@ choice
config OPT_PARISC
bool "generic parisc"
depends on ARCH_PARISC
+
+ config OPT_SH3
+ bool "generic SH3"
+ depends on SH_ARCH_SH3
+
+ config OPT_SH4
+ bool "generic SH4"
+ depends on SH_ARCH_SH4
endchoice
comment "---"
@@ -170,6 +228,8 @@ config TARGET_CONFIG_FILE
default "mipsel.dat" if MIPS_ARCH_LE
default "cris.dat" if ARCH_CRIS
default "hppa.dat" if ARCH_PARISC
+ default "sh3.dat" if SH_ARCH_SH3
+ default "sh4.dat" if SH_ARCH_SH4
comment "---"
@@ -188,6 +248,7 @@ config ARCH
default "mips" if ARCH_MIPSEL
default "cris" if ARCH_CRIS
default "parisc" if ARCH_PARISC
+ default "sh" if ARCH_SH
config ARCH_USERSPACE
string
@@ -200,23 +261,16 @@ config ARCH_USERSPACE
default "mips" if ARCH_MIPSEL
default "cris" if ARCH_CRIS
default "hppa" if ARCH_PARISC
+ default "sh" if ARCH_SH
config ARM_PROC
string
default "armv" if ARCH_ARM || ARCH_ARM_NOMMU
-config ARM_ARCH
- string
- default "pxa" if ARM_ARCH_PXA
- default "netarm" if ARM_ARCH_NETARM
- default "atmel" if ARM_ARCH_ATMEL
- default "ixp2000" if ARM_ARCH_IXP2000
- default "epxa" if ARM_ARCH_EPXA
-
config GNU_TARGET
string
- default "arm-linux" if ARM_ARCH_PXA && GLIBC
- default "armb-unknown-linux-gnu" if ARM_ARCH_IXP2000 && GLIBC
+ default "arm-linux" if ARM_ARCH_LE && GLIBC
+ default "armb-unknown-linux-gnu" if ARM_ARCH_BE && GLIBC
default "arm-elf" if ARCH_ARM_NOMMU && GLIBC
default "i386-linux" if OPT_I386 && GLIBC
default "i486-linux" if OPT_I486 && GLIBC
@@ -231,9 +285,11 @@ config GNU_TARGET
default "mipsel-linux" if MIPS_ARCH_LE && GLIBC
default "cris-linux" if ARCH_CRIS && GLIBC
default "hppa-linux" if ARCH_PARISC && GLIBC
+ default "sh3-linux" if SH_ARCH_SH3 && GLIBC
+ default "sh4-linux" if SH_ARCH_SH4 && GLIBC
- default "arm-uclibc-linux-gnu" if ARM_ARCH_PXA && UCLIBC
- default "armb-uclibc-linux-gnu" if ARM_ARCH_IXP2000 && UCLIBC
+ default "arm-uclibc-linux-gnu" if ARM_ARCH_LE && UCLIBC
+ default "armb-uclibc-linux-gnu" if ARM_ARCH_BE && UCLIBC
default "arm-elf" if ARCH_ARM_NOMMU && UCLIBC
default "i386-uclibc-linux-gnu" if OPT_I386 && UCLIBC
default "i486-uclibc-linux-gnu" if OPT_I486 && UCLIBC
@@ -248,9 +304,11 @@ config GNU_TARGET
default "mipsel-uclibc-linux-gnu" if MIPS_ARCH_LE && UCLIBC
default "cris-uclibc-linux-gnu" if ARCH_CRIS && UCLIBC
default "hppa-uclibc-linux-gnu" if ARCH_PARISC && UCLIBC
+ default "sh3-uclibc-linux-gnu" if SH_ARCH_SH3 && UCLIBC
+ default "sh4-uclibc-linux-gnu" if SH_ARCH_SH4 && UCLIBC
config PREFIX
- prompt "Prefix for development envirionment"
+ prompt "Prefix for development environment"
string
default "/tmp/ptxdist-local"
@@ -277,12 +335,22 @@ choice
config GCC_2_95_3
bool
prompt "2.95.3"
- depends on ARCH_X86 || ARCH_ARM || ARCH_ARM_NOMMU
+ depends on ARCH_X86 || ARCH_ARM || ARCH_ARM_NOMMU || ARCH_SPARC
config GCC_3_2_3
bool
prompt "3.2.3"
- depends on ARCH_X86 || ARCH_SPARC || ARCH_MIPS || ARCH_CRIS || ARCH_PARISC || ARCH_PPC
+ depends on ARCH_X86 || ARCH_PPC || ARCH_SPARC || ARCH_MIPS || ARCH_CRIS || ARCH_PARISC || ARCH_SH
+
+ config GCC_3_3_1
+ bool
+ prompt "3.3.1"
+ depends on EXP
+
+ config GCC_3_3_2
+ bool
+ prompt "3.3.2"
+ depends on EXP
endchoice
config NASM
@@ -354,172 +422,42 @@ config KSYMOOPS
prompt "ksymoops"
default n
-config LIBBFD
+config LTT
bool
- prompt "libbfd on target (needed for profiling)"
+ prompt "Linux Trace Toolkit (LTT)"
default n
-config LTT
+config LIBBFD
bool
- prompt "Linux Trace Toolkit (LTT)"
+ prompt "libbfd on target (needed for profiling)"
default n
config OPROFILE
bool
prompt "oprofile"
default n
- depends on POPT && LIBBFD
config STRACE
bool
prompt "strace"
default n
+config STRACE_SHARED
+ bool "build shared"
+ default y
+ depends on STRACE
+
endmenu
##############################################################################
-comment "Core System "
+comment "Core System --- "
##############################################################################
menu "Kernel "
-config DONT_COMPILE_KERNEL
- bool
- prompt "Don't compile kernel"
- default n
-
-config KERNEL_CONFIG
- string
- default "kernel-2.4."
- prompt "Name of config in $PTXDIST/config/kernel to be used"
-
-choice
- prompt "Kernel Version"
- default KERNEL_2_4_19
-
- config KERNEL_2_4_18
- bool
- prompt "2.4.18"
- depends on !ARCH_ARM_NOMMU
-
- config KERNEL_2_4_19
- bool
- prompt "2.4.19"
- depends on !ARCH_ARM_NOMMU
-
- config KERNEL_2_4_20
- bool
- prompt "2.4.20"
- depends on ARCH_SPARC || ARCH_X86 || ARCH_MIPS || ARCH_CRIS || ARCH_PPC
- depends on !ARCH_ARM_NOMMU
-
- config KERNEL_2_4_21
- bool
- prompt "2.4.21"
- depends on ARCH_SPARC || ARCH_X86 || ARCH_MIPS || ARCH_CRIS || ARCH_PPC || ARCH_ARM_NOMMU
-
- config KERNEL_2_4_22
- bool
- prompt "2.4.22"
- depends on ARCH_SPARC || ARCH_X86 || ARCH_MIPS || ARCH_CRIS || ARCH_PPC
-endchoice
-
-config KERNEL_XSCALE
- bool
- prompt "Use XScale patch (rmkX-pxaY)"
- default n
- depends on ARCH_ARM
-
-config KERNEL_XSCALE_PTX
- bool
- prompt "Use Pengutronix XScale patch (rmkX-pxaY-ptxZ)"
- default n
- depends on ARCH_ARM
-
-config KERNEL_MTD
- bool
- prompt "Use mtd-20030301-1 snapshot"
- default n
-
-config KERNEL_INSTALL
- bool
- prompt "Install kernel into /boot on target"
- default n
- depends on !DONT_COMPILE_KERNEL
-
-choice
- prompt "Kernel Image"
- default KERNEL_IMAGE_BZ
- depends on !DONT_COMPILE_KERNEL
-
- config KERNEL_IMAGE_BZ
- bool
- prompt "bzImage"
- depends on ARCH_X86
-
- config KERNEL_IMAGE_Z
- bool
- prompt "zImage"
- depends on ARCH_X86
-
- config KERNEL_IMAGE_U
- bool
- prompt "uImage"
- depends on ARCH_ARM
-
- config KERNEL_IMAGE_VMLINUX
- bool
- prompt "vmlinux"
-endchoice
-
-config RTAI
- bool
- prompt "Realtime Extension: RTAI"
- depends on KERNEL_2_4_21 || KERNEL_2_4_20 || KERNEL_2_4_19 || KERNEL_2_4_18
- default n
-
-choice
- prompt "RTAI Version"
- depends on RTAI
- default RTAI_24_1_10
-
- config RTAI_24_1_9
- bool
- prompt "24.1.9 "
-
- config RTAI_24_1_10
- bool
- prompt "24.1.10"
+source "rules/kernel.in"
- config RTAI_24_1_11
- bool
- prompt "24.1.11"
-endchoice
-
-choice
- prompt "RTAI Technology"
- depends on RTAI
- default RTAI_ALLSOFT
-
- config RTAI_RTHAL
- bool
- prompt "rthal"
-
- config RTAI_ALLSOFT
- bool
- prompt "allsoft"
-endchoice
-
-#
-# FIXME: add this if we have the 2.4 configuration in kconfig format
-#
-#config KERNEL
-# bool
-# prompt "Compile Kernel"
-#
-#source "config/kernel/Config.in"
-
endmenu
# ----------------------------------------------------------------------------
@@ -529,9 +467,10 @@ menu "C Library "
source "rules/libc.in"
endmenu
-# ============================================================================
-comment "Core Tools"
-# ============================================================================
+
+##############################################################################
+comment "Core Tools --- "
+##############################################################################
menu "Pdksh "
@@ -814,12 +753,14 @@ source "rules/coreutils.in"
source "rules/util-linux.in"
+source "rules/procps.in"
+
source "rules/vhll.in"
source "rules/pcmcia-cs.in"
##############################################################################
-comment "Network Tools"
+comment "Network Tools --- "
##############################################################################
menu "ppp "
@@ -879,6 +820,15 @@ config UDHCP_DUMPLEASES
depends on UDHCP
endmenu
+# ----------------------------------------------------------------------------
+
+menu "nmap "
+
+config NMAP
+ bool
+ prompt "Compile nmap"
+
+endmenu
# ----------------------------------------------------------------------------
@@ -952,6 +902,14 @@ config OPENSSH
bool
prompt "OpenSSH"
+config OPENSSL
+ bool "OpenSSL support in various tools"
+
+config OPENSSL_SHARED
+ bool "build shared lib"
+ default y
+ depends on OPENSSL
+
# ----------------------------------------------------------------------------
source "rules/dropbear.in"
@@ -959,6 +917,15 @@ source "rules/dropbear.in"
# ----------------------------------------------------------------------------
endmenu
+# ----------------------------------------------------------------------------
+
+menu "netcat "
+
+config NETCAT
+ bool
+ prompt "Compile netcat"
+
+endmenu
# ----------------------------------------------------------------------------
@@ -1080,7 +1047,7 @@ config NFSUTILS_INSTALL_SHOWMOUNT
config NFSUTILS_INSTALL_STATD
bool
- prompt "Install /sbin/showmount"
+ prompt "Install /sbin/statd"
depends on NFSUTILS
endmenu
@@ -1132,8 +1099,12 @@ source "rules/libpcap.in"
# ----------------------------------------------------------------------------
+source "rules/rsync.in"
+
+# ----------------------------------------------------------------------------
+
##############################################################################
-comment "Disk and file "
+comment "Disk and file --- "
##############################################################################
menu "Disk and file utils "
@@ -1220,7 +1191,7 @@ endmenu
##############################################################################
-comment "Applications "
+comment "Applications --- "
##############################################################################
menu "Flash "
@@ -1468,6 +1439,8 @@ menu "System Libraries "
source rules/gettext.in
source rules/popt.in
source rules/zlib.in
+source rules/ncurses.in
+source rules/db41.in
endmenu
@@ -1478,6 +1451,8 @@ menu "Graphics Libraries "
#source rules/gtk22.in
source rules/xfree430.in
source rules/clementine.in
+source rules/fltk.in
+source rules/wxWindows.in
endmenu
diff --git a/config/ptxconfig-i386-generic-glibc-20031018-1 b/config/ptxconfig-i386-generic-glibc-20031018-1
new file mode 100644
index 000000000..b56fe178b
--- /dev/null
+++ b/config/ptxconfig-i386-generic-glibc-20031018-1
@@ -0,0 +1,831 @@
+#
+# Automatically generated make config: don't edit
+#
+PTXCONF_PTXCONF=y
+
+#
+# Code maturity
+#
+# PTXCONF_EXP is not set
+
+#
+# General Options ---
+#
+
+#
+# Target Options
+#
+# PTXCONF_ARCH_ARM is not set
+# PTXCONF_ARCH_ARM_NOMMU is not set
+PTXCONF_ARCH_X86=y
+# PTXCONF_ARCH_PPC is not set
+# PTXCONF_ARCH_SPARC is not set
+# PTXCONF_ARCH_MIPS is not set
+# PTXCONF_ARCH_CRIS is not set
+# PTXCONF_ARCH_PARISC is not set
+# PTXCONF_ARCH_SH is not set
+# PTXCONF_OPT_ARM is not set
+# PTXCONF_OPT_ARM_NOMMU is not set
+PTXCONF_OPT_I386=y
+# PTXCONF_OPT_I486 is not set
+# PTXCONF_OPT_I586 is not set
+# PTXCONF_OPT_I686 is not set
+# PTXCONF_OPT_PPC is not set
+# PTXCONF_OPT_PPC405 is not set
+# PTXCONF_OPT_PPC750 is not set
+# PTXCONF_OPT_PPC7450 is not set
+# PTXCONF_OPT_SPARC is not set
+# PTXCONF_OPT_MIPS is not set
+# PTXCONF_OPT_MIPSEL is not set
+# PTXCONF_OPT_CRIS is not set
+# PTXCONF_OPT_PARISC is not set
+# PTXCONF_OPT_SH3 is not set
+# PTXCONF_OPT_SH4 is not set
+
+#
+# ---
+#
+PTXCONF_TARGET_EXTRA_CFLAGS=""
+PTXCONF_TARGET_EXTRA_CXXFLAGS=""
+PTXCONF_TARGET_CONFIG_FILE="ix86.dat"
+
+#
+# ---
+#
+PTXCONF_ARCH="i386"
+PTXCONF_ARCH_USERSPACE="i386"
+PTXCONF_GNU_TARGET="i386-linux"
+PTXCONF_PREFIX="/tmp/ptxdist-local-generic"
+PTXCONF_ROOT=""
+
+#
+# Cross Toolchain
+#
+PTXCONF_BUILD_CROSSCHAIN=y
+PTXCONF_GCC_2_95_3=y
+# PTXCONF_GCC_3_2_3 is not set
+# PTXCONF_GCC_3_3_1 is not set
+# PTXCONF_GCC_3_3_2 is not set
+# PTXCONF_NASM is not set
+
+#
+# Root Filesystem
+#
+PTXCONF_ROOTFS_PROC=y
+PTXCONF_ROOTFS_DEV=y
+PTXCONF_ROOTFS_MNT=y
+PTXCONF_ROOTFS_FLOPPY=y
+PTXCONF_ROOTFS_TMP=y
+PTXCONF_ROOTFS_HOME=y
+PTXCONF_ROOTFS_VAR=y
+PTXCONF_VENDORTWEAKS=""
+
+#
+# Debugging Tools
+#
+# PTXCONF_BUILD_XGDB is not set
+# PTXCONF_BUILD_GDBSERVER is not set
+# PTXCONF_BUILD_GDB is not set
+# PTXCONF_KSYMOOPS is not set
+# PTXCONF_LTT is not set
+# PTXCONF_LIBBFD is not set
+# PTXCONF_OPROFILE is not set
+# PTXCONF_STRACE is not set
+
+#
+# Core System ---
+#
+
+#
+# Kernel
+#
+PTXCONF_KERNEL_CONFIG="kernel-2.4.19-i386-generic-20030808-1"
+# PTXCONF_KERNEL_2_4_18 is not set
+PTXCONF_KERNEL_2_4_19=y
+# PTXCONF_KERNEL_2_4_20 is not set
+# PTXCONF_KERNEL_2_4_21 is not set
+# PTXCONF_KERNEL_2_4_22 is not set
+# PTXCONF_KERNEL_RMK is not set
+# PTXCONF_KERNEL_RMK_PXA is not set
+# PTXCONF_KERNEL_RMK_DS is not set
+# PTXCONF_KERNEL_RMK_PXA_PTX is not set
+# PTXCONF_KERNEL_RMK_PXA_PTX_LTT is not set
+# PTXCONF_KERNEL_UC is not set
+# PTXCONF_KERNEL_BEN is not set
+PTXCONF_KERNEL_VANILLA=y
+
+#
+# ---
+#
+# PTXCONF_RTAI is not set
+
+#
+# ---
+#
+PTXCONF_DONT_COMPILE_KERNEL=y
+# PTXCONF_KERNEL_IMAGE_BZ is not set
+# PTXCONF_KERNEL_IMAGE_Z is not set
+# PTXCONF_KERNEL_IMAGE_U is not set
+# PTXCONF_KERNEL_IMAGE_VMLINUX is not set
+
+#
+# C Library
+#
+PTXCONF_GLIBC=y
+# PTXCONF_UCLIBC is not set
+
+#
+# C Library options
+#
+# PTXCONF_GLIBC_2_3_2 is not set
+PTXCONF_GLIBC_2_2_5=y
+# PTXCONF_GLIBC_2_2_4 is not set
+# PTXCONF_GLIBC_2_2_3 is not set
+# PTXCONF_UCLIBC_0_9_19 is not set
+# PTXCONF_UCLIBC_0_9_20 is not set
+PTXCONF_GLIBC_PTHREADS=y
+PTXCONF_GLIBC_FLOATINGPOINT=y
+# PTXCONF_GLIBC_LIBIO is not set
+PTXCONF_GLIBC_SHARED=y
+# PTXCONF_GLIBC_PROFILED is not set
+# PTXCONF_GLIBC_OMITFP is not set
+# PTXCONF_GLIBC_BOUNDED is not set
+# PTXCONF_GLIBC_OPTKERNEL is not set
+# PTXCONF_GLIBC_DEBUG is not set
+
+#
+# Install options
+#
+PTXCONF_GLIBC_THREAD_DB=y
+PTXCONF_GLIBC_DL=y
+PTXCONF_GLIBC_CRYPT=y
+PTXCONF_GLIBC_UTIL=y
+PTXCONF_GLIBC_LIBM=y
+PTXCONF_GLIBC_NSS_DNS=y
+PTXCONF_GLIBC_NSS_FILES=y
+PTXCONF_GLIBC_NSS_HESIOD=y
+PTXCONF_GLIBC_NSS_NIS=y
+PTXCONF_GLIBC_NSS_NISPLUS=y
+PTXCONF_GLIBC_NSS_COMPAT=y
+PTXCONF_GLIBC_RESOLV=y
+PTXCONF_GLIBC_NSL=y
+PTXCONF_UCLIBC_HAVE_DOT_CONFIG=y
+
+#
+# Core Tools ---
+#
+
+#
+# Pdksh
+#
+# PTXCONF_PDKSH is not set
+
+#
+# Bash
+#
+# PTXCONF_BASH is not set
+
+#
+# BusyBox
+#
+PTXCONF_BUSYBOX=y
+PTXCONF_BB_HAVE_DOT_CONFIG=y
+
+#
+# General Configuration
+#
+# PTXCONF_BB_CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# PTXCONF_BB_CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+PTXCONF_BB_CONFIG_FEATURE_BUFFERS_GO_IN_BSS=y
+PTXCONF_BB_CONFIG_FEATURE_VERBOSE_USAGE=y
+# PTXCONF_BB_CONFIG_FEATURE_INSTALLER is not set
+# PTXCONF_BB_CONFIG_LOCALE_SUPPORT is not set
+PTXCONF_BB_CONFIG_FEATURE_DEVFS=y
+PTXCONF_BB_CONFIG_FEATURE_DEVPTS=y
+# PTXCONF_BB_CONFIG_FEATURE_CLEAN_UP is not set
+PTXCONF_BB_CONFIG_FEATURE_SUID=y
+PTXCONF_BB_CONFIG_FEATURE_SUID_CONFIG=y
+PTXCONF_BB_CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# PTXCONF_BB_CONFIG_SELINUX is not set
+
+#
+# Build Options
+#
+# PTXCONF_BB_CONFIG_STATIC is not set
+# PTXCONF_BB_CONFIG_LFS is not set
+PTXCONF_BB_USING_CROSS_COMPILER=y
+PTXCONF_BB_CROSS_COMPILER_PREFIX="i386-linux-"
+PTXCONF_BB_EXTRA_CFLAGS_OPTIONS=""
+
+#
+# Installation Options
+#
+# PTXCONF_BB_CONFIG_INSTALL_NO_USR is not set
+PTXCONF_BB_PREFIX="./_install"
+
+#
+# Archival Utilities
+#
+# PTXCONF_BB_CONFIG_AR is not set
+# PTXCONF_BB_CONFIG_BUNZIP2 is not set
+PTXCONF_BB_CONFIG_CPIO=y
+# PTXCONF_BB_CONFIG_DPKG is not set
+# PTXCONF_BB_CONFIG_DPKG_DEB is not set
+# PTXCONF_BB_CONFIG_GUNZIP is not set
+PTXCONF_BB_CONFIG_GZIP=y
+# PTXCONF_BB_CONFIG_RPM2CPIO is not set
+# PTXCONF_BB_CONFIG_RPM is not set
+PTXCONF_BB_CONFIG_TAR=y
+PTXCONF_BB_CONFIG_FEATURE_TAR_CREATE=y
+PTXCONF_BB_CONFIG_FEATURE_TAR_BZIP2=y
+PTXCONF_BB_CONFIG_FEATURE_TAR_EXCLUDE=y
+PTXCONF_BB_CONFIG_FEATURE_TAR_GZIP=y
+# PTXCONF_BB_CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set
+PTXCONF_BB_CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# PTXCONF_BB_CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+PTXCONF_BB_CONFIG_UNCOMPRESS=y
+# PTXCONF_BB_CONFIG_UNZIP is not set
+
+#
+# Coreutils
+#
+PTXCONF_BB_CONFIG_BASENAME=y
+# PTXCONF_BB_CONFIG_CAL is not set
+PTXCONF_BB_CONFIG_CAT=y
+PTXCONF_BB_CONFIG_CHGRP=y
+PTXCONF_BB_CONFIG_CHMOD=y
+PTXCONF_BB_CONFIG_CHOWN=y
+PTXCONF_BB_CONFIG_CHROOT=y
+# PTXCONF_BB_CONFIG_CMP is not set
+PTXCONF_BB_CONFIG_CP=y
+# PTXCONF_BB_CONFIG_CUT is not set
+PTXCONF_BB_CONFIG_DATE=y
+PTXCONF_BB_CONFIG_FEATURE_DATE_ISOFMT=y
+PTXCONF_BB_CONFIG_DD=y
+PTXCONF_BB_CONFIG_DF=y
+PTXCONF_BB_CONFIG_DIRNAME=y
+# PTXCONF_BB_CONFIG_DOS2UNIX is not set
+PTXCONF_BB_CONFIG_DU=y
+PTXCONF_BB_CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
+PTXCONF_BB_CONFIG_ECHO=y
+PTXCONF_BB_CONFIG_FEATURE_FANCY_ECHO=y
+# PTXCONF_BB_CONFIG_ENV is not set
+PTXCONF_BB_CONFIG_EXPR=y
+PTXCONF_BB_CONFIG_FALSE=y
+# PTXCONF_BB_CONFIG_FOLD is not set
+# PTXCONF_BB_CONFIG_HEAD is not set
+# PTXCONF_BB_CONFIG_HOSTID is not set
+# PTXCONF_BB_CONFIG_ID is not set
+# PTXCONF_BB_CONFIG_LENGTH is not set
+PTXCONF_BB_CONFIG_LN=y
+# PTXCONF_BB_CONFIG_LOGNAME is not set
+PTXCONF_BB_CONFIG_LS=y
+# PTXCONF_BB_CONFIG_FEATURE_LS_FILETYPES is not set
+# PTXCONF_BB_CONFIG_FEATURE_LS_FOLLOWLINKS is not set
+PTXCONF_BB_CONFIG_FEATURE_LS_RECURSIVE=y
+PTXCONF_BB_CONFIG_FEATURE_LS_SORTFILES=y
+PTXCONF_BB_CONFIG_FEATURE_LS_TIMESTAMPS=y
+PTXCONF_BB_CONFIG_FEATURE_LS_USERNAME=y
+# PTXCONF_BB_CONFIG_FEATURE_LS_COLOR is not set
+# PTXCONF_BB_CONFIG_MD5SUM is not set
+PTXCONF_BB_CONFIG_MKDIR=y
+PTXCONF_BB_CONFIG_MKFIFO=y
+PTXCONF_BB_CONFIG_MKNOD=y
+PTXCONF_BB_CONFIG_MV=y
+PTXCONF_BB_CONFIG_OD=y
+# PTXCONF_BB_CONFIG_PRINTF is not set
+PTXCONF_BB_CONFIG_PWD=y
+# PTXCONF_BB_CONFIG_REALPATH is not set
+PTXCONF_BB_CONFIG_RM=y
+PTXCONF_BB_CONFIG_RMDIR=y
+# PTXCONF_BB_CONFIG_SHA1SUM is not set
+PTXCONF_BB_CONFIG_SLEEP=y
+# PTXCONF_BB_CONFIG_FEATURE_FANCY_SLEEP is not set
+# PTXCONF_BB_CONFIG_SORT is not set
+PTXCONF_BB_CONFIG_STTY=y
+PTXCONF_BB_CONFIG_SYNC=y
+# PTXCONF_BB_CONFIG_TAIL is not set
+# PTXCONF_BB_CONFIG_TEE is not set
+PTXCONF_BB_CONFIG_TEST=y
+
+#
+# test (forced enabled for use with shell)
+#
+PTXCONF_BB_CONFIG_TOUCH=y
+# PTXCONF_BB_CONFIG_TR is not set
+PTXCONF_BB_CONFIG_TRUE=y
+PTXCONF_BB_CONFIG_TTY=y
+# PTXCONF_BB_CONFIG_UNAME is not set
+# PTXCONF_BB_CONFIG_UNIQ is not set
+# PTXCONF_BB_CONFIG_USLEEP is not set
+# PTXCONF_BB_CONFIG_UUDECODE is not set
+# PTXCONF_BB_CONFIG_UUENCODE is not set
+# PTXCONF_BB_CONFIG_WATCH is not set
+# PTXCONF_BB_CONFIG_WC is not set
+# PTXCONF_BB_CONFIG_WHO is not set
+# PTXCONF_BB_CONFIG_WHOAMI is not set
+PTXCONF_BB_CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+PTXCONF_BB_CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls and more
+#
+# PTXCONF_BB_CONFIG_FEATURE_AUTOWIDTH is not set
+
+#
+# Common options for df, du, ls
+#
+PTXCONF_BB_CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Console Utilities
+#
+# PTXCONF_BB_CONFIG_CHVT is not set
+PTXCONF_BB_CONFIG_CLEAR=y
+# PTXCONF_BB_CONFIG_DEALLOCVT is not set
+# PTXCONF_BB_CONFIG_DUMPKMAP is not set
+# PTXCONF_BB_CONFIG_LOADACM is not set
+# PTXCONF_BB_CONFIG_LOADFONT is not set
+# PTXCONF_BB_CONFIG_LOADKMAP is not set
+# PTXCONF_BB_CONFIG_OPENVT is not set
+PTXCONF_BB_CONFIG_RESET=y
+# PTXCONF_BB_CONFIG_SETKEYCODES is not set
+
+#
+# Debian Utilities
+#
+# PTXCONF_BB_CONFIG_MKTEMP is not set
+# PTXCONF_BB_CONFIG_READLINK is not set
+# PTXCONF_BB_CONFIG_RUN_PARTS is not set
+# PTXCONF_BB_CONFIG_START_STOP_DAEMON is not set
+PTXCONF_BB_CONFIG_WHICH=y
+
+#
+# Editors
+#
+PTXCONF_BB_CONFIG_AWK=y
+# PTXCONF_BB_CONFIG_FEATURE_AWK_MATH is not set
+# PTXCONF_BB_CONFIG_PATCH is not set
+PTXCONF_BB_CONFIG_SED=y
+# PTXCONF_BB_CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
+PTXCONF_BB_CONFIG_VI=y
+PTXCONF_BB_CONFIG_FEATURE_VI_COLON=y
+PTXCONF_BB_CONFIG_FEATURE_VI_YANKMARK=y
+PTXCONF_BB_CONFIG_FEATURE_VI_SEARCH=y
+PTXCONF_BB_CONFIG_FEATURE_VI_USE_SIGNALS=y
+PTXCONF_BB_CONFIG_FEATURE_VI_DOT_CMD=y
+# PTXCONF_BB_CONFIG_FEATURE_VI_READONLY is not set
+PTXCONF_BB_CONFIG_FEATURE_VI_SETOPTS=y
+PTXCONF_BB_CONFIG_FEATURE_VI_SET=y
+# PTXCONF_BB_CONFIG_FEATURE_VI_WIN_RESIZE is not set
+PTXCONF_BB_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
+# Finding Utilities
+#
+# PTXCONF_BB_CONFIG_FIND is not set
+PTXCONF_BB_CONFIG_GREP=y
+PTXCONF_BB_CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+PTXCONF_BB_CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+PTXCONF_BB_CONFIG_FEATURE_GREP_CONTEXT=y
+# PTXCONF_BB_CONFIG_XARGS is not set
+
+#
+# Init Utilities
+#
+PTXCONF_BB_CONFIG_INIT=y
+PTXCONF_BB_CONFIG_FEATURE_USE_INITTAB=y
+# PTXCONF_BB_CONFIG_FEATURE_INITRD is not set
+# PTXCONF_BB_CONFIG_FEATURE_INIT_COREDUMPS is not set
+# PTXCONF_BB_CONFIG_FEATURE_EXTRA_QUIET is not set
+PTXCONF_BB_CONFIG_HALT=y
+# PTXCONF_BB_CONFIG_POWEROFF is not set
+PTXCONF_BB_CONFIG_REBOOT=y
+PTXCONF_BB_CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+PTXCONF_BB_CONFIG_USE_BB_PWD_GRP=y
+# PTXCONF_BB_CONFIG_ADDGROUP is not set
+# PTXCONF_BB_CONFIG_DELGROUP is not set
+# PTXCONF_BB_CONFIG_ADDUSER is not set
+# PTXCONF_BB_CONFIG_DELUSER is not set
+# PTXCONF_BB_CONFIG_GETTY is not set
+PTXCONF_BB_CONFIG_LOGIN=y
+# PTXCONF_BB_CONFIG_FEATURE_SECURETTY is not set
+PTXCONF_BB_CONFIG_PASSWD=y
+# PTXCONF_BB_CONFIG_SU is not set
+# PTXCONF_BB_CONFIG_SULOGIN is not set
+# PTXCONF_BB_CONFIG_VLOCK is not set
+
+#
+# Common options for adduser, deluser, login, su
+#
+# PTXCONF_BB_CONFIG_FEATURE_SHADOWPASSWDS is not set
+
+#
+# Miscellaneous Utilities
+#
+# PTXCONF_BB_CONFIG_ADJTIMEX is not set
+# PTXCONF_BB_CONFIG_CROND is not set
+# PTXCONF_BB_CONFIG_CRONTAB is not set
+# PTXCONF_BB_CONFIG_DC is not set
+# PTXCONF_BB_CONFIG_LAST is not set
+# PTXCONF_BB_CONFIG_HDPARM is not set
+# PTXCONF_BB_CONFIG_MAKEDEVS is not set
+# PTXCONF_BB_CONFIG_MT is not set
+# PTXCONF_BB_CONFIG_STRINGS is not set
+# PTXCONF_BB_CONFIG_TIME is not set
+PTXCONF_BB_CONFIG_WATCHDOG=y
+
+#
+# Linux Module Utilities
+#
+PTXCONF_BB_CONFIG_INSMOD=y
+# PTXCONF_BB_CONFIG_FEATURE_OLD_MODULE_INTERFACE is not set
+PTXCONF_BB_CONFIG_FEATURE_NEW_MODULE_INTERFACE=y
+
+#
+# Support new (post 2.1) Linux kernels (Forced enabled)
+#
+# PTXCONF_BB_CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# PTXCONF_BB_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# PTXCONF_BB_CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# PTXCONF_BB_CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+PTXCONF_BB_CONFIG_LSMOD=y
+PTXCONF_BB_CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y
+PTXCONF_BB_CONFIG_MODPROBE=y
+PTXCONF_BB_CONFIG_RMMOD=y
+# PTXCONF_BB_CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+
+#
+# Networking Utilities
+#
+# PTXCONF_BB_CONFIG_FEATURE_IPV6 is not set
+# PTXCONF_BB_CONFIG_ARPING is not set
+# PTXCONF_BB_CONFIG_FTPGET is not set
+# PTXCONF_BB_CONFIG_FTPPUT is not set
+PTXCONF_BB_CONFIG_HOSTNAME=y
+# PTXCONF_BB_CONFIG_HTTPD is not set
+PTXCONF_BB_CONFIG_IFCONFIG=y
+# PTXCONF_BB_CONFIG_FEATURE_IFCONFIG_STATUS is not set
+# PTXCONF_BB_CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# PTXCONF_BB_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+PTXCONF_BB_CONFIG_FEATURE_IFCONFIG_HW=y
+# PTXCONF_BB_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# PTXCONF_BB_CONFIG_IFUPDOWN is not set
+# PTXCONF_BB_CONFIG_INETD is not set
+# PTXCONF_BB_CONFIG_IP is not set
+# PTXCONF_BB_CONFIG_IPCALC is not set
+# PTXCONF_BB_CONFIG_IPADDR is not set
+# PTXCONF_BB_CONFIG_IPLINK is not set
+# PTXCONF_BB_CONFIG_IPROUTE is not set
+# PTXCONF_BB_CONFIG_IPTUNNEL is not set
+# PTXCONF_BB_CONFIG_NAMEIF is not set
+# PTXCONF_BB_CONFIG_NC is not set
+# PTXCONF_BB_CONFIG_NETSTAT is not set
+# PTXCONF_BB_CONFIG_NSLOOKUP is not set
+PTXCONF_BB_CONFIG_PING=y
+# PTXCONF_BB_CONFIG_FEATURE_FANCY_PING is not set
+PTXCONF_BB_CONFIG_ROUTE=y
+# PTXCONF_BB_CONFIG_TELNET is not set
+# PTXCONF_BB_CONFIG_TELNETD is not set
+# PTXCONF_BB_CONFIG_TFTP is not set
+PTXCONF_BB_CONFIG_TRACEROUTE=y
+# PTXCONF_BB_CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# PTXCONF_BB_CONFIG_VCONFIG is not set
+PTXCONF_BB_CONFIG_WGET=y
+# PTXCONF_BB_CONFIG_FEATURE_WGET_STATUSBAR is not set
+# PTXCONF_BB_CONFIG_FEATURE_WGET_AUTHENTICATION is not set
+PTXCONF_BB_CONFIG_FEATURE_WGET_IP6_LITERAL=y
+
+#
+# udhcp Server/Client
+#
+# PTXCONF_BB_CONFIG_UDHCPD is not set
+# PTXCONF_BB_CONFIG_UDHCPC is not set
+
+#
+# Process Utilities
+#
+PTXCONF_BB_CONFIG_FREE=y
+PTXCONF_BB_CONFIG_KILL=y
+# PTXCONF_BB_CONFIG_KILLALL is not set
+PTXCONF_BB_CONFIG_PIDOF=y
+PTXCONF_BB_CONFIG_PS=y
+# PTXCONF_BB_CONFIG_RENICE is not set
+# PTXCONF_BB_CONFIG_TOP is not set
+# PTXCONF_BB_CONFIG_UPTIME is not set
+
+#
+# Another Bourne-like Shell
+#
+PTXCONF_BB_CONFIG_FEATURE_SH_IS_ASH=y
+# PTXCONF_BB_CONFIG_FEATURE_SH_IS_HUSH is not set
+# PTXCONF_BB_CONFIG_FEATURE_SH_IS_LASH is not set
+# PTXCONF_BB_CONFIG_FEATURE_SH_IS_MSH is not set
+# PTXCONF_BB_CONFIG_FEATURE_SH_IS_NONE is not set
+PTXCONF_BB_CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+PTXCONF_BB_CONFIG_ASH_JOB_CONTROL=y
+PTXCONF_BB_CONFIG_ASH_ALIAS=y
+# PTXCONF_BB_CONFIG_ASH_MATH_SUPPORT is not set
+PTXCONF_BB_CONFIG_ASH_GETOPTS=y
+# PTXCONF_BB_CONFIG_ASH_CMDCMD is not set
+# PTXCONF_BB_CONFIG_ASH_MAIL is not set
+PTXCONF_BB_CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# PTXCONF_BB_CONFIG_HUSH is not set
+# PTXCONF_BB_CONFIG_LASH is not set
+# PTXCONF_BB_CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+PTXCONF_BB_CONFIG_FEATURE_COMMAND_EDITING=y
+PTXCONF_BB_CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
+PTXCONF_BB_CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# PTXCONF_BB_CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+PTXCONF_BB_CONFIG_FEATURE_COMMAND_HISTORY=15
+# PTXCONF_BB_CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+# PTXCONF_BB_CONFIG_FEATURE_SH_FANCY_PROMPT is not set
+# PTXCONF_BB_CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+
+#
+# System Logging Utilities
+#
+PTXCONF_BB_CONFIG_SYSLOGD=y
+# PTXCONF_BB_CONFIG_FEATURE_REMOTE_LOG is not set
+PTXCONF_BB_CONFIG_FEATURE_IPC_SYSLOG=y
+# PTXCONF_BB_CONFIG_LOGREAD is not set
+PTXCONF_BB_CONFIG_KLOGD=y
+PTXCONF_BB_CONFIG_LOGGER=y
+
+#
+# Linux System Utilities
+#
+PTXCONF_BB_CONFIG_DMESG=y
+# PTXCONF_BB_CONFIG_FBSET is not set
+# PTXCONF_BB_CONFIG_FDFLUSH is not set
+# PTXCONF_BB_CONFIG_FDFORMAT is not set
+PTXCONF_BB_CONFIG_FDISK=y
+PTXCONF_BB_FDISK_SUPPORT_LARGE_DISKS=y
+PTXCONF_BB_CONFIG_FEATURE_FDISK_WRITABLE=y
+# PTXCONF_BB_CONFIG_FEATURE_AIX_LABEL is not set
+# PTXCONF_BB_CONFIG_FEATURE_SGI_LABEL is not set
+# PTXCONF_BB_CONFIG_FEATURE_SUN_LABEL is not set
+# PTXCONF_BB_CONFIG_FEATURE_OSF_LABEL is not set
+PTXCONF_BB_CONFIG_FEATURE_FDISK_ADVANCED=y
+# PTXCONF_BB_CONFIG_FREERAMDISK is not set
+PTXCONF_BB_CONFIG_FSCK_MINIX=y
+# PTXCONF_BB_CONFIG_MKFS_MINIX is not set
+
+#
+# Minix filesystem support
+#
+PTXCONF_BB_CONFIG_FEATURE_MINIX2=y
+# PTXCONF_BB_CONFIG_GETOPT is not set
+# PTXCONF_BB_CONFIG_HEXDUMP is not set
+# PTXCONF_BB_CONFIG_HWCLOCK is not set
+# PTXCONF_BB_CONFIG_LOSETUP is not set
+# PTXCONF_BB_CONFIG_MKSWAP is not set
+# PTXCONF_BB_CONFIG_MORE is not set
+# PTXCONF_BB_CONFIG_PIVOT_ROOT is not set
+# PTXCONF_BB_CONFIG_RDATE is not set
+# PTXCONF_BB_CONFIG_SWAPONOFF is not set
+PTXCONF_BB_CONFIG_MOUNT=y
+PTXCONF_BB_CONFIG_NFSMOUNT=y
+PTXCONF_BB_CONFIG_UMOUNT=y
+PTXCONF_BB_CONFIG_FEATURE_MOUNT_FORCE=y
+
+#
+# Common options for mount/umount
+#
+# PTXCONF_BB_CONFIG_FEATURE_MOUNT_LOOP is not set
+# PTXCONF_BB_CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Debugging Options
+#
+# PTXCONF_BB_CONFIG_DEBUG is not set
+
+#
+# MTD Tools
+#
+# PTXCONF_MTD_UTILS is not set
+
+#
+# GNU coreutils
+#
+# PTXCONF_COREUTILS is not set
+
+#
+# util-linux
+#
+# PTXCONF_UTLNX is not set
+
+#
+# procps
+#
+# PTXCONF_PROCPS is not set
+
+#
+# VHLL Support
+#
+# PTXCONF_VHLL_PYTHON23 is not set
+
+#
+# PCMCIA Tools
+#
+# PTXCONF_PCMCIA_TOOLS is not set
+
+#
+# Network Tools ---
+#
+
+#
+# ppp
+#
+# PTXCONF_PPP is not set
+
+#
+# udhcp
+#
+# PTXCONF_UDHCP is not set
+
+#
+# nmap
+#
+# PTXCONF_NMAP is not set
+
+#
+# utelnetd
+#
+PTXCONF_UTELNETD=y
+
+#
+# inetutils
+#
+# PTXCONF_INETUTILS is not set
+
+#
+# Network Security
+#
+# PTXCONF_SHOREWALL is not set
+# PTXCONF_LSH is not set
+# PTXCONF_OPENSSH is not set
+# PTXCONF_OPENSSL is not set
+
+#
+# Dropbear SSH-Server
+#
+# PTXCONF_DROPBEAR is not set
+
+#
+# netcat
+#
+# PTXCONF_NETCAT is not set
+
+#
+# proftpd
+#
+# PTXCONF_PROFTPD is not set
+
+#
+# nfs-utils
+#
+# PTXCONF_NFSUTILS is not set
+
+#
+# Portmapper
+#
+# PTXCONF_PORTMAP is not set
+
+#
+# tcpwrapper
+#
+# PTXCONF_TCPWRAPPER is not set
+
+#
+# Wireless Tools
+#
+# PTXCONF_WIRELESS is not set
+
+#
+# GNU Zebra
+#
+# PTXCONF_ZEBRA is not set
+
+#
+# libnet
+#
+# PTXCONF_LIBNET is not set
+
+#
+# libpcap
+#
+# PTXCONF_LIBPCAP is not set
+
+#
+# rsync
+#
+# PTXCONF_RSYNC is not set
+
+#
+# Disk and file ---
+#
+
+#
+# Disk and file utils
+#
+# PTXCONF_E2FSPROGS is not set
+# PTXCONF_GRUB is not set
+# PTXCONF_LILO is not set
+# PTXCONF_PTXFLASH is not set
+# PTXCONF_GENEXT2FS is not set
+
+#
+# Applications ---
+#
+
+#
+# Flash
+#
+# PTXCONF_FLASH is not set
+
+#
+# Kaffe
+#
+# PTXCONF_KAFFE is not set
+
+#
+# System Libraries
+#
+
+#
+# gettext
+#
+# PTXCONF_GETTEXT is not set
+
+#
+# popt
+#
+# PTXCONF_POPT is not set
+
+#
+# zlib
+#
+# PTXCONF_ZLIB is not set
+
+#
+# ncurses
+#
+# PTXCONF_NCURSES is not set
+
+#
+# Berkeley db 4
+#
+# PTXCONF_DB is not set
+
+#
+# Graphics Libraries
+#
+
+#
+# XFree86-4.3.0
+#
+# PTXCONF_XFREE430 is not set
+
+#
+# Clementine WM
+#
+# PTXCONF_CLEMENTINE is not set
+
+#
+# FLTK GUI Toolkit
+#
+
+#
+# wxWindows GUI [X11]
+#
+
+#
+# Web Applications
+#
+
+#
+# Mozilla Firebird
+#
+# PTXCONF_MFIREBIRD is not set
+
+#
+# Penguzilla
+#
+# PTXCONF_PENGUZILLA is not set
diff --git a/config/ptxconfig-i386-generic-uclibc-20031001-1 b/config/ptxconfig-i386-generic-uclibc-20031001-1
new file mode 100644
index 000000000..2e6557491
--- /dev/null
+++ b/config/ptxconfig-i386-generic-uclibc-20031001-1
@@ -0,0 +1,883 @@
+#
+# Automatically generated make config: don't edit
+#
+PTXCONF_PTXCONF=y
+
+#
+# Code maturity
+#
+PTXCONF_EXP=y
+PTXCONF_EXP_M=y
+
+#
+# General Options
+#
+
+#
+# Target Options
+#
+# PTXCONF_ARCH_ARM is not set
+# PTXCONF_ARCH_ARM_NOMMU is not set
+PTXCONF_ARCH_X86=y
+# PTXCONF_ARCH_PPC is not set
+# PTXCONF_ARCH_SPARC is not set
+# PTXCONF_ARCH_MIPS is not set
+# PTXCONF_ARCH_CRIS is not set
+# PTXCONF_ARCH_PARISC is not set
+# PTXCONF_ARCH_SH is not set
+# PTXCONF_OPT_ARM is not set
+# PTXCONF_OPT_ARM_NOMMU is not set
+PTXCONF_OPT_I386=y
+# PTXCONF_OPT_I486 is not set
+# PTXCONF_OPT_I586 is not set
+# PTXCONF_OPT_I686 is not set
+# PTXCONF_OPT_PPC is not set
+# PTXCONF_OPT_PPC405 is not set
+# PTXCONF_OPT_PPC750 is not set
+# PTXCONF_OPT_PPC7450 is not set
+# PTXCONF_OPT_SPARC is not set
+# PTXCONF_OPT_MIPS is not set
+# PTXCONF_OPT_MIPSEL is not set
+# PTXCONF_OPT_CRIS is not set
+# PTXCONF_OPT_PARISC is not set
+# PTXCONF_OPT_SH3 is not set
+# PTXCONF_OPT_SH4 is not set
+
+#
+# ---
+#
+PTXCONF_TARGET_EXTRA_CFLAGS=""
+PTXCONF_TARGET_EXTRA_CXXFLAGS=""
+PTXCONF_TARGET_CONFIG_FILE="ix86.dat"
+
+#
+# ---
+#
+PTXCONF_ARCH="i386"
+PTXCONF_ARCH_USERSPACE="i386"
+PTXCONF_GNU_TARGET="i386-uclibc-linux-gnu"
+PTXCONF_PREFIX="/tmp/ptxdist-i386-generic-uClibc"
+PTXCONF_ROOT=""
+
+#
+# Cross Toolchain
+#
+PTXCONF_BUILD_CROSSCHAIN=y
+# PTXCONF_GCC_2_95_3 is not set
+PTXCONF_GCC_3_2_3=y
+# PTXCONF_NASM is not set
+
+#
+# Root Filesystem
+#
+PTXCONF_ROOTFS_PROC=y
+PTXCONF_ROOTFS_DEV=y
+PTXCONF_ROOTFS_MNT=y
+PTXCONF_ROOTFS_FLOPPY=y
+PTXCONF_ROOTFS_TMP=y
+PTXCONF_ROOTFS_HOME=y
+PTXCONF_ROOTFS_VAR=y
+PTXCONF_VENDORTWEAKS=""
+
+#
+# Debugging Tools
+#
+# PTXCONF_BUILD_XGDB is not set
+# PTXCONF_BUILD_GDBSERVER is not set
+# PTXCONF_BUILD_GDB is not set
+# PTXCONF_KSYMOOPS is not set
+# PTXCONF_LTT is not set
+# PTXCONF_LIBBFD is not set
+# PTXCONF_OPROFILE is not set
+# PTXCONF_STRACE is not set
+
+#
+# Core System
+#
+
+#
+# Kernel
+#
+PTXCONF_KERNEL_CONFIG="kernel-2.4.19-i386-generic-20030808-1"
+# PTXCONF_KERNEL_2_4_18 is not set
+# PTXCONF_KERNEL_2_4_19 is not set
+# PTXCONF_KERNEL_2_4_20 is not set
+# PTXCONF_KERNEL_2_4_21 is not set
+PTXCONF_KERNEL_2_4_22=y
+# PTXCONF_KERNEL_RMK is not set
+# PTXCONF_KERNEL_RMK_PXA is not set
+# PTXCONF_KERNEL_RMK_DS is not set
+# PTXCONF_KERNEL_RMK_PXA_PTX is not set
+# PTXCONF_KERNEL_RMK_PXA_PTX_LTT is not set
+# PTXCONF_KERNEL_UC is not set
+# PTXCONF_KERNEL_BEN is not set
+PTXCONF_KERNEL_VANILLA=y
+
+#
+# ---
+#
+# PTXCONF_RTAI is not set
+
+#
+# ---
+#
+PTXCONF_DONT_COMPILE_KERNEL=y
+
+#
+# C Library
+#
+# PTXCONF_GLIBC is not set
+PTXCONF_UCLIBC=y
+
+#
+# C Library options
+#
+# PTXCONF_GLIBC_2_2_5 is not set
+# PTXCONF_GLIBC_2_2_4 is not set
+# PTXCONF_GLIBC_2_2_3 is not set
+# PTXCONF_UCLIBC_0_9_19 is not set
+PTXCONF_UCLIBC_0_9_20=y
+PTXCONF_UCLIBC_HAVE_ELF=y
+PTXCONF_UCLIBC_UCLIBC_HAS_MMU=y
+PTXCONF_UCLIBC_UCLIBC_HAS_FLOATS=y
+PTXCONF_UCLIBC_HAS_FPU=y
+# PTXCONF_UCLIBC_DO_C99_MATH is not set
+PTXCONF_UCLIBC_WARNINGS="-Wall"
+PTXCONF_UCLIBC_KERNEL_SOURCE="/usr/src/linux"
+PTXCONF_UCLIBC_C_SYMBOL_PREFIX=""
+PTXCONF_UCLIBC_HAVE_DOT_CONFIG=y
+PTXCONF_UCLIBC_DOPIC=y
+PTXCONF_UCLIBC_HAVE_SHARED=y
+# PTXCONF_UCLIBC_ADD_LIBGCC_FUNCTIONS is not set
+PTXCONF_UCLIBC_BUILD_UCLIBC_LDSO=y
+PTXCONF_UCLIBC_LDSO_LDD_SUPPORT=y
+# PTXCONF_UCLIBC_UCLIBC_CTOR_DTOR is not set
+# PTXCONF_UCLIBC_UCLIBC_PROFILING is not set
+PTXCONF_UCLIBC_UCLIBC_HAS_THREADS=y
+# PTXCONF_UCLIBC_PTHREADS_DEBUG_SUPPORT is not set
+PTXCONF_UCLIBC_UCLIBC_HAS_LFS=y
+# PTXCONF_UCLIBC_MALLOC is not set
+# PTXCONF_UCLIBC_MALLOC_930716 is not set
+# PTXCONF_UCLIBC_UCLIBC_DYNAMIC_ATEXIT is not set
+PTXCONF_UCLIBC_HAS_SHADOW=y
+PTXCONF_UCLIBC_UCLIBC_HAS_REGEX=y
+PTXCONF_UCLIBC_UNIX98PTY_ONLY=y
+PTXCONF_UCLIBC_ASSUME_DEVPTS=y
+# PTXCONF_UCLIBC_UCLIBC_HAS_TM_EXTENSIONS is not set
+# PTXCONF_UCLIBC_UCLIBC_HAS_IPV6 is not set
+PTXCONF_UCLIBC_UCLIBC_HAS_RPC=y
+# PTXCONF_UCLIBC_UCLIBC_HAS_FULL_RPC is not set
+PTXCONF_UCLIBC_UCLIBC_HAS_WCHAR=y
+# PTXCONF_UCLIBC_UCLIBC_HAS_LOCALE is not set
+# PTXCONF_UCLIBC_USE_OLD_VFPRINTF is not set
+PTXCONF_UCLIBC_SHARED_LIB_LOADER_PATH="$(DEVEL_PREFIX)/lib"
+PTXCONF_UCLIBC_DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc"
+PTXCONF_UCLIBC_SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)"
+PTXCONF_UCLIBC_DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr"
+# PTXCONF_UCLIBC_DODEBUG is not set
+# PTXCONF_UCLIBC_DOASSERTS is not set
+# PTXCONF_UCLIBC_SUPPORT_LD_DEBUG is not set
+# PTXCONF_UCLIBC_SUPPORT_LD_DEBUG_EARLY is not set
+
+#
+# Target Architecture Features and Options
+#
+PTXCONF_UCLIBC_CONFIG_GENERIC_386=y
+# PTXCONF_UCLIBC_CONFIG_386 is not set
+# PTXCONF_UCLIBC_CONFIG_486 is not set
+# PTXCONF_UCLIBC_CONFIG_586 is not set
+# PTXCONF_UCLIBC_CONFIG_586MMX is not set
+# PTXCONF_UCLIBC_CONFIG_686 is not set
+# PTXCONF_UCLIBC_CONFIG_PENTIUMIII is not set
+# PTXCONF_UCLIBC_CONFIG_PENTIUM4 is not set
+# PTXCONF_UCLIBC_CONFIG_K6 is not set
+# PTXCONF_UCLIBC_CONFIG_K7 is not set
+# PTXCONF_UCLIBC_CONFIG_CRUSOE is not set
+# PTXCONF_UCLIBC_CONFIG_WINCHIPC6 is not set
+# PTXCONF_UCLIBC_CONFIG_WINCHIP2 is not set
+# PTXCONF_UCLIBC_CONFIG_CYRIXIII is not set
+
+#
+# General Library Settings
+#
+
+#
+# Networking Support
+#
+
+#
+# String and Stdio Support
+#
+
+#
+# Library Installation Options
+#
+
+#
+# uClibc hacking options
+#
+
+#
+# Install options
+#
+PTXCONF_UCLIBC_CRYPT=y
+PTXCONF_UCLIBC_DL=y
+PTXCONF_UCLIBC_M=y
+PTXCONF_UCLIBC_NSL=y
+PTXCONF_UCLIBC_PTHREAD=y
+PTXCONF_UCLIBC_RESOLV=y
+PTXCONF_UCLIBC_UTIL=y
+
+#
+# Core Tools
+#
+
+#
+# Pdksh
+#
+# PTXCONF_PDKSH is not set
+
+#
+# Bash
+#
+# PTXCONF_BASH is not set
+
+#
+# BusyBox
+#
+PTXCONF_BUSYBOX=y
+PTXCONF_BB_HAVE_DOT_CONFIG=y
+
+#
+# General Configuration
+#
+# PTXCONF_BB_CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+# PTXCONF_BB_CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+PTXCONF_BB_CONFIG_FEATURE_BUFFERS_GO_IN_BSS=y
+PTXCONF_BB_CONFIG_FEATURE_VERBOSE_USAGE=y
+# PTXCONF_BB_CONFIG_FEATURE_INSTALLER is not set
+# PTXCONF_BB_CONFIG_LOCALE_SUPPORT is not set
+PTXCONF_BB_CONFIG_FEATURE_DEVFS=y
+PTXCONF_BB_CONFIG_FEATURE_DEVPTS=y
+# PTXCONF_BB_CONFIG_FEATURE_CLEAN_UP is not set
+PTXCONF_BB_CONFIG_FEATURE_SUID=y
+PTXCONF_BB_CONFIG_FEATURE_SUID_CONFIG=y
+# PTXCONF_BB_CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+# PTXCONF_BB_CONFIG_SELINUX is not set
+
+#
+# Build Options
+#
+# PTXCONF_BB_CONFIG_STATIC is not set
+# PTXCONF_BB_CONFIG_LFS is not set
+PTXCONF_BB_USING_CROSS_COMPILER=y
+PTXCONF_BB_CROSS_COMPILER_PREFIX="i386-linux-"
+PTXCONF_BB_EXTRA_CFLAGS_OPTIONS=""
+
+#
+# Installation Options
+#
+# PTXCONF_BB_CONFIG_INSTALL_NO_USR is not set
+PTXCONF_BB_PREFIX="./_install"
+
+#
+# Archival Utilities
+#
+# PTXCONF_BB_CONFIG_AR is not set
+# PTXCONF_BB_CONFIG_BUNZIP2 is not set
+PTXCONF_BB_CONFIG_CPIO=y
+# PTXCONF_BB_CONFIG_DPKG is not set
+# PTXCONF_BB_CONFIG_DPKG_DEB is not set
+# PTXCONF_BB_CONFIG_GUNZIP is not set
+PTXCONF_BB_CONFIG_GZIP=y
+# PTXCONF_BB_CONFIG_RPM2CPIO is not set
+# PTXCONF_BB_CONFIG_RPM is not set
+PTXCONF_BB_CONFIG_TAR=y
+PTXCONF_BB_CONFIG_FEATURE_TAR_CREATE=y
+PTXCONF_BB_CONFIG_FEATURE_TAR_BZIP2=y
+PTXCONF_BB_CONFIG_FEATURE_TAR_EXCLUDE=y
+PTXCONF_BB_CONFIG_FEATURE_TAR_GZIP=y
+# PTXCONF_BB_CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set
+PTXCONF_BB_CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# PTXCONF_BB_CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+PTXCONF_BB_CONFIG_UNCOMPRESS=y
+# PTXCONF_BB_CONFIG_UNZIP is not set
+
+#
+# Coreutils
+#
+PTXCONF_BB_CONFIG_BASENAME=y
+# PTXCONF_BB_CONFIG_CAL is not set
+PTXCONF_BB_CONFIG_CAT=y
+PTXCONF_BB_CONFIG_CHGRP=y
+PTXCONF_BB_CONFIG_CHMOD=y
+PTXCONF_BB_CONFIG_CHOWN=y
+PTXCONF_BB_CONFIG_CHROOT=y
+# PTXCONF_BB_CONFIG_CMP is not set
+PTXCONF_BB_CONFIG_CP=y
+# PTXCONF_BB_CONFIG_CUT is not set
+PTXCONF_BB_CONFIG_DATE=y
+PTXCONF_BB_CONFIG_FEATURE_DATE_ISOFMT=y
+PTXCONF_BB_CONFIG_DD=y
+PTXCONF_BB_CONFIG_DF=y
+PTXCONF_BB_CONFIG_DIRNAME=y
+# PTXCONF_BB_CONFIG_DOS2UNIX is not set
+PTXCONF_BB_CONFIG_DU=y
+PTXCONF_BB_CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
+PTXCONF_BB_CONFIG_ECHO=y
+PTXCONF_BB_CONFIG_FEATURE_FANCY_ECHO=y
+# PTXCONF_BB_CONFIG_ENV is not set
+PTXCONF_BB_CONFIG_EXPR=y
+PTXCONF_BB_CONFIG_FALSE=y
+# PTXCONF_BB_CONFIG_FOLD is not set
+# PTXCONF_BB_CONFIG_HEAD is not set
+# PTXCONF_BB_CONFIG_HOSTID is not set
+# PTXCONF_BB_CONFIG_ID is not set
+# PTXCONF_BB_CONFIG_LENGTH is not set
+PTXCONF_BB_CONFIG_LN=y
+# PTXCONF_BB_CONFIG_LOGNAME is not set
+PTXCONF_BB_CONFIG_LS=y
+# PTXCONF_BB_CONFIG_FEATURE_LS_FILETYPES is not set
+# PTXCONF_BB_CONFIG_FEATURE_LS_FOLLOWLINKS is not set
+PTXCONF_BB_CONFIG_FEATURE_LS_RECURSIVE=y
+PTXCONF_BB_CONFIG_FEATURE_LS_SORTFILES=y
+PTXCONF_BB_CONFIG_FEATURE_LS_TIMESTAMPS=y
+PTXCONF_BB_CONFIG_FEATURE_LS_USERNAME=y
+# PTXCONF_BB_CONFIG_FEATURE_LS_COLOR is not set
+# PTXCONF_BB_CONFIG_MD5SUM is not set
+PTXCONF_BB_CONFIG_MKDIR=y
+PTXCONF_BB_CONFIG_MKFIFO=y
+PTXCONF_BB_CONFIG_MKNOD=y
+PTXCONF_BB_CONFIG_MV=y
+PTXCONF_BB_CONFIG_OD=y
+# PTXCONF_BB_CONFIG_PRINTF is not set
+PTXCONF_BB_CONFIG_PWD=y
+# PTXCONF_BB_CONFIG_REALPATH is not set
+PTXCONF_BB_CONFIG_RM=y
+PTXCONF_BB_CONFIG_RMDIR=y
+# PTXCONF_BB_CONFIG_SHA1SUM is not set
+PTXCONF_BB_CONFIG_SLEEP=y
+# PTXCONF_BB_CONFIG_FEATURE_FANCY_SLEEP is not set
+# PTXCONF_BB_CONFIG_SORT is not set
+PTXCONF_BB_CONFIG_STTY=y
+PTXCONF_BB_CONFIG_SYNC=y
+# PTXCONF_BB_CONFIG_TAIL is not set
+# PTXCONF_BB_CONFIG_TEE is not set
+PTXCONF_BB_CONFIG_TEST=y
+
+#
+# test (forced enabled for use with shell)
+#
+PTXCONF_BB_CONFIG_TOUCH=y
+# PTXCONF_BB_CONFIG_TR is not set
+PTXCONF_BB_CONFIG_TRUE=y
+PTXCONF_BB_CONFIG_TTY=y
+# PTXCONF_BB_CONFIG_UNAME is not set
+# PTXCONF_BB_CONFIG_UNIQ is not set
+# PTXCONF_BB_CONFIG_USLEEP is not set
+# PTXCONF_BB_CONFIG_UUDECODE is not set
+# PTXCONF_BB_CONFIG_UUENCODE is not set
+# PTXCONF_BB_CONFIG_WATCH is not set
+# PTXCONF_BB_CONFIG_WC is not set
+# PTXCONF_BB_CONFIG_WHO is not set
+# PTXCONF_BB_CONFIG_WHOAMI is not set
+PTXCONF_BB_CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+PTXCONF_BB_CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls and more
+#
+# PTXCONF_BB_CONFIG_FEATURE_AUTOWIDTH is not set
+
+#
+# Common options for df, du, ls
+#
+PTXCONF_BB_CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Console Utilities
+#
+# PTXCONF_BB_CONFIG_CHVT is not set
+PTXCONF_BB_CONFIG_CLEAR=y
+# PTXCONF_BB_CONFIG_DEALLOCVT is not set
+# PTXCONF_BB_CONFIG_DUMPKMAP is not set
+# PTXCONF_BB_CONFIG_LOADACM is not set
+# PTXCONF_BB_CONFIG_LOADFONT is not set
+# PTXCONF_BB_CONFIG_LOADKMAP is not set
+# PTXCONF_BB_CONFIG_OPENVT is not set
+PTXCONF_BB_CONFIG_RESET=y
+# PTXCONF_BB_CONFIG_SETKEYCODES is not set
+
+#
+# Debian Utilities
+#
+# PTXCONF_BB_CONFIG_MKTEMP is not set
+# PTXCONF_BB_CONFIG_READLINK is not set
+# PTXCONF_BB_CONFIG_RUN_PARTS is not set
+# PTXCONF_BB_CONFIG_START_STOP_DAEMON is not set
+PTXCONF_BB_CONFIG_WHICH=y
+
+#
+# Editors
+#
+PTXCONF_BB_CONFIG_AWK=y
+# PTXCONF_BB_CONFIG_FEATURE_AWK_MATH is not set
+# PTXCONF_BB_CONFIG_PATCH is not set
+PTXCONF_BB_CONFIG_SED=y
+# PTXCONF_BB_CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
+PTXCONF_BB_CONFIG_VI=y
+PTXCONF_BB_CONFIG_FEATURE_VI_COLON=y
+PTXCONF_BB_CONFIG_FEATURE_VI_YANKMARK=y
+PTXCONF_BB_CONFIG_FEATURE_VI_SEARCH=y
+PTXCONF_BB_CONFIG_FEATURE_VI_USE_SIGNALS=y
+PTXCONF_BB_CONFIG_FEATURE_VI_DOT_CMD=y
+# PTXCONF_BB_CONFIG_FEATURE_VI_READONLY is not set
+PTXCONF_BB_CONFIG_FEATURE_VI_SETOPTS=y
+PTXCONF_BB_CONFIG_FEATURE_VI_SET=y
+# PTXCONF_BB_CONFIG_FEATURE_VI_WIN_RESIZE is not set
+PTXCONF_BB_CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
+# Finding Utilities
+#
+# PTXCONF_BB_CONFIG_FIND is not set
+PTXCONF_BB_CONFIG_GREP=y
+PTXCONF_BB_CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+PTXCONF_BB_CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+PTXCONF_BB_CONFIG_FEATURE_GREP_CONTEXT=y
+# PTXCONF_BB_CONFIG_XARGS is not set
+
+#
+# Init Utilities
+#
+PTXCONF_BB_CONFIG_INIT=y
+PTXCONF_BB_CONFIG_FEATURE_USE_INITTAB=y
+# PTXCONF_BB_CONFIG_FEATURE_INITRD is not set
+# PTXCONF_BB_CONFIG_FEATURE_INIT_COREDUMPS is not set
+# PTXCONF_BB_CONFIG_FEATURE_EXTRA_QUIET is not set
+PTXCONF_BB_CONFIG_HALT=y
+# PTXCONF_BB_CONFIG_POWEROFF is not set
+PTXCONF_BB_CONFIG_REBOOT=y
+PTXCONF_BB_CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
+PTXCONF_BB_CONFIG_USE_BB_PWD_GRP=y
+# PTXCONF_BB_CONFIG_ADDGROUP is not set
+# PTXCONF_BB_CONFIG_DELGROUP is not set
+# PTXCONF_BB_CONFIG_ADDUSER is not set
+# PTXCONF_BB_CONFIG_DELUSER is not set
+# PTXCONF_BB_CONFIG_GETTY is not set
+PTXCONF_BB_CONFIG_LOGIN=y
+# PTXCONF_BB_CONFIG_FEATURE_SECURETTY is not set
+PTXCONF_BB_CONFIG_PASSWD=y
+# PTXCONF_BB_CONFIG_SU is not set
+# PTXCONF_BB_CONFIG_SULOGIN is not set
+# PTXCONF_BB_CONFIG_VLOCK is not set
+
+#
+# Common options for adduser, deluser, login, su
+#
+# PTXCONF_BB_CONFIG_FEATURE_SHADOWPASSWDS is not set
+
+#
+# Miscellaneous Utilities
+#
+# PTXCONF_BB_CONFIG_ADJTIMEX is not set
+# PTXCONF_BB_CONFIG_CROND is not set
+# PTXCONF_BB_CONFIG_CRONTAB is not set
+# PTXCONF_BB_CONFIG_DC is not set
+# PTXCONF_BB_CONFIG_LAST is not set
+# PTXCONF_BB_CONFIG_HDPARM is not set
+# PTXCONF_BB_CONFIG_MAKEDEVS is not set
+# PTXCONF_BB_CONFIG_MT is not set
+# PTXCONF_BB_CONFIG_STRINGS is not set
+# PTXCONF_BB_CONFIG_TIME is not set
+PTXCONF_BB_CONFIG_WATCHDOG=y
+
+#
+# Linux Module Utilities
+#
+PTXCONF_BB_CONFIG_INSMOD=y
+# PTXCONF_BB_CONFIG_FEATURE_OLD_MODULE_INTERFACE is not set
+PTXCONF_BB_CONFIG_FEATURE_NEW_MODULE_INTERFACE=y
+
+#
+# Support new (post 2.1) Linux kernels (Forced enabled)
+#
+# PTXCONF_BB_CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# PTXCONF_BB_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# PTXCONF_BB_CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# PTXCONF_BB_CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+PTXCONF_BB_CONFIG_LSMOD=y
+PTXCONF_BB_CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y
+PTXCONF_BB_CONFIG_MODPROBE=y
+PTXCONF_BB_CONFIG_RMMOD=y
+# PTXCONF_BB_CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+
+#
+# Networking Utilities
+#
+# PTXCONF_BB_CONFIG_FEATURE_IPV6 is not set
+# PTXCONF_BB_CONFIG_ARPING is not set
+# PTXCONF_BB_CONFIG_FTPGET is not set
+# PTXCONF_BB_CONFIG_FTPPUT is not set
+PTXCONF_BB_CONFIG_HOSTNAME=y
+# PTXCONF_BB_CONFIG_HTTPD is not set
+PTXCONF_BB_CONFIG_IFCONFIG=y
+# PTXCONF_BB_CONFIG_FEATURE_IFCONFIG_STATUS is not set
+# PTXCONF_BB_CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# PTXCONF_BB_CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+PTXCONF_BB_CONFIG_FEATURE_IFCONFIG_HW=y
+# PTXCONF_BB_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# PTXCONF_BB_CONFIG_IFUPDOWN is not set
+# PTXCONF_BB_CONFIG_INETD is not set
+# PTXCONF_BB_CONFIG_IP is not set
+# PTXCONF_BB_CONFIG_IPCALC is not set
+# PTXCONF_BB_CONFIG_IPADDR is not set
+# PTXCONF_BB_CONFIG_IPLINK is not set
+# PTXCONF_BB_CONFIG_IPROUTE is not set
+# PTXCONF_BB_CONFIG_IPTUNNEL is not set
+# PTXCONF_BB_CONFIG_NAMEIF is not set
+# PTXCONF_BB_CONFIG_NC is not set
+# PTXCONF_BB_CONFIG_NETSTAT is not set
+# PTXCONF_BB_CONFIG_NSLOOKUP is not set
+PTXCONF_BB_CONFIG_PING=y
+# PTXCONF_BB_CONFIG_FEATURE_FANCY_PING is not set
+PTXCONF_BB_CONFIG_ROUTE=y
+# PTXCONF_BB_CONFIG_TELNET is not set
+# PTXCONF_BB_CONFIG_TELNETD is not set
+# PTXCONF_BB_CONFIG_TFTP is not set
+PTXCONF_BB_CONFIG_TRACEROUTE=y
+# PTXCONF_BB_CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
+# PTXCONF_BB_CONFIG_VCONFIG is not set
+PTXCONF_BB_CONFIG_WGET=y
+# PTXCONF_BB_CONFIG_FEATURE_WGET_STATUSBAR is not set
+# PTXCONF_BB_CONFIG_FEATURE_WGET_AUTHENTICATION is not set
+PTXCONF_BB_CONFIG_FEATURE_WGET_IP6_LITERAL=y
+
+#
+# udhcp Server/Client
+#
+# PTXCONF_BB_CONFIG_UDHCPD is not set
+# PTXCONF_BB_CONFIG_UDHCPC is not set
+
+#
+# Process Utilities
+#
+PTXCONF_BB_CONFIG_FREE=y
+PTXCONF_BB_CONFIG_KILL=y
+# PTXCONF_BB_CONFIG_KILLALL is not set
+PTXCONF_BB_CONFIG_PIDOF=y
+PTXCONF_BB_CONFIG_PS=y
+# PTXCONF_BB_CONFIG_RENICE is not set
+# PTXCONF_BB_CONFIG_TOP is not set
+# PTXCONF_BB_CONFIG_UPTIME is not set
+
+#
+# Another Bourne-like Shell
+#
+PTXCONF_BB_CONFIG_FEATURE_SH_IS_ASH=y
+# PTXCONF_BB_CONFIG_FEATURE_SH_IS_HUSH is not set
+# PTXCONF_BB_CONFIG_FEATURE_SH_IS_LASH is not set
+# PTXCONF_BB_CONFIG_FEATURE_SH_IS_MSH is not set
+# PTXCONF_BB_CONFIG_FEATURE_SH_IS_NONE is not set
+PTXCONF_BB_CONFIG_ASH=y
+
+#
+# Ash Shell Options
+#
+PTXCONF_BB_CONFIG_ASH_JOB_CONTROL=y
+PTXCONF_BB_CONFIG_ASH_ALIAS=y
+# PTXCONF_BB_CONFIG_ASH_MATH_SUPPORT is not set
+PTXCONF_BB_CONFIG_ASH_GETOPTS=y
+# PTXCONF_BB_CONFIG_ASH_CMDCMD is not set
+# PTXCONF_BB_CONFIG_ASH_MAIL is not set
+PTXCONF_BB_CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# PTXCONF_BB_CONFIG_HUSH is not set
+# PTXCONF_BB_CONFIG_LASH is not set
+# PTXCONF_BB_CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+PTXCONF_BB_CONFIG_FEATURE_COMMAND_EDITING=y
+PTXCONF_BB_CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
+PTXCONF_BB_CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# PTXCONF_BB_CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+PTXCONF_BB_CONFIG_FEATURE_COMMAND_HISTORY=15
+# PTXCONF_BB_CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+# PTXCONF_BB_CONFIG_FEATURE_SH_FANCY_PROMPT is not set
+# PTXCONF_BB_CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+
+#
+# System Logging Utilities
+#
+PTXCONF_BB_CONFIG_SYSLOGD=y
+# PTXCONF_BB_CONFIG_FEATURE_REMOTE_LOG is not set
+PTXCONF_BB_CONFIG_FEATURE_IPC_SYSLOG=y
+# PTXCONF_BB_CONFIG_LOGREAD is not set
+PTXCONF_BB_CONFIG_KLOGD=y
+PTXCONF_BB_CONFIG_LOGGER=y
+
+#
+# Linux System Utilities
+#
+PTXCONF_BB_CONFIG_DMESG=y
+# PTXCONF_BB_CONFIG_FBSET is not set
+# PTXCONF_BB_CONFIG_FDFLUSH is not set
+# PTXCONF_BB_CONFIG_FDFORMAT is not set
+PTXCONF_BB_CONFIG_FDISK=y
+PTXCONF_BB_FDISK_SUPPORT_LARGE_DISKS=y
+PTXCONF_BB_CONFIG_FEATURE_FDISK_WRITABLE=y
+# PTXCONF_BB_CONFIG_FEATURE_AIX_LABEL is not set
+# PTXCONF_BB_CONFIG_FEATURE_SGI_LABEL is not set
+# PTXCONF_BB_CONFIG_FEATURE_SUN_LABEL is not set
+# PTXCONF_BB_CONFIG_FEATURE_OSF_LABEL is not set
+PTXCONF_BB_CONFIG_FEATURE_FDISK_ADVANCED=y
+# PTXCONF_BB_CONFIG_FREERAMDISK is not set
+PTXCONF_BB_CONFIG_FSCK_MINIX=y
+# PTXCONF_BB_CONFIG_MKFS_MINIX is not set
+
+#
+# Minix filesystem support
+#
+PTXCONF_BB_CONFIG_FEATURE_MINIX2=y
+# PTXCONF_BB_CONFIG_GETOPT is not set
+# PTXCONF_BB_CONFIG_HEXDUMP is not set
+# PTXCONF_BB_CONFIG_HWCLOCK is not set
+# PTXCONF_BB_CONFIG_LOSETUP is not set
+# PTXCONF_BB_CONFIG_MKSWAP is not set
+# PTXCONF_BB_CONFIG_MORE is not set
+# PTXCONF_BB_CONFIG_PIVOT_ROOT is not set
+# PTXCONF_BB_CONFIG_RDATE is not set
+# PTXCONF_BB_CONFIG_SWAPONOFF is not set
+PTXCONF_BB_CONFIG_MOUNT=y
+PTXCONF_BB_CONFIG_NFSMOUNT=y
+PTXCONF_BB_CONFIG_UMOUNT=y
+PTXCONF_BB_CONFIG_FEATURE_MOUNT_FORCE=y
+
+#
+# Common options for mount/umount
+#
+# PTXCONF_BB_CONFIG_FEATURE_MOUNT_LOOP is not set
+# PTXCONF_BB_CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Debugging Options
+#
+# PTXCONF_BB_CONFIG_DEBUG is not set
+
+#
+# MTD Tools
+#
+# PTXCONF_MTD_UTILS is not set
+
+#
+# GNU coreutils
+#
+# PTXCONF_COREUTILS is not set
+
+#
+# util-linux
+#
+# PTXCONF_UTLNX is not set
+
+#
+# procps
+#
+# PTXCONF_PROCPS is not set
+
+#
+# VHLL Support
+#
+# PTXCONF_VHLL_PYTHON23 is not set
+
+#
+# PCMCIA Tools
+#
+# PTXCONF_PCMCIA_TOOLS is not set
+
+#
+# Network Tools
+#
+
+#
+# ppp
+#
+# PTXCONF_PPP is not set
+
+#
+# udhcp
+#
+# PTXCONF_UDHCP is not set
+
+#
+# nmap
+#
+# PTXCONF_NMAP is not set
+
+#
+# utelnetd
+#
+PTXCONF_UTELNETD=y
+
+#
+# inetutils
+#
+# PTXCONF_INETUTILS is not set
+
+#
+# Network Security
+#
+# PTXCONF_SHOREWALL is not set
+# PTXCONF_LSH is not set
+# PTXCONF_OPENSSH is not set
+
+#
+# Dropbear SSH-Server
+#
+# PTXCONF_DROPBEAR is not set
+
+#
+# netcat
+#
+# PTXCONF_NETCAT is not set
+
+#
+# proftpd
+#
+# PTXCONF_PROFTPD is not set
+
+#
+# nfs-utils
+#
+# PTXCONF_NFSUTILS is not set
+
+#
+# Portmapper
+#
+# PTXCONF_PORTMAP is not set
+
+#
+# tcpwrapper
+#
+# PTXCONF_TCPWRAPPER is not set
+
+#
+# Wireless Tools
+#
+# PTXCONF_WIRELESS is not set
+
+#
+# GNU Zebra
+#
+# PTXCONF_ZEBRA is not set
+
+#
+# libnet
+#
+# PTXCONF_LIBNET is not set
+
+#
+# libpcap
+#
+# PTXCONF_LIBPCAP is not set
+
+#
+# rsync
+#
+# PTXCONF_RSYNC is not set
+
+#
+# Disk and file
+#
+
+#
+# Disk and file utils
+#
+# PTXCONF_E2FSPROGS is not set
+# PTXCONF_GRUB is not set
+# PTXCONF_LILO is not set
+# PTXCONF_PTXFLASH is not set
+# PTXCONF_GENEXT2FS is not set
+
+#
+# Applications
+#
+
+#
+# Flash
+#
+# PTXCONF_FLASH is not set
+
+#
+# Kaffe
+#
+# PTXCONF_KAFFE is not set
+
+#
+# System Libraries
+#
+
+#
+# gettext
+#
+# PTXCONF_GETTEXT is not set
+
+#
+# popt
+#
+# PTXCONF_POPT is not set
+
+#
+# zlib
+#
+# PTXCONF_ZLIB is not set
+
+#
+# ncurses
+#
+# PTXCONF_NCURSES is not set
+
+#
+# Berkeley db 4
+#
+# PTXCONF_DB is not set
+
+#
+# Graphics Libraries
+#
+
+#
+# XFree86-4.3.0
+#
+# PTXCONF_XFREE430 is not set
+
+#
+# Clementine WM
+#
+# PTXCONF_CLEMENTINE is not set
+
+#
+# FLTK GUI Toolkit
+#
+
+#
+# Web Applications
+#
+
+#
+# Mozilla Firebird
+#
+# PTXCONF_MFIREBIRD is not set
+
+#
+# Penguzilla
+#
+# PTXCONF_PENGUZILLA is not set
diff --git a/rules/NEWPACKET-XCHAIN b/rules/NEWPACKET-XCHAIN
new file mode 100755
index 000000000..28c465b78
--- /dev/null
+++ b/rules/NEWPACKET-XCHAIN
@@ -0,0 +1,36 @@
+#!/usr/bin/perl -w
+
+print "\nCreate new rules file from template:\n";
+print "------------------------------------\n\n";
+
+print "Name of new packet..........: "; $packet = "xchain-".<STDIN>;
+print "Major version number........: "; $major = <STDIN>;
+print "Minor version number........: "; $minor = <STDIN>;
+print "Micro version number........: "; $micro = <STDIN>;
+print "Archive file suffix.........: "; $suffix = <STDIN>;
+print "URL of download directory...: "; $url = <STDIN>;
+print "PTXdist Packet Author.......: "; $author = <STDIN>;
+
+chop ($packet, $major, $minor, $micro, $url, $author, $suffix);
+$PACKET = uc($packet);
+$PACKET =~ s/-/_/;
+
+open(INFILE, "template") || die "Can't open template";
+open(OUTFILE, ">$packet\.make") || die "Can't open new file";
+
+while (<INFILE>) {
+ s,\@PACKET@,$PACKET,g;
+ s,\@packet@,$packet,g;
+ s,\@MAJOR@,$major,g;
+ s,\@MINOR@,$minor,g;
+ s,\@MICRO@,$micro,g;
+ s,\@URL@,$url,g;
+ s,\@AUTHOR@,$author,g;
+ s,\@SUFFIX@,$suffix,g;
+ print OUTFILE $_;
+}
+
+close(OUTFILE);
+close(INFILE);
+
+print "\n";
diff --git a/rules/NEWPATCH b/rules/NEWPATCH
new file mode 100755
index 000000000..7ef741a40
--- /dev/null
+++ b/rules/NEWPATCH
@@ -0,0 +1,35 @@
+#!/usr/bin/perl -w
+
+print "\nCreate new rules file from template:\n";
+print "------------------------------------\n\n";
+
+print "Name of new pach................: "; $patch = <STDIN>;
+print "Patches wich packet.............: "; $packet = <STDIN>;
+print "Filename of patch w/o version...: "; $name = <STDIN>;
+print "Archive file suffix.............: "; $suffix = <STDIN>;
+print "URL of download directory.......: "; $url = <STDIN>;
+print "PTXdist Packet Author...........: "; $author = <STDIN>;
+
+chop ($patch, $packet, $name, $suffix, $url, $author);
+$PATCH = uc($patch);
+$PACKET = uc($packet);
+
+open(INFILE, "template-patch") || die "Can't open template";
+open(OUTFILE, ">$packet-$patch\.make") || die "Can't open new file";
+
+while (<INFILE>) {
+ s,\@PATCH@,$PATCH,g;
+ s,\@patch@,$patch,g;
+ s,\@PACKET@,$PACKET,g;
+ s,\@packet@,$packet,g;
+ s,\@NAME@,$name,g;
+ s,\@URL@,$url,g;
+ s,\@AUTHOR@,$author,g;
+ s,\@SUFFIX@,$suffix,g;
+ print OUTFILE $_;
+}
+
+close(OUTFILE);
+close(INFILE);
+
+print "\n";
diff --git a/rules/Rules.make b/rules/Rules.make
index 1e432102d..74ef716c1 100644
--- a/rules/Rules.make
+++ b/rules/Rules.make
@@ -2,7 +2,8 @@
PASSIVEFTP = --passive-ftp
SUDO = sudo
PTXUSER = $(shell echo $$USER)
-GNU_HOST = $(shell $(TOPDIR)/scripts/config.guess)
+GNU_BUILD = $(shell $(TOPDIR)/scripts/config.guess)
+GNU_HOST = $(shell echo $(GNU_BUILD) | sed s/-[a-zA-Z0-9_]*-/-host-/)
HOSTCC = gcc
HOSTCC_ENV = CC=$(HOSTCC)
CROSSSTRIP = PATH=$(CROSS_PATH) $(PTXCONF_GNU_TARGET)-strip
@@ -31,6 +32,11 @@ targetinfo=echo; \
#
# extract the given source to builddir
#
+# $1 = filename to extract
+# $2 = dir into extract
+#
+# if $2 is not given, it is extracted to the BUILDDIR
+#
extract = \
DEST="$(strip $(2))"; \
DEST=$${DEST:-$(BUILDDIR)}; \
@@ -42,7 +48,7 @@ extract = \
EXTRACT=bzip2 \
;; \
*) \
- false \
+ EXTRACT=false \
;; \
esac; \
[ -d $$DEST ] || mkdir -p $$DEST; \
@@ -89,6 +95,10 @@ get_patches = \
$(PASSIVEFTP) $(PTXPATCH_URL)-$$PATCH_TREE/$$PACKET_NAME/generic/; \
wget -r -l 1 -nH --cut-dirs=3 -A.diff -A.patch -A.gz -A.bz2 -P $(PATCHDIR) \
$(PASSIVEFTP) $(PTXPATCH_URL)-$$PATCH_TREE/$$PACKET_NAME/$(PTXCONF_ARCH)/; \
+ if [ -d $(PATCHDIR)-local/$$PACKET_NAME ]; then \
+ echo "Copying Local patches from patches-local/"$$PACKET_NAME; \
+ cp -vr $(PATCHDIR)-local/$$PACKET_NAME $(PATCHDIR); \
+ fi; \
true
#
@@ -127,11 +137,11 @@ get_option_ext = \
#
-# cleanup the given directory
+# cleanup the given directory or file
#
clean = \
DIR="$(strip $(1))"; \
- if [ -d $$DIR ]; then \
+ if [ -e $$DIR ]; then \
rm -rf $$DIR; \
fi
@@ -224,18 +234,18 @@ patchin = \
$(TOPDIR)/patches/$$PACKET_NAME/$(PTXCONF_ARCH)/*.bz2; \
do \
if [ -f $$PATCH_NAME ]; then \
- case "$$PATCH_NAME" in \
- *.diff|*.patch) \
- CAT=cat \
- ;; \
+ case `basename $$PATCH_NAME` in \
*.gz) \
CAT=zcat \
;; \
*.bz2) \
CAT=bzcat \
;; \
+ *.diff|diff*|*.patch|patch*) \
+ CAT=cat \
+ ;; \
*) \
- false \
+ CAT=false \
;; \
esac; \
echo "patchin' $$PATCH_NAME ..."; \
@@ -253,18 +263,18 @@ patch_apply = \
PATCH_NAME="$(strip $(1))"; \
PACKET_DIR="$(strip $(2))"; \
if [ -f $$PATCH_NAME ]; then \
- case "$$PATCH_NAME" in \
- *.diff|*.patch) \
- CAT=cat \
- ;; \
+ case `basename $$PATCH_NAME` in \
*.gz) \
CAT=zcat \
;; \
*.bz2) \
CAT=bzcat \
;; \
+ *.diff|diff*|*.patch|patch*) \
+ CAT=cat \
+ ;; \
*) \
- false \
+ CAT=false \
;; \
esac; \
echo "patchin' $$PATCH_NAME ..."; \
@@ -299,9 +309,8 @@ CROSS_ENV_OBJCOPY = OBJCOPY=$(PTXCONF_GNU_TARGET)-objcopy
CROSS_ENV_OBJDUMP = OBJDUMP=$(PTXCONF_GNU_TARGET)-objdump
CROSS_ENV_RANLIB = RANLIB=$(PTXCONF_GNU_TARGET)-ranlib
CROSS_ENV_STRIP = STRIP=$(PTXCONF_GNU_TARGET)-strip
-CROSS_ENV_CFLAGS = CFLAGS=$(TARGET_CFLAGS)
-CROSS_ENV_CXXFLAGS = CXXFLAGS=$(TARGET_CXXFLAGS)
-
+CROSS_ENV_CFLAGS = CFLAGS='$(subst ",,$(TARGET_CFLAGS))'
+CROSS_ENV_CXXFLAGS = CXXFLAGS='$(subst ",,$(TARGET_CXXFLAGS))'
CROSS_ENV = $(CROSS_ENV_AR)
CROSS_ENV += $(CROSS_ENV_AS)
@@ -316,31 +325,35 @@ CROSS_ENV += $(CROSS_ENV_STRIP)
CROSS_ENV += $(CROSS_ENV_CFLAGS)
CROSS_ENV += $(CROSS_ENV_CXXFLAGS)
+CROSS_ENV += \
+ ac_cv_func_getpgrp_void=yes \
+ ac_cv_func_setpgrp_void=yes \
+ ac_cv_sizeof_long_long=8 \
+ ac_cv_func_memcmp_clean=yes \
+ ac_cv_func_setvbuf_reversed=no \
+ ac_cv_func_getrlimit=yes
+
+
#
# CROSS_LIB_DIR = into this dir, the libs for the target system, are installed
#
CROSS_LIB_DIR = $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
#
-# distcc, perhaps we will use this feature in far future :)
-# for more info see:
-# http://distcc.samba.org
+# prepare the search path
#
-DISTCC_ENV = CC='distcc $(PTXCONF_GNU_TARGET)-gcc'
-DISTCC_MAKE = CC='distcc $(PTXCONF_GNU_TARGET)-gcc' -j16
-
+CROSS_PATH = $(PTXCONF_PREFIX)/bin:$$PATH
#
# prepare the search path
#
-CROSS_PATH = $(PTXCONF_PREFIX)/bin:$$PATH
-
+NATIVE_PATH = $(PTXCONF_PREFIX)/$(NATIVE_GCC)/bin:$(PTXCONF_PREFIX)/$(NATIVE_BINUTILS)/bin:$$PATH
#
# same as PTXCONF_GNU_TARGET, but w/o -linux
# e.g. i486 instead of i486-linux
#
-SHORT_TARGET = `echo $(PTXCONF_GNU_TARGET) | perl -i -p -e 's/(.*?)-.*/$$1/'`
+SHORT_TARGET := `echo $(PTXCONF_GNU_TARGET) | perl -i -p -e 's/(.*?)-.*/$$1/'`
#
# change this if you have some wired configuration :)
diff --git a/rules/Version.make b/rules/Version.make
new file mode 100644
index 000000000..7123a26a3
--- /dev/null
+++ b/rules/Version.make
@@ -0,0 +1,59 @@
+# -*-makefile-*-
+# $Id: Version.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+KERNEL_VERSION_MAJOR := $(call get_option, s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)=y/\1/)
+KERNEL_VERSION_MINOR := $(call get_option, s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)=y/\2/)
+KERNEL_VERSION_MICRO := $(call get_option, s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)=y/\3/)
+KERNEL_VERSION := $(KERNEL_VERSION_MAJOR).$(KERNEL_VERSION_MINOR).$(KERNEL_VERSION_MICRO)
+
+GCC_VERSION_MAJOR := $(call get_option, s/^PTXCONF_GCC_\([0-9]\)_\([0-9]*\)_\([0-9]\)=y/\1/)
+GCC_VERSION_MINOR := $(call get_option, s/^PTXCONF_GCC_\([0-9]\)_\([0-9]*\)_\([0-9]\)=y/\2/)
+GCC_VERSION_MICRO := $(call get_option, s/^PTXCONF_GCC_\([0-9]\)_\([0-9]*\)_\([0-9]\)=y/\3/)
+GCC_VERSION := $(GCC_VERSION_MAJOR).$(GCC_VERSION_MINOR).$(GCC_VERSION_MICRO)
+
+GLIBC_VERSION_MAJOR := $(call get_option, s/^PTXCONF_GLIBC_\([0-9]\)_\([0-9]\)_\([0-9]\).*/\1/)
+GLIBC_VERSION_MINOR := $(call get_option, s/^PTXCONF_GLIBC_\([0-9]\)_\([0-9]\)_\([0-9]\).*/\2/)
+GLIBC_VERSION_MICRO := $(call get_option, s/^PTXCONF_GLIBC_\([0-9]\)_\([0-9]\)_\([0-9]\).*/\3/)
+GLIBC_VERSION := $(GLIBC_VERSION_MAJOR).$(GLIBC_VERSION_MINOR).$(GLIBC_VERSION_MICRO)
+
+RTAI_VERSION_RELEASE := $(call get_option, s/^PTXCONF_RTAI_\([0-9]*\)_\([0-9]\)_\([0-9]*\)=y/\1.\2.\3/, rtai)
+RTAI_VERSION_CVS := $(call get_option, s/^PTXCONF_RTAI_CVS_\([0-9]*\)_\([0-9]\)_\([0-9]*\)=y/\1.\2.\3/, cvs)
+RTAI_TECH := $(call get_option, s/^PTXCONF_RTAI_[0-9]*_[0-9]_[0-9]*_[0-9]_[0-9]_[0-9]*_\([a-z0-9-]*\)=y/\1/)
+RTAI_TECH_SHORT := $(shell echo $(RTAI_TECH) | sed -e 's/adeos.*/adeos/' -e 's/\(rthal[0-9]\).*/\1/' -e 's/allsoft.*/allsoft1a/')
+
+
+HOST_GCC_VERSION_MAJOR := $(shell $(HOSTCC) -v 2>&1 | sed -n -e 's/gcc version \([0-9]\)\.\([0-9]*\)\.\([0-9]\).*/\1/p')
+HOST_GCC_VERSION_MINOR := $(shell $(HOSTCC) -v 2>&1 | sed -n -e 's/gcc version \([0-9]\)\.\([0-9]*\)\.\([0-9]\).*/\2/p')
+HOST_GCC_VERSION_MICRO := $(shell $(HOSTCC) -v 2>&1 | sed -n -e 's/gcc version \([0-9]\)\.\([0-9]*\)\.\([0-9]\).*/\3/p')
+HOST_GCC_VERSION := $(HOST_CC_VERSION_MAJOR).$(HOST_CC_VERSION_MINOR).$(HOST_CC_VERSION_MICRO)
+
+HOST_GCC_OK := \
+ $(shell \
+ if [ $(HOST_GCC_VERSION_MAJOR) -eq 3 -a $(HOST_GCC_VERSION_MINOR) -ge 2 ]; then \
+ echo yes; \
+ else \
+ echo no; \
+ fi \
+ )
+
+
+HOST_BINUTILS_VERSION_MAJOR := $(shell as --version 2>&1 | sed -n -e 's/GNU assembler.* \([0-9]\)\.\([0-9]*\)\.\([0-9]\).*/\1/p')
+HOST_BINUTILS_VERSION_MINOR := $(shell as --version 2>&1 | sed -n -e 's/GNU assembler.* \([0-9]\)\.\([0-9]*\)\.\([0-9]\).*/\2/p')
+HOST_BINUTILS_VERSION_MICRO := $(shell as --version 2>&1 | sed -n -e 's/GNU assembler.* \([0-9]\)\.\([0-9]*\)\.\([0-9]\).*/\3/p')
+HOST_BINUTILS_VERSION := $(HOST_BINUTILS_VERSION_MAJOR).$(HOST_BINUTILS_VERSION_MINOR).$(HOST_BINUTILS_VERSION_MICRO)
+
+HOST_BINUTILS_OK := \
+ $(shell \
+ if [ $(HOST_BINUTILS_VERSION_MAJOR) -eq 2 -a $(HOST_BINUTILS_VERSION_MINOR) -ge 13 ]; then \
+ echo yes; \
+ else \
+ echo no; \
+ fi \
+ )
diff --git a/rules/Virtual.make b/rules/Virtual.make
index 3810498c6..4864b6156 100644
--- a/rules/Virtual.make
+++ b/rules/Virtual.make
@@ -1,13 +1,37 @@
# -*-makefile-*-
-# $Id: Virtual.make,v 1.2 2003/09/16 16:33:21 mkl Exp $
+# $Id: Virtual.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
+# ----------------------------------------------------------------------------
+# nchain
+# ----------------------------------------------------------------------------
+
+#
+# The Nativechain:
+#
+# Some packets; like glibc-2.3.x need
+# at least gcc-3.2 to build. Simply add a dependency to
+# $(STATEDIR)/virtual-nchain.install and the hostchain gets installed.
+#
+
+virtual-nchain_install: $(STATEDIR)/virtual-nchain.install
+
+virtual-nchain_install_deps = $(addprefix $(STATEDIR)/, $(addsuffix .install, $(NATIVE)))
+
+$(STATEDIR)/virtual-nchain.install: $(virtual-nchain_install_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# xchain
+# ----------------------------------------------------------------------------
+
virtual-xchain_install: $(STATEDIR)/virtual-xchain.install
ifdef PTXCONF_BUILD_CROSSCHAIN
@@ -15,5 +39,5 @@ virtual-xchain_install_deps = $(STATEDIR)/xchain-gccstage2.install
endif
$(STATEDIR)/virtual-xchain.install: $(virtual-xchain_install_deps)
- @$(call targetinfo, virtual-xchain.install)
+ @$(call targetinfo, $@)
touch $@ \ No newline at end of file
diff --git a/rules/addons.make b/rules/addons.make
index c921537dd..9d25c843c 100644
--- a/rules/addons.make
+++ b/rules/addons.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: addons.make,v 1.1 2003/09/02 14:10:22 robert Exp $
+# $Id: addons.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -25,7 +25,7 @@ ADDONS_DIR = $(TOPDIR)/addons
addons_get: $(STATEDIR)/addons.get
$(STATEDIR)/addons.get:
- @$(call targetinfo, addons.get)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -35,7 +35,7 @@ $(STATEDIR)/addons.get:
addons_extract: $(STATEDIR)/addons.extract
$(STATEDIR)/addons.extract: $(STATEDIR)/addons.get
- @$(call targetinfo, addons.extract)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -45,7 +45,7 @@ $(STATEDIR)/addons.extract: $(STATEDIR)/addons.get
addons_prepare: $(STATEDIR)/addons.prepare
$(STATEDIR)/addons.prepare: $(STATEDIR)/addons.extract
- @$(call targetinfo, addons.prepare)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -55,7 +55,7 @@ $(STATEDIR)/addons.prepare: $(STATEDIR)/addons.extract
addons_compile: $(STATEDIR)/addons.compile
$(STATEDIR)/addons.compile: $(STATEDIR)/addons.prepare
- @$(call targetinfo, addons.compile)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -65,7 +65,7 @@ $(STATEDIR)/addons.compile: $(STATEDIR)/addons.prepare
addons_install: $(STATEDIR)/addons.install
$(STATEDIR)/addons.install: $(STATEDIR)/addons.compile
- @$(call targetinfo, addons.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -77,7 +77,7 @@ addons_targetinstall: $(STATEDIR)/addons.targetinstall
addons_targetinstall_deps = $(STATEDIR)/addons.compile
$(STATEDIR)/addons.targetinstall: $(addons_targetinstall_deps)
- @$(call targetinfo, addons.targetinstall)
+ @$(call targetinfo, $@)
@cd $(ROOTDIR) && \
for i in $(ADDONS_DIR)/*.tar.gz; do \
echo "Adding stuff from $$i..."; \
diff --git a/rules/atk124.make b/rules/atk124.make
index 7e3970ea0..d17586e1d 100644
--- a/rules/atk124.make
+++ b/rules/atk124.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: atk124.make,v 1.2 2003/08/17 00:32:04 robert Exp $
+# $Id: atk124.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-# Pengutronix <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ atk124_get: $(STATEDIR)/atk124.get
atk124_get_deps = $(ATK124_SOURCE)
$(STATEDIR)/atk124.get: $(atk124_get_deps)
- @$(call targetinfo, atk124.get)
+ @$(call targetinfo, $@)
touch $@
$(ATK124_SOURCE):
- @$(call targetinfo, $(ATK124_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(ATK124_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ atk124_extract: $(STATEDIR)/atk124.extract
atk124_extract_deps = $(STATEDIR)/atk124.get
$(STATEDIR)/atk124.extract: $(atk124_extract_deps)
- @$(call targetinfo, atk124.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(ATK124_DIR))
@$(call extract, $(ATK124_SOURCE))
touch $@
@@ -69,7 +69,7 @@ atk124_prepare: $(STATEDIR)/atk124.prepare
atk124_prepare_deps = \
$(STATEDIR)/atk124.extract \
$(STATEDIR)/pango12.install \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
ATK124_PATH = PATH=$(CROSS_PATH)
ATK124_ENV = $(CROSS_ENV)
@@ -87,7 +87,7 @@ ATK124_AUTOCONF += --enable-foo
endif
$(STATEDIR)/atk124.prepare: $(atk124_prepare_deps)
- @$(call targetinfo, atk124.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(ATK124_BUILDDIR))
cd $(ATK124_DIR) && \
$(ATK124_PATH) $(ATK124_ENV) \
@@ -103,10 +103,10 @@ atk124_compile: $(STATEDIR)/atk124.compile
atk124_compile_deps = $(STATEDIR)/atk124.prepare
$(STATEDIR)/atk124.compile: $(atk124_compile_deps)
- @$(call targetinfo, atk124.compile)
+ @$(call targetinfo, $@)
$(ATK124_PATH) make -C $(ATK124_DIR)
-
- # FIXME: this is somehow not done by the packet; file bug report
+
+# FIXME: this is somehow not done by the packet; file bug report
ln -sf libatk-1.0.la $(ATK124_DIR)/atk/libatk.la
touch $@
@@ -118,14 +118,14 @@ $(STATEDIR)/atk124.compile: $(atk124_compile_deps)
atk124_install: $(STATEDIR)/atk124.install
$(STATEDIR)/atk124.install: $(STATEDIR)/atk124.compile
- @$(call targetinfo, atk124.install)
-
+ @$(call targetinfo, $@)
+
install -d $(PTXCONF_PREFIX)
rm -f $(PTXCONF_PREFIX)/lib/libatk-1.0.so*
install $(ATK124_DIR)/atk/.libs/libatk-1.0.so.0.200.4 $(PTXCONF_PREFIX)/lib/
ln -s libatk-1.0.so.0.200.4 $(PTXCONF_PREFIX)/lib/libatk-1.0.so.0
ln -s libatk-1.0.so.0.200.4 $(PTXCONF_PREFIX)/lib/libatk-1.0.so
-
+
rm -f $(PTXCONF_PREFIX)/include/atk*.h
install $(ATK124_DIR)/atk/atk*.h $(PTXCONF_PREFIX)/include
@@ -140,8 +140,8 @@ atk124_targetinstall: $(STATEDIR)/atk124.targetinstall
atk124_targetinstall_deps = $(STATEDIR)/atk124.compile
$(STATEDIR)/atk124.targetinstall: $(atk124_targetinstall_deps)
- @$(call targetinfo, atk124.targetinstall)
-
+ @$(call targetinfo, $@)
+
install -d $(ROOTDIR)
rm -f $(ROOTDIR)/lib/libatk-1.0.so*
install $(ATK124_DIR)/atk/.libs/libatk-1.0.so.0.200.4 $(ROOTDIR)/lib/
diff --git a/rules/autoconf-2.13.make b/rules/autoconf-2.13.make
index 7cc619255..fa298d2c7 100644
--- a/rules/autoconf-2.13.make
+++ b/rules/autoconf-2.13.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: autoconf-2.13.make,v 1.5 2003/07/17 07:40:38 robert Exp $
+# $Id: autoconf-2.13.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -28,11 +28,11 @@ AUTOCONF213_DIR = $(BUILDDIR)/$(AUTOCONF213)
autoconf213_get: $(STATEDIR)/autoconf213.get
$(STATEDIR)/autoconf213.get: $(AUTOCONF213_SOURCE)
- @$(call targetinfo, autoconf213.get)
+ @$(call targetinfo, $@)
touch $@
$(AUTOCONF213_SOURCE):
- @$(call targetinfo, $(AUTOCONF213_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(AUTOCONF213_URL))
# ----------------------------------------------------------------------------
@@ -42,7 +42,7 @@ $(AUTOCONF213_SOURCE):
autoconf213_extract: $(STATEDIR)/autoconf213.extract
$(STATEDIR)/autoconf213.extract: $(STATEDIR)/autoconf213.get
- @$(call targetinfo, autoconf213.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(AUTOCONF213_DIR))
@$(call extract, $(AUTOCONF213_SOURCE))
touch $@
@@ -56,7 +56,7 @@ autoconf213_prepare: $(STATEDIR)/autoconf213.prepare
AUTOCONF213_ENV = $(HOSTCC_ENV)
$(STATEDIR)/autoconf213.prepare: $(STATEDIR)/autoconf213.extract
- @$(call targetinfo, autoconf213.prepare)
+ @$(call targetinfo, $@)
cd $(AUTOCONF213_DIR) && \
$(AUTOCONF213_ENV) \
./configure --prefix=$(PTXCONF_PREFIX)/$(AUTOCONF213)
@@ -69,7 +69,7 @@ $(STATEDIR)/autoconf213.prepare: $(STATEDIR)/autoconf213.extract
autoconf213_compile: $(STATEDIR)/autoconf213.compile
$(STATEDIR)/autoconf213.compile: $(STATEDIR)/autoconf213.prepare
- @$(call targetinfo, autoconf213.compile)
+ @$(call targetinfo, $@)
make -C $(AUTOCONF213_DIR)
touch $@
@@ -80,7 +80,7 @@ $(STATEDIR)/autoconf213.compile: $(STATEDIR)/autoconf213.prepare
autoconf213_install: $(STATEDIR)/autoconf213.install
$(STATEDIR)/autoconf213.install: $(STATEDIR)/autoconf213.compile
- @$(call targetinfo, autoconf213.install)
+ @$(call targetinfo, $@)
make -C $(AUTOCONF213_DIR) install
touch $@
@@ -91,7 +91,7 @@ $(STATEDIR)/autoconf213.install: $(STATEDIR)/autoconf213.compile
autoconf213_targetinstall: $(STATEDIR)/autoconf213.targetinstall
$(STATEDIR)/autoconf213.targetinstall: $(STATEDIR)/autoconf213.install
- @$(call targetinfo, autoconf213.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/autoconf-2.57.make b/rules/autoconf-2.57.make
index 0b9244b25..3157b3a7b 100644
--- a/rules/autoconf-2.57.make
+++ b/rules/autoconf-2.57.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: autoconf-2.57.make,v 1.3 2003/07/16 04:23:28 mkl Exp $
+# $Id: autoconf-2.57.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -28,11 +28,11 @@ AUTOCONF257_DIR = $(BUILDDIR)/$(AUTOCONF257)
autoconf257_get: $(STATEDIR)/autoconf257.get
$(STATEDIR)/autoconf257.get: $(AUTOCONF257_SOURCE)
- @$(call targetinfo, autoconf257.get)
+ @$(call targetinfo, $@)
touch $@
$(AUTOCONF257_SOURCE):
- @$(call targetinfo, $(AUTOCONF257_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(AUTOCONF257_URL))
# ----------------------------------------------------------------------------
@@ -42,7 +42,7 @@ $(AUTOCONF257_SOURCE):
autoconf257_extract: $(STATEDIR)/autoconf257.extract
$(STATEDIR)/autoconf257.extract: $(STATEDIR)/autoconf257.get
- @$(call targetinfo, autoconf257.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(AUTOCONF257_DIR))
@$(call extract, $(AUTOCONF257_SOURCE))
touch $@
@@ -56,7 +56,7 @@ autoconf257_prepare: $(STATEDIR)/autoconf257.prepare
AUTOCONF257_ENV = $(HOSTCC_ENV)
$(STATEDIR)/autoconf257.prepare: $(STATEDIR)/autoconf257.extract
- @$(call targetinfo, autoconf257.prepare)
+ @$(call targetinfo, $@)
cd $(AUTOCONF257_DIR) && \
$(AUTOCONF257_ENV) \
./configure --prefix=$(PTXCONF_PREFIX)/$(AUTOCONF257)
@@ -69,7 +69,7 @@ $(STATEDIR)/autoconf257.prepare: $(STATEDIR)/autoconf257.extract
autoconf257_compile: $(STATEDIR)/autoconf257.compile
$(STATEDIR)/autoconf257.compile: $(STATEDIR)/autoconf257.prepare
- @$(call targetinfo, autoconf257.compile)
+ @$(call targetinfo, $@)
make -C $(AUTOCONF257_DIR)
touch $@
@@ -80,7 +80,7 @@ $(STATEDIR)/autoconf257.compile: $(STATEDIR)/autoconf257.prepare
autoconf257_install: $(STATEDIR)/autoconf257.install
$(STATEDIR)/autoconf257.install: $(STATEDIR)/autoconf257.compile
- @$(call targetinfo, autoconf257.install)
+ @$(call targetinfo, $@)
make -C $(AUTOCONF257_DIR) install
touch $@
@@ -91,7 +91,7 @@ $(STATEDIR)/autoconf257.install: $(STATEDIR)/autoconf257.compile
autoconf257_targetinstall: $(STATEDIR)/autoconf257.targetinstall
$(STATEDIR)/autoconf257.targetinstall: $(STATEDIR)/autoconf257.install
- @$(call targetinfo, autoconf257.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/automake-1.5.make b/rules/automake-1.5.make
index 5029148b1..33567bbf4 100644
--- a/rules/automake-1.5.make
+++ b/rules/automake-1.5.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: automake-1.5.make,v 1.1 2003/09/07 18:29:42 mkl Exp $
+# $Id: automake-1.5.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -28,11 +28,11 @@ automake15_get: $(STATEDIR)/automake15.get
automake15_get_deps = $(AUTOMAKE15_SOURCE)
$(STATEDIR)/automake15.get: $(automake15_get_deps)
- @$(call targetinfo, automake15.get)
+ @$(call targetinfo, $@)
touch $@
$(AUTOMAKE15_SOURCE):
- @$(call targetinfo, $(AUTOMAKE15_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(AUTOMAKE15_URL))
# ----------------------------------------------------------------------------
@@ -44,7 +44,7 @@ automake15_extract: $(STATEDIR)/automake15.extract
automake15_extract_deps = $(STATEDIR)/automake15.get
$(STATEDIR)/automake15.extract: $(automake15_extract_deps)
- @$(call targetinfo, automake15.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(AUTOMAKE15_DIR))
@$(call extract, $(AUTOMAKE15_SOURCE))
touch $@
@@ -70,7 +70,7 @@ AUTOMAKE15_PATH = PATH=$(PTXCONF_PREFIX)/$(AUTOCONF257)/bin:$(CROSS_PATH)
AUTOMAKE15_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(AUTOMAKE15)
$(STATEDIR)/automake15.prepare: $(automake15_prepare_deps)
- @$(call targetinfo, automake15.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(AUTOMAKE15_BUILDDIR))
cd $(AUTOMAKE15_DIR) && \
$(AUTOMAKE15_PATH) \
@@ -86,7 +86,7 @@ automake15_compile: $(STATEDIR)/automake15.compile
automake15_compile_deps = $(STATEDIR)/automake15.prepare
$(STATEDIR)/automake15.compile: $(automake15_compile_deps)
- @$(call targetinfo, automake15.compile)
+ @$(call targetinfo, $@)
$(AUTOMAKE15_PATH) make -C $(AUTOMAKE15_DIR)
touch $@
@@ -97,7 +97,7 @@ $(STATEDIR)/automake15.compile: $(automake15_compile_deps)
automake15_install: $(STATEDIR)/automake15.install
$(STATEDIR)/automake15.install: $(STATEDIR)/automake15.compile
- @$(call targetinfo, automake15.install)
+ @$(call targetinfo, $@)
$(AUTOMAKE15_PATH) make -C $(AUTOMAKE15_DIR) install
touch $@
@@ -110,7 +110,7 @@ automake15_targetinstall: $(STATEDIR)/automake15.targetinstall
automake15_targetinstall_deps =
$(STATEDIR)/automake15.targetinstall: $(automake15_targetinstall_deps)
- @$(call targetinfo, automake15.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/automake-1.7.6.make b/rules/automake-1.7.6.make
index 473c404f8..8651effff 100644
--- a/rules/automake-1.7.6.make
+++ b/rules/automake-1.7.6.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: automake-1.7.6.make,v 1.1 2003/09/07 18:29:42 mkl Exp $
+# $Id: automake-1.7.6.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -28,11 +28,11 @@ automake176_get: $(STATEDIR)/automake176.get
automake176_get_deps = $(AUTOMAKE176_SOURCE)
$(STATEDIR)/automake176.get: $(automake176_get_deps)
- @$(call targetinfo, automake176.get)
+ @$(call targetinfo, $@)
touch $@
$(AUTOMAKE176_SOURCE):
- @$(call targetinfo, $(AUTOMAKE176_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(AUTOMAKE176_URL))
# ----------------------------------------------------------------------------
@@ -44,7 +44,7 @@ automake176_extract: $(STATEDIR)/automake176.extract
automake176_extract_deps = $(STATEDIR)/automake176.get
$(STATEDIR)/automake176.extract: $(automake176_extract_deps)
- @$(call targetinfo, automake176.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(AUTOMAKE176_DIR))
@$(call extract, $(AUTOMAKE176_SOURCE))
touch $@
@@ -70,7 +70,7 @@ AUTOMAKE176_PATH = PATH=$(PTXCONF_PREFIX)/$(AUTOCONF257)/bin:$(CROSS_PATH)
AUTOMAKE176_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(AUTOMAKE176)
$(STATEDIR)/automake176.prepare: $(automake176_prepare_deps)
- @$(call targetinfo, automake176.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(AUTOMAKE176_BUILDDIR))
cd $(AUTOMAKE176_DIR) && \
$(AUTOMAKE176_PATH) \
@@ -86,7 +86,7 @@ automake176_compile: $(STATEDIR)/automake176.compile
automake176_compile_deps = $(STATEDIR)/automake176.prepare
$(STATEDIR)/automake176.compile: $(automake176_compile_deps)
- @$(call targetinfo, automake176.compile)
+ @$(call targetinfo, $@)
$(AUTOMAKE176_PATH) make -C $(AUTOMAKE176_DIR)
touch $@
@@ -97,7 +97,7 @@ $(STATEDIR)/automake176.compile: $(automake176_compile_deps)
automake176_install: $(STATEDIR)/automake176.install
$(STATEDIR)/automake176.install: $(STATEDIR)/automake176.compile
- @$(call targetinfo, automake176.install)
+ @$(call targetinfo, $@)
$(AUTOMAKE176_PATH) make -C $(AUTOMAKE176_DIR) install
touch $@
@@ -110,7 +110,7 @@ automake176_targetinstall: $(STATEDIR)/automake176.targetinstall
automake176_targetinstall_deps =
$(STATEDIR)/automake176.targetinstall: $(automake176_targetinstall_deps)
- @$(call targetinfo, automake176.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/bash.make b/rules/bash.make
index 3cb5c88f0..3829962a3 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: bash.make,v 1.5 2003/07/16 04:23:28 mkl Exp $
+# $Id: bash.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -30,11 +30,11 @@ BASH_DIR = $(BUILDDIR)/$(BASH)
bash_get: $(STATEDIR)/bash.get
$(STATEDIR)/bash.get: $(BASH_SOURCE)
- @$(call targetinfo, bash.get)
+ @$(call targetinfo, $@)
touch $@
$(BASH_SOURCE):
- @$(call targetinfo, $(BASH_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(BASH_URL))
# ----------------------------------------------------------------------------
@@ -44,7 +44,7 @@ $(BASH_SOURCE):
bash_extract: $(STATEDIR)/bash.extract
$(STATEDIR)/bash.extract: $(STATEDIR)/bash.get
- @$(call targetinfo, bash.extract)
+ @$(call targetinfo, $@)
@$(call clean $(BASH_DIR))
@$(call extract, $(BASH_SOURCE))
touch $@
@@ -194,7 +194,7 @@ bash_prepare_deps = \
$(STATEDIR)/bash.extract
$(STATEDIR)/bash.prepare: $(bash_prepare_deps)
- @$(call targetinfo, bash.prepare)
+ @$(call targetinfo, $@)
cd $(BASH_DIR) && \
$(BASH_PATH) $(BASH_ENV) \
./configure $(BASH_AUTOCONF)
@@ -207,7 +207,7 @@ $(STATEDIR)/bash.prepare: $(bash_prepare_deps)
bash_compile: $(STATEDIR)/bash.compile
$(STATEDIR)/bash.compile: $(STATEDIR)/bash.prepare
- @$(call targetinfo, bash.compile)
+ @$(call targetinfo, $@)
$(BASH_PATH) make -C $(BASH_DIR)
touch $@
@@ -218,7 +218,7 @@ $(STATEDIR)/bash.compile: $(STATEDIR)/bash.prepare
bash_install: $(STATEDIR)/bash.install
$(STATEDIR)/bash.install: $(STATEDIR)/bash.compile
- @$(call targetinfo, bash.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -228,7 +228,7 @@ $(STATEDIR)/bash.install: $(STATEDIR)/bash.compile
bash_targetinstall: $(STATEDIR)/bash.targetinstall
$(STATEDIR)/bash.targetinstall: $(STATEDIR)/bash.compile
- @$(call targetinfo, bash.targetinstall)
+ @$(call targetinfo, $@)
mkdir -p $(ROOTDIR)/bin
install $(BASH_DIR)/bash $(ROOTDIR)/bin/bash
ln -sf bash $(ROOTDIR)/bin/sh
diff --git a/rules/binutils.make b/rules/binutils.make
index b2d57e493..f31c70f81 100644
--- a/rules/binutils.make
+++ b/rules/binutils.make
@@ -1,75 +1,61 @@
# -*-makefile-*-
-# $Id: binutils.make,v 1.3 2003/09/16 08:12:55 mkl Exp $
+# $Id: binutils.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
+ifdef PTXCONF_LIBBFD
+PACKAGES += binutils
+endif
+
#
# Paths and names
#
-BINUTILS = binutils-2.13.2.1
+BINUTILS_VERSION = 2.13.2.1
+BINUTILS = binutils-$(BINUTILS_VERSION)
BINUTILS_URL = ftp://ftp.gnu.org/pub/gnu/binutils/$(BINUTILS).tar.gz
BINUTILS_SOURCE = $(SRCDIR)/$(BINUTILS).tar.gz
BINUTILS_DIR = $(BUILDDIR)/$(BINUTILS)
-ifdef PTXCONF_ARCH_NOMMU
-BINUTILS = binutils-2.10
-BINUTILS_URL = ftp://ftp.gnu.org/pub/gnu/binutils/$(BINUTILS).tar.gz
-endif
-ifdef PTXCONF_ARCH_MIPS
-BINUTILS = binutils-2.14.90.0.4
-BINUTILS_URL = ftp://ftp.de.kernel.org/pub/linux/devel/binutils/$(BINUTILS).tar.gz
-endif
-ifdef PTXCONF_ARCH_PARISC
-BINUTILS = binutils-2.14.90.0.4
-BINUTILS_URL = ftp://ftp.de.kernel.org/pub/linux/devel/binutils/$(BINUTILS).tar.gz
-endif
-
-BINUTILS_NOMMU_PATCH = binutils-2.10-full.patch
-BINUTILS_NOMMU_PATCH_URL = http://www.uclinux.org/pub/uClinux/m68k-elf-tools/tools-20030314/$(BINUTILS_NOMMU_PATCH)
-BINUTILS_NOMMU_PATCH_SOURCE = $(SRCDIR)/$(BINUTILS_NOMMU_PATCH)
+BINUTILS_BUILDDIR = $(BINUTILS_DIR)-build
# ----------------------------------------------------------------------------
-# Extract
+# Get
# ----------------------------------------------------------------------------
-binutils_extract: $(STATEDIR)/binutils.extract
+binutils_get: $(STATEDIR)/binutils.get
-$(STATEDIR)/binutils.extract: $(STATEDIR)/xchain-binutils.get
- @$(call targetinfo, binutils.extract)
- @$(call clean, $(BINUTILS_DIR))
- @$(call extract, $(BINUTILS_SOURCE))
+binutils_get_deps = \
+ $(BINUTILS_SOURCE) \
+ $(STATEDIR)/binutils-patches.get
-#
-# inspired by Erik Andersen's buildroot
-#
+$(STATEDIR)/binutils.get: $(binutils_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
-#
-# Enable combreloc, since it is such a nice thing to have...
-#
- perl -i -p -e "s,link_info.combreloc = false,link_info.combreloc = true,g;" $(BINUTILS_DIR)/ld/ldmain.c
+$(STATEDIR)/binutils-patches.get:
+ @$(call targetinfo, $@)
+ @$(call get_patches, $(BINUTILS))
+ touch $@
-#
-# Hack binutils to use the correct shared lib loader
-#
- cd $(BINUTILS_DIR) && \
- perl -i -p -e "s,#.*define.*ELF_DYNAMIC_INTERPRETER.*\".*\",#define ELF_DYNAMIC_INTERPRETER \"$(DYNAMIC_LINKER)\",;" \
- `grep -lr "#define ELF_DYNAMIC_INTERPRETER" $(BINUTILS_DIR)`
+$(BINUTILS_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(BINUTILS_URL))
-#
-# Hack binutils to prevent it from searching the host system
-# for libraries. We only want libraries for the target system.
-#
- cd $(BINUTILS_DIR) && \
- perl -i -p -e "s,^NATIVE_LIB_DIRS.*,NATIVE_LIB_DIRS='$(CROSS_LIB_DIR)/usr/lib $(CROSS_LIB_DIR)/lib',;" \
- $(BINUTILS_DIR)/ld/configure.host
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
-ifdef PTXCONF_ARCH_ARM_NOMMU
- cd $(BINUTILS_DIR) && patch -p1 < $(BINUTILS_NOMMU_PATCH_SOURCE)
-endif
+binutils_extract: $(STATEDIR)/binutils.extract
+
+$(STATEDIR)/binutils.extract: $(STATEDIR)/binutils.get
+ @$(call targetinfo, $@)
+ @$(call clean, $(BINUTILS_DIR))
+ @$(call extract, $(BINUTILS_SOURCE))
+ @$(call patchin, $(BINUTILS))
touch $@
# ----------------------------------------------------------------------------
@@ -82,31 +68,27 @@ binutils_prepare_deps = \
$(STATEDIR)/virtual-xchain.install \
$(STATEDIR)/binutils.extract
-BINUTILS_AUTOCONF_TARGET = --enable-targets=$(PTXCONF_GNU_TARGET)
-ifdef PTXCONF_ARCH_MIPS
-BINUTILS_AUTOCONF_TARGET = --enable-targets=$(PTXCONF_GNU_TARGET),mips64-linux
-endif
-ifdef PTXCONF_OPT_PA8X00
-BINUTILS_AUTOCONF_TARGET = --enable-targets=$(PTXCONF_GNU_TARGET),hppa64-linux
-endif
-
BINUTILS_AUTOCONF = \
--target=$(PTXCONF_GNU_TARGET) \
--host=$(PTXCONF_GNU_TARGET) \
--build=$(GNU_HOST) \
- --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) \
+ --enable-targets=$(PTXCONF_GNU_TARGET) \
+ --prefix=/usr \
--disable-nls \
--enable-shared \
- $(BINUTILS_AUTOCONF_TARGET)
-
-# --enable-multilib \
+ --enable-commonbfdlib \
+ --enable-install-libiberty \
+ --disable-multilib
-BINUTILS_ENV = $(CROSS_ENV) PATH=$(CROSS_PATH)
+BINUTILS_ENV = $(CROSS_ENV)
+BINUTILS_PATH = PATH=$(CROSS_PATH)
$(STATEDIR)/binutils.prepare: $(binutils_prepare_deps)
- @$(call targetinfo, binutils.prepare)
- cd $(BINUTILS_DIR) && $(BINUTILS_ENV) \
- ./configure $(BINUTILS_AUTOCONF)
+ @$(call targetinfo, $@)
+ @$(call clean, $(BINUTILS_BUILDDIR))
+ mkdir -p $(BINUTILS_BUILDDIR)
+ cd $(BINUTILS_BUILDDIR) && $(BINUTILS_PATH) $(BINUTILS_ENV) \
+ $(BINUTILS_DIR)/configure $(BINUTILS_AUTOCONF)
touch $@
# ----------------------------------------------------------------------------
@@ -116,8 +98,21 @@ $(STATEDIR)/binutils.prepare: $(binutils_prepare_deps)
binutils_compile: $(STATEDIR)/binutils.compile
$(STATEDIR)/binutils.compile: $(STATEDIR)/binutils.prepare
- @$(call targetinfo, binutils.compile)
- $(BINUTILS_ENV) make -C $(BINUTILS_DIR)
+ @$(call targetinfo, $@)
+#
+# the libiberty part is compiled for the host system
+#
+# don't pass target CFLAGS to it, so override them and call the configure script
+#
+ $(BINUTILS_PATH) make -C $(BINUTILS_BUILDDIR) CFLAGS='' CXXFLAGS='' configure-build-libiberty
+
+ $(BINUTILS_PATH) make -C $(BINUTILS_BUILDDIR)
+
+#
+# the chew tool is needed later during installation, compile it now
+# else it will fail cause it gets target CFLAGS
+#
+ $(BINUTILS_PATH) make -C $(BINUTILS_BUILDDIR)/bfd/doc CFLAGS='' CXXFLAGS='' chew
touch $@
# ----------------------------------------------------------------------------
@@ -127,8 +122,8 @@ $(STATEDIR)/binutils.compile: $(STATEDIR)/binutils.prepare
binutils_install: $(STATEDIR)/binutils.install
$(STATEDIR)/binutils.install: $(STATEDIR)/binutils.compile
- @$(call targetinfo, binutils.install)
- make install -C $(BINUTILS_DIR)
+ @$(call targetinfo, $@)
+ $(BINUTILS_PATH) make -C $(BINUTILS_BUILDDIR)/bfd DESTDIR=$(CROSS_LIB_DIR) prefix='' install
touch $@
# ----------------------------------------------------------------------------
@@ -138,11 +133,9 @@ $(STATEDIR)/binutils.install: $(STATEDIR)/binutils.compile
binutils_targetinstall: $(STATEDIR)/binutils.targetinstall
$(STATEDIR)/binutils.targetinstall: $(STATEDIR)/binutils.install
- @$(call targetinfo, binutils.targetinstall)
- ifeq (y, $(PTXCONF_LIBBFD))
- install -d $(ROOTDIR)/lib
- cp -d $(BINUTILS_DIR)/bfd/.libs/libbfd.* $(ROOTDIR)/lib
- endif
+ @$(call targetinfo, $@)
+ install -d $(ROOTDIR)/usr/lib
+ cp -d $(BINUTILS_BUILDDIR)/bfd/.libs/libbfd*.so $(ROOTDIR)/usr/lib
touch $@
# ----------------------------------------------------------------------------
@@ -150,6 +143,6 @@ $(STATEDIR)/binutils.targetinstall: $(STATEDIR)/binutils.install
# ----------------------------------------------------------------------------
binutils_clean:
- rm -rf $(STATEDIR)/binutils.* $(BINUTILS_DIR)
+ rm -rf $(STATEDIR)/binutils-* $(BINUTILS_DIR)
# vim: syntax=make
diff --git a/rules/bootdisk.make b/rules/bootdisk.make
index e13065b5d..dbea21e83 100644
--- a/rules/bootdisk.make
+++ b/rules/bootdisk.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: bootdisk.make,v 1.10 2003/08/12 08:20:12 robert Exp $
+# $Id: bootdisk.make,v 1.11 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -32,11 +32,11 @@ BOOTDISK_EXTRACT = gzip -dc
bootdisk_get: $(STATEDIR)/bootdisk.get
$(STATEDIR)/bootdisk.get: $(BOOTDISK_SOURCE)
- @$(call targetinfo, bootdisk.get)
+ @$(call targetinfo, $@)
touch $@
$(BOOTDISK_SOURCE):
- @$(call targetinfo, $(BOOTDISK_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(BOOTDISK_URL))
# ----------------------------------------------------------------------------
@@ -46,7 +46,7 @@ $(BOOTDISK_SOURCE):
bootdisk_extract: $(STATEDIR)/bootdisk.extract
$(STATEDIR)/bootdisk.extract: $(STATEDIR)/bootdisk.get
- @$(call targetinfo, bootdisk.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(BOOTDISK_DIR))
@$(call extract, $(BOOTDISK_SOURCE))
touch $@
@@ -58,7 +58,7 @@ $(STATEDIR)/bootdisk.extract: $(STATEDIR)/bootdisk.get
bootdisk_prepare: $(STATEDIR)/bootdisk.prepare
$(STATEDIR)/bootdisk.prepare: $(STATEDIR)/bootdisk.extract
- @$(call targetinfo, bootdisk.prepare)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -68,7 +68,7 @@ $(STATEDIR)/bootdisk.prepare: $(STATEDIR)/bootdisk.extract
bootdisk_compile: $(STATEDIR)/bootdisk.compile
$(STATEDIR)/bootdisk.compile: $(STATEDIR)/bootdisk.prepare
- @$(call targetinfo, bootdisk.compile)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -78,7 +78,7 @@ $(STATEDIR)/bootdisk.compile: $(STATEDIR)/bootdisk.prepare
bootdisk_install: $(STATEDIR)/bootdisk.install
$(STATEDIR)/bootdisk.install: $(STATEDIR)/bootdisk.compile
- @$(call targetinfo, bootdisk.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -94,17 +94,17 @@ bootdisk_targetinstall_deps += $(STATEDIR)/e2fsprogs.compile
bootdisk_targetinstall_deps += $(STATEDIR)/ncurses.compile
$(STATEDIR)/bootdisk.targetinstall: $(bootdisk_targetinstall_deps)
- @$(call targetinfo, bootdisk.targetinstall)
+ @$(call targetinfo, $@)
install $(KERNEL_TARGET_PATH) $(BOOTDISK_DIR)/boot/
install $(GRUB_DIR)/stage1/stage1 $(BOOTDISK_DIR)/boot/grub/
install $(GRUB_DIR)/stage2/stage2 $(BOOTDISK_DIR)/boot/grub/
install $(GRUB_DIR)/grub/grub $(BOOTDISK_DIR)/bin/
- $(CROSSSTRIP) -R .notes -R .comment $(BOOTDISK_DIR)/bin/grub
+ $(CROSSSTRIP) -R .note -R .comment $(BOOTDISK_DIR)/bin/grub
# FIXME: make this a config option
ln -sf menu-disk.lst $(BOOTDISK_DIR)/boot/grub/menu.lst
ln -sf menu.lst $(BOOTDISK_DIR)/boot/grub/grub.conf
install $(E2FSPROGS_DIR)/misc/mke2fs $(BOOTDISK_DIR)/bin/
- $(CROSSSTRIP) -R .notes -R .comment $(BOOTDISK_DIR)/bin/mke2fs
+ $(CROSSSTRIP) -R .note -R .comment $(BOOTDISK_DIR)/bin/mke2fs
install $(NCURSES_DIR)/lib/libncurses.so.5.2 $(BOOTDISK_DIR)/lib/
$(CROSSSTRIP) -S -R .note -R .comment $(BOOTDISK_DIR)/lib/libncurses.so.5.2
# FIXME: is this the correct file for this rule?
diff --git a/rules/busybox.make b/rules/busybox.make
index 962eaa494..158a771a2 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: busybox.make,v 1.14 2003/09/17 22:41:31 mkl Exp $
+# $Id: busybox.make,v 1.15 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,12 +35,12 @@ busybox_get: $(STATEDIR)/busybox.get
busybox_get_deps = $(BUSYBOX_SOURCE)
$(STATEDIR)/busybox.get: $(busybox_get_deps)
- @$(call targetinfo, busybox.get)
+ @$(call targetinfo, $@)
@$(call get_patches, $(BUSYBOX))
touch $@
$(BUSYBOX_SOURCE):
- @$(call targetinfo, $(BUSYBOX_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(BUSYBOX_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ busybox_extract: $(STATEDIR)/busybox.extract
busybox_extract_deps = $(STATEDIR)/busybox.get
$(STATEDIR)/busybox.extract: $(busybox_extract_deps)
- @$(call targetinfo, busybox.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(BUSYBOX_DIR))
@$(call extract, $(BUSYBOX_SOURCE))
@$(call patchin, $(BUSYBOX))
@@ -73,7 +73,7 @@ busybox_prepare: $(STATEDIR)/busybox.prepare
#
busybox_prepare_deps = \
$(STATEDIR)/busybox.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
BUSYBOX_PATH = PATH=$(CROSS_PATH)
BUSYBOX_ENV = $(CROSS_ENV)
@@ -85,7 +85,7 @@ BUSYBOX_MAKEVARS = CROSS=$(PTXCONF_GNU_TARGET)- HOSTCC=$(HOSTCC) EXTRA_CFLAGS=$
busybox_prepare_deps = $(STATEDIR)/virtual-xchain.install $(STATEDIR)/busybox.extract
$(STATEDIR)/busybox.prepare: $(busybox_prepare_deps)
- @$(call targetinfo, busybox.prepare)
+ @$(call targetinfo, $@)
# FIXME: is this necessary?
touch $(BUSYBOX_DIR)/busybox.links
@@ -107,7 +107,7 @@ busybox_compile: $(STATEDIR)/busybox.compile
busybox_compile_deps = $(STATEDIR)/busybox.prepare
$(STATEDIR)/busybox.compile: $(busybox_compile_deps)
- @$(call targetinfo, busybox.compile)
+ @$(call targetinfo, $@)
$(BUSYBOX_PATH) make -C $(BUSYBOX_DIR) $(BUSYBOX_MAKEVARS)
touch $@
@@ -118,7 +118,7 @@ $(STATEDIR)/busybox.compile: $(busybox_compile_deps)
busybox_install: $(STATEDIR)/busybox.install
$(STATEDIR)/busybox.install: $(STATEDIR)/busybox.compile
- @$(call targetinfo, busybox.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -130,13 +130,13 @@ busybox_targetinstall: $(STATEDIR)/busybox.targetinstall
busybox_targetinstall_deps = $(STATEDIR)/busybox.compile
$(STATEDIR)/busybox.targetinstall: $(busybox_targetinstall_deps)
- @$(call targetinfo, busybox.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)
rm -f $(BUSYBOX_DIR)/busybox.links
cd $(BUSYBOX_DIR) && \
$(BUSYBOX_PATH) $(MAKE) install \
PREFIX=$(ROOTDIR) $(BUSYBOX_MAKEVARS)
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/bin/busybox
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/bin/busybox
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/clementine.make b/rules/clementine.make
index 9e01461e1..f08162ff2 100644
--- a/rules/clementine.make
+++ b/rules/clementine.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: clementine.make,v 1.1 2003/08/21 07:29:21 robert Exp $
+# $Id: clementine.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,11 +35,11 @@ clementine_get: $(STATEDIR)/clementine.get
clementine_get_deps = $(CLEMENTINE_SOURCE)
$(STATEDIR)/clementine.get: $(clementine_get_deps)
- @$(call targetinfo, clementine.get)
+ @$(call targetinfo, $@)
touch $@
$(CLEMENTINE_SOURCE):
- @$(call targetinfo, $(CLEMENTINE_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(CLEMENTINE_URL))
# ----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ clementine_extract: $(STATEDIR)/clementine.extract
clementine_extract_deps = $(STATEDIR)/clementine.get
$(STATEDIR)/clementine.extract: $(clementine_extract_deps)
- @$(call targetinfo, clementine.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(CLEMENTINE_DIR))
@$(call extract, $(CLEMENTINE_SOURCE))
touch $@
@@ -68,13 +68,13 @@ clementine_prepare: $(STATEDIR)/clementine.prepare
clementine_prepare_deps = \
$(STATEDIR)/clementine.extract \
$(STATEDIR)/glib1210.install \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
CLEMENTINE_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
CLEMENTINE_ENV = $(CROSS_ENV)
$(STATEDIR)/clementine.prepare: $(clementine_prepare_deps)
- @$(call targetinfo, clementine.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(CLEMENTINE_BUILDDIR))
touch $@
@@ -87,7 +87,7 @@ clementine_compile: $(STATEDIR)/clementine.compile
clementine_compile_deps = $(STATEDIR)/clementine.prepare
$(STATEDIR)/clementine.compile: $(clementine_compile_deps)
- @$(call targetinfo, clementine.compile)
+ @$(call targetinfo, $@)
$(CLEMENTINE_PATH) $(CLEMENTINE_ENV) make -C $(CLEMENTINE_DIR)
touch $@
@@ -98,7 +98,7 @@ $(STATEDIR)/clementine.compile: $(clementine_compile_deps)
clementine_install: $(STATEDIR)/clementine.install
$(STATEDIR)/clementine.install: $(STATEDIR)/clementine.compile
- @$(call targetinfo, clementine.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -110,7 +110,7 @@ clementine_targetinstall: $(STATEDIR)/clementine.targetinstall
clementine_targetinstall_deps = $(STATEDIR)/clementine.compile
$(STATEDIR)/clementine.targetinstall: $(clementine_targetinstall_deps)
- @$(call targetinfo, clementine.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)/usr/X11R6/bin
install $(CLEMENTINE_DIR)/clementine $(ROOTDIR)/usr/X11R6/bin/
touch $@
diff --git a/rules/coreutils.make b/rules/coreutils.make
index fa2306344..2099ac725 100644
--- a/rules/coreutils.make
+++ b/rules/coreutils.make
@@ -1,17 +1,17 @@
# -*-makefile-*-
-# $Id: coreutils.make,v 1.1 2003/08/06 21:23:03 robert Exp $
+# $Id: coreutils.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y, $(PTXCONF_COREUTILS))
+ifdef PTXCONF_COREUTILS
PACKAGES += coreutils
endif
@@ -22,7 +22,6 @@ COREUTILS = coreutils-5.0
COREUTILS_URL = http://ftp.gnu.org/pub/gnu/coreutils/$(COREUTILS).tar.bz2
COREUTILS_SOURCE = $(SRCDIR)/$(COREUTILS).tar.bz2
COREUTILS_DIR = $(BUILDDIR)/$(COREUTILS)
-COREUTILS_EXTRACT = bzcat
# ----------------------------------------------------------------------------
# Get
@@ -31,12 +30,12 @@ COREUTILS_EXTRACT = bzcat
coreutils_get: $(STATEDIR)/coreutils.get
$(STATEDIR)/coreutils.get: $(COREUTILS_SOURCE)
- @$(call targetinfo, coreutils.get)
+ @$(call targetinfo, $@)
touch $@
$(COREUTILS_SOURCE):
- @$(call targetinfo, $(COREUTILS_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(COREUTILS_URL)
+ @$(call targetinfo, $@)
+ @$(call get, $(COREUTILS_URL))
# ----------------------------------------------------------------------------
# Extract
@@ -45,9 +44,9 @@ $(COREUTILS_SOURCE):
coreutils_extract: $(STATEDIR)/coreutils.extract
$(STATEDIR)/coreutils.extract: $(STATEDIR)/coreutils.get
- @$(call targetinfo, coreutils.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(COREUTILS_DIR))
- $(COREUTILS_EXTRACT) $(COREUTILS_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
+ @$(call extract, $(COREUTILS_SOURCE))
touch $@
# ----------------------------------------------------------------------------
@@ -61,9 +60,9 @@ COREUTILS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
COREUTILS_AUTOCONF += --target=$(PTXCONF_GNU_TARGET)
COREUTILS_PATH = PATH=$(CROSS_PATH)
-COREUTILS_ENV += $(CROSS_ENV)
+COREUTILS_ENV = $(CROSS_ENV)
-#ifeq (y, $(PTXCONF_COREUTILS_SHLIKE))
+#ifdef PTXCONF_COREUTILS_SHLIKE
#COREUTILS_AUTOCONF += --enable-shell=sh
#else
#COREUTILS_AUTOCONF += --enable-shell=ksh
@@ -72,11 +71,12 @@ COREUTILS_ENV += $(CROSS_ENV)
#
# dependencies
#
-coreutils_prepare_deps = $(STATEDIR)/coreutils.extract
-coreutils_prepare_deps += $(STATEDIR)/virtual-xchain.install
+coreutils_prepare_deps = \
+ $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/coreutils.extract \
$(STATEDIR)/coreutils.prepare: $(coreutils_prepare_deps)
- @$(call targetinfo, coreutils.prepare)
+ @$(call targetinfo, $@)
mkdir -p $(BUILDDIR)/$(COREUTILS)
cd $(COREUTILS_DIR) && \
$(COREUTILS_PATH) $(COREUTILS_ENV) \
@@ -92,11 +92,11 @@ coreutils_compile_deps = $(STATEDIR)/coreutils.prepare
coreutils_compile: $(STATEDIR)/coreutils.compile
$(STATEDIR)/coreutils.compile: $(STATEDIR)/coreutils.prepare
- @$(call targetinfo, coreutils.compile)
+ @$(call targetinfo, $@)
$(COREUTILS_PATH) make -C $(COREUTILS_DIR)/lib libfetish.a
-#ifeq (y, $(PTXCONF_COREUTILS_SEQ))
+ifdef PTXCONF_COREUTILS_SEQ
$(COREUTILS_PATH) make -C $(COREUTILS_DIR)/src seq
-#endif
+endif
touch $@
# ----------------------------------------------------------------------------
@@ -105,8 +105,8 @@ $(STATEDIR)/coreutils.compile: $(STATEDIR)/coreutils.prepare
coreutils_install: $(STATEDIR)/coreutils.install
-$(STATEDIR)/coreutils.install: $(STATEDIR)/coreutils.compile
- @$(call targetinfo, coreutils.install)
+$(STATEDIR)/coreutils.install:
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -115,11 +115,13 @@ $(STATEDIR)/coreutils.install: $(STATEDIR)/coreutils.compile
coreutils_targetinstall: $(STATEDIR)/coreutils.targetinstall
-$(STATEDIR)/coreutils.targetinstall: $(STATEDIR)/coreutils.install
- @$(call targetinfo, coreutils.targetinstall)
- install -d $(ROOTDIR)/bin
- install $(COREUTILS_DIR)/src/seq $(ROOTDIR)/bin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/bin/seq
+$(STATEDIR)/coreutils.targetinstall: $(STATEDIR)/coreutils.compile
+ @$(call targetinfo, $@)
+ install -d $(ROOTDIR)/usr/bin
+ifdef PTXCONF_COREUTILS_SEQ
+ install $(COREUTILS_DIR)/src/seq $(ROOTDIR)/usr/bin
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/seq
+endif
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/db41.in b/rules/db41.in
new file mode 100644
index 000000000..f0752f2a5
--- /dev/null
+++ b/rules/db41.in
@@ -0,0 +1,12 @@
+menu "Berkeley db 4 "
+
+config DB
+ bool
+ prompt "Compile Berkeley DB-4"
+
+config DB_INSTALL_BIN_UTIL
+ bool
+ prompt "install db_* tools on target"
+ depends on DB
+
+endmenu
diff --git a/rules/db41.make b/rules/db41.make
new file mode 100644
index 000000000..3e94f7991
--- /dev/null
+++ b/rules/db41.make
@@ -0,0 +1,141 @@
+# -*-makefile-*-
+# $Id: db41.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Werner Schmitt mail2ws@gmx.de
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_DB41
+PACKAGES += db41
+endif
+
+#
+# Paths and names
+#
+DB41_VERSION = 4.1.25.NC
+DB41 = db-$(DB41_VERSION)
+DB41_SUFFIX = tar.gz
+DB41_URL = http://www.sleepycat.com/update/snapshot/$(DB41).$(DB41_SUFFIX)
+DB41_SOURCE = $(SRCDIR)/$(DB41).$(DB41_SUFFIX)
+DB41_DIR = $(BUILDDIR)/$(DB41)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+db41_get: $(STATEDIR)/db41.get
+
+db41_get_deps = $(DB41_SOURCE)
+
+$(STATEDIR)/db41.get: $(db41_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(DB41_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(DB41_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+db41_extract: $(STATEDIR)/db41.extract
+
+db41_extract_deps = $(STATEDIR)/db41.get
+
+$(STATEDIR)/db41.extract: $(db41_extract_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(DB41_DIR))
+ @$(call extract, $(DB41_SOURCE))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+db41_prepare: $(STATEDIR)/db41.prepare
+
+#
+# dependencies
+#
+db41_prepare_deps = \
+ $(STATEDIR)/db41.extract \
+ $(STATEDIR)/virtual-xchain.install
+
+DB41_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
+DB41_ENV = $(CROSS_ENV)
+
+#
+# autoconf
+#
+DB41_AUTOCONF = --prefix=$(CROSS_LIB_DIR)
+DB41_AUTOCONF += --build=$(GNU_HOST)
+DB41_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
+DB41_AUTOCONF += --enable-cxx
+
+$(STATEDIR)/db41.prepare: $(db41_prepare_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(DB41_BUILDDIR))
+ cd $(DB41_DIR)/dist && \
+ $(DB41_PATH) $(DB41_ENV) \
+ ./configure $(DB41_AUTOCONF)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+db41_compile: $(STATEDIR)/db41.compile
+
+db41_compile_deps = $(STATEDIR)/db41.prepare
+
+$(STATEDIR)/db41.compile: $(db41_compile_deps)
+ @$(call targetinfo, $@)
+ $(DB41_PATH) $(DB41_ENV) make -C $(DB41_DIR)/dist
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+db41_install: $(STATEDIR)/db41.install
+
+$(STATEDIR)/db41.install: $(STATEDIR)/db41.compile
+ @$(call targetinfo, $@)
+ $(DB41_PATH) $(DB41_ENV) make -C $(DB41_DIR)/dist install
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+db41_targetinstall_deps: $(STATEDIR)/db41.targetinstall
+ $(STATEDIR)/db41.install
+
+$(STATEDIR)/db41.targetinstall: $(db41_targetinstall_deps)
+ @$(call targetinfo, $@)
+ install -d $(ROOTDIR)/usr/bin
+ install $(CROSS_LIB_DIR)/bin/db_* $(ROOTDIR)/usr/bin
+ $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/db_*
+
+ install -d $(ROOTDIR)/usr/lib
+ cp -pd $(CROSS_LIB_DIR)/lib/libdb*.so* $(ROOTDIR)/usr/lib
+ $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/lib/libdb*.so*
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+db41_clean:
+ rm -rf $(STATEDIR)/db41.*
+ rm -rf $(DB41_DIR)
+
+# vim: syntax=make
diff --git a/rules/distcc.make b/rules/distcc.make
deleted file mode 100644
index a192fd68e..000000000
--- a/rules/distcc.make
+++ /dev/null
@@ -1,103 +0,0 @@
-# -*-makefile-*-
-# $Id: distcc.make,v 1.1 2003/07/16 04:23:28 mkl Exp $
-#
-# (c) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXDIST project and license conditions
-# see the README file.
-#
-
-#
-# Paths and names
-#
-DISTCC_VERSION = 2.8
-DISTCC = distcc-$(DISTCC_VERSION)
-DISTCC_SUFFIX = tar.bz2
-DISTCC_URL = http://distcc.samba.org/ftp/distcc/$(DISTCC).$(DISTCC_SUFFIX)
-DISTCC_SOURCE = $(SRCDIR)/$(DISTCC).$(DISTCC_SUFFIX)
-DISTCC_DIR = $(BUILDDIR)/$(DISTCC)
-DISTCC_EXTRACT = bzip2 -dc
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-distcc_get: $(STATEDIR)/distcc.get
-
-$(STATEDIR)/distcc.get: $(DISTCC_SOURCE)
- @$(call targetinfo, distcc.get)
- touch $@
-
-$(DISTCC_SOURCE):
- @$(call targetinfo, $(DISTCC_SOURCE))
- @$(call get, $(DISTCC_URL))
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-distcc_extract: $(STATEDIR)/distcc.extract
-
-$(STATEDIR)/distcc.extract: $(STATEDIR)/distcc.get
- @$(call targetinfo, distcc.extract)
- @$(call extract, $(DISTCC_SOURCE))
- touch $@
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-distcc_prepare: $(STATEDIR)/distcc.prepare
-
-DISTCC_ENV = CC=$(HOSTCC)
-
-DISTCC_AUTOCONF = --prefix=$(PTXCONF_PREFIX)
-
-$(STATEDIR)/distcc.prepare: $(STATEDIR)/distcc.extract
- @$(call targetinfo, distcc.prepare)
- cd $(DISTCC_DIR) && $(DISTCC_ENV) \
- ./configure $(DISTCC_AUTOCONF)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-distcc_compile: $(STATEDIR)/distcc.compile
-
-$(STATEDIR)/distcc.compile: $(STATEDIR)/distcc.prepare
- @$(call targetinfo, distcc.compile)
- make -C $(DISTCC_DIR)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-distcc_install: $(STATEDIR)/distcc.install
-
-$(STATEDIR)/distcc.install: $(STATEDIR)/distcc.compile
- @$(call targetinfo, distcc.install)
- make -C $(DISTCC_DIR) install
- touch $@
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-distcc_targetinstall: $(STATEDIR)/distcc.targetinstall
-
-$(STATEDIR)/distcc.targetinstall: $(STATEDIR)/distcc.install
- @$(call targetinfo, distcc.targetinstall)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-distcc_clean:
- rm -rf $(STATEDIR)/distcc.*
- rm -rf $(DISTCC_DIR)
-
-# vim: syntax=make
diff --git a/rules/dropbear.in b/rules/dropbear.in
index caef5dbd7..87f691f36 100644
--- a/rules/dropbear.in
+++ b/rules/dropbear.in
@@ -140,6 +140,7 @@ comment "Authentication types, at least one required --- RFC Draft requires pubk
config DROPBEAR_PASSWD
bool
prompt "password"
+ default y
depends on DROPBEAR
config DROPBEAR_PUBKEY
diff --git a/rules/dropbear.make b/rules/dropbear.make
index 953b63cf2..47b650e64 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: dropbear.make,v 1.5 2003/08/29 19:05:15 mkl Exp $
+# $Id: dropbear.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
-# for Pengutronix e.K. <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
+# Pengutronix e.K. <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ dropbear_get: $(STATEDIR)/dropbear.get
dropbear_get_deps = $(DROPBEAR_SOURCE)
$(STATEDIR)/dropbear.get: $(dropbear_get_deps)
- @$(call targetinfo, dropbear.get)
+ @$(call targetinfo, $@)
touch $@
$(DROPBEAR_SOURCE):
- @$(call targetinfo, $(DROPBEAR_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(DROPBEAR_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ dropbear_extract: $(STATEDIR)/dropbear.extract
dropbear_extract_deps = $(STATEDIR)/dropbear.get
$(STATEDIR)/dropbear.extract: $(dropbear_extract_deps)
- @$(call targetinfo, dropbear.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(DROPBEAR_DIR))
@$(call extract, $(DROPBEAR_SOURCE))
touch $@
@@ -130,7 +130,7 @@ DROPBEAR_AUTOCONF += --disable-pututxline
endif
$(STATEDIR)/dropbear.prepare: $(dropbear_prepare_deps)
- @$(call targetinfo, dropbear.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(DROPBEAR_BUILDDIR))
cd $(DROPBEAR_DIR) && \
$(DROPBEAR_PATH) $(DROPBEAR_ENV) \
@@ -228,7 +228,7 @@ dropbear_compile: $(STATEDIR)/dropbear.compile
dropbear_compile_deps = $(STATEDIR)/dropbear.prepare
$(STATEDIR)/dropbear.compile: $(dropbear_compile_deps)
- @$(call targetinfo, dropbear.compile)
+ @$(call targetinfo, $@)
$(DROPBEAR_PATH) make -C $(DROPBEAR_DIR) dropbear
ifdef PTXCONF_DROPBEAR_DROPBEAR_KEY
$(DROPBEAR_PATH) make -C $(DROPBEAR_DIR) dropbearkey
@@ -245,7 +245,7 @@ endif
dropbear_install: $(STATEDIR)/dropbear.install
$(STATEDIR)/dropbear.install: $(STATEDIR)/dropbear.compile
- @$(call targetinfo, dropbear.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -260,7 +260,7 @@ dropbear_targetinstall_deps += $(STATEDIR)/zlib.targetinstall
endif
$(STATEDIR)/dropbear.targetinstall: $(dropbear_targetinstall_deps)
- @$(call targetinfo, dropbear.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)/usr/bin
install -d $(ROOTDIR)/usr/sbin
@@ -293,4 +293,4 @@ dropbear_clean:
rm -rf $(STATEDIR)/dropbear.*
rm -rf $(DROPBEAR_DIR)
-# vim: syntax=make \ No newline at end of file
+# vim: syntax=make
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 23c221f81..e107b56ef 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -1,28 +1,31 @@
# -*-makefile-*-
# $id$
#
-# (C) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
+#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y, $(PTXCONF_E2FSPROGS))
+ifdef PTXCONF_E2FSPROGS
PACKAGES += e2fsprogs
endif
#
# Paths and names
#
-E2FSPROGS = e2fsprogs-1.29
-E2FSPROGS_URL = http://cesnet.dl.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-1.29.tar.gz
-E2FSPROGS_SOURCE = $(SRCDIR)/$(E2FSPROGS).tar.gz
+E2FSPROGS_VERSION = 1.34
+E2FSPROGS = e2fsprogs-$(E2FSPROGS_VERSION)
+E2FSPROGS_SUFFIX = tar.gz
+E2FSPROGS_URL = http://cesnet.dl.sourceforge.net/sourceforge/e2fsprogs/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)
+E2FSPROGS_SOURCE = $(SRCDIR)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX)
E2FSPROGS_DIR = $(BUILDDIR)/$(E2FSPROGS)
-E2FSPROGS_EXTRACT = gzip -dc
+E2FSPROGS_BUILD_DIR = $(BUILDDIR)/$(E2FSPROGS)-build
# ----------------------------------------------------------------------------
# Get
@@ -31,12 +34,12 @@ E2FSPROGS_EXTRACT = gzip -dc
e2fsprogs_get: $(STATEDIR)/e2fsprogs.get
$(STATEDIR)/e2fsprogs.get: $(E2FSPROGS_SOURCE)
- @$(call targetinfo, e2fsprogs.get)
+ @$(call targetinfo, $@)
touch $@
$(E2FSPROGS_SOURCE):
- @$(call targetinfo, $(E2FSPROGS_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(E2FSPROGS_URL)
+ @$(call targetinfo, $@)
+ @$(call get, $(E2FSPROGS_URL))
# ----------------------------------------------------------------------------
# Extract
@@ -45,8 +48,10 @@ $(E2FSPROGS_SOURCE):
e2fsprogs_extract: $(STATEDIR)/e2fsprogs.extract
$(STATEDIR)/e2fsprogs.extract: $(STATEDIR)/e2fsprogs.get
- @$(call targetinfo, e2fsprogs.extract)
- $(E2FSPROGS_EXTRACT) $(E2FSPROGS_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
+ @$(call targetinfo, $@)
+ @$(call clean, $(E2FSPROGS_DIR))
+ @$(call extract, $(E2FSPROGS_SOURCE))
+ chmod +w $(E2FSPROGS_DIR)/po/*.po
touch $@
# ----------------------------------------------------------------------------
@@ -55,18 +60,24 @@ $(STATEDIR)/e2fsprogs.extract: $(STATEDIR)/e2fsprogs.get
e2fsprogs_prepare: $(STATEDIR)/e2fsprogs.prepare
-E2FSPROGS_AUTOCONF = --prefix=$(PTXCONF_PREFIX)
+E2FSPROGS_AUTOCONF = --prefix=/usr
E2FSPROGS_AUTOCONF += --enable-fsck
E2FSPROGS_AUTOCONF += --build=$(GNU_HOST)
E2FSPROGS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
-E2FSPROGS_PATH = PATH=$(PTXCONF_PREFIX)/$(AUTOCONF213)/bin:$(CROSS_PATH)
-E2FSPROGS_ENV = $(CROSS_ENV)
-
-$(STATEDIR)/e2fsprogs.prepare: $(STATEDIR)/virtual-xchain.install $(STATEDIR)/e2fsprogs.extract
- @$(call targetinfo, e2fsprogs.prepare)
- cd $(E2FSPROGS_DIR) \
- $(E2FSPROGS_PATH) $(E2FSPROGS_ENV) && \
- ./configure $(E2FSPROGS_AUTOCONF)
+E2FSPROGS_PATH = PATH=$(CROSS_PATH)
+E2FSPROGS_ENV = $(CROSS_ENV)
+E2FSPROGS_ENV += BUILD_CC=$(HOSTCC)
+
+e2fsprogs_prepare_deps = \
+ $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/e2fsprogs.extract
+
+$(STATEDIR)/e2fsprogs.prepare: $(e2fsprogs_prepare_deps)
+ @$(call targetinfo, $@)
+ mkdir -p $(E2FSPROGS_BUILD_DIR) && \
+ cd $(E2FSPROGS_BUILD_DIR) && \
+ $(E2FSPROGS_PATH) $(E2FSPROGS_ENV) \
+ $(E2FSPROGS_DIR)/configure $(E2FSPROGS_AUTOCONF)
touch $@
# ----------------------------------------------------------------------------
@@ -76,12 +87,18 @@ $(STATEDIR)/e2fsprogs.prepare: $(STATEDIR)/virtual-xchain.install $(STATEDIR)/e2
e2fsprogs_compile: $(STATEDIR)/e2fsprogs.compile
e2fsprogs_compile_deps = $(STATEDIR)/e2fsprogs.prepare
-e2fsprogs_compile_deps += $(STATEDIR)/glibc.install
$(STATEDIR)/e2fsprogs.compile: $(e2fsprogs_compile_deps)
- @$(call targetinfo, e2fsprogs.compile)
- # FIXME: not tested on non-x86
- $(E2FSPROGS_PATH) make -C $(E2FSPROGS_DIR)
+ @$(call targetinfo, $@)
+#
+# in the util dir are tools that are compiled for the host system
+# these tools are needed later in the compile progress
+#
+# it's not good to pass target CFLAGS to the host compiler :)
+# so override these
+#
+ $(E2FSPROGS_PATH) make -C $(E2FSPROGS_BUILD_DIR)/util CFLAGS='' CXXFLAGS=''
+ $(E2FSPROGS_PATH) make -C $(E2FSPROGS_BUILD_DIR)
touch $@
# ----------------------------------------------------------------------------
@@ -90,8 +107,8 @@ $(STATEDIR)/e2fsprogs.compile: $(e2fsprogs_compile_deps)
e2fsprogs_install: $(STATEDIR)/e2fsprogs.install
-$(STATEDIR)/e2fsprogs.install: $(STATEDIR)/e2fsprogs.compile
- @$(call targetinfo, e2fsprogs.install)
+$(STATEDIR)/e2fsprogs.install:
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -100,16 +117,17 @@ $(STATEDIR)/e2fsprogs.install: $(STATEDIR)/e2fsprogs.compile
e2fsprogs_targetinstall: $(STATEDIR)/e2fsprogs.targetinstall
-$(STATEDIR)/e2fsprogs.targetinstall: $(STATEDIR)/e2fsprogs.install
- @$(call targetinfo, e2fsprogs.targetinstall)
- ifeq (y, $(PTXCONF_E2FSPROGS_MKFS))
- install $(E2FSPROGS_DIR)/misc/mke2fs $(ROOTDIR)/sbin/
+$(STATEDIR)/e2fsprogs.targetinstall: $(STATEDIR)/e2fsprogs.compile
+ @$(call targetinfo, $@)
+ mkdir -p $(ROOTDIR)/sbin
+ifdef PTXCONF_E2FSPROGS_MKFS
+ install $(E2FSPROGS_BUILD_DIR)/misc/mke2fs $(ROOTDIR)/sbin/mke2fs
$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/mke2fs
- endif
- ifeq (y, $(PTXCONF_E2FSPROGS_E2FSCK))
- install $(E2FSPROGS_DIR)/e2fsck/e2fsck.shared $(ROOTDIR)/sbin/e2fsck
+endif
+ifdef PTXCONF_E2FSPROGS_E2FSCK
+ install $(E2FSPROGS_BUILD_DIR)/e2fsck/e2fsck.shared $(ROOTDIR)/sbin/e2fsck
$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/e2fsck
- endif
+endif
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/expat.make b/rules/expat.make
index fe8bf5d41..f13e4e0cf 100644
--- a/rules/expat.make
+++ b/rules/expat.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: expat.make,v 1.1 2003/08/17 00:34:18 robert Exp $
+# $Id: expat.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-# Pengutronix <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ expat_get: $(STATEDIR)/expat.get
expat_get_deps = $(EXPAT_SOURCE)
$(STATEDIR)/expat.get: $(expat_get_deps)
- @$(call targetinfo, expat.get)
+ @$(call targetinfo, $@)
touch $@
$(EXPAT_SOURCE):
- @$(call targetinfo, $(EXPAT_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(EXPAT_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ expat_extract: $(STATEDIR)/expat.extract
expat_extract_deps = $(STATEDIR)/expat.get
$(STATEDIR)/expat.extract: $(expat_extract_deps)
- @$(call targetinfo, expat.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(EXPAT_DIR))
@$(call extract, $(EXPAT_SOURCE))
touch $@
@@ -68,7 +68,7 @@ expat_prepare: $(STATEDIR)/expat.prepare
#
expat_prepare_deps = \
$(STATEDIR)/expat.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
EXPAT_PATH = PATH=$(CROSS_PATH)
EXPAT_ENV = $(CROSS_ENV)
@@ -86,7 +86,7 @@ EXPAT_AUTOCONF += --enable-foo
endif
$(STATEDIR)/expat.prepare: $(expat_prepare_deps)
- @$(call targetinfo, expat.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(EXPAT_BUILDDIR))
cd $(EXPAT_DIR) && \
$(EXPAT_PATH) $(EXPAT_ENV) \
@@ -102,7 +102,7 @@ expat_compile: $(STATEDIR)/expat.compile
expat_compile_deps = $(STATEDIR)/expat.prepare
$(STATEDIR)/expat.compile: $(expat_compile_deps)
- @$(call targetinfo, expat.compile)
+ @$(call targetinfo, $@)
$(EXPAT_PATH) $(EXPAT_ENV) make -C $(EXPAT_DIR)
touch $@
@@ -113,7 +113,7 @@ $(STATEDIR)/expat.compile: $(expat_compile_deps)
expat_install: $(STATEDIR)/expat.install
$(STATEDIR)/expat.install: $(STATEDIR)/expat.compile
- @$(call targetinfo, expat.install)
+ @$(call targetinfo, $@)
install -d $(PTXCONF_PREFIX)/lib
rm -f $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libexpat.so*
install $(EXPAT_DIR)/.libs/libexpat.so.0.4.0 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/
@@ -132,7 +132,7 @@ expat_targetinstall: $(STATEDIR)/expat.targetinstall
expat_targetinstall_deps = $(STATEDIR)/expat.compile
$(STATEDIR)/expat.targetinstall: $(expat_targetinstall_deps)
- @$(call targetinfo, expat.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)/lib
rm -f $(ROOTDIR)/lib/libglib-2.0.so*
install $(EXPAT_DIR)/.libs/libexpat.so.0.4.0 $(ROOTDIR)/lib/
diff --git a/rules/flash.make b/rules/flash.make
index dc48225f3..d4dc300ff 100644
--- a/rules/flash.make
+++ b/rules/flash.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: flash.make,v 1.2 2003/08/08 16:28:17 robert Exp $
+# $Id: flash.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -40,15 +40,15 @@ flash_get_deps = $(FLASH_SOURCE)
flash_get_deps += $(FLASH_PATCH_SOURCE)
$(STATEDIR)/flash.get: $(flash_get_deps)
- @$(call targetinfo, flash.get)
+ @$(call targetinfo, $@)
touch $@
$(FLASH_SOURCE):
- @$(call targetinfo, $(FLASH_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(FLASH_URL))
$(FLASH_PATCH_SOURCE):
- @$(call targetinfo, $(FLASH_PATCH))
+ @$(call targetinfo, $@)
@$(call get, $(FLASH_PATCH_URL))
@@ -59,7 +59,7 @@ $(FLASH_PATCH_SOURCE):
flash_extract: $(STATEDIR)/flash.extract
$(STATEDIR)/flash.extract: $(STATEDIR)/flash.get
- @$(call targetinfo, flash.extract)
+ @$(call targetinfo, $@)
$(FLASH_EXTRACT) $(FLASH_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
cd $(FLASH_DIR) && patch -p1 < $(FLASH_PATCH_SOURCE)
touch $@
@@ -92,12 +92,12 @@ FLASH_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
FLASH_AUTOCONF += --with-ncurses-path=$(BUILDDIR)/ncurses-5.2
$(STATEDIR)/flash.prepare: $(flash_prepare_deps)
- @$(call targetinfo, flash.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(FLASH_BUILDDIR))
mkdir -p $(FLASH_DIR)
rm -f $(FLASH_DIR)/configure
cd $(FLASH_DIR) && autoconf
- # Workaround for broken autoconf magic for cross compilation
+# # Workaround for broken autoconf magic for cross compilation
cd $(FLASH_DIR) && \
ac_cv_func_getpgrp_void=yes \
ac_cv_func_setpgrp_void=yes \
@@ -114,7 +114,7 @@ $(STATEDIR)/flash.prepare: $(flash_prepare_deps)
flash_compile: $(STATEDIR)/flash.compile
$(STATEDIR)/flash.compile: $(STATEDIR)/flash.prepare
- @$(call targetinfo, flash.compile)
+ @$(call targetinfo, $@)
$(FLASH_PATH) make -C $(FLASH_DIR)
touch $@
@@ -125,7 +125,7 @@ $(STATEDIR)/flash.compile: $(STATEDIR)/flash.prepare
flash_install: $(STATEDIR)/flash.install
$(STATEDIR)/flash.install: $(STATEDIR)/flash.compile
- @$(call targetinfo, flash.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -135,7 +135,7 @@ $(STATEDIR)/flash.install: $(STATEDIR)/flash.compile
flash_targetinstall: $(STATEDIR)/flash.targetinstall
$(STATEDIR)/flash.targetinstall: $(STATEDIR)/flash.install
- @$(call targetinfo, flash.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)/usr/bin
install $(FLASH_DIR)/flash $(ROOTDIR)/usr/bin
$(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/flash
diff --git a/rules/fltk.in b/rules/fltk.in
new file mode 100644
index 000000000..e5fb7b25b
--- /dev/null
+++ b/rules/fltk.in
@@ -0,0 +1,7 @@
+menu "FLTK GUI Toolkit "
+
+config FLTK
+ bool
+ prompt "FLTK-GUI Toolkit"
+ depends on XFREE430
+endmenu
diff --git a/rules/fltk.make b/rules/fltk.make
new file mode 100644
index 000000000..67ba9a7da
--- /dev/null
+++ b/rules/fltk.make
@@ -0,0 +1,145 @@
+# -*-makefile-*-
+# $Id: fltk.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Werner Schmitt mail2ws@gmx.de
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_FLTK
+PACKAGES += fltk
+endif
+
+#
+# Paths and names
+#
+FLTK_VERSION = 1.1.4
+FLTK = fltk-$(FLTK_VERSION)
+FLTK_SUFFIX = source.tar.gz
+FLTK_URL = ftp://ftp.easysw.com/pub/fltk/$(FLTK_VERSION)/$(FLTK)-$(FLTK_SUFFIX)
+FLTK_SOURCE = $(SRCDIR)/$(FLTK)-$(FLTK_SUFFIX)
+FLTK_DIR = $(BUILDDIR)/$(FLTK)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+fltk_get: $(STATEDIR)/fltk.get
+
+fltk_get_deps = $(FLTK_SOURCE)
+
+$(STATEDIR)/fltk.get: $(fltk_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(FLTK_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(FLTK_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+fltk_extract: $(STATEDIR)/fltk.extract
+
+fltk_extract_deps = $(STATEDIR)/fltk.get
+
+$(STATEDIR)/fltk.extract: $(fltk_extract_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(FLTK_DIR))
+ @$(call extract, $(FLTK_SOURCE))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+fltk_prepare: $(STATEDIR)/fltk.prepare
+
+#
+# dependencies
+#
+fltk_prepare_deps = \
+ $(STATEDIR)/fltk.extract \
+ $(STATEDIR)/xfree430.install \
+ $(STATEDIR)/virtual-xchain.install
+
+FLTK_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
+FLTK_ENV = $(CROSS_ENV)
+
+#
+# autoconf
+#
+FLTK_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
+FLTK_AUTOCONF += --build=$(GNU_HOST)
+FLTK_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
+FLTK_AUTOCONF += --x-includes=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include/X11
+FLTK_AUTOCONF += --x-librarie=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib
+FLTK_AUTOCONF += --enable-shared
+#FLTK_AUTOCONF += --enable-threads
+
+$(STATEDIR)/fltk.prepare: $(fltk_prepare_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(FLTK_BUILDDIR))
+ cd $(FLTK_DIR) && \
+ $(FLTK_PATH) $(FLTK_ENV) \
+ ./configure $(FLTK_AUTOCONF)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+fltk_compile: $(STATEDIR)/fltk.compile
+
+fltk_compile_deps = $(STATEDIR)/fltk.prepare
+
+$(STATEDIR)/fltk.compile: $(fltk_compile_deps)
+ @$(call targetinfo, $@)
+ $(FLTK_PATH) $(FLTK_ENV) make -C $(FLTK_DIR)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+fltk_install: $(STATEDIR)/fltk.install
+
+$(STATEDIR)/fltk.install: $(STATEDIR)/fltk.compile
+ @$(call targetinfo, $@)
+ $(FLTK_PATH) $(FLTK_ENV) make -C $(FLTK_DIR) install
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+fltk_targetinstall: $(STATEDIR)/fltk.targetinstall
+
+
+fltk_targetinstall_deps = $(STATEDIR)/fltk.compile \
+ $(STATEDIR)/fltk.install \
+ $(STATEDIR)/xfree430.targetinstall
+
+$(STATEDIR)/fltk.targetinstall: $(fltk_targetinstall_deps)
+ @$(call targetinfo, $@)
+ install -d $(ROOTDIR)/lib
+ cp -pd $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libfltk*.so* $(ROOTDIR)/lib
+ $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/lib/libfltk*
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+fltk_clean:
+ rm -rf $(STATEDIR)/fltk.*
+ rm -rf $(FLTK_DIR)
+
+# vim: syntax=make
diff --git a/rules/fontconfig22.make b/rules/fontconfig22.make
index 54f2a6ba6..af7698ba8 100644
--- a/rules/fontconfig22.make
+++ b/rules/fontconfig22.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: fontconfig22.make,v 1.1 2003/08/17 00:34:18 robert Exp $
+# $Id: fontconfig22.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-# Pengutronix <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ fontconfig22_get: $(STATEDIR)/fontconfig22.get
fontconfig22_get_deps = $(FONTCONFIG22_SOURCE)
$(STATEDIR)/fontconfig22.get: $(fontconfig22_get_deps)
- @$(call targetinfo, fontconfig22.get)
+ @$(call targetinfo, $@)
touch $@
$(FONTCONFIG22_SOURCE):
- @$(call targetinfo, $(FONTCONFIG22_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(FONTCONFIG22_URL))
# ----------------------------------------------------------------------------
@@ -52,13 +52,13 @@ fontconfig22_extract: $(STATEDIR)/fontconfig22.extract
fontconfig22_extract_deps = $(STATEDIR)/fontconfig22.get
$(STATEDIR)/fontconfig22.extract: $(fontconfig22_extract_deps)
- @$(call targetinfo, fontconfig22.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(FONTCONFIG22_DIR))
@$(call extract, $(FONTCONFIG22_SOURCE))
- # FIXME: src/Makefile tries to link in the host's libfreetype;
- # this is a workaround but not a real solution.
- # perl -i -p -e 's,-rpath ..libdir.,-L$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib,g' $(FONTCONFIG22_DIR)/src/Makefile.in
- # (workaround does not work yet :-( )
+# FIXME: src/Makefile tries to link in the host's libfreetype;
+# this is a workaround but not a real solution.
+# perl -i -p -e 's,-rpath ..libdir.,-L$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib,g' $(FONTCONFIG22_DIR)/src/Makefile.in
+# (workaround does not work yet :-( )
touch $@
# ----------------------------------------------------------------------------
@@ -75,7 +75,7 @@ fontconfig22_prepare_deps = \
$(STATEDIR)/glib22.install \
$(STATEDIR)/expat.install \
$(STATEDIR)/freetype214.install \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
FONTCONFIG22_PATH = PATH=$(CROSS_PATH)
FONTCONFIG22_ENV = $(CROSS_ENV)
@@ -100,7 +100,7 @@ FONTCONFIG22_AUTOCONF += --enable-foo
endif
$(STATEDIR)/fontconfig22.prepare: $(fontconfig22_prepare_deps)
- @$(call targetinfo, fontconfig22.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(FONTCONFIG22_BUILDDIR))
cd $(FONTCONFIG22_DIR) && \
$(FONTCONFIG22_PATH) $(FONTCONFIG22_ENV) \
@@ -116,8 +116,8 @@ fontconfig22_compile: $(STATEDIR)/fontconfig22.compile
fontconfig22_compile_deps = $(STATEDIR)/fontconfig22.prepare
$(STATEDIR)/fontconfig22.compile: $(fontconfig22_compile_deps)
- @$(call targetinfo, fontconfig22.compile)
- # FIXME: uggly hack to fix wrongly detected libfreetype.la path
+ @$(call targetinfo, $@)
+# FIXME: uggly hack to fix wrongly detected libfreetype.la path
- $(FONTCONFIG22_PATH) make -C $(FONTCONFIG22_DIR)
cd $(FONTCONFIG22_DIR)/src && \
perl -i -p -e "s,/usr/lib/libfreetype.la,$(FREETYPE214_DIR)/objs/libfreetype.la,g" libfontconfig.la
@@ -131,7 +131,7 @@ $(STATEDIR)/fontconfig22.compile: $(fontconfig22_compile_deps)
fontconfig22_install: $(STATEDIR)/fontconfig22.install
$(STATEDIR)/fontconfig22.install: $(STATEDIR)/fontconfig22.compile
- @$(call targetinfo, fontconfig22.install)
+ @$(call targetinfo, $@)
install -d $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
rm -f $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/$(PTXCONF_GNU_TARGET)/lib/libfontconfig.so*
install $(FONTCONFIG22_DIR)/src/.libs/libfontconfig.so.1.0.4 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/
@@ -150,7 +150,7 @@ fontconfig22_targetinstall: $(STATEDIR)/fontconfig22.targetinstall
fontconfig22_targetinstall_deps = $(STATEDIR)/fontconfig22.compile
$(STATEDIR)/fontconfig22.targetinstall: $(fontconfig22_targetinstall_deps)
- @$(call targetinfo, fontconfig22.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)
rm -f $(ROOTDIR)/lib/libfontconfig.so*
install $(FONTCONFIG22_DIR)/src/.libs/libfontconfig.so.1.0.4 $(ROOTDIR)/lib/
diff --git a/rules/freetype214.make b/rules/freetype214.make
index c12edeb63..f265a4b58 100644
--- a/rules/freetype214.make
+++ b/rules/freetype214.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: freetype214.make,v 1.1 2003/08/17 00:34:18 robert Exp $
+# $Id: freetype214.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ freetype214_get: $(STATEDIR)/freetype214.get
freetype214_get_deps = $(FREETYPE214_SOURCE)
$(STATEDIR)/freetype214.get: $(freetype214_get_deps)
- @$(call targetinfo, freetype214.get)
+ @$(call targetinfo, $@)
touch $@
$(FREETYPE214_SOURCE):
- @$(call targetinfo, $(FREETYPE214_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(FREETYPE214_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ freetype214_extract: $(STATEDIR)/freetype214.extract
freetype214_extract_deps = $(STATEDIR)/freetype214.get
$(STATEDIR)/freetype214.extract: $(freetype214_extract_deps)
- @$(call targetinfo, freetype214.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(FREETYPE214_DIR))
@$(call extract, $(FREETYPE214_SOURCE))
touch $@
@@ -89,7 +89,7 @@ FREETYPE214_AUTOCONF += --enable-foo
endif
$(STATEDIR)/freetype214.prepare: $(freetype214_prepare_deps)
- @$(call targetinfo, freetype214.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(FREETYPE214_BUILDDIR))
cd $(FREETYPE214_DIR) && \
$(FREETYPE214_PATH) $(FREETYPE214_ENV) \
@@ -105,7 +105,7 @@ freetype214_compile: $(STATEDIR)/freetype214.compile
freetype214_compile_deps = $(STATEDIR)/freetype214.prepare
$(STATEDIR)/freetype214.compile: $(freetype214_compile_deps)
- @$(call targetinfo, freetype214.compile)
+ @$(call targetinfo, $@)
$(FREETYPE214_PATH) make -C $(FREETYPE214_DIR)
chmod a+x $(FREETYPE214_DIR)/builds/unix/freetype-config
touch $@
@@ -117,7 +117,7 @@ $(STATEDIR)/freetype214.compile: $(freetype214_compile_deps)
freetype214_install: $(STATEDIR)/freetype214.install
$(STATEDIR)/freetype214.install: $(STATEDIR)/freetype214.compile
- @$(call targetinfo, freetype214.install)
+ @$(call targetinfo, $@)
install -d $(PTXCONF_PREFIX)
rm -f $(PTXCONF_PREFIX)/lib/libfreetype.so*
install $(FREETYPE214_DIR)/objs/.libs/libfreetype.so.6.3.3 $(PTXCONF_PREFIX)/lib/
@@ -138,7 +138,7 @@ freetype214_targetinstall: $(STATEDIR)/freetype214.targetinstall
freetype214_targetinstall_deps = $(STATEDIR)/freetype214.compile
$(STATEDIR)/freetype214.targetinstall: $(freetype214_targetinstall_deps)
- @$(call targetinfo, freetype214.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)
rm -f $(ROOTDIR)/lib/libfreetype.so*
install $(FREETYPE214_DIR)/objs/.libs/libfreetype.so.6.3.3 $(ROOTDIR)/lib/
diff --git a/rules/gdb.in b/rules/gdb.in
index d084fd51c..37480b9d3 100644
--- a/rules/gdb.in
+++ b/rules/gdb.in
@@ -1,15 +1,33 @@
config BUILD_XGDB
bool
prompt "Build Cross GDB"
- depends on BUILD_CROSSCHAIN
- comment "gdbserver needs libthreads_db on target"
+
+config BUILD_GDBSERVER
+ bool
+ prompt "Build gdbserver for target"
+ depends on !ARCH_SPARC
+
+comment "building gdbserver static, install libthreads_db on target (see C Library) to enable shared"
+ depends on BUILD_GDBSERVER
+ depends on !BUILD_GDBSERVER_SHARED
+
+config BUILD_GDBSERVER_SHARED
+ bool "Build shared"
+ default y
+ depends on BUILD_GDBSERVER
+ depends on GLIBC_THREAD_DB || UCLIBC_PTHREAD
config BUILD_GDB
bool
prompt "Build GDB for target"
- depends on GLIBC_THREAD_DB
-config BUILD_GDBSERVER
- bool
- prompt "Build gdbserver for target"
- depends on BUILD_XGDB && GLIBC_THREAD_DB
+comment "building GDB static, install libm on target (see C Library) to enables shared"
+ depends on BUILD_GDB
+ depends on !BUILD_GDB_SHARED
+
+config BUILD_GDB_SHARED
+ bool "Build shared"
+ default y
+ depends on BUILD_GDB
+ depends on GLIBC_LIBM || UCLIBC_M
+
diff --git a/rules/gdb.make b/rules/gdb.make
index fe9b779c0..c6427bbbf 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -1,49 +1,60 @@
# -*-makefile-*-
-# $Id: gdb.make,v 1.2 2003/10/07 07:13:43 robert Exp $
+# $Id: gdb.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y, $(PTXCONF_BUILD_GDB))
-PACKAGES += gdb
-endif
-ifeq (y, $(PTXCONF_BUILD_GDBSERVER))
+ifdef PTXCONF_BUILD_GDB
PACKAGES += gdb
endif
#
# Paths and names
#
-GDB_VERSION = $(XGDB_VERSION)
-GDB = gdb-$(GDB_VERSION)
-GDB_SUFFIX = $(XGDB_SUFFIX)
-GDB_SOURCE = $(XGDB_SOURCE)
-GDB_DIR = $(BUILDDIR)/$(GDB)
+GDB_VERSION = 5.3
+GDB = gdb-$(GDB_VERSION)
+GDB_SUFFIX = tar.gz
+GDB_URL = ftp://ftp.gnu.org/pub/gnu/gdb/$(GDB).$(GDB_SUFFIX)
+GDB_SOURCE = $(SRCDIR)/$(GDB).tar.gz
+GDB_DIR = $(BUILDDIR)/$(GDB)
+GDB_BUILDDIR = $(BUILDDIR)/$(GDB)-build
# ----------------------------------------------------------------------------
# Get
# ----------------------------------------------------------------------------
-gdb_get: $(STATEDIR)/xchain-gdb.get
-
+gdb_get: $(STATEDIR)/gdb.get
+
+gdb_get_deps = $(GDB_SOURCE)
+
+$(STATEDIR)/gdb.get: $(gdb_get_deps)
+ @$(call targetinfo, $@)
+ @$(call get_patches, $(GDB))
+ touch $@
+
+$(GDB_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(GDB_URL))
+
# ----------------------------------------------------------------------------
# Extract
# ----------------------------------------------------------------------------
gdb_extract: $(STATEDIR)/gdb.extract
-$(STATEDIR)/gdb.extract: $(STATEDIR)/xchain-gdb.get
- @$(call targetinfo, gdb.extract)
+$(STATEDIR)/gdb.extract: $(STATEDIR)/gdb.get
+ @$(call targetinfo, $@)
@$(call clean, $(GDB_DIR))
@$(call extract, $(GDB_SOURCE))
+ @$(call patchin, $(GDB))
touch $@
# ----------------------------------------------------------------------------
@@ -52,30 +63,36 @@ $(STATEDIR)/gdb.extract: $(STATEDIR)/xchain-gdb.get
gdb_prepare: $(STATEDIR)/gdb.prepare
+#
+# dependencies
+#
+gdb_prepare_deps = \
+ $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/ncurses.install \
+ $(STATEDIR)/gdb.extract
+
GDB_PATH = PATH=$(CROSS_PATH)
GDB_ENV = $(CROSS_ENV)
+ifndef PTXCONF_GDB_SHARED
+GDB_MAKEVARS += LDFLAGS=-static
+endif
+
#
# autoconf
#
-GDB_AUTOCONF = --prefix=$(PTXCONF_PREFIX)
+GDB_AUTOCONF = --prefix=/usr
GDB_AUTOCONF += --build=$(GNU_HOST)
GDB_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
GDB_AUTOCONF += --target=$(PTXCONF_GNU_TARGET)
-$(STATEDIR)/gdb.prepare: $(STATEDIR)/gdb.extract
- @$(call targetinfo, gdb.prepare)
-
-ifeq (y,$(PTXCONF_BUILD_GDB))
- cd $(GDB_DIR) && \
- $(GDB_PATH) $(GDB_ENV) ./configure $(GDB_AUTOCONF)
-endif
-
-ifeq (y,$(PTXCONF_BUILD_GDBSERVER))
- # configure is not executable, so run it with sh
- cd $(GDB_DIR)/gdb/gdbserver && \
- $(GDB_PATH) $(GDB_ENV) /bin/sh configure $(GDB_AUTOCONF)
-endif
+$(STATEDIR)/gdb.prepare: $(gdb_prepare_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(GDB_BUILDDIR))
+ mkdir -p $(GDB_BUILDDIR)
+ cd $(GDB_BUILDDIR) && \
+ $(GDB_PATH) $(GDB_ENV) \
+ $(GDB_DIR)/configure $(GDB_AUTOCONF)
touch $@
# ----------------------------------------------------------------------------
@@ -85,17 +102,14 @@ endif
gdb_compile: $(STATEDIR)/gdb.compile
$(STATEDIR)/gdb.compile: $(STATEDIR)/gdb.prepare
- @$(call targetinfo, gdb.compile)
-
-ifeq (y,$(PTXCONF_BUILD_GDB))
- cd $(GDB_DIR) && \
- $(GDB_PATH) $(GDB_ENV) make
-endif
-
-ifeq (y,$(PTXCONF_BUILD_GDBSERVER))
- cd $(GDB_DIR)/gdb/gdbserver && \
- $(GDB_PATH) $(GDB_ENV) make
-endif
+ @$(call targetinfo, $@)
+#
+# the libiberty part is compiled for the host system
+#
+# don't pass target CFLAGS to it, so override them and call the configure script
+#
+ $(GDB_PATH) make -C $(GDB_BUILDDIR) $(GDB_MAKEVARS) CFLAGS='' CXXFLAGS='' configure-build-libiberty
+ $(GDB_PATH) make -C $(GDB_BUILDDIR) $(GDB_MAKEVARS)
touch $@
# ----------------------------------------------------------------------------
@@ -104,8 +118,8 @@ endif
gdb_install: $(STATEDIR)/gdb.install
-$(STATEDIR)/gdb.install: $(STATEDIR)/gdb.compile
- @$(call targetinfo, gdb.install)
+$(STATEDIR)/gdb.install:
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -114,18 +128,19 @@ $(STATEDIR)/gdb.install: $(STATEDIR)/gdb.compile
gdb_targetinstall: $(STATEDIR)/gdb.targetinstall
-$(STATEDIR)/gdb.targetinstall: $(STATEDIR)/gdb.install
- @$(call targetinfo, gdb.targetinstall)
-
-ifeq (y,$(PTXCONF_BUILD_GDB))
- install $(GDB_DIR)/gdb/gdb $(ROOTDIR)/bin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/bin/gdb
-endif
+gdb_targetinstall_deps = \
+ $(STATEDIR)/gdb.compile
-ifeq (y,$(PTXCONF_BUILD_GDBSERVER))
- install $(GDB_DIR)/gdb/gdbserver/gdbserver $(ROOTDIR)/bin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/bin/gdbserver
+ifdef PTXCONF_GDB_SHARED
+gdb_targetinstall_deps += \
+ $(STATEDIR)/ncurses.targetinstall
endif
+
+$(STATEDIR)/gdb.targetinstall: $(gdb_targetinstall_deps)
+ @$(call targetinfo, $@)
+ mkdir -p $(ROOTDIR)/usr/bin
+ install $(GDB_BUILDDIR)/gdb/gdb $(ROOTDIR)/usr/bin
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/gdb
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/gdbserver.make b/rules/gdbserver.make
new file mode 100644
index 000000000..11eebd735
--- /dev/null
+++ b/rules/gdbserver.make
@@ -0,0 +1,114 @@
+# -*-makefile-*-
+# $Id: gdbserver.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_BUILD_GDBSERVER
+PACKAGES += gdbserver
+endif
+
+GDBSERVER_BUILDDIR = $(BUILDDIR)/$(GDB)-server-build
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+gdbserver_get: $(STATEDIR)/gdbserver.get
+
+$(STATEDIR)/gdbserver.get: $(gdb_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+gdbserver_extract: $(STATEDIR)/gdbserver.extract
+
+$(STATEDIR)/gdbserver.extract: $(STATEDIR)/gdb.extract
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+gdbserver_prepare: $(STATEDIR)/gdbserver.prepare
+
+gdbserver_prepare_deps = \
+ $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/gdbserver.extract
+
+GDBSERVER_PATH = $(GDB_PATH)
+GDBSERVER_ENV = $(GDB_ENV)
+
+ifndef PTXCONF_GDBSERVER_SHARED
+GDBSERVER_ENV += LDFLAGS=-static
+endif
+
+#
+# autoconf
+#
+GDBSERVER_AUTOCONF = $(GDB_AUTOCONF)
+
+$(STATEDIR)/gdbserver.prepare: $(gdbserver_prepare_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(GDBSERVER_BUILDDIR))
+ mkdir -p $(GDBSERVER_BUILDDIR)
+#
+# we call sh, cause configure is not executable
+#
+ cd $(GDBSERVER_BUILDDIR) && $(GDBSERVER_PATH) $(GDBSERVER_ENV) \
+ sh $(GDB_DIR)/gdb/gdbserver/configure $(GDBSERVER_AUTOCONF)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+gdbserver_compile: $(STATEDIR)/gdbserver.compile
+
+$(STATEDIR)/gdbserver.compile: $(STATEDIR)/gdbserver.prepare
+ @$(call targetinfo, $@)
+ $(GDBSERVER_PATH) make -C $(GDBSERVER_BUILDDIR)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+gdbserver_install: $(STATEDIR)/gdbserver.install
+
+$(STATEDIR)/gdbserver.install:
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+gdbserver_targetinstall: $(STATEDIR)/gdbserver.targetinstall
+
+$(STATEDIR)/gdbserver.targetinstall: $(STATEDIR)/gdbserver.compile
+ @$(call targetinfo, $@)
+ mkdir -p $(ROOTDIR)/bin
+ install $(GDBSERVER_BUILDDIR)/gdbserver $(ROOTDIR)/bin
+ $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/bin/gdbserver
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+gdbserver_clean:
+ rm -rf $(STATEDIR)/gdbserver.* $(GDBSERVER_BUILDDIR)
+
+# vim: syntax=make
diff --git a/rules/genext2fs.make b/rules/genext2fs.make
deleted file mode 100644
index 663fcb01d..000000000
--- a/rules/genext2fs.make
+++ /dev/null
@@ -1,117 +0,0 @@
-# -*-makefile-*-
-# $id$
-#
-# (C) 2003 by Ixia Corporation (www.ixiacom.com)
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXDIST project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-ifdef PTXCONF_GENEXT2FS
-PACKAGES += genext2fs
-endif
-
-#
-# Paths and names
-#
-GENEXT2FS_VERSION = 1.3.orig
-GENEXT2FS = genext2fs-$(GENEXT2FS_VERSION)
-GENEXT2FS_TARBALL = genext2fs_$(GENEXT2FS_VERSION).$(GENEXT2FS_SUFFIX)
-GENEXT2FS_SUFFIX = tar.gz
-GENEXT2FS_URL = http://ftp.debian.org/debian/pool/main/g/genext2fs/$(GENEXT2FS_TARBALL)
-GENEXT2FS_SOURCE = $(SRCDIR)/$(GENEXT2FS_TARBALL)
-GENEXT2FS_DIR = $(BUILDDIR)/$(GENEXT2FS)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-genext2fs_get: $(STATEDIR)/genext2fs.get
-
-genext_get_deps = $(GENEXT2FS_SOURCE)
-
-$(STATEDIR)/genext2fs.get: $(genext_get_deps)
- @$(call targetinfo, $@)
- @$(call get_patches, $(GENEXT2FS))
- touch $@
-
-$(GENEXT2FS_SOURCE):
- @$(call targetinfo, $@)
- @$(call get, $(GENEXT2FS_URL))
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-genext2fs_extract: $(STATEDIR)/genext2fs.extract
-
-$(STATEDIR)/genext2fs.extract: $(STATEDIR)/genext2fs.get
- @$(call targetinfo, genext2fs.extract)
- @$(call clean, $(GENEXT2FS.DIR))
- @$(call extract, $(GENEXT2FS_SOURCE))
- @$(call patchin, $(GENEXT2FS))
- touch $@
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-genext2fs_prepare: $(STATEDIR)/genext2fs.prepare
-
-GENEXT2FS_ENV = $(HOSTCC_ENV)
-
-genext2fs_prepare_deps = \
- $(STATEDIR)/genext2fs.extract
-
-$(STATEDIR)/genext2fs.prepare: $(genext2fs_prepare_deps)
- @$(call targetinfo, $@)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-genext2fs_compile: $(STATEDIR)/genext2fs.compile
-
-genext2fs_compile_deps = $(STATEDIR)/genext2fs.prepare
-
-$(STATEDIR)/genext2fs.compile: $(genext2fs_compile_deps)
- @$(call targetinfo, $@)
- make -C $(GENEXT2FS_DIR) $(GENEXT2FS_ENV)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-genext2fs_install: $(STATEDIR)/genext2fs.install
-
-genext2fs_install_deps = $(STATEDIR)/genext2fs.compile
-
-$(STATEDIR)/genext2fs.install:$(genext2fs_install_deps)
- @$(call targetinfo, genext2fs.install)
- make -C $(GENEXT2FS_DIR) install DESTDIR=$(PTXCONF_PREFIX)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-genext2fs_targetinstall: $(STATEDIR)/genext2fs.targetinstall
-
-$(STATEDIR)/genext2fs.targetinstall: $(STATEDIR)/genext2fs.install
- @$(call targetinfo, genext2fs.targetinstall)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-genext2fs_clean:
- rm -rf $(STATEDIR)/genext2fs.* $(GENEXT2FS_DIR)
-
-# vim: syntax=make
diff --git a/rules/gettext.make b/rules/gettext.make
index 9be0e481a..24a13f4dd 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: gettext.make,v 1.3 2003/08/13 14:53:16 robert Exp $
+# $Id: gettext.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ gettext_get: $(STATEDIR)/gettext.get
gettext_get_deps = $(GETTEXT_SOURCE)
$(STATEDIR)/gettext.get: $(gettext_get_deps)
- @$(call targetinfo, gettext.get)
+ @$(call targetinfo, $@)
touch $@
$(GETTEXT_SOURCE):
- @$(call targetinfo, $(GETTEXT_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(GETTEXT_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ gettext_extract: $(STATEDIR)/gettext.extract
gettext_extract_deps = $(STATEDIR)/gettext.get
$(STATEDIR)/gettext.extract: $(gettext_extract_deps)
- @$(call targetinfo, gettext.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(GETTEXT_DIR))
@$(call extract, $(GETTEXT_SOURCE))
touch $@
@@ -67,8 +67,8 @@ gettext_prepare: $(STATEDIR)/gettext.prepare
# dependencies
#
gettext_prepare_deps = \
- $(STATEDIR)/gettext.extract
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/gettext.extract \
+ $(STATEDIR)/virtual-xchain.install
GETTEXT_PATH = PATH=$(CROSS_PATH)
GETTEXT_ENV = $(CROSS_ENV)
@@ -85,7 +85,7 @@ GETTEXT_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
GETTEXT_AUTOCONF += --disable-nls
$(STATEDIR)/gettext.prepare: $(gettext_prepare_deps)
- @$(call targetinfo, gettext.prepare)
+ @$(call targetinfo, $@)
cd $(GETTEXT_DIR) && \
$(GETTEXT_PATH) $(GETTEXT_ENV) \
./configure $(GETTEXT_AUTOCONF)
@@ -100,7 +100,7 @@ gettext_compile: $(STATEDIR)/gettext.compile
gettext_compile_deps = $(STATEDIR)/gettext.prepare
$(STATEDIR)/gettext.compile: $(gettext_compile_deps)
- @$(call targetinfo, gettext.compile)
+ @$(call targetinfo, $@)
$(GETTEXT_PATH) make -C $(GETTEXT_DIR)
touch $@
@@ -111,7 +111,7 @@ $(STATEDIR)/gettext.compile: $(gettext_compile_deps)
gettext_install: $(STATEDIR)/gettext.install
$(STATEDIR)/gettext.install: $(STATEDIR)/gettext.compile
- @$(call targetinfo, gettext.install)
+ @$(call targetinfo, $@)
install -d $(PTXCONF_PREFIX)/lib
rm -f $(PTXCONF_PREFIX)/lib/libgnuintl.so*
install $(GETTEXT_DIR)/gettext-runtime/intl/.libs/libgnuintl.so.2.3.0 $(PTXCONF_PREFIX)/lib/
@@ -130,7 +130,7 @@ gettext_targetinstall: $(STATEDIR)/gettext.targetinstall
gettext_targetinstall_deps = $(STATEDIR)/gettext.compile
$(STATEDIR)/gettext.targetinstall: $(gettext_targetinstall_deps)
- @$(call targetinfo, gettext.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)/lib
rm -f $(ROOTDIR)/lib/libgnuintl.so*
install $(GETTEXT_DIR)/gettext-runtime/intl/.libs/libgnuintl.so.2.3.0 $(ROOTDIR)/lib/
diff --git a/rules/glib1210.make b/rules/glib1210.make
index 6bfa82fcb..69b418418 100644
--- a/rules/glib1210.make
+++ b/rules/glib1210.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: glib1210.make,v 1.1 2003/08/19 12:04:27 robert Exp $
+# $Id: glib1210.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-# Pengutronix <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ glib1210_get: $(STATEDIR)/glib1210.get
glib1210_get_deps = $(GLIB1210_SOURCE)
$(STATEDIR)/glib1210.get: $(glib1210_get_deps)
- @$(call targetinfo, glib1210.get)
+ @$(call targetinfo, $@)
touch $@
$(GLIB1210_SOURCE):
- @$(call targetinfo, $(GLIB1210_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(GLIB1210_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ glib1210_extract: $(STATEDIR)/glib1210.extract
glib1210_extract_deps = $(STATEDIR)/glib1210.get
$(STATEDIR)/glib1210.extract: $(glib1210_extract_deps)
- @$(call targetinfo, glib1210.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(GLIB1210_DIR))
@$(call extract, $(GLIB1210_SOURCE))
touch $@
@@ -68,7 +68,7 @@ glib1210_prepare: $(STATEDIR)/glib1210.prepare
#
glib1210_prepare_deps = \
$(STATEDIR)/glib1210.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
GLIB1210_PATH = PATH=$(CROSS_PATH)
GLIB1210_ENV = $(CROSS_ENV)
@@ -93,7 +93,7 @@ GLIB1210_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
GLIB1210_AUTOCONF += --with-threads=posix
$(STATEDIR)/glib1210.prepare: $(glib1210_prepare_deps)
- @$(call targetinfo, glib1210.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(GLIB1210_BUILDDIR))
cd $(GLIB1210_DIR) && \
$(GLIB1210_PATH) $(GLIB1210_ENV) \
@@ -109,7 +109,7 @@ glib1210_compile: $(STATEDIR)/glib1210.compile
glib1210_compile_deps = $(STATEDIR)/glib1210.prepare
$(STATEDIR)/glib1210.compile: $(glib1210_compile_deps)
- @$(call targetinfo, glib1210.compile)
+ @$(call targetinfo, $@)
$(GLIB1210_PATH) $(GLIB1210_ENV) make -C $(GLIB1210_DIR)
touch $@
@@ -120,7 +120,7 @@ $(STATEDIR)/glib1210.compile: $(glib1210_compile_deps)
glib1210_install: $(STATEDIR)/glib1210.install
$(STATEDIR)/glib1210.install: $(STATEDIR)/glib1210.compile
- @$(call targetinfo, glib1210.install)
+ @$(call targetinfo, $@)
$(GLIB1210_PATH) $(GLIB1210_ENV) make -C $(GLIB1210_DIR) install
touch $@
@@ -133,19 +133,19 @@ glib1210_targetinstall: $(STATEDIR)/glib1210.targetinstall
glib1210_targetinstall_deps = $(STATEDIR)/glib1210.compile
$(STATEDIR)/glib1210.targetinstall: $(glib1210_targetinstall_deps)
- @$(call targetinfo, glib1210.targetinstall)
+ @$(call targetinfo, $@)
- # glib
+# glib
install $(GLIB1210_DIR)/.libs/libglib-1.2.so.0.0.10 $(ROOTDIR)/lib/
ln -sf libglib-1.2.so.0.0.10 $(ROOTDIR)/lib/libglib-1.2.so.0
ln -sf libglib-1.2.so.0.0.10 $(ROOTDIR)/lib/libglib-1.2.so
- # gmodule
+# gmodule
install $(GLIB1210_DIR)/gmodule/.libs/libgmodule-1.2.so.0.0.10 $(ROOTDIR)/lib/
ln -sf libgmodule-1.2.so.0.0.10 $(ROOTDIR)/lib/libgmodule-1.2.so.0
ln -sf libgmodule-1.2.so.0.0.10 $(ROOTDIR)/lib/libgmodule-1.2.so
- # gthread
+# gthread
install $(GLIB1210_DIR)/gthread/.libs/libgthread-1.2.so.0.0.10 $(ROOTDIR)/lib/
ln -sf libgthread-1.2.so.0.0.10 $(ROOTDIR)/lib/libgthread-1.2.so.0
ln -sf libgthread-1.2.so.0.0.10 $(ROOTDIR)/lib/libgthread-1.2.so
diff --git a/rules/glib22.make b/rules/glib22.make
index c0a97aaec..b4deea515 100644
--- a/rules/glib22.make
+++ b/rules/glib22.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: glib22.make,v 1.4 2003/08/17 00:32:04 robert Exp $
+# $Id: glib22.make,v 1.5 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-# Pengutronix <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ glib22_get: $(STATEDIR)/glib22.get
glib22_get_deps = $(GLIB22_SOURCE)
$(STATEDIR)/glib22.get: $(glib22_get_deps)
- @$(call targetinfo, glib22.get)
+ @$(call targetinfo, $@)
touch $@
$(GLIB22_SOURCE):
- @$(call targetinfo, $(GLIB22_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(GLIB22_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ glib22_extract: $(STATEDIR)/glib22.extract
glib22_extract_deps = $(STATEDIR)/glib22.get
$(STATEDIR)/glib22.extract: $(glib22_extract_deps)
- @$(call targetinfo, glib22.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(GLIB22_DIR))
@$(call extract, $(GLIB22_SOURCE))
touch $@
@@ -68,7 +68,7 @@ glib22_prepare: $(STATEDIR)/glib22.prepare
#
glib22_prepare_deps = \
$(STATEDIR)/glib22.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
GLIB22_PATH = PATH=$(CROSS_PATH)
GLIB22_ENV = $(CROSS_ENV)
@@ -93,7 +93,7 @@ GLIB22_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
GLIB22_AUTOCONF += --with-threads=posix
$(STATEDIR)/glib22.prepare: $(glib22_prepare_deps)
- @$(call targetinfo, glib22.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(GLIB22_BUILDDIR))
cd $(GLIB22_DIR) && \
$(GLIB22_PATH) $(GLIB22_ENV) \
@@ -109,7 +109,7 @@ glib22_compile: $(STATEDIR)/glib22.compile
glib22_compile_deps = $(STATEDIR)/glib22.prepare
$(STATEDIR)/glib22.compile: $(glib22_compile_deps)
- @$(call targetinfo, glib22.compile)
+ @$(call targetinfo, $@)
$(GLIB22_PATH) $(GLIB22_ENV) make -C $(GLIB22_DIR)
touch $@
@@ -120,8 +120,8 @@ $(STATEDIR)/glib22.compile: $(glib22_compile_deps)
glib22_install: $(STATEDIR)/glib22.install
$(STATEDIR)/glib22.install: $(STATEDIR)/glib22.compile
- @$(call targetinfo, glib22.install)
-
+ @$(call targetinfo, $@)
+
install -d $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
rm -f $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libglib-2.0.so*
install $(GLIB22_DIR)/glib/.libs/libglib-2.0.so.0.200.2 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/
@@ -145,7 +145,7 @@ glib22_targetinstall: $(STATEDIR)/glib22.targetinstall
glib22_targetinstall_deps = $(STATEDIR)/glib22.compile
$(STATEDIR)/glib22.targetinstall: $(glib22_targetinstall_deps)
- @$(call targetinfo, glib22.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)
rm -f $(ROOTDIR)/lib/libglib-2.0.so*
install $(GLIB22_DIR)/glib/.libs/libglib-2.0.so.0.200.2 $(ROOTDIR)/lib/
diff --git a/rules/glibc.in b/rules/glibc.in
index 37c1a9d70..7947532bf 100644
--- a/rules/glibc.in
+++ b/rules/glibc.in
@@ -39,6 +39,16 @@ config GLIBC_BOUNDED
prompt "Build with runtime bounds checking"
depends on GLIBC
+config GLIBC_OPTKERNEL
+ bool
+ prompt "Optimize glibc for selected kernel version"
+ default n
+ depends on GLIBC
+
+config GLIBC_DEBUG
+ bool "Don't strip debugging symbols"
+ depends on GLIBC
+
comment "Install options"
depends on GLIBC
@@ -50,7 +60,7 @@ config GLIBC_THREAD_DB
config GLIBC_DL
bool
prompt "Install libdl on the target"
- default y if BASH
+ default y if BASH || BUILD_GDBSERVER
depends on GLIBC
config GLIBC_CRYPT
@@ -66,6 +76,7 @@ config GLIBC_UTIL
config GLIBC_LIBM
bool
prompt "Install libm on the target"
+ default y if BUILD_GDB
depends on GLIBC
config GLIBC_NSS_DNS
diff --git a/rules/glibc.make b/rules/glibc.make
index f3f9b7063..467e9a407 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: glibc.make,v 1.9 2003/09/16 16:40:36 mkl Exp $
+# $Id: glibc.make,v 1.10 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -13,27 +13,16 @@
# We provide this package
#
ifdef PTXCONF_GLIBC
+ifdef PTXCONF_BUILD_CROSSCHAIN
PACKAGES += glibc
-DYNAMIC_LINKER = /lib/ld.so.1
+endif
+DYNAMIC_LINKER = /lib/ld-linux.so.2
endif
#
# Paths and names
#
-ifeq (y, $(PTXCONF_GLIBC_2_3_2))
-GLIBC_VERSION = 2.3.2
-endif
-ifeq (y, $(PTXCONF_GLIBC_2_2_5))
-GLIBC_VERSION = 2.2.5
-endif
-ifeq (y, $(PTXCONF_GLIBC_2_2_4))
-GLIBC_VERSION = 2.2.4
-endif
-ifeq (y, $(PTXCONF_GLIBC_2_2_3))
-GLIBC_VERSION = 2.2.3
-endif
-
GLIBC = glibc-$(GLIBC_VERSION)
GLIBC_URL = ftp://ftp.gnu.org/gnu/glibc/$(GLIBC).tar.gz
GLIBC_SOURCE = $(SRCDIR)/$(GLIBC).tar.gz
@@ -52,24 +41,36 @@ GLIBC_BUILDDIR = $(BUILDDIR)/$(GLIBC)-build
glibc_get: $(STATEDIR)/glibc.get
-glibc_get_deps = $(GLIBC_SOURCE)
+glibc_get_deps = \
+ $(GLIBC_SOURCE) \
+ $(STATEDIR)/glibc-patches.get
ifdef PTXCONF_GLIBC_PTHREADS
-glibc_get_deps += $(GLIBC_THREADS_SOURCE)
+glibc_get_deps += \
+ $(GLIBC_THREADS_SOURCE) \
+ $(STATEDIR)/glibc-threads-patches.get
endif
$(STATEDIR)/glibc.get: $(glibc_get_deps)
- @$(call targetinfo, glibc.get)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(STATEDIR)/glibc-patches.get:
+ @$(call targetinfo, $@)
@$(call get_patches, $(GLIBC))
+ touch $@
+
+$(STATEDIR)/glibc-threads-patches.get:
+ @$(call targetinfo, $@)
@$(call get_patches, $(GLIBC_THREADS))
touch $@
$(GLIBC_SOURCE):
- @$(call targetinfo, $(GLIBC_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(GLIBC_URL))
$(GLIBC_THREADS_SOURCE):
- @$(call targetinfo, $(GLIBC_THREADS_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(GLIBC_THREADS_URL))
# ----------------------------------------------------------------------------
@@ -79,23 +80,23 @@ $(GLIBC_THREADS_SOURCE):
glibc_extract: $(STATEDIR)/glibc.extract
glibc_extract_deps = $(STATEDIR)/glibc-base.extract
-ifeq (y, $(PTXCONF_GLIBC_PTHREADS))
+ifdef PTXCONF_GLIBC_PTHREADS
glibc_extract_deps += $(STATEDIR)/glibc-threads.extract
endif
$(STATEDIR)/glibc.extract: $(glibc_extract_deps)
- @$(call targetinfo, glibc.extract)
+ @$(call targetinfo, $@)
touch $@
$(STATEDIR)/glibc-base.extract: $(STATEDIR)/glibc.get
- @$(call targetinfo, glibc-base.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(GLIBC_DIR))
@$(call extract, $(GLIBC_SOURCE))
@$(call patchin, $(GLIBC))
touch $@
$(STATEDIR)/glibc-threads.extract: $(STATEDIR)/glibc.get
- @$(call targetinfo, glibc-threads.extract)
+ @$(call targetinfo, $@)
@$(call extract, $(GLIBC_THREADS_SOURCE), $(GLIBC_DIR))
@$(call patchin, $(GLIBC_THREADS), $(GLIBC_DIR))
touch $@
@@ -109,33 +110,55 @@ glibc_prepare: $(STATEDIR)/glibc.prepare
#
# arcitecture dependend configuration
#
-GLIBC_AUTOCONF = --build=$(GNU_HOST)
-GLIBC_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
-GLIBC_AUTOCONF += --disable-sanity-checks
+GLIBC_AUTOCONF = \
+ --build=$(GNU_HOST) \
+ --host=$(PTXCONF_GNU_TARGET) \
+ --with-headers=$(CROSS_LIB_DIR)/include \
+ --enable-clocale=gnu \
+ --without-tls \
+ --without-cvs \
+ --without-gd \
+ --prefix=/usr \
+ --libexecdir=/usr/bin
+
+ifdef GLIBC_OPTKERNEL
+GLIBC_AUTOCONF += --enable-kernel=$(KERNEL_VERSION)
+endif
+
+ifeq ($(GLIBC_VERSION_MAJOR).$(GLIBC_VERSION_MINOR),2.2)
GLIBC_PATH = PATH=$(PTXCONF_PREFIX)/$(AUTOCONF213)/bin:$(CROSS_PATH)
-GLIBC_ENV = $(CROSS_ENV)
+else
+#FIXME: wich autoconf version wants the glibc?
+GLIBC_PATH = PATH=$(CROSS_PATH)
+endif
+
+GLIBC_ENV = $(CROSS_ENV) BUILD_CC=$(HOSTCC)
#
# features
#
ifdef PTXCONF_GLIBC_LIBIO
- GLIBC_AUTOCONF+=--enable-libio
+GLIBC_AUTOCONF += --enable-libio
endif
+
ifdef PTXCONF_GLIBC_SHARED
- GLIBC_AUTOCONF+=--enable-shared
+GLIBC_AUTOCONF += --enable-shared
else
- GLIBC_AUTOCONF+=--enable-shared=no
+GLIBC_AUTOCONF += --enable-shared=no
endif
+
ifdef PTXCONF_GLIBC_PROFILED
- GLIBC_AUTOCONF+=--enable-profile=yes
+GLIBC_AUTOCONF += --enable-profile=yes
else
- GLIBC_AUTOCONF+=--enable-profile=no
+GLIBC_AUTOCONF += --enable-profile=no
endif
+
ifdef PTXCONF_GLIBC_OMITFP
- GLIBC_AUTOCONF+=--enable-omitfp
+GLIBC_AUTOCONF += --enable-omitfp
endif
+
ifdef PTXCONF_GLIBC_PTHREADS
- GLIBC_AUTOCONF+=--enable-add-ons=linuxthreads
+GLIBC_AUTOCONF += --enable-add-ons=linuxthreads
endif
GLIBC_AUTOCONF += $(GLIBC_EXTRA_CONFIG)
@@ -144,19 +167,22 @@ GLIBC_AUTOCONF += $(GLIBC_EXTRA_CONFIG)
# dependencies
#
glibc_prepare_deps = \
- $(STATEDIR)/virtual-xchain.install \
$(STATEDIR)/autoconf213.install \
+ $(STATEDIR)/xchain-gccstage1.install \
$(STATEDIR)/glibc.extract
$(STATEDIR)/glibc.prepare: $(glibc_prepare_deps)
- @$(call targetinfo, glibc.prepare)
+ @$(call targetinfo, $@)
mkdir -p $(GLIBC_BUILDDIR)
- cd $(GLIBC_BUILDDIR) && \
- $(GLIBC_PATH) $(GLIBC_ENV) \
- $(GLIBC_DIR)/configure $(PTXCONF_GNU_TARGET) \
- $(GLIBC_AUTOCONF) \
- --prefix=/usr \
- --libexecdir=/usr/bin
+ cd $(GLIBC_BUILDDIR) && \
+ $(GLIBC_PATH) $(GLIBC_ENV) \
+ $(GLIBC_DIR)/configure $(PTXCONF_GNU_TARGET) \
+ $(GLIBC_AUTOCONF)
+#
+# don't compile programs
+#
+# echo "build-programs=no" >> $(XCHAIN_GLIBC_BUILDDIR)/configparms
+
touch $@
# ----------------------------------------------------------------------------
@@ -166,8 +192,14 @@ $(STATEDIR)/glibc.prepare: $(glibc_prepare_deps)
glibc_compile: $(STATEDIR)/glibc.compile
$(STATEDIR)/glibc.compile: $(STATEDIR)/glibc.prepare
- @$(call targetinfo, glibc.compile)
- cd $(GLIBC_BUILDDIR) && $(GLIBC_PATH) make
+ @$(call targetinfo, $@)
+ $(GLIBC_PATH) make -C $(GLIBC_BUILDDIR)
+#
+# fake files which are installed by make install although
+# compiling binaries was switched of (tested with 2.2.5)
+#
+# touch $(XCHAIN_GLIBC_BUILDDIR)/iconv/iconv_prog
+# touch $(XCHAIN_GLIBC_BUILDDIR)/login/pt_chown
touch $@
# ----------------------------------------------------------------------------
@@ -177,7 +209,33 @@ $(STATEDIR)/glibc.compile: $(STATEDIR)/glibc.prepare
glibc_install: $(STATEDIR)/glibc.install
$(STATEDIR)/glibc.install: $(STATEDIR)/glibc.compile
- @$(call targetinfo, glibc.install)
+ @$(call targetinfo, $@)
+ $(GLIBC_PATH) make -C $(GLIBC_BUILDDIR) \
+ install_root=$(CROSS_LIB_DIR) prefix="" install
+#
+# Dan Kegel writes:
+#
+# Fix problems in linker scripts.
+#
+# 1. Remove absolute paths
+# Any file in a list of known suspects that isn't a symlink is assumed to be a linker script.
+# FIXME: test -h is not portable
+# FIXME: probably need to check more files than just these three...
+# Need to use sed instead of just assuming we know what's in libc.so because otherwise alpha breaks
+#
+# 2. Remove lines containing BUG per http://sources.redhat.com/ml/bug-glibc/2003-05/msg00055.html,
+# needed to fix gcc-3.2.3/glibc-2.3.2 targeting arm
+#
+ for file in libc.so libpthread.so libgcc_s.so; do \
+ if [ -f $(CROSS_LIB_DIR)/lib/$$file -a ! -h $(CROSS_LIB_DIR)/lib/$$file ]; then \
+ echo $$file; \
+ if [ ! -f $(CROSS_LIB_DIR)/lib/$$file.orig ]; then \
+ mv $(CROSS_LIB_DIR)/lib/$$file $(CROSS_LIB_DIR)/lib/$$file.orig; \
+ fi; \
+ sed 's,/lib/,,g;/BUG in libc.scripts.output-format.sed/d' < $(CROSS_LIB_DIR)/lib/$$file.orig \
+ > $(CROSS_LIB_DIR)/lib/$$file; \
+ fi; \
+ done
touch $@
# ----------------------------------------------------------------------------
@@ -186,102 +244,122 @@ $(STATEDIR)/glibc.install: $(STATEDIR)/glibc.compile
glibc_targetinstall: $(STATEDIR)/glibc.targetinstall
-$(STATEDIR)/glibc.targetinstall: $(STATEDIR)/glibc.compile
- @$(call targetinfo, glibc.targetinstall)
- # CAREFUL: don't never ever make install in ldso tree!!!
+ifdef PTXCONF_BUILD_CROSSCHAIN
+glibc_targetinstall_deps = $(STATEDIR)/glibc.install
+endif
+
+ifdef PTXCONF_GLIBC_DEBUG
+GLIBC_STRIP = true
+else
+GLIBC_STRIP = $(CROSSSTRIP) -S -R .note -R .comment
+endif
+
+ifeq ($(GLIBC_VERSION_MAJOR).$(GLIBC_VERSION_MINOR),2.2)
+GLIBC_PTHREAD_VERSION = 0.9
+else
+GLIBC_PTHREAD_VERSION = 0.10
+endif
+
+$(STATEDIR)/glibc.targetinstall: $(glibc_targetinstall_deps)
+ @$(call targetinfo, $@)
+#
+# CAREFUL: don't never ever make install!!!
+# but we never ever run ptxdist as root, do we? :)
+#
mkdir -p $(ROOTDIR)/lib
- install $(GLIBC_BUILDDIR)/elf/ld.so $(ROOTDIR)/lib/ld-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/ld-$(GLIBC_VERSION).so
+ install $(CROSS_LIB_DIR)/lib/ld-$(GLIBC_VERSION).so $(ROOTDIR)/lib/ld-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/ld-$(GLIBC_VERSION).so
ln -sf ld-$(GLIBC_VERSION).so $(ROOTDIR)/lib/ld.so.1
ln -sf ld-$(GLIBC_VERSION).so $(ROOTDIR)/lib/ld-linux.so.2
- install $(GLIBC_BUILDDIR)/libc.so $(ROOTDIR)/lib/libc-$(GLIBC_VERSION).so.6
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libc-$(GLIBC_VERSION).so.6
+ install $(CROSS_LIB_DIR)/lib/libc-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libc-$(GLIBC_VERSION).so.6
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libc-$(GLIBC_VERSION).so.6
ln -sf libc-$(GLIBC_VERSION).so.6 $(ROOTDIR)/lib/libc.so.6
- ifeq (y, $(PTXCONF_GLIBC_PTHREADS))
- install $(GLIBC_BUILDDIR)/linuxthreads/libpthread.so $(ROOTDIR)/lib/libpthread-0.9.so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libpthread-0.9.so
- ln -sf libpthread-0.9.so $(ROOTDIR)/lib/libpthread.so.0
- endif
+ifdef PTXCONF_GLIBC_PTHREADS
+ install $(CROSS_LIB_DIR)/lib/libpthread-$(GLIBC_PTHREAD_VERSION).so $(ROOTDIR)/lib/libpthread-$(GLIBC_PTHREAD_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libpthread-$(GLIBC_PTHREAD_VERSION).so
+ ln -sf libpthread-$(GLIBC_PTHREAD_VERSION).so $(ROOTDIR)/lib/libpthread.so.0
+endif
- ifeq (y, $(PTXCONF_GLIBC_THREAD_DB))
- install $(GLIBC_BUILDDIR)/linuxthreads_db/libthread_db.so $(ROOTDIR)/lib/libthread_db.so.1
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libthread_db.so.1
- endif
+ifdef PTXCONF_GLIBC_THREAD_DB
+ install $(CROSS_LIB_DIR)/lib/libthread_db.so $(ROOTDIR)/lib/libthread_db-1.0.so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libthread_db-1.0.so
+ ln -sf libthread_db-1.0.so $(ROOTDIR)/lib/libthread_db.so.1
+endif
- ifeq (y, $(PTXCONF_GLIBC_DL))
- install $(GLIBC_BUILDDIR)/dlfcn/libdl.so $(ROOTDIR)/lib/libdl-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libdl-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_DL
+ install $(CROSS_LIB_DIR)/lib/libdl.so $(ROOTDIR)/lib/libdl-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libdl-$(GLIBC_VERSION).so
ln -sf libdl-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libdl.so.2
- endif
+endif
- ifeq (y, $(PTXCONF_GLIBC_CRYPT))
- install $(GLIBC_BUILDDIR)/crypt/libcrypt.so $(ROOTDIR)/lib/libcrypt-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libcrypt-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_CRYPT
+ install $(CROSS_LIB_DIR)/lib/libcrypt.so $(ROOTDIR)/lib/libcrypt-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libcrypt-$(GLIBC_VERSION).so
ln -sf libcrypt-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libcrypt.so.1
- endif
+endif
- ifeq (y, $(PTXCONF_GLIBC_UTIL))
- install $(GLIBC_BUILDDIR)/login/libutil.so $(ROOTDIR)/lib/libutil-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libutil-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_UTIL
+ install $(CROSS_LIB_DIR)/lib/libutil.so $(ROOTDIR)/lib/libutil-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libutil-$(GLIBC_VERSION).so
ln -sf libutil-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libutil.so.1
- endif
+endif
- ifeq (y, $(PTXCONF_GLIBC_LIBM))
- install $(GLIBC_BUILDDIR)/math/libm.so $(ROOTDIR)/lib/libm-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libm-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_LIBM
+ install $(CROSS_LIB_DIR)/lib/libm.so $(ROOTDIR)/lib/libm-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libm-$(GLIBC_VERSION).so
ln -sf libm-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libm.so.6
- endif
+endif
- ifeq (y, $(PTXCONF_GLIBC_NSS_DNS))
- install $(GLIBC_BUILDDIR)/resolv/libnss_dns.so.2 $(ROOTDIR)/lib/libnss_dns-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_dns-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_NSS_DNS
+ install $(CROSS_LIB_DIR)/lib/libnss_dns.so.2 $(ROOTDIR)/lib/libnss_dns-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_dns-$(GLIBC_VERSION).so
ln -sf libnss_dns-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_dns.so.2
- endif
+endif
- ifeq (y, $(PTXCONF_GLIBC_NSS_FILES))
- install $(GLIBC_BUILDDIR)/nss/libnss_files.so.2 $(ROOTDIR)/lib/libnss_files-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_files-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_NSS_FILES
+ install $(CROSS_LIB_DIR)/lib/libnss_files.so.2 $(ROOTDIR)/lib/libnss_files-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_files-$(GLIBC_VERSION).so
ln -sf libnss_files-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_files.so.2
- endif
+endif
- ifeq (y, $(PTXCONF_GLIBC_NSS_HESIOD))
- install $(GLIBC_BUILDDIR)/hesiod/libnss_hesiod.so.2 $(ROOTDIR)/lib/libnss_hesiod-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_hesiod-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_NSS_HESIOD
+ install $(CROSS_LIB_DIR)/lib/libnss_hesiod.so.2 $(ROOTDIR)/lib/libnss_hesiod-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_hesiod-$(GLIBC_VERSION).so
ln -sf libnss_hesiod-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_hesiod.so.2
- endif
+endif
- ifeq (y, $(PTXCONF_GLIBC_NSS_NIS))
- install $(GLIBC_BUILDDIR)/nis/libnss_nis.so.2 $(ROOTDIR)/lib/libnss_nis-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_nis-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_NSS_NIS
+ install $(CROSS_LIB_DIR)/lib/libnss_nis.so.2 $(ROOTDIR)/lib/libnss_nis-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_nis-$(GLIBC_VERSION).so
ln -sf libnss_nis-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_nis.so.2
- endif
+endif
- ifeq (y, $(PTXCONF_GLIBC_NSS_NISPLUS))
- install $(GLIBC_BUILDDIR)/nis/libnss_nisplus.so.2 $(ROOTDIR)/lib/libnss_nisplus-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_nisplus-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_NSS_NISPLUS
+ install $(CROSS_LIB_DIR)/lib/libnss_nisplus.so.2 $(ROOTDIR)/lib/libnss_nisplus-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_nisplus-$(GLIBC_VERSION).so
ln -sf libnss_nisplus-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_nisplus.so.2
- endif
+endif
- ifeq (y, $(PTXCONF_GLIBC_NSS_COMPAT))
- install $(GLIBC_BUILDDIR)/nis/libnss_compat.so.2 $(ROOTDIR)/lib/libnss_compat-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnss_compat-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_NSS_COMPAT
+ install $(CROSS_LIB_DIR)/lib/libnss_compat.so.2 $(ROOTDIR)/lib/libnss_compat-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libnss_compat-$(GLIBC_VERSION).so
ln -sf libnss_compat-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnss_compat.so.2
- endif
+endif
- ifeq (y, $(PTXCONF_GLIBC_RESOLV))
- install $(GLIBC_BUILDDIR)/resolv/libresolv.so $(ROOTDIR)/lib/libresolv-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libresolv-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_RESOLV
+ install $(CROSS_LIB_DIR)/lib/libresolv.so $(ROOTDIR)/lib/libresolv-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libresolv-$(GLIBC_VERSION).so
ln -sf libresolv-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libresolv.so.2
- endif
+endif
- ifeq (y, $(PTXCONF_GLIBC_NSL))
- install $(GLIBC_BUILDDIR)/nis/libnsl.so $(ROOTDIR)/lib/libnsl-$(GLIBC_VERSION).so
- $(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libnsl-$(GLIBC_VERSION).so
+ifdef PTXCONF_GLIBC_NSL
+ install $(CROSS_LIB_DIR)/lib/libnsl.so $(ROOTDIR)/lib/libnsl-$(GLIBC_VERSION).so
+ $(GLIBC_STRIP) $(ROOTDIR)/lib/libnsl-$(GLIBC_VERSION).so
ln -sf libnsl-$(GLIBC_VERSION).so $(ROOTDIR)/lib/libnsl.so.1
- endif
+endif
touch $@
@@ -290,11 +368,7 @@ $(STATEDIR)/glibc.targetinstall: $(STATEDIR)/glibc.compile
# ----------------------------------------------------------------------------
glibc_clean:
- -rm -rf $(STATEDIR)/xchain-glibc.extract
- -rm -rf $(STATEDIR)/xchain-glibc.prepare
- -rm -rf $(STATEDIR)/xchain-glibc.compile
-rm -rf $(STATEDIR)/glibc*
-rm -rf $(GLIBC_DIR)
-rm -rf $(GLIBC_BUILDDIR)
- -rm -rf $(XCHAIN_GLIBC_BUILDDIR)
-# vim: syntax=make
+: syntax=make
diff --git a/rules/gmp.make b/rules/gmp.make
index f5602fa51..a16a82ee1 100644
--- a/rules/gmp.make
+++ b/rules/gmp.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: gmp.make,v 1.5 2003/07/17 09:37:24 bsp Exp $
+# $Id: gmp.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -34,11 +34,11 @@ GMP_EXTRACT = gzip -dc
gmp_get: $(STATEDIR)/gmp.get
$(STATEDIR)/gmp.get: $(GMP_SOURCE)
- @$(call targetinfo, gmp.get)
+ @$(call targetinfo, $@)
touch $@
$(GMP_SOURCE):
- @$(call targetinfo, $(GMP_SOURCE))
+ @$(call targetinfo, $@)
wget -P $(SRCDIR) $(PASSIVEFTP) $(GMP_URL)
# ----------------------------------------------------------------------------
@@ -48,7 +48,7 @@ $(GMP_SOURCE):
gmp_extract: $(STATEDIR)/gmp.extract
$(STATEDIR)/gmp.extract: $(STATEDIR)/gmp.get
- @$(call targetinfo, gmp.extract)
+ @$(call targetinfo, $@)
$(GMP_EXTRACT) $(GMP_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
touch $@
@@ -64,7 +64,7 @@ GMP_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
GMP_AUTOCONF += --prefix=$(PTXCONF_PREFIX)
$(STATEDIR)/gmp.prepare: $(STATEDIR)/gmp.extract
- @$(call targetinfo, gmp.prepare)
+ @$(call targetinfo, $@)
cd $(GMP_DIR) && \
PATH=$(PTXCONF_PREFIX)/bin:$$PATH ./configure $(GMP_AUTOCONF)
touch $@
@@ -76,7 +76,7 @@ $(STATEDIR)/gmp.prepare: $(STATEDIR)/gmp.extract
gmp_compile: $(STATEDIR)/gmp.compile
$(STATEDIR)/gmp.compile: $(STATEDIR)/gmp.prepare
- @$(call targetinfo, gmp.compile)
+ @$(call targetinfo, $@)
PATH=$(PTXCONF_PREFIX)/bin:$$PATH make -C $(GMP_DIR)
touch $@
@@ -87,7 +87,7 @@ $(STATEDIR)/gmp.compile: $(STATEDIR)/gmp.prepare
gmp_install: $(STATEDIR)/gmp.install
$(STATEDIR)/gmp.install: $(STATEDIR)/gmp.compile
- @$(call targetinfo, gmp.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ $(STATEDIR)/gmp.install: $(STATEDIR)/gmp.compile
gmp_targetinstall: $(STATEDIR)/gmp.targetinstall
$(STATEDIR)/gmp.targetinstall: $(STATEDIR)/gmp.install
- @$(call targetinfo, gmp.targetinstall)
+ @$(call targetinfo, $@)
mkdir -p $(ROOTDIR)/lib
# preserve links -> we cannot use install
cp -d $(PTXCONF_PREFIX)/lib/libgmp.so* $(ROOTDIR)/lib
diff --git a/rules/gmp3.make b/rules/gmp3.make
index 81cef3d16..e57d80300 100644
--- a/rules/gmp3.make
+++ b/rules/gmp3.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: gmp3.make,v 1.2 2003/07/22 13:39:15 mkl Exp $
+# $Id: gmp3.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -26,11 +26,11 @@ GMP3_EXTRACT = gzip -dc
gmp3_get: $(STATEDIR)/gmp3.get
$(STATEDIR)/gmp3.get: $(GMP3_SOURCE)
- @$(call targetinfo, gmp3.get)
+ @$(call targetinfo, $@)
touch $@
$(GMP3_SOURCE):
- @$(call targetinfo, $(GMP3_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(GMP3_URL))
# ----------------------------------------------------------------------------
@@ -40,7 +40,7 @@ $(GMP3_SOURCE):
gmp3_extract: $(STATEDIR)/gmp3.extract
$(STATEDIR)/gmp3.extract: $(STATEDIR)/gmp3.get
- @$(call targetinfo, gmp3.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(GMP3_DIR))
@$(call extract, $(GMP3_SOURCE))
touch $@
@@ -64,7 +64,7 @@ GMP3_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
GMP3_AUTOCONF += --prefix=$(CROSS_LIB_DIR)
$(STATEDIR)/gmp3.prepare: $(gmp3_prepare_deps)
- @$(call targetinfo, gmp3.prepare)
+ @$(call targetinfo, $@)
cd $(GMP3_DIR) && \
$(GMP3_PATH) $(GMP3_ENV) ./configure $(GMP3_AUTOCONF)
touch $@
@@ -76,7 +76,7 @@ $(STATEDIR)/gmp3.prepare: $(gmp3_prepare_deps)
gmp3_compile: $(STATEDIR)/gmp3.compile
$(STATEDIR)/gmp3.compile: $(STATEDIR)/gmp3.prepare
- @$(call targetinfo, gmp3.compile)
+ @$(call targetinfo, $@)
$(GMP3_PATH) make -C $(GMP3_DIR)
touch $@
@@ -87,7 +87,7 @@ $(STATEDIR)/gmp3.compile: $(STATEDIR)/gmp3.prepare
gmp3_install: $(STATEDIR)/gmp3.install
$(STATEDIR)/gmp3.install: $(STATEDIR)/gmp3.compile
- @$(call targetinfo, gmp3.install)
+ @$(call targetinfo, $@)
$(GMP3_PATH) make -C $(GMP3_DIR) install
touch $@
@@ -98,7 +98,7 @@ $(STATEDIR)/gmp3.install: $(STATEDIR)/gmp3.compile
gmp3_targetinstall: $(STATEDIR)/gmp3.targetinstall
$(STATEDIR)/gmp3.targetinstall: $(STATEDIR)/gmp3.install
- @$(call targetinfo, gmp3.targetinstall)
+ @$(call targetinfo, $@)
mkdir -p $(ROOTDIR)/lib
cp -a $(CROSS_LIB_DIR)/lib/libgmp.so* $(ROOTDIR)/lib
$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libgmp.so*
diff --git a/rules/grub.make b/rules/grub.make
index f5c40c2aa..411a83e3c 100644
--- a/rules/grub.make
+++ b/rules/grub.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: grub.make,v 1.6 2003/07/16 04:23:28 mkl Exp $
+# $Id: grub.make,v 1.7 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -30,11 +30,11 @@ GRUB_DIR = $(BUILDDIR)/$(GRUB)
grub_get: $(STATEDIR)/grub.get
$(STATEDIR)/grub.get: $(GRUB_SOURCE)
- @$(call targetinfo, grub.get)
+ @$(call targetinfo, $@)
touch $@
$(GRUB_SOURCE):
- @$(call targetinfo, $(GRUB_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(GRUB_URL))
# ----------------------------------------------------------------------------
@@ -44,7 +44,7 @@ $(GRUB_SOURCE):
grub_extract: $(STATEDIR)/grub.extract
$(STATEDIR)/grub.extract: $(STATEDIR)/grub.get
- @$(call targetinfo, grub.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(GRUB_DIR))
@$(call extract, $(GRUB_SOURCE))
touch $@
@@ -109,7 +109,7 @@ grub_prepare_deps = \
$(STATEDIR)/grub.extract
$(STATEDIR)/grub.prepare: $(grub_prepare_deps)
- @$(call targetinfo, grub.prepare)
+ @$(call targetinfo, $@)
cd $(GRUB_DIR) && \
$(GRUB_PATH) $(GRUB_ENV) ./configure $(GRUB_AUTOCONF)
touch $@
@@ -121,7 +121,7 @@ $(STATEDIR)/grub.prepare: $(grub_prepare_deps)
grub_compile: $(STATEDIR)/grub.compile
$(STATEDIR)/grub.compile: $(STATEDIR)/grub.prepare
- @$(call targetinfo, grub.compile)
+ @$(call targetinfo, $@)
$(GRUB_PATH) make -C $(GRUB_DIR)
touch $@
@@ -132,7 +132,7 @@ $(STATEDIR)/grub.compile: $(STATEDIR)/grub.prepare
grub_install: $(STATEDIR)/grub.install
$(STATEDIR)/grub.install: $(STATEDIR)/grub.compile
- @$(call targetinfo, grub.install)
+ @$(call targetinfo, $@)
# make -C $(GRUB_DIR) install
touch $@
@@ -143,7 +143,7 @@ $(STATEDIR)/grub.install: $(STATEDIR)/grub.compile
grub_targetinstall: $(STATEDIR)/grub.targetinstall
$(STATEDIR)/grub.targetinstall: $(STATEDIR)/grub.install
- @$(call targetinfo, grub.targetinstall)
+ @$(call targetinfo, $@)
mkdir -p $(ROOTDIR)/boot/grub
install $(GRUB_DIR)/stage1/stage1 $(ROOTDIR)/boot/grub/
touch $@
diff --git a/rules/gtk1210.make b/rules/gtk1210.make
index b8b36eaae..53a72bc91 100644
--- a/rules/gtk1210.make
+++ b/rules/gtk1210.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: gtk1210.make,v 1.3 2003/08/22 20:55:54 robert Exp $
+# $Id: gtk1210.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-# Pengutronix <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ gtk1210_get: $(STATEDIR)/gtk1210.get
gtk1210_get_deps = $(GTK1210_SOURCE)
$(STATEDIR)/gtk1210.get: $(gtk1210_get_deps)
- @$(call targetinfo, gtk1210.get)
+ @$(call targetinfo, $@)
touch $@
$(GTK1210_SOURCE):
- @$(call targetinfo, $(GTK1210_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(GTK1210_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ gtk1210_extract: $(STATEDIR)/gtk1210.extract
gtk1210_extract_deps = $(STATEDIR)/gtk1210.get
$(STATEDIR)/gtk1210.extract: $(gtk1210_extract_deps)
- @$(call targetinfo, gtk1210.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(GTK1210_DIR))
@$(call extract, $(GTK1210_SOURCE))
touch $@
@@ -69,7 +69,7 @@ gtk1210_prepare: $(STATEDIR)/gtk1210.prepare
gtk1210_prepare_deps = \
$(STATEDIR)/gtk1210.extract \
$(STATEDIR)/glib1210.install \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
GTK1210_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
GTK1210_ENV = $(CROSS_ENV)
@@ -87,7 +87,7 @@ GTK1210_AUTOCONF += --with-glib-prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
GTK1210_AUTOCONF += --with-x
$(STATEDIR)/gtk1210.prepare: $(gtk1210_prepare_deps)
- @$(call targetinfo, gtk1210.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(GTK1210_BUILDDIR))
cd $(GTK1210_DIR) && \
$(GTK1210_PATH) $(GTK1210_ENV) \
@@ -103,7 +103,7 @@ gtk1210_compile: $(STATEDIR)/gtk1210.compile
gtk1210_compile_deps = $(STATEDIR)/gtk1210.prepare
$(STATEDIR)/gtk1210.compile: $(gtk1210_compile_deps)
- @$(call targetinfo, gtk1210.compile)
+ @$(call targetinfo, $@)
$(GTK1210_PATH) $(GTK1210_ENV) make -C $(GTK1210_DIR)
touch $@
@@ -114,7 +114,7 @@ $(STATEDIR)/gtk1210.compile: $(gtk1210_compile_deps)
gtk1210_install: $(STATEDIR)/gtk1210.install
$(STATEDIR)/gtk1210.install: $(STATEDIR)/gtk1210.compile
- @$(call targetinfo, gtk1210.install)
+ @$(call targetinfo, $@)
$(GTK1210_PATH) $(GTK1210_ENV) make -C $(GTK1210_DIR) install
touch $@
@@ -128,14 +128,14 @@ gtk1210_targetinstall_deps = $(STATEDIR)/gtk1210.compile
gtk1210_targetinstall_deps += $(STATEDIR)/glib1210.targetinstall
$(STATEDIR)/gtk1210.targetinstall: $(gtk1210_targetinstall_deps)
- @$(call targetinfo, gtk1210.targetinstall)
+ @$(call targetinfo, $@)
- # glib
+# glib
install $(GTK1210_DIR)/gdk/.libs/libgdk-1.2.so.0.9.1 $(ROOTDIR)/lib
ln -sf libgdk-1.2.so.0.9.1 $(ROOTDIR)/lib/libgdk-1.2.so.0
ln -sf libgdk-1.2.so.0.9.1 $(ROOTDIR)/lib/libgdk-1.2.so
- # gtk
+# gtk
install $(GTK1210_DIR)/gtk/.libs/libgtk-1.2.so.0.9.1 $(ROOTDIR)/lib
ln -sf libgtk-1.2.so.0.9.1 $(ROOTDIR)/lib/libgtk-1.2.so.0
ln -sf libgtk-1.2.so.0.9.1 $(ROOTDIR)/lib/libgtk-1.2.so
diff --git a/rules/gtk22.make b/rules/gtk22.make
index 340519321..1cd36fa7a 100644
--- a/rules/gtk22.make
+++ b/rules/gtk22.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: gtk22.make,v 1.2 2003/08/17 00:32:04 robert Exp $
+# $Id: gtk22.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-# Pengutronix <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ gtk22_get: $(STATEDIR)/gtk22.get
gtk22_get_deps = $(GTK22_SOURCE)
$(STATEDIR)/gtk22.get: $(gtk22_get_deps)
- @$(call targetinfo, gtk22.get)
+ @$(call targetinfo, $@)
touch $@
$(GTK22_SOURCE):
- @$(call targetinfo, $(GTK22_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(GTK22_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ gtk22_extract: $(STATEDIR)/gtk22.extract
gtk22_extract_deps = $(STATEDIR)/gtk22.get
$(STATEDIR)/gtk22.extract: $(gtk22_extract_deps)
- @$(call targetinfo, gtk22.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(GTK22_DIR))
@$(call extract, $(GTK22_SOURCE))
touch $@
@@ -69,8 +69,8 @@ gtk22_prepare: $(STATEDIR)/gtk22.prepare
gtk22_prepare_deps = \
$(STATEDIR)/gtk22.extract \
$(STATEDIR)/atk124.install \
+ $(STATEDIR)/virtual-xchain.install
# $(STATEDIR)/fontconfig22.install \
-# $(STATEDIR)/virtual-xchain.install
GTK22_PATH = PATH=$(CROSS_PATH)
GTK22_ENV = $(CROSS_ENV)
@@ -97,7 +97,7 @@ GTK22_AUTOCONF += --enable-foo
endif
$(STATEDIR)/gtk22.prepare: $(gtk22_prepare_deps)
- @$(call targetinfo, gtk22.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(GTK22_BUILDDIR))
cd $(GTK22_DIR) && \
$(GTK22_PATH) $(GTK22_ENV) \
@@ -113,7 +113,7 @@ gtk22_compile: $(STATEDIR)/gtk22.compile
gtk22_compile_deps = $(STATEDIR)/gtk22.prepare
$(STATEDIR)/gtk22.compile: $(gtk22_compile_deps)
- @$(call targetinfo, gtk22.compile)
+ @$(call targetinfo, $@)
$(GTK22_PATH) $(GTK22_ENV) make -C $(GTK22_DIR)
touch $@
@@ -124,7 +124,7 @@ $(STATEDIR)/gtk22.compile: $(gtk22_compile_deps)
gtk22_install: $(STATEDIR)/gtk22.install
$(STATEDIR)/gtk22.install: $(STATEDIR)/gtk22.compile
- @$(call targetinfo, gtk22.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -136,7 +136,7 @@ gtk22_targetinstall: $(STATEDIR)/gtk22.targetinstall
gtk22_targetinstall_deps = $(STATEDIR)/gtk22.compile
$(STATEDIR)/gtk22.targetinstall: $(gtk22_targetinstall_deps)
- @$(call targetinfo, gtk22.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/hosttool-genext2fs.make b/rules/hosttool-genext2fs.make
new file mode 100644
index 000000000..bf30e0fa4
--- /dev/null
+++ b/rules/hosttool-genext2fs.make
@@ -0,0 +1,122 @@
+# -*-makefile-*-
+# $id$
+#
+# Copyright (C) 2003 by Ixia Corporation (www.ixiacom.com)
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_GENEXT2FS
+PACKAGES += xchain-genext2fs
+endif
+
+#
+# Paths and names
+#
+XCHAIN_GENEXT2FS_VERSION = 1.3.orig
+XCHAIN_GENEXT2FS = genext2fs-$(XCHAIN_GENEXT2FS_VERSION)
+XCHAIN_GENEXT2FS_TARBALL = genext2fs_$(XCHAIN_GENEXT2FS_VERSION).$(XCHAIN_GENEXT2FS_SUFFIX)
+XCHAIN_GENEXT2FS_SUFFIX = tar.gz
+XCHAIN_GENEXT2FS_URL = http://ftp.debian.org/debian/pool/main/g/genext2fs/$(XCHAIN_GENEXT2FS_TARBALL)
+XCHAIN_GENEXT2FS_SOURCE = $(SRCDIR)/$(XCHAIN_GENEXT2FS_TARBALL)
+XCHAIN_GENEXT2FS_DIR = $(BUILDDIR)/$(XCHAIN_GENEXT2FS)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xchain-genext2fs_get: $(STATEDIR)/xchain-genext2fs.get
+
+xchain-genext2fs_get_deps = $(XCHAIN_GENEXT2FS_SOURCE)
+
+$(STATEDIR)/xchain-genext2fs.get: $(xchain-genext2fs_get_deps)
+ @$(call targetinfo, $@)
+ @$(call get_patches, $(XCHAIN_GENEXT2FS))
+ touch $@
+
+$(XCHAIN_GENEXT2FS_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(XCHAIN_GENEXT2FS_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+xchain-genext2fs_extract: $(STATEDIR)/xchain-genext2fs.extract
+
+$(STATEDIR)/xchain-genext2fs.extract: $(STATEDIR)/xchain-genext2fs.get
+ @$(call targetinfo, $@)
+ @$(call clean, $(XCHAIN_GENEXT2FS_DIR))
+ @$(call extract, $(XCHAIN_GENEXT2FS_SOURCE))
+ @$(call patchin, $(XCHAIN_GENEXT2FS))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+xchain-genext2fs_prepare: $(STATEDIR)/xchain-genext2fs.prepare
+
+XCHAIN_GENEXT2FS_ENV = $(HOSTCC_ENV)
+
+xchain-genext2fs_prepare_deps = \
+ $(STATEDIR)/xchain-genext2fs.extract
+
+$(STATEDIR)/xchain-genext2fs.prepare: $(xchain-genext2fs_prepare_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xchain-genext2fs_compile: $(STATEDIR)/xchain-genext2fs.compile
+
+xchain-genext2fs_compile_deps = $(STATEDIR)/xchain-genext2fs.prepare
+
+$(STATEDIR)/xchain-genext2fs.compile: $(xchain-genext2fs_compile_deps)
+ @$(call targetinfo, $@)
+ make -C $(XCHAIN_GENEXT2FS_DIR) $(XCHAIN_GENEXT2FS_ENV)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xchain-genext2fs_install: $(STATEDIR)/xchain-genext2fs.install
+
+xchain-genext2fs_install_deps = $(STATEDIR)/xchain-genext2fs.compile
+
+$(STATEDIR)/xchain-genext2fs.install:$(xchain-genext2fs_install_deps)
+ @$(call targetinfo, $@)
+ install -d $(PTXCONF_PREFIX)/bin/
+ install -d $(PTXCONF_PREFIX)/man/man8/
+
+ install -m 755 $(XCHAIN_GENEXT2FS_DIR)/genext2fs $(PTXCONF_PREFIX)/bin/
+ install -m 644 $(XCHAIN_GENEXT2FS_DIR)/genext2fs.8 $(PTXCONF_PREFIX)/man/man8/
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+xchain-genext2fs_targetinstall: $(STATEDIR)/xchain-genext2fs.targetinstall
+
+$(STATEDIR)/xchain-genext2fs.targetinstall: $(STATEDIR)/xchain-genext2fs.install
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xchain-genext2fs_clean:
+ rm -rf $(STATEDIR)/xchain-genext2fs.* $(XCHAIN_GENEXT2FS_DIR)
+
+# vim: syntax=make
diff --git a/rules/inetutils.make b/rules/inetutils.make
index 5b0248b66..736fe90cf 100644
--- a/rules/inetutils.make
+++ b/rules/inetutils.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: inetutils.make,v 1.3 2003/09/24 23:43:23 mkl Exp $
+# $Id: inetutils.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
#
-# (C) 2003 by Ixia Corporation (www.ixiacom.com)
+# Copyright (C) 2003 by Ixia Corporation (www.ixiacom.com)
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -73,18 +73,17 @@ inetutils_prepare_deps = \
INETUTILS_PATH = PATH=$(CROSS_PATH)
INETUTILS_ENV = $(CROSS_ENV)
-# Override autoconf tests that break when cross-compiling.
-# Value given is for Linux.
-# FIXME: Should this be part of the default $(CROSS_ENV)?
-INETUTILS_ENV += ac_cv_func_setvbuf_reversed=no
#
# autoconf
#
-INETUTILS_AUTOCONF = --prefix=/usr
-INETUTILS_AUTOCONF += --build=$(GNU_HOST)
-INETUTILS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
-INETUTILS_AUTOCONF += --with-PATH-CP=/bin/cp
+INETUTILS_AUTOCONF = \
+ --prefix=/usr \
+ --build=$(GNU_HOST) \
+ --host=$(PTXCONF_GNU_TARGET) \
+ --with-PATH-CP=/bin/cp \
+ --localstatedir=/var \
+ --sysconfdir=/etc
$(STATEDIR)/inetutils.prepare: $(inetutils_prepare_deps)
@$(call targetinfo, $@)
@@ -139,17 +138,17 @@ $(STATEDIR)/inetutils.targetinstall: $(inetutils_targetinstall_deps)
install -d $(ROOTDIR)/usr/sbin
ifdef PTXCONF_INETUTILS_RCP
install -D $(INETUTILS_DIR)/rcp/rcp $(ROOTDIR)/usr/bin/rcp
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/bin/rcp
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/rcp
endif
ifdef PTXCONF_INETUTILS_RLOGIND
install -D $(INETUTILS_DIR)/rlogind/rlogind $(ROOTDIR)/usr/sbin/rlogind
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/sbin/rlogind
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/rlogind
endif
ifdef PTXCONF_INETUTILS_RSHD
install -D $(INETUTILS_DIR)/rshd/rshd $(ROOTDIR)/usr/bin/rshd
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/bin/rshd
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/rshd
endif
touch $@
diff --git a/rules/kaffe.make b/rules/kaffe.make
index a0e978d86..7e47f9ebb 100644
--- a/rules/kaffe.make
+++ b/rules/kaffe.make
@@ -1,11 +1,12 @@
# -*-makefile-*-
-# $Id: kaffe.make,v 1.5 2003/09/16 22:11:56 mkl Exp $
+# $Id: kaffe.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
+# GYRO net GmbH <info@gyro-net.de>, Hannover, Germany
#
-# (c) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
-# GYRO net GmbH <info@gyro-net.de>, Hannover, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -46,15 +47,15 @@ kaffe_get_deps += $(KAFFE_KANGAROO_SOURCE)
endif
$(STATEDIR)/kaffe.get: $(kaffe_get_deps)
- @$(call targetinfo, kaffe.get)
+ @$(call targetinfo, $@)
touch $@
$(KAFFE_SOURCE):
- @$(call targetinfo, $(KAFFE_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(KAFFE_URL))
$(KAFFE_KANGAROO_SOURCE):
- @$(call targetinfo, $(KAFFE_KANGAROO_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(KAFFE_KANGAROO_URL))
# ----------------------------------------------------------------------------
@@ -69,17 +70,17 @@ kaffe_extract_deps += $(STATEDIR)/kaffe-kangaroo.extract
endif
$(STATEDIR)/kaffe.extract: $(kaffe_extract_deps)
- @$(call targetinfo, kaffe.extract)
+ @$(call targetinfo, $@)
touch $@
$(STATEDIR)/kaffe-base.extract: $(STATEDIR)/kaffe.get
- @$(call targetinfo, kaffe-base.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(KAFFE_DIR))
@$(call extract, $(KAFFE_SOURCE))
touch $@
$(STATEDIR)/kaffe-kangaroo.extract: $(STATEDIR)/kaffe.get
- @$(call targetinfo, kaffe-kangaroo.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(KAFFE_KANGAROO_DIR))
@$(call extract, $(KAFFE_KANGAROO_SOURCE))
cp -a $(BUILDDIR)/$(KAFFE_KANGAROO)/* $(BUILDDIR)/$(KAFFE)
@@ -138,9 +139,9 @@ ifdef PTXCONF_KAFFE_JIKES
KAFFE_AUTOCONF += --with-jikes=$(PTXCONF_KAFFE_JIKES)
endif
-ifdef PTXCONF_KAFFE_API_SE
-KAFFE_AUTOCONF += --with-api=se
-endif
+# ifdef PTXCONF_KAFFE_API_SE
+# KAFFE_AUTOCONF += --with-api=se
+# endif
ifdef PTXCONF_KAFFE_API_CLDC
KAFFE_AUTOCONF += --with-api=cldc
endif
@@ -230,7 +231,7 @@ KAFFE_AUTOCONF += --with-staticlib
endif
$(STATEDIR)/kaffe.prepare: $(kaffe_prepare_deps)
- @$(call targetinfo, kaffe.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(KAFFE_BUILDDIR))
mkdir -p $(KAFFE_BUILDDIR)
cd $(KAFFE_BUILDDIR) && \
@@ -253,7 +254,7 @@ KAFFE_MAKEVARS = JAVAC_FLAGS="-verbose"
endif
$(STATEDIR)/kaffe.compile: $(kaffe_compile_deps)
- @$(call targetinfo, kaffe.compile)
+ @$(call targetinfo, $@)
$(KAFFE_PATH) make -C $(KAFFE_BUILDDIR) $(KAFFE_MAKEVARS)
ifdef PTXCONF_KAFFE_LINK_GMP
@@ -276,7 +277,7 @@ endif
kaffe_install: $(STATEDIR)/kaffe.install
$(STATEDIR)/kaffe.install: $(STATEDIR)/kaffe.compile
- @$(call targetinfo, kaffe.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -292,7 +293,7 @@ kaffe_targetinstall_deps += $(STATEDIR)/gmp3.targetinstall
endif
$(STATEDIR)/kaffe.targetinstall: $(kaffe_targetinstall_deps)
- @$(call targetinfo, kaffe.targetinstall)
+ @$(call targetinfo, $@)
@$(call clean, $(KAFFE_BUILDDIR)-tmp)
mkdir -p $(ROOTDIR)/usr/jre/bin
mkdir -p $(ROOTDIR)/usr/jre/lib/$(PTXCONF_ARCH_USERSPACE)
diff --git a/rules/kernel-ben.make b/rules/kernel-ben.make
new file mode 100644
index 000000000..9c5a44f8b
--- /dev/null
+++ b/rules/kernel-ben.make
@@ -0,0 +1,63 @@
+# -*-makefile-*-
+# $Id: kernel-ben.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_KERNEL_BEN
+PATCHES += kernel-ben
+endif
+
+#
+# Paths and names
+#
+KERNEL-BEN_VERSION = $(call get_option, s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(ben[0-9]\).*/\1.\2.\3-\4/, benh)
+KERNEL-BEN = patch-$(KERNEL-BEN_VERSION)
+KERNEL-BEN_SUFFIX = bz2
+KERNEL-BEN_URL = http://www.kernel.org/pub/linux/kernel/people/benh/$(KERNEL-BEN).$(KERNEL-BEN_SUFFIX)
+KERNEL-BEN_SOURCE = $(SRCDIR)/$(KERNEL-BEN).$(KERNEL-BEN_SUFFIX)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+kernel-ben_get: $(STATEDIR)/kernel-ben.get
+
+kernel-ben_get_deps = \
+ $(KERNEL-BEN_SOURCE)
+
+$(STATEDIR)/kernel-ben.get: $(kernel-ben_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(KERNEL-BEN_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(KERNEL-BEN_URL))
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+kernel-ben_install: $(STATEDIR)/kernel-ben.install
+
+$(STATEDIR)/kernel-ben.install: $(STATEDIR)/kernel-ben.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-BEN_SOURCE), $(KERNEL_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+kernel-ben_clean:
+ rm -rf $(STATEDIR)/kernel*
+
+# vim: syntax=make
diff --git a/rules/kernel-ds.make b/rules/kernel-ds.make
new file mode 100644
index 000000000..7e01389fc
--- /dev/null
+++ b/rules/kernel-ds.make
@@ -0,0 +1,64 @@
+# -*-makefile-*-
+# $Id: kernel-ds.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_KERNEL_DS
+PATCHES += kernel-ds
+endif
+
+#
+# Paths and names
+#
+KERNEL-DS_VERSION = $(call get_config, \
+ s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\)_\(ds[0-9]\).*/\1.\2.\3-\4-\5/, ds)
+KERNEL-DS = patch-$(KERNEL-DS_VERSION)
+KERNEL-DS_SUFFIX = gz
+KERNEL-DS_URL = ftp://source.mvista.com/pub/ds-patches/$(KERNEL_VERSION_MAJOR).$(KERNEL_VERSION_MINOR)/$(KERNEL-DS).$(KERNEL-DS_SUFFIX)
+KERNEL-DS_SOURCE = $(SRCDIR)/$(KERNEL-DS).$(KERNEL-DS_SUFFIX)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+kernel-ds_get: $(STATEDIR)/kernel-ds.get
+
+kernel-ds_get_deps = \
+ $(KERNEL-DS_SOURCE)
+
+$(STATEDIR)/kernel-ds.get: $(kernel-ds_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(KERNEL-DS_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(KERNEL-DS_URL))
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+kernel-ds_install: $(STATEDIR)/kernel-ds.install
+
+$(STATEDIR)/kernel-ds.install: $(STATEDIR)/kernel-ds.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-DS_SOURCE), $(KERNEL_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+kernel-ds_clean:
+ rm -rf $(STATEDIR)/kernel-ds.*
+
+# vim: syntax=make
diff --git a/rules/kernel-ltt.make b/rules/kernel-ltt.make
new file mode 100644
index 000000000..1bb43508d
--- /dev/null
+++ b/rules/kernel-ltt.make
@@ -0,0 +1,64 @@
+# -*-makefile-*-
+# $Id: kernel-ltt.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_KERNEL_LTT
+PATCHES += kernel-ltt
+endif
+
+#
+# Paths and names
+#
+KERNEL-LTT_VERSION = $(call get_option, \
+ s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\)_\(pxa[0-9]\)_\(mtd[0-9]*\)_\(ptx[0-9]\)_\(ltt[0-9]\).*/\1.\2.\3-\4-\5-\7-\8/, ltt)
+KERNEL-LTT = linux-$(KERNEL-LTT_VERSION)
+KERNEL-LTT_SUFFIX = diff
+KERNEL-LTT_URL = http://www.pengutronix.de/software/ltt/$(KERNEL-LTT).$(KERNEL-LTT_SUFFIX)
+KERNEL-LTT_SOURCE = $(SRCDIR)/$(KERNEL-LTT).$(KERNEL-LTT_SUFFIX)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+kernel-ltt_get: $(STATEDIR)/kernel-ltt.get
+
+kernel-ltt_get_deps = \
+ $(KERNEL-LTT_SOURCE)
+
+$(STATEDIR)/kernel-ltt.get: $(kernel-ltt_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(KERNEL-LTT_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(KERNEL-LTT_URL))
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+kernel-ltt_install: $(STATEDIR)/kernel-ltt.install
+
+$(STATEDIR)/kernel-ltt.install: $(STATEDIR)/kernel-ltt.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-LTT_SOURCE), $(KERNEL_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+kernel-ltt_clean:
+ rm -rf $(STATEDIR)/kernel*
+
+# vim: syntax=make
diff --git a/rules/kernel-mtd.make b/rules/kernel-mtd.make
new file mode 100644
index 000000000..208f082e5
--- /dev/null
+++ b/rules/kernel-mtd.make
@@ -0,0 +1,64 @@
+# -*-makefile-*-
+# $Id: kernel-mtd.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef MTDCONF_KERNEL_MTD
+PATCHES += kernel-mtd
+endif
+
+#
+# Paths and names
+#
+KERNEL-MTD_VERSION = $(call get_option, \
+ s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\)_\(pxa[0-9]\)_\(mtd[0-9]*\).*/\1.\2.\3-\4-\5-\6/, mtd)
+KERNEL-MTD = linux-$(KERNEL-MTD_VERSION)
+KERNEL-MTD_SUFFIX = diff.bz2
+KERNEL-MTD_URL = http://www.pengutronix.de/software/linux-arm/$(KERNEL-MTD).$(KERNEL-MTD_SUFFIX)
+KERNEL-MTD_SOURCE = $(SRCDIR)/linux-$(KERNEL-MTD_VERSION).$(KERNEL-MTD_SUFFIX)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+kernel-mtd_get: $(STATEDIR)/kernel-mtd.get
+
+kernel-mtd_get_deps = \
+ $(KERNEL-MTD_SOURCE)
+
+$(STATEDIR)/kernel-mtd.get: $(kernel-mtd_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(KERNEL-MTD_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(KERNEL-MTD_URL))
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+kernel-mtd_install: $(STATEDIR)/kernel-mtd.install
+
+$(STATEDIR)/kernel-mtd.install: $(STATEDIR)/kernel-mtd.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-MTD_SOURCE), $(KERNEL_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+kernel-mtd_clean:
+ rm -rf $(STATEDIR)/kernel*
+
+# vim: syntax=make
diff --git a/rules/kernel-ptx.make b/rules/kernel-ptx.make
new file mode 100644
index 000000000..3c9ca9d7e
--- /dev/null
+++ b/rules/kernel-ptx.make
@@ -0,0 +1,64 @@
+# -*-makefile-*-
+# $Id: kernel-ptx.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_KERNEL_PTX
+PATCHES += kernel-ptx
+endif
+
+#
+# Paths and names
+#
+KERNEL_PTX_VERSION = $(call get_option, \
+ s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\)_\(pxa[0-9]\)_\(mtd[0-9]*\)_\(ptx[0-9]\).*/\1.\2.\3-\4-\5-\7/, ptx)
+KERNEL_PTX = linux-$(KERNEL_PTX_VERSION)
+KERNEL_PTX_SUFFIX = diff
+KERNEL_PTX_URL = http://www.pengutronix.de/software/linux-arm/$(KERNEL_PTX).$(KERNEL_PTX_SUFFIX)
+KERNEL_PTX_SOURCE = $(SRCDIR)/$(KERNEL_PTX).$(KERNEL_PTX_SUFFIX)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+kernel-ptx_get: $(STATEDIR)/kernel-ptx.get
+
+kernel-ptx_get_deps = \
+ $(KERNEL_PTX_SOURCE)
+
+$(STATEDIR)/kernel-ptx.get: $(kernel-ptx_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(KERNEL_PTX_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(KERNEL_PTX_URL))
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+kernel-ptx_install: $(STATEDIR)/kernel-ptx.install
+
+$(STATEDIR)/kernel-ptx.install: $(STATEDIR)/kernel-ptx.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL_PTX_SOURCE), $(KERNEL_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+kernel-ptx_clean:
+ rm -rf $(STATEDIR)/kernel*
+
+# vim: syntax=make
diff --git a/rules/kernel-pxa.make b/rules/kernel-pxa.make
new file mode 100644
index 000000000..4fa132e94
--- /dev/null
+++ b/rules/kernel-pxa.make
@@ -0,0 +1,64 @@
+# -*-makefile-*-
+# $Id: kernel-pxa.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_KERNEL_PXA
+PATCHES += kernel-pxa
+endif
+
+#
+# Paths and names
+#
+KERNEL-PXA_VERSION = $(call get_option, \
+ s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\)_\(pxa[0-9]\).*/\1.\2.\3-\4-\5/, pxa)
+KERNEL-PXA = diff-$(KERNEL-PXA_VERSION)
+KERNEL-PXA_SUFFIX = gz
+KERNEL-PXA_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/people/nico/$(KERNEL-PXA).$(KERNEL-PXA_SUFFIX)
+KERNEL-PXA_SOURCE = $(SRCDIR)/$(KERNEL-PXA).$(KERNEL-PXA_SUFFIX)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+kernel-pxa_get: $(STATEDIR)/kernel-pxa.get
+
+kernel-pxa_get_deps = \
+ $(KERNEL-PXA_SOURCE)
+
+$(STATEDIR)/kernel-pxa.get: $(kernel-pxa_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(KERNEL-PXA_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(KERNEL-PXA_URL))
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+kernel-pxa_install: $(STATEDIR)/kernel-pxa.install
+
+$(STATEDIR)/kernel-pxa.install: $(STATEDIR)/kernel-pxa.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-PXA_SOURCE), $(KERNEL_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+kernel-pxa_clean:
+ rm -rf $(STATEDIR)/kernel*
+
+# vim: syntax=make
diff --git a/rules/kernel-rmk.make b/rules/kernel-rmk.make
new file mode 100644
index 000000000..fc9b1969d
--- /dev/null
+++ b/rules/kernel-rmk.make
@@ -0,0 +1,65 @@
+# -*-makefile-*-
+# $Id: kernel-rmk.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_KERNEL_RMK
+PATCHES += kernel-rmk
+endif
+
+#
+# Paths and names
+#
+KERNEL-RMK_VERSION = $(call get_option, \
+ s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(rmk[0-9]\).*/\1.\2.\3-\4/, rmk)
+KERNEL-RMK = patch-$(KERNEL-RMK_VERSION)
+KERNEL-RMK_SUFFIX = bz2
+KERNEL-RMK_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v$(KERNEL_VERSION_MAJOR).$(KERNEL_VERSION_MINOR)/$(KERNEL-RMK).$(KERNEL-RMK_SUFFIX)
+KERNEL-RMK_SOURCE = $(SRCDIR)/$(KERNEL-RMK).$(KERNEL-RMK_SUFFIX)
+
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+kernel-rmk_get: $(STATEDIR)/kernel-rmk.get
+
+kernel-rmk_get_deps = \
+ $(KERNEL-RMK_SOURCE)
+
+$(STATEDIR)/kernel-rmk.get: $(kernel-rmk_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(KERNEL-RMK_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(KERNEL-RMK_URL))
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+kernel-rmk_install: $(STATEDIR)/kernel-rmk.install
+
+$(STATEDIR)/kernel-rmk.install: $(STATEDIR)/kernel-rmk.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-RMK_SOURCE), $(KERNEL_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+kernel-rmk_clean:
+ rm -rf $(STATEDIR)/kernel*
+
+# vim: syntax=make
diff --git a/rules/kernel-rtai.make b/rules/kernel-rtai.make
new file mode 100644
index 000000000..9771a5692
--- /dev/null
+++ b/rules/kernel-rtai.make
@@ -0,0 +1,67 @@
+# -*-makefile-*-
+# $Id: kernel-rtai.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_RTAI
+KERNEL_PATCHES += rtai
+endif
+
+#
+# Paths and names
+#
+KERNEL_RTAI_PATCH = $(KERNEL_RTAI_DIR)/patches/patch-$(KERNEL_VERSION)-$(RTAI_TECH)
+KERNEL_RTAI_SOURCE = $(RTAI_SOURCE)
+KERNEL_RTAI = $(RTAI)
+KERNEL_RTAI_DIR = $(PATCHES_BUILDDIR)/$(KERNEL_RTAI)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+kernel-rtai_get: $(STATEDIR)/kernel-rtai.get
+
+$(STATEDIR)/kernel-rtai.get: $(KERNEL_RTAI_SOURCE)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+kernel-rtai_extract: $(STATEDIR)/kernel-rtai.extract
+
+$(STATEDIR)/kernel-rtai.extract: $(STATEDIR)/kernel-rtai.get
+ @$(call targetinfo, $@)
+ @$(call clean, $(KERNEL_RTAI_DIR))
+ @$(call extract, $(KERNEL_RTAI_SOURCE), $(PATCHES_BUILDDIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+kernel-rtai_install: $(STATEDIR)/kernel-rtai.install
+
+$(STATEDIR)/kernel-rtai.install: $(STATEDIR)/kernel-rtai.extract
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL_RTAI_PATCH), $(KERNEL_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+kernel-rtai_clean:
+ rm -rf $(STATEDIR)/kernel*
+
+# vim: syntax=make
diff --git a/rules/kernel-uc.make b/rules/kernel-uc.make
new file mode 100644
index 000000000..6afddd280
--- /dev/null
+++ b/rules/kernel-uc.make
@@ -0,0 +1,64 @@
+# -*-makefile-*-
+# $Id: kernel-uc.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_KERNEL_UC
+PATCHES += kernel-uc
+endif
+
+#
+# Paths and names
+#
+KERNEL-UC_VERSION = $(call get_option, \
+ s/^PTXCONF_KERNEL_\([0-9]\)_\([0-9]\)_\([0-9]*\)_\(uc[0-9]\).*/\1.\2.\3-\4/, uc)
+KERNEL-UC = uClinux-$(KERNEL-UC_VERSION)
+KERNEL-UC_SUFFIX = diff.gz
+KERNEL-UC_URL = http://www.uclinux.org/pub/uClinux/uClinux-2.4.x/$(KERNEL-UC).$(KERNEL-UC_SUFFIX)
+KERNEL-UC_SOURCE = $(SRCDIR)/$(KERNEL-UC).$(KERNEL-UC_SUFFIX)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+kernel-uc_get: $(STATEDIR)/kernel-uc.get
+
+kernel-uc_get_deps = \
+ $(KERNEL-UC_SOURCE)
+
+$(STATEDIR)/kernel-uc.get: $(kernel-uc_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(KERNEL-UC_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(KERNEL-UC_URL))
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+kernel-uc_install: $(STATEDIR)/kernel-uc.install
+
+$(STATEDIR)/kernel-uc.install: $(STATEDIR)/kernel-uc.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-UC_SOURCE), $(KERNEL_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+kernel-uc_clean:
+ rm -rf $(STATEDIR)/kernel*
+
+# vim: syntax=make
diff --git a/rules/kernel.in b/rules/kernel.in
new file mode 100644
index 000000000..3906e4d0b
--- /dev/null
+++ b/rules/kernel.in
@@ -0,0 +1,863 @@
+config KERNEL_CONFIG
+ string
+ prompt "Name of config in $PTXDIST/config/kernel to be used"
+ default "kernel-2.4.18-" if KERNEL_2_4_18
+ default "kernel-2.4.19-" if KERNEL_2_4_19
+ default "kernel-2.4.20-" if KERNEL_2_4_20
+ default "kernel-2.4.21-" if KERNEL_2_4_21
+ default "kernel-2.4.22-" if KERNEL_2_4_22
+ default "kernel-2.4.23-" if KERNEL_2_4_23
+
+choice
+ prompt "Kernel Version"
+ default KERNEL_2_4_19
+
+ config KERNEL_2_4_18
+ bool
+ prompt "2.4.18"
+ depends on !ARCH_ARM_NOMMU
+
+ config KERNEL_2_4_19
+ bool
+ prompt "2.4.19"
+
+ config KERNEL_2_4_20
+ bool
+ prompt "2.4.20"
+ depends on ARCH_ARM_NOMMU || ARCH_X86 || ARCH_PPC || ARCH_SPARC || ARCH_MIPS || ARCH_CRIS || ARCH_PARISC || ARCH_SH
+
+ config KERNEL_2_4_21
+ bool
+ prompt "2.4.21"
+ depends on !ARM_ARCH_BE && !ARM_ARCH_PXA
+
+ config KERNEL_2_4_22
+ bool
+ prompt "2.4.22"
+ depends on ARCH_ARM_NOMMU || ARCH_X86 || ARCH_PPC || ARCH_SPARC || ARCH_MIPS || ARCH_CRIS || ARCH_PARISC || ARCH_SH
+endchoice
+
+
+choice
+ prompt "Select flavour"
+
+ config KERNEL_RMK
+ bool "-rmk"
+ depends on ARM_ARCH_LE && !ARM_ARCH_PXA && !ARCH_NOMMU
+
+ config KERNEL_RMK_PXA
+ bool "-rmk-pxa"
+ depends on ARM_ARCH_LE && !ARCH_NOMMU
+
+ config KERNEL_RMK_DS
+ bool "-rmk-ds"
+ depends on ARM_ARCH_BE && !ARCH_NOMMU
+
+ config KERNEL_RMK_PXA_PTX
+ bool "-rmk-pxa-ptx"
+ depends on ARM_ARCH_LE && !ARCH_NOMMU
+
+ config KERNEL_RMK_PXA_PTX_LTT
+ bool "-rmk-pxa-ptx-ltt"
+ depends on ARM_ARCH_LE && !ARCH_NOMMU
+
+ config KERNEL_UC
+ bool "-uc"
+ depends on ARCH_NOMMU
+
+ config KERNEL_BEN
+ bool "-ben"
+ depends on ARCH_PPC
+ depends on !KERNEL_2_4_18 && !KERNEL_2_4_19
+
+ config KERNEL_VANILLA
+ bool "vanilla"
+ depends on !ARCH_ARM && !ARCH_NOMMU
+endchoice
+
+
+
+choice
+ prompt "Select Patch version"
+ depends on !KERNEL_VANILLA
+
+#---------------------------------------------------------------------
+#------------------------------- RMK ---------------------------------
+#---------------------------------------------------------------------
+
+#--------------- 2.4.18
+
+ config KERNEL_2_4_18_rmk7
+ bool "2.4.18-rmk7"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_18_rmk6
+ bool "2.4.18-rmk6"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_18_rmk5
+ bool "2.4.18-rmk5"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_18_rmk4
+ bool "2.4.18-rmk4"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_18_rmk3
+ bool "2.4.18-rmk3"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_18_rmk2
+ bool "2.4.18-rmk2"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_18_rmk1
+ bool "2.4.18-rmk1"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK
+
+
+#--------------- 2.4.19
+
+ config KERNEL_2_4_19_rmk7
+ bool "2.4.19-rmk7"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_19_rmk6
+ bool "2.4.19-rmk6"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_19_rmk5
+ bool "2.4.19-rmk5"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_19_rmk4
+ bool "2.4.19-rmk4"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_19_rmk3
+ bool "2.4.19-rmk3"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_19_rmk2
+ bool "2.4.19-rmk2"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK
+
+ config KERNEL_2_4_19_rmk1
+ bool "2.4.19-rmk1"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK
+
+
+#--------------- 2.4.21
+
+ config KERNEL_2_4_21_rmk1
+ bool "2.4.21-rmk1"
+ depends on KERNEL_2_4_21
+ depends on KERNEL_RMK
+
+#---------------------------------------------------------------------
+#------------------------------- RMK-DS ------------------------------
+#---------------------------------------------------------------------
+
+#--------------- 2.4.18-rmk7
+
+ config KERNEL_2_4_18_rmk7_ds3
+ bool "2.4.18-rmk7-ds3"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_DS
+
+ config KERNEL_2_4_18_rmk7_ds2
+ bool "2.4.18-rmk7-ds2"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_DS
+
+ config KERNEL_2_4_18_rmk7_ds1
+ bool "2.4.18-rmk7-ds1"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_DS
+
+#--------------- 2.4.18-rmk6
+
+ config KERNEL_2_4_18_rmk6_ds1
+ bool "2.4.18-rmk6-ds1"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_DS
+
+#--------------- 2.4.18-rmk5
+
+ config KERNEL_2_4_18_rmk5_ds1
+ bool "2.4.18-rmk5-ds1"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_DS
+
+
+
+#--------------- 2.4.19-rmk7
+
+ config KERNEL_2_4_19_rmk7_ds3
+ bool "2.4.19-rmk7-ds3"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_DS
+
+ config KERNEL_2_4_19_rmk7_ds2
+ bool "2.4.19-rmk7-ds2"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_DS
+
+ config KERNEL_2_4_19_rmk7_ds1
+ bool "2.4.19-rmk7-ds1"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_DS
+
+#--------------- 2.4.19-rmk6
+
+ config KERNEL_2_4_19_rmk6_ds2
+ bool "2.4.19-rmk6-ds2"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_DS
+
+ config KERNEL_2_4_19_rmk6_ds1
+ bool "2.4.19-rmk6-ds1"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_DS
+
+#--------------- 2.4.19-rmk4
+
+ config KERNEL_2_4_19_rmk4_ds2
+ bool "2.4.19-rmk4-ds2"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_DS
+
+ config KERNEL_2_4_19_rmk4_ds1
+ bool "2.4.19-rmk4-ds1"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_DS
+
+#---------------------------------------------------------------------
+#------------------------------- RMK-PXA -----------------------------
+#---------------------------------------------------------------------
+
+#--------------- 2.4.18-rmk7
+
+ config KERNEL_2_4_18_rmk7_pxa3
+ bool "2.4.18-rmk7-pxa3"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_PXA
+
+ config KERNEL_2_4_18_rmk7_pxa2
+ bool "2.4.18-rmk7-pxa2"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_PXA
+
+ config KERNEL_2_4_18_rmk7_pxa1
+ bool "2.4.18-rmk7-pxa1"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_PXA
+
+#--------------- 2.4.18-rmk6
+
+ config KERNEL_2_4_18_rmk6_pxa2
+ bool "2.4.18-rmk6-pxa2"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_PXA
+
+ config KERNEL_2_4_18_rmk6_pxa1
+ bool "2.4.18-rmk6-pxa1"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_PXA
+
+#--------------- 2.4.18-rmk5
+
+ config KERNEL_2_4_18_rmk5_pxa1
+ bool "2.4.18-rmk5-pxa1"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_PXA
+
+#--------------- 2.4.18-rmk3
+
+ config KERNEL_2_4_18_rmk3_pxa2
+ bool "2.4.18-rmk3-pxa2"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_PXA
+
+ config KERNEL_2_4_18_rmk3_pxa1
+ bool "2.4.18-rmk3-pxa1"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_PXA
+
+#--------------- 2.4.18-rmk2
+
+ config KERNEL_2_4_18_rmk2_pxa1
+ bool "2.4.18-rmk2-pxa1"
+ depends on KERNEL_2_4_18
+ depends on KERNEL_RMK_PXA
+
+
+
+#--------------- 2.4.19-rmk7
+
+ config KERNEL_2_4_19_rmk7_pxa2
+ bool "2.4.19-rmk7-pxa2"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_PXA
+
+ config KERNEL_2_4_19_rmk7_pxa1
+ bool "2.4.19-rmk7-pxa1"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_PXA
+
+#--------------- 2.4.19-rmk6
+
+ config KERNEL_2_4_19_rmk6_pxa1
+ bool "2.4.19-rmk6-pxa1"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_PXA
+
+#--------------- 2.4.19-rmk4
+
+ config KERNEL_2_4_19_rmk4_pxa1
+ bool "2.4.19-rmk4-pxa1"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_PXA
+
+ config KERNEL_2_4_19_rmk4_pxa2
+ bool "2.4.19-rmk4-pxa2"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_PXA
+
+#--------------- 2.4.19-rmk2
+
+ config KERNEL_2_4_19_rmk2_pxa2
+ bool "2.4.19-rmk2-pxa2"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_PXA
+
+ config KERNEL_2_4_19_rmk2_pxa1
+ bool "2.4.19-rmk2-pxa1"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_PXA
+
+#---------------------------------------------------------------------
+#------------------------------- RMK-PXA-PTX -------------------------
+#---------------------------------------------------------------------
+
+ config KERNEL_2_4_19_rmk7_pxa2_mtd20030728_ptx7
+ bool "2.4.19-rmk7-pxa2-mtd20030728-ptx7"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_PXA_PTX
+
+ config KERNEL_2_4_19_rmk7_pxa2_mtd20030728_ptx6
+ bool "2.4.19-rmk7-pxa2-mtd20030728-ptx6"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_PXA_PTX
+
+#---------------------------------------------------------------------
+#------------------------------- RMK-PXA-PTX-LTT ---------------------
+#---------------------------------------------------------------------
+
+ config KERNEL_2_4_19_rmk7_pxa2_mtd20030728_ptx7_ltt1
+ bool "2.4.19-rmk7-pxa2-mtd20030728-ptx7-ltt1"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_PXA_PTX_LTT
+
+ config KERNEL_2_4_19_rmk7_pxa2_mtd20030728_ptx6_ltt1
+ bool "2.4.19-rmk7-pxa2-mtd20030728-ptx6-ltt1"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_RMK_PXA_PTX_LTT
+
+#---------------------------------------------------------------------
+#------------------------------- UC ----------------------------------
+#---------------------------------------------------------------------
+
+#--------------- 2.4.19
+
+ config KERNEL_2_4_19_uc2
+ bool "2.4.19-uc2"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_UC
+
+ config KERNEL_2_4_19_uc1
+ bool "2.4.19-uc1"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_UC
+
+ config KERNEL_2_4_19_uc0
+ bool "2.4.19-uc0"
+ depends on KERNEL_2_4_19
+ depends on KERNEL_UC
+
+#--------------- 2.4.20
+
+ config KERNEL_2_4_20_uc1
+ bool "2.4.20-uc1"
+ depends on KERNEL_2_4_20
+ depends on KERNEL_UC
+
+ config KERNEL_2_4_20_uc0
+ bool "2.4.20-uc0"
+ depends on KERNEL_2_4_20
+ depends on KERNEL_UC
+
+#--------------- 2.4.21
+
+ config KERNEL_2_4_21_uc0
+ bool "2.4.21-uc0"
+ depends on KERNEL_2_4_21
+ depends on KERNEL_UC
+
+#--------------- 2.4.22
+
+ config KERNEL_2_4_22_uc0
+ bool "2.4.22-uc0"
+ depends on KERNEL_2_4_22
+ depends on KERNEL_UC
+
+#---------------------------------------------------------------------
+#------------------------------- BEN ---------------------------------
+#---------------------------------------------------------------------
+
+#--------------- 2.4.20
+
+ config KERNEL_2_4_20_ben10
+ bool "2.4.20-ben10"
+ depends on KERNEL_2_4_20
+ depends on KERNEL_BEN
+
+ config KERNEL_2_4_20_ben9
+ bool "2.4.20-ben9"
+ depends on KERNEL_2_4_20
+ depends on KERNEL_BEN
+
+ config KERNEL_2_4_20_ben8
+ bool "2.4.20-ben8"
+ depends on KERNEL_2_4_20
+ depends on KERNEL_BEN
+
+ config KERNEL_2_4_20_ben7
+ bool "2.4.20-ben7"
+ depends on KERNEL_2_4_20
+ depends on KERNEL_BEN
+
+ config KERNEL_2_4_20_ben6
+ bool "2.4.20-ben6"
+ depends on KERNEL_2_4_20
+ depends on KERNEL_BEN
+
+ config KERNEL_2_4_20_ben5
+ bool "2.4.20-ben5"
+ depends on KERNEL_2_4_20
+ depends on KERNEL_BEN
+
+ config KERNEL_2_4_20_ben4
+ bool "2.4.20-ben4"
+ depends on KERNEL_2_4_20
+ depends on KERNEL_BEN
+
+ config KERNEL_2_4_20_ben3
+ bool "2.4.20-ben3"
+ depends on KERNEL_2_4_20
+ depends on KERNEL_BEN
+
+#--------------- 2.4.21
+
+ config KERNEL_2_4_21_ben3
+ bool "2.4.21-ben3"
+ depends on KERNEL_2_4_21
+ depends on KERNEL_BEN
+
+ config KERNEL_2_4_21_ben2
+ bool "2.4.21-ben2"
+ depends on KERNEL_2_4_21
+ depends on KERNEL_BEN
+
+#--------------- 2.4.22
+
+ config KERNEL_2_4_22_ben2
+ bool "2.4.22-ben2"
+ depends on KERNEL_2_4_22
+ depends on KERNEL_BEN
+
+ config KERNEL_2_4_22_ben1
+ bool "2.4.22-ben1"
+ depends on KERNEL_2_4_22
+ depends on KERNEL_BEN
+endchoice
+
+comment "---"
+
+config RTAI
+ bool "Realtime Extension: RTAI"
+
+config RTAI_CONFIG
+ string
+ depends on RTAI
+ prompt "Name of config in $PTXDIST/config/rtai to be used"
+ default "rtai-24.1.9-" if RTAI_24_1_9
+ default "rtai-24.1.10-" if RTAI_24_1_10
+ default "rtai-24.1.11-" if RTAI_24_1_11
+ default "rtai-24.1.12-" if RTAI_24_1_12
+ default "rtai-stable-" if RTAI_CVS_stable
+ default "rtai-testing-" if RTAI_CVS_testing
+ default "rtai-unstable-" if RTAI_CVS_unstable
+
+choice
+ prompt "RTAI Version"
+ depends on RTAI
+ default RTAI_24_1_10
+
+ config RTAI_24_1_9
+ bool "24.1.9 "
+
+ config RTAI_24_1_10
+ bool "24.1.10"
+
+ config RTAI_24_1_11
+ bool "24.1.11"
+
+ config RTAI_24_1_12
+ bool "24.1.12"
+
+ config RTAI_CVS_stable
+ bool "CVS stable tree"
+
+ config RTAI_CVS_testing
+ bool "CVS testing tree"
+
+# config RTAI_CVS_unstable
+# bool "CVS unstable tree"
+endchoice
+
+
+config RTAI_CVS_DATE
+ string
+ prompt "Date for CVS checkout (blank for HEAD)"
+ depends on RTAI_CVS_stable || RTAI_CVS_testing || RTAI_CVS_unstable
+
+choice
+ prompt "Select RTAI technology"
+ depends on RTAI
+
+#---------------------------------------------------------------------
+#------------------------------- 24.1.9 ------------------------------
+#---------------------------------------------------------------------
+
+ config RTAI_24_1_9_2_4_18_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_18
+ depends on RTAI_24_1_9
+
+#---------------------------------------------------------------------
+#------------------------------- 24.1.10 -----------------------------
+#---------------------------------------------------------------------
+
+#--------------- 2.4.18
+
+ config RTAI_24_1_10_2_4_18_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_18
+ depends on RTAI_24_1_10
+
+ config RTAI_24_1_10_2_4_18_allsoft
+ bool "allsoft"
+ depends on KERNEL_2_4_18
+ depends on RTAI_24_1_10
+
+#--------------- 2.4.19
+
+ config RTAI_24_1_10_2_4_19_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_19
+ depends on RTAI_24_1_10
+
+ config RTAI_24_1_10_2_4_19_allsoft
+ bool "allsoft"
+ depends on KERNEL_2_4_19
+ depends on RTAI_24_1_10
+
+#---------------------------------------------------------------------
+#------------------------------- 24.1.11 -----------------------------
+#---------------------------------------------------------------------
+
+#--------------- 2.4.18
+
+ config RTAI_24_1_11_2_4_18_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_18
+ depends on RTAI_24_1_11
+
+ config RTAI_24_1_11_2_4_18_allsoft
+ bool "allsoft"
+ depends on KERNEL_2_4_18
+ depends on RTAI_24_1_11
+
+#--------------- 2.4.19
+
+ config RTAI_24_1_11_2_4_19_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_19
+ depends on RTAI_24_1_11
+
+ config RTAI_24_1_11_2_4_19_adeos-r6
+ bool "adeos-r6"
+ depends on KERNEL_2_4_19
+ depends on RTAI_24_1_11
+
+ config RTAI_24_1_11_2_4_19_allsoft
+ bool "allsoft"
+ depends on KERNEL_2_4_19
+ depends on RTAI_24_1_11
+
+#--------------- 2.4.20
+
+ config RTAI_24_1_11_2_4_20_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_20
+ depends on RTAI_24_1_11
+
+ config RTAI_24_1_11_2_4_20_adeos-r6
+ bool "adeos-r6"
+ depends on KERNEL_2_4_20
+ depends on RTAI_24_1_11
+
+#---------------------------------------------------------------------
+#------------------------------- 24.1.12 -----------------------------
+#---------------------------------------------------------------------
+
+#--------------- 2.4.18
+
+ config RTAI_24_1_12_2_4_18_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_18
+ depends on RTAI_24_1_12
+
+ config RTAI_24_1_12_2_4_18_allsoft
+ bool "allsoft"
+ depends on KERNEL_2_4_18
+ depends on RTAI_24_1_12
+
+#--------------- 2.4.19
+
+ config RTAI_24_1_12_2_4_19_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_19
+ depends on RTAI_24_1_12
+
+ config RTAI_24_1_12_2_4_19_adeos-r8
+ bool "adeos-r8"
+ depends on KERNEL_2_4_19
+ depends on RTAI_24_1_12
+
+ config RTAI_24_1_12_2_4_19_allsoft
+ bool "allsoft"
+ depends on KERNEL_2_4_19
+ depends on RTAI_24_1_12
+
+#--------------- 2.4.20
+
+ config RTAI_24_1_12_2_4_20_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_20
+ depends on RTAI_24_1_12
+
+ config RTAI_24_1_12_2_4_20_adeos-r8
+ bool "adeos-r8"
+ depends on KERNEL_2_4_20
+ depends on RTAI_24_1_12
+
+#--------------- 2.4.21
+
+ config RTAI_24_1_12_2_4_21_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_21
+ depends on RTAI_24_1_12
+
+ config RTAI_24_1_12_2_4_21_adeos-r8
+ bool "adeos-r8"
+ depends on KERNEL_2_4_21
+ depends on RTAI_24_1_12
+
+#--------------- 2.4.22
+
+ config RTAI_24_1_12_2_4_22_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_22
+ depends on RTAI_24_1_12
+
+ config RTAI_24_1_12_2_4_22_adeos-r8
+ bool "adeos-r8"
+ depends on KERNEL_2_4_22
+ depends on RTAI_24_1_12
+
+#---------------------------------------------------------------------
+#------------------------------- CVS/stable --------------------------
+#---------------------------------------------------------------------
+
+#--------------- 2.4.18
+
+ config RTAI_CVS_stable_2_4_18_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_18
+ depends on RTAI_CVS_stable
+
+ config RTAI_CVS_stable_2_4_18_allsoft
+ bool "allsoft"
+ depends on KERNEL_2_4_18
+ depends on RTAI_CVS_stable
+
+#--------------- 2.4.19
+
+ config RTAI_CVS_stable_2_4_19_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_19
+ depends on RTAI_CVS_stable
+
+ config RTAI_CVS_stable_2_4_19_adeos-r8
+ bool "adeos-r8"
+ depends on KERNEL_2_4_19
+ depends on RTAI_CVS_stable
+
+ config RTAI_CVS_stable_2_4_19_allsoft
+ bool "allsoft"
+ depends on KERNEL_2_4_19
+ depends on RTAI_CVS_stable
+
+#--------------- 2.4.20
+
+ config RTAI_CVS_stable_2_4_20_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_20
+ depends on RTAI_CVS_stable
+
+ config RTAI_CVS_stable_2_4_20_adeos-r8
+ bool "adeos-r8"
+ depends on KERNEL_2_4_20
+ depends on RTAI_CVS_stable
+
+#--------------- 2.4.21
+
+ config RTAI_CVS_stable_2_4_21_adeos-r8
+ bool "adeos-r8"
+ depends on KERNEL_2_4_21
+ depends on RTAI_CVS_stable
+
+#---------------------------------------------------------------------
+#------------------------------- CVS/testing -------------------------
+#---------------------------------------------------------------------
+
+#--------------- 2.4.18
+
+ config RTAI_CVS_testing_2_4_18_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_18
+ depends on RTAI_CVS_testing
+
+ config RTAI_CVS_testing_2_4_18_allsoft
+ bool "allsoft"
+ depends on KERNEL_2_4_18
+ depends on RTAI_CVS_testing
+
+#--------------- 2.4.19
+
+ config RTAI_CVS_testing_2_4_19_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_19
+ depends on RTAI_CVS_testing
+
+ config RTAI_CVS_testing_2_4_19_adeos-r8
+ bool "adeos-r8"
+ depends on KERNEL_2_4_19
+ depends on RTAI_CVS_testing
+
+ config RTAI_CVS_testing_2_4_19_allsoft
+ bool "allsoft"
+ depends on KERNEL_2_4_19
+ depends on RTAI_CVS_testing
+
+#--------------- 2.4.20
+
+ config RTAI_CVS_testing_2_4_20_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_20
+ depends on RTAI_CVS_testing
+
+ config RTAI_CVS_testing_2_4_20_adeos-r8
+ bool "adeos-r8"
+ depends on KERNEL_2_4_20
+ depends on RTAI_CVS_testing
+
+#--------------- 2.4.21
+
+ config RTAI_CVS_testing_2_4_21_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_21
+ depends on RTAI_CVS_testing
+
+ config RTAI_CVS_testing_2_4_21_adeos-r8
+ bool "adeos-r8"
+ depends on KERNEL_2_4_21
+ depends on RTAI_CVS_testing
+
+#--------------- 2.4.22
+
+ config RTAI_CVS_testing_2_4_22_rthal5g
+ bool "rthal5g"
+ depends on KERNEL_2_4_22
+ depends on RTAI_CVS_testing
+
+ config RTAI_CVS_testing_2_4_21_adeos-r9c2
+ bool "adeos-r9c2"
+ depends on KERNEL_2_4_22
+ depends on RTAI_CVS_testing
+endchoice
+
+comment "---"
+
+config DONT_COMPILE_KERNEL
+ bool
+ prompt "Don't compile kernel"
+ default n
+
+choice
+ prompt "Kernel Image"
+ default KERNEL_IMAGE_BZ
+ depends on !DONT_COMPILE_KERNEL
+
+ config KERNEL_IMAGE_BZ
+ bool
+ prompt "bzImage"
+ depends on ARCH_X86
+
+ config KERNEL_IMAGE_Z
+ bool
+ prompt "zImage"
+ depends on ARCH_X86
+
+ config KERNEL_IMAGE_U
+ bool
+ prompt "uImage"
+ depends on ARCH_ARM
+
+ config KERNEL_IMAGE_VMLINUX
+ bool
+ prompt "vmlinux"
+endchoice
+
+
+config KERNEL_INSTALL
+ bool
+ prompt "Install kernel into /boot on target"
+ default n
+ depends on !DONT_COMPILE_KERNEL
diff --git a/rules/kernel.make b/rules/kernel.make
index c3e8ec9a1..51ce0d5eb 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -1,20 +1,15 @@
# -*-makefile-*-
-# $Id: kernel.make,v 1.9 2003/10/23 08:39:49 robert Exp $
+# $Id: kernel.make,v 1.10 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
-# There are two "groups" of targets here: that ones starting with xchain- are
-# only used for the cross chain. The "normal" targets are used for building the
-# runtime kernel.
-#
-
-#
# We provide this package
#
ifndef PTXCONF_DONT_COMPILE_KERNEL
@@ -22,385 +17,96 @@ PACKAGES += kernel
endif
#
-# Paths and names
+# version stuff in now in rules/Version.make
+# NB: make s*cks
#
-# FIXME: make extraversion configurable and add this into a predefined
-# scheme!
-#
-ifeq (y,$(PTXCONF_KERNEL_2_4_18))
-KERNEL = linux-2.4.18
-KERNEL_URL = ftp://ftp.kernel.org/pub/linux/kernel/v2.4/$(KERNEL).tar.bz2
-KERNEL_SOURCE = $(SRCDIR)/$(KERNEL).tar.bz2
+KERNEL = linux-$(KERNEL_VERSION)
+KERNEL_SUFFIX = tar.bz2
+KERNEL_URL = ftp://ftp.kernel.org/pub/linux/kernel/v$(KERNEL_VERSION_MAJOR).$(KERNEL_VERSION_MINOR)/$(KERNEL).$(KERNEL_SUFFIX)
+KERNEL_SOURCE = $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX)
KERNEL_DIR = $(BUILDDIR)/$(KERNEL)
-KERNEL_EXTRACT = bzip2 -dc
-
-KERNEL_RMKPATCH = patch-2.4.18-rmk7
-KERNEL_RMKPATCH_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/kernel/v2.4/$(KERNEL_RMKPATCH).bz2
-KERNEL_RMKPATCH_SOURCE = $(SRCDIR)/$(KERNEL_RMKPATCH).bz2
-KERNEL_RMKPATCH_EXTRACT = bzip2 -dc
-
-KERNEL_PXAPATCH = diff-2.4.18-rmk7-pxa3
-KERNEL_PXAPATCH_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/people/nico/$(KERNEL_PXAPATCH).gz
-KERNEL_PXAPATCH_SOURCE = $(SRCDIR)/$(KERNEL_PXAPATCH).gz
-KERNEL_PXAPATCH_EXTRACT = gzip -dc
-
-KERNEL_PTXPATCH = patch-2.4.18-rmk7-ptx3
-KERNEL_PTXPATCH_SOURCE = $(SRCDIR)/$(KERNEL_PTXPATCH)
-KERNEL_PTXPATCH_URL = http://www.pengutronix.de/software/dnp/patch-2.4.18-rmk7-ptx3
-KERNEL_PTXPATCH_EXTRACT = cat
-
-ifeq (y, $(PTXCONF_RTAI_ALLSOFT))
-KERNEL_RTAIPATCH = patch-2.4.18-allsoft
-endif
-ifeq (y, $(PTXCONF_RTAI_RTHAL))
-KERNEL_RTAIPATCH = patch-2.4.18-rthal5g
-endif
-KERNEL_RTAIPATCH_DIR = $(BUILDDIR)/rtai-patches
-endif
-
-# -----
-
-ifeq (y,$(PTXCONF_KERNEL_2_4_19))
-KERNEL = linux-2.4.19
-KERNEL_URL = ftp://ftp.rfc822.org/pub/linux/kernel/v2.4/$(KERNEL).tar.bz2
-KERNEL_SOURCE = $(SRCDIR)/$(KERNEL).tar.bz2
-KERNEL_DIR = $(BUILDDIR)/$(KERNEL)
-KERNEL_EXTRACT = bzip2 -dc
-
-KERNEL_RMKPATCH = patch-2.4.19-rmk7
-KERNEL_RMKPATCH_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/kernel/v2.4/$(KERNEL_RMKPATCH).bz2
-KERNEL_RMKPATCH_SOURCE = $(SRCDIR)/$(KERNEL_RMKPATCH).bz2
-KERNEL_RMKPATCH_EXTRACT = bzip2 -dc
-
-KERNEL_PXAPATCH = diff-2.4.19-rmk7-pxa2
-KERNEL_PXAPATCH_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/people/nico/$(KERNEL_PXAPATCH).gz
-KERNEL_PXAPATCH_SOURCE = $(SRCDIR)/$(KERNEL_PXAPATCH).gz
-KERNEL_PXAPATCH_EXTRACT = gzip -dc
-
-KERNEL_MTDPATCH = linux-2.4.19-rmk7-pxa2-mtd20030728.diff
-KERNEL_MTDPATCH_SOURCE = $(SRCDIR)/$(KERNEL_MTDPATCH).bz2
-KERNEL_MTDPATCH_URL = http://www.pengutronix.de/software/linux-arm/$(KERNEL_MTDPATCH).bz2
-KERNEL_MTDPATCH_DIR = $(BUILDDIR)/$(KERNEL)
-KERNEL_MTDPATCH_EXTRACT = bzip2 -cd
-
-KERNEL_PTXPATCH = linux-2.4.19-rmk7-pxa2-ptx10.diff
-KERNEL_PTXPATCH_SOURCE = $(SRCDIR)/$(KERNEL_PTXPATCH)
-KERNEL_PTXPATCH_URL = http://www.pengutronix.de/software/linux-arm/$(KERNEL_PTXPATCH)
-KERNEL_PTXPATCH_EXTRACT = cat
-
-KERNEL_LTTPATCH = linux-2.4.19-rmk7-pxa2-ptx10-ltt1.diff
-KERNEL_LTTPATCH_SOURCE = $(SRCDIR)/$(KERNEL_LTTPATCH)
-KERNEL_LTTPATCH_URL = http://www.pengutronix.de/software/ltt/$(KERNEL_LTTPATCH)
-KERNEL_LTTPATCH_EXTRACT = cat
-
-ifeq (y, $(PTXCONF_RTAI_ALLSOFT))
-KERNEL_RTAIPATCH = patch-2.4.19-allsoft
-endif
-ifeq (y, $(PTXCONF_RTAI_RTHAL))
-KERNEL_RTAIPATCH = patch-2.4.19-rthal5g
-endif
-KERNEL_RTAIPATCH_DIR = $(BUILDDIR)/rtai-patches
-endif
-
-# -----
-
-ifeq (y,$(PTXCONF_KERNEL_2_4_20))
-KERNEL = linux-2.4.20
-KERNEL_URL = ftp://ftp.rfc822.org/pub/linux/kernel/v2.4/$(KERNEL).tar.bz2
-KERNEL_SOURCE = $(SRCDIR)/$(KERNEL).tar.bz2
-KERNEL_DIR = $(BUILDDIR)/$(KERNEL)
-KERNEL_EXTRACT = bzip2 -dc
-
-#FIXME: find right patch // not yet available
-KERNEL_RMKPATCH = patch-2.4.19-rmk4
-KERNEL_RMKPATCH_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/kernel/v2.4/$(KERNEL_RMKPATCH).bz2
-KERNEL_RMKPATCH_SOURCE = $(SRCDIR)/$(KERNEL_RMKPATCH).bz2
-KERNEL_RMKPATCH_EXTRACT = bzip2 -dc
-
-#FIXME: find right patch // not yet available
-KERNEL_PXAPATCH = diff-2.4.19-rmk4-pxa1
-KERNEL_PXAPATCH_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/people/nico/$(KERNEL_PXAPATCH).gz
-KERNEL_PXAPATCH_SOURCE = $(SRCDIR22)/$(KERNEL_PXAPATCH).gz
-KERNEL_PXAPATCH_EXTRACT = gzip -dc
-
-#FIXME: find right patch // not yet available
-KERNEL_PTXPATCH = linux-2.4.19-rmk4-pxa1-ptx10.diff
-KERNEL_PTXPATCH_SOURCE = $(SRCDIR)/$(KERNEL_PTXPATCH)
-KERNEL_PTXPATCH_URL = http://www.pengutronix.de/software/linux-arm/$(KERNEL_PTXPATCH)
-KERNEL_PTXPATCH_EXTRACT = cat
-
-ifeq (y, $(PTXCONF_RTAI_ALLSOFT))
-KERNEL_RTAIPATCH = patch-2.4.20-allsoft
-endif
-ifeq (y, $(PTXCONF_RTAI_RTHAL))
-KERNEL_RTAIPATCH = patch-2.4.20-rthal5g
-endif
-KERNEL_RTAIPATCH_DIR = $(BUILDDIR)/rtai-patches
-endif
+KERNEL_PATCHES += $(call get_option_ext, s/^PTXCONF_KERNEL_[0-9]_[0-9]_[0-9]*_\(.*\)=y/\1/, sed -e 's/_/ /g' -e 's/[0-9]//g' )
-# -----
-
-ifeq (y,$(PTXCONF_KERNEL_2_4_21))
-KERNEL = linux-2.4.21
-KERNEL_URL = ftp://ftp.rfc822.org/pub/linux/kernel/v2.4/$(KERNEL).tar.bz2
-KERNEL_SOURCE = $(SRCDIR)/$(KERNEL).tar.bz2
-KERNEL_DIR = $(BUILDDIR)/$(KERNEL)
-KERNEL_EXTRACT = bzip2 -dc
-
-#FIXME: find right patch // not yet available
-KERNEL_RMKPATCH = patch-2.4.19-rmk4
-KERNEL_RMKPATCH_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/kernel/v2.4/$(KERNEL_RMKPATCH).bz2
-KERNEL_RMKPATCH_SOURCE = $(SRCDIR)/$(KERNEL_RMKPATCH).bz2
-KERNEL_RMKPATCH_EXTRACT = bzip2 -dc
-
-#FIXME: find right patch // not yet available
-KERNEL_PXAPATCH = diff-2.4.19-rmk4-pxa1
-KERNEL_PXAPATCH_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/people/nico/$(KERNEL_PXAPATCH).gz
-KERNEL_PXAPATCH_SOURCE = $(SRCDIR)/$(KERNEL_PXAPATCH).gz
-KERNEL_PXAPATCH_EXTRACT = gzip -dc
-
-#FIXME: find right patch // not yet available
-KERNEL_PTXPATCH = linux-2.4.19-rmk4-pxa1-ptx10.diff
-KERNEL_PTXPATCH_SOURCE = $(SRCDIR)/$(KERNEL_PTXPATCH)
-KERNEL_PTXPATCH_URL = http://www.pengutronix.de/software/linux-arm/$(KERNEL_PTXPATCH)
-KERNEL_PTXPATCH_EXTRACT = cat
-
-KERNEL_UCLINUXPATCH = uClinux-2.4.21-uc0.diff.gz
-KERNEL_UCLINUXPATCH_SOURCE = $(SRCDIR)/$(KERNEL_UCLINUXPATCH)
-KERNEL_UCLINUXPATCH_URL = http://www.uclinux.org/pub/uClinux/uClinux-2.4.x/$(KERNEL_UCLINUXPATCH)
-KERNEL_UCLINUXPATCH_EXTRACT = zcat
-
-ifeq (y, $(PTXCONF_RTAI_ALLSOFT))
-KERNEL_RTAIPATCH = patch-2.4.21-allsoft
-endif
-ifeq (y, $(PTXCONF_RTAI_RTHAL))
-KERNEL_RTAIPATCH = patch-2.4.21-rthal5g
-endif
-KERNEL_RTAIPATCH_DIR = $(BUILDDIR)/rtai-patches
-endif
-
-# -----
-
-ifeq (y,$(PTXCONF_KERNEL_2_4_22))
-KERNEL = linux-2.4.22
-KERNEL_URL = ftp://ftp.rfc822.org/pub/linux/kernel/v2.4/$(KERNEL).tar.bz2
-KERNEL_SOURCE = $(SRCDIR)/$(KERNEL).tar.bz2
-KERNEL_DIR = $(BUILDDIR)/$(KERNEL)
-KERNEL_EXTRACT = bzip2 -dc
-
-#FIXME: find right patch // not yet available
-KERNEL_RMKPATCH = patch-2.4.19-rmk4
-KERNEL_RMKPATCH_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/kernel/v2.4/$(KERNEL_RMKPATCH).bz2
-KERNEL_RMKPATCH_SOURCE = $(SRCDIR)/$(KERNEL_RMKPATCH).bz2
-KERNEL_RMKPATCH_EXTRACT = bzip2 -dc
-
-#FIXME: find right patch // not yet available
-KERNEL_PXAPATCH = diff-2.4.19-rmk4-pxa1
-KERNEL_PXAPATCH_URL = ftp://ftp.arm.linux.org.uk/pub/armlinux/people/nico/$(KERNEL_PXAPATCH).gz
-KERNEL_PXAPATCH_SOURCE = $(SRCDIR)/$(KERNEL_PXAPATCH).gz
-KERNEL_PXAPATCH_EXTRACT = gzip -dc
-
-#FIXME: find right patch // not yet available
-KERNEL_PTXPATCH = linux-2.4.19-rmk4-pxa1-ptx10.diff
-KERNEL_PTXPATCH_SOURCE = $(SRCDIR)/$(KERNEL_PTXPATCH)
-KERNEL_PTXPATCH_URL = http://www.pengutronix.de/software/linux-arm/$(KERNEL_PTXPATCH)
-KERNEL_PTXPATCH_EXTRACT = cat
-
-#FIXME: find right patch // not yet available
-KERNEL_UCLINUXPATCH = uClinux-2.4.21-uc0.diff.gz
-KERNEL_UCLINUXPATCH_SOURCE = $(SRCDIR)/$(KERNEL_UCLINUXPATCH)
-KERNEL_UCLINUXPATCH_URL = http://www.uclinux.org/pub/uClinux/uClinux-2.4.x/$(KERNEL_UCLINUXPATCH)
-KERNEL_UCLINUXPATCH_EXTRACT = zcat
-
-ifeq (y, $(PTXCONF_RTAI_ALLSOFT))
-KERNEL_RTAIPATCH = patch-2.4.22-allsoft
-endif
-ifeq (y, $(PTXCONF_RTAI_RTHAL))
-KERNEL_RTAIPATCH = patch-2.4.22-rthal5g
-endif
-KERNEL_RTAIPATCH_DIR = $(BUILDDIR)/rtai-patches
-endif
-
-# -----
-
-ifeq (y, $(PTXCONF_KERNEL_IMAGE_Z))
+ifdef PTXCONF_KERNEL_IMAGE_Z
KERNEL_TARGET = zImage
KERNEL_TARGET_PATH = $(KERNEL_DIR)/arch/$(PTXCONF_ARCH)/boot/zImage
endif
-ifeq (y, $(PTXCONF_KERNEL_IMAGE_BZ))
+ifdef PTXCONF_KERNEL_IMAGE_BZ
KERNEL_TARGET = bzImage
KERNEL_TARGET_PATH = $(KERNEL_DIR)/arch/$(PTXCONF_ARCH)/boot/bzImage
endif
-ifeq (y, $(PTXCONF_KERNEL_IMAGE_U))
+ifdef PTXCONF_KERNEL_IMAGE_U
KERNEL_TARGET = uImage
KERNEL_TARGET_PATH = $(KERNEL_DIR)/uImage
endif
-ifeq (y, $(PTXCONF_KERNEL_IMAGE_VMLINUX))
+ifdef PTXCONF_KERNEL_IMAGE_VMLINUX
KERNEL_TARGET = vmlinux
KERNEL_TARGET_PATH = $(KERNEL_DIR)/vmlinux
endif
# ----------------------------------------------------------------------------
-# Get
+# Menuconfig
# ----------------------------------------------------------------------------
-kernel_get: $(STATEDIR)/kernel.get
-
-kernel_get_deps = $(KERNEL_SOURCE)
-
-ifdef PTXCONF_ARCH_NOMMU
-kernel_get_deps += $(KERNEL_UCLINUXPATCH_SOURCE)
-endif
-ifdef PTXCONF_ARCH_ARM
-kernel_get_deps += $(KERNEL_RMKPATCH_SOURCE)
-endif
-ifdef PTXCONF_KERNEL_XSCALE
-kernel_get_deps += $(KERNEL_PXAPATCH_SOURCE)
-endif
-ifdef PTXCONF_KERNEL_XSCALE_PTX
-kernel_get_deps += $(KERNEL_MTDPATCH_SOURCE)
-kernel_get_deps += $(KERNEL_PTXPATCH_SOURCE)
-endif
-ifdef PTXCONF_LTT
-kernel_get_deps += $(KERNEL_LTTPATCH_SOURCE)
-endif
-
-$(STATEDIR)/kernel.get: $(kernel_get_deps)
- @$(call targetinfo, kernel.get)
- touch $@
-
-$(KERNEL_SOURCE):
- @$(call targetinfo, $(KERNEL_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(KERNEL_URL)
-
-$(KERNEL_RMKPATCH_SOURCE):
- @$(call targetinfo, $(KERNEL_RMKPATCH_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(KERNEL_RMKPATCH_URL)
+kernel_menuconfig: $(STATEDIR)/kernel.extract
+ @if [ -f $(TOPDIR)/config/kernel/$(PTXCONF_KERNEL_CONFIG) ]; then \
+ install -m 644 $(TOPDIR)/config/kernel/$(PTXCONF_KERNEL_CONFIG) \
+ $(KERNEL_DIR)/.config; \
+ fi
-$(KERNEL_PXAPATCH_SOURCE):
- @$(call targetinfo, $(KERNEL_PXAPATCH_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(KERNEL_PXAPATCH_URL)
+ $(KERNEL_PATH) make -C $(KERNEL_DIR) $(KERNEL_MAKEVARS) \
+ menuconfig
-$(KERNEL_MTDPATCH_SOURCE):
- @$(call targetinfo, $(KERNEL_MTDPATCH_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(KERNEL_MTDPATCH_URL)
+ @if [ -f $(KERNEL_DIR)/.config ]; then \
+ install -m 644 $(KERNEL_DIR)/.config \
+ $(TOPDIR)/config/kernel/$(PTXCONF_KERNEL_CONFIG); \
+ fi
-$(KERNEL_PTXPATCH_SOURCE):
- @$(call targetinfo, $(KERNEL_PTXPATCH_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(KERNEL_PTXPATCH_URL)
+ @if [ -f $(STATEDIR)/kernel.compile ]; then \
+ rm $(STATEDIR)/kernel.compile; \
+ fi
-$(KERNEL_LTTPATCH_SOURCE):
- @$(call targetinfo, $(KERNEL_LTTPATCH_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(KERNEL_LTTPATCH_URL)
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
-$(KERNEL_UCLINUXPATCH_SOURCE):
- @$(call targetinfo, $(KERNEL_UCLINUXPATCH_SOURCE))
- @$(call get, $(KERNEL_UCLINUXPATCH_URL)
+kernel_get: $(STATEDIR)/kernel.get
-#
-# RTAI patches are included in the normal RTAI packet
-#
-rtai-patches_get: $(STATEDIR)/rtai-patches.get
+kernel_get_deps = \
+ $(KERNEL_SOURCE)
-$(STATEDIR)/rtai-patches.get: $(STATEDIR)/rtai.get
- @$(call targetinfo, rtai-patches.get)
+$(STATEDIR)/kernel.get: $(kernel_get_deps)
+ @$(call targetinfo, $@)
touch $@
+$(KERNEL_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(KERNEL_URL))
+
# ----------------------------------------------------------------------------
# Extract
# ----------------------------------------------------------------------------
kernel_extract: $(STATEDIR)/kernel.extract
-kernel_extract_deps = $(STATEDIR)/kernel.get
-ifeq (y, $(PTXCONF_RTAI))
-kernel_extract_deps += $(STATEDIR)/rtai-patches.extract
-endif
-ifeq (y, $(PTXCONF_KERNEL_MTD))
-kernel_extract_deps += $(STATEDIR)/mtd.extract
-endif
+kernel_extract_deps = \
+ $(STATEDIR)/kernel-base.extract \
+ $(addprefix $(STATEDIR)/kernel-, $(addsuffix .install, $(KERNEL_PATCHES)))
$(STATEDIR)/kernel.extract: $(kernel_extract_deps)
- @$(call targetinfo, kernel.extract)
- @$(call clean, $(KERNEL_DIR))
- @$(call extract, $(KERNEL_SOURCE))
-# #
-# # kernels before 2.4.19 extract to "linux" instead of "linux-version"
-# #
- ifeq (y,$(PTXCONF_KERNEL_2_4_18))
- cd $(BUILDDIR) && mv linux $(KERNEL_DIR)
- endif
-# #
-# # ARM patch
-# #
- ifeq (y,$(PTXCONF_ARCH_ARM))
- cd $(KERNEL_DIR) && \
- $(KERNEL_RMKPATCH_EXTRACT) $(KERNEL_RMKPATCH_SOURCE) | \
- patch -p1
- endif
-# #
-# # XSCALE patch
-# #
- ifeq (y, $(PTXCONF_KERNEL_XSCALE))
- cd $(KERNEL_DIR) && \
- $(KERNEL_PXAPATCH_EXTRACT) $(KERNEL_PXAPATCH_SOURCE) | \
- patch -p1
- endif
-# #
-# # MTD patch
-# #
- ifeq (y, $(PTXCONF_KERNEL_MTD))
- cd $(KERNEL_DIR) && \
- $(KERNEL_MTDPATCH_EXTRACT) $(KERNEL_MTDPATCH_SOURCE) | \
- patch -p1
- endif
-# #
-# # XSCALE_PTX patch
-# #
- ifeq (y, $(PTXCONF_KERNEL_XSCALE_PTX))
- cd $(KERNEL_DIR) && \
- $(KERNEL_PTXPATCH_EXTRACT) $(KERNEL_PTXPATCH_SOURCE) | \
- patch -p1
- endif
-# #
-# # patch for mmu-less architectures
-# #
- ifdef PTXCONF_ARCH_NOMMU
- cd $(KERNEL_DIR) && \
- $(KERNEL_UCLINUXPATCH_EXTRACT) $(KERNEL_UCLINUXPATCH_SOURCE) | \
- patch -p1 || true
- endif
-# #
-# # patches for all architectures
-# #
- ifeq (y, $(PTXCONF_RTAI))
- cd $(KERNEL_DIR) && \
- patch -p1 < $(KERNEL_RTAIPATCH_DIR)/$(RTAI)/patches/$(KERNEL_RTAIPATCH)
- endif
-# #
-# # LTT patch
-# #
- ifeq (y, $(PTXCONF_LTT))
- cd $(KERNEL_DIR) && \
- $(KERNEL_LTTPATCH_EXTRACT) $(KERNEL_LTTPATCH_SOURCE) | \
- patch -p1
- endif
+ @$(call targetinfo, $@)
touch $@
+$(STATEDIR)/kernel-base.extract: $(STATEDIR)/kernel.get
+ @$(call targetinfo, $@)
+ @$(call clean, $(KERNEL_DIR))
+ @$(call extract, $(KERNEL_SOURCE))
#
-# RTAI patch
+# kernels before 2.4.19 extract to "linux" instead of "linux-<version>"
#
-
-rtai-patches_extract: $(STATEDIR)/rtai-patches.extract
-
-$(STATEDIR)/rtai-patches.extract: $(STATEDIR)/rtai-patches.get
- @$(call targetinfo, rtai-patches.extract)
-# # remove old rtaipatch directory
- rm -fr $(KERNEL_RTAIPATCH_DIR)
- install -d $(KERNEL_RTAIPATCH_DIR)
-# # extract only the patches directory
- cd $(KERNEL_RTAIPATCH_DIR) && \
- tar zxvf $(RTAI_SOURCE) $(RTAI)/patches
+ifeq (2.4.18,$(KERNEL_VERSION))
+ mv $(BUILDDIR)/linux $(KERNEL_DIR)
+endif
touch $@
# ----------------------------------------------------------------------------
@@ -409,23 +115,22 @@ $(STATEDIR)/rtai-patches.extract: $(STATEDIR)/rtai-patches.get
kernel_prepare: $(STATEDIR)/kernel.prepare
-kernel_prepare_deps = $(STATEDIR)/kernel.extract
-kernel_prepare_deps += $(STATEDIR)/virtual-xchain.install
-ifdef PTXCONF_RTAI
-kernel_prepare_deps += $(STATEDIR)/rtai-patches.extract
-endif
+kernel_prepare_deps = \
+ $(STATEDIR)/kernel.extract \
+ $(STATEDIR)/virtual-xchain.install
KERNEL_PATH = PATH=$(CROSS_PATH)
KERNEL_MAKEVARS = ARCH=$(PTXCONF_ARCH) CROSS_COMPILE=$(PTXCONF_GNU_TARGET)- HOSTCC=$(HOSTCC)
$(STATEDIR)/kernel.prepare: $(kernel_prepare_deps)
- @$(call targetinfo, kernel.prepare)
+ @$(call targetinfo, $@)
- test -f $(TOPDIR)/config/kernel/$(PTXCONF_KERNEL_CONFIG) && \
+ if [ -f $(TOPDIR)/config/kernel/$(PTXCONF_KERNEL_CONFIG) ]; then \
install -m 644 $(TOPDIR)/config/kernel/$(PTXCONF_KERNEL_CONFIG) \
- $(KERNEL_DIR)/.config
+ $(KERNEL_DIR)/.config; \
+ fi
- $(KERNEL_PATH) make -C $(KERNEL_DIR) $(KERNEL_MAKEVARS) \
+ yes no | $(KERNEL_PATH) make -C $(KERNEL_DIR) $(KERNEL_MAKEVARS) \
oldconfig
$(KERNEL_PATH) make -C $(KERNEL_DIR) $(KERNEL_MAKEVARS) \
dep
@@ -444,7 +149,7 @@ kernel_compile_deps += $(STATEDIR)/umkimage.install
endif
$(STATEDIR)/kernel.compile: $(kernel_compile_deps)
- @$(call targetinfo, kernel.compile)
+ @$(call targetinfo, $@)
$(KERNEL_PATH) make -C $(KERNEL_DIR) $(KERNEL_MAKEVARS) \
$(KERNEL_TARGET) modules
touch $@
@@ -455,8 +160,8 @@ $(STATEDIR)/kernel.compile: $(kernel_compile_deps)
kernel_install: $(STATEDIR)/kernel.install
-$(STATEDIR)/kernel.install: $(STATEDIR)/kernel.compile
- @$(call targetinfo, kernel.install)
+$(STATEDIR)/kernel.install:
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -465,37 +170,21 @@ $(STATEDIR)/kernel.install: $(STATEDIR)/kernel.compile
kernel_targetinstall: $(STATEDIR)/kernel.targetinstall
-$(STATEDIR)/kernel.targetinstall: $(STATEDIR)/kernel.install
- @$(call targetinfo, kernel.targetinstall)
- ifeq (y,$(PTXCONF_KERNEL_INSTALL))
+$(STATEDIR)/kernel.targetinstall: $(STATEDIR)/kernel.compile
+ @$(call targetinfo, $@)
+ifdef PTXCONF_KERNEL_INSTALL
mkdir -p $(ROOTDIR)/boot
install $(KERNEL_TARGET_PATH) $(ROOTDIR)/boot
- -$(KERNEL_PATH) make -C $(KERNEL_DIR) $(KERNEL_MAKEVARS) \
+ $(KERNEL_PATH) make -C $(KERNEL_DIR) $(KERNEL_MAKEVARS) \
modules_install INSTALL_MOD_PATH=$(ROOTDIR)
- endif # PTXCONF_KERNEL_INSTALL
+endif
touch $@
# ----------------------------------------------------------------------------
# Clean
# ----------------------------------------------------------------------------
-kernel_clean: rtai-patches_clean
+kernel_clean:
rm -rf $(STATEDIR)/kernel.* $(KERNEL_DIR)
-rtai-patches_clean:
- rm -rf $(STATEDIR)/rtai-patches.* $(KERNEL_RTAIPATCH_DIR)
-
-kernel_menuconfig: $(STATEDIR)/kernel.extract
- if test -f $(TOPDIR)/config/kernel/$(PTXCONF_KERNEL_CONFIG) ; then \
- install -m 644 $(TOPDIR)/config/kernel/$(PTXCONF_KERNEL_CONFIG) \
- $(KERNEL_DIR)/.config ; \
- fi
-
- $(KERNEL_PATH) make -C $(KERNEL_DIR) $(KERNEL_MAKEVARS) \
- menuconfig
-
- install -m 644 $(KERNEL_DIR)/.config \
- $(TOPDIR)/config/kernel/$(PTXCONF_KERNEL_CONFIG) ; \
- [ -f $(STATEDIR)/kernel.compile ] && rm $(STATEDIR)/kernel.compile
-
# vim: syntax=make
diff --git a/rules/konq-e.make b/rules/konq-e.make
index 3566ad07e..17ec22282 100644
--- a/rules/konq-e.make
+++ b/rules/konq-e.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: konq-e.make,v 1.1 2003/08/26 13:20:12 robert Exp $
+# $Id: konq-e.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,11 +35,11 @@ konq-e_get: $(STATEDIR)/konq-e.get
konq-e_get_deps = $(KONQ-E_SOURCE)
$(STATEDIR)/konq-e.get: $(konq-e_get_deps)
- @$(call targetinfo, konq-e.get)
+ @$(call targetinfo, $@)
touch $@
$(KONQ-E_SOURCE):
- @$(call targetinfo, $(KONQ-E_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(KONQ-E_URL))
# ----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ konq-e_extract: $(STATEDIR)/konq-e.extract
konq-e_extract_deps = $(STATEDIR)/konq-e.get
$(STATEDIR)/konq-e.extract: $(konq-e_extract_deps)
- @$(call targetinfo, konq-e.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(KONQ-E_DIR))
@$(call extract, $(KONQ-E_SOURCE))
touch $@
@@ -67,7 +67,7 @@ konq-e_prepare: $(STATEDIR)/konq-e.prepare
#
konq-e_prepare_deps = \
$(STATEDIR)/konq-e.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
KONQ-E_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
KONQ-E_ENV = $(CROSS_ENV)
@@ -84,7 +84,7 @@ KONQ-E_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
#KONQ-E_AUTOCONF +=
$(STATEDIR)/konq-e.prepare: $(konq-e_prepare_deps)
- @$(call targetinfo, konq-e.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(KONQ-E_BUILDDIR))
cd $(KONQ-E_DIR) && \
$(KONQ-E_PATH) $(KONQ-E_ENV) \
@@ -100,7 +100,7 @@ konq-e_compile: $(STATEDIR)/konq-e.compile
konq-e_compile_deps = $(STATEDIR)/konq-e.prepare
$(STATEDIR)/konq-e.compile: $(konq-e_compile_deps)
- @$(call targetinfo, konq-e.compile)
+ @$(call targetinfo, $@)
$(KONQ-E_PATH) $(KONQ-E_ENV) make -C $(KONQ-E_DIR)
touch $@
@@ -111,7 +111,7 @@ $(STATEDIR)/konq-e.compile: $(konq-e_compile_deps)
konq-e_install: $(STATEDIR)/konq-e.install
$(STATEDIR)/konq-e.install: $(STATEDIR)/konq-e.compile
- @$(call targetinfo, konq-e.install)
+ @$(call targetinfo, $@)
$(KONQ-E_PATH) $(KONQ-E_ENV) make -C $(KONQ-E_DIR) install
touch $@
@@ -124,7 +124,7 @@ konq-e_targetinstall: $(STATEDIR)/konq-e.targetinstall
konq-e_targetinstall_deps = $(STATEDIR)/konq-e.compile
$(STATEDIR)/konq-e.targetinstall: $(konq-e_targetinstall_deps)
- @$(call targetinfo, konq-e.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/libIDL068.make b/rules/libIDL068.make
index 7adc9fa1f..6688b16a0 100644
--- a/rules/libIDL068.make
+++ b/rules/libIDL068.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: libIDL068.make,v 1.1 2003/08/19 12:04:27 robert Exp $
+# $Id: libIDL068.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-# Pengutronix <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ libidl068_get: $(STATEDIR)/libidl068.get
libidl068_get_deps = $(LIBIDL068_SOURCE)
$(STATEDIR)/libidl068.get: $(libidl068_get_deps)
- @$(call targetinfo, libidl068.get)
+ @$(call targetinfo, $@)
touch $@
$(LIBIDL068_SOURCE):
- @$(call targetinfo, $(LIBIDL068_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(LIBIDL068_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ libidl068_extract: $(STATEDIR)/libidl068.extract
libidl068_extract_deps = $(STATEDIR)/libidl068.get
$(STATEDIR)/libidl068.extract: $(libidl068_extract_deps)
- @$(call targetinfo, libidl068.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(LIBIDL068_DIR))
@$(call extract, $(LIBIDL068_SOURCE))
touch $@
@@ -68,7 +68,7 @@ libidl068_prepare: $(STATEDIR)/libidl068.prepare
#
libidl068_prepare_deps = \
$(STATEDIR)/libidl068.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
LIBIDL068_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
LIBIDL068_ENV = $(CROSS_ENV)
@@ -87,7 +87,7 @@ LIBIDL068_AUTOCONF += --enable-foo
endif
$(STATEDIR)/libidl068.prepare: $(libidl068_prepare_deps)
- @$(call targetinfo, libidl068.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(LIBIDL068_BUILDDIR))
cd $(LIBIDL068_DIR) && \
$(LIBIDL068_PATH) $(LIBIDL068_ENV) \
@@ -103,10 +103,10 @@ libidl068_compile: $(STATEDIR)/libidl068.compile
libidl068_compile_deps = $(STATEDIR)/libidl068.prepare
$(STATEDIR)/libidl068.compile: $(libidl068_compile_deps)
- @$(call targetinfo, libidl068.compile)
-
+ @$(call targetinfo, $@)
+
$(LIBIDL068_PATH) $(LIBIDL068_ENV) make -C $(LIBIDL068_DIR)
-
+
touch $@
# ----------------------------------------------------------------------------
@@ -116,7 +116,7 @@ $(STATEDIR)/libidl068.compile: $(libidl068_compile_deps)
libidl068_install: $(STATEDIR)/libidl068.install
$(STATEDIR)/libidl068.install: $(STATEDIR)/libidl068.compile
- @$(call targetinfo, libidl068.install)
+ @$(call targetinfo, $@)
$(LIBIDL068_PATH) $(LIBIDL068_ENV) make -C $(LIBIDL068_DIR) install
@@ -131,7 +131,7 @@ libidl068_targetinstall: $(STATEDIR)/libidl068.targetinstall
libidl068_targetinstall_deps = $(STATEDIR)/libidl068.compile
$(STATEDIR)/libidl068.targetinstall: $(libidl068_targetinstall_deps)
- @$(call targetinfo, libidl068.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/libc.in b/rules/libc.in
index 7d04c8421..925f8f056 100644
--- a/rules/libc.in
+++ b/rules/libc.in
@@ -20,6 +20,13 @@ choice
prompt "C-Lib Version"
default GLIBC_2_2_5
+ config GLIBC_2_3_2
+ bool
+ prompt "2.3.2"
+ depends on GLIBC
+ depends on GCC_3_2_3 || GCC_3_3_1
+ depends on EXP
+
config GLIBC_2_2_5
bool
prompt "2.2.5"
diff --git a/rules/libgd.make b/rules/libgd.make
index 81606ccd0..0b2a84cb5 100644
--- a/rules/libgd.make
+++ b/rules/libgd.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: libgd.make,v 1.1 2003/08/22 19:44:28 bsp Exp $
+# $Id: libgd.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
+# Copyright (C) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,11 +35,11 @@ libgd_get: $(STATEDIR)/libgd.get
libgd_get_deps = $(LIBGD_SOURCE)
$(STATEDIR)/libgd.get: $(libgd_get_deps)
- @$(call targetinfo, libgd.get)
+ @$(call targetinfo, $@)
touch $@
$(LIBGD_SOURCE):
- @$(call targetinfo, $(LIBGD_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(LIBGD_URL))
# ----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ libgd_extract: $(STATEDIR)/libgd.extract
libgd_extract_deps = $(STATEDIR)/libgd.get
$(STATEDIR)/libgd.extract: $(libgd_extract_deps)
- @$(call targetinfo, libgd.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(LIBGD_DIR))
@$(call extract, $(LIBGD_SOURCE))
touch $@
@@ -67,7 +67,7 @@ libgd_prepare: $(STATEDIR)/libgd.prepare
#
libgd_prepare_deps = \
$(STATEDIR)/libgd.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
LIBGD_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
LIBGD_ENV = $(CROSS_ENV)
@@ -84,7 +84,7 @@ LIBGD_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
#LIBGD_AUTOCONF +=
$(STATEDIR)/libgd.prepare: $(libgd_prepare_deps)
- @$(call targetinfo, libgd.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(LIBGD_BUILDDIR))
cd $(LIBGD_DIR) && \
$(LIBGD_PATH) $(LIBGD_ENV) \
@@ -100,7 +100,7 @@ libgd_compile: $(STATEDIR)/libgd.compile
libgd_compile_deps = $(STATEDIR)/libgd.prepare
$(STATEDIR)/libgd.compile: $(libgd_compile_deps)
- @$(call targetinfo, libgd.compile)
+ @$(call targetinfo, $@)
$(LIBGD_PATH) $(LIBGD_ENV) make -C $(LIBGD_DIR)
touch $@
@@ -111,7 +111,7 @@ $(STATEDIR)/libgd.compile: $(libgd_compile_deps)
libgd_install: $(STATEDIR)/libgd.install
$(STATEDIR)/libgd.install: $(STATEDIR)/libgd.compile
- @$(call targetinfo, libgd.install)
+ @$(call targetinfo, $@)
$(LIBGD_PATH) $(LIBGD_ENV) make -C $(LIBGD_DIR) install
touch $@
@@ -124,7 +124,7 @@ libgd_targetinstall: $(STATEDIR)/libgd.targetinstall
libgd_targetinstall_deps = $(STATEDIR)/libgd.compile
$(STATEDIR)/libgd.targetinstall: $(libgd_targetinstall_deps)
- @$(call targetinfo, libgd.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/libnet.make b/rules/libnet.make
index daa0274d4..30af363dc 100644
--- a/rules/libnet.make
+++ b/rules/libnet.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: libnet.make,v 1.6 2003/09/16 16:41:22 mkl Exp $
+# $Id: libnet.make,v 1.7 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,12 +35,12 @@ libnet_get: $(STATEDIR)/libnet.get
libnet_get_deps = $(LIBNET_SOURCE)
$(STATEDIR)/libnet.get: $(libnet_get_deps)
- @$(call targetinfo, libnet.get)
+ @$(call targetinfo, $@)
@$(call get_patches, $(LIBNET))
touch $@
$(LIBNET_SOURCE):
- @$(call targetinfo, $(LIBNET_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(LIBNET_URL))
# ----------------------------------------------------------------------------
@@ -51,10 +51,11 @@ libnet_extract: $(STATEDIR)/libnet.extract
libnet_extract_deps = \
$(STATEDIR)/automake15.install \
+ $(STATEDIR)/autoconf257.install \
$(STATEDIR)/libnet.get
$(STATEDIR)/libnet.extract: $(libnet_extract_deps)
- @$(call targetinfo, libnet.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(LIBNET_DIR))
@$(call extract, $(LIBNET_SOURCE))
@$(call patchin, $(LIBNET), $(LIBNET_DIR))
@@ -90,7 +91,7 @@ LIBNET_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
LIBNET_AUTOCONF += --with-pf_packet=yes
$(STATEDIR)/libnet.prepare: $(libnet_prepare_deps)
- @$(call targetinfo, libnet.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(LIBNET_BUILDDIR))
cd $(LIBNET_DIR) && \
$(LIBNET_PATH) $(LIBNET_ENV) \
@@ -106,7 +107,7 @@ libnet_compile: $(STATEDIR)/libnet.compile
libnet_compile_deps = $(STATEDIR)/libnet.prepare
$(STATEDIR)/libnet.compile: $(libnet_compile_deps)
- @$(call targetinfo, libnet.compile)
+ @$(call targetinfo, $@)
$(LIBNET_PATH) $(LIBNET_ENV) make -C $(LIBNET_DIR)
touch $@
@@ -117,7 +118,7 @@ $(STATEDIR)/libnet.compile: $(libnet_compile_deps)
libnet_install: $(STATEDIR)/libnet.install
$(STATEDIR)/libnet.install: $(STATEDIR)/libnet.compile
- @$(call targetinfo, libnet.install)
+ @$(call targetinfo, $@)
$(LIBNET_PATH) $(LIBNET_ENV) make -C $(LIBNET_DIR) install
touch $@
@@ -130,7 +131,7 @@ libnet_targetinstall: $(STATEDIR)/libnet.targetinstall
libnet_targetinstall_deps = $(STATEDIR)/libnet.install
$(STATEDIR)/libnet.targetinstall: $(libnet_targetinstall_deps)
- @$(call targetinfo, libnet.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/liboop.make b/rules/liboop.make
index e7f729927..ba96e4c31 100644
--- a/rules/liboop.make
+++ b/rules/liboop.make
@@ -1,10 +1,11 @@
# -*-makefile-*-
-# $Id: liboop.make,v 1.4 2003/07/16 04:23:28 mkl Exp $
+# $Id: liboop.make,v 1.5 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -31,11 +32,11 @@ LIBOOP_EXTRACT = gzip -dc
liboop_get: $(STATEDIR)/liboop.get
$(STATEDIR)/liboop.get: $(LIBOOP_SOURCE)
- @$(call targetinfo, liboop.get)
+ @$(call targetinfo, $@)
touch $@
$(LIBOOP_SOURCE):
- @$(call targetinfo, $(LIBOOP_SOURCES))
+ @$(call targetinfo, $@)
wget -P $(SRCDIR) $(PASSIVEFTP) $(LIBOOP_URL)
# ----------------------------------------------------------------------------
@@ -50,7 +51,7 @@ LIBOOP_USE_AUTOCONF = autoconf
LIBOOP_USE_AUTOMAKE = automake
$(STATEDIR)/liboop.extract: $(STATEDIR)/liboop.get
- @$(call targetinfo, liboop.extract)
+ @$(call targetinfo, $@)
$(LIBOOP_EXTRACT) $(LIBOOP_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
#
# we have to add a switch to disable tcl
@@ -82,7 +83,7 @@ LIBOOP_AUTOCONF += --prefix=$(PTXCONF_PREFIX)
LIBOOP_AUTOCONF += --without-tcl
$(STATEDIR)/liboop.prepare: $(STATEDIR)/liboop.extract
- @$(call targetinfo, liboop.prepare)
+ @$(call targetinfo, $@)
cd $(LIBOOP_DIR) && \
PATH=$(PTXCONF_PREFIX)/bin:$$PATH ./configure $(LIBOOP_AUTOCONF)
touch $@
@@ -94,7 +95,7 @@ $(STATEDIR)/liboop.prepare: $(STATEDIR)/liboop.extract
liboop_compile: $(STATEDIR)/liboop.compile
$(STATEDIR)/liboop.compile: $(STATEDIR)/liboop.prepare
- @$(call targetinfo, liboop.compile)
+ @$(call targetinfo, $@)
PATH=$(PTXCONF_PREFIX)/bin:$$PATH make -C $(LIBOOP_DIR)
touch $@
@@ -105,7 +106,7 @@ $(STATEDIR)/liboop.compile: $(STATEDIR)/liboop.prepare
liboop_install: $(STATEDIR)/liboop.install
$(STATEDIR)/liboop.install: $(STATEDIR)/liboop.compile
- @$(call targetinfo, liboop.install)
+ @$(call targetinfo, $@)
# FIXME: this doesn't work when using local bin dir
make -C $(LIBOOP_DIR) install
touch $@
@@ -117,7 +118,7 @@ $(STATEDIR)/liboop.install: $(STATEDIR)/liboop.compile
liboop_targetinstall: $(STATEDIR)/liboop.targetinstall
$(STATEDIR)/liboop.targetinstall: $(STATEDIR)/liboop.install
- @$(call targetinfo, liboop.targetinstall)
+ @$(call targetinfo, $@)
# FIXME: the other liboop libraries should optionally be installed
# we want to preserve links, so we cannot use install
cp -d $(PTXCONF_PREFIX)/lib/liboop.so* $(ROOTDIR)/lib/
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 0b775e8f5..8f53c6461 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: libpcap.make,v 1.2 2003/09/10 01:39:34 mkl Exp $
+# $Id: libpcap.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,11 +35,11 @@ libpcap_get: $(STATEDIR)/libpcap.get
libpcap_get_deps = $(LIBPCAP_SOURCE)
$(STATEDIR)/libpcap.get: $(libpcap_get_deps)
- @$(call targetinfo, libpcap.get)
+ @$(call targetinfo, $@)
touch $@
$(LIBPCAP_SOURCE):
- @$(call targetinfo, $(LIBPCAP_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(LIBPCAP_URL))
# ----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ libpcap_extract: $(STATEDIR)/libpcap.extract
libpcap_extract_deps = $(STATEDIR)/libpcap.get
$(STATEDIR)/libpcap.extract: $(libpcap_extract_deps)
- @$(call targetinfo, libpcap.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(LIBPCAP_DIR))
@$(call extract, $(LIBPCAP_SOURCE))
touch $@
@@ -83,7 +83,7 @@ LIBPCAP_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
LIBPCAP_AUTOCONF += --with-pcap=linux
$(STATEDIR)/libpcap.prepare: $(libpcap_prepare_deps)
- @$(call targetinfo, libpcap.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(LIBPCAP_BUILDDIR))
cd $(LIBPCAP_DIR) && \
$(LIBPCAP_PATH) $(LIBPCAP_ENV) \
@@ -99,7 +99,7 @@ libpcap_compile: $(STATEDIR)/libpcap.compile
libpcap_compile_deps = $(STATEDIR)/libpcap.prepare
$(STATEDIR)/libpcap.compile: $(libpcap_compile_deps)
- @$(call targetinfo, libpcap.compile)
+ @$(call targetinfo, $@)
$(LIBPCAP_PATH) make -C $(LIBPCAP_DIR)
touch $@
@@ -110,7 +110,7 @@ $(STATEDIR)/libpcap.compile: $(libpcap_compile_deps)
libpcap_install: $(STATEDIR)/libpcap.install
$(STATEDIR)/libpcap.install: $(STATEDIR)/libpcap.compile
- @$(call targetinfo, libpcap.install)
+ @$(call targetinfo, $@)
$(LIBPCAP_PATH) make -C $(LIBPCAP_DIR) install
touch $@
@@ -123,7 +123,7 @@ libpcap_targetinstall: $(STATEDIR)/libpcap.targetinstall
libpcap_targetinstall_deps = $(STATEDIR)/libpcap.install
$(STATEDIR)/libpcap.targetinstall: $(libpcap_targetinstall_deps)
- @$(call targetinfo, libpcap.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/libpng125.make b/rules/libpng125.make
index fa493d257..b587214f5 100644
--- a/rules/libpng125.make
+++ b/rules/libpng125.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: libpng125.make,v 1.1 2003/08/17 00:34:18 robert Exp $
+# $Id: libpng125.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-# Pengutronix <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ libpng125_get: $(STATEDIR)/libpng125.get
libpng125_get_deps = $(LIBPNG125_SOURCE)
$(STATEDIR)/libpng125.get: $(libpng125_get_deps)
- @$(call targetinfo, libpng125.get)
+ @$(call targetinfo, $@)
touch $@
$(LIBPNG125_SOURCE):
- @$(call targetinfo, $(LIBPNG125_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(LIBPNG125_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ libpng125_extract: $(STATEDIR)/libpng125.extract
libpng125_extract_deps = $(STATEDIR)/libpng125.get
$(STATEDIR)/libpng125.extract: $(libpng125_extract_deps)
- @$(call targetinfo, libpng125.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(LIBPNG125_DIR))
@$(call extract, $(LIBPNG125_SOURCE))
touch $@
@@ -68,7 +68,7 @@ libpng125_prepare: $(STATEDIR)/libpng125.prepare
#
libpng125_prepare_deps = \
$(STATEDIR)/libpng125.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
LIBPNG125_PATH = PATH=$(CROSS_PATH)
LIBPNG125_ENV = $(CROSS_ENV)
@@ -78,7 +78,7 @@ LIBPNG125_AUTOCONF += --enable-foo
endif
$(STATEDIR)/libpng125.prepare: $(libpng125_prepare_deps)
- @$(call targetinfo, libpng125.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(LIBPNG125_BUILDDIR))
cp $(LIBPNG125_DIR)/scripts/makefile.linux $(LIBPNG125_DIR)/Makefile
perl -i -p -e "s/CC=/CC?=/g" $(LIBPNG125_DIR)/Makefile
@@ -94,7 +94,7 @@ libpng125_compile_deps = $(STATEDIR)/libpng125.prepare
libpng125_compile_deps += $(STATEDIR)/zlib.install
$(STATEDIR)/libpng125.compile: $(libpng125_compile_deps)
- @$(call targetinfo, libpng125.compile)
+ @$(call targetinfo, $@)
$(LIBPNG125_PATH) $(LIBPNG125_ENV) make -C $(LIBPNG125_DIR)
touch $@
@@ -105,7 +105,7 @@ $(STATEDIR)/libpng125.compile: $(libpng125_compile_deps)
libpng125_install: $(STATEDIR)/libpng125.install
$(STATEDIR)/libpng125.install: $(STATEDIR)/libpng125.compile
- @$(call targetinfo, libpng125.install)
+ @$(call targetinfo, $@)
install -d $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib
install $(LIBPNG125_DIR)/libpng12.so.0.1.2.5 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib
ln -sf libpng12.so.0.1.2.5 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libpng12.so.0
@@ -124,7 +124,7 @@ libpng125_targetinstall: $(STATEDIR)/libpng125.targetinstall
libpng125_targetinstall_deps = $(STATEDIR)/libpng125.compile
$(STATEDIR)/libpng125.targetinstall: $(libpng125_targetinstall_deps)
- @$(call targetinfo, libpng125.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)/lib
install $(LIBPNG125_DIR)/libpng12.so.0.1.2.5 $(ROOTDIR)/lib
ln -sf libpng12.so.0.1.2.5 $(ROOTDIR)/lib/libpng12.so.0
diff --git a/rules/lilo.make b/rules/lilo.make
index 4baf8de74..e78ac88c9 100644
--- a/rules/lilo.make
+++ b/rules/lilo.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: lilo.make,v 1.1 2003/07/16 04:23:28 mkl Exp $
+# $Id: lilo.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -33,11 +33,11 @@ lilo_get: $(STATEDIR)/lilo.get
lilo_get_deps = $(LILO_SOURCE)
$(STATEDIR)/lilo.get: $(lilo_get_deps)
- @$(call targetinfo, lilo.get)
+ @$(call targetinfo, $@)
touch $@
$(LILO_SOURCE):
- @$(call targetinfo, $(LILO_SOURCE))
+ @$(call targetinfo, $@)
wget -P $(SRCDIR) $(PASSIVEFTP) $(LILO_URL)
# ----------------------------------------------------------------------------
@@ -47,7 +47,7 @@ $(LILO_SOURCE):
lilo_extract: $(STATEDIR)/lilo.extract
$(STATEDIR)/lilo.extract: $(STATEDIR)/lilo.get
- @$(call targetinfo, lilo.extract)
+ @$(call targetinfo, $@)
$(LILO_EXTRACT) $(LILO_SOURCE) | tar -C $(BUILDDIR) -xf -
touch $@
@@ -66,7 +66,7 @@ LILO_MAKEVARS = CROSS=$(PTXCONF_GNU_TARGET)-
lilo_prepare_deps = $(STATEDIR)/lilo.extract $(STATEDIR)/virtual-xchain.install
$(STATEDIR)/lilo.prepare: $(lilo_prepare_deps)
- @$(call targetinfo, lilo.prepare)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -78,7 +78,7 @@ lilo_compile: $(STATEDIR)/lilo.compile
lilo_compile_deps = $(STATEDIR)/lilo.prepare
$(STATEDIR)/lilo.compile: $(lilo_compile_deps)
- @$(call targetinfo, lilo.compile)
+ @$(call targetinfo, $@)
$(LILO_PATH) make -C $(LILO_DIR) $(LILO_MAKEVARS)
touch $@
@@ -89,7 +89,7 @@ $(STATEDIR)/lilo.compile: $(lilo_compile_deps)
lilo_install: $(STATEDIR)/lilo.install
$(STATEDIR)/lilo.install: $(STATEDIR)/lilo.compile
- @$(call targetinfo, lilo.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -99,7 +99,7 @@ $(STATEDIR)/lilo.install: $(STATEDIR)/lilo.compile
lilo_targetinstall: $(STATEDIR)/lilo.targetinstall
$(STATEDIR)/lilo.targetinstall: $(STATEDIR)/lilo.install
- @$(call targetinfo, lilo.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/lrzsz.make b/rules/lrzsz.make
index 876611a85..bb4c8e6e0 100644
--- a/rules/lrzsz.make
+++ b/rules/lrzsz.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: lrzsz.make,v 1.1 2003/08/13 12:04:17 robert Exp $
+# $Id: lrzsz.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-# Pengutronix <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -36,11 +36,11 @@ lrzsz_get: $(STATEDIR)/lrzsz.get
lrzsz_get_deps = $(LSZRZ_SOURCE)
$(STATEDIR)/lrzsz.get: $(lrzsz_get_deps)
- @$(call targetinfo, lrzsz.get)
+ @$(call targetinfo, $@)
touch $@
$(LSZRZ_SOURCE):
- @$(call targetinfo, $(LSZRZ_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(LSZRZ_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ lrzsz_extract: $(STATEDIR)/lrzsz.extract
lrzsz_extract_deps = $(STATEDIR)/lrzsz.get
$(STATEDIR)/lrzsz.extract: $(lrzsz_extract_deps)
- @$(call targetinfo, lrzsz.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(LSZRZ_DIR))
@$(call extract, $(LSZRZ_SOURCE))
touch $@
@@ -68,7 +68,7 @@ lrzsz_prepare: $(STATEDIR)/lrzsz.prepare
#
lrzsz_prepare_deps = \
$(STATEDIR)/lrzsz.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
LSZRZ_PATH = PATH=$(CROSS_PATH)
LSZRZ_ENV = $(CROSS_ENV)
@@ -82,7 +82,7 @@ LSZRZ_AUTOCONF += --build=$(GNU_HOST)
LSZRZ_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
$(STATEDIR)/lrzsz.prepare: $(lrzsz_prepare_deps)
- @$(call targetinfo, lrzsz.prepare)
+ @$(call targetinfo, $@)
cd $(LSZRZ_DIR) && \
$(LSZRZ_PATH) $(LSZRZ_ENV) \
./configure $(LSZRZ_AUTOCONF)
@@ -97,7 +97,7 @@ lrzsz_compile: $(STATEDIR)/lrzsz.compile
lrzsz_compile_deps = $(STATEDIR)/lrzsz.prepare
$(STATEDIR)/lrzsz.compile: $(lrzsz_compile_deps)
- @$(call targetinfo, lrzsz.compile)
+ @$(call targetinfo, $@)
$(LSZRZ_PATH) make -C $(LSZRZ_DIR)
touch $@
@@ -108,7 +108,7 @@ $(STATEDIR)/lrzsz.compile: $(lrzsz_compile_deps)
lrzsz_install: $(STATEDIR)/lrzsz.install
$(STATEDIR)/lrzsz.install: $(STATEDIR)/lrzsz.compile
- @$(call targetinfo, lrzsz.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -120,7 +120,7 @@ lrzsz_targetinstall: $(STATEDIR)/lrzsz.targetinstall
lrzsz_targetinstall_deps = $(STATEDIR)/lrzsz.compile
$(STATEDIR)/lrzsz.targetinstall: $(lrzsz_targetinstall_deps)
- @$(call targetinfo, lrzsz.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/lsh.make b/rules/lsh.make
index 6b753b592..e5657571c 100644
--- a/rules/lsh.make
+++ b/rules/lsh.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: lsh.make,v 1.4 2003/07/16 04:23:28 mkl Exp $
+# $Id: lsh.make,v 1.5 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
diff --git a/rules/ltt.make b/rules/ltt.make
index af6b34388..5f1d09c88 100644
--- a/rules/ltt.make
+++ b/rules/ltt.make
@@ -1,18 +1,18 @@
# -*-makefile-*-
-# $Id: ltt.make,v 1.3 2003/09/19 13:43:36 mkl Exp $
+# $Id: ltt.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
-# (c) 2003 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
+# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y, $(PTXCONF_LTT))
+ifdef PTXCONF_LTT
PACKAGES += ltt
endif
@@ -26,6 +26,7 @@ LTT_SUFFIX = tgz
LTT_URL = http://www.opersys.com/ftp/pub/LTT/$(LTT)a.$(LTT_SUFFIX)
LTT_SOURCE = $(SRCDIR)/$(LTT)a.$(LTT_SUFFIX)
LTT_DIR = $(BUILDDIR)/$(LTT)
+LTT_BUILDDIR = $(BUILDDIR)/$(LTT)-build
# ----------------------------------------------------------------------------
# Get
@@ -36,12 +37,12 @@ ltt_get: $(STATEDIR)/ltt.get
ltt_get_deps = $(LTT_SOURCE)
$(STATEDIR)/ltt.get: $(ltt_get_deps)
- @$(call targetinfo, ltt.get)
+ @$(call targetinfo, $@)
@$(call get_patches, $(LTT))
touch $@
$(LTT_SOURCE):
- @$(call targetinfo, ltt.get)
+ @$(call targetinfo, $@)
@$(call get, $(LTT_URL))
# ----------------------------------------------------------------------------
@@ -53,7 +54,7 @@ ltt_extract: $(STATEDIR)/ltt.extract
ltt_extract_deps = $(STATEDIR)/ltt.get
$(STATEDIR)/ltt.extract: $(ltt_extract_deps)
- @$(call targetinfo, ltt.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(LTT_DIR))
@$(call extract, $(LTT_SOURCE))
@$(call patchin, $(LTT))
@@ -65,27 +66,27 @@ $(STATEDIR)/ltt.extract: $(ltt_extract_deps)
ltt_prepare: $(STATEDIR)/ltt.prepare
-LTT_PATH = PATH=$(PTXCONF_PREFIX)/$(AUTOCONF213)/bin:$(CROSS_PATH)
+LTT_PATH = PATH=$(CROSS_PATH)
LTT_ENV = $(CROSS_ENV)
LTT_ENV += ac_cv_func_setvbuf_reversed=no ltt_cv_have_mbstate_t=yes
-LTT_AUTOCONF = --disable-sanity-checks
-LTT_AUTOCONF += --prefix=$(PTXCONF_PREFIX)
+LTT_AUTOCONF += --prefix=/usr
+LTT_AUTOCONF += --with-gtk=no
#
# dependencies
#
-ltt_prepare_deps = $(STATEDIR)/ltt.extract
-ltt_prepare_deps += $(STATEDIR)/virtual-xchain.install
+ltt_prepare_deps = \
+ $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/ltt.extract
$(STATEDIR)/ltt.prepare: $(ltt_prepare_deps)
- @$(call targetinfo, ltt.prepare)
-
- # configure without $(LTT_ENV) now, add this later;
- # visualizer has to be built for host...
- cd $(LTT_DIR) && \
- $(LTT_PATH) \
- ./configure $(LTT_AUTOCONF)
+ @$(call targetinfo, $@)
+ @$(call clean, $(LTT_BUILDDIR))
+ mkdir -p $(LTT_BUILDDIR)
+ cd $(LTT_BUILDDIR) && \
+ $(LTT_PATH) $(LTT_ENV) \
+ $(LTT_DIR)/configure $(LTT_AUTOCONF)
touch $@
# ----------------------------------------------------------------------------
@@ -97,16 +98,11 @@ ltt_compile: $(STATEDIR)/ltt.compile
ltt_compile_deps = $(STATEDIR)/ltt.prepare
$(STATEDIR)/ltt.compile: $(STATEDIR)/ltt.prepare
- @$(call targetinfo, ltt.compile)
-
-# build for target:
- make -C $(LTT_DIR)/LibUserTrace $(LTT_ENV) UserTrace.o
- make -C $(LTT_DIR)/LibUserTrace $(LTT_ENV) LDFLAGS="-static"
- make -C $(LTT_DIR)/Daemon $(LTT_ENV) LDFLAGS="-static"
+ @$(call targetinfo, $@)
-# build for host:
- make -C $(LTT_DIR)/LibLTT
- make -C $(LTT_DIR)/Visualizer
+ $(LTT_PATH) make -C $(LTT_BUILDDIR)/LibUserTrace UserTrace.o
+ $(LTT_PATH) make -C $(LTT_BUILDDIR)/LibUserTrace LDFLAGS="-static"
+ $(LTT_PATH) make -C $(LTT_BUILDDIR)/Daemon LDFLAGS="-static"
touch $@
@@ -116,10 +112,12 @@ $(STATEDIR)/ltt.compile: $(STATEDIR)/ltt.prepare
ltt_install: $(STATEDIR)/ltt.install
-$(STATEDIR)/ltt.install: $(STATEDIR)/ltt.compile
- @$(call targetinfo, ltt.install)
- make -C $(LTT_DIR)/LibLTT install
- make -C $(LTT_DIR)/Visualizer install
+ltt_install_deps = \
+ $(STATEDIR)/ltt.compile \
+ $(STATEDIR)/xchain-ltt.compile
+
+$(STATEDIR)/ltt.install: $(ltt_install_deps)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -129,10 +127,13 @@ $(STATEDIR)/ltt.install: $(STATEDIR)/ltt.compile
ltt_targetinstall: $(STATEDIR)/ltt.targetinstall
$(STATEDIR)/ltt.targetinstall: $(STATEDIR)/ltt.install
- @$(call targetinfo, ltt.targetinstall)
- $(CROSSSTRIP) $(LTT_DIR)/Daemon/tracedaemon
- cp $(LTT_DIR)/Daemon/tracedaemon $(ROOTDIR)/usr/sbin
- cp $(LTT_DIR)/createdev.sh $(ROOTDIR)/usr/sbin/tracecreatedev
+ @$(call targetinfo, $@)
+ mkdir -p $(ROOTDIR)/usr/sbin
+
+ install $(LTT_BUILDDIR)/Daemon/tracedaemon $(ROOTDIR)/usr/sbin
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/tracedaemon
+
+ install $(LTT_DIR)/createdev.sh $(ROOTDIR)/usr/sbin/tracecreatedev
cp $(LTT_DIR)/Daemon/Scripts/trace* $(ROOTDIR)/usr/sbin
touch $@
diff --git a/rules/mfirebird.make b/rules/mfirebird.make
index 6a55cc295..358927985 100644
--- a/rules/mfirebird.make
+++ b/rules/mfirebird.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: mfirebird.make,v 1.6 2003/09/16 16:41:58 mkl Exp $
+# $Id: mfirebird.make,v 1.7 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>,
-# Pengutronix e.K. <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>,
+# Pengutronix e.K. <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -37,12 +37,12 @@ mfirebird_get_deps = $(MFIREBIRD_SOURCE)
mfirebird_get_deps += $(MFIREBIRD_PATCH_SOURCE)
$(STATEDIR)/mfirebird.get: $(mfirebird_get_deps)
- @$(call targetinfo, mfirebird.get)
+ @$(call targetinfo, $@)
@$(call get_patches, $(MFIREBIRD))
touch $@
$(MFIREBIRD_SOURCE):
- @$(call targetinfo, $(MFIREBIRD_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(MFIREBIRD_URL))
# ----------------------------------------------------------------------------
@@ -54,7 +54,7 @@ mfirebird_extract: $(STATEDIR)/mfirebird.extract
mfirebird_extract_deps = $(STATEDIR)/mfirebird.get
$(STATEDIR)/mfirebird.extract: $(mfirebird_extract_deps)
- @$(call targetinfo, mfirebird.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(MFIREBIRD_DIR))
@$(call extract, $(MFIREBIRD_SOURCE))
cd $(BUILDDIR) && mv mozilla $(MFIREBIRD)
@@ -74,10 +74,9 @@ mfirebird_prepare_deps = \
$(STATEDIR)/mfirebird.extract \
$(STATEDIR)/gtk1210.install \
$(STATEDIR)/libidl068.install \
-# $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/virtual-xchain.install \
MFIREBIRD_PATH = PATH=$(CROSS_PATH)
-#MFIREBIRD_PATH += PATH=$(PTXCONF_PREFIX)/bin:$$PATH
MFIREBIRD_ENV = $(CROSS_ENV)
MFIREBIRD_ENV += MOZILLA_OFFICIAL=1
@@ -403,7 +402,7 @@ endif
#endif
$(STATEDIR)/mfirebird.prepare: $(mfirebird_prepare_deps)
- @$(call targetinfo, mfirebird.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(MFIREBIRD_BUILDDIR))
cd $(MFIREBIRD_DIR) && \
$(MFIREBIRD_PATH) $(MFIREBIRD_ENV) \
@@ -419,7 +418,7 @@ mfirebird_compile: $(STATEDIR)/mfirebird.compile
mfirebird_compile_deps = $(STATEDIR)/mfirebird.prepare
$(STATEDIR)/mfirebird.compile: $(mfirebird_compile_deps)
- @$(call targetinfo, mfirebird.compile)
+ @$(call targetinfo, $@)
$(MFIREBIRD_PATH) $(MFIREBIRD_ENV) make -C $(MFIREBIRD_DIR)
touch $@
@@ -430,7 +429,7 @@ $(STATEDIR)/mfirebird.compile: $(mfirebird_compile_deps)
mfirebird_install: $(STATEDIR)/mfirebird.install
$(STATEDIR)/mfirebird.install: $(STATEDIR)/mfirebird.compile
- @$(call targetinfo, mfirebird.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -443,7 +442,7 @@ mfirebird_targetinstall_deps = $(STATEDIR)/mfirebird.compile
mfirebird_targetinstall_deps += $(STATEDIR)/gtk1210.targetinstall
$(STATEDIR)/mfirebird.targetinstall: $(mfirebird_targetinstall_deps)
- @$(call targetinfo, mfirebird.targetinstall)
+ @$(call targetinfo, $@)
cd $(MFIREBIRD_DIR) && $(MFIREBIRD_PATH) $(MFIREBIRD_ENV) make install DESTDIR=$(ROOTDIR)
diff --git a/rules/mtd.make b/rules/mtd.make
index c0cf8eebe..4309a0ac2 100644
--- a/rules/mtd.make
+++ b/rules/mtd.make
@@ -1,10 +1,11 @@
# -*-makefile-*-
-# $Id: mtd.make,v 1.6 2003/09/16 17:26:21 mkl Exp $
+# $Id: mtd.make,v 1.7 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
#
-# (c) 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -12,11 +13,11 @@
# We provide this package
#
-ifeq (y, $(PTXCONF_KERNEL_MTD))
+ifdef PTXCONF_KERNEL_MTD
PACKAGES += mtd
endif
-ifeq (y, $(PTXCONF_MTD_UTILS))
+ifdef PTXCONF_MTD_UTILS
PACKAGES += mtdutil
endif
@@ -36,17 +37,17 @@ MTD_EXTRACT = gzip -dc
mtd_get: $(STATEDIR)/mtd.get
$(STATEDIR)/mtd.get: $(MTD_SOURCE)
- @$(call targetinfo, mtdutil.get)
+ @$(call targetinfo, $@)
touch $@
mtdutil_get: $(STATEDIR)/mtdutil.get
$(STATEDIR)/mtdutil.get: $(MTD_SOURCE)
- @$(call targetinfo, $(MTD_SOURCE))
+ @$(call targetinfo, $@)
touch $@
$(MTD_SOURCE):
- @$(call targetinfo, mtd.get)
+ @$(call targetinfo, $@)
wget -P $(SRCDIR) $(PASSIVEFTP) $(MTD_URL)
# ----------------------------------------------------------------------------
@@ -56,14 +57,14 @@ $(MTD_SOURCE):
mtd_extract: $(STATEDIR)/mtd.extract
$(STATEDIR)/mtd.extract: $(STATEDIR)/mtd.get
- @$(call targetinfo, mtd.extract)
+ @$(call targetinfo, $@)
$(MTD_EXTRACT) $(MTD_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
touch $@
mtdutil_extract: $(STATEDIR)/mtdutil.extract
$(STATEDIR)/mtdutil.extract: $(STATEDIR)/mtdutil.get
- @$(call targetinfo, mtdutil.extract)
+ @$(call targetinfo, $@)
rm -fr $(BUILDDIR)/mtdutil
mkdir -p $(BUILDDIR)/mtdutil
$(MTD_EXTRACT) $(MTD_SOURCE) | $(TAR) -C $(BUILDDIR)/mtdutil -xf - $(MTD)/util
@@ -78,7 +79,7 @@ $(STATEDIR)/mtdutil.extract: $(STATEDIR)/mtdutil.get
mtd_prepare: $(STATEDIR)/mtd.prepare
$(STATEDIR)/mtd.prepare: $(STATEDIR)/mtd.extract
- @$(call targetinfo, mtd.prepare)
+ @$(call targetinfo, $@)
# Makefile is currently fucked up... @#*$
# FIXME: patch sent to maintainer, remove this for fixed version
perl -i -p -e 's/\(CFLAGS\) -o/\(LDFLAGS\) -o/g' $(MTD_DIR)/util/Makefile
@@ -88,7 +89,7 @@ $(STATEDIR)/mtd.prepare: $(STATEDIR)/mtd.extract
mtdutil_prepare: $(STATEDIR)/mtdutil.prepare
$(STATEDIR)/mtdutil.prepare: $(STATEDIR)/mtdutil.extract
- @$(call targetinfo, mtdutil.prepare)
+ @$(call targetinfo, $@)
# Makefile is currently fucked up... @#*$
# FIXME: patch sent to maintainer, remove this for fixed version
perl -i -p -e 's/\(CFLAGS\) -o/\(LDFLAGS\) -o/g' $(BUILDDIR)/mtdutil/$(MTD)/util/Makefile
@@ -106,7 +107,7 @@ MTD_MAKEVARS = CFLAGS=-I$(PTXCONF_PREFIX)/include
MTD_MAKEVARS += LDFLAGS=-L$(PTXCONF_PREFIX)/lib
$(STATEDIR)/mtd.compile: $(STATEDIR)/mtd.prepare $(STATEDIR)/xchain-zlib.install
- @$(call targetinfo, mtd.compile)
+ @$(call targetinfo, $@)
$(MTD_ENVIRONMENT) make -C $(MTD_DIR)/util mkfs.jffs mkfs.jffs2 $(MTD_MAKEVARS)
touch $@
@@ -124,7 +125,7 @@ MTD_MAKEVARS += CFLAGS=$(TARGET_CFLAGS)
mtdutil_compile: $(STATEDIR)/mtdutil.compile
$(STATEDIR)/mtdutil.compile: $(mtdutil_compile_deps)
- @$(call targetinfo, mtdutil.compile)
+ @$(call targetinfo, $@)
$(MTD-UTIL_ENVIRONMENT) make -C $(BUILDDIR)/mtdutil/$(MTD)/util $(MTD-UTIL_MAKEVARS)
touch $@
@@ -135,7 +136,7 @@ $(STATEDIR)/mtdutil.compile: $(mtdutil_compile_deps)
mtd_install: $(STATEDIR)/mtd.install
$(STATEDIR)/mtd.install: $(STATEDIR)/mtd.compile
- @$(call targetinfo, mtd.install)
+ @$(call targetinfo, $@)
install -d $(PTXCONF_PREFIX)/bin
install $(MTD_DIR)/util/mkfs.jffs $(PTXCONF_PREFIX)/bin
install $(MTD_DIR)/util/mkfs.jffs2 $(PTXCONF_PREFIX)/bin
@@ -144,7 +145,7 @@ $(STATEDIR)/mtd.install: $(STATEDIR)/mtd.compile
mtdutil_install: $(STATEDIR)/mtdutil.install
$(STATEDIR)/mtdutil.install: $(STATEDIR)/mtdutil.compile
- @$(call targetinfo, mtdutil.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -154,81 +155,81 @@ $(STATEDIR)/mtdutil.install: $(STATEDIR)/mtdutil.compile
mtd_targetinstall: $(STATEDIR)/mtd.targetinstall
$(STATEDIR)/mtd.targetinstall: $(STATEDIR)/mtd.install
- @$(call targetinfo, mtd.targetinstall)
+ @$(call targetinfo, $@)
touch $@
mtdutil_targetinstall: $(STATEDIR)/mtdutil.targetinstall
$(STATEDIR)/mtdutil.targetinstall: $(STATEDIR)/mtdutil.install
- @$(call targetinfo, mtdutil.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)/sbin
ifeq (y, $(PTXCONF_MTD_EINFO))
install $(BUILDDIR)/mtdutil/$(MTD)/util/einfo $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/einfo
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/einfo
endif
ifeq (y, $(PTXCONF_MTD_ERASE))
install $(BUILDDIR)/mtdutil/$(MTD)/util/erase $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/erase
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/erase
endif
ifeq (y, $(PTXCONF_MTD_ERASEALL))
install $(BUILDDIR)/mtdutil/$(MTD)/util/eraseall $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/eraseall
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/eraseall
endif
ifeq (y, $(PTXCONF_MTD_FCP))
install $(BUILDDIR)/mtdutil/$(MTD)/util/fcp $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/fcp
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/fcp
endif
ifeq (y, $(PTXCONF_MTD_FTL_CHECK))
install $(BUILDDIR)/mtdutil/$(MTD)/util/ftl_check $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/check
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/check
endif
ifeq (y, $(PTXCONF_MTD_FTL_FORMAT))
install $(BUILDDIR)/mtdutil/$(MTD)/util/ftl_format $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/ftl_format
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/ftl_format
endif
ifeq (y, $(PTXCONF_MTD_JFFS2READER))
install $(BUILDDIR)/mtdutil/$(MTD)/util/jffs2reader $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/jffs2reader
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/jffs2reader
endif
ifeq (y, $(PTXCONF_MTD_LOCK))
install $(BUILDDIR)/mtdutil/$(MTD)/util/lock $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/lock
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lock
endif
ifeq (y, $(PTXCONF_MTD_MTDDEBUG))
install $(BUILDDIR)/mtdutil/$(MTD)/util/mtd_debug $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/mtd_debug
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/mtd_debug
endif
ifeq (y, $(PTXCONF_MTD_NANDDUMP))
install $(BUILDDIR)/mtdutil/$(MTD)/util/nanddump $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/nanddump
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/nanddump
endif
ifeq (y, $(PTXCONF_MTD_NANDTEST))
install $(BUILDDIR)/mtdutil/$(MTD)/util/nandtest $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/nandtest
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/nandtest
endif
ifeq (y, $(PTXCONF_MTD_NANDWRITE))
install $(BUILDDIR)/mtdutil/$(MTD)/util/nandwrite $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/nandwrite
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/nandwrite
endif
ifeq (y, $(PTXCONF_MTD_NFTL_FORMAT))
install $(BUILDDIR)/mtdutil/$(MTD)/util/nftl_format $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/nftl_format
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/nftl_format
endif
ifeq (y, $(PTXCONF_MTD_NFTLDUMP))
install $(BUILDDIR)/mtdutil/$(MTD)/util/nftldump $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/nftldump
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/nftldump
endif
ifeq (y, $(PTXCONF_MTD_UNLOCK))
install $(BUILDDIR)/mtdutil/$(MTD)/util/unlock $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/unlock
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/unlock
endif
ifeq (y, $(PTXCONF_MTD_MKJFFS))
install $(BUILDDIR)/mtdutil/$(MTD)/util/mkfs.jffs $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/mkfs.jffs
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/mkfs.jffs
endif
ifeq (y, $(PTXCONF_MTD_MKJFFS2))
install $(BUILDDIR)/mtdutil/$(MTD)/util/mkfs.jffs2 $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/mkfs.jffs2
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/mkfs.jffs2
endif
touch $@
diff --git a/rules/nasm.make b/rules/nasm.make
deleted file mode 100644
index d9b82dea2..000000000
--- a/rules/nasm.make
+++ /dev/null
@@ -1,135 +0,0 @@
-# -*-makefile-*-
-# $Id: nasm.make,v 1.1 2003/09/26 12:16:07 mkl Exp $
-#
-# (c) 2003 by Dan Kegel http://kegel.com
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXDIST project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-ifdef PTXCONF_NASM
-PACKAGES += nasm
-endif
-
-#
-# Paths and names
-#
-NASM_VERSION = 0.98.38
-NASM = nasm-$(NASM_VERSION)
-NASM_SUFFIX = tar.bz2
-NASM_URL = http://umn.dl.sourceforge.net/sourceforge/nasm/$(NASM).$(NASM_SUFFIX)
-NASM_SOURCE = $(SRCDIR)/$(NASM).$(NASM_SUFFIX)
-NASM_DIR = $(BUILDDIR)/$(NASM)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-nasm_get: $(STATEDIR)/nasm.get
-
-nasm_get_deps = $(NASM_SOURCE)
-
-$(STATEDIR)/nasm.get: $(nasm_get_deps)
- @$(call targetinfo, $@)
- touch $@
-
-$(NASM_SOURCE):
- @$(call targetinfo, $@)
- @$(call get, $(NASM_URL))
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-nasm_extract: $(STATEDIR)/nasm.extract
-
-nasm_extract_deps = $(STATEDIR)/nasm.get
-
-$(STATEDIR)/nasm.extract: $(nasm_extract_deps)
- @$(call targetinfo, $@)
- @$(call clean, $(NASM_DIR))
- @$(call extract, $(NASM_SOURCE))
- touch $@
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-nasm_prepare: $(STATEDIR)/nasm.prepare
-
-#
-# dependencies
-#
-nasm_prepare_deps = \
- $(STATEDIR)/nasm.extract
-
-NASM_PATH =
-NASM_ENV =
-#NASM_ENV +=
-
-
-#
-# autoconf
-#
-NASM_AUTOCONF = --prefix=$(PTXCONF_PREFIX)
-
-#NASM_AUTOCONF +=
-
-$(STATEDIR)/nasm.prepare: $(nasm_prepare_deps)
- @$(call targetinfo, $@)
- @$(call clean, $(NASM_BUILDDIR))
- cd $(NASM_DIR) && \
- $(NASM_PATH) $(NASM_ENV) \
- ./configure $(NASM_AUTOCONF)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-nasm_compile: $(STATEDIR)/nasm.compile
-
-nasm_compile_deps = $(STATEDIR)/nasm.prepare
-
-$(STATEDIR)/nasm.compile: $(nasm_compile_deps)
- @$(call targetinfo, $@)
- $(NASM_PATH) $(NASM_ENV) make -C $(NASM_DIR)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-nasm_install: $(STATEDIR)/nasm.install
-
-$(STATEDIR)/nasm.install: $(STATEDIR)/nasm.compile
- @$(call targetinfo, $@)
- $(NASM_PATH) $(NASM_ENV) make -C $(NASM_DIR) install
- touch $@
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-nasm_targetinstall: $(STATEDIR)/nasm.targetinstall
-
-nasm_targetinstall_deps = $(STATEDIR)/nasm.install
-
-$(STATEDIR)/nasm.targetinstall: $(nasm_targetinstall_deps)
- @$(call targetinfo, $@)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-nasm_clean:
- rm -rf $(STATEDIR)/nasm.*
- rm -rf $(NASM_DIR)
-
-# vim: syntax=make
diff --git a/rules/native-binutils.make b/rules/native-binutils.make
new file mode 100644
index 000000000..5cbf9fda6
--- /dev/null
+++ b/rules/native-binutils.make
@@ -0,0 +1,126 @@
+# -*-makefile-*-
+# $Id: native-binutils.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+ifneq ($(HOST_BINUTILS_OK),yes)
+NATIVE += native-binutils
+endif
+
+#
+# Paths and names
+#
+NATIVE_BINUTILS_VERSION = 2.13.2.1
+NATIVE_BINUTILS = binutils-$(NATIVE_BINUTILS_VERSION)
+NATIVE_BINUTILS_SUFFIX = tar.gz
+NATIVE_BINUTILS_URL = ftp://ftp.gnu.org/pub/gnu/binutils/$(NATIVE_BINUTILS).$(NATIVE_BINUTILS_SUFFIX)
+NATIVE_BINUTILS_SOURCE = $(SRCDIR)/$(NATIVE_BINUTILS).$(NATIVE_BINUTILS_SUFFIX)
+NATIVE_BINUTILS_DIR = $(NATIVE_BUILDDIR)/$(NATIVE_BINUTILS)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+native-binutils_get: $(STATEDIR)/native-binutils.get
+
+native-binutils_get_deps = \
+ $(NATIVE_BINUTILS_SOURCE) \
+ $(STATEDIR)/native-binutils-patches.get
+
+$(STATEDIR)/native-binutils.get: $(native-binutils_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(STATEDIR)/native-binutils-patches.get:
+ @$(call targetinfo, $@)
+ @$(call get_patches, $(NATIVE_BINUTILS))
+ touch $@
+
+ifneq ($(BINUTILS_VERSION),$(NATIVE_BINUTILS_VERSION))
+$(NATIVE_BINUTILS_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(NATIVE_BINUTILS_URL))
+endif
+
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+native-binutils_extract: $(STATEDIR)/native-binutils.extract
+
+$(STATEDIR)/native-binutils.extract: $(STATEDIR)/native-binutils.get
+ @$(call targetinfo, $@)
+ @$(call clean, $(NATIVE_BINUTILS_DIR))
+ @$(call extract, $(NATIVE_BINUTILS_SOURCE), $(NATIVE_BUILDDIR))
+ @$(call patchin, $(NATIVE_BINUTILS), $(NATIVE_BINUTILS_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+native-binutils_prepare: $(STATEDIR)/native-binutils.prepare
+
+NATIVE_NATIVE_BINUTILS_AUTOCONF = \
+ --prefix=$(PTXCONF_PREFIX)/$(NATIVE_BINUTILS) \
+ --disable-nls \
+ --enable-shared \
+ --enable-commonbfdlib \
+ --enable-install-libiberty
+
+NATIVE_NATIVE_BINUTILS_ENV = CC=$(HOSTCC)
+
+$(STATEDIR)/native-binutils.prepare: $(STATEDIR)/native-binutils.extract
+ @$(call targetinfo, $@)
+ @$(call clean, $(NATIVE_BINUTILS_DIR)/config.cache)
+ cd $(NATIVE_BINUTILS_DIR) && $(NATIVE_NATIVE_BINUTILS_ENV) \
+ ./configure $(NATIVE_NATIVE_BINUTILS_AUTOCONF)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+native-binutils_compile: $(STATEDIR)/native-binutils.compile
+
+$(STATEDIR)/native-binutils.compile: $(STATEDIR)/native-binutils.prepare
+ @$(call targetinfo, $@)
+ make -C $(NATIVE_BINUTILS_DIR)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+native-binutils_install: $(STATEDIR)/native-binutils.install
+
+$(STATEDIR)/native-binutils.install: $(STATEDIR)/native-binutils.compile
+ @$(call targetinfo, $@)
+ make -C $(NATIVE_BINUTILS_DIR) install
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+native-binutils_targetinstall: $(STATEDIR)/native-binutils.targetinstall
+
+$(STATEDIR)/native-binutils.targetinstall: $(STATEDIR)/native-binutils.install
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+native-binutils_clean:
+ rm -rf $(STATEDIR)/native-binutils.* $(NATIVE_BINUTILS_DIR)
+
+# vim: syntax=make
diff --git a/rules/native-gcc.make b/rules/native-gcc.make
new file mode 100644
index 000000000..9db6c3584
--- /dev/null
+++ b/rules/native-gcc.make
@@ -0,0 +1,148 @@
+# -*-makefile-*-
+# $Id: native-gcc.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+ifneq ($(HOST_GCC_OK),yes)
+NATIVE += native-gcc
+NATIVE_CC = gcc-$(NATIVE_GCC_VERSION)
+NATIVE_CXX = g++-$(NATIVE_GCC_VERSION)
+else
+NATIVE_CC = $(HOSTCC)
+NATIVE_CXX = $(HOSTCC)
+endif
+
+#
+# Paths and names
+#
+NATIVE_GCC_VERSION = 3.2.3
+NATIVE_GCC = gcc-$(NATIVE_GCC_VERSION)
+NATIVE_GCC_SUFFIX = tar.gz
+NATIVE_GCC_URL = ftp://ftp.gnu.org/pub/gnu/gcc/$(NATIVE_GCC).$(NATIVE_GCC_SUFFIX)
+NATIVE_GCC_SOURCE = $(SRCDIR)/$(NATIVE_GCC).$(NATIVE_GCC_SUFFIX)
+NATIVE_GCC_DIR = $(NATIVE_BUILDDIR)/$(NATIVE_GCC)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+native-gcc_get: $(STATEDIR)/native-gcc.get
+
+native-gcc_get_deps = \
+ $(NATIVE_GCC_SOURCE) \
+ $(STATEDIR)/native-gcc-patches.get
+
+$(STATEDIR)/native-gcc.get: $(native-gcc_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(STATEDIR)/native-gcc-patches.get:
+ @$(call targetinfo, $@)
+ @$(call get_patches, $(NATIVE_GCC))
+ touch $@
+
+ifneq ($(GCC_VERSION),$(NATIVE_GCC_VERSION))
+$(NATIVE_GCC_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(NATIVE_GCC_URL))
+endif
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+native-gcc_extract: $(STATEDIR)/native-gcc.extract
+
+native-gcc_extract_deps = $(STATEDIR)/native-gcc.get
+
+$(STATEDIR)/native-gcc.extract: $(native-gcc_extract_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(NATIVE_GCC_DIR))
+ @$(call extract, $(NATIVE_GCC_SOURCE), $(NATIVE_BUILDDIR))
+ @$(call patchin, $(NATIVE_GCC), $(NATIVE_GCC_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+native-gcc_prepare: $(STATEDIR)/native-gcc.prepare
+
+native-gcc_prepare_deps = \
+ $(STATEDIR)/native-gcc.extract
+
+NATIVE_GCC_PATH = PATH=$(NATIVE_PATH)
+NATIVE_GCC_ENV = CC=$(HOSTCC)
+
+NATIVE_GCC_AUTOCONF = \
+ --prefix=$(PTXCONF_PREFIX)/$(NATIVE_GCC) \
+ --program-suffix=-$(NATIVE_GCC_VERSION) \
+ --disable-nls \
+ --disable-multilib \
+ --enable-threads \
+ --enable-shared \
+ --enable-languages=c \
+ --enable-symvers=gnu \
+ --enable-target-optspace \
+ --enable-version-specific-runtime-libs \
+ --enable-c99 \
+ --enable-long-long \
+ --enable-__cxa_atexit
+
+$(STATEDIR)/native-gcc.prepare: $(native-gcc_prepare_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(NATIVE_GCC_DIR)/config.cache)
+
+ cd $(NATIVE_GCC_DIR) && \
+ $(NATIVE_GCC_PATH) $(NATIVE_GCC_ENV) \
+ ./configure $(NATIVE_GCC_AUTOCONF)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+native-gcc_compile: $(STATEDIR)/native-gcc.compile
+
+$(STATEDIR)/native-gcc.compile: $(STATEDIR)/native-gcc.prepare
+ @$(call targetinfo, $@)
+ $(NATIVE_GCC_PATH) make -C $(NATIVE_GCC_DIR) all-gcc
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+native-gcc_install: $(STATEDIR)/native-gcc.install
+
+$(STATEDIR)/native-gcc.install: $(STATEDIR)/native-gcc.compile
+ @$(call targetinfo, $@)
+ $(NATIVE_GCC_PATH) make -C $(NATIVE_GCC_DIR) install
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+native-gcc_targetinstall: $(STATEDIR)/native-gcc.targetinstall
+
+$(STATEDIR)/native-gcc.targetinstall:
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+native-gcc_clean:
+ rm -fr $(NATIVE_GCC_DIR)
+ rm -fr $(STATEDIR)/native-gcc.*
+ rm -fr $(NATIVE_GCC_DIR)
+
+# vim: syntax=make
diff --git a/rules/ncurses.in b/rules/ncurses.in
new file mode 100644
index 000000000..7ed7a897e
--- /dev/null
+++ b/rules/ncurses.in
@@ -0,0 +1,37 @@
+menu "ncurses "
+
+config NCURSES
+ bool "Compile ncurses"
+
+#config NCURSES_NCURSES
+# bool "Install libncurses on the target"
+# default y
+# depends on NCURSES
+
+config NCURSES_TERMCAP
+ bool "install minimal termcap"
+ default y
+ depends on NCURSES
+ help
+ Installes the following termcap files:
+ - xterm
+ - xterm-color
+ - xterm-xfree86
+ - vt100
+ - vt200
+ - ansi
+ - linux
+
+config NCURSES_FORM
+ bool "Install libform on the target"
+ depends on NCURSES
+
+config NCURSES_MENU
+ bool "Install libmenu on the target"
+ depends on NCURSES
+
+config NCURSES_PANEL
+ bool "Install libpanel on the target"
+ depends on NCURSES
+
+endmenu
diff --git a/rules/ncurses.make b/rules/ncurses.make
index e6a6457e3..3b7e8ad3d 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -1,18 +1,17 @@
# -*-makefile-*-
-# $Id: ncurses.make,v 1.11 2003/09/30 13:54:16 mkl Exp $
+# $Id: ncurses.make,v 1.12 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-# FIXME: this is currently not integrated into PTXCONF
-ifeq (y, $(PTXCONF_NCURSES))
+ifdef PTXCONF_NCURSES
PACKAGES += ncurses
endif
@@ -33,12 +32,12 @@ NCURSES_DIR = $(BUILDDIR)/$(NCURSES)
ncurses_get: $(STATEDIR)/ncurses.get
$(STATEDIR)/ncurses.get: $(NCURSES_SOURCE)
- @$(call targetinfo, ncurses.get)
+ @$(call targetinfo, $@)
@$(call get_patches, $(NCURSES))
touch $@
$(NCURSES_SOURCE):
- @$(call targetinfo, $(NCURSES_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(NCURSES_URL))
# ----------------------------------------------------------------------------
@@ -48,10 +47,10 @@ $(NCURSES_SOURCE):
ncurses_extract: $(STATEDIR)/ncurses.extract
$(STATEDIR)/ncurses.extract: $(STATEDIR)/ncurses.get
- @$(call targetinfo, ncurses.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(NCURSES_DIR))
@$(call extract, $(NCURSES_SOURCE))
- $(call patchin, $(NCURSES))
+ @$(call patchin, $(NCURSES))
touch $@
# ----------------------------------------------------------------------------
@@ -64,20 +63,38 @@ ncurses_prepare: $(STATEDIR)/ncurses.prepare
# dependencies
#
ncurses_prepare_deps = \
- $(STATEDIR)/ncurses.extract \
- $(STATEDIR)/virtual-xchain.install
-
-NCURSES_PATH = PATH=$(CROSS_PATH)
-NCURSES_MAKEVARS = BUILD_CC=$(HOSTCC)
-
-NCURSES_AUTOCONF = --prefix=$(CROSS_LIB_DIR)
-NCURSES_AUTOCONF += --build=$(GNU_HOST)
-NCURSES_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
-NCURSES_AUTOCONF += --with-shared
-NCURSES_AUTOCONF += --without-ada
+ $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/ncurses.extract
+
+NCURSES_PATH = PATH=$(CROSS_PATH)
+NCURSES_ENV = $(CROSS_ENV)
+NCURSES_ENV += BUILD_CC=$(HOSTCC)
+
+NCURSES_AUTOCONF =\
+ --build=$(GNU_HOST) \
+ --host=$(PTXCONF_GNU_TARGET) \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --with-shared \
+ --disable-nls \
+ --disable-rpath \
+ --without-ada \
+ --enable-const \
+ --enable-overwrite \
+ --with-terminfo-dirs=/usr/share/terminfo \
+ --with-default-terminfo-dir=/usr/share/terminfo
+
+ifdef PTXCONF_UCLIBC
+ifdef PTXCONF_GCC_2_95_3
+# FIXME: there's got to be a better way to detect whether we disabled libstdc++ in xchain-gccstage1.make
+NCURSES_AUTOCONF += --without-cxx-binding
+endif
+endif
$(STATEDIR)/ncurses.prepare: $(ncurses_prepare_deps)
- @$(call targetinfo, ncurses.prepare)
+ @$(call targetinfo, $@)
cd $(NCURSES_DIR) && \
$(NCURSES_PATH) $(NCURSES_ENV) \
./configure $(NCURSES_AUTOCONF)
@@ -90,8 +107,16 @@ $(STATEDIR)/ncurses.prepare: $(ncurses_prepare_deps)
ncurses_compile: $(STATEDIR)/ncurses.compile
$(STATEDIR)/ncurses.compile: $(STATEDIR)/ncurses.prepare
- @$(call targetinfo, ncurses.compile)
- $(NCURSES_PATH) $(NCURSES_ENV) make -C $(NCURSES_DIR) $(NCURSES_MAKEVARS)
+ @$(call targetinfo, $@)
+#
+# the two tools make_hash and make_keys are compiled for the host system
+# these tools are needed later in the compile progress
+#
+# it's not good to pass target CFLAGS to the host compiler :)
+# so override these
+#
+ $(NCURSES_PATH) make -C $(NCURSES_DIR)/ncurses CFLAGS='' CXXFLAGS='' make_hash make_keys
+ $(NCURSES_PATH) make -C $(NCURSES_DIR)
touch $@
# ----------------------------------------------------------------------------
@@ -101,24 +126,8 @@ $(STATEDIR)/ncurses.compile: $(STATEDIR)/ncurses.prepare
ncurses_install: $(STATEDIR)/ncurses.install
$(STATEDIR)/ncurses.install: $(STATEDIR)/ncurses.compile
- @$(call targetinfo, ncurses.install)
-# $(NCURSES_PATH) make -C $(NCURSES_DIR) install
- install -d $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib
- install $(NCURSES_DIR)/lib/libncurses.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib
- ln -sf libncurses.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libncurses.so.5
- ln -sf libncurses.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libncurses.so
- install $(NCURSES_DIR)/lib/libform.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib
- ln -sf libform.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libform.so.5
- ln -sf libform.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libform.so
- install $(NCURSES_DIR)/lib/libmenu.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib
- ln -sf libmenu.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libmenu.so.5
- ln -sf libmenu.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libmenu.so
- install $(NCURSES_DIR)/lib/libpanel.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib
- ln -sf libpanel.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libpanel.so.5
- ln -sf libpanel.so.5.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/libpanel.so
- install $(NCURSES_DIR)/include/curses.h $(PTXCONF_PREFIX)/include/
- ln -sf curses.h $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include/ncurses.h
- install -m 644 $(NCURSES_DIR)/include/*.h $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include/
+ @$(call targetinfo, $@)
+ $(NCURSES_PATH) make -C $(NCURSES_DIR) DESTDIR=$(CROSS_LIB_DIR) prefix='' exec_prefix='' install
touch $@
# ----------------------------------------------------------------------------
@@ -128,21 +137,43 @@ $(STATEDIR)/ncurses.install: $(STATEDIR)/ncurses.compile
ncurses_targetinstall: $(STATEDIR)/ncurses.targetinstall
$(STATEDIR)/ncurses.targetinstall: $(STATEDIR)/ncurses.install
- @$(call targetinfo, ncurses.targetinstall)
- # FIXME: make configurable which libraries are installed!
+ @$(call targetinfo, $@)
+
install -d $(ROOTDIR)/lib
+ install -d $(ROOTDIR)/usr/lib
+
install $(NCURSES_DIR)/lib/libncurses.so.5.3 $(ROOTDIR)/lib
ln -sf libncurses.so.5.3 $(ROOTDIR)/lib/libncurses.so.5
ln -sf libncurses.so.5.3 $(ROOTDIR)/lib/libncurses.so
- install $(NCURSES_DIR)/lib/libform.so.5.3 $(ROOTDIR)/lib
- ln -sf libform.so.5.3 $(ROOTDIR)/lib/libform.so.5
- ln -sf libform.so.5.3 $(ROOTDIR)/lib/libform.so
- install $(NCURSES_DIR)/lib/libmenu.so.5.3 $(ROOTDIR)/lib
- ln -sf libmenu.so.5.3 $(ROOTDIR)/lib/libmenu.so.5
- ln -sf libmenu.so.5.3 $(ROOTDIR)/lib/libmenu.so
- install $(NCURSES_DIR)/lib/libpanel.so.5.3 $(ROOTDIR)/lib
- ln -sf libpanel.so.5.3 $(ROOTDIR)/lib/libpanel.so.5
- ln -sf libpanel.so.5.3 $(ROOTDIR)/lib/libpanel.so
+ $(CROSS_STRIP) --strip-unneeded -R .comment -R .note $(ROOTDIR)/lib/libncurses.so.5.3
+
+ifdef PTXCONF_NCURSES_FORM
+ install $(NCURSES_DIR)/lib/libform.so.5.3 $(ROOTDIR)/usr/lib
+ ln -sf libform.so.5.3 $(ROOTDIR)/usr/lib/libform.so.5
+ ln -sf libform.so.5.3 $(ROOTDIR)/usr/lib/libform.so
+ $(CROSS_STRIP) --strip-unneeded -R .comment -R .note $(ROOTDIR)/usr/lib/libform.so.5.3
+endif
+
+ifdef PTXCONF_NCURSES_MENU
+ install $(NCURSES_DIR)/lib/libmenu.so.5.3 $(ROOTDIR)/usr/lib
+ ln -sf libmenu.so.5.3 $(ROOTDIR)/usr/lib/libmenu.so.5
+ ln -sf libmenu.so.5.3 $(ROOTDIR)/usr/lib/libmenu.so
+ $(CROSS_STRIP) --strip-unneeded -R .comment -R .note $(ROOTDIR)/usr/lib/libmenu.so.5.3
+endif
+
+ifdef PTXCONF_NCURSES_PANEL
+ install $(NCURSES_DIR)/lib/libpanel.so.5.3 $(ROOTDIR)/usr/lib
+ ln -sf libpanel.so.5.3 $(ROOTDIR)/usr/lib/libpanel.so.5
+ ln -sf libpanel.so.5.3 $(ROOTDIR)/usr/lib/libpanel.so
+ $(CROSS_STRIP) --strip-unneeded -R .comment -R .note $(ROOTDIR)/usr/lib/libpanel.so.5.3
+endif
+
+ifdef PTXCONF_NCURSES_TERMCAP
+ mkdir -p $(ROOTDIR)/usr/share/terminfo
+ for FILE in x/xterm x/xterm-color x/xterm-xfree86 v/vt100 v/vt200 a/ansi l/linux; do \
+ install -D $(CROSS_LIB_DIR)/usr/share/terminfo/$$FILE $(ROOTDIR)/usr/share/terminfo/$$FILE; \
+ done
+endif
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/netcat.make b/rules/netcat.make
new file mode 100644
index 000000000..b17ea8aaf
--- /dev/null
+++ b/rules/netcat.make
@@ -0,0 +1,116 @@
+# -*-makefile-*-
+# $id$
+#
+# Copyright (C) 2003 Ixia Corporation (www.ixiacom.com), by Milan Bobde
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_NETCAT
+PACKAGES += netcat
+endif
+
+#
+# Paths and names
+#
+NETCAT = netcat-1.10
+NETCAT_FILE = nc110
+NETCAT_URL = http://www.atstake.com/research/tools/network_utilities/nc110.tgz
+NETCAT_SOURCE = $(SRCDIR)/$(NETCAT_FILE).tgz
+NETCAT_DIR = $(BUILDDIR)/$(NETCAT)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+netcat_get: $(STATEDIR)/netcat.get
+
+netcat_get_deps = $(NETCAT_SOURCE)
+
+$(STATEDIR)/netcat.get: $(netcat_get_deps)
+ @$(call targetinfo, $@)
+ @$(call get_patches, $(NETCAT))
+ touch $@
+
+$(NETCAT_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(NETCAT_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+netcat_extract: $(STATEDIR)/netcat.extract
+
+$(STATEDIR)/netcat.extract: $(STATEDIR)/netcat.get
+ @$(call targetinfo, $@)
+ @$(call clean, $(NETCAT_DIR))
+ @$(call extract, $(NETCAT_SOURCE), $(NETCAT_DIR))
+ @$(call patchin, $(NETCAT))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+netcat_prepare: $(STATEDIR)/netcat.prepare
+
+netcat_prepare_deps = \
+ $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/libpcap.install \
+ $(STATEDIR)/netcat.extract
+
+$(STATEDIR)/netcat.prepare: $(netcat_prepare_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+netcat_compile: $(STATEDIR)/netcat.compile
+
+netcat_compile_deps = $(STATEDIR)/netcat.prepare
+
+NETCAT_PATH = PATH=$(CROSS_PATH)
+NETCAT_MAKEVARS = CC="$(PTXCONF_GNU_TARGET)-gcc -DLINUX -lresolv"
+
+$(STATEDIR)/netcat.compile: $(netcat_compile_deps)
+ @$(call targetinfo, $@)
+ $(NETCAT_PATH) make $(NETCAT_MAKEVARS) nc -C $(NETCAT_DIR)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+netcat_install: $(STATEDIR)/netcat.install
+
+$(STATEDIR)/netcat.install: $(STATEDIR)/netcat.compile
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+netcat_targetinstall: $(STATEDIR)/netcat.targetinstall
+
+$(STATEDIR)/netcat.targetinstall: $(STATEDIR)/netcat.install
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+netcat_clean:
+ rm -rf $(STATEDIR)/netcat.* $(NETCAT_DIR)
+
+# vim: syntax=make
diff --git a/rules/nettle.make b/rules/nettle.make
index e7fd4aef8..790a995fc 100644
--- a/rules/nettle.make
+++ b/rules/nettle.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: nettle.make,v 1.4 2003/07/16 04:23:28 mkl Exp $
+# $Id: nettle.make,v 1.5 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
diff --git a/rules/nfs-utils.make b/rules/nfs-utils.make
index e7bd3d3b4..f184a75a7 100644
--- a/rules/nfs-utils.make
+++ b/rules/nfs-utils.make
@@ -1,17 +1,17 @@
# -*-makefile-*-
-# $Id: nfs-utils.make,v 1.6 2003/08/29 19:05:15 mkl Exp $
+# $Id: nfs-utils.make,v 1.7 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y, $(PTXCONF_NFSUTILS))
+ifdef PTXCONF_NFSUTILS
PACKAGES += nfsutils
endif
@@ -22,7 +22,6 @@ NFSUTILS = nfs-utils-1.0.1
NFSUTILS_URL = http://unc.dl.sourceforge.net/sourceforge/nfs/$(NFSUTILS).tar.gz
NFSUTILS_SOURCE = $(SRCDIR)/$(NFSUTILS).tar.gz
NFSUTILS_DIR = $(BUILDDIR)/$(NFSUTILS)
-NFSUTILS_EXTRACT = gzip -dc
# ----------------------------------------------------------------------------
# Get
@@ -31,12 +30,12 @@ NFSUTILS_EXTRACT = gzip -dc
nfsutils_get: $(STATEDIR)/nfsutils.get
$(STATEDIR)/nfsutils.get: $(NFSUTILS_SOURCE)
- @$(call targetinfo, nfsutils.get)
+ @$(call targetinfo, $@)
touch $@
$(NFSUTILS_SOURCE):
- @$(call targetinfo, $(NFSUTILS_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(NFSUTILS_URL)
+ @$(call targetinfo, $@)
+ @$(call get, $(NFSUTILS_URL))
# ----------------------------------------------------------------------------
# Extract
@@ -45,11 +44,12 @@ $(NFSUTILS_SOURCE):
nfsutils_extract: $(STATEDIR)/nfsutils.extract
$(STATEDIR)/nfsutils.extract: $(STATEDIR)/nfsutils.get $(STATEDIR)/autoconf257.install
- @$(call targetinfo, nfsutils.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(NFSUTILS_DIR))
@$(call extract, $(NFSUTILS_SOURCE))
- #
- # regenerate configure script with new autoconf, to make cross compiling work
+#
+# regenerate configure script with new autoconf, to make cross compiling work
+#
cd $(NFSUTILS_DIR) && PATH=$(PTXCONF_PREFIX)/$(AUTOCONF257)/bin:$$PATH autoconf
touch $@
@@ -60,8 +60,7 @@ $(STATEDIR)/nfsutils.extract: $(STATEDIR)/nfsutils.get $(STATEDIR)/autoconf257.i
nfsutils_prepare: $(STATEDIR)/nfsutils.prepare
#
-# # arcitecture dependend configuration
-# #
+# arcitecture dependend configuration
#
NFSUTILS_AUTOCONF = --build=$(GNU_HOST)
NFSUTILS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
@@ -69,17 +68,19 @@ NFSUTILS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
NFSUTILS_PATH = PATH=$(CROSS_PATH)
NFSUTILS_ENV += CC_FOR_BUILD=$(HOSTCC) $(CROSS_ENV)
-ifeq (y, $(PTXCONF_NFSUTILS_V3))
+ifdef PTXCONF_NFSUTILS_V3
NFSUTILS_AUTOCONF += --enable-nfsv3
else
NFSUTILS_AUTOCONF += --disable-nfsv3
endif
-ifeq (y, $(PTXCONF_NFSUTILS_SECURE_STATD))
+
+ifdef PTXCONF_NFSUTILS_SECURE_STATD
NFSUTILS_AUTOCONF += --enable-secure-statd
else
NFSUTILS_AUTOCONF += --disable-secure-statd
endif
-ifeq (y, $(PTXCONF_NFSUTILS_RQUOTAD))
+
+ifdef PTXCONF_NFSUTILS_RQUOTAD
NFSUTILS_AUTOCONF += --enable-rquotad
else
NFSUTILS_AUTOCONF += --disable-rquotad
@@ -90,7 +91,7 @@ nfsutils_prepare_deps = \
$(STATEDIR)/nfsutils.extract
$(STATEDIR)/nfsutils.prepare: $(nfsutils_prepare_deps)
- @$(call targetinfo, nfsutils.prepare)
+ @$(call targetinfo, $@)
cd $(NFSUTILS_DIR) && \
$(NFSUTILS_PATH) $(NFSUTILS_ENV) \
$(NFSUTILS_DIR)/configure $(NFSUTILS_AUTOCONF)
@@ -103,7 +104,7 @@ $(STATEDIR)/nfsutils.prepare: $(nfsutils_prepare_deps)
nfsutils_compile: $(STATEDIR)/nfsutils.compile
$(STATEDIR)/nfsutils.compile: $(STATEDIR)/nfsutils.prepare
- @$(call targetinfo, nfsutils.compile)
+ @$(call targetinfo, $@)
$(NFSUTILS_PATH) make -C $(NFSUTILS_DIR)
touch $@
@@ -114,7 +115,7 @@ $(STATEDIR)/nfsutils.compile: $(STATEDIR)/nfsutils.prepare
nfsutils_install: $(STATEDIR)/nfsutils.install
$(STATEDIR)/nfsutils.install: $(STATEDIR)/nfsutils.compile
- @$(call targetinfo, nfsutils.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -124,7 +125,7 @@ $(STATEDIR)/nfsutils.install: $(STATEDIR)/nfsutils.compile
nfsutils_targetinstall: $(STATEDIR)/nfsutils.targetinstall
$(STATEDIR)/nfsutils.targetinstall: $(STATEDIR)/nfsutils.install
- @$(call targetinfo, nfsutils.targetinstall)
+ @$(call targetinfo, $@)
mkdir -p $(ROOTDIR)/etc/init.d
ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_CLIENTSCRIPT))
@@ -140,23 +141,23 @@ $(STATEDIR)/nfsutils.targetinstall: $(STATEDIR)/nfsutils.install
mkdir -p $(ROOTDIR)/sbin
ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_EXPORTFS))
install $(NFSUTILS_DIR)/utils/exportfs/exportfs $(ROOTDIR)/sbin/
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/exportfs
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/exportfs
endif
ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_LOCKD))
install $(NFSUTILS_DIR)/utils/lockd/lockd $(ROOTDIR)/sbin/
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/lockd
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/lockd
endif
ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_MOUNTD))
install $(NFSUTILS_DIR)/utils/mountd/mountd $(ROOTDIR)/sbin/
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/mountd
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/mountd
endif
ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NFSD))
install $(NFSUTILS_DIR)/utils/nfsd/nfsd $(ROOTDIR)/sbin/
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/nfsd
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/nfsd
endif
ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NFSSTAT))
install $(NFSUTILS_DIR)/utils/nfsstat/nfsstat $(ROOTDIR)/sbin/
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/nfsstat
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/nfsstat
endif
ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSGRAPH))
# don't strip, this is a shell script
@@ -172,15 +173,15 @@ $(STATEDIR)/nfsutils.targetinstall: $(STATEDIR)/nfsutils.install
endif
ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NHFSSTONE))
install $(NFSUTILS_DIR)/utils/nhfsstone/nhfsstone $(ROOTDIR)/sbin/
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/nhfsstone
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/nhfsstone
endif
ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_SHOWMOUNT))
install $(NFSUTILS_DIR)/utils/showmount/showmount $(ROOTDIR)/sbin/
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/showmount
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/showmount
endif
ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_STATD))
install $(NFSUTILS_DIR)/utils/statd/statd $(ROOTDIR)/sbin/
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/statd
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/statd
endif
# create stuff necessary for nfs
mkdir -p $(ROOTDIR)/var/lib/nfs
diff --git a/rules/nmap.make b/rules/nmap.make
new file mode 100644
index 000000000..d54cf4932
--- /dev/null
+++ b/rules/nmap.make
@@ -0,0 +1,143 @@
+# -*-makefile-*-
+# $id$
+#
+# Copyright (C) 2003 Ixia Corporation (www.ixiacom.com), by Milan Bobde
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_NMAP
+PACKAGES += nmap
+endif
+
+#
+# Paths and names
+#
+NMAP = nmap-3.46
+NMAP_URL = http://download.insecure.org/nmap/dist/nmap-3.46.tgz
+NMAP_SOURCE = $(SRCDIR)/$(NMAP).tgz
+NMAP_DIR = $(BUILDDIR)/$(NMAP)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+nmap_get: $(STATEDIR)/nmap.get
+
+nmap_get_deps = $(NMAP_SOURCE)
+
+$(STATEDIR)/nmap.get: $(nmap_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(NMAP_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(NMAP_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+nmap_extract: $(STATEDIR)/nmap.extract
+
+$(STATEDIR)/nmap.extract: $(STATEDIR)/nmap.get
+ @$(call targetinfo, $@)
+ @$(call clean, $(NMAP_DIR))
+ @$(call extract, $(NMAP_SOURCE))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+nmap_prepare: $(STATEDIR)/nmap.prepare
+
+NMAP_AUTOCONF = --prefix=/usr
+NMAP_AUTOCONF += --build=$(GNU_HOST)
+NMAP_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
+NMAP_AUTOCONF += --with-pcap=linux
+
+NMAP_PATH = PATH=$(CROSS_PATH)
+NMAP_ENV = $(CROSS_ENV)
+NMAP_ENV += ac_cv_linux_vers=$(KERNEL_VERSION_MAJOR)
+
+nmap_prepare_deps = \
+ $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/nmap.extract \
+ $(STATEDIR)/libpcap.install
+
+ifdef PTXCONF_OPENSSL_SHARED
+NMAP_AUTOCONF += --with-openssl
+nmap_prepare_deps += $(STATEDIR)/openssl.install
+else
+NMAP_AUTOCONF += --without-openssl
+endif
+
+$(STATEDIR)/nmap.prepare: $(nmap_prepare_deps)
+ @$(call targetinfo, $@)
+ cd $(NMAP_DIR) && \
+ $(NMAP_PATH) $(NMAP_ENV) \
+ ./configure $(NMAP_AUTOCONF)
+#
+# Kludge:
+# touch 3 files to avoid cross build failure
+#
+ touch $(NMAP_DIR)/libpcre/dftables.o
+ sleep 1
+ touch $(NMAP_DIR)/libpcre/dftables
+ sleep 1
+ touch $(NMAP_DIR)/libpcre/chartables.c
+
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+nmap_compile: $(STATEDIR)/nmap.compile
+
+nmap_compile_deps = $(STATEDIR)/nmap.prepare
+
+$(STATEDIR)/nmap.compile: $(nmap_compile_deps)
+ @$(call targetinfo, $@)
+ $(NMAP_PATH) make -C $(NMAP_DIR) nmap
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+nmap_install: $(STATEDIR)/nmap.install
+
+$(STATEDIR)/nmap.install: $(STATEDIR)/nmap.compile
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+nmap_targetinstall: $(STATEDIR)/nmap.targetinstall
+
+$(STATEDIR)/nmap.targetinstall: $(STATEDIR)/nmap.install
+ @$(call targetinfo, $@)
+
+ install -d $(ROOTDIR)/usr/bin
+
+ install $(NMAP_DIR)/nmap $(ROOTDIR)/usr/bin/nmap
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+nmap_clean:
+ rm -rf $(STATEDIR)/nmap.* $(NMAP_DIR)
+
+# vim: syntax=make
diff --git a/rules/openssh.make b/rules/openssh.make
index fa2e92f92..279a1974f 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: openssh.make,v 1.9 2003/07/23 12:39:06 mkl Exp $
+# $Id: openssh.make,v 1.10 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
diff --git a/rules/openssl.make b/rules/openssl.make
index de9f992da..861db840e 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -1,17 +1,19 @@
# -*-makefile-*-
-# $Id: openssl.make,v 1.7 2003/07/16 04:23:28 mkl Exp $
+# $Id: openssl.make,v 1.8 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2002 by Jochen Striepe for Pengutronix e.K., Hildesheim, Germany
+# 2003 by Pengutronix e.K., Hildesheim, Germany
#
-# (c) 2002 by Jochen Striepe for Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y,$(PTXCONF_OPENSSL))
+ifdef PTXCONF_OPENSSL
PACKAGES += openssl
endif
@@ -38,7 +40,9 @@ endif
ifeq (y,$(PTXCONF_ARCH_PPC))
THUD = linux-ppc
endif
-
+ifeq (y,$(PTXCONF_ARCH_SPARC))
+ THUD = linux-sparcv7
+endif
# ----------------------------------------------------------------------------
# Get
# ----------------------------------------------------------------------------
@@ -46,11 +50,11 @@ endif
openssl_get: $(STATEDIR)/openssl.get
$(STATEDIR)/openssl.get: $(OPENSSL_SOURCE)
- @$(call targetinfo, openssl.get)
+ @$(call targetinfo, $@)
touch $@
$(OPENSSL_SOURCE):
- @$(call targetinfo, $(OPENSSL_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(OPENSSL_URL))
# ----------------------------------------------------------------------------
@@ -60,9 +64,10 @@ $(OPENSSL_SOURCE):
openssl_extract: $(STATEDIR)/openssl.extract
$(STATEDIR)/openssl.extract: $(STATEDIR)/openssl.get
- @$(call targetinfo, openssl.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(OPENSSL_DIR))
@$(call extract, $(OPENSSL_SOURCE))
+ perl -p -i -e 's/-m486//' $(OPENSSL_DIR)/Configure
touch $@
# ----------------------------------------------------------------------------
@@ -79,12 +84,21 @@ openssl_prepare_deps = \
OPENSSL_PATH = PATH=$(CROSS_PATH)
OPENSSL_MAKEVARS= $(CROSS_ENV_CC) $(CROSS_ENV_RANLIB) AR='$(PTXCONF_GNU_TARGET)-ar r'
+OPENSSL_AUTOCONF = \
+ --prefix=/usr \
+# --openssldir=/etc/ssl
+
+ifdef PTXCONF_OPENSSL_SHARED
+OPENSSL_AUTOCONF += shared
+else
+OPENSSL_AUTOCONF += no-shared
+endif
+
$(STATEDIR)/openssl.prepare: $(openssl_prepare_deps)
- @$(call targetinfo, openssl.prepare)
- perl -p -i -e 's/-m486//' $(OPENSSL_DIR)/Configure
+ @$(call targetinfo, $@)
cd $(OPENSSL_DIR) && \
$(OPENSSL_PATH) \
- ./Configure $(THUD) --prefix=$(CROSS_LIB_DIR) no-shared
+ ./Configure $(THUD) $(OPENSSL_AUTOCONF)
touch $@
# ----------------------------------------------------------------------------
@@ -94,7 +108,7 @@ $(STATEDIR)/openssl.prepare: $(openssl_prepare_deps)
openssl_compile: $(STATEDIR)/openssl.compile
$(STATEDIR)/openssl.compile: $(STATEDIR)/openssl.prepare
- @$(call targetinfo, openssl.compile)
+ @$(call targetinfo, $@)
$(OPENSSL_PATH) make -C $(OPENSSL_DIR) $(OPENSSL_MAKEVARS)
touch $@
@@ -105,8 +119,8 @@ $(STATEDIR)/openssl.compile: $(STATEDIR)/openssl.prepare
openssl_install: $(STATEDIR)/openssl.install
$(STATEDIR)/openssl.install: $(STATEDIR)/openssl.compile
- @$(call targetinfo, openssl.install)
- $(OPENSSL_PATH) make -C $(OPENSSL_DIR) install $(OPENSSL_MAKEVARS)
+ @$(call targetinfo, $@)
+ $(OPENSSL_PATH) make -C $(OPENSSL_DIR) install $(OPENSSL_MAKEVARS) INSTALL_PREFIX=$(CROSS_LIB_DIR) INSTALLTOP=''
touch $@
# ----------------------------------------------------------------------------
@@ -116,8 +130,7 @@ $(STATEDIR)/openssl.install: $(STATEDIR)/openssl.compile
openssl_targetinstall: $(STATEDIR)/openssl.targetinstall
$(STATEDIR)/openssl.targetinstall: $(STATEDIR)/openssl.install
- @$(call targetinfo, openssl.targetinstall)
- echo NO TARGET INSTALL FOR STATIC LIBS
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/oprofile.make b/rules/oprofile.make
index f3b4e59e4..cc22dee50 100644
--- a/rules/oprofile.make
+++ b/rules/oprofile.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: oprofile.make,v 1.1 2003/08/26 13:03:52 bsp Exp $
+# $Id: oprofile.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
+# Copyright (C) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,11 +35,11 @@ oprofile_get: $(STATEDIR)/oprofile.get
oprofile_get_deps = $(OPROFILE_SOURCE)
$(STATEDIR)/oprofile.get: $(oprofile_get_deps)
- @$(call targetinfo, oprofile.get)
+ @$(call targetinfo, $@)
touch $@
$(OPROFILE_SOURCE):
- @$(call targetinfo, $(OPROFILE_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(OPROFILE_URL))
# ----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ oprofile_extract: $(STATEDIR)/oprofile.extract
oprofile_extract_deps = $(STATEDIR)/oprofile.get
$(STATEDIR)/oprofile.extract: $(oprofile_extract_deps)
- @$(call targetinfo, oprofile.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(OPROFILE_DIR))
@$(call extract, $(OPROFILE_SOURCE))
touch $@
@@ -66,15 +66,14 @@ oprofile_prepare: $(STATEDIR)/oprofile.prepare
# dependencies
#
oprofile_prepare_deps = \
- $(STATEDIR)/oprofile.extract \
+ $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/binutils.install \
$(STATEDIR)/popt.install \
$(STATEDIR)/kernel.prepare \
- $(STATEDIR)/binutils.install
+ $(STATEDIR)/oprofile.extract
OPROFILE_PATH = PATH=$(CROSS_PATH)
OPROFILE_ENV = $(CROSS_ENV)
-#OPROFILE_ENV +=
-
#
# autoconf
@@ -84,10 +83,17 @@ OPROFILE_AUTOCONF += --build=$(GNU_HOST)
OPROFILE_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
OPROFILE_AUTOCONF += --with-linux=$(KERNEL_DIR)
+#
+# note: we must use here the kernel's makevars (ARCH=fo CROSS_COMPILE=bar)
+# (see kernel.make) because oprofile includes the kernel's makefile
+# in it's modules subdir, and there it doesn't care about the CC
+# we gave him at ./configure-time....
+#
+OPROFILE_MAKEVARS = $(KERNEL_MAKEVARS)
$(STATEDIR)/oprofile.prepare: $(oprofile_prepare_deps)
- @$(call targetinfo, oprofile.prepare)
- @$(call clean, $(OPROFILE_BUILDDIR))
+ @$(call targetinfo, $@)
+ @$(call clean, $(OPROFILE_DIR)/config.cache)
cd $(OPROFILE_DIR) && \
$(OPROFILE_PATH) $(OPROFILE_ENV) \
./configure $(OPROFILE_AUTOCONF)
@@ -102,8 +108,8 @@ oprofile_compile: $(STATEDIR)/oprofile.compile
oprofile_compile_deps = $(STATEDIR)/oprofile.prepare
$(STATEDIR)/oprofile.compile: $(oprofile_compile_deps)
- @$(call targetinfo, oprofile.compile)
- $(OPROFILE_PATH) $(OPROFILE_ENV) make -C $(OPROFILE_DIR)
+ @$(call targetinfo, $@)
+ $(OPROFILE_PATH) make -C $(OPROFILE_DIR) $(OPROFILE_MAKEVARS)
touch $@
# ----------------------------------------------------------------------------
@@ -113,8 +119,8 @@ $(STATEDIR)/oprofile.compile: $(oprofile_compile_deps)
oprofile_install: $(STATEDIR)/oprofile.install
$(STATEDIR)/oprofile.install: $(STATEDIR)/oprofile.compile
- @$(call targetinfo, oprofile.install)
- $(OPROFILE_PATH) $(OPROFILE_ENV) make -C $(OPROFILE_DIR) install
+ @$(call targetinfo, $@)
+ $(OPROFILE_PATH) make -C $(OPROFILE_DIR) install
touch $@
# ----------------------------------------------------------------------------
@@ -126,7 +132,7 @@ oprofile_targetinstall: $(STATEDIR)/oprofile.targetinstall
oprofile_targetinstall_deps = $(STATEDIR)/oprofile.compile
$(STATEDIR)/oprofile.targetinstall: $(oprofile_targetinstall_deps)
- @$(call targetinfo, oprofile.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/pango12.make b/rules/pango12.make
index bc894e590..0738aac15 100644
--- a/rules/pango12.make
+++ b/rules/pango12.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: pango12.make,v 1.2 2003/08/17 00:32:04 robert Exp $
+# $Id: pango12.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
-# Pengutronix <info@pengutronix.de>, Germany
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -40,17 +40,17 @@ pango12_get_deps = $(PANGO12_SOURCE)
pango12_get_deps += $(PANGO12_PATCH_SOURCE)
$(STATEDIR)/pango12.get: $(pango12_get_deps)
- @$(call targetinfo, pango12.get)
+ @$(call targetinfo, $@)
touch $@
$(PANGO12_SOURCE):
- @$(call targetinfo, $(PANGO12_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(PANGO12_URL))
$(PANGO12_PATCH_SOURCE):
- @$(call targetinfo, $(PANGO12_PATCH_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(PANGO12_PATCH_URL))
-
+
# ----------------------------------------------------------------------------
# Extract
# ----------------------------------------------------------------------------
@@ -60,7 +60,7 @@ pango12_extract: $(STATEDIR)/pango12.extract
pango12_extract_deps = $(STATEDIR)/pango12.get
$(STATEDIR)/pango12.extract: $(pango12_extract_deps)
- @$(call targetinfo, pango12.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(PANGO12_DIR))
@$(call extract, $(PANGO12_SOURCE))
cd $(PANGO12_DIR) && patch -p1 < $(PANGO12_PATCH_SOURCE)
@@ -78,8 +78,8 @@ pango12_prepare: $(STATEDIR)/pango12.prepare
pango12_prepare_deps = \
$(STATEDIR)/pango12.extract \
$(STATEDIR)/glib22.install \
+ $(STATEDIR)/virtual-xchain.install
# $(STATEDIR)/fontconfig22.install \
-# $(STATEDIR)/virtual-xchain.install
PANGO12_PATH = PATH=$(CROSS_PATH)
PANGO12_ENV = $(CROSS_ENV)
@@ -97,7 +97,7 @@ PANGO12_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
PANGO12_AUTOCONF += --x-includes=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include
$(STATEDIR)/pango12.prepare: $(pango12_prepare_deps)
- @$(call targetinfo, pango12.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(PANGO12_BUILDDIR))
cd $(PANGO12_DIR) && \
$(PANGO12_PATH) $(PANGO12_ENV) \
@@ -113,17 +113,17 @@ pango12_compile: $(STATEDIR)/pango12.compile
pango12_compile_deps = $(STATEDIR)/pango12.prepare
$(STATEDIR)/pango12.compile: $(pango12_compile_deps)
- @$(call targetinfo, pango12.compile)
+ @$(call targetinfo, $@)
- # FIXME: feed upstream; these links are expected by gtk and seem
- # to have been forgetten.
+# FIXME: feed upstream; these links are expected by gtk and seem
+# to have been forgetten.
ln -sf libpangoxft-1.0.la $(PANGO12_DIR)/pango/libpangoxft.la
ln -sf libpango-1.0.la $(PANGO12_DIR)/pango/libpango.la
ln -sf libpangox-1.0.la $(PANGO12_DIR)/pango/libpangox.la
-
+
$(PANGO12_PATH) $(PANGO12_ENV) make -C $(PANGO12_DIR)
- # FIXME: let gtk not see xft
+# FIXME: let gtk not see xft
cd $(PANGO12_DIR) && mv pangoxft-uninstalled.pc NOINST-pangoxft-uninstalled.pc
cd $(PANGO12_DIR) && mv pangoxft.pc NOINST-pangoxft.pc
@@ -136,8 +136,8 @@ $(STATEDIR)/pango12.compile: $(pango12_compile_deps)
pango12_install: $(STATEDIR)/pango12.install
$(STATEDIR)/pango12.install: $(STATEDIR)/pango12.compile
- @$(call targetinfo, pango12.install)
-
+ @$(call targetinfo, $@)
+
install -d $(PTXCONF_PREFIX)/$(PTX_GNU_TARGET)/lib
rm -f $(PTXCONF_PREFIX)/$(PTX_GNU_TARGET)/lib/libpango-1.0.so*
install $(PANGO12_DIR)/pango/.libs/libpango-1.0.so.0.200.3 $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib/
@@ -158,7 +158,7 @@ pango12_targetinstall: $(STATEDIR)/pango12.targetinstall
pango12_targetinstall_deps = $(STATEDIR)/pango12.compile
$(STATEDIR)/pango12.targetinstall: $(pango12_targetinstall_deps)
- @$(call targetinfo, pango12.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)/lib
rm -f $(ROOTDIR)/lib/libpango-1.0.so*
install $(PANGO12_DIR)/pango/.libs/libpango-1.0.so.0.200.3 $(ROOTDIR)/lib/
diff --git a/rules/pcmcia-cs.make b/rules/pcmcia-cs.make
index 9ff007554..40527e71a 100644
--- a/rules/pcmcia-cs.make
+++ b/rules/pcmcia-cs.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: pcmcia-cs.make,v 1.1 2003/09/25 06:14:49 robert Exp $
+# $Id: pcmcia-cs.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -67,7 +67,7 @@ pcmcia-cs_prepare: $(STATEDIR)/pcmcia-cs.prepare
#
pcmcia-cs_prepare_deps = \
$(STATEDIR)/pcmcia-cs.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
PCMCIA-CS_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
PCMCIA-CS_ENV = $(CROSS_ENV)
diff --git a/rules/pdksh.make b/rules/pdksh.make
index a8e1fd637..63461a868 100644
--- a/rules/pdksh.make
+++ b/rules/pdksh.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: pdksh.make,v 1.8 2003/08/29 19:05:15 mkl Exp $
+# $Id: pdksh.make,v 1.9 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
-# (c) 2003 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
+# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -32,11 +32,11 @@ PDKSH_EXTRACT = gzip -dc
pdksh_get: $(STATEDIR)/pdksh.get
$(STATEDIR)/pdksh.get: $(PDKSH_SOURCE)
- @$(call targetinfo, pdksh.get)
+ @$(call targetinfo, $@)
touch $@
$(PDKSH_SOURCE):
- @$(call targetinfo, $(PDKSH_SOURCE))
+ @$(call targetinfo, $@)
wget -P $(SRCDIR) $(PASSIVEFTP) $(PDKSH_URL)
# ----------------------------------------------------------------------------
@@ -46,7 +46,7 @@ $(PDKSH_SOURCE):
pdksh_extract: $(STATEDIR)/pdksh.extract
$(STATEDIR)/pdksh.extract: $(STATEDIR)/pdksh.get
- @$(call targetinfo, pdksh.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(PDKSH_DIR))
$(PDKSH_EXTRACT) $(PDKSH_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
touch $@
@@ -115,7 +115,7 @@ pdksh_prepare_deps = $(STATEDIR)/pdksh.extract
pdksh_prepare_deps += $(STATEDIR)/virtual-xchain.install
$(STATEDIR)/pdksh.prepare: $(pdksh_prepare_deps)
- @$(call targetinfo, pdksh.prepare)
+ @$(call targetinfo, $@)
mkdir -p $(BUILDDIR)/$(PDKSH)
cd $(PDKSH_DIR) && \
$(PDKSH_PATH) $(PDKSH_ENV) \
@@ -131,7 +131,7 @@ pdksh_compile_deps = $(STATEDIR)/pdksh.prepare
pdksh_compile: $(STATEDIR)/pdksh.compile
$(STATEDIR)/pdksh.compile: $(STATEDIR)/pdksh.prepare
- @$(call targetinfo, pdksh.compile)
+ @$(call targetinfo, $@)
$(PDKSH_PATH) make -C $(PDKSH_DIR)
touch $@
@@ -142,7 +142,7 @@ $(STATEDIR)/pdksh.compile: $(STATEDIR)/pdksh.prepare
pdksh_install: $(STATEDIR)/pdksh.install
$(STATEDIR)/pdksh.install: $(STATEDIR)/pdksh.compile
- @$(call targetinfo, pdksh.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -152,10 +152,10 @@ $(STATEDIR)/pdksh.install: $(STATEDIR)/pdksh.compile
pdksh_targetinstall: $(STATEDIR)/pdksh.targetinstall
$(STATEDIR)/pdksh.targetinstall: $(STATEDIR)/pdksh.install
- @$(call targetinfo, pdksh.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)/bin
install $(PDKSH_DIR)/ksh $(ROOTDIR)/bin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/bin/ksh
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/bin/ksh
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/penguzilla.make b/rules/penguzilla.make
index 172db8893..14387f1fd 100644
--- a/rules/penguzilla.make
+++ b/rules/penguzilla.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: penguzilla.make,v 1.2 2003/09/02 14:13:08 robert Exp $
+# $Id: penguzilla.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,11 +35,11 @@ penguzilla_get: $(STATEDIR)/penguzilla.get
penguzilla_get_deps = $(PENGUZILLA_SOURCE)
$(STATEDIR)/penguzilla.get: $(penguzilla_get_deps)
- @$(call targetinfo, penguzilla.get)
+ @$(call targetinfo, $@)
touch $@
$(PENGUZILLA_SOURCE):
- @$(call targetinfo, $(PENGUZILLA_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(PENGUZILLA_URL))
# ----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ penguzilla_extract: $(STATEDIR)/penguzilla.extract
penguzilla_extract_deps = $(STATEDIR)/penguzilla.get
$(STATEDIR)/penguzilla.extract: $(penguzilla_extract_deps)
- @$(call targetinfo, penguzilla.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(PENGUZILLA_DIR))
@$(call extract, $(PENGUZILLA_SOURCE))
touch $@
@@ -67,7 +67,7 @@ penguzilla_prepare: $(STATEDIR)/penguzilla.prepare
#
penguzilla_prepare_deps = \
$(STATEDIR)/penguzilla.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
PENGUZILLA_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
PENGUZILLA_ENV = $(CROSS_ENV)
@@ -85,7 +85,7 @@ PENGUZILLA_AUTOCONF += --with-mozilla=$(MFIREBIRD_DIR)
PENGUZILLA_AUTOCONF += --with-gtk-prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
$(STATEDIR)/penguzilla.prepare: $(penguzilla_prepare_deps)
- @$(call targetinfo, penguzilla.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(PENGUZILLA_BUILDDIR))
cd $(PENGUZILLA_DIR) && \
$(PENGUZILLA_PATH) $(PENGUZILLA_ENV) \
@@ -101,7 +101,7 @@ penguzilla_compile: $(STATEDIR)/penguzilla.compile
penguzilla_compile_deps = $(STATEDIR)/penguzilla.prepare
$(STATEDIR)/penguzilla.compile: $(penguzilla_compile_deps)
- @$(call targetinfo, penguzilla.compile)
+ @$(call targetinfo, $@)
$(PENGUZILLA_PATH) $(PENGUZILLA_ENV) make -C $(PENGUZILLA_DIR)
touch $@
@@ -112,7 +112,7 @@ $(STATEDIR)/penguzilla.compile: $(penguzilla_compile_deps)
penguzilla_install: $(STATEDIR)/penguzilla.install
$(STATEDIR)/penguzilla.install: $(STATEDIR)/penguzilla.compile
- @$(call targetinfo, penguzilla.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -124,9 +124,9 @@ penguzilla_targetinstall: $(STATEDIR)/penguzilla.targetinstall
penguzilla_targetinstall_deps = $(STATEDIR)/penguzilla.compile
$(STATEDIR)/penguzilla.targetinstall: $(penguzilla_targetinstall_deps)
- @$(call targetinfo, penguzilla.targetinstall)
+ @$(call targetinfo, $@)
- # pixmap directory
+# pixmap directory
install -d $(ROOTDIR)/usr/share/penguzilla/pixmaps
install $(PENGUZILLA_DIR)/pixmaps/* $(ROOTDIR)/usr/share/penguzilla/pixmaps
@@ -134,9 +134,9 @@ $(STATEDIR)/penguzilla.targetinstall: $(penguzilla_targetinstall_deps)
install $(PENGUZILLA_DIR)/src/penguzilla $(ROOTDIR)/usr/bin/
install $(PENGUZILLA_DIR)/src/penguzilla_bin $(ROOTDIR)/usr/lib/mozilla-1.5a/
- # Style
+# Style
install $(PENGUZILLA_DIR)/gtkrc $(ROOTDIR)/.gtkrc
-
+
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/popt.make b/rules/popt.make
index 1b43e2491..a7c691848 100644
--- a/rules/popt.make
+++ b/rules/popt.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: popt.make,v 1.2 2003/08/28 14:27:29 mkl Exp $
+# $Id: popt.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
+# Copyright (C) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,11 +35,11 @@ popt_get: $(STATEDIR)/popt.get
popt_get_deps = $(POPT_SOURCE)
$(STATEDIR)/popt.get: $(popt_get_deps)
- @$(call targetinfo, popt.get)
+ @$(call targetinfo, $@)
touch $@
$(POPT_SOURCE):
- @$(call targetinfo, $(POPT_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(POPT_URL))
# ----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ popt_extract: $(STATEDIR)/popt.extract
popt_extract_deps = $(STATEDIR)/popt.get
$(STATEDIR)/popt.extract: $(popt_extract_deps)
- @$(call targetinfo, popt.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(POPT_DIR))
@$(call extract, $(POPT_SOURCE))
touch $@
@@ -71,8 +71,6 @@ popt_prepare_deps = \
POPT_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
POPT_ENV = $(CROSS_ENV)
-#POPT_ENV +=
-
#
# autoconf
@@ -82,8 +80,8 @@ POPT_AUTOCONF += --build=$(GNU_HOST)
POPT_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
$(STATEDIR)/popt.prepare: $(popt_prepare_deps)
- @$(call targetinfo, popt.prepare)
- @$(call clean, $(POPT_BUILDDIR))
+ @$(call targetinfo, $@)
+ @$(call clean, $(POP_DIR)/config.cache)
cd $(POPT_DIR) && \
$(POPT_PATH) $(POPT_ENV) \
./configure $(POPT_AUTOCONF)
@@ -98,8 +96,8 @@ popt_compile: $(STATEDIR)/popt.compile
popt_compile_deps = $(STATEDIR)/popt.prepare
$(STATEDIR)/popt.compile: $(popt_compile_deps)
- @$(call targetinfo, popt.compile)
- $(POPT_PATH) $(POPT_ENV) make -C $(POPT_DIR)
+ @$(call targetinfo, $@)
+ $(POPT_PATH) make -C $(POPT_DIR)
touch $@
# ----------------------------------------------------------------------------
@@ -109,8 +107,8 @@ $(STATEDIR)/popt.compile: $(popt_compile_deps)
popt_install: $(STATEDIR)/popt.install
$(STATEDIR)/popt.install: $(STATEDIR)/popt.compile
- @$(call targetinfo, popt.install)
- $(POPT_PATH) $(POPT_ENV) make -C $(POPT_DIR) install
+ @$(call targetinfo, $@)
+ $(POPT_PATH) make -C $(POPT_DIR) install
touch $@
# ----------------------------------------------------------------------------
@@ -122,7 +120,7 @@ popt_targetinstall: $(STATEDIR)/popt.targetinstall
popt_targetinstall_deps = $(STATEDIR)/popt.compile
$(STATEDIR)/popt.targetinstall: $(popt_targetinstall_deps)
- @$(call targetinfo, popt.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/portmap.make b/rules/portmap.make
index d16282d91..571c264a7 100644
--- a/rules/portmap.make
+++ b/rules/portmap.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: portmap.make,v 1.6 2003/09/17 23:43:59 mkl Exp $
+# $Id: portmap.make,v 1.7 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -30,11 +30,11 @@ PORTMAP_DIR = $(BUILDDIR)/$(PORTMAP)
portmap_get: $(STATEDIR)/portmap.get
$(STATEDIR)/portmap.get: $(PORTMAP_SOURCE)
- @$(call targetinfo, portmap.get)
+ @$(call targetinfo, $@)
touch $@
$(PORTMAP_SOURCE):
- @$(call targetinfo, $(PORTMAP_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(PORTMAP_URL))
# ----------------------------------------------------------------------------
@@ -44,7 +44,7 @@ $(PORTMAP_SOURCE):
portmap_extract: $(STATEDIR)/portmap.extract
$(STATEDIR)/portmap.extract: $(STATEDIR)/portmap.get
- @$(call targetinfo, portmap.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(PORTMAP_DIR))
@$(call extract, $(PORTMAP_SOURCE))
# apply some fixes
@@ -67,7 +67,7 @@ portmap_prepare_deps = \
$(STATEDIR)/portmap.extract
$(STATEDIR)/portmap.prepare: $(portmap_prepare_deps)
- @$(call targetinfo, portmap.prepare)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -81,7 +81,7 @@ PORTMAP_PATH = PATH=$(CROSS_PATH)
PORTMAP_MAKEVARS = WRAP_DIR=$(CROSS_LIB_DIR)/lib
$(STATEDIR)/portmap.compile: $(STATEDIR)/portmap.prepare
- @$(call targetinfo, portmap.compile)
+ @$(call targetinfo, $@)
$(PORTMAP_ENV) $(PORTMAP_PATH) \
make -C $(PORTMAP_DIR) $(PORTMAP_MAKEVARS)
touch $@
@@ -93,7 +93,7 @@ $(STATEDIR)/portmap.compile: $(STATEDIR)/portmap.prepare
portmap_install: $(STATEDIR)/portmap.install
$(STATEDIR)/portmap.install: $(STATEDIR)/portmap.compile
- @$(call targetinfo, portmap.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -103,11 +103,11 @@ $(STATEDIR)/portmap.install: $(STATEDIR)/portmap.compile
portmap_targetinstall: $(STATEDIR)/portmap.targetinstall
$(STATEDIR)/portmap.targetinstall: $(STATEDIR)/portmap.install
- @$(call targetinfo, portmap.targetinstall)
+ @$(call targetinfo, $@)
ifdef PTXCONF_PORTMAP_INSTALL_PORTMAPPER
mkdir -p $(ROOTDIR)/sbin
install $(PORTMAP_DIR)/portmap $(ROOTDIR)/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/portmap
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/portmap
endif
touch $@
diff --git a/rules/pppd.make b/rules/pppd.make
index 1620e7f10..92837b30e 100644
--- a/rules/pppd.make
+++ b/rules/pppd.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: pppd.make,v 1.3 2003/07/23 12:39:06 mkl Exp $
+# $Id: pppd.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
# GYRO net GmbH <info@gyro-net.de>, Hannover, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -33,11 +33,12 @@ ppp_get: $(STATEDIR)/ppp.get
ppp_get_deps = $(PPP_SOURCE)
$(STATEDIR)/ppp.get: $(ppp_get_deps)
- @$(call targetinfo, ppp.get)
+ @$(call targetinfo, $@)
+ @$(call get_patches, $(PPP))
touch $@
$(PPP_SOURCE):
- @$(call targetinfo, $(PPP_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(PPP_URL))
# ----------------------------------------------------------------------------
@@ -47,9 +48,10 @@ $(PPP_SOURCE):
ppp_extract: $(STATEDIR)/ppp.extract
$(STATEDIR)/ppp.extract: $(STATEDIR)/ppp.get
- @$(call targetinfo, ppp.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(PPP_DIR))
@$(call extract, $(PPP_SOURCE))
+ @$(call patchin, $(PPP))
touch $@
# ----------------------------------------------------------------------------
@@ -64,7 +66,7 @@ PPP_MAKEVARS = CROSS=$(CROSS_ENV)
$(STATEDIR)/ppp.prepare: \
$(STATEDIR)/virtual-xchain.install \
$(STATEDIR)/ppp.extract
- @$(call targetinfo, ppp.prepare)
+ @$(call targetinfo, $@)
cd $(PPP_DIR) && \
./configure
@@ -108,7 +110,7 @@ ppp_compile: $(STATEDIR)/ppp.compile
ppp_compile_deps = $(STATEDIR)/ppp.prepare
$(STATEDIR)/ppp.compile: $(ppp_compile_deps)
- @$(call targetinfo, ppp.compile)
+ @$(call targetinfo, $@)
cd $(PPP_DIR) && \
$(PPP_PATH) make $(PPP_MAKEVARS)
touch $@
@@ -120,7 +122,7 @@ $(STATEDIR)/ppp.compile: $(ppp_compile_deps)
ppp_install: $(STATEDIR)/ppp.install
$(STATEDIR)/ppp.install: $(STATEDIR)/ppp.compile
- @$(call targetinfo, ppp.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -130,13 +132,13 @@ $(STATEDIR)/ppp.install: $(STATEDIR)/ppp.compile
ppp_targetinstall: $(STATEDIR)/ppp.targetinstall
$(STATEDIR)/ppp.targetinstall: $(STATEDIR)/ppp.compile
- @$(call targetinfo, ppp.targetinstalll)
- mkdir -p $(ROOTDIR)/sbin
- install $(PPP_DIR)/pppd/pppd $(ROOTDIR)/sbin/
- $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/pppd
+ @$(call targetinfo, $@)
+ mkdir -p $(ROOTDIR)/usr/sbin
+ install $(PPP_DIR)/pppd/pppd $(ROOTDIR)/usr/sbin/
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/pppd
- install $(PPP_DIR)/chat/chat $(ROOTDIR)/sbin/
- $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/chat
+ install $(PPP_DIR)/chat/chat $(ROOTDIR)/usr/sbin/
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/chat
touch $@
diff --git a/rules/procps.in b/rules/procps.in
new file mode 100644
index 000000000..4bbbfa1a6
--- /dev/null
+++ b/rules/procps.in
@@ -0,0 +1,21 @@
+menu "procps "
+
+config PROCPS
+ bool
+ prompt "Compile procps"
+
+config PROCPS_TOP
+ bool
+ prompt "top"
+ depends on PROCPS
+
+config PROCPS_SLABTOP
+ bool
+ prompt "slabtop"
+ depends on PROCPS
+
+config PROCPS_SYSCTL
+ bool
+ prompt "sysctl"
+ depends on PROCPS
+endmenu
diff --git a/rules/procps.make b/rules/procps.make
new file mode 100644
index 000000000..3223a5391
--- /dev/null
+++ b/rules/procps.make
@@ -0,0 +1,167 @@
+# -*-makefile-*-
+# $Id: procps.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 Ixia Corporation, by Milan Bobde
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_PROCPS
+PACKAGES += procps
+endif
+
+#
+# Paths and names
+#
+PROCPS_VERSION = 2.0.16
+PROCPS = procps-$(PROCPS_VERSION)
+PROCPS_SUFFIX = tar.gz
+PROCPS_URL = http://www.tech9.net/rml/procps/packages/2.0.16/$(PROCPS).$(PROCPS_SUFFIX)
+PROCPS_SOURCE = $(SRCDIR)/$(PROCPS).$(PROCPS_SUFFIX)
+PROCPS_DIR = $(BUILDDIR)/$(PROCPS)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+procps_get: $(STATEDIR)/procps.get
+
+procps_get_deps = $(PROCPS_SOURCE)
+
+$(STATEDIR)/procps.get: $(procps_get_deps)
+ @$(call targetinfo, $@)
+ @$(call get_patches, $(PROCPS))
+ touch $@
+
+$(PROCPS_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(PROCPS_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+procps_extract: $(STATEDIR)/procps.extract
+
+procps_extract_deps = $(STATEDIR)/procps.get
+
+$(STATEDIR)/procps.extract: $(procps_extract_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(PROCPS_DIR))
+ @$(call extract, $(PROCPS_SOURCE))
+ @$(call patchin, $(PROCPS))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+procps_prepare: $(STATEDIR)/procps.prepare
+
+#
+# dependencies
+#
+procps_prepare_deps = \
+ $(STATEDIR)/procps.extract \
+ $(STATEDIR)/ncurses.install \
+ $(STATEDIR)/virtual-xchain.install
+
+PROCPS_PATH = PATH=$(CROSS_PATH)
+#
+# we must override INCDIR because in the orig Makefile they contain a
+# path to the host include path
+#
+PROCPS_MAKEVERS = $(CROSS_ENV) INCDIRS=''
+
+#
+# autoconf
+#
+PROCPS_AUTOCONF = --prefix=$(CROSS_LIB_DIR)
+PROCPS_AUTOCONF += --build=$(GNU_HOST)
+PROCPS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
+
+$(STATEDIR)/procps.prepare: $(procps_prepare_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(PROCPS_BUILDDIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+procps_compile: $(STATEDIR)/procps.compile
+
+procps_compile_deps = $(STATEDIR)/procps.prepare
+
+$(STATEDIR)/procps.compile: $(procps_compile_deps)
+ @$(call targetinfo, $@)
+
+ifdef PTXCONF_PROCPS_TOP
+ $(PROCPS_PATH) make -C $(PROCPS_DIR) $(PROCPS_MAKEVERS) top
+endif
+ifdef PTXCONF_PROCPS_SLABTOP
+ $(PROCPS_PATH) make -C $(PROCPS_DIR) $(PROCPS_MAKEVERS) slabtop
+endif
+ifdef PTXCONF_PROCPS_SYSCTL
+ $(PROCPS_PATH) make -C $(PROCPS_DIR) $(PROCPS_MAKEVERS) sysctl
+endif
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+procps_install: $(STATEDIR)/procps.install
+
+$(STATEDIR)/procps.install: $(STATEDIR)/procps.compile
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+procps_targetinstall: $(STATEDIR)/procps.targetinstall
+
+procps_targetinstall_deps = \
+ $(STATEDIR)/procps.compile \
+ $(STATEDIR)/ncurses.targetinstall
+
+$(STATEDIR)/procps.targetinstall: $(procps_targetinstall_deps)
+ @$(call targetinfo, $@)
+ install -d $(ROOTDIR)/usr/bin
+ install -d $(ROOTDIR)/sbin
+
+ install -d $(ROOTDIR)/lib
+ cp -d $(PROCPS_DIR)/proc/libproc*so* $(ROOTDIR)/lib
+
+ifdef PTXCONF_PROCPS_TOP
+ install -D $(PROCPS_DIR)/top $(ROOTDIR)/usr/bin/top
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/top
+endif
+
+ifdef PTXCONF_PROCPS_SLABTOP
+ install -D $(PROCPS_DIR)/slabtop $(ROOTDIR)/usr/bin/slabtop
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/slabtop
+endif
+ifdef PTXCONF_PROCPS_SYSCTL
+ install -D $(PROCPS_DIR)/sysctl $(ROOTDIR)/sbin/sysctl
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/sysctl
+endif
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+procps_clean:
+ rm -rf $(STATEDIR)/procps.*
+ rm -rf $(PROCPS_DIR)
+
+# vim: syntax=make
diff --git a/rules/proftpd.make b/rules/proftpd.make
index b12e583d5..7ae52984c 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: proftpd.make,v 1.4 2003/07/16 04:23:28 mkl Exp $
+# $Id: proftpd.make,v 1.5 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
diff --git a/rules/python.make b/rules/python.make
index 8b4bd57a8..1238a5a37 100644
--- a/rules/python.make
+++ b/rules/python.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: python.make,v 1.4 2003/09/16 16:42:38 mkl Exp $
+# $Id: python.make,v 1.5 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by David R Bacon
+# Copyright (C) 2003 by David R Bacon
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -37,12 +37,12 @@ python_get_deps = \
$(PYTHON_SOURCE)
$(STATEDIR)/python.get: $(python_get_deps)
- @$(call targetinfo, python.get)
+ @$(call targetinfo, $@)
@$(call get_patches, $(PYTHON))
touch $@
$(PYTHON_SOURCE):
- @$(call targetinfo, $(PYTHON_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(PYTHON_URL))
# ----------------------------------------------------------------------------
@@ -55,7 +55,7 @@ python_extract_deps = \
$(STATEDIR)/python.get
$(STATEDIR)/python.extract: $(python_extract_deps)
- @$(call targetinfo, python.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(PYTHON_DIR))
@$(call extract, $(PYTHON_SOURCE))
@$(call patchin, $(PYTHON))
@@ -87,7 +87,7 @@ PYTHON_MAKEVARS += HOSTPGEN=$(XCHAIN_PYTHON_BUILDDIR)/Parser/pgen
PYTHON_MAKEVARS += CROSS_COMPILE=yes
$(STATEDIR)/python.prepare: $(python_prepare_deps)
- @$(call targetinfo, python.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(PYTHON_BUILDDIR))
mkdir -p $(PYTHON_BUILDDIR)
cd $(PYTHON_BUILDDIR) && \
@@ -106,7 +106,7 @@ python_compile_deps = \
$(STATEDIR)/python.prepare
$(STATEDIR)/python.compile: $(python_compile_deps)
- @$(call targetinfo, python.compile)
+ @$(call targetinfo, $@)
$(PYTHON_PATH) make -C $(PYTHON_BUILDDIR) $(PYTHON_MAKEVARS)
touch $@
@@ -117,7 +117,7 @@ $(STATEDIR)/python.compile: $(python_compile_deps)
python_install: $(STATEDIR)/python.install
$(STATEDIR)/python.install:
- @$(call targetinfo, python.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -127,7 +127,7 @@ $(STATEDIR)/python.install:
python_targetinstall: $(STATEDIR)/python.targetinstall
$(STATEDIR)/python.targetinstall: $(STATEDIR)/python.compile
- @$(call targetinfo, python.targetinstall)
+ @$(call targetinfo, $@)
$(PYTHON_PATH) make -C $(PYTHON_BUILDDIR) $(PYTHON_MAKEVARS) \
altbininstall DESTDIR=$(ROOTDIR)
@@ -145,7 +145,7 @@ $(STATEDIR)/python.targetinstall: $(STATEDIR)/python.compile
$(PYTHON_PATH) make -C $(PYTHON_BUILDDIR) $(PYTHON_MAKEVARS) \
oldsharedinstall DESTDIR=$(ROOTDIR)
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/bin/python2.3
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/python2.3
touch $@
diff --git a/rules/qt.make b/rules/qt.make
index 8d09c48c3..4b490edad 100644
--- a/rules/qt.make
+++ b/rules/qt.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: qt.make,v 1.1 2003/08/26 13:20:12 robert Exp $
+# $Id: qt.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,11 +35,11 @@ qt_get: $(STATEDIR)/qt.get
qt_get_deps = $(QT_SOURCE)
$(STATEDIR)/qt.get: $(qt_get_deps)
- @$(call targetinfo, qt.get)
+ @$(call targetinfo, $@)
touch $@
$(QT_SOURCE):
- @$(call targetinfo, $(QT_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(QT_URL))
# ----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ qt_extract: $(STATEDIR)/qt.extract
qt_extract_deps = $(STATEDIR)/qt.get
$(STATEDIR)/qt.extract: $(qt_extract_deps)
- @$(call targetinfo, qt.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(QT_DIR))
@$(call extract, $(QT_SOURCE))
touch $@
@@ -67,7 +67,7 @@ qt_prepare: $(STATEDIR)/qt.prepare
#
qt_prepare_deps = \
$(STATEDIR)/qt.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
QT_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
QT_ENV = $(CROSS_ENV)
@@ -98,7 +98,7 @@ QT_AUTOCONF += -no-qvfb
QT_AUTOCONF += -xplatform linux-g++
$(STATEDIR)/qt.prepare: $(qt_prepare_deps)
- @$(call targetinfo, qt.prepare)
+ @$(call targetinfo, $@)
cd $(QT_DIR) && \
echo "yes" | $(QT_PATH) $(QT_ENV) \
./configure $(QT_AUTOCONF)
@@ -113,7 +113,7 @@ qt_compile: $(STATEDIR)/qt.compile
qt_compile_deps = $(STATEDIR)/qt.prepare
$(STATEDIR)/qt.compile: $(qt_compile_deps)
- @$(call targetinfo, qt.compile)
+ @$(call targetinfo, $@)
$(QT_PATH) $(QT_ENV) make -C $(QT_DIR)
touch $@
@@ -124,7 +124,7 @@ $(STATEDIR)/qt.compile: $(qt_compile_deps)
qt_install: $(STATEDIR)/qt.install
$(STATEDIR)/qt.install: $(STATEDIR)/qt.compile
- @$(call targetinfo, qt.install)
+ @$(call targetinfo, $@)
$(QT_PATH) $(QT_ENV) make -C $(QT_DIR) install
touch $@
@@ -137,7 +137,7 @@ qt_targetinstall: $(STATEDIR)/qt.targetinstall
qt_targetinstall_deps = $(STATEDIR)/qt.compile
$(STATEDIR)/qt.targetinstall: $(qt_targetinstall_deps)
- @$(call targetinfo, qt.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/rootfs.make b/rules/rootfs.make
index ce8b15215..43586bf76 100644
--- a/rules/rootfs.make
+++ b/rules/rootfs.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: rootfs.make,v 1.5 2003/08/17 00:32:04 robert Exp $
+# $Id: rootfs.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -29,11 +29,11 @@ ROOTFS_EXTRACT = gzip -dc
rootfs_get: $(STATEDIR)/rootfs.get
$(STATEDIR)/rootfs.get: $(ROOTFS_SOURCE)
- @$(call targetinfo, rootfs.get)
+ @$(call targetinfo, $@)
touch $@
$(ROOTFS_SOURCE):
- @$(call targetinfo, $(ROOTFS_SOURCE))
+ @$(call targetinfo, $@)
wget -P $(SRCDIR) $(PASSIVEFTP) $(ROOTFS_URL)
# ----------------------------------------------------------------------------
@@ -43,7 +43,7 @@ $(ROOTFS_SOURCE):
rootfs_extract: $(STATEDIR)/rootfs.extract
$(STATEDIR)/rootfs.extract: $(STATEDIR)/rootfs.get
- @$(call targetinfo, rootfs.extract)
+ @$(call targetinfo, $@)
$(ROOTFS_EXTRACT) $(ROOTFS_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
touch $@
@@ -54,7 +54,7 @@ $(STATEDIR)/rootfs.extract: $(STATEDIR)/rootfs.get
rootfs_prepare: $(STATEDIR)/rootfs.prepare
$(STATEDIR)/rootfs.prepare: $(STATEDIR)/rootfs.extract
- @$(call targetinfo, rootfs.prepare)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -64,7 +64,7 @@ $(STATEDIR)/rootfs.prepare: $(STATEDIR)/rootfs.extract
rootfs_compile: $(STATEDIR)/rootfs.compile
$(STATEDIR)/rootfs.compile: $(STATEDIR)/rootfs.prepare
- @$(call targetinfo, rootfs.compile)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -74,7 +74,7 @@ $(STATEDIR)/rootfs.compile: $(STATEDIR)/rootfs.prepare
rootfs_install: $(STATEDIR)/rootfs.install
$(STATEDIR)/rootfs.install: $(STATEDIR)/rootfs.compile
- @$(call targetinfo, rootfs.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -84,7 +84,7 @@ $(STATEDIR)/rootfs.install: $(STATEDIR)/rootfs.compile
rootfs_targetinstall: $(STATEDIR)/rootfs.targetinstall
$(STATEDIR)/rootfs.targetinstall: $(STATEDIR)/rootfs.install
- @$(call targetinfo, rootfs.targetinstall)
+ @$(call targetinfo, $@)
ifeq (y, $(PTXCONF_ROOTFS_PROC))
mkdir -p $(ROOTDIR)/proc
endif
diff --git a/rules/rsync.in b/rules/rsync.in
new file mode 100644
index 000000000..e4da6829d
--- /dev/null
+++ b/rules/rsync.in
@@ -0,0 +1,7 @@
+menu "rsync "
+
+config RSYNC
+ bool
+ prompt "Compile rsync"
+
+endmenu
diff --git a/rules/rsync.make b/rules/rsync.make
new file mode 100644
index 000000000..657a4b86b
--- /dev/null
+++ b/rules/rsync.make
@@ -0,0 +1,139 @@
+# -*-makefile-*-
+# $Id: rsync.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by wschmitt@envicomp.de
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_RSYNC
+PACKAGES += rsync
+endif
+
+#
+# Paths and names
+#
+RSYNC_VERSION = 2.5.6
+RSYNC = rsync-$(RSYNC_VERSION)
+RSYNC_SUFFIX = tar.gz
+RSYNC_URL = http://samba.anu.edu.au/ftp/rsync/$(RSYNC).$(RSYNC_SUFFIX)
+RSYNC_SOURCE = $(SRCDIR)/$(RSYNC).$(RSYNC_SUFFIX)
+RSYNC_DIR = $(BUILDDIR)/$(RSYNC)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+rsync_get: $(STATEDIR)/rsync.get
+
+rsync_get_deps = $(RSYNC_SOURCE)
+
+$(STATEDIR)/rsync.get: $(rsync_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(RSYNC_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(RSYNC_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+rsync_extract: $(STATEDIR)/rsync.extract
+
+rsync_extract_deps = $(STATEDIR)/rsync.get
+
+$(STATEDIR)/rsync.extract: $(rsync_extract_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(RSYNC_DIR))
+ @$(call extract, $(RSYNC_SOURCE))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+rsync_prepare: $(STATEDIR)/rsync.prepare
+
+#
+# dependencies
+#
+rsync_prepare_deps = \
+ $(STATEDIR)/rsync.extract \
+ $(STATEDIR)/virtual-xchain.install
+
+RSYNC_PATH = PATH=$(CROSS_PATH)
+RSYNC_ENV = rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes $(CROSS_ENV)
+
+#
+# autoconf
+#
+RSYNC_AUTOCONF = --prefix=/usr
+RSYNC_AUTOCONF += --build=$(GNU_HOST)
+RSYNC_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
+RSYNC_AUTOCONF += --target=$(PTXCONF_GNU_TARGET)
+RSYNC_AUTOCONF += --with-included-popt
+
+
+$(STATEDIR)/rsync.prepare: $(rsync_prepare_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(RSYNC_BUILDDIR))
+ cd $(RSYNC_DIR) && \
+ $(RSYNC_PATH) $(RSYNC_ENV) \
+ ./configure $(RSYNC_AUTOCONF)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+rsync_compile: $(STATEDIR)/rsync.compile
+
+rsync_compile_deps = $(STATEDIR)/rsync.prepare
+
+$(STATEDIR)/rsync.compile: $(rsync_compile_deps)
+ @$(call targetinfo, $@)
+ $(RSYNC_PATH) make -C $(RSYNC_DIR)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+rsync_install: $(STATEDIR)/rsync.install
+
+$(STATEDIR)/rsync.install: $(STATEDIR)/rsync.compile
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+rsync_targetinstall: $(STATEDIR)/rsync.targetinstall
+
+rsync_targetinstall_deps = $(STATEDIR)/rsync.compile
+
+$(STATEDIR)/rsync.targetinstall: $(rsync_targetinstall_deps)
+ @$(call targetinfo, $@)
+ mkdir -p $(ROOTDIR)/usr/bin
+ install $(RSYNC_DIR)/rsync $(ROOTDIR)/usr/bin/rsync
+ $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/rsync
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+rsync_clean:
+ rm -rf $(STATEDIR)/rsync.*
+ rm -rf $(RSYNC_DIR)
+
+# vim: syntax=make
diff --git a/rules/rtai.make b/rules/rtai.make
index e452b34a5..fe97a2a48 100644
--- a/rules/rtai.make
+++ b/rules/rtai.make
@@ -1,48 +1,56 @@
# -*-makefile-*-
-# $Id: rtai.make,v 1.7 2003/08/26 13:23:59 robert Exp $
+# $Id: rtai.make,v 1.8 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y,$(PTXCONF_RTAI))
+ifdef PTXCONF_RTAI
PACKAGES += rtai
endif
#
# Paths and names
#
-ifeq (y, $(PTXCONF_RTAI_24_1_11))
-RTAI = rtai-24.1.11
-endif
-ifeq (y, $(PTXCONF_RTAI_24_1_10))
-RTAI = rtai-24.1.10
-endif
-ifeq (y, $(PTXCONF_RTAI_24_1_9))
-RTAI = rtai-24.1.9
-endif
-RTAI_URL = http://www.aero.polimi.it/RTAI/$(RTAI).tgz
-RTAI_SOURCE = $(SRCDIR)/$(RTAI).tgz
+RTAI_VERSION = $(RTAI_VERSION_RELEASE)
+RTAI = rtai-$(RTAI_VERSION)
+RTAI_SUFFIX = tgz
+RTAI_URL = http://www.aero.polimi.it/RTAI/$(RTAI).$(RTAI_SUFFIX)
+RTAI_SOURCE = $(SRCDIR)/$(RTAI).$(RTAI_SUFFIX)
RTAI_DIR = $(BUILDDIR)/$(RTAI)
-RTAI_EXTRACT = gzip -dc
-ifeq (y, $(PTXCONF_KERNEL_2_4_18))
-RTAI_MODULEDIR = /lib/modules/2.4.18-rthal5/rtai
-endif
-ifeq (y, $(PTXCONF_KERNEL_2_4_19))
-RTAI_MODULEDIR = /lib/modules/2.4.19-rthal5/rtai
-endif
-ifeq (y, $(PTXCONF_KERNEL_2_4_20))
-RTAI_MODULEDIR = /lib/modules/2.4.20-rthal5/rtai
-endif
-ifeq (y, $(PTXCONF_KERNEL_2_4_21))
-RTAI_MODULEDIR = /lib/modules/2.4.21-rthal5/rtai
-endif
+RTAI_MODULEDIR = /lib/modules/$(KERNEL_VERSION)-$(RTAI_TECH_SHORT)/rtai
+RTAI_PATCH = $(RTAI_DIR)/patches/patch-$(KERNEL_VERSION)-$(RTAI_TECH)
+
+# ----------------------------------------------------------------------------
+# Menuconfig
+# ----------------------------------------------------------------------------
+#
+# FIXME: not tested
+#
+# rtai_menuconfig: $(STATEDIR)/rtai.prepare
+# @if [ -f $(TOPDIR)/config/rtai/$(PTXCONF_RTAI_CONFIG) ]; then \
+# install -m 644 $(TOPDIR)/config/rtai/$(PTXCONF_RTAI_CONFIG) \
+# $(RTAI_DIR)/.config; \
+# fi
+
+# $(RTAI_PATH) make -C $(RTAI_DIR) $(RTAI_MAKEVARS) \
+# menuconfig
+
+# @if [ -f $(RTAI_DIR)/.config ]; then \
+# install -m 644 $(RTAI_DIR)/.config \
+# $(TOPDIR)/config/rtai/$(PTXCONF_RTAI_CONFIG); \
+# fi
+
+# @if [ -f $(STATEDIR)/rtai.compile ]; then \
+# rm $(STATEDIR)/rtai.compile; \
+# fi
# ----------------------------------------------------------------------------
# Get
@@ -51,12 +59,12 @@ endif
rtai_get: $(STATEDIR)/rtai.get
$(STATEDIR)/rtai.get: $(RTAI_SOURCE)
- @$(call targetinfo, rtai.get)
+ @$(call targetinfo, $@)
touch $@
$(RTAI_SOURCE):
- @$(call targetinfo, $(RTAI_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(RTAI_URL)
+ @$(call targetinfo, $@)
+ @$(call get, $(RTAI_URL))
# ----------------------------------------------------------------------------
# Extract
@@ -65,8 +73,9 @@ $(RTAI_SOURCE):
rtai_extract: $(STATEDIR)/rtai.extract
$(STATEDIR)/rtai.extract: $(STATEDIR)/rtai.get
- @$(call targetinfo, rtai.extract)
- $(RTAI_EXTRACT) $(RTAI_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
+ @$(call targetinfo, $@)
+ @$(call clean, $(RTAI_DIR))
+ @$(call extract, $(RTAI_SOURCE))
touch $@
# ----------------------------------------------------------------------------
@@ -75,22 +84,32 @@ $(STATEDIR)/rtai.extract: $(STATEDIR)/rtai.get
rtai_prepare: $(STATEDIR)/rtai.prepare
-rtai_prepare_deps = $(STATEDIR)/kernel.prepare
-rtai_prepare_deps += $(STATEDIR)/rtai.extract
+RTAI_PATH = PATH=$(CROSS_PATH)
+RTAI_ENV = \
+ ARCH=$(PTXCONF_ARCH) \
+ CROSS_COMPILE=$(PTXCONF_GNU_TARGET)- \
+ LINUXDIR=$(KERNEL_DIR) \
+ MAKE='make CROSS_COMPILE=$(PTXCONF_GNU_TARGET)-'
+
+rtai_prepare_deps = \
+ $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/kernel.prepare \
+ $(STATEDIR)/rtai.extract
$(STATEDIR)/rtai.prepare: $(rtai_prepare_deps)
- @$(call targetinfo, rtai.prepare)
- install .rtaiconfig $(RTAI_DIR)
- cd $(RTAI_DIR) && \
- yes no | ./configure --non-interactive --linuxdir $(KERNEL_DIR) --reconf
- # FIXME: spaces in pathnames are forbidden right now...
- echo '# this is ugly like hell and committed by ptxdist' >> $(RTAI_DIR)/.buildvars
- # we honestly doubt anyone of them has ever used a cross compiler...
- echo CC=$(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-gcc >> $(RTAI_DIR)/.buildvars
- echo CROSS_COMPILE=$(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)- >> $(RTAI_DIR)/.buildvars
- echo LD=$(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-ld >> $(RTAI_DIR)/.buildvars
- echo AS=$(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-as >> $(RTAI_DIR)/.buildvars
- # FIXME: Hopefully someone will fix this one:
+ @$(call targetinfo, $@)
+
+ if [ -f $(TOPDIR)/config/rtai/$(PTXCONF_RTAI_CONFIG) ]; then \
+ install -m 644 $(TOPDIR)/config/rtai/$(PTXCONF_RTAI_CONFIG) \
+ $(RTAI_DIR)/.config; \
+ fi
+
+ cd $(RTAI_DIR) && \
+ yes no | $(RTAI_PATH) $(RTAI_ENV) ./configure --reconf
+
+#
+# FIXME: Hopefully someone will fix this one:
+#
cp -f $(RTAI_DIR)/lxrt/Makefile $(RTAI_DIR)/lxrt/Makefile.orig
sed -e "s/pressa//g" $(RTAI_DIR)/lxrt/Makefile.orig >$(RTAI_DIR)/lxrt/Makefile
touch $@
@@ -102,8 +121,8 @@ $(STATEDIR)/rtai.prepare: $(rtai_prepare_deps)
rtai_compile: $(STATEDIR)/rtai.compile
$(STATEDIR)/rtai.compile: $(STATEDIR)/rtai.prepare
- @$(call targetinfo, rtai.compile)
- cd $(RTAI_DIR) && TOPDIR=$(RTAI_DIR) PATH=$(PTXCONF_PREFIX)/bin:$$PATH make
+ @$(call targetinfo, $@)
+ $(RTAI_PATH) $(RTAI_ENV) TOPDIR=$(RTAI_DIR) make -C $(RTAI_DIR)
touch $@
# ----------------------------------------------------------------------------
@@ -113,7 +132,7 @@ $(STATEDIR)/rtai.compile: $(STATEDIR)/rtai.prepare
rtai_install: $(STATEDIR)/rtai.install
$(STATEDIR)/rtai.install: $(STATEDIR)/rtai.compile
- @$(call targetinfo, rtai.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -123,22 +142,24 @@ $(STATEDIR)/rtai.install: $(STATEDIR)/rtai.compile
rtai_targetinstall: $(STATEDIR)/rtai.targetinstall
$(STATEDIR)/rtai.targetinstall: $(STATEDIR)/rtai.install
- @$(call targetinfo, rtai.targetinstall)
+ @$(call targetinfo, $@)
mkdir -p $(ROOTDIR)/$(RTAI_MODULEDIR)
+
install $(RTAI_DIR)/rtaidir/rtai.o $(ROOTDIR)/$(RTAI_MODULEDIR)
$(CROSSSTRIP) -S $(ROOTDIR)/$(RTAI_MODULEDIR)/rtai.o
+
install $(RTAI_DIR)/upscheduler/rtai_sched_up.o $(ROOTDIR)/$(RTAI_MODULEDIR)
$(CROSSSTRIP) -S $(ROOTDIR)/$(RTAI_MODULEDIR)/rtai_sched_up.o
ln -sf rtai_sched_up.o $(ROOTDIR)/$(RTAI_MODULEDIR)/rtai_sched.o
- ifeq (y, $(PTXCONF_RTAI_24_1_9))
+
+ifeq ($(RTAI_VERSION_RELEASE),24.1.9)
install $(RTAI_DIR)/lxrt/rtai_lxrt.o $(ROOTDIR)/$(RTAI_MODULEDIR)
$(CROSSSTRIP) -S $(ROOTDIR)/$(RTAI_MODULEDIR)/rtai_lxrt.o
- endif
- ifeq (y, $(PTXCONF_RTAI_24_1_10))
+else
install $(RTAI_DIR)/lxrt/rtai_lxrt_old.o $(ROOTDIR)/$(RTAI_MODULEDIR)
$(CROSSSTRIP) -S $(ROOTDIR)/$(RTAI_MODULEDIR)/rtai_lxrt_old.o
ln -sf rtai_lxrt_old.o $(ROOTDIR)/$(RTAI_MODULEDIR)/rtai_lxrt.o
- endif
+endif
touch $@
# ----------------------------------------------------------------------------
@@ -148,7 +169,4 @@ $(STATEDIR)/rtai.targetinstall: $(STATEDIR)/rtai.install
rtai_clean:
rm -rf $(STATEDIR)/rtai.* $(RTAI_DIR)
-rtai_kernel_clean:
- rm -fr $(STATEDIR)/rtai_kernel.* $(BUILDDIR)/rtai-patches/
-
# vim: syntax=make
diff --git a/rules/shorewall.make b/rules/shorewall.make
index 87b0d4a83..bcfb17fff 100644
--- a/rules/shorewall.make
+++ b/rules/shorewall.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: shorewall.make,v 1.3 2003/09/27 16:34:16 mkl Exp $
+# $Id: shorewall.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Dan Kegel, Ixia Communications (http://ixiacom.com)
+# Copyright (C) 2003 by Dan Kegel, Ixia Communications (http://ixiacom.com)
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -84,7 +84,6 @@ shorewall_targetinstall: $(STATEDIR)/shorewall.targetinstall
shorewall_targetinstall_deps = $(STATEDIR)/shorewall.extract
-
#
# create /etc/shorewall directory before installing to keep it from
# using build system's chkconfig script to install itself!
diff --git a/rules/strace.make b/rules/strace.make
index f0e8b5eca..e8c9fe4fd 100644
--- a/rules/strace.make
+++ b/rules/strace.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: strace.make,v 1.4 2003/09/18 00:37:40 mkl Exp $
+# $Id: strace.make,v 1.5 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
-# (c) 2003 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
+# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -31,12 +31,12 @@ STRACE_DIR = $(BUILDDIR)/$(STRACE)
strace_get: $(STATEDIR)/strace.get
$(STATEDIR)/strace.get: $(STRACE_SOURCE)
- @$(call targetinfo, strace.get)
+ @$(call targetinfo, $@)
@$(call get_patches, $(STRACE))
touch $@
$(STRACE_SOURCE):
- @$(call targetinfo, $(STRACE_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(STRACE_URL))
# ----------------------------------------------------------------------------
@@ -49,7 +49,7 @@ strace_extract_deps = \
$(STATEDIR)/strace.get
$(STATEDIR)/strace.extract: $(strace_extract_deps)
- @$(call targetinfo, strace.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(STRACE_DIR))
@$(call extract, $(STRACE_SOURCE))
@$(call patchin, $(STRACE))
@@ -68,6 +68,10 @@ strace_prepare_deps = \
STRACE_PATH = PATH=$(CROSS_PATH)
STRACE_ENV = $(CROSS_ENV)
+ifndef PTXCONF_STRACE_SHARED
+STRACE_ENV = LDFLAGS=-static
+endif
+
STRACE_AUTOCONF = --build=$(GNU_HOST)
STRACE_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
STRACE_AUTOCONF += --target=$(PTXCONF_GNU_TARGET)
@@ -75,7 +79,7 @@ STRACE_AUTOCONF += --disable-sanity-checks
STRACE_AUTOCONF += --prefix=/
$(STATEDIR)/strace.prepare: $(strace_prepare_deps)
- @$(call targetinfo, strace.prepare)
+ @$(call targetinfo, $@)
cd $(STRACE_DIR) && \
$(STRACE_PATH) $(STRACE_ENV) \
./configure $(STRACE_AUTOCONF)
@@ -88,7 +92,7 @@ $(STATEDIR)/strace.prepare: $(strace_prepare_deps)
strace_compile: $(STATEDIR)/strace.compile
$(STATEDIR)/strace.compile: $(STATEDIR)/strace.prepare
- @$(call targetinfo, strace.compile)
+ @$(call targetinfo, $@)
$(STRACE_PATH) $(STRACE_ENV) make -C $(STRACE_DIR)
touch $@
@@ -99,7 +103,7 @@ $(STATEDIR)/strace.compile: $(STATEDIR)/strace.prepare
strace_install: $(STATEDIR)/strace.install
$(STATEDIR)/strace.install: $(STATEDIR)/strace.compile
- @$(call targetinfo, strace.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -109,7 +113,7 @@ $(STATEDIR)/strace.install: $(STATEDIR)/strace.compile
strace_targetinstall: $(STATEDIR)/strace.targetinstall
$(STATEDIR)/strace.targetinstall: $(STATEDIR)/strace.compile
- @$(call targetinfo, strace.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)/bin
install $(STRACE_DIR)/strace $(ROOTDIR)/bin
$(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/bin/strace
diff --git a/rules/tcpwrapper.make b/rules/tcpwrapper.make
index a3792a106..76ac225d0 100644
--- a/rules/tcpwrapper.make
+++ b/rules/tcpwrapper.make
@@ -1,17 +1,17 @@
# -*-makefile-*-
-# $Id: tcpwrapper.make,v 1.8 2003/09/17 23:43:59 mkl Exp $
+# $Id: tcpwrapper.make,v 1.9 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y, $(PTXCONF_TCPWRAPPER))
+ifdef PTXCONF_TCPWRAPPER
PACKAGES += tcpwrapper
endif
@@ -34,15 +34,15 @@ TCPWRAPPER_PTXPATCH_SOURCE = $(SRCDIR)/$(TCPWRAPPER_PTXPATCH).diff
tcpwrapper_get: $(STATEDIR)/tcpwrapper.get
$(STATEDIR)/tcpwrapper.get: $(TCPWRAPPER_SOURCE) $(TCPWRAPPER_PTXPATCH_SOURCE)
- @$(call targetinfo, tcpwrapper.get)
+ @$(call targetinfo, $@)
touch $@
$(TCPWRAPPER_SOURCE):
- @$(call targetinfo, $(TCPWRAPPER_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(TCPWRAPPER_URL))
$(TCPWRAPPER_PTXPATCH_SOURCE):
- @$(call targetinfo, $(TCPWRAPPER_PTXPATCH_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(TCPWRAPPER_PTXPATCH_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ $(TCPWRAPPER_PTXPATCH_SOURCE):
tcpwrapper_extract: $(STATEDIR)/tcpwrapper.extract
$(STATEDIR)/tcpwrapper.extract: $(STATEDIR)/tcpwrapper.get
- @$(call targetinfo, tcpwrapper.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(TCPWRAPPER_DIR))
@$(call extract, $(TCPWRAPPER_SOURCE))
cd $(TCPWRAPPER_DIR) && patch -p1 < $(TCPWRAPPER_PTXPATCH_SOURCE)
@@ -65,7 +65,7 @@ $(STATEDIR)/tcpwrapper.extract: $(STATEDIR)/tcpwrapper.get
tcpwrapper_prepare: $(STATEDIR)/tcpwrapper.prepare
$(STATEDIR)/tcpwrapper.prepare: $(STATEDIR)/virtual-xchain.install $(STATEDIR)/tcpwrapper.extract
- @$(call targetinfo, tcpwrapper.prepare)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -78,7 +78,7 @@ TCPWRAPPER_ENV = $(CROSS_ENV)
TCPWRAPPER_PATH = PATH=$(CROSS_PATH)
$(STATEDIR)/tcpwrapper.compile: $(STATEDIR)/tcpwrapper.prepare
- @$(call targetinfo, tcpwrapper.compile)
+ @$(call targetinfo, $@)
$(TCPWRAPPER_PATH) $(TCPWRAPPER_ENV) \
make -C $(TCPWRAPPER_DIR) linux
touch $@
@@ -90,7 +90,7 @@ $(STATEDIR)/tcpwrapper.compile: $(STATEDIR)/tcpwrapper.prepare
tcpwrapper_install: $(STATEDIR)/tcpwrapper.install
$(STATEDIR)/tcpwrapper.install: $(STATEDIR)/tcpwrapper.compile
- @$(call targetinfo, tcpwrapper.install)
+ @$(call targetinfo, $@)
install -d $(CROSS_LIB_DIR)/lib
install $(TCPWRAPPER_DIR)/libwrap.a $(CROSS_LIB_DIR)/lib
touch $@
@@ -102,11 +102,11 @@ $(STATEDIR)/tcpwrapper.install: $(STATEDIR)/tcpwrapper.compile
tcpwrapper_targetinstall: $(STATEDIR)/tcpwrapper.targetinstall
$(STATEDIR)/tcpwrapper.targetinstall: $(STATEDIR)/tcpwrapper.install
- @$(call targetinfo, tcpwrapper.targetinstall)
+ @$(call targetinfo, $@)
ifdef PTXCONF_TCPWRAPPER_INSTALL_TCPD
mkdir -p $(ROOTDIR)/usr/sbin
install $(TCPWRAPPER_DIR)/tcpd $(ROOTDIR)/usr/sbin
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/usr/sbin/tcpd
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/tcpd
endif
touch $@
diff --git a/rules/template b/rules/template
index 511a0e52c..e36f52faa 100644
--- a/rules/template
+++ b/rules/template
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: template,v 1.6 2003/09/24 14:45:16 mkl Exp $
+# $Id: template,v 1.7 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by @AUTHOR@
+# Copyright (C) 2003 by @AUTHOR@
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -69,7 +69,7 @@ $(STATEDIR)/@packet@.extract: $(@packet@_extract_deps)
$(STATEDIR)/@packet@.extract \
$(STATEDIR)/virtual-xchain.install
-@PACKET@_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
+@PACKET@_PATH = PATH=$(CROSS_PATH)
@PACKET@_ENV = $(CROSS_ENV)
#@PACKET@_ENV +=
@@ -85,7 +85,7 @@ $(STATEDIR)/@packet@.extract: $(@packet@_extract_deps)
$(STATEDIR)/@packet@.prepare: $(@packet@_prepare_deps)
@$(call targetinfo, $@)
- @$(call clean, $(@PACKET@_BUILDDIR))
+ @$(call clean, $(@PACKET@_DIR)/config.cache)
cd $(@PACKET@_DIR) && \
$(@PACKET@_PATH) $(@PACKET@_ENV) \
./configure $(@PACKET@_AUTOCONF)
@@ -101,7 +101,7 @@ $(STATEDIR)/@packet@.prepare: $(@packet@_prepare_deps)
$(STATEDIR)/@packet@.compile: $(@packet@_compile_deps)
@$(call targetinfo, $@)
- $(@PACKET@_PATH) $(@PACKET@_ENV) make -C $(@PACKET@_DIR)
+ $(@PACKET@_PATH) make -C $(@PACKET@_DIR)
touch $@
# ----------------------------------------------------------------------------
@@ -112,7 +112,7 @@ $(STATEDIR)/@packet@.compile: $(@packet@_compile_deps)
$(STATEDIR)/@packet@.install: $(STATEDIR)/@packet@.compile
@$(call targetinfo, $@)
- $(@PACKET@_PATH) $(@PACKET@_ENV) make -C $(@PACKET@_DIR) install
+ $(@PACKET@_PATH) make -C $(@PACKET@_DIR) install
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/template-patch b/rules/template-patch
new file mode 100644
index 000000000..207afb56f
--- /dev/null
+++ b/rules/template-patch
@@ -0,0 +1,64 @@
+# -*-makefile-*-
+# $Id: template-patch,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by @AUTHOR@
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_@PACKET@_@PATCH@
+PATCHES += @patch@
+endif
+
+#
+# Paths and names
+#
+@PACKET@_@PATCH@_VERSION = $(call get_option, \
+ s/^PTXCONF_@PACKET@_\([0-9]\)_\([0-9]\)_\([0-9]\)_/\1.\2.\3/, @patch@)
+@PACKET@_@PATCH@ = @NAME@-$(@PACKET@_@PATCH@_VERSION)
+@PACKET@_@PATCH@_SUFFIX = @SUFFIX@
+@PACKET@_@PATCH@_URL = @URL@/$(@PACKET@_@PATCH@).$(@PACKET@_@PATCH@_SUFFIX)
+@PACKET@_@PATCH@_SOURCE = $(SRCDIR)/$(@PACKET@_@PATCH@).$(@PACKET@_@PATCH@_SUFFIX)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+@packet@-@patch@_get: $(STATEDIR)/@packet@-@patch@.get
+
+@packet@-@patch@_get_deps = \
+ $(@PACKET@_@PATCH@_SOURCE)
+
+$(STATEDIR)/@packet@-@patch@.get: $(@packet@-@patch@_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(@PACKET@_@PATCH@_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(@PACKET@_@PATCH@_URL))
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+@packet@-@patch@_install: $(STATEDIR)/@packet@-@patch@.install
+
+$(STATEDIR)/@packet@-@patch@.install: $(STATEDIR)/@packet@-@patch@.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(@PACKET@_@PATCH@_SOURCE), $(@PACKET@_DIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+@packet@-@patch@_clean:
+ rm -rf $(STATEDIR)/@packet@*
+
+# vim: syntax=make
diff --git a/rules/tinylogin.make b/rules/tinylogin.make
index c2d0412ea..58be73354 100644
--- a/rules/tinylogin.make
+++ b/rules/tinylogin.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: tinylogin.make,v 1.1 2003/07/16 04:23:28 mkl Exp $
+# $Id: tinylogin.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -33,11 +33,11 @@ tinylogin_get: $(STATEDIR)/tinylogin.get
tinylogin_get_deps = $(TINYLOGIN_SOURCE)
$(STATEDIR)/tinylogin.get: $(tinylogin_get_deps)
- @$(call targetinfo, tinylogin.get)
+ @$(call targetinfo, $@)
touch $@
$(TINYLOGIN_SOURCE):
- @$(call targetinfo, $(TINYLOGIN_SOURCE))
+ @$(call targetinfo, $@)
wget -P $(SRCDIR) $(PASSIVEFTP) $(TINYLOGIN_URL)
# ----------------------------------------------------------------------------
@@ -47,7 +47,7 @@ $(TINYLOGIN_SOURCE):
tinylogin_extract: $(STATEDIR)/tinylogin.extract
$(STATEDIR)/tinylogin.extract: $(STATEDIR)/tinylogin.get
- @$(call targetinfo, tinylogin.extract)
+ @$(call targetinfo, $@)
$(TINYLOGIN_EXTRACT) $(TINYLOGIN_SOURCE) | tar -C $(BUILDDIR) -xf -
touch $@
@@ -66,7 +66,7 @@ TINYLOGIN_MAKEVARS = CROSS=$(PTXCONF_GNU_TARGET)-
tinylogin_prepare_deps = $(STATEDIR)/tinylogin.extract $(STATEDIR)/virtual-xchain.install
$(STATEDIR)/tinylogin.prepare: $(tinylogin_prepare_deps)
- @$(call targetinfo, tinylogin.prepare)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -78,7 +78,7 @@ tinylogin_compile: $(STATEDIR)/tinylogin.compile
tinylogin_compile_deps = $(STATEDIR)/tinylogin.prepare
$(STATEDIR)/tinylogin.compile: $(tinylogin_compile_deps)
- @$(call targetinfo, tinylogin.compile)
+ @$(call targetinfo, $@)
$(TINYLOGIN_PATH) make -C $(TINYLOGIN_DIR) $(TINYLOGIN_MAKEVARS)
touch $@
@@ -89,7 +89,7 @@ $(STATEDIR)/tinylogin.compile: $(tinylogin_compile_deps)
tinylogin_install: $(STATEDIR)/tinylogin.install
$(STATEDIR)/tinylogin.install: $(STATEDIR)/tinylogin.compile
- @$(call targetinfo, tinylogin.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -99,7 +99,7 @@ $(STATEDIR)/tinylogin.install: $(STATEDIR)/tinylogin.compile
tinylogin_targetinstall: $(STATEDIR)/tinylogin.targetinstall
$(STATEDIR)/tinylogin.targetinstall: $(STATEDIR)/tinylogin.install
- @$(call targetinfo, tinylogin.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/u-boot-mkimage.make b/rules/u-boot-mkimage.make
deleted file mode 100644
index 23b151346..000000000
--- a/rules/u-boot-mkimage.make
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*-makefile-*-
-# $Id: u-boot-mkimage.make,v 1.6 2003/08/29 01:42:32 mkl Exp $
-#
-# (c) 2003 by Pengutronix e.K., Hildesheim, Germany
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXDIST project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-# PACKAGES += umkimage
-
-#
-# Paths and names
-#
-UMKIMAGE = u-boot-mkimage-20030424
-UMKIMAGE_URL = http://www.pengutronix.de/software/ptxdist/temporary-src/$(UMKIMAGE).tar.gz
-UMKIMAGE_SOURCE = $(SRCDIR)/$(UMKIMAGE).tar.gz
-UMKIMAGE_DIR = $(BUILDDIR)/$(UMKIMAGE)
-UMKIMAGE_EXTRACT = gzip -dc
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-umkimage_get: $(STATEDIR)/umkimage.get
-
-$(STATEDIR)/umkimage.get: $(UMKIMAGE_SOURCE)
- @$(call targetinfo, umkimage.get)
- touch $@
-
-$(UMKIMAGE_SOURCE):
- @$(call targetinfo, $(UMKIMAGE_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(UMKIMAGE_URL)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-umkimage_extract: $(STATEDIR)/umkimage.extract
-
-$(STATEDIR)/umkimage.extract: $(STATEDIR)/umkimage.get
- @$(call targetinfo, umkimage.extract)
- $(UMKIMAGE_EXTRACT) $(UMKIMAGE_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
- touch $@
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-umkimage_prepare: $(STATEDIR)/umkimage.prepare
-
-umkimage_prepare_deps = \
- $(STATEDIR)/umkimage.extract \
- $(STATEDIR)/xchain-zlib.install
-
-$(STATEDIR)/umkimage.prepare: $(umkimage_prepare_deps)
- @$(call targetinfo, umkimage.prepare)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-umkimage_compile: $(STATEDIR)/umkimage.compile
-
-$(STATEDIR)/umkimage.compile: $(STATEDIR)/umkimage.prepare
- @$(call targetinfo, umkimage.compile)
- # FIXME: no spaces in pathnames:
- CC=$(HOSTCC) CFLAGS=-I$(PTXCONF_PREFIX)/include LIBS=-L$(PTXCONF_PREFIX)/lib make -C $(UMKIMAGE_DIR)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-umkimage_install: $(STATEDIR)/umkimage.install
-
-$(STATEDIR)/umkimage.install: $(STATEDIR)/umkimage.compile
- @$(call targetinfo, umkimage.install)
- install $(UMKIMAGE_DIR)/mkimage $(PTXCONF_PREFIX)/bin/u-boot-mkimage
- touch $@
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-umkimage_targetinstall: $(STATEDIR)/umkimage.targetinstall
-
-$(STATEDIR)/umkimage.targetinstall: $(STATEDIR)/umkimage.install
- @$(call targetinfo, umkimage.targetinstall)
- touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-umkimage_clean:
- rm -rf $(STATEDIR)/umkimage.* $(UMKIMAGE_DIR)
-
-# vim: syntax=make
diff --git a/rules/uclibc.make b/rules/uclibc.make
index a3eafce83..e1b444aa4 100644
--- a/rules/uclibc.make
+++ b/rules/uclibc.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: uclibc.make,v 1.3 2003/09/16 16:43:00 mkl Exp $
+# $Id: uclibc.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -32,8 +32,6 @@ UCLIBC_URL = http://www.uclibc.org/downloads/$(UCLIBC).$(UCLIBC_SUFFIX)
UCLIBC_SOURCE = $(SRCDIR)/$(UCLIBC).$(UCLIBC_SUFFIX)
UCLIBC_DIR = $(BUILDDIR)/$(UCLIBC)
-UCLIBC_CRIS_PATCH_SOURCE = $(SRCDIR)/$(UCLIBC)-mkb1.patch
-
#
# uClibc config file fixup
#
@@ -48,7 +46,8 @@ uclibc_fix_config = \
#
# for uClibc that is used for the xchain
#
-xchain_uclibc_fix_config = \
+# FIXME: enable widechar support for c++
+xchain-uclibc_fix_config = \
@$(call uclibc_fix_config_general, $(1))
#
@@ -72,11 +71,12 @@ uclibc_get: $(STATEDIR)/uclibc.get
uclibc_get_deps = $(UCLIBC_SOURCE)
$(STATEDIR)/uclibc.get: $(uclibc_get_deps)
- @$(call targetinfo, uclibc.get)
+ @$(call targetinfo, $@)
+ @$(call get_patches, $(UCLIBC))
touch $@
$(UCLIBC_SOURCE):
- @$(call targetinfo, $(UCLIBC_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(UCLIBC_URL))
# ----------------------------------------------------------------------------
@@ -88,9 +88,10 @@ uclibc_extract: $(STATEDIR)/uclibc.extract
uclibc_extract_deps = $(STATEDIR)/uclibc.get
$(STATEDIR)/uclibc.extract: $(uclibc_extract_deps)
- @$(call targetinfo, uclibc.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(UCLIBC_DIR))
@$(call extract, $(UCLIBC_SOURCE))
+ @$(call patchin, $(UCLIBC))
touch $@
# ----------------------------------------------------------------------------
@@ -111,7 +112,7 @@ uclibc_prepare_deps = \
$(STATEDIR)/uclibc.prepare: $(uclibc_prepare_deps)
- @$(call targetinfo, uclibc.prepare)
+ @$(call targetinfo, $@)
grep -e PTXCONF_UCLIBC_ .config > $(UCLIBC_DIR)/.config
perl -i -p -e 's/PTXCONF_UCLIBC_//g' $(UCLIBC_DIR)/.config
@@ -129,7 +130,7 @@ uclibc_compile: $(STATEDIR)/uclibc.compile
uclibc_compile_deps = $(STATEDIR)/uclibc.prepare
$(STATEDIR)/uclibc.compile: $(uclibc_compile_deps)
- @$(call targetinfo, uclibc.compile)
+ @$(call targetinfo, $@)
$(UCLIBC_PATH) make -C $(UCLIBC_DIR) $(UCLIBC_MAKEVARS)
touch $@
@@ -140,7 +141,7 @@ $(STATEDIR)/uclibc.compile: $(uclibc_compile_deps)
uclibc_install: $(STATEDIR)/uclibc.install
$(STATEDIR)/uclibc.install:
- @$(call targetinfo, uclibc.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -150,7 +151,7 @@ $(STATEDIR)/uclibc.install:
uclibc_targetinstall: $(STATEDIR)/uclibc.targetinstall
$(STATEDIR)/uclibc.targetinstall: $(STATEDIR)/uclibc.compile
- @$(call targetinfo, uclibc.targetinstall)
+ @$(call targetinfo, $@)
mkdir -p $(ROOTDIR)/lib
install $(UCLIBC_DIR)/lib/ld-uClibc-$(UCLIBC_VERSION).so \
diff --git a/rules/utelnetd.make b/rules/utelnetd.make
index d94c83819..0013b899a 100644
--- a/rules/utelnetd.make
+++ b/rules/utelnetd.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: utelnetd.make,v 1.5 2003/07/16 04:23:28 mkl Exp $
+# $Id: utelnetd.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -31,11 +31,11 @@ UTELNETD_EXTRACT = gzip -dc
utelnetd_get: $(STATEDIR)/utelnetd.get
$(STATEDIR)/utelnetd.get: $(UTELNETD_SOURCE)
- @$(call targetinfo, utelnetd.get)
+ @$(call targetinfo, $@)
touch $@
$(UTELNETD_SOURCE):
- @$(call targetinfo, $(UTELNETD_SOURCE))
+ @$(call targetinfo, $@)
wget -P $(SRCDIR) $(PASSIVEFTP) $(UTELNETD_URL)
# ----------------------------------------------------------------------------
@@ -45,7 +45,7 @@ $(UTELNETD_SOURCE):
utelnetd_extract: $(STATEDIR)/utelnetd.extract
$(STATEDIR)/utelnetd.extract: $(STATEDIR)/utelnetd.get
- @$(call targetinfo, utelnetd.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(UTELNETS_DIR))
$(UTELNETD_EXTRACT) $(UTELNETD_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
touch $@
@@ -57,7 +57,7 @@ $(STATEDIR)/utelnetd.extract: $(STATEDIR)/utelnetd.get
utelnetd_prepare: $(STATEDIR)/utelnetd.prepare
$(STATEDIR)/utelnetd.prepare: $(STATEDIR)/virtual-xchain.install $(STATEDIR)/utelnetd.extract
- @$(call targetinfo, utelnetd.prepare)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -70,7 +70,7 @@ UTELNETD_ENVIRONMENT += PATH=$(PTXCONF_PREFIX)/bin:$$PATH
UTELNETD_MAKEVARS += CROSS=$(PTXCONF_GNU_TARGET)-
$(STATEDIR)/utelnetd.compile: $(STATEDIR)/utelnetd.prepare
- @$(call targetinfo, utelnetd.compile)
+ @$(call targetinfo, $@)
$(UTELNETD_ENVIRONMENT) make -C $(UTELNETD_DIR) $(UTELNETD_MAKEVARS)
touch $@
@@ -81,7 +81,7 @@ $(STATEDIR)/utelnetd.compile: $(STATEDIR)/utelnetd.prepare
utelnetd_install: $(STATEDIR)/utelnetd.install
$(STATEDIR)/utelnetd.install: $(STATEDIR)/utelnetd.compile
- @$(call targetinfo, utelnetd.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -91,10 +91,10 @@ $(STATEDIR)/utelnetd.install: $(STATEDIR)/utelnetd.compile
utelnetd_targetinstall: $(STATEDIR)/utelnetd.targetinstall
$(STATEDIR)/utelnetd.targetinstall: $(STATEDIR)/utelnetd.install
- @$(call targetinfo, utelnetd.targetinstall)
+ @$(call targetinfo, $@)
install -d $(ROOTDIR)/sbin/
install $(UTELNETD_DIR)/utelnetd $(ROOTDIR)/sbin/
- $(CROSSSTRIP) -R .notes -R .comment $(ROOTDIR)/sbin/utelnetd
+ $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/sbin/utelnetd
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/util-linux.make b/rules/util-linux.make
index 1bf8f0fc3..add477c44 100644
--- a/rules/util-linux.make
+++ b/rules/util-linux.make
@@ -1,28 +1,28 @@
# -*-makefile-*-
-# $Id: util-linux.make,v 1.3 2003/09/16 16:52:14 mkl Exp $
+# $Id: util-linux.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifdef PTXCONF_UTIL-LINUX
+ifdef PTXCONF_UTLNX
PACKAGES += util-linux
endif
#
# Paths and names
#
-UTIL-LINUX_VERSION = 2.12pre
+UTIL-LINUX_VERSION = 2.12
UTIL-LINUX = util-linux-$(UTIL-LINUX_VERSION)
-UTIL-LINUX_SUFFIX = tar.bz2
-UTIL-LINUX_URL = http://www.kernel.org/pub/linux/utils/util-linux/$(UTIL-LINUX).$(UTIL-LINUX_SUFFIX)
+UTIL-LINUX_SUFFIX = tar.gz
+UTIL-LINUX_URL = http://ftp.cwi.nl/aeb/util-linux/$(UTIL-LINUX).$(UTIL-LINUX_SUFFIX)
UTIL-LINUX_SOURCE = $(SRCDIR)/$(UTIL-LINUX).$(UTIL-LINUX_SUFFIX)
UTIL-LINUX_DIR = $(BUILDDIR)/$(UTIL-LINUX)
@@ -35,12 +35,12 @@ util-linux_get: $(STATEDIR)/util-linux.get
util-linux_get_deps = $(UTIL-LINUX_SOURCE)
$(STATEDIR)/util-linux.get: $(util-linux_get_deps)
- @$(call targetinfo, util-linux.get)
- @$(call get_patches, $(UTIL_LINUX))
+ @$(call targetinfo, $@)
+ @$(call get_patches, $(UTIL-LINUX))
touch $@
$(UTIL-LINUX_SOURCE):
- @$(call targetinfo, $(UTIL-LINUX_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(UTIL-LINUX_URL))
# ----------------------------------------------------------------------------
@@ -52,7 +52,7 @@ util-linux_extract: $(STATEDIR)/util-linux.extract
util-linux_extract_deps = $(STATEDIR)/util-linux.get
$(STATEDIR)/util-linux.extract: $(util-linux_extract_deps)
- @$(call targetinfo, util-linux.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(UTIL-LINUX_DIR))
@$(call extract, $(UTIL-LINUX_SOURCE))
@$(call patchin, $(UTIL-LINUX))
@@ -73,12 +73,13 @@ util-linux_prepare_deps = \
UTIL-LINUX_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
UTIL-LINUX_ENV = $(CROSS_ENV)
-#UTIL-LINUX_ENV +=
$(STATEDIR)/util-linux.prepare: $(util-linux_prepare_deps)
- @$(call targetinfo, util-linux.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(UTIL-LINUX_BUILDDIR))
-# # FIXME: strange configure script, not cross enabled...
+#
+# FIXME: strange configure script, not cross enabled...
+#
cd $(UTIL-LINUX_DIR) && \
$(UTIL-LINUX_PATH) $(UTIL-LINUX_ENV) \
./configure
@@ -93,23 +94,23 @@ util-linux_compile: $(STATEDIR)/util-linux.compile
util-linux_compile_deps = $(STATEDIR)/util-linux.prepare
$(STATEDIR)/util-linux.compile: $(util-linux_compile_deps)
- @$(call targetinfo, util-linux.compile)
+ @$(call targetinfo, $@)
-ifeq (y, $(PTXCONF_UTLNX_MKSWAP))
- cd $(UTIL-LINUX_DIR)/disk-utils && $(UTIL-LINUX_PATH) $(UTIL-LINUX_ENV) make mkswap
+ifdef PTXCONF_UTLNX_MKSWAP
+ $(UTIL-LINUX_PATH) make -C $(UTIL-LINUX_DIR)/disk-utils mkswap
endif
-ifeq (y, $(PTXCONF_UTLNX_SWAPON))
- cd $(UTIL-LINUX_DIR)/mount && $(UTIL-LINUX_PATH) $(UTIL-LINUX_ENV) make swapon
+ifdef PTXCONF_UTLNX_SWAPON
+ $(UTIL-LINUX_PATH) make -C $(UTIL-LINUX_DIR)/mount swapon
endif
-ifeq (y, $(PTXCONF_UTLNX_IPCS))
- cd $(UTIL-LINUX_DIR)/sys-utils && $(UTIL-LINUX_PATH) $(UTIL-LINUX_ENV) make ipcs
+ifdef PTXCONF_UTLNX_IPCS
+ $(UTIL-LINUX_PATH) make -C $(UTIL-LINUX_DIR)/sys-utils ipcs
endif
-ifeq (y, $(PTXCONF_UTLNX_READPROFILE))
- cd $(UTIL-LINUX_DIR)/sys-utils && $(UTIL-LINUX_PATH) $(UTIL-LINUX_ENV) make readprofile
+ifdef PTXCONF_UTLNX_READPROFILE
+ $(UTIL-LINUX_PATH) make -C $(UTIL-LINUX_DIR)/sys-utils readprofile
endif
-
+#
# FIXME: implement other utilities
-
+#
touch $@
# ----------------------------------------------------------------------------
@@ -119,7 +120,7 @@ endif
util-linux_install: $(STATEDIR)/util-linux.install
$(STATEDIR)/util-linux.install: $(STATEDIR)/util-linux.compile
- @$(call targetinfo, util-linux.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -131,25 +132,23 @@ util-linux_targetinstall: $(STATEDIR)/util-linux.targetinstall
util-linux_targetinstall_deps = $(STATEDIR)/util-linux.compile
$(STATEDIR)/util-linux.targetinstall: $(util-linux_targetinstall_deps)
- @$(call targetinfo, util-linux.targetinstall)
-
-ifeq (y, $(PTXCONF_UTLNX_MKSWAP))
- install $(UTIL-LINUX_DIR)/disk-utils/mkswap $(ROOTDIR)/sbin/
- $(CROSSSTRIP) $(ROOTDIR)/sbin/mkswap
+ @$(call targetinfo, $@)
+ifdef PTXCONF_UTLNX_MKSWAP
+ install -D $(UTIL-LINUX_DIR)/disk-utils/mkswap $(ROOTDIR)/sbin/mkswap
+ $(CROSSSTRIP) -R .note -R comment $(ROOTDIR)/sbin/mkswap
endif
-ifeq (y, $(PTXCONF_UTLNX_SWAPON))
- install $(UTIL-LINUX_DIR)/mount/swapon $(ROOTDIR)/sbin/
- $(CROSSSTRIP) $(ROOTDIR)/sbin/swapon
+ifdef PTXCONF_UTLNX_SWAPON
+ install -D $(UTIL-LINUX_DIR)/mount/swapon $(ROOTDIR)/sbin/swapon
+ $(CROSSSTRIP) -R .note -R comment $(ROOTDIR)/sbin/swapon
endif
-ifeq (y, $(PTXCONF_UTLNX_IPCS))
- install $(UTIL-LINUX_DIR)/sys-utils/ipcs $(ROOTDIR)/usr/bin/
- $(CROSSSTRIP) $(ROOTDIR)/usr/bin/ipcs
+ifdef PTXCONF_UTLNX_IPCS
+ install -D $(UTIL-LINUX_DIR)/sys-utils/ipcs $(ROOTDIR)/usr/bin/ipcs
+ $(CROSSSTRIP) -R .note -R comment $(ROOTDIR)/usr/bin/ipcs
endif
-ifeq (y, $(PTXCONF_UTLNX_READPROFILE))
- install $(UTIL-LINUX_DIR)/sys-utils/readprofile $(ROOTDIR)/usr/sbin/
- $(CROSSSTRIP) $(ROOTDIR)/usr/sbin/readprofile
+ifdef PTXCONF_UTLNX_READPROFILE
+ install -D $(UTIL-LINUX_DIR)/sys-utils/readprofile $(ROOTDIR)/usr/sbin/readprofile
+ $(CROSSSTRIP) -R .note -R comment $(ROOTDIR)/usr/sbin/readprofile
endif
-
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/vendor-tweaks/innokom.make b/rules/vendor-tweaks/innokom.make
index 599d9d95b..ed6618b56 100644
--- a/rules/vendor-tweaks/innokom.make
+++ b/rules/vendor-tweaks/innokom.make
@@ -1,31 +1,30 @@
# -*-makefile-*-
-# $Id: innokom.make,v 1.7 2003/10/09 07:43:00 robert Exp $
+# $Id: innokom.make,v 1.8 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Auerswald GmbH & Co. KG <linux-development@auerswald.de>
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Auerswald GmbH & Co. KG <linux-development@auerswald.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
-# leave this intact for all vendor tweaks
-VENDORTWEAKS=vendor-tweaks.targetinstall
+VENDORTWEAKS = innokom
# ----------------------------------------------------------------------------
# Target-Install
# ----------------------------------------------------------------------------
-vendor-tweaks_targetinstall: $(STATEDIR)/vendor-tweaks.targetinstall
+innokom_targetinstall: $(STATEDIR)/innokom.targetinstall
$(STATEDIR)/vendor-tweaks.targetinstall:
@$(call targetinfo, vendor-tweaks.targetinstall)
- # the application resides in /opt
+# the application resides in /opt
install -d $(ROOTDIR)/opt
- # writable directories must be on /data (ramdisk)
+# writable directories must be on /data (ramdisk)
install -d $(ROOTDIR)/data
mv $(ROOTDIR)/var/log $(ROOTDIR)/data/log || mkdir $(ROOTDIR)/data/log
@@ -34,22 +33,22 @@ $(STATEDIR)/vendor-tweaks.targetinstall:
mv $(ROOTDIR)/tmp $(ROOTDIR)/data/tmp || mkdir $(ROOTDIR)/data/tmp
ln -sf /data/tmp $(ROOTDIR)/tmp
-ifeq (y, $(PTXCONF_NFSUTILS_INSTALL_NFSD))
+ifdef PTXCONF_NFSUTILS_INSTALL_NFSD
mv $(ROOTDIR)/var/lib/nfs $(ROOTDIR)/data/nfs || mkdir $(ROOTDIR)/data/nfs
ln -sf /data/nfs $(ROOTDIR)/var/lib/nfs
endif
- # copy /etc template
+# copy /etc template
cp -a $(TOPDIR)/etc/innokom/. $(ROOTDIR)/etc
- # remove CVS stuff
+# remove CVS stuff
find $(ROOTDIR) -name "CVS" | xargs rm -fr
rm -f $(ROOTDIR)/JUST_FOR_CVS
- # make scripts executable
+# make scripts executable
chmod 755 $(ROOTDIR)/etc/init.d/*
- # generate version stamps
+# generate version stamps
perl -i -p -e "s,\@VERSION@,$(VERSION),g" $(ROOTDIR)/etc/init.d/banner
perl -i -p -e "s,\@PATCHLEVEL@,$(PATCHLEVEL),g" $(ROOTDIR)/etc/init.d/banner
perl -i -p -e "s,\@SUBLEVEL@,$(SUBLEVEL),g" $(ROOTDIR)/etc/init.d/banner
diff --git a/rules/vhll.in b/rules/vhll.in
index 65aa9723d..90f54ca48 100644
--- a/rules/vhll.in
+++ b/rules/vhll.in
@@ -1,7 +1,11 @@
menu "VHLL Support "
+comment "Python requires libdl on the target (see C Library)"
+ depends on !GLIBC_DL && !UCLIBC_DL
+
config VHLL_PYTHON23
bool
prompt "Python 2.3"
+ depends on GLIBC_DL || UCLIBC_DL
endmenu
diff --git a/rules/wireless.make b/rules/wireless.make
index e7ecf69fd..817681d32 100644
--- a/rules/wireless.make
+++ b/rules/wireless.make
@@ -1,17 +1,17 @@
# -*-makefile-*-
-# $Id: wireless.make,v 1.2 2003/08/08 18:28:43 robert Exp $
+# $Id: wireless.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y,$(PTXCONF_WIRELESS))
+ifdef PTXCONF_WIRELESS
PACKAGES += wireless
endif
@@ -24,7 +24,6 @@ WIRELESS_SUFFIX = tar.gz
WIRELESS_URL = http://pcmcia-cs.sourceforge.net/ftp/contrib/$(WIRELESS).$(WIRELESS_SUFFIX)
WIRELESS_SOURCE = $(SRCDIR)/$(WIRELESS).$(WIRELESS_SUFFIX)
WIRELESS_DIR = $(BUILDDIR)/$(WIRELESS)
-WIRELESS_EXTRACT = gzip -dc
# ----------------------------------------------------------------------------
# Get
@@ -35,11 +34,11 @@ wireless_get: $(STATEDIR)/wireless.get
wireless_get_deps = $(WIRELESS_SOURCE)
$(STATEDIR)/wireless.get: $(wireless_get_deps)
- @$(call targetinfo, wireless.get)
+ @$(call targetinfo, $@)
touch $@
$(WIRELESS_SOURCE):
- @$(call targetinfo, $(WIRELESS_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(WIRELESS_URL))
# ----------------------------------------------------------------------------
@@ -51,7 +50,7 @@ wireless_extract: $(STATEDIR)/wireless.extract
wireless_extract_deps = $(STATEDIR)/wireless.get
$(STATEDIR)/wireless.extract: $(wireless_extract_deps)
- @$(call targetinfo, wireless.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(WIRELESS_DIR))
@$(call extract, $(WIRELESS_SOURCE))
touch $@
@@ -65,7 +64,7 @@ wireless_prepare: $(STATEDIR)/wireless.prepare
wireless_prepare_deps = $(STATEDIR)/wireless.extract
$(STATEDIR)/wireless.prepare: $(wireless_prepare_deps)
- @$(call targetinfo, wireless.prepare)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -77,7 +76,7 @@ wireless_compile: $(STATEDIR)/wireless.compile
wireless_compile_deps = $(STATEDIR)/wireless.prepare
$(STATEDIR)/wireless.compile: $(wireless_compile_deps)
- @$(call targetinfo, wireless.compile)
+ @$(call targetinfo, $@)
make -C $(WIRELESS_DIR)
touch $@
@@ -90,7 +89,7 @@ wireless_install: $(STATEDIR)/wireless.install
wireless_compile_deps = $(STATEDIR)/wireless.compile
$(STATEDIR)/wireless.install: $(wireless_compile_deps)
- @$(call targetinfo, wireless.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -100,7 +99,7 @@ $(STATEDIR)/wireless.install: $(wireless_compile_deps)
wireless_targetinstall: $(STATEDIR)/wireless.targetinstall
$(STATEDIR)/wireless.targetinstall: $(STATEDIR)/wireless.install
- @$(call targetinfo, wireless.targetinstall)
+ @$(call targetinfo, $@)
# TODO
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/wxWindows.in b/rules/wxWindows.in
new file mode 100644
index 000000000..a1a047312
--- /dev/null
+++ b/rules/wxWindows.in
@@ -0,0 +1,19 @@
+#
+# Copyright (C) 08/10/2003 by Marco Cavallini <m.cavallini@koansoftware.com>
+#
+
+menu "wxWindows GUI [X11] "
+
+config WXWINDOWS_X11
+ bool
+ prompt "Compile wxWindows / X11"
+ depends on EXP
+# depends on XFREE430
+
+config WXWINDOWS_X11_CONFIG
+ prompt "Configuration to be used (not used)"
+ string
+ default "--with-x11"
+ depends on WXWINDOWS_X11
+
+endmenu
diff --git a/rules/wxWindows.make b/rules/wxWindows.make
new file mode 100644
index 000000000..8a1c3ea8a
--- /dev/null
+++ b/rules/wxWindows.make
@@ -0,0 +1,149 @@
+# -*-makefile-*-
+# $Id: wxWindows.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 08/10/2003 by Marco Cavallini <m.cavallini@koansoftware.com>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_WXWINDOWS_X11
+PACKAGES += wxWindows
+endif
+
+#
+# Paths and names
+#
+WXWINDOWS_VERSION = 2.4.2
+WXWINDOWS = wxX11-$(WXWINDOWS_VERSION)
+WXWINDOWS_SUFFIX = tar.gz
+WXWINDOWS_URL = http://heanet.dl.sourceforge.net/sourceforge/wxwindows/$(WXWINDOWS).$(WXWINDOWS_SUFFIX)
+WXWINDOWS_SOURCE = $(SRCDIR)/$(WXWINDOWS).$(WXWINDOWS_SUFFIX)
+WXWINDOWS_DIR = $(BUILDDIR)/$(WXWINDOWS)
+
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+wxWindows_get: $(STATEDIR)/wxWindows.get
+
+wxWindows_get_deps = $(WXWINDOWS_SOURCE)
+
+$(STATEDIR)/wxWindows.get: $(wxWindows_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(WXWINDOWS_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(WXWINDOWS_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+wxWindows_extract: $(STATEDIR)/wxWindows.extract
+
+wxWindows_extract_deps = $(STATEDIR)/wxWindows.get
+
+$(STATEDIR)/wxWindows.extract: $(wxWindows_extract_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(WXWINDOWS_DIR))
+ @$(call extract, $(WXWINDOWS_SOURCE))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+wxWindows_prepare: $(STATEDIR)/wxWindows.prepare
+
+#
+# dependencies
+#
+wxWindows_prepare_deps = \
+ $(STATEDIR)/wxWindows.extract \
+ $(STATEDIR)/virtual-xchain.install
+
+WXWINDOWS_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
+WXWINDOWS_ENV = $(CROSS_ENV)
+#WXWINDOWS_ENV +=
+
+
+#
+# autoconf
+#
+WXWINDOWS_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
+WXWINDOWS_AUTOCONF += --build=$(GNU_HOST)
+WXWINDOWS_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
+WXWINDOWS_AUTOCONF += --x-includes=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include/X11
+WXWINDOWS_AUTOCONF += --x-libraries=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib
+WXWINDOWS_AUTOCONF += --disable-shared
+
+# WARNING : HERE WORK IS STILL IN PROGRESS !
+
+WXWINDOWS_AUTOCONF += --with-x11 --without-gtk \
+--disable-no_rtti --disable-no_exceptions \
+--disable-mdi --disable-printarch --disable-postscript --disable-resources \
+--disable-prologio --with-zlib=builtin --with-libpng=builtin \
+--disable-joystick --with-libjpeg=builtin --with-libtiff=builtin
+
+
+$(STATEDIR)/wxWindows.prepare: $(wxWindows_prepare_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(WXWINDOWS_BUILDDIR))
+ cd $(WXWINDOWS_DIR) && \
+ $(WXWINDOWS_PATH) $(WXWINDOWS_ENV) \
+ ./configure $(WXWINDOWS_AUTOCONF)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+wxWindows_compile: $(STATEDIR)/wxWindows.compile
+
+wxWindows_compile_deps = $(STATEDIR)/wxWindows.prepare
+
+$(STATEDIR)/wxWindows.compile: $(wxWindows_compile_deps)
+ @$(call targetinfo, $@)
+ $(WXWINDOWS_PATH) $(WXWINDOWS_ENV) make -C $(WXWINDOWS_DIR)
+ touch $@
+
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+wxWindows_install: $(STATEDIR)/wxWindows.install
+
+$(STATEDIR)/wxWindows.install: $(STATEDIR)/wxWindows.compile
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+wxWindows_targetinstall: $(STATEDIR)/wxWindows.targetinstall
+
+wxWindows_targetinstall_deps = $(STATEDIR)/wxWindows.compile
+
+$(STATEDIR)/wxWindows.targetinstall: $(wxWindows_targetinstall_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+wxWindows_clean:
+ rm -rf $(STATEDIR)/wxWindows.*
+ rm -rf $(WXWINDOWS_DIR)
+
+# vim: syntax=make
diff --git a/rules/xalf.make b/rules/xalf.make
index 2fb554757..3dca62305 100644
--- a/rules/xalf.make
+++ b/rules/xalf.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: xalf.make,v 1.1 2003/09/02 14:11:13 robert Exp $
+# $Id: xalf.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,11 +35,11 @@ xalf_get: $(STATEDIR)/xalf.get
xalf_get_deps = $(XALF_SOURCE)
$(STATEDIR)/xalf.get: $(xalf_get_deps)
- @$(call targetinfo, xalf.get)
+ @$(call targetinfo, $@)
touch $@
$(XALF_SOURCE):
- @$(call targetinfo, $(XALF_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(XALF_URL))
# ----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ xalf_extract: $(STATEDIR)/xalf.extract
xalf_extract_deps = $(STATEDIR)/xalf.get
$(STATEDIR)/xalf.extract: $(xalf_extract_deps)
- @$(call targetinfo, xalf.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(XALF_DIR))
@$(call extract, $(XALF_SOURCE))
touch $@
@@ -67,7 +67,7 @@ xalf_prepare: $(STATEDIR)/xalf.prepare
#
xalf_prepare_deps = \
$(STATEDIR)/xalf.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
XALF_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
XALF_ENV = $(CROSS_ENV)
@@ -84,7 +84,7 @@ XALF_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
#XALF_AUTOCONF +=
$(STATEDIR)/xalf.prepare: $(xalf_prepare_deps)
- @$(call targetinfo, xalf.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(XALF_BUILDDIR))
cd $(XALF_DIR) && \
$(XALF_PATH) $(XALF_ENV) \
@@ -100,7 +100,7 @@ xalf_compile: $(STATEDIR)/xalf.compile
xalf_compile_deps = $(STATEDIR)/xalf.prepare
$(STATEDIR)/xalf.compile: $(xalf_compile_deps)
- @$(call targetinfo, xalf.compile)
+ @$(call targetinfo, $@)
$(XALF_PATH) $(XALF_ENV) make -C $(XALF_DIR)
touch $@
@@ -111,7 +111,7 @@ $(STATEDIR)/xalf.compile: $(xalf_compile_deps)
xalf_install: $(STATEDIR)/xalf.install
$(STATEDIR)/xalf.install: $(STATEDIR)/xalf.compile
- @$(call targetinfo, xalf.install)
+ @$(call targetinfo, $@)
$(XALF_PATH) $(XALF_ENV) make -C $(XALF_DIR) install
touch $@
@@ -124,7 +124,7 @@ xalf_targetinstall: $(STATEDIR)/xalf.targetinstall
xalf_targetinstall_deps = $(STATEDIR)/xalf.compile
$(STATEDIR)/xalf.targetinstall: $(xalf_targetinstall_deps)
- @$(call targetinfo, xalf.targetinstall)
+ @$(call targetinfo, $@)
install $(XALF_DIR)/src/xalf $(ROOTDIR)/usr/bin
$(CROSSSTRIP) $(ROOTDIR)/usr/bin/xalf
touch $@
diff --git a/rules/xchain-binutils.make b/rules/xchain-binutils.make
index e52774f30..9a2f6ed21 100644
--- a/rules/xchain-binutils.make
+++ b/rules/xchain-binutils.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: xchain-binutils.make,v 1.8 2003/09/18 00:42:49 mkl Exp $
+# $Id: xchain-binutils.make,v 1.9 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -15,26 +15,10 @@ endif
#
# Paths and names
#
-XBINUTILS = binutils-2.13.2.1
-XBINUTILS_URL = ftp://ftp.gnu.org/pub/gnu/binutils/$(XBINUTILS).tar.gz
-XBINUTILS_SOURCE = $(SRCDIR)/$(XBINUTILS).tar.gz
-XBINUTILS_DIR = $(BUILDDIR)/xchain-$(XBINUTILS)
-ifdef PTXCONF_ARCH_NOMMU
-XBINUTILS = binutils-2.10
-XBINUTILS_URL = ftp://ftp.gnu.org/pub/gnu/binutils/$(XBINUTILS).tar.gz
-endif
-# ifdef PTXCONF_ARCH_MIPS
-# XBINUTILS = binutils-2.14.90.0.4
-# XBINUTILS_URL = ftp://ftp.de.kernel.org/pub/linux/devel/binutils/$(XBINUTILS).tar.gz
-# endif
-# ifdef PTXCONF_ARCH_PARISC
-# XBINUTILS = binutils-2.14.90.0.4
-# XBINUTILS_URL = ftp://ftp.de.kernel.org/pub/linux/devel/binutils/$(XBINUTILS).tar.gz
-# endif
-
-XBINUTILS_NOMMU_PATCH = binutils-2.10-full.patch
-XBINUTILS_NOMMU_PATCH_URL = http://www.uclinux.org/pub/uClinux/m68k-elf-tools/tools-20030314/$(XBINUTILS_NOMMU_PATCH)
-XBINUTILS_NOMMU_PATCH_SOURCE = $(SRCDIR)/$(XBINUTILS_NOMMU_PATCH)
+XCHAIN_BINUTILS_VERSION = $(BINUTILS_VERSION)
+XCHAIN_BINUTILS = $(BINUTILS)
+XCHAIN_BINUTILS_SOURCE = $(BINUTILS_SOURCE)
+XCHAIN_BINUTILS_DIR = $(XCHAIN_BUILDDIR)/$(XCHAIN_BINUTILS)
# ----------------------------------------------------------------------------
# Get
@@ -42,22 +26,18 @@ XBINUTILS_NOMMU_PATCH_SOURCE = $(SRCDIR)/$(XBINUTILS_NOMMU_PATCH)
xchain-binutils_get: $(STATEDIR)/xchain-binutils.get
-binutils_get_deps = $(XBINUTILS_SOURCE)
-ifdef PTXCONF_ARCH_ARM_NOMMU
-binutils_get_deps += $(XBINUTILS_NOMMU_PATCH_SOURCE)
-endif
+xchain-binutils_get_deps = \
+ $(XCHAIN_BINUTILS_SOURCE) \
+ $(STATEDIR)/xchain-binutils-patches.get
$(STATEDIR)/xchain-binutils.get: $(binutils_get_deps)
- @$(call targetinfo, xchain-binutils.get)
+ @$(call targetinfo, $@)
touch $@
-$(XBINUTILS_SOURCE):
- @$(call targetinfo, $(XBINUTILS_SOURCE))
- @$(call get, $(XBINUTILS_URL))
-
-$(XBINUTILS_NOMMU_PATCH_SOURCE):
- @$(call targetinfo, $(XBINUTILS_NOMMU_PATCH_SOURCE))
- @$(call get, $(XBINUTILS_NOMMU_PATCH_URL))
+$(STATEDIR)/xchain-binutils-patches.get:
+ @$(call targetinfo, $@)
+ @$(call get_patches, $(XCHAIN_BINUTILS))
+ touch $@
# ----------------------------------------------------------------------------
# Extract
@@ -66,10 +46,10 @@ $(XBINUTILS_NOMMU_PATCH_SOURCE):
xchain-binutils_extract: $(STATEDIR)/xchain-binutils.extract
$(STATEDIR)/xchain-binutils.extract: $(STATEDIR)/xchain-binutils.get
- @$(call targetinfo, xchain-binutils.extract)
- @$(call clean, $(XBINUTILS_DIR))
- @$(call extract, $(XBINUTILS_SOURCE), $(XBINUTILS_DIR))
- mv $(XBINUTILS_DIR)/$(XBINUTILS)/* $(XBINUTILS_DIR)
+ @$(call targetinfo, $@)
+ @$(call clean, $(XCHAIN_BINUTILS_DIR))
+ @$(call extract, $(XCHAIN_BINUTILS_SOURCE), $(XCHAIN_BUILDDIR))
+ @$(call patchin, $(BINUTILS), $(XCHAIN_BINUTILS_DIR))
#
# inspired by Erik Andersen's buildroot
#
@@ -77,26 +57,22 @@ $(STATEDIR)/xchain-binutils.extract: $(STATEDIR)/xchain-binutils.get
#
# Enable combreloc, since it is such a nice thing to have...
#
- perl -i -p -e "s,link_info.combreloc = false,link_info.combreloc = true,g;" $(XBINUTILS_DIR)/ld/ldmain.c
+ perl -i -p -e "s,link_info.combreloc = false,link_info.combreloc = true,g;" $(XCHAIN_BINUTILS_DIR)/ld/ldmain.c
#
# Hack binutils to use the correct shared lib loader
#
- cd $(XBINUTILS_DIR) && \
+ cd $(XCHAIN_BINUTILS_DIR) && \
perl -i -p -e "s,#.*define.*ELF_DYNAMIC_INTERPRETER.*\".*\",#define ELF_DYNAMIC_INTERPRETER \"$(DYNAMIC_LINKER)\",;" \
- `grep -lr "#define ELF_DYNAMIC_INTERPRETER" $(XBINUTILS_DIR)`
+ `grep -lr "#define ELF_DYNAMIC_INTERPRETER" $(XCHAIN_BINUTILS_DIR)`
#
# Hack binutils to prevent it from searching the host system
# for libraries. We only want libraries for the target system.
#
- cd $(XBINUTILS_DIR) && \
+ cd $(XCHAIN_BINUTILS_DIR) && \
perl -i -p -e "s,^NATIVE_LIB_DIRS.*,NATIVE_LIB_DIRS='$(CROSS_LIB_DIR)/usr/lib $(CROSS_LIB_DIR)/lib',;" \
- $(XBINUTILS_DIR)/ld/configure.host
-
-ifdef PTXCONF_ARCH_ARM_NOMMU
- cd $(XBINUTILS_DIR) && patch -p1 < $(XBINUTILS_NOMMU_PATCH_SOURCE)
-endif
+ $(XCHAIN_BINUTILS_DIR)/ld/configure.host
touch $@
# ----------------------------------------------------------------------------
@@ -105,31 +81,26 @@ endif
xchain-binutils_prepare: $(STATEDIR)/xchain-binutils.prepare
-XCHAIN_XBINUTILS_AUTOCONF_TARGET = --enable-targets=$(PTXCONF_GNU_TARGET)
-# ifdef PTXCONF_ARCH_MIPS
-# XCHAIN_XBINUTILS_AUTOCONF_TARGET = --enable-targets=$(PTXCONF_GNU_TARGET),mips64-linux
-# endif
-# ifdef PTXCONF_OPT_PA8X00
-# XCHAIN_XBINUTILS_AUTOCONF_TARGET = --enable-targets=$(PTXCONF_GNU_TARGET),hppa64-linux
-# endif
-
-XCHAIN_XBINUTILS_AUTOCONF = \
+XCHAIN_XCHAIN_BINUTILS_AUTOCONF = \
--target=$(PTXCONF_GNU_TARGET) \
--host=$(GNU_HOST) \
--build=$(GNU_HOST) \
--prefix=$(PTXCONF_PREFIX) \
+ --enable-targets=$(PTXCONF_GNU_TARGET) \
--disable-nls \
- --disable-shared \
- $(XCHAIN_XBINUTILS_AUTOCONF_TARGET)
-
-# --enable-multilib \
+ --enable-shared \
+ --enable-commonbfdlib \
+ --enable-install-libiberty \
+ --with-sysroot=$(CROSS_LIB_DIR) \
+ --with-lib-path="$(CROSS_LIB_DIR)/usr/lib:$(CROSS_LIB_DIR)/lib"
-XCHAIN_XBINUTILS_ENV = $(HOSTCC_ENV)
+XCHAIN_XCHAIN_BINUTILS_ENV = $(HOSTCC_ENV)
$(STATEDIR)/xchain-binutils.prepare: $(STATEDIR)/xchain-binutils.extract
- @$(call targetinfo, xchain-binutils.prepare)
- cd $(XBINUTILS_DIR) && $(XCHAIN_XBINUTILS_ENV) \
- ./configure $(XCHAIN_XBINUTILS_AUTOCONF)
+ @$(call targetinfo, $@)
+ @$(call clean, $(XCHAIN_BINUTILS_DIR)/config.cache)
+ cd $(XCHAIN_BINUTILS_DIR) && $(XCHAIN_XCHAIN_BINUTILS_ENV) \
+ ./configure $(XCHAIN_XCHAIN_BINUTILS_AUTOCONF)
touch $@
# ----------------------------------------------------------------------------
@@ -139,8 +110,8 @@ $(STATEDIR)/xchain-binutils.prepare: $(STATEDIR)/xchain-binutils.extract
xchain-binutils_compile: $(STATEDIR)/xchain-binutils.compile
$(STATEDIR)/xchain-binutils.compile: $(STATEDIR)/xchain-binutils.prepare
- @$(call targetinfo, xchain-binutils.compile)
- make -C $(XBINUTILS_DIR)
+ @$(call targetinfo, $@)
+ make -C $(XCHAIN_BINUTILS_DIR)
touch $@
# ----------------------------------------------------------------------------
@@ -150,8 +121,26 @@ $(STATEDIR)/xchain-binutils.compile: $(STATEDIR)/xchain-binutils.prepare
xchain-binutils_install: $(STATEDIR)/xchain-binutils.install
$(STATEDIR)/xchain-binutils.install: $(STATEDIR)/xchain-binutils.compile
- @$(call targetinfo, xchain-binutils.install)
- make install -C $(XBINUTILS_DIR)
+ @$(call targetinfo, $@)
+ make install -C $(XCHAIN_BINUTILS_DIR)
+#
+# here we convert the static libiberty.a into a
+# shared one (.so)
+#
+ cd $(XCHAIN_BINUTILS_DIR)/libiberty && \
+ ld --whole-archive libiberty.a -r -o libiberty-$(XCHAIN_BINUTILS_VERSION).so
+
+ install -m 755 $(XCHAIN_BINUTILS_DIR)/libiberty/libiberty-$(XCHAIN_BINUTILS_VERSION).so \
+ $(PTXCONF_PREFIX)/$(GNU_HOST)/$(PTXCONF_GNU_TARGET)/lib
+ ln -sf libiberty-$(XCHAIN_BINUTILS_VERSION).so $(PTXCONF_PREFIX)/$(GNU_HOST)/$(PTXCONF_GNU_TARGET)/lib/libiberty.so
+
+#
+# ksymoops want's to have libiberty.a, we copy it into the dir where ksymoops
+# expects them
+#
+ install -m 644 $(XCHAIN_BINUTILS_DIR)/libiberty/libiberty.a \
+ $(PTXCONF_PREFIX)/$(GNU_HOST)/$(PTXCONF_GNU_TARGET)/lib
+
touch $@
# ----------------------------------------------------------------------------
@@ -161,7 +150,7 @@ $(STATEDIR)/xchain-binutils.install: $(STATEDIR)/xchain-binutils.compile
xchain-binutils_targetinstall: $(STATEDIR)/xchain-binutils.targetinstall
$(STATEDIR)/xchain-binutils.targetinstall: $(STATEDIR)/xchain-binutils.install
- @$(call targetinfo, xchain-binutils.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -169,6 +158,6 @@ $(STATEDIR)/xchain-binutils.targetinstall: $(STATEDIR)/xchain-binutils.install
# ----------------------------------------------------------------------------
xchain-binutils_clean:
- rm -rf $(STATEDIR)/xchain-binutils.* $(XBINUTILS_DIR)
+ rm -rf $(STATEDIR)/xchain-binutils.* $(XCHAIN_BINUTILS_DIR)
# vim: syntax=make
diff --git a/rules/xchain-gccstage1.make b/rules/xchain-gccstage1.make
index 60d7e20c9..ad999872b 100644
--- a/rules/xchain-gccstage1.make
+++ b/rules/xchain-gccstage1.make
@@ -1,33 +1,24 @@
# -*-makefile-*-
-# $Id: xchain-gccstage1.make,v 1.9 2003/09/16 16:55:16 mkl Exp $
+# $Id: xchain-gccstage1.make,v 1.10 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002,2003 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
-# We provide this package
+# Paths and names
#
-
-ifdef PTXCONF_GCC_2_95_3
-GCC_VERSION = 2.95.3
-endif
-ifdef PTXCONF_GCC_3_2_3
-GCC_VERSION = 3.2.3
-endif
-
+# version stuff in now in rules/Version.make
+# NB: make s*cks
#
-# Paths and names
-GCC_PREFIX = $(PTXCONF_GNU_TARGET)-
-GCC = gcc-$(GCC_VERSION)
-GCC_URL = ftp://ftp.gnu.org/pub/gnu/gcc/$(GCC).tar.gz
-GCC_SOURCE = $(SRCDIR)/$(GCC).tar.gz
-GCC_DIR = $(BUILDDIR)/$(GCC)
-GCC_STAGE1_DIR = $(BUILDDIR)/$(GCC)-$(GCC_PREFIX)stage1
-GCC_STAGE2_DIR = $(BUILDDIR)/$(GCC)-$(GCC_PREFIX)stage2
+GCC = gcc-$(GCC_VERSION)
+GCC_URL = ftp://ftp.gnu.org/pub/gnu/gcc/$(GCC).tar.gz
+GCC_SOURCE = $(SRCDIR)/$(GCC).tar.gz
+GCC_DIR = $(BUILDDIR)/$(GCC)
+GCC_STAGE1_DIR = $(BUILDDIR)/$(GCC)-$(PTXCONF_GNU_TARGET)-stage1
# ----------------------------------------------------------------------------
# Get
@@ -35,15 +26,21 @@ GCC_STAGE2_DIR = $(BUILDDIR)/$(GCC)-$(GCC_PREFIX)stage2
xchain-gccstage1_get: $(STATEDIR)/xchain-gccstage1.get
-xchain-gccstage1_get_deps = $(GCC_SOURCE)
+xchain-gccstage1_get_deps = \
+ $(GCC_SOURCE) \
+ $(STATEDIR)/xchain-gccstage1-patches.get
$(STATEDIR)/xchain-gccstage1.get: $(xchain-gccstage1_get_deps)
- @$(call targetinfo, xchain-gccstage1.get)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(STATEDIR)/xchain-gccstage1-patches.get:
+ @$(call targetinfo, $@)
@$(call get_patches, $(GCC))
touch $@
$(GCC_SOURCE):
- @$(call targetinfo, $(GCC_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(GCC_URL))
# ----------------------------------------------------------------------------
@@ -55,7 +52,7 @@ xchain-gccstage1_extract: $(STATEDIR)/xchain-gccstage1.extract
xchain-gccstage1_extract_deps = $(STATEDIR)/xchain-gccstage1.get
$(STATEDIR)/xchain-gccstage1.extract: $(xchain-gccstage1_extract_deps)
- @$(call targetinfo, xchain-gccstage1.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(GCC_DIR))
@$(call extract, $(GCC_SOURCE))
@$(call patchin, $(GCC))
@@ -76,8 +73,10 @@ $(STATEDIR)/xchain-gccstage1.extract: $(xchain-gccstage1_extract_deps)
#
# Prevent system glibc start files from leaking in uninvited...
#
- perl -i -p -e "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 =\"$(CROSS_LIB_DIR)/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
- perl -i -p -e "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 =\"$(CROSS_LIB_DIR)/usr/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
+ perl -i -p -e "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 =\"$(CROSS_LIB_DIR)/lib/\";,;" \
+ $(GCC_DIR)/gcc/gcc.c;
+ perl -i -p -e "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 =\"$(CROSS_LIB_DIR)/usr/lib/\";,;" \
+ $(GCC_DIR)/gcc/gcc.c;
#
# Prevent system glibc include files from leaking in uninvited...
@@ -154,9 +153,41 @@ endif # PTXCON_UCLIBC
xchain-gccstage1_prepare: $(STATEDIR)/xchain-gccstage1.prepare
-xchain-gccstage1_prepare_deps = $(STATEDIR)/xchain-binutils.install
-xchain-gccstage1_prepare_deps += $(STATEDIR)/xchain-gccstage1.extract
-xchain-gccstage1_prepare_deps += $(STATEDIR)/xchain-kernel.install
+xchain-gccstage1_prepare_deps = \
+ $(STATEDIR)/xchain-binutils.install \
+ $(STATEDIR)/xchain-kernel.install \
+ $(STATEDIR)/xchain-gccstage1.extract
+#
+# Dan Kegel says:
+#
+# Only need to install bootstrap glibc headers for gcc-3.0 and above?
+# Or maybe just gcc-3.3 and above? This will change for gcc-3.5, I
+# think (I hope). See also http://gcc.gnu.org/PR8180, which complains
+# about the need for this step. Don't install them if they're already
+# there (it's really slow)
+#
+# Comments:
+# gcc-3.2.3 for PPC needs some headers (or a patch that disables the
+# #include of the headers)
+#
+# you will get an error like this:
+#
+# /home/frogger/projects/ptxdist/ptxdist-ppc/build/gcc-3.2.3-powerpc-405-linux-gnu-stage1/gcc/xgcc
+# [...]
+# /home/frogger/projects/ptxdist/ptxdist-ppc/build/gcc-3.2.3/gcc/libgcc2.c
+# -o libgcc/./_muldi3.o
+#
+# In file included from tconfig.h:21,
+# from /home/frogger/projects/ptxdist/ptxdist-ppc/build/gcc-3.2.3/gcc/libgcc2.c:36:
+# /home/frogger/projects/ptxdist/ptxdist-ppc/build/gcc-3.2.3/gcc/config/rs6000/linux.h:82:20: signal.h: No such file or directory
+# /home/frogger/projects/ptxdist/ptxdist-ppc/build/gcc-3.2.3/gcc/config/rs6000/linux.h:83:26: sys/ucontext.h: No such file or directory
+# make[3]: *** [libgcc/./_muldi3.o] Error 1
+#
+ifdef PTXCONF_GLIBC
+ifeq (3,$(GCC_VERSION_MAJOR))
+xchain-gccstage1_prepare_deps += $(STATEDIR)/xchain-glibc.install
+endif
+endif
GCC_STAGE1_PATH = PATH=$(CROSS_PATH)
GCC_STAGE1_ENV = $(HOSTCC_ENV)
@@ -166,18 +197,49 @@ GCC_STAGE1_AUTOCONF = \
--host=$(GNU_HOST) \
--build=$(GNU_HOST) \
--prefix=$(PTXCONF_PREFIX) \
+ --with-local-prefix=$(CROSS_LIB_DIR) \
$(GCC_EXTRA_CONFIG) \
--disable-nls \
+ --disable-multilib \
+ --disable-threads \
--disable-shared \
+ --enable-languages=c \
+ --enable-symvers=gnu \
--enable-target-optspace \
- --disable-threads \
- --with-gnu-ld \
- --enable-languages=c
+ --enable-version-specific-runtime-libs \
+ --with-newlib \
+ --without-headers \
+ --with-gnu-ld
-# --enable-multilib \
+ifdef PTXCONF_GLIBC
+GCC_STAGE1_AUTOCONF += --enable-__cxa_atexit
+endif
+ifdef PTXCONF_UCLIBC
+GCC_STAGE1_AUTOCONF += --disable-__cxa_atexit
+endif
+
+#
+# FIXME: "configure: line 193: cd: no: No such file or directory"
+#
+# cd /home/frogger/ptxdist/ptxdist-i386/build/gcc-3.2.3-"i386-linux"-stage1 && \
+# PATH="/home/frogger/ptxdist/xchain/i386"/bin:$PATH CC=gcc \
+#
+# /home/frogger/ptxdist/ptxdist-i386/build/gcc-3.2.3/configure
+# --target="i386-linux" --host=powerpc-host-linux-gnu
+# --build=powerpc-host-linux-gnu
+# --prefix="/home/frogger/ptxdist/xchain/i386"
+# --with-local-prefix="/home/frogger/ptxdist/xchain/i386"/"i386-linux"
+# --disable-nls --disable-multilib --disable-threads --disable-shared
+# --enable-languages=c --enable-symvers=gnu --enable-target-optspace
+# --enable-version-specific-runtime-libs --with-newlib
+# --without-headers --with-gnu-ld --enable-__cxa_atexit Copying no to
+# /home/frogger/ptxdist/xchain/i386/i386-linux/sys-include
+# /home/frogger/ptxdist/ptxdist-i386/build/gcc-3.2.3/configure: line
+# 193: cd: no: No such file or directory
+#
$(STATEDIR)/xchain-gccstage1.prepare: $(xchain-gccstage1_prepare_deps)
- @$(call targetinfo, xchain-gccstage1.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(GCC_STAGE1_DIR))
[ -d $(GCC_STAGE1_DIR) ] || mkdir -p $(GCC_STAGE1_DIR)
@@ -193,20 +255,10 @@ $(STATEDIR)/xchain-gccstage1.prepare: $(xchain-gccstage1_prepare_deps)
xchain-gccstage1_compile: $(STATEDIR)/xchain-gccstage1.compile
$(STATEDIR)/xchain-gccstage1.compile: $(STATEDIR)/xchain-gccstage1.prepare
- @$(call targetinfo, xchain-gccstage1.compile)
- ifdef PTXCONF_GCC_2_95_3
- cd $(GCC_STAGE1_DIR) && \
- $(GCC_STAGE1_PATH) \
- make MAKE="make TARGET_LIBGCC2_CFLAGS='-Dinhibit_libc -D__gthr_posix_h'"
- else
-#
-# -DSTAGE1 is a switch for the PPC platfrom
-# it makes some modification active needed only for stage 1
-#
+ @$(call targetinfo, $@)
cd $(GCC_STAGE1_DIR) && \
$(GCC_STAGE1_PATH) \
- make MAKE="make TARGET_LIBGCC2_CFLAGS='-Dinhibit_libc -DSTAGE1'"
- endif
+ make all-gcc
touch $@
# ----------------------------------------------------------------------------
@@ -216,7 +268,7 @@ $(STATEDIR)/xchain-gccstage1.compile: $(STATEDIR)/xchain-gccstage1.prepare
xchain-gccstage1_install: $(STATEDIR)/xchain-gccstage1.install
$(STATEDIR)/xchain-gccstage1.install: $(STATEDIR)/xchain-gccstage1.compile
- @$(call targetinfo, xchain-gccstage1.install)
+ @$(call targetinfo, $@)
cd $(GCC_STAGE1_DIR) && \
$(GCC_STAGE1_PATH) $(GCC_STAGE1_ENV) \
make install
@@ -229,7 +281,7 @@ $(STATEDIR)/xchain-gccstage1.install: $(STATEDIR)/xchain-gccstage1.compile
xchain-gccstage1_targetinstall: $(STATEDIR)/xchain-gccstage1.targetinstall
$(STATEDIR)/xchain-gccstage1.targetinstall:
- @$(call targetinfo, xchain-gccstage1.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -241,5 +293,4 @@ xchain-gccstage1_clean:
rm -fr $(STATEDIR)/xchain-gccstage1.*
rm -fr $(GCC_DIR)
-
# vim: syntax=make
diff --git a/rules/xchain-gccstage2.make b/rules/xchain-gccstage2.make
index 41b3d316e..ee7cc06cc 100644
--- a/rules/xchain-gccstage2.make
+++ b/rules/xchain-gccstage2.make
@@ -1,17 +1,17 @@
# -*-makefile-*-
-# $Id: xchain-gccstage2.make,v 1.10 2003/09/16 16:55:29 mkl Exp $
+# $Id: xchain-gccstage2.make,v 1.11 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# Paths and names
#
-# See gccstage1 for variable definitions
+GCC_STAGE2_DIR = $(BUILDDIR)/$(GCC)-$(PTXCONF_GNU_TARGET)-stage2
# ----------------------------------------------------------------------------
@@ -21,7 +21,7 @@
xchain-gccstage2_get: $(STATEDIR)/xchain-gccstage2.get
$(STATEDIR)/xchain-gccstage2.get: $(xchain-gccstate1_get_deps)
- @$(call targetinfo, xchain-gccstage2.get)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -31,7 +31,7 @@ $(STATEDIR)/xchain-gccstage2.get: $(xchain-gccstate1_get_deps)
xchain-gccstage2_extract: $(STATEDIR)/xchain-gccstage2.extract
$(STATEDIR)/xchain-gccstage2.extract: $(xchain-gccstage1_extract_deps)
- @$(call targetinfo, xchain-gccstage2.extract)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -42,7 +42,7 @@ xchain-gccstage2_prepare: $(STATEDIR)/xchain-gccstage2.prepare
xchain-gccstage2_prepare_deps = $(STATEDIR)/xchain-gccstage2.extract
ifdef PTXCONF_GLIBC
-xchain-gccstage2_prepare_deps += $(STATEDIR)/xchain-glibc.install
+xchain-gccstage2_prepare_deps += $(STATEDIR)/glibc.install
endif
ifdef PTXCONF_UCLIBC
xchain-gccstage2_prepare_deps += $(STATEDIR)/xchain-uclibc.install
@@ -59,24 +59,66 @@ ifdef PTXCONF_UCLIBC_UCLIBC_HAS_THREADS
GCC_STAGE2_AUTOCONF_THREADS = --enable-threads=posix
endif
+#
+# Robert Schwebel says:
+#
+# why do we have to define _GNU_SOURCE here? Otherwhise
+# the c++ compiler cannot be compiled. occours in 2.95.3
+#
+# the error looks like this:
+#
+# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3-i386-linux-stage2/gcc/xgcc
+# -B/home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3-i386-linux-stage2/gcc/
+# -B/home/frogger/ptxdist/xchain/generic/i386-linux/bin/ -c -g -Os
+# -fno-implicit-templates
+# -I. -I/home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio
+# -nostdinc++ -D_IO_MTSAFE_IO -fpic
+# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc
+# -o pic/iostream.o
+# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc: In method `class istream & istream::get(char &)':
+# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc:75: `_pthread_cleanup_push_defer' undeclared (first use this function)
+# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc:75: (Each undeclared identifier is reported only once
+# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc:75: for each function it appears in.)
+# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc:86: implicit declaration of function `int _pthread_cleanup_pop_restore(...)'
+#
+ifdef PTXCONF_GCC_2_95_3
+GCC_STAGE2_MAKEVARS = CXXFLAGS_FOR_TARGET="-D_GNU_SOURCE"
+endif
+
GCC_STAGE2_AUTOCONF = \
--target=$(PTXCONF_GNU_TARGET) \
--host=$(GNU_HOST) \
--build=$(GNU_HOST) \
--prefix=$(PTXCONF_PREFIX) \
+ --with-local-prefix=$(CROSS_LIB_DIR) \
$(GCC_EXTRA_CONFIG) \
- --disable-nls \
- --disable-shared \
- --enable-target-optspace \
- --with-gnu-ld \
- --enable-languages="c,c++" \
+ $(GCC_STAGE2_AUTOCONF_THREADS) \
--with-headers=$(CROSS_LIB_DIR)/include \
+ --disable-nls \
--disable-multilib \
- $(GCC_STAGE2_AUTOCONF_THREADS)
+ --enable-languages="c,c++" \
+ --enable-symvers=gnu \
+ --enable-target-optspace \
+ --enable-version-specific-runtime-libs \
+ --enable-c99 \
+ --enable-long-long
+
+ifdef PTXCONF_GLIBC_SHARED
+GCC_STAGE2_AUTOCONF += --enable-shared
+else
+GCC_STAGE2_AUTOCONF += --disable-shared
+endif
+ifdef PTXCONF_GLIBC
+GCC_STAGE2_AUTOCONF += --enable-__cxa_atexit
+endif
+
+ifdef PTXCONF_UCLIBC
+GCC_STAGE2_AUTOCONF += --disable-__cxa_atexit
+endif
$(STATEDIR)/xchain-gccstage2.prepare: $(xchain-gccstage2_prepare_deps)
- @$(call targetinfo, xchain-gccstage2.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(GCC_STAGE2_DIR))
[ -d $(GCC_STAGE2_DIR) ] || mkdir -p $(GCC_STAGE2_DIR)
@@ -91,14 +133,9 @@ $(STATEDIR)/xchain-gccstage2.prepare: $(xchain-gccstage2_prepare_deps)
xchain-gccstage2_compile: $(STATEDIR)/xchain-gccstage2.compile
-$(STATEDIR)/xchain-gccstage2.compile: \
- $(STATEDIR)/xchain-gccstage2.prepare
- @$(call targetinfo, xchain-gccstage2.compile)
-# # FIXME: why do we have to define _GNU_SOURCE here? Otherwhise
-# # the c++ compiler cannot be compiled.
- cd $(GCC_STAGE2_DIR) && \
- $(GCC_STAGE2_PATH) $(GCC_STAGE2_ENV) \
- make CXXFLAGS_FOR_TARGET="-D_GNU_SOURCE"
+$(STATEDIR)/xchain-gccstage2.compile: $(STATEDIR)/xchain-gccstage2.prepare
+ @$(call targetinfo, $@)
+ $(GCC_STAGE2_PATH) make -C $(GCC_STAGE2_DIR) $(GCC_STAGE2_MAKEVARS)
touch $@
# ----------------------------------------------------------------------------
@@ -108,10 +145,8 @@ $(STATEDIR)/xchain-gccstage2.compile: \
xchain-gccstage2_install: $(STATEDIR)/xchain-gccstage2.install
$(STATEDIR)/xchain-gccstage2.install: $(STATEDIR)/xchain-gccstage2.compile
- @$(call targetinfo, xchain-gccstage2.install)
- cd $(GCC_STAGE2_DIR) && \
- $(GCC_STAGE2_PATH) $(GCC_STAGE2_ENV) \
- make install
+ @$(call targetinfo, $@)
+ $(GCC_STAGE2_PATH) make -C $(GCC_STAGE2_DIR) install
touch $@
# ----------------------------------------------------------------------------
@@ -120,8 +155,36 @@ $(STATEDIR)/xchain-gccstage2.install: $(STATEDIR)/xchain-gccstage2.compile
xchain-gccstage2_targetinstall: $(STATEDIR)/xchain-gccstage2.targetinstall
+#
+# FIXME: install libstdc++
+#
+# gcc-3.2.3:
+#
+# [frogger@timberwolf:~/ptxdist/xchain/i586]$ find . -name "libstd*"
+# ./lib/gcc-lib/i586-linux/3.2.3/libstdc++.so
+# ./lib/gcc-lib/i586-linux/3.2.3/libstdc++.so.5.0.3
+# ./lib/gcc-lib/i586-linux/3.2.3/libstdc++.so.5
+# ./lib/gcc-lib/i586-linux/3.2.3/libstdc++.la
+# ./lib/gcc-lib/i586-linux/3.2.3/libstdc++.a
+# [frogger@timberwolf:~/ptxdist/xchain/i586]$ find . -name "libgcc*"
+# ./lib/gcc-lib/i586-linux/3.2.3/libgcc_s.so
+# ./lib/gcc-lib/i586-linux/3.2.3/libgcc.a
+# ./lib/gcc-lib/i586-linux/3.2.3/libgcc_eh.a
+# ./lib/gcc-lib/i586-linux/3.2.3/libgcc_s.so.1
+#
+# gcc-2.95.3:
+#
+# [frogger@timberwolf:~/ptxdist/xchain/i586-2.95.3]$ find . -name "libstd*"
+# ./lib/gcc-lib/i586-linux/2.95.3/libstdc++.a
+# ./lib/gcc-lib/i586-linux/2.95.3/libstdc++-3-libc6.1-2-2.10.0.a
+# ./lib/gcc-lib/i586-linux/2.95.3/libstdc++-libc6.1-2.a.3
+# ./lib/gcc-lib/i586-linux/2.95.3/libstdc++.so
+# ./lib/gcc-lib/i586-linux/2.95.3/libstdc++-3-libc6.1-2-2.10.0.so
+# ./lib/gcc-lib/i586-linux/2.95.3/libstdc++-libc6.1-2.so.3
+#
+
$(STATEDIR)/xchain-gccstage2.targetinstall:
- @$(call targetinfo, xchain-gccstage2.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -131,5 +194,4 @@ $(STATEDIR)/xchain-gccstage2.targetinstall:
xchain-gccstage2_clean:
rm -fr $(GCC_STAGE2_DIR) $(STATEDIR)/xchain-gccstage2.*
-
# vim: syntax=make
diff --git a/rules/xchain-gdb.make b/rules/xchain-gdb.make
index e40c1bc07..536dbbc4c 100644
--- a/rules/xchain-gdb.make
+++ b/rules/xchain-gdb.make
@@ -1,31 +1,22 @@
# -*-makefile-*-
-# $Id: xchain-gdb.make,v 1.5 2003/08/27 18:55:13 robert Exp $
+# $Id: xchain-gdb.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y,$(PTXCONF_BUILD_XGDB))
+ifdef PTXCONF_BUILD_XGDB
PACKAGES += xchain-gdb
endif
-#
-# Paths and names
-#
-XGDB_VERSION = 5.3
-XGDB = gdb-$(XGDB_VERSION)
-XGDB_SUFFIX = tar.gz
-XGDB_URL = ftp://ftp.gnu.org/pub/gnu/gdb/$(XGDB).$(XGDB_SUFFIX)
-XGDB_SOURCE = $(SRCDIR)/$(XGDB).tar.gz
-XGDB_DIR = $(BUILDDIR)/xchain-$(XGDB)
-XGDB_EXTRACT = gzip -dc
+XCHAIN_GDB_BUILDDIR = $(BUILDDIR)/xchain-$(GDB)-build
# ----------------------------------------------------------------------------
# Get
@@ -33,26 +24,17 @@ XGDB_EXTRACT = gzip -dc
xchain-gdb_get: $(STATEDIR)/xchain-gdb.get
-$(STATEDIR)/xchain-gdb.get: $(XGDB_SOURCE)
- @$(call targetinfo, xchain-gdb.get)
+$(STATEDIR)/xchain-gdb.get: $(gdb_get_deps)
+ @$(call targetinfo, $@)
touch $@
-$(XGDB_SOURCE):
- @$(call targetinfo, $(XGDB_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(XGDB_URL)
-
# ----------------------------------------------------------------------------
# Extract
# ----------------------------------------------------------------------------
xchain-gdb_extract: $(STATEDIR)/xchain-gdb.extract
-$(STATEDIR)/xchain-gdb.extract: $(STATEDIR)/xchain-gdb.get
- @$(call targetinfo, xchain-gdb.extract)
- @$(call clean, $(XGDB_DIR))
- install -d $(XGDB_DIR)
- cd $(XGDB_DIR) && $(XGDB_EXTRACT) $(XGDB_SOURCE) | $(TAR) -C $(XGDB_DIR) -xf -
- mv $(XGDB_DIR)/$(XGDB)/* $(XGDB_DIR)
+$(STATEDIR)/xchain-gdb.extract: $(STATEDIR)/gdb.extract
touch $@
# ----------------------------------------------------------------------------
@@ -64,14 +46,19 @@ xchain-gdb_prepare: $(STATEDIR)/xchain-gdb.prepare
#
# autoconf
#
-XGDB_AUTOCONF = --prefix=$(PTXCONF_PREFIX)
-XGDB_AUTOCONF += --build=$(GNU_HOST)
-XGDB_AUTOCONF += --host=$(GNU_HOST)
-XGDB_AUTOCONF += --target=$(PTXCONF_GNU_TARGET)
+XCHAIN_GDB_AUTOCONF = --prefix=$(PTXCONF_PREFIX)
+XCHAIN_GDB_AUTOCONF += --build=$(GNU_HOST)
+XCHAIN_GDB_AUTOCONF += --host=$(GNU_HOST)
+XCHAIN_GDB_AUTOCONF += --target=$(PTXCONF_GNU_TARGET)
+
+XCHAIN_GDB_ENV = $(HOSTCC_ENV)
$(STATEDIR)/xchain-gdb.prepare: $(STATEDIR)/xchain-gdb.extract
- @$(call targetinfo, xchain-gdb.prepare)
- cd $(XGDB_DIR) && ./configure $(XGDB_AUTOCONF)
+ @$(call targetinfo, $@)
+ @$(call clean, $(XCHAIN_GDB_BUILDDIR))
+ mkdir -p $(XCHAIN_GDB_BUILDDIR)
+ cd $(XCHAIN_GDB_BUILDDIR) && $(XCHAIN_GDB_ENV) \
+ $(GDB_DIR)/configure $(XCHAIN_GDB_AUTOCONF)
touch $@
# ----------------------------------------------------------------------------
@@ -81,8 +68,8 @@ $(STATEDIR)/xchain-gdb.prepare: $(STATEDIR)/xchain-gdb.extract
xchain-gdb_compile: $(STATEDIR)/xchain-gdb.compile
$(STATEDIR)/xchain-gdb.compile: $(STATEDIR)/xchain-gdb.prepare
- @$(call targetinfo, xchain-gdb.compile)
- cd $(XGDB_DIR) && make
+ @$(call targetinfo, $@)
+ make -C $(XCHAIN_GDB_BUILDDIR)
touch $@
# ----------------------------------------------------------------------------
@@ -92,8 +79,8 @@ $(STATEDIR)/xchain-gdb.compile: $(STATEDIR)/xchain-gdb.prepare
xchain-gdb_install: $(STATEDIR)/xchain-gdb.install
$(STATEDIR)/xchain-gdb.install: $(STATEDIR)/xchain-gdb.compile
- @$(call targetinfo, xchain-gdb.install)
- cd $(XGDB_DIR) && make install
+ @$(call targetinfo, $@)
+ make -C $(XCHAIN_GDB_BUILDDIR) install
touch $@
# ----------------------------------------------------------------------------
@@ -103,7 +90,7 @@ $(STATEDIR)/xchain-gdb.install: $(STATEDIR)/xchain-gdb.compile
xchain-gdb_targetinstall: $(STATEDIR)/xchain-gdb.targetinstall
$(STATEDIR)/xchain-gdb.targetinstall: $(STATEDIR)/xchain-gdb.install
- @$(call targetinfo, xchain-gdb.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -111,6 +98,6 @@ $(STATEDIR)/xchain-gdb.targetinstall: $(STATEDIR)/xchain-gdb.install
# ----------------------------------------------------------------------------
xchain-gdb_clean:
- rm -rf $(STATEDIR)/xchain-gdb.* $(XGDB_DIR)
+ rm -rf $(STATEDIR)/xchain-gdb.* $(XCHAIN_GDB_BUILDDIR)
# vim: syntax=make
diff --git a/rules/xchain-glibc.make b/rules/xchain-glibc.make
index c30fd8752..669687d21 100644
--- a/rules/xchain-glibc.make
+++ b/rules/xchain-glibc.make
@@ -1,11 +1,12 @@
# -*-makefile-*-
-# $Id: xchain-glibc.make,v 1.15 2003/10/09 15:12:27 robert Exp $
+# $Id: xchain-glibc.make,v 1.16 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
#
-# (c) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -22,10 +23,13 @@ XCHAIN_GLIBC_BUILDDIR = $(BUILDDIR)/xchain-$(GLIBC)-build
# Get
# ----------------------------------------------------------------------------
-xchain-glibc_get: $(STATEDIR)/xchain-glibc.get
+xchain-glibc_get: $(STATEDIR)/xchain-glibc.get
+
+xchain-glibc_get_deps = \
+ $(glibc_get_deps)
-$(STATEDIR)/xchain-glibc.get: $(glibc_get_deps)
- @$(call targetinfo, xchain-glibc.get)
+$(STATEDIR)/xchain-glibc.get: $(xchain-glibc_get_deps)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -35,7 +39,7 @@ $(STATEDIR)/xchain-glibc.get: $(glibc_get_deps)
xchain-glibc_extract: $(STATEDIR)/xchain-glibc.extract
$(STATEDIR)/xchain-glibc.extract: $(glibc_extract_deps)
- @$(call targetinfo, xchain-glibc.extract)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -44,25 +48,40 @@ $(STATEDIR)/xchain-glibc.extract: $(glibc_extract_deps)
xchain-glibc_prepare: $(STATEDIR)/xchain-glibc.prepare
-xchain_glibc_prepare_deps = \
- $(STATEDIR)/autoconf213.install \
- $(STATEDIR)/xchain-gccstage1.install \
+xchain-glibc_prepare_deps = \
+ $(STATEDIR)/xchain-binutils.install \
$(STATEDIR)/xchain-glibc.extract
+#
+# glibc-2.3.x needs gcc-3.2 and binutils 2.13 on host
+# maybe we need to install this...
+# handled by virtual-nchain
+#
+ifeq ($(GLIBC_VERSION_MAJOR).$(GLIBC_VERSION_MINOR),2.3)
+xchain-glibc_prepare_deps += $(STATEDIR)/virtual-nchain.install
+endif
+
+XCHAIN_GLIBC_AUTOCONF = \
+ --build=$(GNU_HOST) \
+ --host=$(PTXCONF_GNU_TARGET) \
+ --with-header=$(CROSS_LIB_DIR)/include \
+ --without-cvs \
+ --disable-sanity-checks \
+ --enable-hacker-mode
+
+ifeq ($(GLIBC_VERSION_MAJOR).$(GLIBC_VERSION_MINOR),2.3)
+XCHAIN_GLIBC_ENV = CC=$(NATIVE_CC)
+else
+XCHAIN_GLIBC_ENV = CC=$(HOSTCC)
+endif
+XCHAIN_GLIBC_PATH = PATH=$(NATIVE_PATH)
-$(STATEDIR)/xchain-glibc.prepare: $(xchain_glibc_prepare_deps)
- @$(call targetinfo, xchain-glibc.prepare)
+$(STATEDIR)/xchain-glibc.prepare: $(xchain-glibc_prepare_deps)
+ @$(call targetinfo, $@)
@$(call clean, $(XCHAIN_GLIBC_BUILDDIR))
mkdir -p $(XCHAIN_GLIBC_BUILDDIR)
- cd $(XCHAIN_GLIBC_BUILDDIR) && \
- $(GLIBC_PATH) $(GLIBC_ENV) \
- $(GLIBC_DIR)/configure $(PTXCONF_GNU_TARGET) \
- $(GLIBC_AUTOCONF) \
- --prefix=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET) \
- --libexecdir=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/usr/bin
-
- # don't compile programs
- echo "build-programs=no" >> $(XCHAIN_GLIBC_BUILDDIR)/configparms
-
+ cd $(XCHAIN_GLIBC_BUILDDIR) && \
+ $(XCHAIN_GLIBC_PATH) $(XCHAIN_GLIBC_ENV) \
+ $(GLIBC_DIR)/configure $(XCHAIN_GLIBC_AUTOCONF)
touch $@
# ----------------------------------------------------------------------------
@@ -71,15 +90,25 @@ $(STATEDIR)/xchain-glibc.prepare: $(xchain_glibc_prepare_deps)
xchain-glibc_compile: $(STATEDIR)/xchain-glibc.compile
-$(STATEDIR)/xchain-glibc.compile: $(STATEDIR)/xchain-glibc.prepare
- @$(call targetinfo, xchain-glibc.compile)
- cd $(XCHAIN_GLIBC_BUILDDIR) && $(GLIBC_PATH) make
-
- # fake files which are installed by make install although
- # compiling binaries was switched of (tested with 2.2.5)
- touch $(XCHAIN_GLIBC_BUILDDIR)/iconv/iconv_prog
- touch $(XCHAIN_GLIBC_BUILDDIR)/login/pt_chown
-
+$(STATEDIR)/xchain-glibc.compile: $(STATEDIR)/xchain-glibc.prepare
+ @$(call targetinfo, $@)
+#
+# Dan Kegel writes:
+#
+# glibc-2.3.x passes cross options to $(CC) when generating
+# errlist-compat.c, which fails without a real cross-compiler.
+# Fortunately, we don't need errlist-compat.c, since we just need .h
+# files, so work around this by creating a fake errlist-compat.c and
+# satisfying its dependencies. Another workaround might be to tell
+# configure to not use any cross options to $(CC). The real fix would
+# be to get install-headers to not generate errlist-compat.c.
+#
+ifeq ($(GLIBC_VERSION_MAJOR).$(GLIBC_VERSION_MINOR),2.3)
+# cd $(XCHAIN_GLIBC_BUILDDIR) && \
+# make sysdeps/gnu/errlist.c && \
+# mkdir -p stdio-common && \
+# touch stdio-common/errlist-compat.c
+endif
touch $@
# ----------------------------------------------------------------------------
@@ -89,8 +118,24 @@ $(STATEDIR)/xchain-glibc.compile: $(STATEDIR)/xchain-glibc.prepare
xchain-glibc_install: $(STATEDIR)/xchain-glibc.install
$(STATEDIR)/xchain-glibc.install: $(STATEDIR)/xchain-glibc.compile
- @$(call targetinfo, xchain-glibc.install)
- cd $(XCHAIN_GLIBC_BUILDDIR) && $(GLIBC_PATH) make install
+ @$(call targetinfo, $@)
+
+ $(XCHAIN_GLIBC_PATH) make -C $(XCHAIN_GLIBC_BUILDDIR) \
+ cross-compiling=yes install_root=$(CROSS_LIB_DIR) prefix="" \
+ install-headers
+#
+# Dan Kegel says:
+#
+# Two headers -- stubs.h and features.h -- aren't installed by
+# install-headers, so do them by hand. We can tolerate an empty
+# stubs.h for the moment. See
+# e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
+#
+ mkdir -p $(CROSS_LIB_DIR)/include/gnu
+ touch $(CROSS_LIB_DIR)/include/gnu/stubs.h
+ install -m 644 $(GLIBC_DIR)/include/features.h \
+ $(CROSS_LIB_DIR)/include/features.h
+
touch $@
# ----------------------------------------------------------------------------
@@ -108,10 +153,5 @@ $(STATEDIR)/xchain-glibc.targetinstall: $(STATEDIR)/xchain-glibc.install
xchain-glibc_clean:
-rm -rf $(STATEDIR)/xchain-glibc*
- -rm -rf $(STATEDIR)/glibc*extract
- -rm -rf $(STATEDIR)/glibc.prepare
- -rm -rf $(STATEDIR)/glibc.compile
- -rm -rf $(GLIBC_DIR)
- -rm -rf $(GLIBC_BUILDDIR)
-rm -rf $(XCHAIN_GLIBC_BUILDDIR)
# vim: syntax=make
diff --git a/rules/xchain-kaffe.make b/rules/xchain-kaffe.make
index 3369a7cf1..dd1e5d0bc 100644
--- a/rules/xchain-kaffe.make
+++ b/rules/xchain-kaffe.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: xchain-kaffe.make,v 1.2 2003/09/08 23:42:39 mkl Exp $
+# $Id: xchain-kaffe.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
# GYRO net GmbH <info@gyro-net.de>, Hannover, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -28,7 +28,7 @@ XCHAIN_KAFFE_BUILDDIR = $(BUILDDIR)/xchain-$(KAFFE)-build
xchain-kaffe_get: $(STATEDIR)/xchain-kaffe.get
$(STATEDIR)/xchain-kaffe.get: $(kaffe_get_deps)
- @$(call targetinfo, xchain-kaffe.get)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -38,7 +38,7 @@ $(STATEDIR)/xchain-kaffe.get: $(kaffe_get_deps)
xchain-kaffe_extract: $(STATEDIR)/xchain-kaffe.extract
$(STATEDIR)/xchain-kaffe.extract: $(kaffe_extract_deps)
- @$(call targetinfo, xchain-kaffe.extract)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -53,7 +53,7 @@ xchain-kaffe_prepare_deps = \
XCHAIN_KAFFE_ENV = $(HOSTCC_ENV)
$(STATEDIR)/xchain-kaffe.prepare: $(xchain-kaffe_prepare_deps)
- @$(call targetinfo, xchain-kaffe.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(XCHAIN_KAFFE_BUILDDIR))
mkdir -p $(XCHAIN_KAFFE_BUILDDIR)
cd $(XCHAIN_KAFFE_BUILDDIR) && \
@@ -68,7 +68,7 @@ $(STATEDIR)/xchain-kaffe.prepare: $(xchain-kaffe_prepare_deps)
xchain-kaffe_compile: $(STATEDIR)/xchain-kaffe.compile
$(STATEDIR)/xchain-kaffe.compile: $(STATEDIR)/xchain-kaffe.prepare
- @$(call targetinfo, xchain-kaffe.compile)
+ @$(call targetinfo, $@)
make -C $(XCHAIN_KAFFE_BUILDDIR)/config
make -C $(XCHAIN_KAFFE_BUILDDIR)/kaffe/kaffeh
touch $@
@@ -80,7 +80,7 @@ $(STATEDIR)/xchain-kaffe.compile: $(STATEDIR)/xchain-kaffe.prepare
xchain-kaffe_install: $(STATEDIR)/xchain-kaffe.install
$(STATEDIR)/xchain-kaffe.install: $(STATEDIR)/xchain-kaffe.compile
- @$(call targetinfo, xchain-kaffe.install)
+ @$(call targetinfo, $@)
make -C $(XCHAIN_KAFFE_BUILDDIR)/kaffe/kaffeh install
touch $@
@@ -91,7 +91,7 @@ $(STATEDIR)/xchain-kaffe.install: $(STATEDIR)/xchain-kaffe.compile
xchain-kaffe_targetinstall: $(STATEDIR)/xchain-kaffe.targetinstall
$(STATEDIR)/xchain-kaffe.targetinstall:
- @$(call targetinfo, xchain-kaffe.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -100,11 +100,6 @@ $(STATEDIR)/xchain-kaffe.targetinstall:
xchain-kaffe_clean:
rm -rf $(STATEDIR)/xchain-kaffe*
- rm -rf $(STATEDIR)/kaffe.extract
- rm -rf $(STATEDIR)/kaffe.prepare
- rm -rf $(STATEDIR)/kaffe.compile
rm -rf $(XCHAIN_KAFFE_BUILDDIR)
- rm -rf $(KAFFE_BUILDDIR)
- rm -rf $(KAFFE_DIR)
# vim: syntax=make \ No newline at end of file
diff --git a/rules/xchain-kernel-ben.make b/rules/xchain-kernel-ben.make
new file mode 100644
index 000000000..da0df8dc0
--- /dev/null
+++ b/rules/xchain-kernel-ben.make
@@ -0,0 +1,43 @@
+# -*-makefile-*-
+# $Id: xchain-kernel-ben.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xchain-kernel-ben_get: $(STATEDIR)/xchain-kernel-ben.get
+
+xchain-kernel-ben_get_deps = \
+ $(STATEDIR)/kernel-ben.get
+
+$(STATEDIR)/xchain-kernel-ben.get: $(xchain-kernel-ben_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xchain-kernel-ben_install: $(STATEDIR)/xchain-kernel-ben.install
+
+$(STATEDIR)/xchain-kernel-ben.install: $(STATEDIR)/xchain-kernel-ben.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-BEN_SOURCE), $(XCHAIN_KERNEL_BUILDDIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xchain-kernel-ben_clean:
+ rm -rf $(STATEDIR)/xchain-kernel*
+
+# vim: syntax=make
diff --git a/rules/xchain-kernel-ds.make b/rules/xchain-kernel-ds.make
new file mode 100644
index 000000000..143282cf2
--- /dev/null
+++ b/rules/xchain-kernel-ds.make
@@ -0,0 +1,43 @@
+# -*-makefile-*-
+# $Id: xchain-kernel-ds.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xchain-kernel-ds_get: $(STATEDIR)/xchain-kernel-ds.get
+
+xchain-kernel-ds_get_deps = \
+ $(STATEDIR)/kernel-ds.get
+
+$(STATEDIR)/xchain-kernel-ds.get: $(xchain-kernel-ds_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xchain-kernel-ds_install: $(STATEDIR)/xchain-kernel-ds.install
+
+$(STATEDIR)/xchain-kernel-ds.install: $(STATEDIR)/xchain-kernel-ds.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-DS_SOURCE), $(XCHAIN_KERNEL_BUILDDIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xchain-kernel-ds_clean:
+ rm -rf $(STATEDIR)/xchain-kernel*
+
+# vim: syntax=make
diff --git a/rules/xchain-kernel-mtd.make b/rules/xchain-kernel-mtd.make
new file mode 100644
index 000000000..387205d40
--- /dev/null
+++ b/rules/xchain-kernel-mtd.make
@@ -0,0 +1,43 @@
+# -*-makefile-*-
+# $Id: xchain-kernel-mtd.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xchain-kernel-mtd_get: $(STATEDIR)/xchain-kernel-mtd.get
+
+xchain-kernel-mtd_get_deps = \
+ $(STATEDIR)/kernel-mtd.get
+
+$(STATEDIR)/xchain-kernel-mtd.get: $(xchain-kernel-mtd_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xchain-kernel-mtd_install: $(STATEDIR)/xchain-kernel-mtd.install
+
+$(STATEDIR)/xchain-kernel-mtd.install: $(STATEDIR)/xchain-kernel-mtd.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-MTD_SOURCE), $(XCHAIN_KERNEL_BUILDDIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xchain-kernel-mtd_clean:
+ rm -rf $(STATEDIR)/xchain-kernel*
+
+# vim: syntax=make
diff --git a/rules/xchain-kernel-ptx.make b/rules/xchain-kernel-ptx.make
new file mode 100644
index 000000000..d5213d047
--- /dev/null
+++ b/rules/xchain-kernel-ptx.make
@@ -0,0 +1,43 @@
+# -*-makefile-*-
+# $Id: xchain-kernel-ptx.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xchain-kernel-ptx_get: $(STATEDIR)/xchain-kernel-ptx.get
+
+xchain-kernel-ptx_get_deps = \
+ $(STATEDIR)/kernel-ptx.get
+
+$(STATEDIR)/xchain-kernel-ptx.get: $(xchain-kernel-ptx_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xchain-kernel-ptx_install: $(STATEDIR)/xchain-kernel-ptx.install
+
+$(STATEDIR)/xchain-kernel-ptx.install: $(STATEDIR)/xchain-kernel-ptx.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-PTX_SOURCE), $(XCHAIN_KERNEL_BUILDDIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xchain-kernel-ptx_clean:
+ rm -rf $(STATEDIR)/xchain-kernel*
+
+# vim: syntax=make
diff --git a/rules/xchain-kernel-pxa.make b/rules/xchain-kernel-pxa.make
new file mode 100644
index 000000000..30ec5e81f
--- /dev/null
+++ b/rules/xchain-kernel-pxa.make
@@ -0,0 +1,43 @@
+# -*-makefile-*-
+# $Id: xchain-kernel-pxa.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xchain-kernel-pxa_get: $(STATEDIR)/xchain-kernel-pxa.get
+
+xchain-kernel-pxa_get_deps = \
+ $(STATEDIR)/kernel-pxa.get
+
+$(STATEDIR)/xchain-kernel-pxa.get: $(xchain-kernel-pxa_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xchain-kernel-pxa_install: $(STATEDIR)/xchain-kernel-pxa.install
+
+$(STATEDIR)/xchain-kernel-pxa.install: $(STATEDIR)/xchain-kernel-pxa.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-PXA_SOURCE), $(XCHAIN_KERNEL_BUILDDIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xchain-kernel-pxa_clean:
+ rm -rf $(STATEDIR)/xchain-kernel*
+
+# vim: syntax=make
diff --git a/rules/xchain-kernel-rmk.make b/rules/xchain-kernel-rmk.make
new file mode 100644
index 000000000..dfde11605
--- /dev/null
+++ b/rules/xchain-kernel-rmk.make
@@ -0,0 +1,43 @@
+# -*-makefile-*-
+# $Id: xchain-kernel-rmk.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xchain-kernel-rmk_get: $(STATEDIR)/xchain-kernel-rmk.get
+
+xchain-kernel-rmk_get_deps = \
+ $(STATEDIR)/kernel-rmk.get
+
+$(STATEDIR)/xchain-kernel-rmk.get: $(xchain-kernel-rmk_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xchain-kernel-rmk_install: $(STATEDIR)/xchain-kernel-rmk.install
+
+$(STATEDIR)/xchain-kernel-rmk.install: $(STATEDIR)/xchain-kernel-rmk.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-RMK_SOURCE), $(XCHAIN_KERNEL_BUILDDIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xchain-kernel-rmk_clean:
+ rm -rf $(STATEDIR)/xchain-kernel*
+
+# vim: syntax=make
diff --git a/rules/xchain-kernel-uc.make b/rules/xchain-kernel-uc.make
new file mode 100644
index 000000000..bd5035620
--- /dev/null
+++ b/rules/xchain-kernel-uc.make
@@ -0,0 +1,43 @@
+# -*-makefile-*-
+# $Id: xchain-kernel-uc.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xchain-kernel-uc_get: $(STATEDIR)/xchain-kernel-uc.get
+
+xchain-kernel-uc_get_deps = \
+ $(STATEDIR)/kernel-uc.get
+
+$(STATEDIR)/xchain-kernel-uc.get: $(xchain-kernel-uc_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xchain-kernel-uc_install: $(STATEDIR)/xchain-kernel-uc.install
+
+$(STATEDIR)/xchain-kernel-uc.install: $(STATEDIR)/xchain-kernel-uc.get
+ @$(call targetinfo, $@)
+ @$(call patch_apply, $(KERNEL-UC_SOURCE), $(XCHAIN_KERNEL_BUILDDIR))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xchain-kernel-uc_clean:
+ rm -rf $(STATEDIR)/xchain-kernel*
+
+# vim: syntax=make
diff --git a/rules/xchain-kernel.make b/rules/xchain-kernel.make
index 311eed656..d241ed399 100644
--- a/rules/xchain-kernel.make
+++ b/rules/xchain-kernel.make
@@ -1,10 +1,11 @@
# -*-makefile-*-
-# $Id: xchain-kernel.make,v 1.10 2003/09/16 22:13:59 mkl Exp $
+# $Id: xchain-kernel.make,v 1.11 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -14,13 +15,30 @@
# runtime kernel.
#
-ifdef BUILD_CROSSCHAIN
+ifdef PTXCONF_BUILD_CROSSCHAIN
XCHAIN += xchain-kernel
endif
+XCHAIN_KERNEL_BUILDDIR = $(BUILDDIR)/xchain-$(KERNEL)
+# XCHAIN_KERNEL_PATCHES = $(subst kernel-,xchain-kernel-,$(KERNEL_PATCHES))
-XCHAIN_KERNEL_BUILDDIR = $(BUILDDIR)/xchain-kernel
-
+#
+# Robert says: Aber dokumentier' das entsprechend...
+#
+# Well, to build the glibc we need the kernel headers.
+# We want to use the kernel plus the selected patches (e.g.: rmk-pxa-ptx)
+# But without the ltt (linux trace toolkit) or rtai patches.
+#
+# The most important thing is, that the glibc and the kernel header
+# (against the glibc is built) always stay together, the kernel that
+# is running on the system does not matter...
+#
+# so we pull in the kernel's patches and drop ltt and rtai
+#
+XCHAIN_KERNEL_PATCHES = $(addprefix $(STATEDIR)/xchain-kernel-, $(addsuffix .install, \
+ $(call get_option_ext, s/^PTXCONF_KERNEL_[0-9]_[0-9]_[0-9]*_\(.*\)=y/\1/, \
+ sed -e 's/_/ /g' -e 's/[0-9]//g' -e 's/ltt//g' ) \
+ ) )
# ----------------------------------------------------------------------------
# Get
# ----------------------------------------------------------------------------
@@ -28,7 +46,7 @@ XCHAIN_KERNEL_BUILDDIR = $(BUILDDIR)/xchain-kernel
xchain-kernel_get: $(STATEDIR)/xchain-kernel.get
$(STATEDIR)/xchain-kernel.get: $(kernel_get_deps)
- @$(call targetinfo, xchain-kernel.get)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -37,67 +55,27 @@ $(STATEDIR)/xchain-kernel.get: $(kernel_get_deps)
xchain-kernel_extract: $(STATEDIR)/xchain-kernel.extract
-xchain_kernel_extract_deps = $(kernel_get_deps)
-ifdef PTXCONF_KERNEL_MTD
-xchain_kernel_extract_deps += $(STATEDIR)/mtd.extract
+xchain-kernel_extract_deps = \
+ $(STATEDIR)/xchain-kernel-base.extract \
+ $(XCHAIN_KERNEL_PATCHES)
+
+$(STATEDIR)/xchain-kernel.extract: $(xchain-kernel_extract_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(STATEDIR)/xchain-kernel-base.extract: $(STATEDIR)/xchain-kernel.get
+ @$(call targetinfo, $@)
+ @$(call clean, $(XCHAIN_KERNEL_BUILDDIR))
+ @$(call extract, $(KERNEL_SOURCE), $(XCHAIN_KERNEL_BUILDDIR))
+#
+# kernels before 2.4.19 extract to "linux" instead of "linux-version"
+#
+ifeq (2.4.18,$(KERNEL_VERSION))
+ mv $(XCHAIN_KERNEL_BUILDDIR)/linux $(XCHAIN_KERNEL_BUILDDIR)/$(KERNEL)
endif
+ mv $(XCHAIN_KERNEL_BUILDDIR)/$(KERNEL)/* $(XCHAIN_KERNEL_BUILDDIR)
+ rmdir $(XCHAIN_KERNEL_BUILDDIR)/$(KERNEL)
-$(STATEDIR)/xchain-kernel.extract: $(xchain_kernel_extract_deps)
- @$(call targetinfo, xchain-kernel.extract)
- @$(call clean, $(BUILDDIR)/xchain-kernel)
- @$(call extract, $(KERNEL_SOURCE), $(BUILDDIR)/xchain-kernel/tmp)
-# #
-# # kernels before 2.4.19 extract to "linux" instead of "linux-version"
-# #
- ifeq (y,$(PTXCONF_KERNEL_2_4_18))
- cd $(BUILDDIR)/xchain-kernel/tmp && mv linux $(KERNEL)
- endif
-# #
-# # ARM patch
-# #
- ifeq (y,$(PTXCONF_ARCH_ARM))
- cd $(BUILDDIR)/xchain-kernel/tmp/$(KERNEL) && \
- $(KERNEL_RMKPATCH_EXTRACT) $(KERNEL_RMKPATCH_SOURCE) | \
- patch -p1
- endif
-# #
-# # XSCALE patch
-# #
- ifeq (y, $(PTXCONF_KERNEL_XSCALE))
- cd $(BUILDDIR)/xchain-kernel/tmp/$(KERNEL) && \
- $(KERNEL_PXAPATCH_EXTRACT) $(KERNEL_PXAPATCH_SOURCE) | \
- patch -p1
- endif
-# #
-# # MTD patch
-# #
- ifeq (y, $(PTXCONF_KERNEL_MTD))
- cd $(BUILDDIR)/xchain-kernel/tmp/$(KERNEL) && \
- $(KERNEL_MTDPATCH_EXTRACT) $(KERNEL_MTDPATCH_SOURCE) | \
- patch -p1
- endif
-# #
-# # XSCALE_PTX patch
-# #
- ifeq (y, $(PTXCONF_KERNEL_XSCALE_PTX))
- cd $(BUILDDIR)/xchain-kernel/tmp/$(KERNEL) && \
- $(KERNEL_PTXPATCH_EXTRACT) $(KERNEL_PTXPATCH_SOURCE) | \
- patch -p1
- endif
-# #
-# # patch for mmu-less architectures
-# #
- ifdef PTXCONF_ARCH_NOMMU
- cd $(BUILDDIR)/xchain-kernel/tmp/$(KERNEL) && \
- $(KERNEL_UCLINUXPATCH_EXTRACT) $(KERNEL_UCLINUXPATCH_SOURCE) | \
- patch -p1 || true
- endif
-# # fake headers
- make -C $(BUILDDIR)/xchain-kernel/tmp/$(KERNEL) include/linux/version.h
- touch $(BUILDDIR)/xchain-kernel/tmp/$(KERNEL)/include/linux/autoconf.h
-# # we are only interested in include/ here
- cp -a $(BUILDDIR)/xchain-kernel/tmp/$(KERNEL)/include $(BUILDDIR)/xchain-kernel/
- rm -fr $(BUILDDIR)/xchain-kernel/tmp
touch $@
# ----------------------------------------------------------------------------
@@ -107,19 +85,18 @@ $(STATEDIR)/xchain-kernel.extract: $(xchain_kernel_extract_deps)
xchain-kernel_prepare: $(STATEDIR)/xchain-kernel.prepare
$(STATEDIR)/xchain-kernel.prepare: $(STATEDIR)/xchain-kernel.extract
- @$(call targetinfo, xchain-kernel.prepare)
+ @$(call targetinfo, $@)
- rm -rf `find $(XCHAIN_KERNEL_BUILDDIR)/include -name "asm*" -type d |grep -v asm-$(PTXCONF_ARCH)`
- cd $(BUILDDIR)/xchain-kernel/include && ln -s asm-$(PTXCONF_ARCH) asm
+# fake headers
+ make -C $(XCHAIN_KERNEL_BUILDDIR) include/linux/version.h
+ touch $(XCHAIN_KERNEL_BUILDDIR)/include/linux/autoconf.h
-ifdef PTXCONF_ARCH_ARM
- cd $(BUILDDIR)/xchain-kernel/include/asm && ln -s proc-$(PTXCONF_ARM_PROC) proc
- cd $(BUILDDIR)/xchain-kernel/include/asm && ln -s arch-$(PTXCONF_ARM_ARCH) arch
-endif
+ rm -rf `find $(XCHAIN_KERNEL_BUILDDIR)/include -name "asm*" -type d |grep -v asm-$(PTXCONF_ARCH) | grep -v asm-generic`
+ ln -s asm-$(PTXCONF_ARCH) $(XCHAIN_KERNEL_BUILDDIR)/include/asm
-ifdef PTXCONF_ARCH_ARM_NOMMU
- cd $(BUILDDIR)/xchain-kernel/include/asm && ln -s proc-$(PTXCONF_ARM_PROC) proc
- cd $(BUILDDIR)/xchain-kernel/include/asm && ln -s arch-$(PTXCONF_ARM_ARCH) arch
+ifdef PTXCONF_ARM_PROC
+ ln -s proc-$(PTXCONF_ARM_PROC) $(XCHAIN_KERNEL_BUILDDIR)/include/asm/proc
+ ln -s arch-$(PTXCONF_ARM_ARCH) $(XCHAIN_KERNEL_BUILDDIR)/include/asm/arch
endif
touch $@
@@ -131,17 +108,19 @@ endif
xchain-kernel_compile: $(STATEDIR)/xchain-kernel.compile
$(STATEDIR)/xchain-kernel.compile:
- @$(call targetinfo, xchain-kernel.compile)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------
+xchain-kernel_install: $(STATEDIR)/xchain-kernel.install
+
$(STATEDIR)/xchain-kernel.install: $(STATEDIR)/xchain-kernel.prepare
- @$(call targetinfo, xchain-kernel.install)
- install -d $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)
- cp -a $(BUILDDIR)/xchain-kernel/include $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/
+ @$(call targetinfo, $@)
+ install -d $(CROSS_LIB_DIR)
+ cp -a $(XCHAIN_KERNEL_BUILDDIR)/include $(CROSS_LIB_DIR)
touch $@
# ----------------------------------------------------------------------------
@@ -151,7 +130,7 @@ $(STATEDIR)/xchain-kernel.install: $(STATEDIR)/xchain-kernel.prepare
xchain-kernel_targetinstall: $(STATEDIR)/xchain-kernel.targetinstall
$(STATEDIR)/xchain-kernel.targetinstall:
- @$(call targetinfo, xchain-kernel.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/ksymoops.make b/rules/xchain-ksymoops.make
index 9b54bdc29..1d02704f1 100644
--- a/rules/ksymoops.make
+++ b/rules/xchain-ksymoops.make
@@ -1,28 +1,27 @@
# -*-makefile-*-
-# $Id: ksymoops.make,v 1.4 2003/07/16 04:23:28 mkl Exp $
+# $Id: xchain-ksymoops.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y, $(PTXCONF_KSYMOOPS))
+ifdef PTXCONF_KSYMOOPS
PACKAGES += ksymoops
endif
#
# Paths and names
#
-KSYMOOPS = ksymoops-2.4.6
+KSYMOOPS = ksymoops-2.4.9
KSYMOOPS_URL = http://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/$(KSYMOOPS).tar.bz2
KSYMOOPS_SOURCE = $(SRCDIR)/$(KSYMOOPS).tar.bz2
KSYMOOPS_DIR = $(BUILDDIR)/$(KSYMOOPS)
-KSYMOOPS_EXTRACT = bzip2 -dc
# ----------------------------------------------------------------------------
# Get
@@ -31,12 +30,12 @@ KSYMOOPS_EXTRACT = bzip2 -dc
ksymoops_get: $(STATEDIR)/ksymoops.get
$(STATEDIR)/ksymoops.get: $(KSYMOOPS_SOURCE)
- @$(call targetinfo, ksymoops.get)
+ @$(call targetinfo, $@)
touch $@
$(KSYMOOPS_SOURCE):
- @$(call targetinfo, $(KSYMOOPS_SOURCE))
- wget -P $(SRCDIR) $(PASSIVEFTP) $(KSYMOOPS_URL)
+ @$(call targetinfo, $@)
+ @$(call get, $(KSYMOOPS_URL))
# ----------------------------------------------------------------------------
# Extract
@@ -45,8 +44,9 @@ $(KSYMOOPS_SOURCE):
ksymoops_extract: $(STATEDIR)/ksymoops.extract
$(STATEDIR)/ksymoops.extract: $(STATEDIR)/ksymoops.get
- @$(call targetinfo, ksymoops.extract)
- $(KSYMOOPS_EXTRACT) $(KSYMOOPS_SOURCE) | $(TAR) -C $(BUILDDIR) -xf -
+ @$(call targetinfo, $@)
+ @$(call clean, $(KSYMOOPS_DIR))
+ @$(call extract, $(KSYMOOPS_SOURCE))
touch $@
# ----------------------------------------------------------------------------
@@ -55,8 +55,12 @@ $(STATEDIR)/ksymoops.extract: $(STATEDIR)/ksymoops.get
ksymoops_prepare: $(STATEDIR)/ksymoops.prepare
-$(STATEDIR)/ksymoops.prepare: $(STATEDIR)/ksymoops.extract
- @$(call targetinfo, ksymoops.prepare)
+KSYMOOPS_MAKEVARS = \
+ CROSS=$(PTXCONF_GNU_TARGET)- \
+ INSTALL_PREFIX=$(PTXCONF_PREFIX) \
+ BFD_PREFIX=$(PTXCONF_PREFIX)/$(GNU_HOST)/$(PTXCONF_GNU_TARGET)
+
+$(STATEDIR)/ksymoops.prepare:
touch $@
# ----------------------------------------------------------------------------
@@ -65,9 +69,13 @@ $(STATEDIR)/ksymoops.prepare: $(STATEDIR)/ksymoops.extract
ksymoops_compile: $(STATEDIR)/ksymoops.compile
-$(STATEDIR)/ksymoops.compile: $(STATEDIR)/ksymoops.prepare
- @$(call targetinfo, ksymoops.compile)
- CFLAGS="-I$(PTXCONF_PREFIX)/include" make -C $(KSYMOOPS_DIR)
+ksymoops_compile_deps = \
+ $(STATEDIR)/xchain-binutils.install \
+ $(STATEDIR)/ksymoops.extract
+
+$(STATEDIR)/ksymoops.compile: $(ksymoops_compile_deps)
+ @$(call targetinfo, $@)
+ make -C $(KSYMOOPS_DIR) $(KSYMOOPS_MAKEVARS)
touch $@
# ----------------------------------------------------------------------------
@@ -77,8 +85,8 @@ $(STATEDIR)/ksymoops.compile: $(STATEDIR)/ksymoops.prepare
ksymoops_install: $(STATEDIR)/ksymoops.install
$(STATEDIR)/ksymoops.install: $(STATEDIR)/ksymoops.compile
- @$(call targetinfo, ksymoops.install)
- make -C $(KSYMOOPS_DIR) install INSTALL_PREFIX=$(PTXCONF_PREFIX)
+ @$(call targetinfo, $@)
+ make -C $(KSYMOOPS_DIR) $(KSYMOOPS_MAKEVARS) install
touch $@
# ----------------------------------------------------------------------------
@@ -88,7 +96,7 @@ $(STATEDIR)/ksymoops.install: $(STATEDIR)/ksymoops.compile
ksymoops_targetinstall: $(STATEDIR)/ksymoops.targetinstall
$(STATEDIR)/ksymoops.targetinstall: $(STATEDIR)/ksymoops.install
- @$(call targetinfo, ksymoops.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/xchain-ltt.make b/rules/xchain-ltt.make
new file mode 100644
index 000000000..25c4e84d6
--- /dev/null
+++ b/rules/xchain-ltt.make
@@ -0,0 +1,127 @@
+# -*-makefile-*-
+# $Id: xchain-ltt.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
+# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_LTT
+XCHAIN += xchain-ltt
+endif
+
+XCHAIN_LTT_BUILDDIR = $(BUILDDIR)/xchain-$(LTT)-build
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xchain-ltt_get: $(STATEDIR)/xchain-ltt.get
+
+xchain-ltt_get_deps = \
+ $(STATEDIR)/ltt.get
+
+$(STATEDIR)/xchain-ltt.get: $(xchain-ltt_get_geps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+xchain-ltt_extract: $(STATEDIR)/xchain-ltt.extract
+
+xchain-ltt_extract_deps = $(STATEDIR)/ltt.extract
+
+$(STATEDIR)/xchain-ltt.extract: $(xchain-ltt_extract_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+xchain-ltt_prepare: $(STATEDIR)/xchain-ltt.prepare
+
+#
+# dependencies
+#
+xchain-ltt_prepare_deps = \
+ $(STATEDIR)/xchain-ltt.extract
+
+XCHAIN_LTT_ENV = $(HOSTCC_ENV)
+
+#
+# autoconf
+#
+XCHAIN_LTT_AUTOCONF = --prefix=$(PTXCONF_PREFIX) #--with-gtk=no
+
+$(STATEDIR)/xchain-ltt.prepare: $(xchain-ltt_prepare_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(XCHAIN_LTT_BUILDDIR))
+ mkdir -p $(XCHAIN_LTT_BUILDDIR)
+#
+# the Daemon/Scripts subdir is needed by 'make install'
+# the Visualizer/Scripts subdir is needed by 'make install'
+# so link to from the original sources dir
+#
+ mkdir -p $(XCHAIN_LTT_BUILDDIR)/Daemon
+ ln -s $(LTT_DIR)/Daemon/Scripts $(XCHAIN_LTT_BUILDDIR)/Daemon
+ mkdir -p $(XCHAIN_LTT_BUILDDIR)/Visualizer
+ ln -s $(LTT_DIR)/Daemon/Scripts $(XCHAIN_LTT_BUILDDIR)/Visualizer
+
+ cd $(XCHAIN_LTT_BUILDDIR) && \
+ $(XCHAIN_LTT_ENV) \
+ $(LTT_DIR)/configure $(XCHAIN_LTT_AUTOCONF)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xchain-ltt_compile: $(STATEDIR)/xchain-ltt.compile
+
+xchain-ltt_compile_deps = \
+ $(STATEDIR)/xchain-ltt.prepare
+
+$(STATEDIR)/xchain-ltt.compile: $(STATEDIR)/xchain-ltt.prepare
+ @$(call targetinfo, $@)
+ make -C $(XCHAIN_LTT_BUILDDIR)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xchain-ltt_install: $(STATEDIR)/xchain-ltt.install
+
+$(STATEDIR)/xchain-ltt.install: $(STATEDIR)/xchain-ltt.compile
+ @$(call targetinfo, $@)
+ make -C $(XCHAIN_LTT_BUILDDIR)/LibLTT install
+ make -C $(XCHAIN_LTT_BUILDDIR)/Visualizer install
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+xchain-ltt_targetinstall: $(STATEDIR)/xchain-ltt.targetinstall
+
+$(STATEDIR)/xchain-ltt.targetinstall:
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xchain-ltt_clean:
+ rm -rf $(STATEDIR)/xchain-ltt.* $(XCHAIN_LTT_BUILDDIR)
+
+# vim: syntax=make
diff --git a/rules/xchain-nasm.make b/rules/xchain-nasm.make
new file mode 100644
index 000000000..e5a7f4e86
--- /dev/null
+++ b/rules/xchain-nasm.make
@@ -0,0 +1,138 @@
+# -*-makefile-*-
+# $Id: xchain-nasm.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Dan Kegel http://kegel.com
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_NASM
+PACKAGES += xchain-nasm
+endif
+
+#
+# Paths and names
+#
+XCHAIN_NASM_VERSION = 0.98.38
+XCHAIN_NASM = nasm-$(XCHAIN_NASM_VERSION)
+XCHAIN_NASM_SUFFIX = tar.bz2
+XCHAIN_NASM_URL = http://umn.dl.sourceforge.net/sourceforge/nasm/$(XCHAIN_NASM).$(XCHAIN_NASM_SUFFIX)
+XCHAIN_NASM_SOURCE = $(SRCDIR)/$(XCHAIN_NASM).$(XCHAIN_NASM_SUFFIX)
+XCHAIN_NASM_DIR = $(BUILDDIR)/$(XCHAIN_NASM)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xchain-nasm_get: $(STATEDIR)/xchain-nasm.get
+
+xchain-nasm_get_deps = $(XCHAIN_NASM_SOURCE)
+
+$(STATEDIR)/xchain-nasm.get: $(xchain-nasm_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(XCHAIN_NASM_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(XCHAIN_NASM_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+xchain-nasm_extract: $(STATEDIR)/xchain-nasm.extract
+
+xchain-nasm_extract_deps = $(STATEDIR)/xchain-nasm.get
+
+$(STATEDIR)/xchain-nasm.extract: $(xchain-nasm_extract_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(XCHAIN_NASM_DIR))
+ @$(call extract, $(XCHAIN_NASM_SOURCE))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+xchain-nasm_prepare: $(STATEDIR)/xchain-nasm.prepare
+
+#
+# dependencies
+#
+xchain-nasm_prepare_deps = \
+ $(STATEDIR)/xchain-nasm.extract
+
+
+XCHAIN_NASM_PATH = PATH=$(CROSS_PATH)
+XCHAIN_NASM_ENV = $(HOSTCC_ENV)
+
+#
+# autoconf
+#
+XCHAIN_NASM_AUTOCONF = \
+ --target=$(PTXCONF_GNU_TARGET) \
+ --host=$(GNU_HOST) \
+ --build=$(GNU_HOST) \
+ --prefix=$(PTXCONF_PREFIX)
+
+$(STATEDIR)/xchain-nasm.prepare: $(xchain-nasm_prepare_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(XCHAIN_NASM_BUILDDIR))
+ cd $(XCHAIN_NASM_DIR) && \
+ $(XCHAIN_NASM_PATH) $(XCHAIN_NASM_ENV) \
+ ./configure $(XCHAIN_NASM_AUTOCONF)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xchain-nasm_compile: $(STATEDIR)/xchain-nasm.compile
+
+xchain-nasm_compile_deps = $(STATEDIR)/xchain-nasm.prepare
+
+$(STATEDIR)/xchain-nasm.compile: $(xchain-nasm_compile_deps)
+ @$(call targetinfo, $@)
+ $(XCHAIN_NASM_PATH) make -C $(XCHAIN_NASM_DIR)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xchain-nasm_install: $(STATEDIR)/xchain-nasm.install
+
+$(STATEDIR)/xchain-nasm.install: $(STATEDIR)/xchain-nasm.compile
+ @$(call targetinfo, $@)
+ mkdir -p $(PTXCONF_PREFIX)/bin
+ mkdir -p $(PTXCONF_PREFIX)/man/man1
+ $(XCHAIN_NASM_PATH) make -C $(XCHAIN_NASM_DIR) install
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+xchain-nasm_targetinstall: $(STATEDIR)/xchain-nasm.targetinstall
+
+xchain-nasm_targetinstall_deps = $(STATEDIR)/xchain-nasm.install
+
+$(STATEDIR)/xchain-nasm.targetinstall: $(xchain-nasm_targetinstall_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+nasm_clean:
+ rm -rf $(STATEDIR)/xchain-nasm.*
+ rm -rf $(XCHAIN_NASM_DIR)
+
+# vim: syntax=make
diff --git a/rules/xchain-python.make b/rules/xchain-python.make
index 2c79a32ab..c45aeee8f 100644
--- a/rules/xchain-python.make
+++ b/rules/xchain-python.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: xchain-python.make,v 1.1 2003/09/08 23:43:19 mkl Exp $
+# $Id: xchain-python.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by David R Bacon
+# Copyright (C) 2003 by David R Bacon
# Marc Kleine-Budde <kleine-budde@gmx.de>
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -28,7 +28,7 @@ XCHAIN_PYTHON_BUILDDIR = $(BUILDDIR)/xchain-$(PYTHON)-build
xchain-python_get: $(STATEDIR)/xchain-python.get
$(STATEDIR)/xchain-python.get: $(STATEDIR)/python.get
- @$(call targetinfo, xchain-python.get)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -38,7 +38,7 @@ $(STATEDIR)/xchain-python.get: $(STATEDIR)/python.get
xchain-python_extract: $(STATEDIR)/xchain-python.extract
$(STATEDIR)/xchain-python.extract: $(STATEDIR)/python.extract
- @$(call targetinfo, xchain-python.extract)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -57,7 +57,7 @@ XCHAIN_PYTHON_ENV = $(HOSTCC_ENV)
XCHAIN_PYTHON_AUTOCONF = --prefix=$(PTXCONF_PREFIX)
$(STATEDIR)/xchain-python.prepare: $(xchain-python_prepare_deps)
- @$(call targetinfo, xchain-python.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(XCHAIN_PYTHON_BUILDDIR))
mkdir -p $(XCHAIN_PYTHON_BUILDDIR)
cd $(XCHAIN_PYTHON_BUILDDIR) && \
@@ -72,7 +72,7 @@ $(STATEDIR)/xchain-python.prepare: $(xchain-python_prepare_deps)
xchain-python_compile: $(STATEDIR)/xchain-python.compile
$(STATEDIR)/xchain-python.compile: $(STATEDIR)/xchain-python.prepare
- @$(call targetinfo, xchain-python.compile)
+ @$(call targetinfo, $@)
make -C $(XCHAIN_PYTHON_BUILDDIR) python
make -C $(XCHAIN_PYTHON_BUILDDIR) Parser/pgen
touch $@
@@ -84,7 +84,7 @@ $(STATEDIR)/xchain-python.compile: $(STATEDIR)/xchain-python.prepare
xchain-python_install: $(STATEDIR)/xchain-python.install
$(STATEDIR)/xchain-python.install: $(STATEDIR)/xchain-python.compile
- @$(call targetinfo, xchain-python.install)
+ @$(call targetinfo, $@)
# make -C $(XCHAIN_PYTHON_BUILDDIR) bininstall
# install $(XCHAIN_PYTHON_BUILDDIR)/Parser/pgen $(PTXCONF_PREFIX)/bin/pgen
touch $@
@@ -96,7 +96,7 @@ $(STATEDIR)/xchain-python.install: $(STATEDIR)/xchain-python.compile
xchain-python_targetinstall: $(STATEDIR)/xchain-python.targetinstall
$(STATEDIR)/xchain-python.targetinstall:
- @$(call targetinfo, xchain-python.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/xchain-uclibc.make b/rules/xchain-uclibc.make
index 59c1329ac..5ff1ec6bd 100644
--- a/rules/xchain-uclibc.make
+++ b/rules/xchain-uclibc.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
-# $Id: xchain-uclibc.make,v 1.1 2003/07/16 04:23:28 mkl Exp $
+# $Id: xchain-uclibc.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
+# Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -24,7 +24,7 @@ XCHAIN_UCLIBC_BUILDDIR = $(BUILDDIR)/xchain/$(UCLIBC)
xchain-uclibc_get: $(STATEDIR)/xchain-uclibc.get
$(STATEDIR)/xchain-uclibc.get: $(uclibc_get_deps)
- @$(call targetinfo, xchain-uclibc.get)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -34,9 +34,10 @@ $(STATEDIR)/xchain-uclibc.get: $(uclibc_get_deps)
xchain-uclibc_extract: $(STATEDIR)/xchain-uclibc.extract
$(STATEDIR)/xchain-uclibc.extract: $(uclibc_get_deps)
- @$(call targetinfo, xchain-uclibc.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(XCHAIN_UCLIBC_BUILDDIR))
@$(call extract, $(UCLIBC_SOURCE), $(XCHAIN_BUILDDIR))
+ @$(call patchin, $(UCLIBC), $(XCHAIN_UCLIBC_BUILDDIR))
touch $@
# ----------------------------------------------------------------------------
@@ -48,14 +49,16 @@ xchain-uclibc_prepare: $(STATEDIR)/xchain-uclibc.prepare
XCHAIN_UCLIBC_PATH = PATH=$(CROSS_PATH)
XCHAIN_UCLIBC_MAKEVARS = CROSS=$(PTXCONF_GNU_TARGET)- HOSTCC=$(HOSTCC)
-$(STATEDIR)/xchain-uclibc.prepare: \
- $(STATEDIR)/xchain-gccstage1.install \
- $(STATEDIR)/xchain-uclibc.extract
- @$(call targetinfo, xchain-uclibc.prepare)
+xchain-uclibc_prepare_deps = \
+ $(STATEDIR)/xchain-gccstage1.install \
+ $(STATEDIR)/xchain-uclibc.extract
+
+$(STATEDIR)/xchain-uclibc.prepare: $(xchain-uclibc_prepare_deps)
+ @$(call targetinfo, $@)
grep -e PTXCONF_UCLIBC_ .config > $(XCHAIN_UCLIBC_BUILDDIR)/.config
perl -i -p -e 's/PTXCONF_UCLIBC_//g' $(XCHAIN_UCLIBC_BUILDDIR)/.config
- @$(call xchain_uclibc_fix_config, $(XCHAIN_UCLIBC_BUILDDIR)/.config)
+ @$(call xchain-uclibc_fix_config, $(XCHAIN_UCLIBC_BUILDDIR)/.config)
$(XCHAIN_UCLIBC_PATH) make -C $(XCHAIN_UCLIBC_BUILDDIR) oldconfig $(XCHAIN_UCLIBC_MAKEVARS)
touch $@
@@ -67,7 +70,7 @@ $(STATEDIR)/xchain-uclibc.prepare: \
xchain-uclibc_compile: $(STATEDIR)/xchain-uclibc.compile
$(STATEDIR)/xchain-uclibc.compile: $(STATEDIR)/xchain-uclibc.prepare
- @$(call targetinfo, xchain-uclibc.compile)
+ @$(call targetinfo, $@)
$(XCHAIN_UCLIBC_PATH) make -C $(XCHAIN_UCLIBC_BUILDDIR) $(XCHAIN_UCLIBC_MAKEVARS)
touch $@
@@ -78,7 +81,7 @@ $(STATEDIR)/xchain-uclibc.compile: $(STATEDIR)/xchain-uclibc.prepare
xchain-uclibc_install: $(STATEDIR)/xchain-uclibc.install
$(STATEDIR)/xchain-uclibc.install: $(STATEDIR)/xchain-uclibc.compile
- @$(call targetinfo, xchain-uclibc.install)
+ @$(call targetinfo, $@)
$(XCHAIN_UCLIBC_PATH) make -C $(XCHAIN_UCLIBC_BUILDDIR) \
install_dev install_runtime install_utils \
$(XCHAIN_UCLIBC_MAKEVARS) TARGET_ARCH=$(SHORT_TARGET)
@@ -91,7 +94,7 @@ $(STATEDIR)/xchain-uclibc.install: $(STATEDIR)/xchain-uclibc.compile
xchain-uclibc_targetinstall: $(STATEDIR)/xchain-uclibc.targetinstall
$(STATEDIR)/xchain-uclibc.targetinstall:
- @$(call targetinfo, xchain-uclibc.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/xchain-umkimage.make b/rules/xchain-umkimage.make
new file mode 100644
index 000000000..fd052fadf
--- /dev/null
+++ b/rules/xchain-umkimage.make
@@ -0,0 +1,123 @@
+# -*-makefile-*-
+# $Id: xchain-umkimage.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+#
+# Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_XCHAIN_UMKIMAGE
+PACKAGES += xchain-umkimage
+endif
+
+#
+# Paths and names
+#
+XCHAIN_UMKIMAGE_VERSION = 20030424
+XCHAIN_UMKIMAGE = u-boot-mkimage-$(XCHAIN_UMKIMAGE_VERSION)
+XCHAIN_UMKIMAGE_SUFFIX = tar.gz
+XCHAIN_UMKIMAGE_URL = http://www.pengutronix.de/software/ptxdist/temporary-src/$(XCHAIN_UMKIMAGE).$(XCHAIN_UMKIMAGE_SUFFIX)
+XCHAIN_UMKIMAGE_SOURCE = $(SRCDIR)/$(XCHAIN_UMKIMAGE).$(XCHAIN_UMKIMAGE_SUFFIX)
+XCHAIN_UMKIMAGE_DIR = $(BUILDDIR)/$(XCHAIN_UMKIMAGE)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xchain-umkimage_get: $(STATEDIR)/xchain-umkimage.get
+
+xchain-umkimage_get_deps = $(XCHAIN_UMKIMAGE_SOURCE)
+
+$(STATEDIR)/xchain-umkimage.get: $(xchain-umkimage_get_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+$(XCHAIN_UMKIMAGE_SOURCE):
+ @$(call targetinfo, $@)
+ @$(call get, $(XCHAIN_UMKIMAGE_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+xchain-umkimage_extract: $(STATEDIR)/xchain-umkimage.extract
+
+xchain-umkimage_extract_deps = $(STATEDIR)/xchain-umkimage.get
+
+$(STATEDIR)/xchain-umkimage.extract: $(xchain-umkimage_extract_deps)
+ @$(call targetinfo, $@)
+ @$(call clean, $(XCHAIN_UMKIMAGE_DIR))
+ @$(call extract, $(XCHAIN_UMKIMAGE_SOURCE))
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+xchain-umkimage_prepare: $(STATEDIR)/xchain-umkimage.prepare
+
+#
+# dependencies
+#
+xchain-umkimage_prepare_deps = \
+ $(STATEDIR)/xchain-umkimage.extract \
+ $(STATEDIR)/xchain-zlib.install
+
+XCHAIN_UMKIMAGE_MAKEVARS = CC=$(HOSTCC)
+XCHAIN_UMKIMAGE_ENV = CFLAGS=-I$(PTXCONF_PREFIX)/include
+
+$(STATEDIR)/xchain-umkimage.prepare: $(xchain-umkimage_prepare_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xchain-umkimage_compile: $(STATEDIR)/xchain-umkimage.compile
+
+xchain-umkimage_compile_deps = $(STATEDIR)/xchain-umkimage.prepare
+
+$(STATEDIR)/xchain-umkimage.compile: $(xchain-umkimage_compile_deps)
+ @$(call targetinfo, $@)
+ $(XCHAIN_UMKIMAGE_ENV) make -C $(XCHAIN_UMKIMAGE_DIR) $(XCHAIN_UMKIMAGE_MAKEVARS)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xchain-umkimage_install: $(STATEDIR)/xchain-umkimage.install
+
+$(STATEDIR)/xchain-umkimage.install: $(STATEDIR)/xchain-umkimage.compile
+ @$(call targetinfo, $@)
+ install $(UMKIMAGE_DIR)/mkimage $(PTXCONF_PREFIX)/bin/u-boot-mkimage
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+xchain-umkimage_targetinstall: $(STATEDIR)/xchain-umkimage.targetinstall
+
+xchain-umkimage_targetinstall_deps = $(STATEDIR)/xchain-umkimage.compile
+
+$(STATEDIR)/xchain-umkimage.targetinstall: $(xchain-umkimage_targetinstall_deps)
+ @$(call targetinfo, $@)
+ touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xchain-umkimage_clean:
+ rm -rf $(STATEDIR)/xchain-umkimage.*
+ rm -rf $(XCHAIN_UMKIMAGE_DIR)
+
+# vim: syntax=make
diff --git a/rules/xchain-zlib.make b/rules/xchain-zlib.make
index e2959cee0..92c0237b9 100644
--- a/rules/xchain-zlib.make
+++ b/rules/xchain-zlib.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
# $id$
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -25,7 +25,7 @@ XCHAIN_ZLIB_BUILDDIR = $(BUILDDIR)/xchain/$(ZLIB)
xchain-zlib_get: $(STATEDIR)/xchain-zlib.get
$(STATEDIR)/xchain-zlib.get: $(STATEDIR)/zlib.get
- @$(call targetinfo, xchain-zlib.get)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -35,7 +35,7 @@ $(STATEDIR)/xchain-zlib.get: $(STATEDIR)/zlib.get
xchain-zlib_extract: $(STATEDIR)/xchain-zlib.extract
$(STATEDIR)/xchain-zlib.extract: $(STATEDIR)/xchain-zlib.get
- @$(call targetinfo, xchain-zlib.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(XCHAIN_ZLIB_BUILDDIR))
@$(call extract, $(ZLIB_SOURCE), $(XCHAIN_BUILDDIR))
touch $@
@@ -51,7 +51,7 @@ XCHAIN_ZLIB_AUTOCONF += --prefix=$(PTXCONF_PREFIX)
XCHAIN_ZLIB_MAKEVARS = $(HOSTCC_ENV)
$(STATEDIR)/xchain-zlib.prepare: $(STATEDIR)/xchain-zlib.extract
- @$(call targetinfo, xchain-zlib.prepare)
+ @$(call targetinfo, $@)
cd $(XCHAIN_ZLIB_BUILDDIR) && \
./configure $(XCHAIN_ZLIB_AUTOCONF)
touch $@
@@ -61,7 +61,7 @@ $(STATEDIR)/xchain-zlib.prepare: $(STATEDIR)/xchain-zlib.extract
# ----------------------------------------------------------------------------
$(STATEDIR)/xchain-zlib.compile: $(STATEDIR)/xchain-zlib.prepare
- @$(call targetinfo, xchain-zlib.compile)
+ @$(call targetinfo, $@)
make -C $(XCHAIN_ZLIB_BUILDDIR) $(XCHAIN_ZLIB_MAKEVARS)
touch $@
@@ -72,7 +72,7 @@ $(STATEDIR)/xchain-zlib.compile: $(STATEDIR)/xchain-zlib.prepare
xchain-zlib_install: $(STATEDIR)/xchain-zlib.install
$(STATEDIR)/xchain-zlib.install: $(STATEDIR)/xchain-zlib.compile
- @$(call targetinfo, xchain-zlib.install)
+ @$(call targetinfo, $@)
make -C $(XCHAIN_ZLIB_BUILDDIR) $(XCHAIN_ZLIB_MAKEVARS) \
install
touch $@
@@ -83,7 +83,7 @@ $(STATEDIR)/xchain-zlib.install: $(STATEDIR)/xchain-zlib.compile
xchain-zlib_targetinstall: $(STATEDIR)/xchain-zlib.targetinstall
$(STATEDIR)/xchain-zlib.targetinstall: $(STATEDIR)/xchain-zlib.install
- @$(call targetinfo, xchain-zlib.targetinstall)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
diff --git a/rules/xfree430.make b/rules/xfree430.make
index 786e8a5b5..c1ca38563 100644
--- a/rules/xfree430.make
+++ b/rules/xfree430.make
@@ -1,12 +1,12 @@
# -*-makefile-*-
-# $Id: xfree430.make,v 1.5 2003/09/16 16:58:57 mkl Exp $
+# $Id: xfree430.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
# Pengutronix <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -58,33 +58,33 @@ xfree430_get_deps = $(XFREE430_SOURCE)
#xfree430_get_deps += $(XFREE430_5_SOURCE)
$(STATEDIR)/xfree430.get: $(xfree430_get_deps)
- @$(call targetinfo, xfree430.get)
+ @$(call targetinfo, $@)
@$(call get_patches, $(XFREE))
touch $@
$(XFREE430_SOURCE):
- @$(call targetinfo, $(XFREE430_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(XFREE430_URL))
# FIXME: for a release use split sources
#$(XFREE430_1_SOURCE):
-# @$(call targetinfo, $(XFREE430_1_SOURCE))
+# @$(call targetinfo, $@)
# @$(call get, $(XFREE430_1_URL))
#
#$(XFREE430_2_SOURCE):
-# @$(call targetinfo, $(XFREE430_2_SOURCE))
+# @$(call targetinfo, $@)
# @$(call get, $(XFREE430_2_URL))
#
#$(XFREE430_3_SOURCE):
-# @$(call targetinfo, $(XFREE430_3_SOURCE))
+# @$(call targetinfo, $@)
# @$(call get, $(XFREE430_3_URL))
#
#$(XFREE430_4_SOURCE):
-# @$(call targetinfo, $(XFREE430_4_SOURCE))
+# @$(call targetinfo, $@)
# @$(call get, $(XFREE430_4_URL))
#
#$(XFREE430_5_SOURCE):
-# @$(call targetinfo, $(XFREE430_5_SOURCE))
+# @$(call targetinfo, $@)
# @$(call get, $(XFREE430_5_URL))
# ----------------------------------------------------------------------------
@@ -96,7 +96,7 @@ xfree430_extract: $(STATEDIR)/xfree430.extract
xfree430_extract_deps = $(STATEDIR)/xfree430.get
$(STATEDIR)/xfree430.extract: $(xfree430_extract_deps)
- @$(call targetinfo, xfree430.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(XFREE430_DIR))
@$(call extract, $(XFREE430_SOURCE))
@$(call patchin, $(XFREE430), $(XFREE430_DIR))
@@ -129,7 +129,7 @@ XFREE430_PATH = PATH=$(CROSS_PATH)
XFREE430_ENV = XCURSORGEN=xcursorgen
$(STATEDIR)/xfree430.prepare: $(xfree430_prepare_deps)
- @$(call targetinfo, xfree430.prepare)
+ @$(call targetinfo, $@)
@$(call clean, $(XFREE430_BUILDDIR))
# # Out-of-Tree build preparation
@@ -157,7 +157,7 @@ xfree430_compile: $(STATEDIR)/xfree430.compile
xfree430_compile_deps = $(STATEDIR)/xfree430.prepare
$(STATEDIR)/xfree430.compile: $(xfree430_compile_deps)
- @$(call targetinfo, xfree430.compile)
+ @$(call targetinfo, $@)
cd $(XFREE430_BUILDDIR) && \
$(XFREE430_ENV) make World CROSSCOMPILEDIR=$(XFREE430_BUILDDIR)/cross_compiler
@@ -171,7 +171,7 @@ $(STATEDIR)/xfree430.compile: $(xfree430_compile_deps)
xfree430_install: $(STATEDIR)/xfree430.install
$(STATEDIR)/xfree430.install: $(STATEDIR)/xfree430.compile
- @$(call targetinfo, xfree430.install)
+ @$(call targetinfo, $@)
# # These links are set incorrectly :-(
ln -sf $(XFREE430_BUILDDIR)/programs/Xserver/hw/xfree86/xf86Date.h $(XFREE430_BUILDDIR)/config/cf/date.def
@@ -279,7 +279,7 @@ xfree430_targetinstall_deps += $(STATEDIR)/libpng125.targetinstall
xfree430_targetinstall_deps += $(STATEDIR)/zlib.targetinstall
$(STATEDIR)/xfree430.targetinstall: $(xfree430_targetinstall_deps)
- @$(call targetinfo, xfree430.targetinstall)
+ @$(call targetinfo, $@)
# # These links are set incorrectly :-(
ln -sf $(XFREE430_BUILDDIR)/programs/Xserver/hw/xfree86/xf86Date.h $(XFREE430_BUILDDIR)/config/cf/date.def
diff --git a/rules/xvkbd.make b/rules/xvkbd.make
index 2e2ca6732..c7c4ad93f 100644
--- a/rules/xvkbd.make
+++ b/rules/xvkbd.make
@@ -1,11 +1,11 @@
# -*-makefile-*-
-# $Id: xvkbd.make,v 1.2 2003/09/13 08:09:06 robert Exp $
+# $Id: xvkbd.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
+# Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -35,11 +35,11 @@ xvkbd_get: $(STATEDIR)/xvkbd.get
xvkbd_get_deps = $(XVKBD_SOURCE)
$(STATEDIR)/xvkbd.get: $(xvkbd_get_deps)
- @$(call targetinfo, xvkbd.get)
+ @$(call targetinfo, $@)
touch $@
$(XVKBD_SOURCE):
- @$(call targetinfo, $(XVKBD_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(XVKBD_URL))
# ----------------------------------------------------------------------------
@@ -51,7 +51,7 @@ xvkbd_extract: $(STATEDIR)/xvkbd.extract
xvkbd_extract_deps = $(STATEDIR)/xvkbd.get
$(STATEDIR)/xvkbd.extract: $(xvkbd_extract_deps)
- @$(call targetinfo, xvkbd.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(XVKBD_DIR))
@$(call extract, $(XVKBD_SOURCE))
touch $@
@@ -67,14 +67,14 @@ xvkbd_prepare: $(STATEDIR)/xvkbd.prepare
#
xvkbd_prepare_deps = \
$(STATEDIR)/xvkbd.extract \
-# $(STATEDIR)/virtual-xchain.install
+ $(STATEDIR)/virtual-xchain.install
XVKBD_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH)
XVKBD_ENV = $(CROSS_ENV)
#XVKBD_ENV +=
$(STATEDIR)/xvkbd.prepare: $(xvkbd_prepare_deps)
- @$(call targetinfo, xvkbd.prepare)
+ @$(call targetinfo, $@)
cd $(XVKBD_DIR) && \
$(XVKBD_PATH) $(XVKBD_ENV) \
xmkmf
@@ -89,7 +89,7 @@ xvkbd_compile: $(STATEDIR)/xvkbd.compile
xvkbd_compile_deps = $(STATEDIR)/xvkbd.prepare
$(STATEDIR)/xvkbd.compile: $(xvkbd_compile_deps)
- @$(call targetinfo, xvkbd.compile)
+ @$(call targetinfo, $@)
$(XVKBD_PATH) $(XVKBD_ENV) make -C $(XVKBD_DIR)
touch $@
@@ -100,7 +100,7 @@ $(STATEDIR)/xvkbd.compile: $(xvkbd_compile_deps)
xvkbd_install: $(STATEDIR)/xvkbd.install
$(STATEDIR)/xvkbd.install: $(STATEDIR)/xvkbd.compile
- @$(call targetinfo, xvkbd.install)
+ @$(call targetinfo, $@)
$(XVKBD_PATH) $(XVKBD_ENV) make -C $(XVKBD_DIR) install
touch $@
@@ -113,7 +113,7 @@ xvkbd_targetinstall: $(STATEDIR)/xvkbd.targetinstall
xvkbd_targetinstall_deps = $(STATEDIR)/xvkbd.compile
$(STATEDIR)/xvkbd.targetinstall: $(xvkbd_targetinstall_deps)
- @$(call targetinfo, xvkbd.targetinstall)
+ @$(call targetinfo, $@)
install $(XVKBD_DIR)/xvkbd $(ROOTDIR)/usr/X11R6/bin/
install $(XVKBD_DIR)/XVkbd-common.ad $(ROOTDIR)/etc/X11/app-defaults/XVkbd-common
install $(XVKBD_DIR)/XVkbd-german.ad $(ROOTDIR)/etc/X11/app-defaults/XVkbd-german
diff --git a/rules/zebra.make b/rules/zebra.make
index 1329c0b31..028f08a50 100644
--- a/rules/zebra.make
+++ b/rules/zebra.make
@@ -1,19 +1,19 @@
# -*-makefile-*-
-# $Id: zebra.make,v 1.1 2003/08/08 18:28:43 robert Exp $
+# $Id: zebra.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
#
-# (c) 2003 Jochen Striepe, Pengutronix e.K. <info@pengutronix.de>, Germany
-# (c) 2003 Robert Schwebel, Pengutronix e.K. <info@pengutronix.de>, Germany
+# Copyright (C) 2003 Jochen Striepe, Pengutronix e.K. <info@pengutronix.de>, Germany
+# Copyright (C) 2003 Robert Schwebel, Pengutronix e.K. <info@pengutronix.de>, Germany
#
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
#
# We provide this package
#
-ifeq (y,$(PTXCONF_ZEBRA))
+ifdef PTXCONF_ZEBRA
PACKAGES += zebra
endif
@@ -36,11 +36,11 @@ zebra_get: $(STATEDIR)/zebra.get
zebra_get_deps = $(ZEBRA_SOURCE)
$(STATEDIR)/zebra.get: $(zebra_get_deps)
- @$(call targetinfo, zebra.get)
+ @$(call targetinfo, $@)
touch $@
$(ZEBRA_SOURCE):
- @$(call targetinfo, $(ZEBRA_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(ZEBRA_URL))
# ----------------------------------------------------------------------------
@@ -52,9 +52,10 @@ zebra_extract: $(STATEDIR)/zebra.extract
zebra_extract_deps = $(STATEDIR)/zebra.get
$(STATEDIR)/zebra.extract: $(zebra_extract_deps)
- @$(call targetinfo, zebra.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(ZEBRA_DIR))
@$(call extract, $(ZEBRA_SOURCE))
+ touch $@
# ----------------------------------------------------------------------------
# Prepare
@@ -62,21 +63,35 @@ $(STATEDIR)/zebra.extract: $(zebra_extract_deps)
zebra_prepare: $(STATEDIR)/zebra.prepare
-zebra_prepare_deps = $(STATEDIR)/zebra.extract
+zebra_prepare_deps = \
+ $(STATEDIR)/virtual-xchain.install \
+ $(STATEDIR)/zebra.extract
+
+ZEBRA_AUTOCONF = \
+ --build=$(GNU_HOST) \
+ --host=$(PTXCONF_GNU_TARGET) \
+ --with-cflags=$(TARGET_CFLAGS) \
+ --prefix=/usr \
+ --exec-prefix=/usr \
+ --sysconfdir=/etc/zebra \
+ --localstatedir=/var
+
+ZEBRA_ENV = \
+ $(CROSS_ENV) \
+ ac_cv_func_getpgrp_void=yes \
+ ac_cv_func_setpgrp_void=yes \
+ ac_cv_sizeof_long_long=8 \
+ ac_cv_func_memcmp_clean=yes \
+ ac_cv_func_getrlimit=yes
+
+ZEBRA_PATH = PATH=$(CROSS_PATH)
-ZEBRA_AUTOCONF = --prefix=/usr
-ZEBRA_AUTOCONF += --build=$(GNU_HOST)
-ZEBRA_AUTOCONF += --host=$(PTXCONF_GNU_TARGET)
$(STATEDIR)/zebra.prepare: $(zebra_prepare_deps)
- @$(call targetinfo, zebra.prepare)
+ @$(call targetinfo, $@)
cd $(ZEBRA_DIR) && \
- ac_cv_func_getpgrp_void=yes \
- ac_cv_func_setpgrp_void=yes \
- ac_cv_sizeof_long_long=8 \
- ac_cv_func_memcmp_clean=yes \
- ac_cv_func_getrlimit=yes \
- $(ZEBRA_PATH) $(ZEBRA_ENV) $(ZEBRA_DIR)/configure $(ZEBRA_AUTOCONF)
+ $(ZEBRA_PATH) $(ZEBRA_ENV) \
+ ./configure $(ZEBRA_AUTOCONF)
touch $@
# ----------------------------------------------------------------------------
@@ -86,7 +101,7 @@ $(STATEDIR)/zebra.prepare: $(zebra_prepare_deps)
zebra_compile: $(STATEDIR)/zebra.compile
$(STATEDIR)/zebra.compile: $(STATEDIR)/zebra.prepare
- @$(call targetinfo, zebra.compile)
+ @$(call targetinfo, $@)
$(ZEBRA_PATH) make -C $(ZEBRA_DIR)
touch $@
@@ -97,7 +112,7 @@ $(STATEDIR)/zebra.compile: $(STATEDIR)/zebra.prepare
zebra_install: $(STATEDIR)/zebra.install
$(STATEDIR)/zebra.install: $(STATEDIR)/zebra.compile
- @$(call targetinfo, zebra.install)
+ @$(call targetinfo, $@)
touch $@
# ----------------------------------------------------------------------------
@@ -107,8 +122,8 @@ $(STATEDIR)/zebra.install: $(STATEDIR)/zebra.compile
zebra_targetinstall: $(STATEDIR)/zebra.targetinstall
$(STATEDIR)/zebra.targetinstall: $(STATEDIR)/zebra.install
- @$(call targetinfo, zebra.targetinstall)
-# TODO
+ @$(call targetinfo, $@)
+ $(ZEBRA_PATH) make -C $(ZEBRA_DIR) DESTDIR=$(ROOTDIR)
touch $@
# ----------------------------------------------------------------------------
# Clean
diff --git a/rules/zlib.make b/rules/zlib.make
index 66cb30e20..dd3b60d40 100644
--- a/rules/zlib.make
+++ b/rules/zlib.make
@@ -1,10 +1,10 @@
# -*-makefile-*-
# $id$
#
-# (c) 2002 by Pengutronix e.K., Hildesheim, Germany
+# Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
# See CREDITS for details about who has contributed to this project.
#
-# For further information about the PTXDIST project and license conditions
+# For further information about the PTXdist project and license conditions
# see the README file.
#
@@ -30,11 +30,11 @@ ZLIB_DIR = $(BUILDDIR)/$(ZLIB)
zlib_get: $(STATEDIR)/zlib.get
$(STATEDIR)/zlib.get: $(ZLIB_SOURCE)
- @$(call targetinfo, zlib.get)
+ @$(call targetinfo, $@)
touch $@
$(ZLIB_SOURCE):
- @$(call targetinfo, $(ZLIB_SOURCE))
+ @$(call targetinfo, $@)
@$(call get, $(ZLIB_URL))
# ----------------------------------------------------------------------------
@@ -44,7 +44,7 @@ $(ZLIB_SOURCE):
zlib_extract: $(STATEDIR)/zlib.extract
$(STATEDIR)/zlib.extract: $(STATEDIR)/zlib.get
- @$(call targetinfo, zlib.extract)
+ @$(call targetinfo, $@)
@$(call clean, $(ZLIB_DIR))
@$(call extract, $(ZLIB_SOURCE))
touch $@
@@ -64,7 +64,7 @@ ZLIB_AUTOCONF = --shared
ZLIB_AUTOCONF += --prefix=$(CROSS_LIB_DIR)
$(STATEDIR)/zlib.prepare: $(zlib_prepare_deps)
- @$(call targetinfo, zlib.prepare)
+ @$(call targetinfo, $@)
cd $(ZLIB_DIR) && \
$(ZLIB_PATH) \
./configure $(ZLIB_AUTOCONF)
@@ -79,7 +79,7 @@ $(STATEDIR)/zlib.prepare: $(zlib_prepare_deps)
zlib_compile: $(STATEDIR)/zlib.compile
$(STATEDIR)/zlib.compile: $(STATEDIR)/zlib.prepare
- @$(call targetinfo, zlib.compile)
+ @$(call targetinfo, $@)
$(ZLIB_PATH) make -C $(ZLIB_DIR)
touch $@
@@ -90,7 +90,7 @@ $(STATEDIR)/zlib.compile: $(STATEDIR)/zlib.prepare
zlib_install: $(STATEDIR)/zlib.install
$(STATEDIR)/zlib.install: $(STATEDIR)/zlib.compile
- @$(call targetinfo, zlib.install)
+ @$(call targetinfo, $@)
$(ZLIB_PATH) make -C $(ZLIB_DIR) install
touch $@
@@ -101,7 +101,7 @@ $(STATEDIR)/zlib.install: $(STATEDIR)/zlib.compile
zlib_targetinstall: $(STATEDIR)/zlib.targetinstall
$(STATEDIR)/zlib.targetinstall: $(STATEDIR)/zlib.install
- @$(call targetinfo, zlib.targetinstall)
+ @$(call targetinfo, $@)
mkdir -p $(ROOTDIR)/lib
cp -d $(ZLIB_DIR)/libz.so* $(ROOTDIR)/lib
$(CROSSSTRIP) -S -R .note -R .comment $(ROOTDIR)/lib/libz.so*