diff --git a/modules b/modules index 747e27a66868c6020b5ac1f8a8f26a451c719b8a..38e6370826f4b0fbb26026e8cfd7b6d24df6f92f 100644 --- a/modules +++ b/modules @@ -2,7 +2,7 @@ GLUON_FEEDS='openwrt gluon routing luci' LEDE_REPO=https://git.lede-project.org/source.git LEDE_BRANCH=lede-17.01 -LEDE_COMMIT=415175246eec0c59351e575ce6f3769b70772b09 +LEDE_COMMIT=783465d783b17a66b37e6dd7db732244e30e6913 PACKAGES_OPENWRT_REPO=https://github.com/openwrt/packages.git PACKAGES_OPENWRT_BRANCH=lede-17.01 diff --git a/patches/lede/0014-procd-clean-up-trailing-whitespace-in-nand.sh.patch b/patches/lede/0013-procd-clean-up-trailing-whitespace-in-nand.sh.patch similarity index 100% rename from patches/lede/0014-procd-clean-up-trailing-whitespace-in-nand.sh.patch rename to patches/lede/0013-procd-clean-up-trailing-whitespace-in-nand.sh.patch diff --git a/patches/lede/0013-sunxi-clean-up-modules-definitions.patch b/patches/lede/0013-sunxi-clean-up-modules-definitions.patch deleted file mode 100644 index 175dda66136d9a29e3100eb49f75be0be50c361c..0000000000000000000000000000000000000000 --- a/patches/lede/0013-sunxi-clean-up-modules-definitions.patch +++ /dev/null @@ -1,128 +0,0 @@ -From: Matthias Schiffer <mschiffer@universe-factory.net> -Date: Thu, 4 May 2017 07:00:06 +0200 -Subject: sunxi: clean up modules definitions - -Module definitions for kmod-wdt-sunxi and kmod-eeprom-sunxi are removed -(wdt-sunxi was builtin anyways; nvmem-sunxi, which is the new name of -eeprom-sunxi is changed to builtin). As kmod-eeprom-sunxi was specified -in DEFAULT_PACKAGES, but not available on kernel 4.4, it was breaking the -image builder. - -Support for kmod-sunxi-ir is added for kernel 4.4 (it is unclear why it -was disable before, it builds fine with with kernel 4.4). - -Condtionals only relevant for pre-4.4 kernels are removed from modules.mk, -as sunxi does't support older kernels anymore. - -Fixes FS#755. - -Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> - -diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile -index b0bc1bab398af55b77909deccd8f059e17d96e67..3c2f14b8418e1d296a239027f6fdee9b5ba8f9b2 100644 ---- a/target/linux/sunxi/Makefile -+++ b/target/linux/sunxi/Makefile -@@ -27,7 +27,7 @@ KERNELNAME:=zImage dtbs - - include $(INCLUDE_DIR)/target.mk - --DEFAULT_PACKAGES += uboot-envtools kmod-eeprom-sunxi kmod-wdt-sunxi -+DEFAULT_PACKAGES += uboot-envtools - DEFAULT_PACKAGES += mkf2fs e2fsprogs - - $(eval $(call BuildTarget)) -diff --git a/target/linux/sunxi/config-4.4 b/target/linux/sunxi/config-4.4 -index 2253afa124ad6c3d6b9d6798dc29f68437455341..a978e9d15b8c358f69669d3afdbf4a14bba83d31 100644 ---- a/target/linux/sunxi/config-4.4 -+++ b/target/linux/sunxi/config-4.4 -@@ -356,7 +356,7 @@ CONFIG_NO_HZ_COMMON=y - CONFIG_NO_HZ_IDLE=y - CONFIG_NR_CPUS=8 - CONFIG_NVMEM=y --# CONFIG_NVMEM_SUNXI_SID is not set -+CONFIG_NVMEM_SUNXI_SID=y - CONFIG_OF=y - CONFIG_OF_ADDRESS=y - CONFIG_OF_EARLY_FLATTREE=y -diff --git a/target/linux/sunxi/modules.mk b/target/linux/sunxi/modules.mk -index 6f4991798decb4a65f615d3a7282270960a7555a..99b82a3b5f17348049458ced5823f7c90f784269 100644 ---- a/target/linux/sunxi/modules.mk -+++ b/target/linux/sunxi/modules.mk -@@ -25,7 +25,7 @@ $(eval $(call KernelPackage,rtc-sunxi)) - define KernelPackage/sunxi-ir - SUBMENU:=$(OTHER_MENU) - TITLE:=Sunxi SoC built-in IR support (A20) -- DEPENDS:=@TARGET_sunxi @!LINUX_4_4 +kmod-input-core -+ DEPENDS:=@TARGET_sunxi +kmod-input-core - $(call AddDepends/rtc) - KCONFIG:= \ - CONFIG_MEDIA_SUPPORT=y \ -@@ -42,22 +42,6 @@ endef - - $(eval $(call KernelPackage,sunxi-ir)) - --define KernelPackage/eeprom-sunxi -- SUBMENU:=$(OTHER_MENU) -- TITLE:=AllWinner Security ID fuse support -- DEPENDS:=@TARGET_sunxi @!LINUX_4_4 -- KCONFIG:= \ -- CONFIG_EEPROM_SUNXI_SID -- FILES:=$(LINUX_DIR)/drivers/misc/eeprom/sunxi_sid.ko -- AUTOLOAD:=$(call AutoLoad,50,sunxi_sid) --endef -- --define KernelPackage/eeprom-sunxi/description -- Support for the AllWinner Security ID fuse support --endef -- --$(eval $(call KernelPackage,eeprom-sunxi)) -- - define KernelPackage/ata-sunxi - TITLE:=AllWinner sunXi AHCI SATA support - SUBMENU:=$(BLOCK_MENU) -@@ -76,7 +60,7 @@ $(eval $(call KernelPackage,ata-sunxi)) - define KernelPackage/sun4i-emac - SUBMENU:=$(NETWORK_DEVICES_MENU) - TITLE:=AllWinner EMAC Ethernet support -- DEPENDS:=@TARGET_sunxi +LINUX_4_4:kmod-of-mdio +LINUX_4_4:kmod-libphy -+ DEPENDS:=@TARGET_sunxi +kmod-of-mdio +kmod-libphy - KCONFIG:=CONFIG_SUN4I_EMAC - FILES:=$(LINUX_DIR)/drivers/net/ethernet/allwinner/sun4i-emac.ko - AUTOLOAD:=$(call AutoProbe,sun4i-emac) -@@ -85,35 +69,11 @@ endef - $(eval $(call KernelPackage,sun4i-emac)) - - --define KernelPackage/wdt-sunxi -- SUBMENU:=$(OTHER_MENU) -- TITLE:=AllWinner sunXi Watchdog timer -- DEPENDS:=@TARGET_sunxi -- KCONFIG:=CONFIG_SUNXI_WATCHDOG -- FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/sunxi_wdt.ko -- AUTOLOAD:=$(call AutoLoad,51,sunxi_wdt) --endef -- --define KernelPackage/wdt-sunxi/description -- Kernel module for AllWinner sunXi watchdog timer. --endef -- --$(eval $(call KernelPackage,wdt-sunxi)) -- -- - define KernelPackage/sound-soc-sunxi - TITLE:=AllWinner built-in SoC sound support -- KCONFIG:= \ -- CONFIG_SND_SUNXI_SOC_CODEC \ -- CONFIG_SND_SUN4I_CODEC --ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,4.4.0)),1) -- FILES+=$(LINUX_DIR)/sound/soc/sunxi/sunxi-codec.ko -- AUTOLOAD:=$(call AutoLoad,65,sunxi-codec) --endif --ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,4.4.0)),1) -+ KCONFIG:=CONFIG_SND_SUN4I_CODEC - FILES:=$(LINUX_DIR)/sound/soc/sunxi/sun4i-codec.ko - AUTOLOAD:=$(call AutoLoad,65,sun4i-codec) --endif - DEPENDS:=@TARGET_sunxi +kmod-sound-soc-core - $(call AddDepends/sound) - endef diff --git a/patches/lede/0015-procd-prepare-NAND-sysupgrade-for-making-upgraded-dynamically-linked.patch b/patches/lede/0014-procd-prepare-NAND-sysupgrade-for-making-upgraded-dynamically-linked.patch similarity index 100% rename from patches/lede/0015-procd-prepare-NAND-sysupgrade-for-making-upgraded-dynamically-linked.patch rename to patches/lede/0014-procd-prepare-NAND-sysupgrade-for-making-upgraded-dynamically-linked.patch diff --git a/patches/lede/0016-procd-remove-procd-nand-package.patch b/patches/lede/0015-procd-remove-procd-nand-package.patch similarity index 99% rename from patches/lede/0016-procd-remove-procd-nand-package.patch rename to patches/lede/0015-procd-remove-procd-nand-package.patch index 4c86f6dedda591956325e2ebf05ffc9ec8ff907b..548476813c8243fcf4dfaf1348b5a3d892fa9308 100644 --- a/patches/lede/0016-procd-remove-procd-nand-package.patch +++ b/patches/lede/0015-procd-remove-procd-nand-package.patch @@ -12,7 +12,7 @@ as a separate package. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> diff --git a/package/base-files/Makefile b/package/base-files/Makefile -index 305d0bfd333fd17f0f7c57ee2298dbfd4b97fe29..fe4430d59092dae9ba2ffbea61f58ac7b4b41dc6 100644 +index fdeda95a17cd463f0348bf0606ad40dde717d21f..54f752c802ae2125bf65415807e5b55b45d16190 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -19,7 +19,9 @@ PKG_BUILD_DEPENDS:=usign/host diff --git a/patches/lede/0017-base-files-always-use-staged-sysupgrade.patch b/patches/lede/0016-base-files-always-use-staged-sysupgrade.patch similarity index 100% rename from patches/lede/0017-base-files-always-use-staged-sysupgrade.patch rename to patches/lede/0016-base-files-always-use-staged-sysupgrade.patch diff --git a/patches/lede/0018-fstools-clean-up-trailing-whitespace-in-snapshot-script.patch b/patches/lede/0017-fstools-clean-up-trailing-whitespace-in-snapshot-script.patch similarity index 100% rename from patches/lede/0018-fstools-clean-up-trailing-whitespace-in-snapshot-script.patch rename to patches/lede/0017-fstools-clean-up-trailing-whitespace-in-snapshot-script.patch diff --git a/patches/lede/0019-fstools-snapshot-handle-jffs2-conversion-using-upgraded.patch b/patches/lede/0018-fstools-snapshot-handle-jffs2-conversion-using-upgraded.patch similarity index 100% rename from patches/lede/0019-fstools-snapshot-handle-jffs2-conversion-using-upgraded.patch rename to patches/lede/0018-fstools-snapshot-handle-jffs2-conversion-using-upgraded.patch diff --git a/patches/lede/0020-base-files-sysupgrade-cleanup.patch b/patches/lede/0019-base-files-sysupgrade-cleanup.patch similarity index 100% rename from patches/lede/0020-base-files-sysupgrade-cleanup.patch rename to patches/lede/0019-base-files-sysupgrade-cleanup.patch diff --git a/patches/lede/0021-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch b/patches/lede/0020-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch similarity index 100% rename from patches/lede/0021-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch rename to patches/lede/0020-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch diff --git a/patches/lede/0022-ramips-sysupgrade-move-nand_do_upgrade-call-to-platform_do_upgrade.patch b/patches/lede/0021-ramips-sysupgrade-move-nand_do_upgrade-call-to-platform_do_upgrade.patch similarity index 100% rename from patches/lede/0022-ramips-sysupgrade-move-nand_do_upgrade-call-to-platform_do_upgrade.patch rename to patches/lede/0021-ramips-sysupgrade-move-nand_do_upgrade-call-to-platform_do_upgrade.patch diff --git a/patches/lede/0023-x86-sysupgrade-move-partition-table-change-check-to-platform_check_image.patch b/patches/lede/0022-x86-sysupgrade-move-partition-table-change-check-to-platform_check_image.patch similarity index 100% rename from patches/lede/0023-x86-sysupgrade-move-partition-table-change-check-to-platform_check_image.patch rename to patches/lede/0022-x86-sysupgrade-move-partition-table-change-check-to-platform_check_image.patch diff --git a/patches/lede/0024-x86-sysupgrade-refactor-platform_do_upgrade.patch b/patches/lede/0023-x86-sysupgrade-refactor-platform_do_upgrade.patch similarity index 100% rename from patches/lede/0024-x86-sysupgrade-refactor-platform_do_upgrade.patch rename to patches/lede/0023-x86-sysupgrade-refactor-platform_do_upgrade.patch diff --git a/patches/lede/0025-x86-sysupgrade-explicitly-rescan-disk-after-writing-partition-table.patch b/patches/lede/0024-x86-sysupgrade-explicitly-rescan-disk-after-writing-partition-table.patch similarity index 100% rename from patches/lede/0025-x86-sysupgrade-explicitly-rescan-disk-after-writing-partition-table.patch rename to patches/lede/0024-x86-sysupgrade-explicitly-rescan-disk-after-writing-partition-table.patch diff --git a/patches/lede/0026-sunxi-sysupgrade-don-t-write-partitions-twice.patch b/patches/lede/0025-sunxi-sysupgrade-don-t-write-partitions-twice.patch similarity index 100% rename from patches/lede/0026-sunxi-sysupgrade-don-t-write-partitions-twice.patch rename to patches/lede/0025-sunxi-sysupgrade-don-t-write-partitions-twice.patch diff --git a/patches/lede/0027-sunxi-sysupgrade-sync-with-x86.patch b/patches/lede/0026-sunxi-sysupgrade-sync-with-x86.patch similarity index 100% rename from patches/lede/0027-sunxi-sysupgrade-sync-with-x86.patch rename to patches/lede/0026-sunxi-sysupgrade-sync-with-x86.patch diff --git a/patches/lede/0028-mvebu-fix-sysupgrade.patch b/patches/lede/0027-mvebu-fix-sysupgrade.patch similarity index 100% rename from patches/lede/0028-mvebu-fix-sysupgrade.patch rename to patches/lede/0027-mvebu-fix-sysupgrade.patch diff --git a/patches/lede/0029-generic-mtd-backport-unlock-support-and-asserted-fixes-for-certain-Winbond-Spansion-flash-chips.patch b/patches/lede/0028-generic-mtd-backport-unlock-support-and-asserted-fixes-for-certain-Winbond-Spansion-flash-chips.patch similarity index 100% rename from patches/lede/0029-generic-mtd-backport-unlock-support-and-asserted-fixes-for-certain-Winbond-Spansion-flash-chips.patch rename to patches/lede/0028-generic-mtd-backport-unlock-support-and-asserted-fixes-for-certain-Winbond-Spansion-flash-chips.patch diff --git a/patches/lede/0030-generic-vxlan-backport-support-for-VXLAN-over-link-local-IPv6.patch b/patches/lede/0029-generic-vxlan-backport-support-for-VXLAN-over-link-local-IPv6.patch similarity index 100% rename from patches/lede/0030-generic-vxlan-backport-support-for-VXLAN-over-link-local-IPv6.patch rename to patches/lede/0029-generic-vxlan-backport-support-for-VXLAN-over-link-local-IPv6.patch diff --git a/patches/lede/0031-vxlan-add-new-package-for-netifd-VXLAN-proto.patch b/patches/lede/0030-vxlan-add-new-package-for-netifd-VXLAN-proto.patch similarity index 100% rename from patches/lede/0031-vxlan-add-new-package-for-netifd-VXLAN-proto.patch rename to patches/lede/0030-vxlan-add-new-package-for-netifd-VXLAN-proto.patch diff --git a/patches/lede/0032-busybox-compile-with-debug-information.patch b/patches/lede/0031-busybox-compile-with-debug-information.patch similarity index 100% rename from patches/lede/0032-busybox-compile-with-debug-information.patch rename to patches/lede/0031-busybox-compile-with-debug-information.patch diff --git a/patches/lede/0033-scripts-metadata-always-resolve-dependencies-through-provides-list.patch b/patches/lede/0032-scripts-metadata-always-resolve-dependencies-through-provides-list.patch similarity index 100% rename from patches/lede/0033-scripts-metadata-always-resolve-dependencies-through-provides-list.patch rename to patches/lede/0032-scripts-metadata-always-resolve-dependencies-through-provides-list.patch diff --git a/patches/lede/0034-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch b/patches/lede/0033-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch similarity index 100% rename from patches/lede/0034-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch rename to patches/lede/0033-base-files-upgrade-correctly-handle-nand_do_upgrade-argument-passed-from-preupgrade.patch diff --git a/patches/lede/0035-base-files-upgrade-don-t-loop-forever-trying-to-kill-processes.patch b/patches/lede/0034-base-files-upgrade-don-t-loop-forever-trying-to-kill-processes.patch similarity index 100% rename from patches/lede/0035-base-files-upgrade-don-t-loop-forever-trying-to-kill-processes.patch rename to patches/lede/0034-base-files-upgrade-don-t-loop-forever-trying-to-kill-processes.patch diff --git a/patches/lede/0036-bcm53xx-upgrade-fix-RAMFS_COPY_.patch b/patches/lede/0035-bcm53xx-upgrade-fix-RAMFS_COPY_.patch similarity index 100% rename from patches/lede/0036-bcm53xx-upgrade-fix-RAMFS_COPY_.patch rename to patches/lede/0035-bcm53xx-upgrade-fix-RAMFS_COPY_.patch diff --git a/patches/lede/0037-ipq806x-upgrade-fix-RAMFS_COPY_.patch b/patches/lede/0036-ipq806x-upgrade-fix-RAMFS_COPY_.patch similarity index 100% rename from patches/lede/0037-ipq806x-upgrade-fix-RAMFS_COPY_.patch rename to patches/lede/0036-ipq806x-upgrade-fix-RAMFS_COPY_.patch diff --git a/patches/lede/0038-kirkwood-upgrade-fix-RAMFS_COPY_.patch b/patches/lede/0037-kirkwood-upgrade-fix-RAMFS_COPY_.patch similarity index 100% rename from patches/lede/0038-kirkwood-upgrade-fix-RAMFS_COPY_.patch rename to patches/lede/0037-kirkwood-upgrade-fix-RAMFS_COPY_.patch