diff options
Diffstat (limited to 'package')
-rw-r--r-- | package/devel/strace/Makefile | 11 | ||||
-rw-r--r-- | package/firmware/linux-firmware/Makefile | 2 | ||||
-rw-r--r-- | package/firmware/linux-firmware/realtek.mk | 9 | ||||
-rw-r--r-- | package/kernel/linux/modules/block.mk | 18 | ||||
-rw-r--r-- | package/kernel/linux/modules/crypto.mk | 2 | ||||
-rw-r--r-- | package/kernel/linux/modules/i2c.mk | 2 | ||||
-rw-r--r-- | package/kernel/linux/modules/leds.mk | 16 | ||||
-rw-r--r-- | package/kernel/linux/modules/other.mk | 40 | ||||
-rw-r--r-- | package/kernel/linux/modules/wireless.mk | 18 | ||||
-rw-r--r-- | package/kernel/mt76/Makefile | 4 | ||||
-rw-r--r-- | package/libs/polarssl/Makefile | 2 | ||||
-rw-r--r-- | package/libs/polarssl/patches/200-reduce_config.patch | 10 | ||||
-rw-r--r-- | package/network/config/swconfig/Makefile | 2 | ||||
-rw-r--r-- | package/network/config/swconfig/src/cli.c | 12 |
14 files changed, 36 insertions, 112 deletions
diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile index 8a0d2e8fb3..df560fd1b7 100644 --- a/package/devel/strace/Makefile +++ b/package/devel/strace/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=strace PKG_VERSION:=4.11 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=a15d2555a7febb56d00c6e1a51c655dc PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -23,6 +23,7 @@ PKG_LICENSE_FILES:=COPYRIGHT PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_FIXUP:=autoreconf +PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_strace_libunwind PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -39,6 +40,7 @@ define Package/strace SECTION:=utils CATEGORY:=Utilities TITLE:=System call tracer + DEPENDS:=+PACKAGE_strace_libunwind:libunwind URL:=http://strace.sourceforge.net/ endef @@ -47,6 +49,13 @@ A useful diagnostic, instructional, and debugging tool. Allows you to track what system calls a program makes while it is running. endef +define Package/strace/config +config PACKAGE_strace_libunwind + bool "Enable stack tracing support using libunwind (experimental)" + default n +endef + +CONFIGURE_ARGS += --with-libunwind=$(if $(CONFIG_PACKAGE_strace_libunwind),yes,no) MAKE_FLAGS := \ CCOPT="$(TARGET_CFLAGS)" diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index e1e1a47219..ae5894cc56 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -17,7 +17,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git -PKG_MIRROR_MD5SUM:=ca4d289ad9380471cae376fc7dd3660a +PKG_MIRROR_MD5SUM:=8d44332359de89b1936b4ff608a72614 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> diff --git a/package/firmware/linux-firmware/realtek.mk b/package/firmware/linux-firmware/realtek.mk index 0f8b1ce750..4229ca0ebb 100644 --- a/package/firmware/linux-firmware/realtek.mk +++ b/package/firmware/linux-firmware/realtek.mk @@ -43,8 +43,15 @@ endef $(eval $(call BuildPackage,rtl8192de-firmware)) Package/rtl8192se-firmware = $(call Package/firmware-default,RealTek RTL8192SE firmware) -define KernelPackage/rtl8192se/install +define Package/rtl8192se-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8192sefw.bin $(1)/lib/firmware/rtlwifi endef $(eval $(call BuildPackage,rtl8192se-firmware)) + +Package/rtl8192su-firmware = $(call Package/firmware-default,RealTek RTL8192SU firmware) +define Package/rtl8192su-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi + $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8712u.bin $(1)/lib/firmware/rtlwifi +endef +$(eval $(call BuildPackage,rtl8192su-firmware)) diff --git a/package/kernel/linux/modules/block.mk b/package/kernel/linux/modules/block.mk index 0c8d9b1fe9..d7f5ca4762 100644 --- a/package/kernel/linux/modules/block.mk +++ b/package/kernel/linux/modules/block.mk @@ -65,7 +65,7 @@ define KernelPackage/ata-ahci-platform $(LINUX_DIR)/drivers/ata/ahci_platform.ko \ $(LINUX_DIR)/drivers/ata/libahci_platform.ko AUTOLOAD:=$(call AutoLoad,40,libahci libahci_platform ahci_platform,1) - $(call AddDepends/ata,@TARGET_ipq806x||TARGET_mvebu||TARGET_sunxi) + $(call AddDepends/ata,@TARGET_ipq806x||TARGET_sunxi) endef define KernelPackage/ata-ahci-platform/description @@ -124,22 +124,6 @@ endef $(eval $(call KernelPackage,ata-marvell-sata)) -define KernelPackage/ata-mvebu-ahci - TITLE:=Marvell EBU AHCI support - DEPENDS:=@TARGET_mvebu +kmod-ata-ahci-platform - KCONFIG:=CONFIG_AHCI_MVEBU - FILES:=$(LINUX_DIR)/drivers/ata/ahci_mvebu.ko - AUTOLOAD:=$(call AutoLoad,41,ahci_mvebu,1) - $(call AddDepends/ata) -endef - -define KernelPackage/ata-mvebu-ahci/description - AHCI support for Marvell EBU SoCs -endef - -$(eval $(call KernelPackage,ata-mvebu-ahci)) - - define KernelPackage/ata-nvidia-sata TITLE:=Nvidia Serial ATA support KCONFIG:=CONFIG_SATA_NV diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 0acc730691..cc62f2cc27 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -714,7 +714,7 @@ $(eval $(call KernelPackage,crypto-xts)) define KernelPackage/crypto-mv-cesa TITLE:=Marvell crypto engine - DEPENDS:=+kmod-crypto-manager @TARGET_kirkwood||TARGET_orion||TARGET_mvebu + DEPENDS:=+kmod-crypto-manager @TARGET_kirkwood||TARGET_orion KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko AUTOLOAD:=$(call AutoLoad,09,mv_cesa) diff --git a/package/kernel/linux/modules/i2c.mk b/package/kernel/linux/modules/i2c.mk index d4effee13d..e1c65d493e 100644 --- a/package/kernel/linux/modules/i2c.mk +++ b/package/kernel/linux/modules/i2c.mk @@ -140,7 +140,7 @@ I2C_MV64XXX_MODULES:=\ define KernelPackage/i2c-mv64xxx $(call i2c_defaults,$(I2C_MV64XXX_MODULES),59) TITLE:=Orion Platform I2C interface support - DEPENDS:=@TARGET_kirkwood||TARGET_orion||TARGET_mvebu +kmod-i2c-core + DEPENDS:=@TARGET_kirkwood||TARGET_orion +kmod-i2c-core endef define KernelPackage/i2c-mv64xxx/description diff --git a/package/kernel/linux/modules/leds.mk b/package/kernel/linux/modules/leds.mk index c4261d31ac..aea62902ac 100644 --- a/package/kernel/linux/modules/leds.mk +++ b/package/kernel/linux/modules/leds.mk @@ -197,19 +197,3 @@ define KernelPackage/leds-pca963x/description endef $(eval $(call KernelPackage,leds-pca963x)) - - -define KernelPackage/leds-tlc591xx - SUBMENU:=$(LEDS_MENU) - TITLE:=TLC591xx LED support - DEPENDS:=@TARGET_mvebu +kmod-i2c-core +kmod-regmap - KCONFIG:=CONFIG_LEDS_TLC591XX - FILES:=$(LINUX_DIR)/drivers/leds/leds-tlc591xx.ko - AUTOLOAD:=$(call AutoLoad,60,leds-tlc591xx,1) -endef - -define KernelPackage/leds-tlc591xx/description - Kernel module for LEDs on TLC591xx -endef - -$(eval $(call KernelPackage,leds-tlc591xx)) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 503ca98be4..42b45ba893 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -501,7 +501,7 @@ $(eval $(call KernelPackage,wdt-omap)) define KernelPackage/wdt-orion SUBMENU:=$(OTHER_MENU) TITLE:=Marvell Orion Watchdog timer - DEPENDS:=@TARGET_orion||TARGET_kirkwood||TARGET_mvebu + DEPENDS:=@TARGET_orion||TARGET_kirkwood KCONFIG:=CONFIG_ORION_WATCHDOG FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/orion_wdt.ko AUTOLOAD:=$(call AutoLoad,50,orion_wdt,1) @@ -585,7 +585,7 @@ $(eval $(call KernelPackage,rtc-isl1208)) define KernelPackage/rtc-marvell SUBMENU:=$(OTHER_MENU) TITLE:=Marvell SoC built-in RTC support - DEPENDS:=@RTC_SUPPORT @TARGET_kirkwood||TARGET_orion||TARGET_mvebu + DEPENDS:=@RTC_SUPPORT @TARGET_kirkwood||TARGET_orion KCONFIG:=CONFIG_RTC_DRV_MV \ CONFIG_RTC_CLASS=y FILES:=$(LINUX_DIR)/drivers/rtc/rtc-mv.ko @@ -599,23 +599,6 @@ endef $(eval $(call KernelPackage,rtc-marvell)) -define KernelPackage/rtc-armada38x - SUBMENU:=$(OTHER_MENU) - TITLE:=Marvell Armada 38x SoC built-in RTC support - DEPENDS:=@RTC_SUPPORT @TARGET_mvebu - KCONFIG:=CONFIG_RTC_DRV_ARMADA38X \ - CONFIG_RTC_CLASS=y - FILES:=$(LINUX_DIR)/drivers/rtc/rtc-armada38x.ko - AUTOLOAD:=$(call AutoProbe,rtc-armada38x) -endef - -define KernelPackage/rtc-armada38x/description - Kernel module for Marvell Armada 38x SoC built-in RTC. -endef - -$(eval $(call KernelPackage,rtc-armada38x)) - - define KernelPackage/rtc-pcf8563 SUBMENU:=$(OTHER_MENU) TITLE:=Philips PCF8563/Epson RTC8564 RTC support @@ -794,7 +777,7 @@ $(eval $(call KernelPackage,zram)) define KernelPackage/mvsdio SUBMENU:=$(OTHER_MENU) TITLE:=Marvell SDIO support - DEPENDS:=@TARGET_orion||TARGET_kirkwood||TARGET_mvebu +kmod-mmc + DEPENDS:=@TARGET_orion||TARGET_kirkwood +kmod-mmc KCONFIG:=CONFIG_MMC_MVSDIO FILES:=$(LINUX_DIR)/drivers/mmc/host/mvsdio.ko AUTOLOAD:=$(call AutoProbe,mvsdio) @@ -936,23 +919,6 @@ endef $(eval $(call KernelPackage,thermal)) -define KernelPackage/thermal-armada - SUBMENU:=$(OTHER_MENU) - TITLE:=Armada 370/XP thermal management - DEPENDS:=@TARGET_mvebu +kmod-thermal - KCONFIG:=CONFIG_ARMADA_THERMAL - FILES:=$(LINUX_DIR)/drivers/thermal/armada_thermal.ko - AUTOLOAD:=$(call AutoProbe,armada_thermal) -endef - -define KernelPackage/thermal-armada/description - Enable this module if you want to have support for thermal management - controller present in Armada 370 and Armada XP SoC. -endef - -$(eval $(call KernelPackage,thermal-armada)) - - define KernelPackage/thermal-imx SUBMENU:=$(OTHER_MENU) TITLE:=Temperature sensor driver for Freescale i.MX SoCs diff --git a/package/kernel/linux/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk index b62827ec02..d7c4425c8c 100644 --- a/package/kernel/linux/modules/wireless.mk +++ b/package/kernel/linux/modules/wireless.mk @@ -43,7 +43,7 @@ $(eval $(call KernelPackage,net-prism54)) define KernelPackage/net-rtl8192su SUBMENU:=$(WIRELESS_MENU) TITLE:=RTL8192SU support (staging) - DEPENDS:=@USB_SUPPORT +@DRIVER_WEXT_SUPPORT +kmod-usb-core + DEPENDS:=@USB_SUPPORT +@DRIVER_WEXT_SUPPORT +kmod-usb-core +rtl8192su-firmware KCONFIG:=\ CONFIG_STAGING=y \ CONFIG_R8712U @@ -55,20 +55,4 @@ define KernelPackage/net-rtl8192su/description Kernel modules for RealTek RTL8712 and RTL81XXSU fullmac support. endef -# R8712 FullMAC firmware -R8712_FW:=rtl8712u.bin - -define Download/net-rtl8192su - FILE:=$(R8712_FW) - - URL:=http://mirrors.arizona.edu/raspbmc/downloads/bin/lib/wifi/rtlwifi/ - MD5SUM:=8e6396b5844a3e279ae8679555dec3f0 -endef - -define KernelPackage/net-rtl8192su/install - $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi - $(INSTALL_DATA) $(DL_DIR)/$(R8712_FW) $(1)/lib/firmware/rtlwifi/ -endef - -$(eval $(call Download,net-rtl8192su)) $(eval $(call KernelPackage,net-rtl8192su)) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 4a81142f7a..801188fa6e 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mt76 -PKG_VERSION:=2016-05-14 +PKG_VERSION:=2016-06-17 PKG_RELEASE=1 PKG_LICENSE:=GPLv2 @@ -10,7 +10,7 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=810eef8383cf2669cd4354135fc560ccfe71786c +PKG_SOURCE_VERSION:=f06ed811cda67ab2ed9932c3e87ba03229e75f4e PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> diff --git a/package/libs/polarssl/Makefile b/package/libs/polarssl/Makefile index 03e3252e0a..573966e33b 100644 --- a/package/libs/polarssl/Makefile +++ b/package/libs/polarssl/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=polarssl SRC_PKG_NAME:=mbedtls PKG_VERSION:=1.3.16 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_USE_MIPS16:=0 PKG_SOURCE:=$(SRC_PKG_NAME)-$(PKG_VERSION)-gpl.tgz diff --git a/package/libs/polarssl/patches/200-reduce_config.patch b/package/libs/polarssl/patches/200-reduce_config.patch index 6fef1a6f5c..9e2734aa6c 100644 --- a/package/libs/polarssl/patches/200-reduce_config.patch +++ b/package/libs/polarssl/patches/200-reduce_config.patch @@ -170,16 +170,6 @@ /** * \def POLARSSL_ENTROPY_C -@@ -1662,8 +1662,8 @@ - * - * This module enables the AES-GCM and CAMELLIA-GCM ciphersuites, if other - * requisites are enabled as well. -- */ - #define POLARSSL_GCM_C -+ */ - - /** - * \def POLARSSL_HAVEGE_C @@ -1699,8 +1699,8 @@ * Requires: POLARSSL_MD_C * diff --git a/package/network/config/swconfig/Makefile b/package/network/config/swconfig/Makefile index 2856742fcd..f4ba3a9d69 100644 --- a/package/network/config/swconfig/Makefile +++ b/package/network/config/swconfig/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=swconfig -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_LICENSE:=GPL-2.0 diff --git a/package/network/config/swconfig/src/cli.c b/package/network/config/swconfig/src/cli.c index 331f3d5dac..eab6c64742 100644 --- a/package/network/config/swconfig/src/cli.c +++ b/package/network/config/swconfig/src/cli.c @@ -335,10 +335,10 @@ int main(int argc, char **argv) if(cvlan > -1) cport = cvlan; - if(swlib_set_attr_string(dev, a, cport, cvalue) < 0) + retval = swlib_set_attr_string(dev, a, cport, cvalue); + if (retval < 0) { - fprintf(stderr, "failed\n"); - retval = -1; + nl_perror(-retval, "Failed to set attribute"); goto out; } break; @@ -347,10 +347,10 @@ int main(int argc, char **argv) val.port_vlan = cvlan; if(cport > -1) val.port_vlan = cport; - if(swlib_get_attr(dev, a, &val) < 0) + retval = swlib_get_attr(dev, a, &val); + if (retval < 0) { - fprintf(stderr, "failed\n"); - retval = -1; + nl_perror(-retval, "Failed to get attribute"); goto out; } print_attr_val(a, &val); |