diff --git a/core/linux-sun7i/PKGBUILD b/core/linux-sun7i/PKGBUILD index cf3898398..2104e9af6 100644 --- a/core/linux-sun7i/PKGBUILD +++ b/core/linux-sun7i/PKGBUILD @@ -18,7 +18,7 @@ options=('!strip') source=("https://github.com/cubieboard2/linux-sunxi/archive/${_commit}.tar.gz" 'config') md5sums=('7fa48cc5b9d8917601aa1f95818a6a08' - 'b4434e1a8d196cb37a4934b84acd9c2f') + '1e304024372dce93c3e99f9db3235e66') prepare() { cd "${srcdir}/${_srcname}" @@ -27,6 +27,7 @@ prepare() { # add pkgrel to extraversion sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile + sed -ri "138c MODULE_LICENSE(\"GPL\");" arch/arm/mach-sun7i/rf/bt_pm.c # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh diff --git a/core/linux-sun7i/config b/core/linux-sun7i/config index 4f365497a..395db4611 100644 --- a/core/linux-sun7i/config +++ b/core/linux-sun7i/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.3.0 Kernel Configuration +# Linux/arm 3.3.0-3 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -954,6 +954,7 @@ CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_ATH3K=m +CONFIG_BT_WILINK=m # CONFIG_AF_RXRPC is not set CONFIG_FIB_RULES=y CONFIG_WIRELESS=y @@ -962,7 +963,7 @@ CONFIG_WEXT_CORE=y CONFIG_WEXT_PROC=y CONFIG_WEXT_SPY=y CONFIG_WEXT_PRIV=y -CONFIG_CFG80211=y +CONFIG_CFG80211=m CONFIG_NL80211_TESTMODE=y # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set @@ -977,7 +978,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_CFG80211_ALLOW_RECONNECT=y -CONFIG_MAC80211=y +CONFIG_MAC80211=m CONFIG_MAC80211_HAS_RC=y # CONFIG_MAC80211_RC_PID is not set CONFIG_MAC80211_RC_MINSTREL=y @@ -989,8 +990,12 @@ CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set -# CONFIG_RFKILL is not set +CONFIG_RFKILL=m +CONFIG_RFKILL_PM=y +CONFIG_RFKILL_LEDS=y +CONFIG_RFKILL_INPUT=y CONFIG_RFKILL_REGULATOR=m +CONFIG_RFKILL_GPIO=m # CONFIG_NET_9P is not set # CONFIG_CAIF is not set # CONFIG_CEPH_LIB is not set @@ -1137,6 +1142,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_UID_STAT is not set # CONFIG_BMP085 is not set # CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_WL127X_RFKILL is not set # CONFIG_C2PORT is not set # @@ -1155,7 +1161,7 @@ CONFIG_IWMC3200TOP=m # # Texas Instruments shared transport line discipline # -# CONFIG_TI_ST is not set +CONFIG_TI_ST=m # CONFIG_SENSORS_LIS3_SPI is not set # CONFIG_SENSORS_LIS3_I2C is not set @@ -1395,6 +1401,7 @@ CONFIG_USB_KC2190=y CONFIG_USB_NET_ZAURUS=m CONFIG_USB_NET_CX82310_ETH=m CONFIG_USB_NET_KALMIA=m +CONFIG_USB_HSO=m CONFIG_USB_NET_INT51X1=m CONFIG_USB_IPHETH=m CONFIG_USB_SIERRA_NET=m @@ -2244,6 +2251,7 @@ CONFIG_USB_DSBR=m # # Texas Instruments WL128x FM driver (ST based) # +CONFIG_RADIO_WL128X=m # CONFIG_PA_CONTROL is not set CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set diff --git a/core/linux-sun7i/linux-sun7i.install b/core/linux-sun7i/linux-sun7i.install index 80937ae9b..0d1ba5e5d 100644 --- a/core/linux-sun7i/linux-sun7i.install +++ b/core/linux-sun7i/linux-sun7i.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-sun7i -KERNEL_VERSION=3.3.0-1-ARCH +KERNEL_VERSION=3.3.0-3-ARCH post_install () { # updating module dependencies