summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Save2008-12-02 12:27:14 +0100
committerJean-Philippe Save2008-12-02 12:27:14 +0100
commit2676a524d6d7fd69f576ade0bb61ea9b900132ed (patch)
tree04dc7acc32485f4ecedc3a398747550f786c7581
parentd6bc855621c6425aa9a92f0843e8605e19e870c9 (diff)
[BUILDROOT] Changed copy image with FTP_HOME env variable + Cleaning hg status
-rw-r--r--.hgignore14
-rw-r--r--devkit/rtai-3.1-2.6/rtai-core/math/.k_cos.o.cmd23
-rw-r--r--package/linux/linux.mk6
3 files changed, 17 insertions, 26 deletions
diff --git a/.hgignore b/.hgignore
index ec99541607..100cf5aedf 100644
--- a/.hgignore
+++ b/.hgignore
@@ -64,6 +64,9 @@ application/busybox/include/config/*
# package directory
package/initramfs/initramfs_list
package/config/buildroot-config/*
+package/config/.depend
+package/config/conf
+package/config/mconf
# tools directory
tools/mtd-utils/doc_loadbios
@@ -261,6 +264,16 @@ application/smm/smm-server/smm_server
application/spidlib/interface/spidlib.h
application/spidlib/spidlib.a
application/wishlist/wishlist
+application/boottable/bt
+application/bridge-utils/brctl/brctl
+application/bridge-utils/libbridge/libbridge.a
+application/ebtables/ebtables
+application/mtd-utils/arm-uclinux/flash_erase
+application/mtd-utils/arm-uclinux/flash_eraseall
+application/mtd-utils/arm-uclinux/flash_lock
+application/mtd-utils/arm-uclinux/flash_unlock
+bootloader/src/config.mk
+bootloader/src/config_SCR200c-slave-16M.mk
devkit/plc/plc_drv.mod.c
devkit/plc/version/stamp.c
devkit/rtai-3.1-2.6/.cfok
@@ -354,6 +367,7 @@ linux-2.6.10/usr/initramfs_data.cpio.gz
linux-2.6.10/usr/initramfs_list
linux-2.6.10/vmlinux
linux-2.6.10/Module.symvers
+include/autoconf.h
tools/flashfs/flashfs.jffs2
tools/mtd-utils/docfdisk
tools/mtd-utils/flash_info
diff --git a/devkit/rtai-3.1-2.6/rtai-core/math/.k_cos.o.cmd b/devkit/rtai-3.1-2.6/rtai-core/math/.k_cos.o.cmd
deleted file mode 100644
index 7049f39cc2..0000000000
--- a/devkit/rtai-3.1-2.6/rtai-core/math/.k_cos.o.cmd
+++ /dev/null
@@ -1,23 +0,0 @@
-cmd_/home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/k_cos.o := arm-uclinux-gcc -Wp,-MD,/home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/.k_cos.o.d -nostdinc -iwithprefix include -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Os -fomit-frame-pointer -fno-builtin -D__linux__ -fomit-frame-pointer -mapcs -mlittle-endian -mapcs-32 -D__LINUX_ARM_ARCH__=5 -march=armv5te -mtune=arm926ejs -malignment-traps -msoft-float -Uarm -I/home/naulet/spidroot/linux-2.6.10/../include -DSP_CRISTINA -DTINA_C -funit-at-a-time -Wdeclaration-after-statement -I/home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/include -I/home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/../include -I/home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/../.. -I/usr/include -ffast-math -msoft-float -D_IEEE_LIBM -D_ISOC99_SOURCE -D_SVID_SOURCE -D__IN_RTAI__ -DMODULE -mlong-calls -DKBUILD_BASENAME=k_cos -DKBUILD_MODNAME=rtai_math -c -o /home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/k_cos.o /home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/k_cos.c
-
-deps_/home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/k_cos.o := \
- /home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/k_cos.c \
- /home/naulet/spidroot/linux-2.6.10/../include/math.h \
- /home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/mathP.h \
- /usr/include/endian.h \
- /usr/include/features.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/wordsize.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-32.h \
- /usr/include/bits/endian.h \
- /usr/include/sys/types.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/time.h \
- /opt/arm-uclinux/bin/../lib/gcc/arm-uclinux/3.4.4/include/stddef.h \
- /usr/include/bits/pthreadtypes.h \
-
-/home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/k_cos.o: $(deps_/home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/k_cos.o)
-
-$(deps_/home/naulet/spidroot/devkit/rtai-3.1-2.6/rtai-core/math/k_cos.o):
diff --git a/package/linux/linux.mk b/package/linux/linux.mk
index e8cb57d521..f256fd400b 100644
--- a/package/linux/linux.mk
+++ b/package/linux/linux.mk
@@ -35,9 +35,9 @@ else
endif
# For compatibility purposes
@if [ "$(FTP_HOME)" != "" ]; then \
- echo "Copying zImage to $(FTP_HOME)"; \
- cp $< $(FTP_HOME); \
- md5sum $< > $(FTP_HOME)/md5; \
+ echo "Copying $@ to $(FTP_HOME)/bootpImage"; \
+ cp $@ $(FTP_HOME)/bootpImage; \
+# md5sum $< > $(FTP_HOME)/md5; \
fi
linux: initramfs tools $(IMAGE_DIR)/$(IMAGE_NAME)