summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-25 13:15:31 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-25 13:15:31 +0100
commit977956e6dbde952f72031c5c2035c9d9685cee88 (patch)
tree441ffe27aa76fc28e210e1ca7a506a03a32f5fe2 /target
parent573b06af740b3f1966aa2ea190494d9c87270786 (diff)
parentf5a999a24fddc9527fda922c72577e50f93c2ae2 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
-rw-r--r--target/cris/Makefile6
-rw-r--r--target/mipsel/Makefile10
-rw-r--r--target/packages/pkg-available/development4
-rw-r--r--target/packages/pkg-available/laptop1
4 files changed, 11 insertions, 10 deletions
diff --git a/target/cris/Makefile b/target/cris/Makefile
index ff8f19473..80ec16d6a 100644
--- a/target/cris/Makefile
+++ b/target/cris/Makefile
@@ -10,11 +10,11 @@ include $(TOPDIR)/mk/image.mk
KERNEL:=$(LINUX_DIR)/arch/cris/boot/zImage
tools-compile:
- $(MAKE) -C ../tools/mkfimage
+ $(MAKE) -C ../tools/mkfimage all
ifneq ($(ADK_HOST_DARWIN),y)
- $(MAKE) -C ../tools/e100boot
+ $(MAKE) -C ../tools/e100boot all
endif
- $(MAKE) -C ../tools/squashfs
+ $(MAKE) -C ../tools/squashfs all
$(INSTALL_BIN) ../tools/boot_linux $(BIN_DIR)/
kernel-install: tools-compile
diff --git a/target/mipsel/Makefile b/target/mipsel/Makefile
index 7577faf1e..0caacc1db 100644
--- a/target/mipsel/Makefile
+++ b/target/mipsel/Makefile
@@ -16,14 +16,14 @@ KERNEL:=$(LINUX_DIR)/vmlinux
OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
tools-compile:
- $(MAKE) -C ../tools/trx
- $(MAKE) -C ../tools/addpattern
- $(MAKE) -C ../tools/srec2bin
- $(MAKE) -C ../tools/squashfs
+ $(MAKE) -C ../tools/trx all
+ $(MAKE) -C ../tools/addpattern all
+ $(MAKE) -C ../tools/srec2bin all
+ $(MAKE) -C ../tools/squashfs all
ifeq ($(ADK_KERNEL_BCM47XX),y)
kernel-install: tools-compile
- ${TARGET_CROSS}objcopy ${OSTRIP} -S ${LINUX_DIR}/vmlinub.elf \
+ ${TARGET_CROSS}objcopy ${OSTRIP} -S ${LINUX_DIR}/vmlinuz.elf \
${BUILD_DIR}/${TARGET_KERNEL}
${BUILD_DIR}/${ROOTFSSQUASHFS}: ${BUILD_DIR}/root.squashfs
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index bf479c1c5..7a6c6d13a 100644
--- a/target/packages/pkg-available/development
+++ b/target/packages/pkg-available/development
@@ -9,7 +9,7 @@ config ADK_PKG_DEVELOPMENT
select ADK_PACKAGE_GAWK
select ADK_PACKAGE_GCC
select ADK_PACKAGE_GIT
- #select ADK_PACKAGE_GREP
+ select ADK_PACKAGE_GREP
select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
@@ -17,7 +17,7 @@ config ADK_PKG_DEVELOPMENT
select ADK_PACKAGE_LIBNCURSES_DEV
select ADK_PACKAGE_M4
select ADK_PACKAGE_MAKE
- #select ADK_PACKAGE_PATCH
+ select ADK_PACKAGE_PATCH
select ADK_PACKAGE_PKG_CONFIG
select ADK_PACKAGE_MICROPERL
select ADK_PACKAGE_TSORT
diff --git a/target/packages/pkg-available/laptop b/target/packages/pkg-available/laptop
index 41e4f5e3f..1d0185550 100644
--- a/target/packages/pkg-available/laptop
+++ b/target/packages/pkg-available/laptop
@@ -5,6 +5,7 @@ config ADK_PKG_LAPTOP
select ADK_KPACKAGE_KMOD_PCCARD
select ADK_KPACKAGE_KMOD_SERIAL_8250_CS
select ADK_PACKAGE_SCREEN
+ select ADK_PACKAGE_VIM
select ADK_PACKAGE_SUDO
select ADK_PACKAGE_KEYCHAIN
select ADK_PACKAGE_CRYPTSETUP