summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-12-28 12:56:36 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-12-28 12:56:36 +0100
commit62d218c2368b3ad1e9802075cef06e3f626fb234 (patch)
tree4804f063c6e29cd1b17097324d6bd262a3c291b5 /mk
parentb3259201a158cb1a571c2a3b2976fbd7b95a4b80 (diff)
parent03c7aed5dcad2172bbe1bcd311fabb63fbf6dca0 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk7
-rw-r--r--mk/modules.mk1
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 2fb5bb3bf..6397d78bb 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -15,6 +15,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \
ADK_STATIC=n \
ADK_FORCE_PARALLEL=n \
ADK_PACKAGE_GRUB=n \
+ ADK_PACKAGE_BASE_FILES=y \
BUSYBOX_SELINUX=n \
BUSYBOX_MODPROBE_SMALL=n \
BUSYBOX_EJECT=n \
@@ -81,7 +82,7 @@ include ${TOPDIR}/mk/split-cfg.mk
all: world
allcopy: all
- $(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${d}/
+ $(CP) $(BIN_DIR) $(TOPDIR)/bulkdir/${targetdir}/
${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config
mksh ${TOPDIR}/package/depmaker
@@ -375,9 +376,9 @@ bulk:
defconfig; \
fi && \
$(MAKE) VERBOSE=1 -f mk/build.mk allcopy \
- d=$$target-$$libc-$$fs && \
+ targetdir=$$target-$$libc-$$fs; \
$(MAKE) cleantarget; \
- rm .*config; \
+ rm .config; \
) 2>&1 | tee $(TOPDIR)/bulkdir/$$target-$$libc-$$fs/log; \
done <${TOPDIR}/target/bulk.lst
diff --git a/mk/modules.mk b/mk/modules.mk
index b923b8e34..c36bdb21e 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -934,7 +934,6 @@ $(eval $(call KMOD_template,SND,sound-alsa,\
$(MODULES_DIR)/kernel/sound/core/snd \
$(MODULES_DIR)/kernel/sound/core/snd-timer \
$(MODULES_DIR)/kernel/sound/core/snd-pcm \
- $(MODULES_DIR)/kernel/sound/core/snd-rawmidi \
,40))
$(eval $(call KMOD_template,SND_OSSEMUL,sound-alsa-oss-emul,\