summaryrefslogtreecommitdiff
path: root/target/foxboard
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-29 18:43:00 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-29 18:43:00 +0100
commit7a545ad720f1f8823d6e3dd0e51e1fa9dff237b1 (patch)
tree16083a85aca4e3a621b3db881c89331262d62045 /target/foxboard
parent7805532fffa81c46a01af77aa967cf11a948a9f1 (diff)
parentc6fa1f863aedbdbc977c78e1dc62ca5eb0da9451 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/foxboard')
-rw-r--r--target/foxboard/Makefile4
-rw-r--r--target/foxboard/tools/squashfs/Makefile25
2 files changed, 2 insertions, 27 deletions
diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile
index f33dc813a..c4a64c26b 100644
--- a/target/foxboard/Makefile
+++ b/target/foxboard/Makefile
@@ -12,8 +12,8 @@ $(TOOLS_BUILD_DIR):
tools-compile: $(TOOLS_BUILD_DIR)
$(MAKE) -C tools/mkfimage
- $(MAKE) -C tools/e100boot prepare compile install $(MAKE_TRACE)
- $(MAKE) -C tools/squashfs prepare compile install
+ #$(MAKE) -C tools/e100boot prepare compile install $(MAKE_TRACE)
+ $(MAKE) -C ../tools/squashfs prepare compile install
$(INSTALL_BIN) tools/boot_linux $(BIN_DIR)/
kernel-install: tools-compile
diff --git a/target/foxboard/tools/squashfs/Makefile b/target/foxboard/tools/squashfs/Makefile
deleted file mode 100644
index a55181f88..000000000
--- a/target/foxboard/tools/squashfs/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:= squashfs
-PKG_VERSION:= 4.0
-PKG_RELEASE:= 1
-PKG_MD5SUM:= a3c23391da4ebab0ac4a75021ddabf96
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=squashfs/}
-DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz
-WRKDIST= ${WRKDIR}/$(PKG_NAME)${PKG_VERSION}
-
-include ../rules.mk
-
-$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
- $(MAKE) -C $(WRKBUILD)/squashfs-tools
- touch $@
-
-$(WRKBUILD)/.installed:
- $(INSTALL_BIN) $(WRKBUILD)/squashfs-tools/mksquashfs \
- ${STAGING_TOOLS}/bin
- touch $@
-
-include $(TOPDIR)/mk/tools.mk