Fix modules directory location, update usbutils (github vs project repo) and fix...

diff --git a/include/kernel.mk b/include/kernel.mk
index 4fe66e30c171300ac8ccba86268b2ec967dbdc69..d454fa1d709ad2d55cb0e4f008d086d95293b4fb 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -67,7 +67,7 @@ else
       LINUX_UNAME_VERSION:=$(strip $(shell cat $(LINUX_DIR)/include/config/kernel.release 2>/dev/null))
   endif
 
-  MODULES_SUBDIR:=lib/modules/$(LINUX_UNAME_VERSION)-gnu
+  MODULES_SUBDIR:=lib/modules/$(LINUX_UNAME_VERSION)
   TARGET_MODULES_DIR:=$(LINUX_TARGET_DIR)/$(MODULES_SUBDIR)
 
   ifneq ($(TARGET_BUILD),1)

diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index 511a9188db218fbd0c595f53508b68b15ce30337..4bc439bcc0aa68e06d83b39a62d2333981d0bf95 100644 (file)
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -113,14 +113,15 @@ detect_mac80211() {
                        set wireless.radio${devidx}.hwmode=11${mode_band}
                        ${dev_id}
                        ${ht_capab}
-                       set wireless.radio${devidx}.disabled=1
+                       set wireless.radio${devidx}.disabled=0
 
                        set wireless.default_radio${devidx}=wifi-iface
                        set wireless.default_radio${devidx}.device=radio${devidx}
                        set wireless.default_radio${devidx}.network=lan
                        set wireless.default_radio${devidx}.mode=ap
-                       set wireless.default_radio${devidx}.ssid=OpenWrt
-                       set wireless.default_radio${devidx}.encryption=none
+                       set wireless.default_radio${devidx}.ssid=libreCMC
+                       set wireless.default_radio${devidx}.encryption=psk
+                       set wireless.default_radio${devidx}.key=librecmc
 EOF
                uci -q commit wireless
 

diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile
index 7f798954aefac837b71da49fb2d3dcb6164d3552..53e80fc84a81b39ccce9123f504a8c6f7eb8689f 100644 (file)
--- a/package/utils/usbutils/Makefile
+++ b/package/utils/usbutils/Makefile
@@ -37,7 +37,7 @@ USB_IDS_FILE:=usb.ids.$(USB_IDS_REV)
 define Download/usb_ids
   FILE:=$(USB_IDS_FILE)
   URL_FILE:=usb.ids
-  URL:=@GITHUB/gentoo/hwids/$(USB_IDS_REV)
+  URL:=$(PROJECT_GIT)/hwids/raw/$(USB_IDS_REV)/usb.ids
   HASH:=2d0403ffccc0ff7150e32c0bf8e2878816b76ba08d2c3bb1059f33627a3da30f
 endef
 $(eval $(call Download,usb_ids))