diff options
-rw-r--r-- | include/kernel-version.mk | 4 | ||||
-rw-r--r-- | package/libs/libubox/Makefile | 4 | ||||
-rw-r--r-- | package/libs/ustream-ssl/Makefile | 4 | ||||
-rw-r--r-- | package/network/utils/umbim/Makefile | 4 | ||||
-rw-r--r-- | package/system/procd/Makefile | 4 | ||||
-rw-r--r-- | package/system/rpcd/Makefile | 4 | ||||
-rw-r--r-- | package/system/ubus/Makefile | 4 | ||||
-rw-r--r-- | package/system/uci/Makefile | 4 | ||||
-rw-r--r-- | package/system/usign/Makefile | 4 | ||||
-rw-r--r-- | package/utils/e2fsprogs/Makefile | 2 | ||||
-rw-r--r-- | package/utils/e2fsprogs/patches/002-fix-subst-host-build.patch | 10 | ||||
-rw-r--r-- | package/utils/jsonfilter/Makefile | 4 | ||||
-rw-r--r-- | target/linux/generic/patches-4.1/492-try-auto-mounting-ubi0-rootfs-in-init-do_mounts.c.patch | 2 | ||||
-rw-r--r-- | target/linux/generic/patches-4.1/494-mtd-ubi-add-EOF-marker-support.patch | 2 | ||||
-rw-r--r-- | target/linux/generic/patches-4.1/811-pci_disable_usb_common_quirks.patch | 2 | ||||
-rw-r--r-- | target/linux/generic/patches-4.1/820-usb_add_usb_find_device_by_name.patch | 2 |
16 files changed, 35 insertions, 25 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b0e468559b..579bc701cd 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,11 +3,11 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .36 -LINUX_VERSION-4.1 = .23 +LINUX_VERSION-4.1 = .27 LINUX_VERSION-4.4 = .14 LINUX_KERNEL_MD5SUM-3.18.36 = 31b1699c1285aeeb81fb25750baa50d9 -LINUX_KERNEL_MD5SUM-4.1.23 = 5cb969fa874e110118722398b7c72c5d +LINUX_KERNEL_MD5SUM-4.1.27 = 0347b5790c85bdabce41b8b9d9d4b98e LINUX_KERNEL_MD5SUM-4.4.14 = 59e99c3bf5d495f1f95d26257962ca3e ifdef KERNEL_PATCHVER diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index 97cac7bf5e..4090fa942b 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-05-19 +PKG_VERSION:=2016-07-04 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:=1257a38a6e64511207bb3b077ca7e8e1a3338fc1 +PKG_SOURCE_VERSION:=d3fa561e5abcc88e02eb289c24d0b1d4d05adb54 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_MD5SUM:= CMAKE_INSTALL:=1 diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile index 1729e82a81..12d1b4468b 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-06-07 +PKG_VERSION:=2016-07-02 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:=17085b7abc0cd09c64ccace6f8d16ddee5729678 +PKG_SOURCE_VERSION:=ec80adaa1b47f28d426fa19c692011ce60b992d6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 diff --git a/package/network/utils/umbim/Makefile b/package/network/utils/umbim/Makefile index 4ea4a8b613..7c2b20e85b 100644 --- a/package/network/utils/umbim/Makefile +++ b/package/network/utils/umbim/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=umbim -PKG_VERSION:=2015-04-09 +PKG_VERSION:=2015-07-04 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(OPENWRT_GIT)/project/umbim.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=af9c293c1f1d8a97fbd8adf9c6070ead4920ca84 +PKG_SOURCE_VERSION:=29aaf43b097ee57f7aa1bb24341db6cc4148cbf3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=John Crispin <blogic@openwrt.org> diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 294985c65e..021d702f12 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procd -PKG_VERSION:=2016-03-09 +PKG_VERSION:=2016-07-07 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(OPENWRT_GIT)/project/procd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=b12bb150ed38a4409bef5127c77b060ee616b860 +PKG_SOURCE_VERSION:=02d56c03115276aa4e2203ddbd411c3e587cf08f PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index fdd9145a45..80f131d0df 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rpcd -PKG_VERSION:=2016-06-06 +PKG_VERSION:=2016-06-30 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(OPENWRT_GIT)/project/rpcd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME) -PKG_SOURCE_VERSION:=f8174eacef9b687a83231e58fdd1e53492e3ca84 +PKG_SOURCE_VERSION:=23417e94d25570e6d62542bac46edd51e8e0243a PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile index cfb16cc830..61d4081cfb 100644 --- a/package/system/ubus/Makefile +++ b/package/system/ubus/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ubus -PKG_VERSION:=2016-01-26 +PKG_VERSION:=2016-07-02 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(OPENWRT_GIT)/project/ubus.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=619f3a160de4f417226b69039538882787b3811c +PKG_SOURCE_VERSION:=053be7df871e05478284235732f8b0608089512f PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_MD5SUM:= CMAKE_INSTALL:=1 diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index d33967df70..9763a16379 100644 --- a/package/system/uci/Makefile +++ b/package/system/uci/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk -UCI_VERSION=2016-02-02 +UCI_VERSION=2016-07-04 UCI_RELEASE=1 PKG_NAME:=uci PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) PKG_RELEASE:=1 -PKG_REV:=d4e42a9081e0b6fa5cbb072bcbfe01adccdad694 +PKG_REV:=e1bf4356e1b513e158e1b5049147087ed6342cfd PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL=$(OPENWRT_GIT)/project/uci.git diff --git a/package/system/usign/Makefile b/package/system/usign/Makefile index 5b40ce9630..9df37b84fc 100644 --- a/package/system/usign/Makefile +++ b/package/system/usign/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usign -PKG_VERSION:=2015-05-08 +PKG_VERSION:=2016-07-04 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(OPENWRT_GIT)/project/usign.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=cf8dcdb8a4e874c77f3e9a8e9b643e8c17b19131 +PKG_SOURCE_VERSION:=ef6419142a3b0fbcddcccf536e3c1880302c6f89 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 PKG_CHECK_FORMAT_SECURITY:=1 diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index 9da52d8a2c..247b5ed4a4 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs PKG_VERSION:=1.43.1 PKG_MD5SUM:=1775f3f0eed9dee1c5f39e08d1964a97 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/e2fsprogs diff --git a/package/utils/e2fsprogs/patches/002-fix-subst-host-build.patch b/package/utils/e2fsprogs/patches/002-fix-subst-host-build.patch new file mode 100644 index 0000000000..c92e2280e9 --- /dev/null +++ b/package/utils/e2fsprogs/patches/002-fix-subst-host-build.patch @@ -0,0 +1,10 @@ +--- a/util/subst.c ++++ b/util/subst.c +@@ -9,6 +9,7 @@ + #include "config.h" + #else + #define HAVE_SYS_TIME_H ++#define HAVE_SYS_STAT_H + #endif + #include <stdio.h> + #include <errno.h> diff --git a/package/utils/jsonfilter/Makefile b/package/utils/jsonfilter/Makefile index e651095958..79200cb2e9 100644 --- a/package/utils/jsonfilter/Makefile +++ b/package/utils/jsonfilter/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=jsonfilter -PKG_VERSION:=2014-06-19 +PKG_VERSION:=2016-07-02 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(OPENWRT_GIT)/project/jsonpath.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=cdc760c58077f44fc40adbbe41e1556a67c1b9a9 +PKG_SOURCE_VERSION:=dea067ad67d977c247c300c06676a06adf21e0c7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 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 f6c71a2f63..c4a672c964 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 @@ -41,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/generic/patches-4.1/494-mtd-ubi-add-EOF-marker-support.patch b/target/linux/generic/patches-4.1/494-mtd-ubi-add-EOF-marker-support.patch index 14fae764fe..dd5ee306ef 100644 --- a/target/linux/generic/patches-4.1/494-mtd-ubi-add-EOF-marker-support.patch +++ b/target/linux/generic/patches-4.1/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 -@@ -739,6 +739,7 @@ struct ubi_attach_info { +@@ -741,6 +741,7 @@ struct ubi_attach_info { int mean_ec; uint64_t ec_sum; int ec_count; diff --git a/target/linux/generic/patches-4.1/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-4.1/811-pci_disable_usb_common_quirks.patch index 6de4f6b9c7..e078b4e8aa 100644 --- a/target/linux/generic/patches-4.1/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-4.1/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 -@@ -447,7 +447,14 @@ extern int usb_hcd_pci_probe(struct pci_ +@@ -448,7 +448,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-4.1/820-usb_add_usb_find_device_by_name.patch b/target/linux/generic/patches-4.1/820-usb_add_usb_find_device_by_name.patch index 906f0e215e..6a16c5e7b4 100644 --- a/target/linux/generic/patches-4.1/820-usb_add_usb_find_device_by_name.patch +++ b/target/linux/generic/patches-4.1/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; } |