summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-11-03 21:04:43 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2009-11-03 21:04:43 +0100
commit4fcc7439fb4e203f510e133a21e1bf9150b79368 (patch)
tree32eedf8ba00bb4ec35b196205bc9356a8ae5f5a8 /mk
parent5dd0e62fa8d9366998288e7f384e48dad02949e1 (diff)
update X11, kerberos, samba, bluez
- fix some ipkg issues with ubuntu - use grub2 for alix1c, no grub1 dependency on host - boots up on alix1c - fix some bcm203x problems
Diffstat (limited to 'mk')
-rw-r--r--mk/mirrors.mk5
-rw-r--r--mk/modules.mk4
2 files changed, 7 insertions, 2 deletions
diff --git a/mk/mirrors.mk b/mk/mirrors.mk
index 341ed486a..c7e0ac623 100644
--- a/mk/mirrors.mk
+++ b/mk/mirrors.mk
@@ -17,8 +17,9 @@ MASTER_SITE_KERNEL?= \
http://www.kernel.org/pub/linux/ \
MASTER_SITE_XORG?= \
- http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.4/src/everything/ \
- http://xorg.freedesktop.org/releases/X11R7.4/src/everything/ \
+ http://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.5/src/everything/ \
+ http://www.x.org/releases/X11R7.5/src/everything/ \
+ http://xorg.freedesktop.org/releases/X11R7.5/src/everything/ \
http://xorg.freedesktop.org/releases/individual/lib/ \
MASTER_SITE_GNU?= \
diff --git a/mk/modules.mk b/mk/modules.mk
index 409278015..fb69470aa 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1032,6 +1032,10 @@ $(eval $(call KMOD_template,$(BLUETOOTH_PREFIX),bluetooth,\
$(MODULES_DIR)/kernel/net/bluetooth/$(BLUETOOTH) \
,70))
+$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIBCM203X,bluetooth-hci-bcm203x,\
+ $(MODULES_DIR)/kernel/drivers/bluetooth/bcm203x \
+,75))
+
$(eval $(call KMOD_template,$(BLUETOOTH_PREFIX)_HCIUSB,bluetooth-hci-usb,\
$(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb \
,75))