summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk13
-rw-r--r--mk/mirrors.mk13
-rw-r--r--mk/modules.mk8
3 files changed, 21 insertions, 13 deletions
diff --git a/mk/build.mk b/mk/build.mk
index c4371f477..0da34de85 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -215,16 +215,11 @@ switch:
fi \
fi
-ifeq (${ADK_TARGET_KERNEL64},y)
-KERNEL_CFG:=kernel64.config
-else
-KERNEL_CFG:=kernel.config
-endif
-
kernelconfig:
- cp $(TOPDIR)/target/$(ADK_TARGET_ARCH)/${KERNEL_CFG} $(BUILD_DIR)/linux/.config
- ${KERNEL_MAKE_ENV} ${MAKE} ARCH=$(ARCH) ${KERNEL_MAKE_OPTS} -C $(BUILD_DIR)/linux menuconfig
- cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET_ARCH)/${KERNEL_CFG}
+ ${KERNEL_MAKE_ENV} ${MAKE} \
+ ARCH=$(ARCH) \
+ ${KERNEL_MAKE_OPTS} \
+ -C $(BUILD_DIR)/linux menuconfig
# create a new package from package/.template
newpackage:
diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index 4de2fdded..ab7349288 100644
--- a/mk/mirrors.mk
+++ b/mk/mirrors.mk
@@ -15,12 +15,19 @@ MASTER_SITE_KERNEL?= \
http://www.kernel.org/pub/linux/ \
MASTER_SITE_XORG?= \
- http://www.x.org/releases/X11R7.7/src/everything/ \
- http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.7/src/everything/ \
- http://xorg.freedesktop.org/releases/X11R7.7/src/everything/ \
+ http://www.x.org/releases/individual/xserver/ \
+ http://www.x.org/releases/individual/proto/ \
+ http://www.x.org/releases/individual/app/ \
+ http://www.x.org/releases/individual/xcb/ \
+ http://www.x.org/releases/individual/lib/ \
+ http://www.x.org/releases/individual/driver/ \
+ http://www.x.org/releases/individual/util/ \
http://xorg.freedesktop.org/releases/individual/app/ \
http://xorg.freedesktop.org/releases/individual/lib/ \
http://xorg.freedesktop.org/releases/individual/driver/ \
+ http://www.x.org/releases/X11R7.7/src/everything/ \
+ http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.7/src/everything/ \
+ http://xorg.freedesktop.org/releases/X11R7.7/src/everything/ \
MASTER_SITE_GNU?= \
http://ftp.gnu.org/gnu/ \
diff --git a/mk/modules.mk b/mk/modules.mk
index 5fd2f6419..a9f61e659 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1175,9 +1175,15 @@ $(eval $(call KMOD_template,SND,snd,\
$(MODULES_DIR)/kernel/sound/core/snd \
$(MODULES_DIR)/kernel/sound/core/snd-timer \
$(MODULES_DIR)/kernel/sound/core/snd-pcm \
+,40))
+
+$(eval $(call KMOD_template,SND_PCM_DMAENGINE,snd-pcm-dmaengine,\
$(MODULES_DIR)/kernel/sound/core/snd-pcm-dmaengine \
+,41))
+
+$(eval $(call KMOD_template,SND_COMPRESS,snd-compress,\
$(MODULES_DIR)/kernel/sound/core/snd-compress \
-,40))
+,41))
$(eval $(call KMOD_template,SND_RAWMIDI,snd-rawmidi,\
$(MODULES_DIR)/kernel/sound/core/snd-hwdep \