diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-30 15:27:34 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-30 15:27:34 +0100 |
| commit | 2875c0ee841e74e272e832fdfb91dc8c73013ccd (patch) | |
| tree | 20d0ec969f51b9eb3410090f64a1fc6e092b9fb0 /target/ag241 | |
| parent | 86ada69f32491de2415d237605370e7f4e8d5e01 (diff) | |
| parent | 47e50c10a8bb626f3366912bc4691bd5fbddea45 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/ag241')
| -rw-r--r-- | target/ag241/Makefile | 2 | ||||
| -rw-r--r-- | target/ag241/files/etc/network/interfaces | 2 | ||||
| -rw-r--r-- | target/ag241/tools/squashfs/Makefile | 27 |
3 files changed, 2 insertions, 29 deletions
diff --git a/target/ag241/Makefile b/target/ag241/Makefile index e87a55d0d..9848205cc 100644 --- a/target/ag241/Makefile +++ b/target/ag241/Makefile @@ -15,7 +15,7 @@ $(TOOLS_BUILD_DIR): tools-compile: $(TOOLS_BUILD_DIR) $(MAKE) -C tools/addpattern $(MAKE) -C tools/srec2bin - $(MAKE) -C tools/squashfs prepare compile install + $(MAKE) -C ../tools/squashfs prepare compile install kernel-install: tools-compile PATH='${TARGET_PATH}' \ diff --git a/target/ag241/files/etc/network/interfaces b/target/ag241/files/etc/network/interfaces index 5d2e025d7..519928df9 100644 --- a/target/ag241/files/etc/network/interfaces +++ b/target/ag241/files/etc/network/interfaces @@ -2,7 +2,7 @@ auto lo iface lo inet loopback auto nas0 -iface nas0 inet atm +iface nas0 inet manual auto br0 iface br0 inet manual diff --git a/target/ag241/tools/squashfs/Makefile b/target/ag241/tools/squashfs/Makefile deleted file mode 100644 index 0887afc22..000000000 --- a/target/ag241/tools/squashfs/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $Id$ -#- -# 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 |