From dd163e09b582177ce54fae44b63b10579ee0746d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 27 Dec 2009 23:09:19 +0100 Subject: fix make allmodconfig update several packages, remove snort-wireless. --- mk/build.mk | 7 ++++--- mk/modules.mk | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'mk') 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,\ -- cgit v1.2.3