diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-07-08 17:00:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-08 17:00:34 +0200 |
| commit | 07ba83cf6fe116ebcf909465665a79a596036d79 (patch) | |
| tree | 98790588e371b41a2078859e8117c1fec7413f09 | |
| parent | 461ef054133e34bb97c48bdeed659ff60278c2dd (diff) | |
| parent | 9f5894383a4bc31e2f817d4351ac5c5b4202a0c9 (diff) | |
| download | master-187ad058-07ba83cf6fe116ebcf909465665a79a596036d79.tar.gz master-187ad058-07ba83cf6fe116ebcf909465665a79a596036d79.tar.bz2 master-187ad058-07ba83cf6fe116ebcf909465665a79a596036d79.zip | |
Merge pull request #25 from wigyori/master
package updates, cmake fixes, bump arm64 to 4.4
54 files changed, 575 insertions, 246 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index 456b418f86..a494ceddf3 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -10,7 +10,7 @@ HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install HOST_BUILD_PARALLEL ?= ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),) - HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j) + HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j)) else HOST_MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS) endif diff --git a/include/kernel-version.mk b/include/kernel-version.mk index a507b7db13..b0e468559b 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -2,11 +2,11 @@ LINUX_RELEASE?=1 -LINUX_VERSION-3.18 = .29 +LINUX_VERSION-3.18 = .36 LINUX_VERSION-4.1 = .23 LINUX_VERSION-4.4 = .14 -LINUX_KERNEL_MD5SUM-3.18.29 = b25737a0bc98e80d12200de93f239c28 +LINUX_KERNEL_MD5SUM-3.18.36 = 31b1699c1285aeeb81fb25750baa50d9 LINUX_KERNEL_MD5SUM-4.1.23 = 5cb969fa874e110118722398b7c72c5d LINUX_KERNEL_MD5SUM-4.4.14 = 59e99c3bf5d495f1f95d26257962ca3e diff --git a/include/package.mk b/include/package.mk index ca315b59ac..4962bd68d1 100644 --- a/include/package.mk +++ b/include/package.mk @@ -17,7 +17,7 @@ PKG_USE_MIPS16 ?= 1 PKG_IREMAP ?= 1 ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),) - MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j) + MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j)) else MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS) endif diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 4eb5e3ee99..b15a9a29b6 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -104,6 +104,7 @@ define KernelPackage/fs-cifs TITLE:=CIFS support KCONFIG:= \ CONFIG_CIFS \ + CONFIG_CIFS_XATTR=y \ CONFIG_CIFS_DFS_UPCALL=n \ CONFIG_CIFS_UPCALL=n FILES:=$(LINUX_DIR)/fs/cifs/cifs.ko @@ -406,7 +407,8 @@ $(eval $(call KernelPackage,fs-ntfs)) define KernelPackage/fs-reiserfs SUBMENU:=$(FS_MENU) TITLE:=ReiserFS filesystem support - KCONFIG:=CONFIG_REISERFS_FS + KCONFIG:=CONFIG_REISERFS_FS \ + CONFIG_REISERFS_FS_XATTR=y FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.ko AUTOLOAD:=$(call AutoLoad,30,reiserfs,1) endef diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 417a6a6114..fb38079c43 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -509,7 +509,7 @@ $(eval $(call KernelPackage,e1000e)) define KernelPackage/igb SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Intel(R) 82575/82576 PCI-Express Gigabit Ethernet support - DEPENDS:=@PCI_SUPPORT +kmod-i2c-algo-bit +kmod-ptp + DEPENDS:=@PCI_SUPPORT +kmod-i2c-core +kmod-i2c-algo-bit +kmod-ptp KCONFIG:=CONFIG_IGB \ CONFIG_IGB_HWMON=n \ CONFIG_IGB_DCA=n diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index a0a19b23a9..353de3e45b 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -68,6 +68,7 @@ define KernelPackage/nf-conntrack KCONFIG:= \ CONFIG_NETFILTER=y \ CONFIG_NETFILTER_ADVANCED=y \ + CONFIG_NF_CONNTRACK_ZONES=y \ $(KCONFIG_NF_CONNTRACK) FILES:=$(foreach mod,$(NF_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNTRACK-m))) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index cef14106d4..d680d326d3 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -898,6 +898,7 @@ define KernelPackage/thermal KCONFIG:= \ CONFIG_THERMAL \ CONFIG_THERMAL_OF=y \ + CONFIG_CPU_THERMAL=y \ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y \ CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE=n \ CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE=n \ @@ -924,7 +925,6 @@ define KernelPackage/thermal-imx TITLE:=Temperature sensor driver for Freescale i.MX SoCs DEPENDS:=@TARGET_imx6 +kmod-thermal KCONFIG:= \ - CONFIG_CPU_THERMAL=y \ CONFIG_IMX_THERMAL FILES:=$(LINUX_DIR)/drivers/thermal/imx_thermal.ko AUTOLOAD:=$(call AutoProbe,imx_thermal) diff --git a/package/libs/cyassl/Makefile b/package/libs/cyassl/Makefile index b6440f3a85..a2b3b5eef1 100644 --- a/package/libs/cyassl/Makefile +++ b/package/libs/cyassl/Makefile @@ -41,6 +41,7 @@ CONFIGURE_ARGS += \ --enable-singlethreaded \ --enable-opensslextra \ --enable-sni \ + --enable-stunnel \ --enable-ecc \ --disable-examples diff --git a/package/libs/cyassl/patches/300-debloat_move_SSL_set_tlsext_host_name_outside_STUNNEL.patch b/package/libs/cyassl/patches/300-debloat_move_SSL_set_tlsext_host_name_outside_STUNNEL.patch deleted file mode 100644 index 51d89f7ece..0000000000 --- a/package/libs/cyassl/patches/300-debloat_move_SSL_set_tlsext_host_name_outside_STUNNEL.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/wolfssl/openssl/ssl.h -+++ b/wolfssl/openssl/ssl.h -@@ -402,6 +402,8 @@ typedef WOLFSSL_X509_STORE_CTX X509_STOR - /* yassl had set the default to be 500 */ - #define SSL_get_default_timeout(ctx) 500 - -+#define SSL_set_tlsext_host_name(x, y) wolfSSL_UseSNI(x, WOLFSSL_SNI_HOST_NAME, y, strlen(y)) -+ - /* Lighthttp compatibility */ - - #ifdef HAVE_LIGHTY -@@ -488,7 +490,6 @@ typedef WOLFSSL_ASN1_BIT_STRING ASN1_ - #define SSL_TLSEXT_ERR_NOACK alert_warning - #define TLSEXT_NAMETYPE_host_name WOLFSSL_SNI_HOST_NAME - --#define SSL_set_tlsext_host_name wolfSSL_set_tlsext_host_name - #define SSL_get_servername wolfSSL_get_servername - #define SSL_set_SSL_CTX wolfSSL_set_SSL_CTX - #define SSL_CTX_get_verify_callback wolfSSL_CTX_get_verify_callback diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile index fa7bc5542e..5292eba264 100644 --- a/package/libs/elfutils/Makefile +++ b/package/libs/elfutils/Makefile @@ -65,7 +65,6 @@ CONFIGURE_VARS += \ endif CONFIGURE_ARGS += \ - --disable-werror \ --without-lzma define Build/InstallDev diff --git a/package/libs/libiconv-full/Makefile b/package/libs/libiconv-full/Makefile index 997cce2365..d23af5730b 100644 --- a/package/libs/libiconv-full/Makefile +++ b/package/libs/libiconv-full/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libiconv-full PKG_VERSION:=1.11.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> @@ -17,6 +17,8 @@ PKG_SOURCE:=libiconv-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libiconv PKG_MD5SUM:=d42b97f6ef5dd0ba4469d520ed732fed PKG_BUILD_DIR:=$(BUILD_DIR)/libiconv-$(PKG_VERSION) +PKG_LICENSE:=LGPL-2.0 +PKG_LICENSE_FILES:=COPYING.LIB PKG_FIXUP:=patch-libtool diff --git a/package/libs/libpcap/Makefile b/package/libs/libpcap/Makefile index af5d71e4fc..08fab24fde 100644 --- a/package/libs/libpcap/Makefile +++ b/package/libs/libpcap/Makefile @@ -54,9 +54,7 @@ CONFIGURE_VARS += \ CONFIGURE_ARGS += \ --enable-shared \ - --enable-static \ --disable-yydebug \ - --with-build-cc="$(HOSTCC)" \ --with-pcap=linux \ --without-septel \ --without-dag \ diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index c86a80b44b..97cac7bf5e 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libubox -PKG_VERSION:=2016-02-26 +PKG_VERSION:=2016-05-19 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(OPENWRT_GIT)/project/libubox.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=5326ce1046425154ab715387949728cfb09f4083 +PKG_SOURCE_VERSION:=1257a38a6e64511207bb3b077ca7e8e1a3338fc1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_MD5SUM:= CMAKE_INSTALL:=1 diff --git a/package/libs/libunwind/Makefile b/package/libs/libunwind/Makefile new file mode 100644 index 0000000000..ec19656ec9 --- /dev/null +++ b/package/libs/libunwind/Makefile @@ -0,0 +1,53 @@ +# +# Copyright (C) 2008-2013 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libunwind +PKG_VERSION:=1.1 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://download.savannah.gnu.org/releases/libunwind +PKG_MD5SUM:=fb4ea2f6fbbe45bf032cd36e586883ce +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 + +PKG_LICENSE:=X11 +PKG_LICENSE_FILES:=LICENSE + +PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com> + +include $(INCLUDE_DIR)/package.mk + +define Package/libunwind + SECTION:=libs + CATEGORY:=Libraries + TITLE:=The libunwind project + URL:=http://www.nongnu.org/libunwind/ + DEPENDS:=@(mips||mipsel||powerpc||i386||x86_64) +endef + +define Package/libunwind/description + Libunwind defines a portable and efficient C programming interface (API) to determine the call-chain of a program. +endef + +CONFIGURE_ARGS += --enable-minidebuginfo=no + +define Package/libunwind/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libunwin*.so* $(1)/usr/lib/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libunwin*.so* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ +endef + +$(eval $(call BuildPackage,libunwind)) diff --git a/package/libs/libunwind/patches/001-disable-tests.patch b/package/libs/libunwind/patches/001-disable-tests.patch new file mode 100644 index 0000000000..9700fea477 --- /dev/null +++ b/package/libs/libunwind/patches/001-disable-tests.patch @@ -0,0 +1,22 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -36,7 +36,7 @@ + + nodist_include_HEADERS = include/libunwind-common.h + +-SUBDIRS = src tests doc ++SUBDIRS = src doc + + noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \ + include/compiler.h include/libunwind_i.h include/mempool.h \ +--- a/Makefile.in ++++ b/Makefile.in +@@ -313,7 +313,7 @@ + $(am__append_7) $(am__append_8) $(am__append_9) \ + $(am__append_10) + nodist_include_HEADERS = include/libunwind-common.h +-SUBDIRS = src tests doc ++SUBDIRS = src doc + noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \ + include/compiler.h include/libunwind_i.h include/mempool.h \ + include/remote.h \ diff --git a/package/libs/libunwind/patches/002-fix-building-getcontext_S.patch b/package/libs/libunwind/patches/002-fix-building-getcontext_S.patch new file mode 100644 index 0000000000..10b1dd1d90 --- /dev/null +++ b/package/libs/libunwind/patches/002-fix-building-getcontext_S.patch @@ -0,0 +1,19 @@ +diff -uprN a/src/mips/getcontext.S b/src/mips/getcontext.S +--- a/src/mips/getcontext.S 2012-10-06 12:54:38.000000000 +0800 ++++ b/src/mips/getcontext.S 2016-06-08 13:35:25.033051679 +0800 +@@ -24,12 +24,12 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + #include "offsets.h" +-#include <endian.h> + + .text ++ .set nomips16 + + #if _MIPS_SIM == _ABIO32 +-# if __BYTE_ORDER == __BIG_ENDIAN ++# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + # define OFFSET 4 + # else + # define OFFSET 0 + diff --git a/package/libs/libunwind/patches/003-fix-missing-ef_reg-defs-with-musl.patch b/package/libs/libunwind/patches/003-fix-missing-ef_reg-defs-with-musl.patch new file mode 100644 index 0000000000..465abb4ce0 --- /dev/null +++ b/package/libs/libunwind/patches/003-fix-missing-ef_reg-defs-with-musl.patch @@ -0,0 +1,47 @@ +diff -uprN a/include/libunwind-mips.h b/include/libunwind-mips.h +--- a/include/libunwind-mips.h 2012-10-06 12:54:38.000000000 +0800 ++++ b/include/libunwind-mips.h 2016-06-08 13:55:55.029436442 +0800 +@@ -111,6 +111,42 @@ typedef enum + } + mips_regnum_t; + ++#ifndef __GLIBC__ ++#include <sys/reg.h> ++ ++/* musl as of 1.1.14 does not export these */ ++#define EF_REG0 6 ++#define EF_REG1 7 ++#define EF_REG2 8 ++#define EF_REG3 9 ++#define EF_REG4 10 ++#define EF_REG5 11 ++#define EF_REG6 12 ++#define EF_REG7 13 ++#define EF_REG8 14 ++#define EF_REG9 15 ++#define EF_REG10 16 ++#define EF_REG11 17 ++#define EF_REG12 18 ++#define EF_REG13 19 ++#define EF_REG14 20 ++#define EF_REG15 21 ++#define EF_REG16 22 ++#define EF_REG17 23 ++#define EF_REG18 24 ++#define EF_REG19 25 ++#define EF_REG20 26 ++#define EF_REG21 27 ++#define EF_REG22 28 ++#define EF_REG23 29 ++#define EF_REG24 30 ++#define EF_REG25 31 ++#define EF_REG28 34 ++#define EF_REG29 35 ++#define EF_REG30 36 ++#define EF_REG31 37 ++#endif ++ + typedef enum + { + UNW_MIPS_ABI_O32, + diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile index 71264651ae..1729e82a81 100644 --- a/package/libs/ustream-ssl/Makefile +++ b/package/libs/ustream-ssl/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ustream-ssl -PKG_VERSION:=2016-02-21 +PKG_VERSION:=2016-06-07 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(OPENWRT_GIT)/project/ustream-ssl.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=6ba14990e63fc956e8aff3b0b09be1fd3aaa6d75 +PKG_SOURCE_VERSION:=17085b7abc0cd09c64ccace6f8d16ddee5729678 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile index 0b38be93cd..0dc771d374 100644 --- a/package/network/ipv6/odhcp6c/Makefile +++ b/package/network/ipv6/odhcp6c/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=odhcp6c -PKG_VERSION:=2015-09-04 +PKG_VERSION:=2016-06-30 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/sbyx/odhcp6c.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=dc186d6d2b0dd4ad23ca5fc69c00e81f796ff6d9 +PKG_SOURCE_VERSION:=7533a6243dc3ac5a747cf6ccbc4d0539dafd3e07 PKG_MAINTAINER:=Steven Barth <steven@midlink.org> PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/ebtables/Makefile b/package/network/utils/ebtables/Makefile index 30bf426d77..78b83b817b 100644 --- a/package/network/utils/ebtables/Makefile +++ b/package/network/utils/ebtables/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ebtables PKG_VERSION:=2.0.10-4 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/ebtables diff --git a/package/network/utils/ebtables/patches/200-fix-extension-init.patch b/package/network/utils/ebtables/patches/200-fix-extension-init.patch new file mode 100644 index 0000000000..63d237708f --- /dev/null +++ b/package/network/utils/ebtables/patches/200-fix-extension-init.patch @@ -0,0 +1,249 @@ +--- a/extensions/Makefile ++++ b/extensions/Makefile +@@ -11,13 +11,13 @@ EXT_LIBSI+=$(foreach T,$(EXT_FUNC), -leb + EXT_LIBSI+=$(foreach T,$(EXT_TABLES), -lebtable_$(T)) + + extensions/ebt_%.so: extensions/ebt_%.o +- $(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles ++ $(CC) $(LDFLAGS) -shared -o $@ -lc $< + + extensions/libebt_%.so: extensions/ebt_%.so + mv $< $@ + + extensions/ebtable_%.so: extensions/ebtable_%.o +- $(CC) $(LDFLAGS) -shared -o $@ -lc $< -nostartfiles ++ $(CC) $(LDFLAGS) -shared -o $@ -lc $< + + extensions/libebtable_%.so: extensions/ebtable_%.so + mv $< $@ +--- a/extensions/ebt_802_3.c ++++ b/extensions/ebt_802_3.c +@@ -141,7 +141,7 @@ static struct ebt_u_match _802_3_match = + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_match(&_802_3_match); + } +--- a/extensions/ebt_among.c ++++ b/extensions/ebt_among.c +@@ -490,7 +490,7 @@ static struct ebt_u_match among_match = + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_match(&among_match); + } +--- a/extensions/ebt_arp.c ++++ b/extensions/ebt_arp.c +@@ -362,7 +362,7 @@ static struct ebt_u_match arp_match = + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_match(&arp_match); + } +--- a/extensions/ebt_arpreply.c ++++ b/extensions/ebt_arpreply.c +@@ -132,7 +132,7 @@ static struct ebt_u_target arpreply_targ + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_target(&arpreply_target); + } +--- a/extensions/ebt_ip.c ++++ b/extensions/ebt_ip.c +@@ -338,7 +338,7 @@ static struct ebt_u_match ip_match = + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_match(&ip_match); + } +--- a/extensions/ebt_ip6.c ++++ b/extensions/ebt_ip6.c +@@ -556,7 +556,7 @@ static struct ebt_u_match ip6_match = + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_match(&ip6_match); + } +--- a/extensions/ebt_limit.c ++++ b/extensions/ebt_limit.c +@@ -212,7 +212,7 @@ static struct ebt_u_match limit_match = + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_match(&limit_match); + } +--- a/extensions/ebt_log.c ++++ b/extensions/ebt_log.c +@@ -217,7 +217,7 @@ static struct ebt_u_watcher log_watcher + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_watcher(&log_watcher); + } +--- a/extensions/ebt_mark.c ++++ b/extensions/ebt_mark.c +@@ -172,7 +172,7 @@ static struct ebt_u_target mark_target = + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_target(&mark_target); + } +--- a/extensions/ebt_mark_m.c ++++ b/extensions/ebt_mark_m.c +@@ -121,7 +121,7 @@ static struct ebt_u_match mark_match = + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_match(&mark_match); + } +--- a/extensions/ebt_nat.c ++++ b/extensions/ebt_nat.c +@@ -230,7 +230,7 @@ static struct ebt_u_target dnat_target = + .extra_ops = opts_d, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_target(&snat_target); + ebt_register_target(&dnat_target); +--- a/extensions/ebt_nflog.c ++++ b/extensions/ebt_nflog.c +@@ -166,7 +166,7 @@ static struct ebt_u_watcher nflog_watche + .extra_ops = nflog_opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_watcher(&nflog_watcher); + } +--- a/extensions/ebt_pkttype.c ++++ b/extensions/ebt_pkttype.c +@@ -125,7 +125,7 @@ static struct ebt_u_match pkttype_match + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_match(&pkttype_match); + } +--- a/extensions/ebt_redirect.c ++++ b/extensions/ebt_redirect.c +@@ -108,7 +108,7 @@ static struct ebt_u_target redirect_targ + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_target(&redirect_target); + } +--- a/extensions/ebt_standard.c ++++ b/extensions/ebt_standard.c +@@ -84,7 +84,7 @@ static struct ebt_u_target standard = + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_target(&standard); + } +--- a/extensions/ebt_stp.c ++++ b/extensions/ebt_stp.c +@@ -337,7 +337,7 @@ static struct ebt_u_match stp_match = + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_match(&stp_match); + } +--- a/extensions/ebt_ulog.c ++++ b/extensions/ebt_ulog.c +@@ -180,7 +180,7 @@ static struct ebt_u_watcher ulog_watcher + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_watcher(&ulog_watcher); + } +--- a/extensions/ebt_vlan.c ++++ b/extensions/ebt_vlan.c +@@ -181,7 +181,7 @@ static struct ebt_u_match vlan_match = { + .extra_ops = opts, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_match(&vlan_match); + } +--- a/extensions/ebtable_broute.c ++++ b/extensions/ebtable_broute.c +@@ -23,7 +23,7 @@ ebt_u_table table = + .help = print_help, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_table(&table); + } +--- a/extensions/ebtable_filter.c ++++ b/extensions/ebtable_filter.c +@@ -29,7 +29,7 @@ static struct ebt_u_table table = + .help = print_help, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_table(&table); + } +--- a/extensions/ebtable_nat.c ++++ b/extensions/ebtable_nat.c +@@ -30,7 +30,7 @@ ebt_u_table table = + .help = print_help, + }; + +-void _init(void) ++__attribute__((constructor)) static void extension_init(void) + { + ebt_register_table(&table); + } diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd index f73bb83082..410c832630 100755 --- a/package/utils/busybox/files/sysntpd +++ b/package/utils/busybox/files/sysntpd @@ -25,7 +25,7 @@ start_service() { [ -z "$server" ] && return procd_open_instance - procd_set_param command "$PROG" -n + procd_set_param command "$PROG" -n -N [ "$enable_server" = "1" ] && procd_append_param command -l [ -x "$HOTPLUG_SCRIPT" ] && procd_append_param command -S "$HOTPLUG_SCRIPT" for peer in $server; do diff --git a/package/utils/nvram/Makefile b/package/utils/nvram/Makefile index 040d953582..fdf6bd2d94 100644 --- a/package/utils/nvram/Makefile +++ b/package/utils/nvram/Makefile @@ -8,9 +8,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nvram -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) + PKG_FLAGS:=nonshared include $(INCLUDE_DIR)/package.mk @@ -44,10 +45,11 @@ define Build/Compile endef define Package/nvram/install - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/ +ifneq ($(CONFIG_TARGET_brcm47xx),) + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram endef $(eval $(call BuildPackage,nvram)) diff --git a/package/utils/px5g/Makefile b/package/utils/px5g/Makefile index 8677a8b174..c886ae5880 100644 --- a/package/utils/px5g/Makefile +++ b/package/utils/px5g/Makefile @@ -8,7 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=px5g -PKG_RELEASE:=3 +PKG_RELEASE:=4 +PKG_LICENSE:=LGPL-2.1 PKG_USE_MIPS16:=0 diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile index 2b44df9e90..40d905fbbe 100644 --- a/package/utils/usbutils/Makefile +++ b/package/utils/usbutils/Makefile @@ -9,11 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usbutils PKG_VERSION:=007 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@KERNEL/linux/utils/usb/usbutils PKG_MD5SUM:=a6bd63d5c44cebb717a960eae22a3ca9 +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=COPYING USB_IDS_VERSION:=2016-03-03 USB_IDS_MD5SUM:=273596b6ee101b1df454827cfa87dff8 diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index c128b487e5..d5c08cc5bb 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -32,6 +32,7 @@ include $(INCLUDE_DIR)/package.mk define Package/util-linux/Default SECTION:=utils CATEGORY:=Utilities + DEPENDS:= +librt URL:=http://www.kernel.org/pub/linux/utils/util-linux/ endef @@ -202,7 +203,6 @@ endef define Package/dmesg $(call Package/util-linux/Default) TITLE:=print or control the kernel ring buffer - DEPENDS:= +librt endef define Package/dmesg/description diff --git a/package/utils/util-linux/patches/0001-fix-uClibc-ng-scanf-check.patch b/package/utils/util-linux/patches/0001-fix-uClibc-ng-scanf-check.patch new file mode 100644 index 0000000000..2da95f6cdb --- /dev/null +++ b/package/utils/util-linux/patches/0001-fix-uClibc-ng-scanf-check.patch @@ -0,0 +1,34 @@ +From 180c908e2e80552b19bf3552667fc197d6edf7b3 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb <wbx@uclibc-ng.org> +Date: Fri, 3 Jun 2016 04:13:08 +0200 +Subject: [PATCH] fix uClibc-ng scanf check + +uClibc-ng tries to be compatible with GNU libc and defines +__GLIBC__ and pretend to be version 2.2. +We once changed it to 2.10, but then some hard to fix problems +in different software packages (gcc) occured. +It would be better if we disable the special GNU libc checks +for uClibc-ng here. uClibc-ng implements the required scanf +functionality. + +Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f36b18c..4661c0d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -581,7 +581,7 @@ AC_CACHE_VAL([scanf_cv_alloc_modifier], + #include <stdio.h> + #include <unistd.h> + +- #ifdef __GLIBC__ ++ #if defined(__GLIBC__) && !defined(__UCLIBC__) + + #if !(__GLIBC_PREREQ(2, 7)) + #error %m is not available +-- +2.1.4 + diff --git a/scripts/feeds b/scripts/feeds index 2b88eb8193..55a8dd94ea 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -22,7 +22,10 @@ my @mkver = split /\s+/, `$mk -v`, 4; my $valid_mk = 1; $mkver[0] =~ /^GNU/ or $valid_mk = 0; $mkver[1] =~ /^Make/ or $valid_mk = 0; -$mkver[2] >= "3.81" or $valid_mk = 0; + +my ($mkv1, $mkv2) = split /\./, $mkver[2]; +($mkv1 >= 4 || ($mkv1 == 3 && $mkv2 >= 81)) or $valid_mk = 0; + $valid_mk or die "Unsupported version of make found: $mk\n"; my @feeds; diff --git a/target/linux/arm64/Makefile b/target/linux/arm64/Makefile index 25ece9ad45..f0d23d0ebe 100644 --- a/target/linux/arm64/Makefile +++ b/target/linux/arm64/Makefile @@ -13,7 +13,7 @@ FEATURES:=fpu ramdisk CFLAGS:=-Os -pipe -fno-caller-saves MAINTAINER:=Florian Fainelli <florian@openwrt.org> -KERNEL_PATCHVER:=4.1 +KERNEL_PATCHVER:=4.4 DEVICE_TYPE:=developerboard diff --git a/target/linux/arm64/config-default b/target/linux/arm64/config-default index 0816031741..9d1cb5d46e 100644 --- a/target/linux/arm64/config-default +++ b/target/linux/arm64/config-default @@ -1,17 +1,21 @@ CONFIG_64BIT=y CONFIG_ACPI=y +CONFIG_ACPI_CCA_REQUIRED=y # CONFIG_ACPI_CONTAINER is not set # CONFIG_ACPI_CUSTOM_DSDT is not set # CONFIG_ACPI_DEBUG is not set +# CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DOCK is not set # CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_FAN=y CONFIG_ACPI_GENERIC_GSI=y # CONFIG_ACPI_PCI_SLOT is not set -# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y +CONFIG_ACPI_THERMAL=y +# CONFIG_ARCH_BCM_IPROC is not set CONFIG_ARCH_DMA_ADDR_T_64BIT=y # CONFIG_ARCH_EXYNOS7 is not set -# CONFIG_ARCH_FSL_LS2085A is not set CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y @@ -19,6 +23,7 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_TICK_BROADCAST=y +# CONFIG_ARCH_LAYERSCAPE is not set CONFIG_ARCH_PHYS_ADDR_T_64BIT=y CONFIG_ARCH_REQUIRE_GPIOLIB=y # CONFIG_ARCH_SEATTLE is not set @@ -26,6 +31,7 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_DEFAULT=y CONFIG_ARCH_SPARSEMEM_ENABLE=y # CONFIG_ARCH_SPRD is not set +# CONFIG_ARCH_STRATIX10 is not set CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_ARCH_SUSPEND_POSSIBLE=y # CONFIG_ARCH_THUNDER is not set @@ -39,6 +45,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y # CONFIG_ARCH_XGENE is not set # CONFIG_ARCH_ZYNQMP is not set CONFIG_ARM64=y +# CONFIG_ARM64_16K_PAGES is not set CONFIG_ARM64_4K_PAGES=y # CONFIG_ARM64_64K_PAGES is not set # CONFIG_ARM64_CRYPTO is not set @@ -49,6 +56,9 @@ CONFIG_ARM64_ERRATUM_827319=y CONFIG_ARM64_ERRATUM_832075=y CONFIG_ARM64_ERRATUM_843419=y CONFIG_ARM64_ERRATUM_845719=y +CONFIG_ARM64_HW_AFDBM=y +# CONFIG_ARM64_LSE_ATOMICS is not set +CONFIG_ARM64_PAN=y # CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set CONFIG_ARM64_VA_BITS=39 @@ -60,20 +70,24 @@ CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y CONFIG_ARM_GIC=y CONFIG_ARM_GIC_V3=y +CONFIG_ARM_PSCI_FW=y # CONFIG_ARM_SP805_WATCHDOG is not set CONFIG_ATOMIC64_SELFTEST=y CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y -CONFIG_AVERAGE=y CONFIG_BLK_DEV_SD=y CONFIG_BLOCK_COMPAT=y CONFIG_BOUNCE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_BUILD_BIN2C=y +# CONFIG_CAVIUM_ERRATUM_22375 is not set +# CONFIG_CAVIUM_ERRATUM_23154 is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CLKDEV_LOOKUP=y +CONFIG_CLKSRC_ACPI=y CONFIG_CLKSRC_MMIO=y CONFIG_CLKSRC_OF=y +CONFIG_CLKSRC_PROBE=y CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y CONFIG_CLONE_BACKWARDS=y @@ -99,6 +113,7 @@ CONFIG_DEBUG_INFO=y CONFIG_DEFAULT_IOSCHED="noop" CONFIG_DEFAULT_NOOP=y CONFIG_DTC=y +CONFIG_EDAC_SUPPORT=y # CONFIG_EFI is not set CONFIG_EXT4_FS=y CONFIG_FAT_FS=y @@ -109,19 +124,20 @@ CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_CMDLINE=y CONFIG_FB_MODE_HELPERS=y -# CONFIG_FB_SM750 is not set CONFIG_FIX_EARLYCON_MEM=y CONFIG_FRAME_POINTER=y # CONFIG_FSL_MC_BUS is not set -# CONFIG_FS_DAX is not set CONFIG_FS_MBCACHE=y CONFIG_FUSE_FS=y CONFIG_GENERIC_ALLOCATOR=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_CSUM=y CONFIG_GENERIC_EARLY_IOREMAP=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y @@ -133,6 +149,7 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GPIOLIB=y CONFIG_GPIO_ACPI=y +# CONFIG_GPIO_AMDPT is not set CONFIG_GPIO_DEVRES=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y @@ -144,9 +161,11 @@ CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_HAVE_ARCH_BITREVERSE=y CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y @@ -158,6 +177,7 @@ CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_BUGVERBOSE=y @@ -185,8 +205,10 @@ CONFIG_HAVE_UID16=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y # CONFIG_HPET is not set # CONFIG_HUGETLBFS is not set +CONFIG_HW_RANDOM=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_INITRAMFS_SOURCE="" CONFIG_IOMMU_HELPER=y # CONFIG_IOSCHED_DEADLINE is not set @@ -197,18 +219,17 @@ CONFIG_IP_PNP_DHCP=y CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y -CONFIG_JBD=y CONFIG_JBD2=y -CONFIG_KVM_COMPAT=y CONFIG_LIBFDT=y +# CONFIG_LIQUIDIO is not set CONFIG_LOCKD=y CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_LOGO=y CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOG_BUF_SHIFT=14 CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MAGIC_SYSRQ=y @@ -247,11 +268,11 @@ CONFIG_OF_PCI=y CONFIG_OF_PCI_IRQ=y CONFIG_OF_RESERVED_MEM=y CONFIG_OLD_SIGSUSPEND3=y -CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_PCI=y CONFIG_PCI_BUS_ADDR_T_64BIT=y CONFIG_PCI_DOMAINS=y CONFIG_PCI_DOMAINS_GENERIC=y +# CONFIG_PCI_HISI is not set CONFIG_PCI_LABEL=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=3 @@ -270,6 +291,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PROFILING=y +CONFIG_RATIONAL=y CONFIG_RCU_STALL_COMMON=y CONFIG_REGMAP=y CONFIG_REGMAP_MMIO=y @@ -278,9 +300,12 @@ CONFIG_ROOT_NFS=y CONFIG_RPS=y CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_SCHED_HRTICK=y +# CONFIG_SCHED_INFO is not set CONFIG_SCSI=y # CONFIG_SCSI_LOWLEVEL is not set # CONFIG_SCSI_PROC_FS is not set +CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_8250_PNP=y # CONFIG_SERIAL_AMBA_PL010 is not set CONFIG_SERIAL_AMBA_PL011=y @@ -294,16 +319,21 @@ CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y CONFIG_SPARSE_IRQ=y CONFIG_SRCU=y -CONFIG_STOP_MACHINE=y CONFIG_SUNRPC=y # CONFIG_SWAP is not set CONFIG_SWIOTLB=y CONFIG_SYSCTL_EXCEPTION_TRACE=y CONFIG_SYSVIPC_COMPAT=y CONFIG_SYS_SUPPORTS_HUGETLBFS=y +CONFIG_THERMAL=y +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_OF=y +# CONFIG_THUNDER_NIC_BGX is not set +# CONFIG_THUNDER_NIC_PF is not set +# CONFIG_THUNDER_NIC_VF is not set CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TREE_RCU=y -CONFIG_UID16=y CONFIG_VEXPRESS_CONFIG=y CONFIG_VEXPRESS_SYSCFG=y CONFIG_VFAT_FS=y diff --git a/target/linux/generic/config-4.4 b/target/linux/generic/config-4.4 index 62c1302a63..24b8c48e6f 100644 --- a/target/linux/generic/config-4.4 +++ b/target/linux/generic/config-4.4 @@ -1415,6 +1415,7 @@ CONFIG_HZ_100=y # CONFIG_I2C_AU1550 is not set # CONFIG_I2C_BCM2835 is not set # CONFIG_I2C_BCM_IPROC is not set +# CONFIG_I2C_CADENCE is not set # CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_CHARDEV is not set # CONFIG_I2C_COMPAT is not set diff --git a/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch b/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch index a6310c625c..2e66de29df 100644 --- a/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch +++ b/target/linux/generic/patches-3.18/099-module_arch_freeing_init-new-hook-for-archs-before-m.patch @@ -145,7 +145,7 @@ Origin: backport, https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.gi #endif --- a/kernel/module.c +++ b/kernel/module.c -@@ -1837,6 +1837,10 @@ void __weak module_arch_cleanup(struct m +@@ -1840,6 +1840,10 @@ void __weak module_arch_cleanup(struct m { } @@ -156,7 +156,7 @@ Origin: backport, https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.gi /* Free a module, remove from lists, etc. */ static void free_module(struct module *mod) { -@@ -1869,6 +1873,7 @@ static void free_module(struct module *m +@@ -1872,6 +1876,7 @@ static void free_module(struct module *m /* This may be NULL, but that's OK */ unset_module_init_ro_nx(mod); @@ -164,7 +164,7 @@ Origin: backport, https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.gi module_free(mod, mod->module_init); kfree(mod->args); percpu_modfree(mod); -@@ -2958,6 +2963,7 @@ static struct module *layout_and_allocat +@@ -2978,6 +2983,7 @@ static struct module *layout_and_allocat static void module_deallocate(struct module *mod, struct load_info *info) { percpu_modfree(mod); @@ -172,8 +172,8 @@ Origin: backport, https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.gi module_free(mod, mod->module_init); module_free(mod, mod->module_core); } -@@ -3081,6 +3087,7 @@ static int do_init_module(struct module - mod->strtab = mod->core_strtab; +@@ -3100,6 +3106,7 @@ static int do_init_module(struct module + rcu_assign_pointer(mod->kallsyms, &mod->core_kallsyms); #endif unset_module_init_ro_nx(mod); + module_arch_freeing_init(mod); diff --git a/target/linux/generic/patches-3.18/204-module_strip.patch b/target/linux/generic/patches-3.18/204-module_strip.patch index 5b640bfe3e..58e4f6eab7 100644 --- a/target/linux/generic/patches-3.18/204-module_strip.patch +++ b/target/linux/generic/patches-3.18/204-module_strip.patch @@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> config INIT_ALL_POSSIBLE --- a/kernel/module.c +++ b/kernel/module.c -@@ -2674,6 +2674,7 @@ static struct module *setup_load_info(st +@@ -2694,6 +2694,7 @@ static struct module *setup_load_info(st static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> const char *modmagic = get_modinfo(info, "vermagic"); int err; -@@ -2699,6 +2700,7 @@ static int check_modinfo(struct module * +@@ -2719,6 +2720,7 @@ static int check_modinfo(struct module * pr_warn("%s: module is from the staging directory, the quality " "is unknown, you have been warned.\n", mod->name); } diff --git a/target/linux/generic/patches-3.18/309-mips_fuse_workaround.patch b/target/linux/generic/patches-3.18/309-mips_fuse_workaround.patch deleted file mode 100644 index 934b1198f4..0000000000 --- a/target/linux/generic/patches-3.18/309-mips_fuse_workaround.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/arch/mips/mm/cache.c -+++ b/arch/mips/mm/cache.c -@@ -38,6 +38,7 @@ void (*__flush_cache_vunmap)(void); - - void (*__flush_kernel_vmap_range)(unsigned long vaddr, int size); - EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range); -+EXPORT_SYMBOL(__flush_cache_all); - void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size); - - /* MIPS specific cache operations */ ---- a/fs/fuse/dev.c -+++ b/fs/fuse/dev.c -@@ -20,6 +20,9 @@ - #include <linux/swap.h> - #include <linux/splice.h> - #include <linux/aio.h> -+#ifdef CONFIG_MIPS -+#include <asm/cacheflush.h> -+#endif - - MODULE_ALIAS_MISCDEV(FUSE_MINOR); - MODULE_ALIAS("devname:fuse"); -@@ -749,6 +752,9 @@ static int fuse_copy_fill(struct fuse_co - static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size) - { - unsigned ncpy = min(*size, cs->len); -+#ifdef CONFIG_MIPS -+ __flush_cache_all(); -+#endif - if (val) { - void *pgaddr = kmap_atomic(cs->pg); - void *buf = pgaddr + cs->offset; diff --git a/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch index e4f31fdf17..3f2b439362 100644 --- a/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch +++ b/target/linux/generic/patches-3.18/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch @@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- a/init/do_mounts.c +++ b/init/do_mounts.c -@@ -433,7 +433,27 @@ retry: +@@ -433,7 +433,28 @@ retry: out: put_page(page); } @@ -29,6 +29,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> + case -EACCES: + flags |= MS_RDONLY; + tried++; ++ break; + default: + return err; + } diff --git a/target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch index cd02c13e0c..4b5eb4568d 100644 --- a/target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch +++ b/target/linux/generic/patches-3.18/494-mtd-ubi-add-EOF-marker-support.patch @@ -41,7 +41,7 @@ break; --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h -@@ -701,6 +701,7 @@ struct ubi_attach_info { +@@ -705,6 +705,7 @@ struct ubi_attach_info { int mean_ec; uint64_t ec_sum; int ec_count; diff --git a/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch index b54d1509a5..a7bf0bb9fa 100644 --- a/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.18/811-pci_disable_usb_common_quirks.patch @@ -84,7 +84,7 @@ #endif /* __LINUX_USB_PCI_QUIRKS_H */ --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h -@@ -444,7 +444,14 @@ extern int usb_hcd_pci_probe(struct pci_ +@@ -445,7 +445,14 @@ extern int usb_hcd_pci_probe(struct pci_ extern void usb_hcd_pci_remove(struct pci_dev *dev); extern void usb_hcd_pci_shutdown(struct pci_dev *dev); diff --git a/target/linux/generic/patches-3.18/820-usb_add_usb_find_device_by_name.patch b/target/linux/generic/patches-3.18/820-usb_add_usb_find_device_by_name.patch index e381cc97be..bf19f5f783 100644 --- a/target/linux/generic/patches-3.18/820-usb_add_usb_find_device_by_name.patch +++ b/target/linux/generic/patches-3.18/820-usb_add_usb_find_device_by_name.patch @@ -74,7 +74,7 @@ * @dev: device the buffer will be used with --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -721,6 +721,7 @@ static inline bool usb_device_no_sg_cons +@@ -720,6 +720,7 @@ static inline bool usb_device_no_sg_cons return udev && udev->bus && udev->bus->no_sg_constraint; } diff --git a/target/linux/generic/patches-4.1/309-mips_fuse_workaround.patch b/target/linux/generic/patches-4.1/309-mips_fuse_workaround.patch deleted file mode 100644 index 7a3aa34435..0000000000 --- a/target/linux/generic/patches-4.1/309-mips_fuse_workaround.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/arch/mips/mm/cache.c -+++ b/arch/mips/mm/cache.c -@@ -38,6 +38,7 @@ void (*__flush_cache_vunmap)(void); - - void (*__flush_kernel_vmap_range)(unsigned long vaddr, int size); - EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range); -+EXPORT_SYMBOL(__flush_cache_all); - void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size); - - /* MIPS specific cache operations */ ---- a/fs/fuse/dev.c -+++ b/fs/fuse/dev.c -@@ -19,6 +19,9 @@ - #include <linux/pipe_fs_i.h> - #include <linux/swap.h> - #include <linux/splice.h> -+#ifdef CONFIG_MIPS -+#include <asm/cacheflush.h> -+#endif - - MODULE_ALIAS_MISCDEV(FUSE_MINOR); - MODULE_ALIAS("devname:fuse"); -@@ -816,6 +819,9 @@ static int fuse_copy_fill(struct fuse_co - static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size) - { - unsigned ncpy = min(*size, cs->len); -+#ifdef CONFIG_MIPS -+ __flush_cache_all(); -+#endif - if (val) { - void *pgaddr = kmap_atomic(cs->pg); - void *buf = pgaddr + cs->offset; diff --git a/target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch index 005de3fcae..f6c71a2f63 100644 --- a/target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch +++ b/target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch @@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- a/init/do_mounts.c +++ b/init/do_mounts.c -@@ -438,7 +438,27 @@ retry: +@@ -438,7 +438,28 @@ retry: out: put_page(page); } @@ -29,6 +29,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> + case -EACCES: + flags |= MS_RDONLY; + tried++; ++ break; + default: + return err; + } diff --git a/target/linux/generic/patches-4.4/309-mips_fuse_workaround.patch b/target/linux/generic/patches-4.4/309-mips_fuse_workaround.patch deleted file mode 100644 index 14d7962b94..0000000000 --- a/target/linux/generic/patches-4.4/309-mips_fuse_workaround.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/arch/mips/mm/cache.c -+++ b/arch/mips/mm/cache.c -@@ -39,6 +39,7 @@ void (*__flush_cache_vunmap)(void); - - void (*__flush_kernel_vmap_range)(unsigned long vaddr, int size); - EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range); -+EXPORT_SYMBOL(__flush_cache_all); - void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size); - - /* MIPS specific cache operations */ ---- a/fs/fuse/dev.c -+++ b/fs/fuse/dev.c -@@ -19,6 +19,9 @@ - #include <linux/pipe_fs_i.h> - #include <linux/swap.h> - #include <linux/splice.h> -+#ifdef CONFIG_MIPS -+#include <asm/cacheflush.h> -+#endif - - MODULE_ALIAS_MISCDEV(FUSE_MINOR); - MODULE_ALIAS("devname:fuse"); -@@ -802,6 +805,9 @@ static int fuse_copy_fill(struct fuse_co - static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size) - { - unsigned ncpy = min(*size, cs->len); -+#ifdef CONFIG_MIPS -+ __flush_cache_all(); -+#endif - if (val) { - void *pgaddr = kmap_atomic(cs->pg); - void *buf = pgaddr + cs->offset; diff --git a/target/linux/generic/patches-4.4/340-MIPS-deactivate-gettimeofday-vdso.patch b/target/linux/generic/patches-4.4/340-MIPS-deactivate-gettimeofday-vdso.patch deleted file mode 100644 index a77bdf84fe..0000000000 --- a/target/linux/generic/patches-4.4/340-MIPS-deactivate-gettimeofday-vdso.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/arch/mips/vdso/Makefile -+++ b/arch/mips/vdso/Makefile -@@ -1,5 +1,5 @@ - # Objects to go into the VDSO. --obj-vdso-y := elf.o gettimeofday.o sigreturn.o -+obj-vdso-y := elf.o sigreturn.o - - # Common compiler flags between ABIs. - ccflags-vdso := \ diff --git a/target/linux/generic/patches-4.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch b/target/linux/generic/patches-4.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch index d21e6d21ce..ab8b8bb0a2 100644 --- a/target/linux/generic/patches-4.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch +++ b/target/linux/generic/patches-4.4/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch @@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- a/init/do_mounts.c +++ b/init/do_mounts.c -@@ -438,7 +438,27 @@ retry: +@@ -438,7 +438,28 @@ retry: out: put_page(page); } @@ -29,6 +29,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> + case -EACCES: + flags |= MS_RDONLY; + tried++; ++ break; + default: + return err; + } @@ -40,7 +41,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> #ifdef CONFIG_ROOT_NFS #define NFSROOT_TIMEOUT_MIN 5 -@@ -532,6 +552,10 @@ void __init mount_root(void) +@@ -532,6 +553,10 @@ void __init mount_root(void) change_floppy("root floppy"); } #endif diff --git a/target/linux/kirkwood/config-4.4 b/target/linux/kirkwood/config-4.4 index 666bc04a4f..1caec8b989 100644 --- a/target/linux/kirkwood/config-4.4 +++ b/target/linux/kirkwood/config-4.4 @@ -38,6 +38,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=5 # CONFIG_ARM_MVEBU_V7_CPUIDLE is not set CONFIG_ARM_PATCH_PHYS_VIRT=y # CONFIG_ARM_THUMB is not set +# CONFIG_ARMADA_THERMAL is not set CONFIG_ATAGS=y CONFIG_AUTO_ZRELADDR=y CONFIG_BLK_DEV_SD=y diff --git a/target/linux/lantiq/patches-4.4/0004-MIPS-lantiq-add-atm-hack.patch b/target/linux/lantiq/patches-4.4/0004-MIPS-lantiq-add-atm-hack.patch index 6b97f395ec..53809d0a8f 100644 --- a/target/linux/lantiq/patches-4.4/0004-MIPS-lantiq-add-atm-hack.patch +++ b/target/linux/lantiq/patches-4.4/0004-MIPS-lantiq-add-atm-hack.patch @@ -441,7 +441,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> { --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c -@@ -60,6 +60,8 @@ void (*_dma_cache_wback)(unsigned long s +@@ -59,6 +59,8 @@ void (*_dma_cache_wback)(unsigned long s void (*_dma_cache_inv)(unsigned long start, unsigned long size); EXPORT_SYMBOL(_dma_cache_wback_inv); diff --git a/target/linux/malta/config-4.4 b/target/linux/malta/config-4.4 index 8352362293..7bcfaea5f3 100644 --- a/target/linux/malta/config-4.4 +++ b/target/linux/malta/config-4.4 @@ -166,7 +166,6 @@ CONFIG_KERNEL_GZIP=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 CONFIG_LIBFDT=y -CONFIG_LOG_BUF_SHIFT=15 CONFIG_MD=y CONFIG_MIPS=y CONFIG_MIPS_BONITO64=y diff --git a/target/linux/mvebu/config-4.4 b/target/linux/mvebu/config-4.4 index 216e8da607..f5b2346e44 100644 --- a/target/linux/mvebu/config-4.4 +++ b/target/linux/mvebu/config-4.4 @@ -232,7 +232,6 @@ CONFIG_LEDS_TLC591XX=y CONFIG_LEDS_TRIGGER_USBDEV=y CONFIG_LIBFDT=y CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_LOG_BUF_SHIFT=14 CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MACH_ARMADA_370=y diff --git a/target/linux/sunxi/config-4.4 b/target/linux/sunxi/config-4.4 index e97538de9c..b05446c6d2 100644 --- a/target/linux/sunxi/config-4.4 +++ b/target/linux/sunxi/config-4.4 @@ -291,7 +291,6 @@ CONFIG_LOGO=y CONFIG_LOGO_LINUX_CLUT224=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOG_BUF_SHIFT=19 CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MACH_SUN4I=y diff --git a/target/linux/sunxi/patches-3.18/116-dt-sunxi-update-compats-for-tempcurves.patch b/target/linux/sunxi/patches-3.18/116-dt-sunxi-update-compats-for-tempcurves.patch deleted file mode 100644 index fe8dcdbc0a..0000000000 --- a/target/linux/sunxi/patches-3.18/116-dt-sunxi-update-compats-for-tempcurves.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ff774d842a2bf9136b9c7ddd7f5085a9062705ac Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Mon, 16 Jun 2014 20:06:43 +0200 -Subject: [PATCH] ARM: dts: sunxi: Adjust touchscreen compatible for sun5i and - later - -The touchscreen controller in the A13 and later has a different temperature -curve than the one in the original A10, change the compatible for the A13 and -later so that the kernel will use the correct curve. - -Reported-by: Tong Zhang <lovewilliam@gmail.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +- - arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- - arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - ---- a/arch/arm/boot/dts/sun5i-a10s.dtsi -+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi -@@ -533,7 +533,7 @@ - }; - - rtp: rtp@01c25000 { -- compatible = "allwinner,sun4i-a10-ts"; -+ compatible = "allwinner,sun5i-a13-ts"; - reg = <0x01c25000 0x100>; - interrupts = <29>; - }; ---- a/arch/arm/boot/dts/sun5i-a13.dtsi -+++ b/arch/arm/boot/dts/sun5i-a13.dtsi -@@ -481,7 +481,7 @@ - }; - - rtp: rtp@01c25000 { -- compatible = "allwinner,sun4i-a10-ts"; -+ compatible = "allwinner,sun5i-a13-ts"; - reg = <0x01c25000 0x100>; - interrupts = <29>; - }; ---- a/arch/arm/boot/dts/sun7i-a20.dtsi -+++ b/arch/arm/boot/dts/sun7i-a20.dtsi -@@ -924,7 +924,7 @@ - }; - - rtp: rtp@01c25000 { -- compatible = "allwinner,sun4i-a10-ts"; -+ compatible = "allwinner,sun5i-a13-ts"; - reg = <0x01c25000 0x100>; - interrupts = <0 29 4>; - }; diff --git a/target/linux/zynq/config-4.4 b/target/linux/zynq/config-4.4 index 1152e9f451..f8e080d5f9 100644 --- a/target/linux/zynq/config-4.4 +++ b/target/linux/zynq/config-4.4 @@ -409,7 +409,6 @@ CONFIG_LEDS_TRIGGER_TRANSIENT=y CONFIG_LIBFDT=y CONFIG_LOCKD=y CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_LOG_BUF_SHIFT=14 CONFIG_MACB=y CONFIG_MARVELL_PHY=y CONFIG_MDIO_BITBANG=y diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index da62f70745..aaa3b33f4f 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -19,10 +19,11 @@ HOST_CONFIGURE_PARALLEL:=1 include $(INCLUDE_DIR)/host-build.mk +HOST_CONFIGURE_CMD := MAKEFLAGS="$(HOST_JOBS)" $(BASH) ./configure + HOST_CONFIGURE_VARS := HOST_CONFIGURE_ARGS := \ - --prefix=$(STAGING_DIR_HOST) \ - $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") + --prefix=$(STAGING_DIR_HOST) $(eval $(call HostBuild)) diff --git a/tools/e2fsprogs/patches/010-old-libmagic.patch b/tools/e2fsprogs/patches/010-old-libmagic.patch new file mode 100644 index 0000000000..9156b73372 --- /dev/null +++ b/tools/e2fsprogs/patches/010-old-libmagic.patch @@ -0,0 +1,25 @@ +From b482eb7af94885b6bbad9329e40702c958d5b448 Mon Sep 17 00:00:00 2001 +From: Hauke Mehrtens <hauke@hauke-m.de> +Date: Thu, 30 Jun 2016 19:53:03 +0200 +Subject: [PATCH] fix build problem with very old libmagic + +The libmagic shipped with RedHat 5 does not define +MAGIC_NO_CHECK_ELF and MAGIC_NO_CHECK_COMPRESS. e2fsprogs should +check for that otherwise the build will fail. + +Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +--- + lib/support/plausible.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/lib/support/plausible.c ++++ b/lib/support/plausible.c +@@ -247,7 +247,7 @@ int check_plausibility(const char *devic + return 0; + } + +-#ifdef HAVE_MAGIC_H ++#if defined(HAVE_MAGIC_H) && defined(MAGIC_NO_CHECK_ELF) && defined(MAGIC_NO_CHECK_COMPRESS) + if ((flags & CHECK_FS_EXIST) && + !getenv("E2FSPROGS_LIBMAGIC_SUPPRESS") && + magic_library_available()) { diff --git a/tools/patch-image/src/patch-cmdline.c b/tools/patch-image/src/patch-cmdline.c index d3a5b119e4..8d1fce9172 100644 --- a/tools/patch-image/src/patch-cmdline.c +++ b/tools/patch-image/src/patch-cmdline.c @@ -35,10 +35,16 @@ int main(int argc, char **argv) { int fd, found = 0, len, ret = -1; char *ptr, *p; + unsigned int search_space; - if (argc != 3) { - fprintf(stderr, "Usage: %s <file> <cmdline>\n", argv[0]); + if (argc <= 2 || argc > 4) { + fprintf(stderr, "Usage: %s <file> <cmdline> [size]\n", argv[0]); goto err1; + } else if (argc == 3) { + fprintf(stdout, "search space used is default of 16KB\n"); + search_space = SEARCH_SPACE; + } else { + search_space = atoi(argv[3]); } len = strlen(argv[2]); if (len + 9 > CMDLINE_MAX) { @@ -47,12 +53,12 @@ int main(int argc, char **argv) } if (((fd = open(argv[1], O_RDWR)) < 0) || - (ptr = (char *) mmap(0, SEARCH_SPACE + CMDLINE_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1)) { + (ptr = (char *) mmap(0, search_space + CMDLINE_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1)) { fprintf(stderr, "Could not open kernel image"); goto err2; } - for (p = ptr; p < (ptr + SEARCH_SPACE); p += 4) { + for (p = ptr; p < (ptr + search_space); p += 4) { if (memcmp(p, "CMDLINE:", 8) == 0) { found = 1; p += 8; diff --git a/tools/patch-image/src/patch-dtb.c b/tools/patch-image/src/patch-dtb.c index 7812eb9b39..8d186236c1 100644 --- a/tools/patch-image/src/patch-dtb.c +++ b/tools/patch-image/src/patch-dtb.c @@ -30,7 +30,6 @@ #include <sys/stat.h> #include <string.h> -#define SEARCH_SPACE (16 * 1024) #define DTB_MAX (16 * 1024) int main(int argc, char **argv) @@ -38,11 +37,18 @@ int main(int argc, char **argv) int fd, fddtb, found = 0, len, ret = -1; char *ptr, *ptrdtb, *p; struct stat s; + unsigned int search_space , dtb_max_size; - if (argc != 3) { - fprintf(stderr, "Usage: %s <file> <dtb>\n", argv[0]); + if (argc <= 2 || argc > 4) { + fprintf(stderr, "Usage: %s <file> <dtb> [size]\n", argv[0]); goto err1; + } else if (argc == 3) { + fprintf(stdout, "DT size used is default of 16KB\n"); + search_space = dtb_max_size = DTB_MAX; + } else { + search_space = dtb_max_size = atoi(argv[3]); } + fddtb = open(argv[1], O_RDONLY); if (!fddtb) goto err1; @@ -53,24 +59,24 @@ int main(int argc, char **argv) } len = s.st_size; - if (len + 8 > DTB_MAX) { + if (len + 8 > dtb_max_size) { fprintf(stderr, "DTB too big\n"); goto err1; } if (((fddtb = open(argv[2], O_RDONLY)) < 0) || - (ptrdtb = (char *) mmap(0, DTB_MAX, PROT_READ, MAP_SHARED, fddtb, 0)) == (void *) (-1)) { + (ptrdtb = (char *) mmap(0, dtb_max_size, PROT_READ, MAP_SHARED, fddtb, 0)) == (void *) (-1)) { fprintf(stderr, "Could not open DTB"); goto err2; } if (((fd = open(argv[1], O_RDWR)) < 0) || - (ptr = (char *) mmap(0, SEARCH_SPACE + DTB_MAX, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1)) { + (ptr = (char *) mmap(0, search_space + dtb_max_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0)) == (void *) (-1)) { fprintf(stderr, "Could not open kernel image"); goto err3; } - for (p = ptr; p < (ptr + SEARCH_SPACE); p += 4) { + for (p = ptr; p < (ptr + search_space); p += 4) { if (memcmp(p, "OWRTDTB:", 8) == 0) { found = 1; p += 8; @@ -82,7 +88,7 @@ int main(int argc, char **argv) goto err4; } - memset(p, 0, DTB_MAX - 8); + memset(p, 0, dtb_max_size - 8); memcpy(p, ptrdtb, len); msync(p, len, MS_SYNC|MS_INVALIDATE); ret = 0; |