diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:16:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:16:44 +0100 |
| commit | cfc200714ddfa6d76feb836c258b1135d91a8348 (patch) | |
| tree | ecc4628fc161de5044c9acb03bb63b2fd48ae75c /mk | |
| parent | 77bdac14df2e20b290cdd4bcad0ecb0e1fc446be (diff) | |
| parent | 91c8ff1c3f772e0ae8d7c60a3252c5efced9fe92 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/digitemp/Makefile
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 4 | ||||
| -rw-r--r-- | mk/image.mk | 3 | ||||
| -rw-r--r-- | mk/kernel-build.mk | 4 | ||||
| -rw-r--r-- | mk/modules.mk | 5 |
4 files changed, 11 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index ee3867a16..bd5dc9e5c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -405,10 +405,10 @@ bulk: echo === building $$target $$libc $$fs on $$(date); \ $(GMAKE) prereq && \ if [ "x$$p" = xy ];then \ - $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \ allmodconfig; \ else \ - $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs PKG=ipkg \ + $(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs \ defconfig; \ fi && \ $(GMAKE) VERBOSE=1 -f mk/build.mk allcopy \ diff --git a/mk/image.mk b/mk/image.mk index c6f5ce266..a2a6bb176 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -71,9 +71,6 @@ ${BIN_DIR}/${ROOTFSSQUASHFS}: ${TARGET_DIR} cat ${BIN_DIR}/${ADK_TARGET}-${FS}-kernel \ ${BUILD_DIR}/root.squashfs > \ ${BUILD_DIR}/${ROOTFSSQUASHFS} - # padding of images is required, foxboard only? - #dd if=${BUILD_DIR}/${ROOTFSSQUASHFS} of=${BIN_DIR}/${ROOTFSSQUASHFS} \ - bs=4063232 conv=sync $(MAKE_TRACE) imageclean: rm -f $(BIN_DIR)/$(ADK_TARGET)-* ${BUILD_DIR}/$(ADK_TARGET)-* diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index 970120270..79cb7f9cc 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -53,8 +53,12 @@ compile: $(LINUX_DIR)/vmlinux install: compile ifneq ($(strip $(INSTALL_TARGETS)),) $(TRACE) target/${ADK_TARGET}-modules-install +ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) + $(PKG_INSTALL) $(INSTALL_TARGETS) $(MAKE_TRACE) +else $(foreach pkg,$(INSTALL_TARGETS),$(shell $(PKG_INSTALL) $(pkg))) endif +endif clean: rm -rf $(LINUX_BUILD_DIR) diff --git a/mk/modules.mk b/mk/modules.mk index 948a68364..734fd4435 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -568,6 +568,7 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\ $(eval $(call KMOD_template,SCSI,scsi,\ $(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \ + $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \ ,20)) $(eval $(call KMOD_template,BLK_DEV_SD,blk-dev-sd,\ @@ -979,6 +980,10 @@ $(eval $(call KMOD_template,INPUT_MOUSEDEV,input-mousedev,\ $(MODULES_DIR)/kernel/drivers/input/mousedev \ ,45)) +$(eval $(call KMOD_template,INPUT_EVDEV,input-evdev,\ + $(MODULES_DIR)/kernel/drivers/input/evdev \ +,45)) + # # USB # |